From e2deb45df55e13d16950bc39dfccdd7929d8ae23 Mon Sep 17 00:00:00 2001
From: markus <markus@bibi.ca>
Date: Sat, 28 Sep 2019 21:46:16 -0700
Subject: [PATCH] Load template during editing but unload it afterwards

---
 src/Mod/Path/PathScripts/PathToolBit.py     | 30 ++++++++++++++-------
 src/Mod/Path/PathScripts/PathToolBitEdit.py |  3 +++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Mod/Path/PathScripts/PathToolBit.py b/src/Mod/Path/PathScripts/PathToolBit.py
index 881746910a..fefd634bd9 100644
--- a/src/Mod/Path/PathScripts/PathToolBit.py
+++ b/src/Mod/Path/PathScripts/PathToolBit.py
@@ -57,9 +57,7 @@ def updateConstraint(sketch, name, value):
     for i, constraint in enumerate(sketch.Constraints):
         if constraint.Name.split(';')[0] == name:
             constr = None
-            if constraint.Type in ['DistanceX', 'DistanceY', 'Distance', 'Radius']:
-                constr = Sketcher.Constraint(constraint.Type, constraint.First, value)
-            elif constraint.Type in ['Angle']:
+            if constraint.Type in ['DistanceX', 'DistanceY', 'Distance', 'Radius', 'Angle']:
                 constr = Sketcher.Constraint(constraint.Type, constraint.First, constraint.FirstPos, constraint.Second, constraint.SecondPos, value)
             else:
                 print(constraint.Name, constraint.Type)
@@ -118,13 +116,14 @@ class ToolBit(object):
         #    self._updateBitShape(obj, [prop])
 
     def _updateBitShape(self, obj, properties=None):
-        if not properties:
-            properties = self.bitPropertyNames(obj)
-        for prop in properties:
-            for sketch in [o for o in obj.BitBody.Group if o.TypeId == 'Sketcher::SketchObject']:
-                PathLog.track(obj.Label, sketch.Label, prop)
-                updateConstraint(sketch, prop, obj.getPropertyByName(prop))
-        self._copyBitShape(obj)
+        if not obj.BitBody is None:
+            if not properties:
+                properties = self.bitPropertyNames(obj)
+            for prop in properties:
+                for sketch in [o for o in obj.BitBody.Group if o.TypeId == 'Sketcher::SketchObject']:
+                    PathLog.track(obj.Label, sketch.Label, prop)
+                    updateConstraint(sketch, prop, obj.getPropertyByName(prop))
+            self._copyBitShape(obj)
 
     def _copyBitShape(self, obj):
         obj.Document.recompute()
@@ -160,6 +159,17 @@ class ToolBit(object):
         for prop in self.bitPropertyNames(obj):
             obj.removeProperty(prop)
 
+    def loadBitBody(self, obj):
+        self._removeBitBody(obj)
+        (doc, opened) = self._loadBitBody(obj)
+        obj.BitBody = obj.Document.copyObject(doc.RootObjects[0], True)
+        if opened:
+            FreeCAD.closeDocument(doc.Name)
+        self._updateBitShape(obj)
+
+    def unloadBitBody(self, obj):
+        self._removeBitBody(obj)
+
     def _setupBitFromTemplate(self, obj, path=None):
         (doc, docOpened) = self._loadBitBody(obj, path)
 
diff --git a/src/Mod/Path/PathScripts/PathToolBitEdit.py b/src/Mod/Path/PathScripts/PathToolBitEdit.py
index 0464a2b019..4c546477cb 100644
--- a/src/Mod/Path/PathScripts/PathToolBitEdit.py
+++ b/src/Mod/Path/PathScripts/PathToolBitEdit.py
@@ -54,6 +54,7 @@ class ToolBitEditor:
         self.tool = tool
         if not tool.BitTemplate:
             self.tool.BitTemplate = 'src/Mod/Path/Tools/Template/endmill-straight.fcstd'
+        self.tool.Proxy.loadBitBody(self.tool)
         self.setupTool(self.tool)
 
     def setupTool(self, tool):
@@ -79,8 +80,10 @@ class ToolBitEditor:
 
     def accept(self):
         self.refresh()
+        self.tool.Proxy.unloadBitBody(self.tool)
 
     def reject(self):
+        self.tool.Proxy.unloadBitBody(self.tool)
         pass
 
     def updateUI(self):