Skip to content

Commit

Permalink
[Draft] DraftGui and DraftEdit Cleanup to remove AddPoint & DelPoint
Browse files Browse the repository at this point in the history 
Lines to be deleted in DraftGui in the future, are now commented.
  • Loading branch information
@carlopav @yorikvanhavre
carlopav authored and yorikvanhavre committed Mar 12, 2020
1 parent 6182aea commit f5f4391
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 157 deletions.
12 changes: 0 additions & 12 deletions src/Mod/Draft/DraftEdit.py
View file
Expand Up @@ -439,12 +439,6 @@ def mousePressed(self, event_callback):
event.getButton() == event.BUTTON1
):#left click
if not event.wasAltDown():
if self.ui.addButton.isChecked():
self.addPoint(event)
return
if self.ui.delButton.isChecked():
self.delPoint(event)
return
if Draft.getType(self.obj) == "BezCurve" and (self.ui.sharpButton.isChecked()
or self.ui.tangentButton.isChecked() or
self.ui.symmetricButton.isChecked()):
Expand All @@ -457,12 +451,6 @@ def mousePressed(self, event_callback):
self.obj = doc.getObject(str(node.objectName.getValue()))
if self.obj is None:
return
if self.ui.sharpButton.isChecked():
return self.smoothBezPoint(self.obj, ep, 'Sharp')
elif self.ui.tangentButton.isChecked():
return self.smoothBezPoint(self.obj, ep, 'Tangent')
elif self.ui.symmetricButton.isChecked():
return self.smoothBezPoint(self.obj, ep, 'Symmetric')
if self.editing is None:
self.startEditing(event)
else:
Expand Down
187 changes: 94 additions & 93 deletions src/Mod/Draft/DraftGui.py
View file
Expand Up @@ -403,14 +403,14 @@ def setupToolBar(self,task=False):
boldtxt.setBold(True)
self.cmdlabel.setFont(boldtxt)

# subcommands
# subcommands for draft Edit, OBSOLETE

self.addButton = self._pushbutton("addButton", self.layout, icon="Draft_AddPoint", width=22, checkable=True)
self.delButton = self._pushbutton("delButton", self.layout, icon="Draft_DelPoint", width=22, checkable=True)
self.sharpButton = self._pushbutton("sharpButton", self.layout, icon="Draft_BezSharpNode", width=22, checkable=True)
self.tangentButton = self._pushbutton("tangentButton", self.layout, icon="Draft_BezTanNode", width=22, checkable=True)
self.symmetricButton = self._pushbutton("symmetricButton", self.layout, icon="Draft_BezSymNode", width=22, checkable=True)
self.arc3PtButton = self._pushbutton("arc3PtButton", self.layout, icon="Draft_Arc", width=22, checkable=True)
# self.addButton = self._pushbutton("addButton", self.layout, icon="Draft_AddPoint", width=22, checkable=True)
# self.delButton = self._pushbutton("delButton", self.layout, icon="Draft_DelPoint", width=22, checkable=True)
# self.sharpButton = self._pushbutton("sharpButton", self.layout, icon="Draft_BezSharpNode", width=22, checkable=True)
# self.tangentButton = self._pushbutton("tangentButton", self.layout, icon="Draft_BezTanNode", width=22, checkable=True)
# self.symmetricButton = self._pushbutton("symmetricButton", self.layout, icon="Draft_BezSymNode", width=22, checkable=True)
# self.arc3PtButton = self._pushbutton("arc3PtButton", self.layout, icon="Draft_Arc", width=22, checkable=True)

# point

