Merge pull request #3038 from realthunder/PathDrill

Path: fix drill job creation
FreeCAD · Feb 17, 2020 · 8c6a52b · 8c6a52b
2 parents 71ce215 + 9a7964c
commit 8c6a52b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py b/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py
@@ -52,6 +52,8 @@ class TaskPanelHoleGeometryPage(PathOpGui.TaskPanelBaseGeometryPage):
     DataObject      = QtCore.Qt.ItemDataRole.UserRole + 1
     DataObjectSub   = QtCore.Qt.ItemDataRole.UserRole + 2
 
+    InitBase = False
+
     def getForm(self):
         '''getForm() ... load and return page'''
         return FreeCADGui.PySideUic.loadUi(":/panels/PageBaseHoleGeometryEdit.ui")

diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py
@@ -1017,7 +1017,7 @@ def setupUi(self):
         if self.deleteOnReject and PathOp.FeatureBaseGeometry & self.obj.Proxy.opFeatures(self.obj):
             sel = FreeCADGui.Selection.getSelectionEx()
             for page in self.featurePages:
-                if hasattr(page, 'addBase'):
+                if getattr(page, 'InitBase', True) and hasattr(page, 'addBase'):
                     page.clearBase()
                     page.addBaseGeometry(sel)