kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Path: Improve geometry selection and Cancel operation error messages

Browse Source
This commit is contained in:
Russell Johnson
2020-05-07 23:19:21 -05:00
parent 0e48eb1e85
commit dcd6f0ee97
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Path/PathScripts/PathOpGui.py
View File

@@ -470,7 +470,9 @@ class TaskPanelBaseGeometryPage(TaskPanelPage):
def selectionSupportedAsBaseGeometry(self, selection, ignoreErrors):
if len(selection) != 1:
if not ignoreErrors:
PathLog.error(translate("PathProject", "Please select %s from a single solid" % self.featureName()))
msg = translate("PathProject", "Please select %s from a single solid" % self.featureName())
FreeCAD.Console.PrintError(msg + '\n')
PathLog.debug(msg)
return False
sel = selection[0]
if sel.HasSubObjects:
@@ -506,16 +508,16 @@ class TaskPanelBaseGeometryPage(TaskPanelPage):
if self.addBaseGeometry(FreeCADGui.Selection.getSelectionEx()):
# self.obj.Proxy.execute(self.obj)
self.setFields(self.obj)
self.updatePanelVisibility('Operation', self.obj)
self.setDirty()
self.updatePanelVisibility('Operation', self.obj)
def deleteBase(self):
PathLog.track()
selected = self.form.baseList.selectedItems()
for item in selected:
self.form.baseList.takeItem(self.form.baseList.row(item))
self.updatePanelVisibility('Operation', self.obj)
self.setDirty()
self.updatePanelVisibility('Operation', self.obj)
self.updateBase()
# self.obj.Proxy.execute(self.obj)
# FreeCAD.ActiveDocument.recompute()
@@ -537,8 +539,8 @@ class TaskPanelBaseGeometryPage(TaskPanelPage):
def clearBase(self):
self.obj.Base = []
self.updatePanelVisibility('Operation', self.obj)
self.setDirty()
self.updatePanelVisibility('Operation', self.obj)
def registerSignalHandlers(self, obj):
self.form.baseList.itemSelectionChanged.connect(self.itemActivated)
@@ -975,8 +977,11 @@ class TaskPanel(object):
FreeCAD.ActiveDocument.abortTransaction()
if self.deleteOnReject:
FreeCAD.ActiveDocument.openTransaction(translate("Path", "Uncreate AreaOp Operation"))
PathUtil.clearExpressionEngine(self.obj)
FreeCAD.ActiveDocument.removeObject(self.obj.Name)
try:
PathUtil.clearExpressionEngine(self.obj)
FreeCAD.ActiveDocument.removeObject(self.obj.Name)
except Exception as ee:
PathLog.debug('{}\n'.format(ee))
FreeCAD.ActiveDocument.commitTransaction()
self.cleanup(resetEdit)
return True