Arch: Arch_Structure beam could have wrong length

src/Mod/Arch/ArchStructure.py

@@ -1,4 +1,4 @@
 #***************************************************************************
 #*   Copyright (c) 2011 Yorik van Havre <yorik@uncreated.net>              *
 #*                                                                         *
 #*   This program is free software; you can redistribute it and/or modify  *
@@ -165,7 +165,7 @@
 
 def placeAlongEdge(p1,p2,horizontal=False):
 
     """placeAlongEdge(p1,p2,[horizontal]): returns a Placement positioned at p1, with Z axis oriented towards p2.
     If horizontal is True, then the X axis is oriented towards p2, not the Z axis"""
 
     pl = FreeCAD.Placement()
@@ -180,7 +180,7 @@
             pl.Rotation = FreeCAD.Rotation(zaxis,yaxis,xaxis,"ZXY")
         else:
             pl.Rotation = FreeCAD.Rotation(xaxis,yaxis,zaxis,"ZXY")
             pl.Rotation = FreeCAD.Rotation(pl.Rotation.multVec(FreeCAD.Vector(0,0,1)),90).multiply(pl.Rotation)
     return pl
 
 
@@ -192,8 +192,8 @@
 
     def GetResources(self):
         return {'Pixmap': 'Arch_MultipleStructures',
                 'MenuText': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Multiple Structures"),
                 'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Create multiple Arch Structures from a selected base, using each selected edge as an extrusion path")}
 
     def IsActive(self):
         return not FreeCAD.ActiveDocument is None
@@ -201,18 +201,18 @@
     def Activated(self):
         selex = FreeCADGui.Selection.getSelectionEx()
         if len(selex) >= 2:
             FreeCAD.ActiveDocument.openTransaction(translate("Arch", "Create Structures From Selection"))
             FreeCADGui.addModule("Arch")
             FreeCADGui.addModule("Draft")
             base = selex[0].Object # The first selected object is the base for the Structure objects
             for selexi in selex[1:]: # All the edges from the other objects are used as a Tool (extrusion paths)
                 if len(selexi.SubElementNames) == 0:
                     subelement_names = ["Edge" + str(i) for i in range(1, len(selexi.Object.Shape.Edges) + 1)]
                 else:
                     subelement_names = [sub for sub in selexi.SubElementNames if sub.startswith("Edge")]
                 for sub in subelement_names:
                     FreeCADGui.doCommand("structure = Arch.makeStructure(FreeCAD.ActiveDocument." + base.Name + ")")
                     FreeCADGui.doCommand("structure.Tool = (FreeCAD.ActiveDocument." + selexi.Object.Name + ", '" + sub + "')")
                     FreeCADGui.doCommand("structure.BasePerpendicularToTool = True")
                     FreeCADGui.doCommand("Draft.autogroup(structure)")
             FreeCAD.ActiveDocument.commitTransaction()
@@ -349,6 +349,9 @@
         FreeCAD.ActiveDocument.openTransaction(translate("Arch","Create Structure"))
         FreeCADGui.addModule("Arch")
         FreeCADGui.addModule("WorkingPlane")
+        if self.bmode:
+            self.Length = point.sub(self.bpoint).Length
+            params.set_param_arch("StructureHeight",self.Length)
         if self.Profile is not None:
             try: # try to update latest precast values - fails if dialog has been destroyed already
                 self.precastvalues = self.precast.getValues()
@@ -649,17 +652,17 @@
 
     def rotateLH(self):
 
-        h = self.Height
-        l = self.Length
-        self.vLength.setText(FreeCAD.Units.Quantity(h,FreeCAD.Units.Length).UserString)
-        self.vHeight.setText(FreeCAD.Units.Quantity(l,FreeCAD.Units.Length).UserString)
+        l = self.vLength.text()
+        h = self.vHeight.text()
+        self.vLength.setText(h)
+        self.vHeight.setText(l)
 
     def rotateLW(self):
 
-        w = self.Width
-        l = self.Length
-        self.vLength.setText(FreeCAD.Units.Quantity(w,FreeCAD.Units.Length).UserString)
-        self.vWidth.setText(FreeCAD.Units.Quantity(l,FreeCAD.Units.Length).UserString)
+        l = self.vLength.text()
+        w = self.vWidth.text()
+        self.vLength.setText(w)
+        self.vWidth.setText(l)
 
 
 class _Structure(ArchComponent.Component):
@@ -994,8 +997,8 @@
                 offset = FreeCAD.Vector(0,0,obj.NodesOffset.Value)
             if obj.Nodes and (prop != "ResetNodes"):
                 if hasattr(self,"nodes"):
                     if self.nodes:
                         if obj.Nodes != self.nodes:
                             # nodes are set manually: don't touch them
                             return
                 else:
@@ -1107,7 +1110,7 @@
 
         if prop == "ShowNodes":
             if hasattr(self,"nodes"):
                 vobj.Annotation.removeChild(self.nodes)
                 del self.nodes
             if vobj.ShowNodes:
                 from pivy import coin