Expand Down Expand Up @@ -549,12 +549,13 @@ def setupToolBar(self,task=False):
QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("textChanged()"),self.checkEnterText)
QtCore.QObject.connect(self.textOkButton,QtCore.SIGNAL("clicked()"),self.sendText)
QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("returnPressed()"),self.setFocus)
QtCore.QObject.connect(self.addButton,QtCore.SIGNAL("toggled(bool)"),self.setAddMode)
QtCore.QObject.connect(self.delButton,QtCore.SIGNAL("toggled(bool)"),self.setDelMode)
QtCore.QObject.connect(self.sharpButton,QtCore.SIGNAL("toggled(bool)"),self.setSharpMode)
QtCore.QObject.connect(self.tangentButton,QtCore.SIGNAL("toggled(bool)"),self.setTangentMode)
QtCore.QObject.connect(self.symmetricButton,QtCore.SIGNAL("toggled(bool)"),self.setSymmetricMode)
QtCore.QObject.connect(self.arc3PtButton,QtCore.SIGNAL("toggled(bool)"),self.setArc3PtMode)
# Draft Edit UI obsolete due to introduction of incommand context menu
# QtCore.QObject.connect(self.addButton,QtCore.SIGNAL("toggled(bool)"),self.setAddMode)
# QtCore.QObject.connect(self.delButton,QtCore.SIGNAL("toggled(bool)"),self.setDelMode)
# QtCore.QObject.connect(self.sharpButton,QtCore.SIGNAL("toggled(bool)"),self.setSharpMode)
# QtCore.QObject.connect(self.tangentButton,QtCore.SIGNAL("toggled(bool)"),self.setTangentMode)
# QtCore.QObject.connect(self.symmetricButton,QtCore.SIGNAL("toggled(bool)"),self.setSymmetricMode)
# QtCore.QObject.connect(self.arc3PtButton,QtCore.SIGNAL("toggled(bool)"),self.setArc3PtMode)
QtCore.QObject.connect(self.finishButton,QtCore.SIGNAL("pressed()"),self.finish)
QtCore.QObject.connect(self.closeButton,QtCore.SIGNAL("pressed()"),self.closeLine)
QtCore.QObject.connect(self.wipeButton,QtCore.SIGNAL("pressed()"),self.wipeLine)
Expand Down Expand Up @@ -681,12 +682,12 @@ def retranslateUi(self, widget=None):
self.continueCmd.setText(translate("draft", "Continue")+" ("+inCommandShortcuts["Continue"][0]+")")
self.occOffset.setToolTip(translate("draft", "If checked, an OCC-style offset will be performed instead of the classic offset"))
self.occOffset.setText(translate("draft", "&OCC-style offset"))
self.addButton.setToolTip(translate("draft", "Add points to the current object"))
self.delButton.setToolTip(translate("draft", "Remove points from the current object"))
self.sharpButton.setToolTip(translate("draft", "Make Bezier node sharp"))
self.tangentButton.setToolTip(translate("draft", "Make Bezier node tangent"))
self.symmetricButton.setToolTip(translate("draft", "Make Bezier node symmetric"))
self.arc3PtButton.setToolTip(translate("draft", "Toggle radius and angles arc editing"))
# self.addButton.setToolTip(translate("draft", "Add points to the current object"))
# self.delButton.setToolTip(translate("draft", "Remove points from the current object"))
# self.sharpButton.setToolTip(translate("draft", "Make Bezier node sharp"))
# self.tangentButton.setToolTip(translate("draft", "Make Bezier node tangent"))
# self.symmetricButton.setToolTip(translate("draft", "Make Bezier node symmetric"))
# self.arc3PtButton.setToolTip(translate("draft", "Toggle radius and angles arc editing"))
self.undoButton.setText(translate("draft", "&Undo (CTRL+Z)"))
self.undoButton.setToolTip(translate("draft", "Undo the last segment"))
self.closeButton.setText(translate("draft", "Close")+" ("+inCommandShortcuts["Close"][0]+")")
Expand Down Expand Up @@ -972,12 +973,12 @@ def offUi(self):
self.isRelative.hide()
self.hasFill.hide()
self.finishButton.hide()
self.addButton.hide()
self.delButton.hide()
self.sharpButton.hide()
self.tangentButton.hide()
self.symmetricButton.hide()
self.arc3PtButton.hide()
# self.addButton.hide()
# self.delButton.hide()
# self.sharpButton.hide()
# self.tangentButton.hide()
# self.symmetricButton.hide()
# self.arc3PtButton.hide()
self.undoButton.hide()
self.closeButton.hide()
self.wipeButton.hide()
Expand Down Expand Up @@ -1110,28 +1111,28 @@ def editUi(self, mode=None):
self.numFaces.hide()
self.isRelative.hide()
self.hasFill.hide()
self.addButton.show()
self.delButton.show()
if mode == 'Wire':
self.setEditButtons(True)
self.setBezEditButtons(False)
elif mode == 'Arc':
self.addButton.hide()
self.delButton.hide()
self.arc3PtButton.show()
elif mode == 'BezCurve':
self.sharpButton.show()
self.tangentButton.show()
self.symmetricButton.show()
# self.addButton.show()
# self.delButton.show()
# if mode == 'Wire':
# self.setEditButtons(True)
# self.setBezEditButtons(False)
# elif mode == 'Arc':
# self.addButton.hide()
# self.delButton.hide()
# self.arc3PtButton.show()
# elif mode == 'BezCurve':
# self.sharpButton.show()
# self.tangentButton.show()
# self.symmetricButton.show()
self.closeButton.show()
self.finishButton.show()
# self.finishButton.show()
# always start Edit with buttons unchecked
self.addButton.setChecked(False)
self.delButton.setChecked(False)
self.sharpButton.setChecked(False)
self.tangentButton.setChecked(False)
self.symmetricButton.setChecked(False)
self.arc3PtButton.setChecked(False)
# self.addButton.setChecked(False)
# self.delButton.setChecked(False)
# self.sharpButton.setChecked(False)
# self.tangentButton.setChecked(False)
# self.symmetricButton.setChecked(False)
# self.arc3PtButton.setChecked(False)

