suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed consecutive abort of job editing and selection of current base object.

Browse Source
This commit is contained in:
Markus Lampert 2016-11-01 11:03:57 -07:00 committed by wmayer
parent 462c8b362a
commit 26f73b4a0e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Path/PathScripts/PathJob.py
View File

@ -163,6 +163,7 @@ class ViewProviderJob:
taskd = TaskPanel(vobj.Object, self.deleteObjectsOnReject())
FreeCADGui.Control.showDialog(taskd)
taskd.setupUi()
self.deleteOnReject = False
return True
def getIcon(self):
@ -324,10 +325,11 @@ class TaskPanel:
self.form.PathsList.addItem(child.Name)
baseindex = -1
if self.obj.Base is not None:
if self.obj.Base:
baseindex = self.form.cboBaseObject.findText(self.obj.Base.Name, QtCore.Qt.MatchFixedString)
for o in FreeCADGui.Selection.getCompleteSelection():
baseindex = self.form.cboBaseObject.findText(o.Name, QtCore.Qt.MatchFixedString)
else:
for o in FreeCADGui.Selection.getCompleteSelection():
baseindex = self.form.cboBaseObject.findText(o.Name, QtCore.Qt.MatchFixedString)
print baseindex
if baseindex >= 0:
self.form.cboBaseObject.blockSignals(True)