Minor bugfixes in Arch & Draft

FreeCAD · Aug 26, 2016 · 783ec34 · 783ec34
1 parent 77dec4b
commit 783ec34
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/Mod/Arch/ArchEquipment.py b/src/Mod/Arch/ArchEquipment.py
@@ -299,11 +299,14 @@ def attach(self, vobj):
         sep = coin.SoSeparator()
         self.coords = coin.SoCoordinate3()
         sep.addChild(self.coords)
+        self.coords.point.deleteValues(0)
         symbol = coin.SoMarkerSet()
         symbol.markerIndex = coin.SoMarkerSet.CIRCLE_FILLED_5_5
         sep.addChild(symbol)
         rn = vobj.RootNode
         rn.addChild(sep)
+        ArchComponent.ViewProviderComponent.attach(self,vobj)
+
 
     def updateData(self, obj, prop):
         if prop == "SnapPoints":

diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
@@ -4522,8 +4522,11 @@ def onChanged(self, vobj, prop):
                     self.coords.scaleFactor.setValue((s,s,s))
                     rn.addChild(self.pt)
                 else:
-                    self.pt.removeChild(self.symbol)
-                    rn.removeChild(self.pt)
+                    if self.symbol:
+                        if self.pt.findChild(self.symbol) != -1:
+                            self.pt.removeChild(self.symbol)
+                        if rn.findChild(self.pt) != -1:
+                            rn.removeChild(self.pt)
         _ViewProviderDraft.onChanged(self,vobj,prop)
         return
 

diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
@@ -4608,8 +4608,9 @@ def accept(self):
                             if not lp:
                                 lp = p
                             else:
-                                z = pc*FreeCAD.Vector(p.x,p.y,lp.z).Length
-                                lp = FreeCAD.Vector(p.x,p.y,z)
+                                v = p.sub(lp)
+                                z = pc*FreeCAD.Vector(v.x,v.y,0).Length
+                                lp = FreeCAD.Vector(p.x,p.y,lp.z+z)
                             np.append(lp)
                         obj.Points = np
             FreeCAD.ActiveDocument.commitTransaction()