def extUi(self):
if Draft.getParam("UsePartPrimitives",False):
Expand All @@ -1149,9 +1150,9 @@ def modUi(self):
self.isCopy.setChecked(p.GetBool("copymodeValue",False))
self.continueCmd.show()

def vertUi(self,addmode=True):
self.addButton.setChecked(addmode)
self.delButton.setChecked(not(addmode))
# def vertUi(self,addmode=True):
# self.addButton.setChecked(addmode)
# self.delButton.setChecked(not(addmode))

def checkLocal(self):
"""checks if x,y,z coords must be displayed as local or global"""
Expand All @@ -1164,14 +1165,14 @@ def checkLocal(self):
self.labely.setText(translate("draft", "Local Y"))
self.labelz.setText(translate("draft", "Local Z"))

def setEditButtons(self,mode):
self.addButton.setEnabled(mode)
self.delButton.setEnabled(mode)
# def setEditButtons(self,mode):
# self.addButton.setEnabled(mode)
# self.delButton.setEnabled(mode)

def setBezEditButtons(self,mode):
self.sharpButton.setEnabled(mode)
self.tangentButton.setEnabled(mode)
self.symmetricButton.setEnabled(mode)
# def setBezEditButtons(self,mode):
# self.sharpButton.setEnabled(mode)
# self.tangentButton.setEnabled(mode)
# self.symmetricButton.setEnabled(mode)

def setNextFocus(self):
def isThere(widget):
Expand Down Expand Up @@ -1790,44 +1791,44 @@ def getIcon(self,iconpath):
def popupTriggered(self,action):
self.sourceCmd.proceed(str(action.text()))

def setAddMode(self,bool):
if self.addButton.isChecked():
self.delButton.setChecked(False)
self.symmetricButton.setChecked(False)
self.sharpButton.setChecked(False)
self.tangentButton.setChecked(False)

def setDelMode(self,bool):
if self.delButton.isChecked():
self.addButton.setChecked(False)
self.symmetricButton.setChecked(False)
self.sharpButton.setChecked(False)
self.tangentButton.setChecked(False)

def setSharpMode(self,bool):
if self.sharpButton.isChecked():
self.tangentButton.setChecked(False)
self.symmetricButton.setChecked(False)
self.addButton.setChecked(False)
self.delButton.setChecked(False)

def setTangentMode(self,bool):
if self.tangentButton.isChecked():
self.sharpButton.setChecked(False)
self.symmetricButton.setChecked(False)
self.addButton.setChecked(False)
self.delButton.setChecked(False)

def setSymmetricMode(self,bool):
if self.symmetricButton.isChecked():
self.sharpButton.setChecked(False)
self.tangentButton.setChecked(False)
self.addButton.setChecked(False)
self.delButton.setChecked(False)

