Skip to content

Commit

Permalink
Draft: DraftEdit.py use string operator instead of numeric LGTM fix […
Browse files Browse the repository at this point in the history
…skip ci]
  • Loading branch information
luzpaz authored and yorikvanhavre committed Oct 25, 2019
1 parent 6084bbf commit cf854a5
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/Mod/Draft/DraftEdit.py
Expand Up @@ -206,13 +206,13 @@ def register_editing_callbacks(self):
viewer = FreeCADGui.ActiveDocument.ActiveView.getViewer()
self.render_manager = viewer.getSoRenderManager()
view = FreeCADGui.ActiveDocument.ActiveView
if self._keyPressedCB == None:
if self._keyPressedCB is None:
self._keyPressedCB = view.addEventCallbackPivy(
coin.SoKeyboardEvent.getClassTypeId(), self.keyPressed)
if self._mouseMovedCB == None:
if self._mouseMovedCB is None:
self._mouseMovedCB = view.addEventCallbackPivy(
coin.SoLocation2Event.getClassTypeId(), self.mouseMoved)
if self._mousePressedCB == None:
if self._mousePressedCB is None:
self._mousePressedCB = view.addEventCallbackPivy(
coin.SoMouseButtonEvent.getClassTypeId(), self.mousePressed)
#FreeCAD.Console.PrintMessage("Draft edit callbacks registered \n")
Expand Down Expand Up @@ -245,7 +245,7 @@ def keyPressed(self, event_callback):
key = event.getKey()
#FreeCAD.Console.PrintMessage("pressed key : "+str(key)+"\n")
if key == 65307: # ESC
if self.editing == None: self.finish()
if self.editing is None: self.finish()
else:
self.finalizeGhost()
self.setEditPoints(self.obj)
Expand Down Expand Up @@ -274,17 +274,17 @@ def mousePressed(self, event_callback):
pos = event.getPosition()
node = self.getEditNode(pos)
ep = self.getEditNodeIndex(node)
if ep == None: return
if ep is None: return
doc = FreeCAD.getDocument(str(node.documentName.getValue()))
self.obj = doc.getObject(str(node.objectName.getValue()))
if self.obj == None: return
if self.obj is None: return
if self.ui.sharpButton.isChecked():
return self.smoothBezPoint(ep, 'Sharp')
elif self.ui.tangentButton.isChecked():
return self.smoothBezPoint(ep, 'Tangent')
elif self.ui.symmetricButton.isChecked():
return self.smoothBezPoint(ep, 'Symmetric')
if self.editing == None:
if self.editing is None:
self.startEditing(event)
else:
self.endEditing()
Expand Down Expand Up @@ -313,11 +313,11 @@ def startEditing(self, event):
pos = event.getPosition()
node = self.getEditNode(pos)
ep = self.getEditNodeIndex(node)
if ep == None: return
if ep is None: return

doc = FreeCAD.getDocument(str(node.documentName.getValue()))
self.obj = doc.getObject(str(node.objectName.getValue()))
if self.obj == None: return
if self.obj is None: return
self.setPlacement(self.obj)

FreeCAD.Console.PrintMessage(str(self.obj.Name)+str(": editing node: n° ")+str(ep)+"\n")
Expand Down Expand Up @@ -690,12 +690,12 @@ def delPoint(self,event):
node = self.getEditNode(pos)
ep = self.getEditNodeIndex(node)

if ep == None: return FreeCAD.Console.PrintWarning(
if ep is None: return FreeCAD.Console.PrintWarning(
translate("draft", "Node not found\n"))

doc = FreeCAD.getDocument(str(node.documentName.getValue()))
self.obj = doc.getObject(str(node.objectName.getValue()))
if self.obj == None: return
if self.obj is None: return
if not (Draft.getType(self.obj) in ["Wire","BSpline","BezCurve"]): return
if len(self.obj.Points) <= 2: return FreeCAD.Console.PrintWarning(
translate("draft", "Active object must have more than two points/nodes")+"\n")
Expand Down Expand Up @@ -917,7 +917,7 @@ def resetTrackersBezier(self, obj):
def smoothBezPoint(self, point, style='Symmetric'):
"called when changing the continuity of a knot"
style2cont = {'Sharp':0,'Tangent':1,'Symmetric':2}
if point == None: return
if point is None: return
if not (Draft.getType(self.obj) == "BezCurve"):return
pts = self.obj.Points
deg = self.obj.Degree
Expand Down

0 comments on commit cf854a5

Please sign in to comment.