def setArc3PtMode(self,bool):
if self.arc3PtButton.isChecked():
self.arc3PtButton.setChecked(True)
# def setAddMode(self,bool):
# if self.addButton.isChecked():
# self.delButton.setChecked(False)
# self.symmetricButton.setChecked(False)
# self.sharpButton.setChecked(False)
# self.tangentButton.setChecked(False)

# def setDelMode(self,bool):
# if self.delButton.isChecked():
# self.addButton.setChecked(False)
# self.symmetricButton.setChecked(False)
# self.sharpButton.setChecked(False)
# self.tangentButton.setChecked(False)

# def setSharpMode(self,bool):
# if self.sharpButton.isChecked():
# self.tangentButton.setChecked(False)
# self.symmetricButton.setChecked(False)
# self.addButton.setChecked(False)
# self.delButton.setChecked(False)

# def setTangentMode(self,bool):
# if self.tangentButton.isChecked():
# self.sharpButton.setChecked(False)
# self.symmetricButton.setChecked(False)
# self.addButton.setChecked(False)
# self.delButton.setChecked(False)

# def setSymmetricMode(self,bool):
# if self.symmetricButton.isChecked():
# self.sharpButton.setChecked(False)
# self.tangentButton.setChecked(False)
# self.addButton.setChecked(False)
# self.delButton.setChecked(False)

# def setArc3PtMode(self,bool):
# if self.arc3PtButton.isChecked():
# self.arc3PtButton.setChecked(True)

def setRadiusValue(self,val,unit=None):
#print("DEBUG: setRadiusValue val: ", val, " unit: ", unit)
Expand Down
52 changes: 0 additions & 52 deletions src/Mod/Draft/DraftTools.py
View file
Expand Up @@ -4401,56 +4401,6 @@ def proceed(self,labelname):
pass


class AddPoint(Modifier):
"""The Draft_AddPoint FreeCAD command definition"""

def __init__(self):
self.running = False

def GetResources(self):
return {'Pixmap' : 'Draft_AddPoint',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_AddPoint", "Add Point"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_AddPoint", "Adds a point to an existing Wire or B-spline")}

def IsActive(self):
if FreeCADGui.Selection.getSelection():
return True
else:
return False

def Activated(self):
selection = FreeCADGui.Selection.getSelection()
if selection:
if (Draft.getType(selection[0]) in ['Wire','BSpline']):
FreeCADGui.runCommand("Draft_Edit")
FreeCADGui.draftToolBar.vertUi(True)


class DelPoint(Modifier):
"""The Draft_DelPoint FreeCAD command definition"""

def __init__(self):
self.running = False

def GetResources(self):
return {'Pixmap' : 'Draft_DelPoint',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_DelPoint", "Remove Point"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_DelPoint", "Removes a point from an existing Wire or B-spline")}

def IsActive(self):
if FreeCADGui.Selection.getSelection():
return True
else:
return False

def Activated(self):
selection = FreeCADGui.Selection.getSelection()
if selection:
if (Draft.getType(selection[0]) in ['Wire','BSpline']):
FreeCADGui.runCommand("Draft_Edit")
FreeCADGui.draftToolBar.vertUi(False)


class WireToBSpline(Modifier):
"""The Draft_Wire2BSpline FreeCAD command definition"""

Expand Down Expand Up @@ -5681,8 +5631,6 @@ def IsActive(self):
FreeCADGui.addCommand('Draft_Scale',Scale())
FreeCADGui.addCommand('Draft_Drawing',Drawing())
FreeCADGui.addCommand('Draft_SubelementHighlight', SubelementHighlight())
FreeCADGui.addCommand('Draft_AddPoint',AddPoint())
FreeCADGui.addCommand('Draft_DelPoint',DelPoint())
FreeCADGui.addCommand('Draft_WireToBSpline',WireToBSpline())
FreeCADGui.addCommand('Draft_Draft2Sketch',Draft2Sketch())
FreeCADGui.addCommand('Draft_Array',Array())
Expand Down

0 comments on commit f5f4391

Please sign in to comment.