added Stirrup.py and improved getParametersOfFace()

Rebarfunc.py

@@ -103,7 +103,7 @@ def getTrueParametersOfStructure(obj):
         height = structuralBaseObject.Height.Value
     return [length, width, height]
 
-def getParametersOfFace(obj, selected_face):
+def getParametersOfFace(obj, selected_face, sketch=True):
     """ getParametersOfFace(obj, selected_face): This function will return
     length, width and points of center of mass of a given face in the form of list like
     [(FaceLength, FaceWidth), (CenterOfMassX, CenterOfMassY)]"""
@@ -133,6 +133,11 @@ def getParametersOfFace(obj, selected_face):
             elif i == 2:
                 y = center_of_mass[i]
                 facewidth = StructurePRM[2]
+        else:
+            z = center_of_mass[i]
+    if not sketch:
+        center_of_mass = selected_face.CenterOfMass
+        return [(facelength, facewidth), center_of_mass]
     return [(facelength, facewidth), (x, y)]
 
 def showWarning(message):

Stirrup.py

@@ -0,0 +1,203 @@
+from PySide import QtCore, QtGui
+from Rebarfunc import *
+from PySide.QtCore import QT_TRANSLATE_NOOP
+import FreeCAD, FreeCADGui, os, sys
+import math
+
+def getpointsOfStirrup(FacePRM, s_cover, bent_factor, diameter, rounding, facenormal):
+    if round(facenormal[1]) in {1,-1}:
+        x1 = FacePRM[1][0] - FacePRM[0][0]/2 + s_cover
+        y1 = FacePRM[1][1]
+        z1 = FacePRM[1][2] + FacePRM[0][1]/2 - s_cover + 1.4*diameter*rounding
+        x2 = FacePRM[1][0] - FacePRM[0][0]/2 + s_cover
+        y2 = y1 - diameter/4
+        z2 = FacePRM[1][2] - FacePRM[0][1]/2 + s_cover
+        x3 = FacePRM[1][0] + FacePRM[0][0]/2 - s_cover
+        y3 = y2 - diameter/4
+        z3 = FacePRM[1][2] - FacePRM[0][1]/2 + s_cover
+        x4 = FacePRM[1][0] + FacePRM[0][0]/2 - s_cover
+        y4 = y3 - diameter/4
+        z4 = FacePRM[1][2] + FacePRM[0][1]/2 - s_cover
+        x5 = FacePRM[1][0] - FacePRM[0][0]/2 + s_cover - 1.4*diameter*rounding
+        y5 = y4 - diameter/4
+        z5 = FacePRM[1][2] + FacePRM[0][1]/2 - s_cover
+        x0 = x1 + 10 * diameter * math.sin(math.radians(45))
+        y0 = y1
+        z0 = z1 - 10 * diameter * math.cos(math.radians(45))
+        x6 = x5 + 10 * diameter * math.sin(math.radians(45))
+        y6 = y5
+        z6 = z5 - 10 * diameter * math.cos(math.radians(45))
+        return [FreeCAD.Vector(x0, y0, z0), FreeCAD.Vector(x1, y1, z1),\
+                FreeCAD.Vector(x2, y2, z2), FreeCAD.Vector(x3, y3, z3),\
+                FreeCAD.Vector(x4, y4, z4), FreeCAD.Vector(x5, y5, z5),\
+                FreeCAD.Vector(x6, y6, z6)]
+
+class _StirrupTaskPanel:
+    def __init__(self, Rebar = None):
+        self.form = FreeCADGui.PySideUic.loadUi(os.path.splitext(__file__)[0]+".ui")
+        self.form.setWindowTitle(QtGui.QApplication.translate("Arch", "Stirrup Rebar", None))
+        self.form.amount_radio.clicked.connect(self.amount_radio_clicked)
+        self.form.spacing_radio.clicked.connect(self.spacing_radio_clicked)
+        #self.form.image.setPixmap(QtGui.QPixmap(os.path.split(os.path.abspath(__file__))[0]+"/icons/UShapeRebar.svg"))
+        self.Rebar = Rebar
+
+    def getStandardButtons(self):
+        return int(QtGui.QDialogButtonBox.Ok) | int(QtGui.QDialogButtonBox.Cancel)
+
+    def accept(self):
+        s_cover = self.form.sideCover.text()
+        s_cover = FreeCAD.Units.Quantity(s_cover).Value
+        f_cover = self.form.frontCover.text()
+        f_cover = FreeCAD.Units.Quantity(f_cover).Value
+        bent_factor = self.form.bentFactor.value()
+        diameter = self.form.diameter.text()
+        diameter = FreeCAD.Units.Quantity(diameter).Value
+        rounding = self.form.rounding.value()
+        FreeCAD.Console.PrintMessage("hfhh: "+str(rounding)+"  "+str(type(rounding))+"\n")
+        amount_check = self.form.amount_radio.isChecked()
+        spacing_check = self.form.spacing_radio.isChecked()
+        if not self.Rebar:
+            if amount_check == True:
+                amount = self.form.amount.value()
+                makeStirrup(s_cover, f_cover, bent_factor, diameter, rounding, True, amount)
+            elif spacing_check == True:
+                spacing = self.form.spacing.text()
+                spacing = FreeCAD.Units.Quantity(spacing).Value
+                makeStirrup(s_cover, f_cover, bent_factor, diameter, rounding, False, spacing)
+        else:
+            if amount_check == True:
+                amount = self.form.amount.value()
+                editStirrup(self.Rebar, s_cover, f_cover, bent_factor, diameter, rounding, True, amount)
+            elif spacing_check == True:
+                spacing = self.form.spacing.text()
+                spacing = FreeCAD.Units.Quantity(spacing).Value
+                editStirrup(self.Rebar, s_cover, f_cover, bent_factor, diameter, rounding, False, spacing)
+        FreeCAD.Console.PrintMessage("Done!\n")
+        FreeCADGui.Control.closeDialog(self)
+
+    def amount_radio_clicked(self):
+        self.form.spacing.setEnabled(False)
+        self.form.amount.setEnabled(True)
+
+    def spacing_radio_clicked(self):
+        self.form.amount.setEnabled(False)
+        self.form.spacing.setEnabled(True)
+
+
+def makeStirrup(s_cover, f_cover, bent_factor, diameter, rounding, amount_spacing_check, amount_spacing_value):
+    """ makeStirrup(f_cover, b_cover, s_cover, diameter, t_cover, rounding, rebarAlong, amount_spacing_check, amount_spacing_value):
+    Adds the U-Shape reinforcement bar to the selected structural object"""
+    FreeCAD.Console.PrintMessage(str(rounding)+"  "+str(type(rounding))+"\n")
+    selected_obj = FreeCADGui.Selection.getSelectionEx()[0]
+    StructurePRM = getTrueParametersOfStructure(selected_obj.Object)
+    FacePRM = getParametersOfFace(selected_obj.Object, selected_obj.SubObjects[0], False)
+    FaceNormal = selected_obj.SubObjects[0].normalAt(0,0)
+    FaceNormal = selected_obj.SubObjects[0].Placement.Rotation.inverted().multVec(FaceNormal)
+    if not FacePRM:
+        FreeCAD.Console.PrintError("Cannot identified shape or from which base object sturctural element is derived\n")
+        return
+    # Calculate the coordinate values of U-Shape rebar
+    FreeCAD.Console.PrintMessage("faceprm: "+str(FacePRM)+"\n")
+    #FreeCAD.Console.PrintMessage(str(FacePRM)+"\n")
+    points = getpointsOfStirrup(FacePRM, s_cover, bent_factor, diameter, rounding, FaceNormal)
+    FreeCAD.Console.PrintMessage("points: "+str(points)+"\n")
+    import Draft
+    line = Draft.makeWire(points,closed=False,face=True,support=None)
+    import Arch
+#    sketch = FreeCAD.activeDocument().addObject('Sketcher::SketchObject','Sketch')
+#    sketch.MapMode = "FlatFace"
+    line.Support = [(selected_obj.Object, selected_obj.SubElementNames[0])]
+#    FreeCAD.ActiveDocument.recompute()
+#    sketch.addGeometry(Part.LineSegment(FreeCAD.Vector(x1, y1, 0), FreeCAD.Vector(x2, y2, z2)), False)
+#    sketch.addGeometry(Part.LineSegment(FreeCAD.Vector(x2, y2, z2), FreeCAD.Vector(x3, y3, z3)), False)
+#    import Sketcher
+#    sketch.addConstraint(Sketcher.Constraint('Coincident',0,2,1,1))
+#    sketch.addGeometry(Part.LineSegment(FreeCAD.Vector(x3, y3, z3), FreeCAD.Vector(x4, y4, z4)), False)
+#    sketch.addConstraint(Sketcher.Constraint('Coincident',1,2,2,1))
+#    sketch.addGeometry(Part.LineSegment(FreeCAD.Vector(x4, y4, z4), FreeCAD.Vector(x1, y1, z4)), False)
+    if amount_spacing_check == True:
+        rebar = Arch.makeRebar(selected_obj.Object, line, diameter, amount_spacing_value, f_cover)
+        rebar.Direction = FaceNormal.negative()
+        FreeCAD.ActiveDocument.recompute()
+#    else:
+#        rebar = Arch.makeRebar(selected_obj.Object, sketch, diameter, int((StructurePRM[1]-diameter)/amount_spacing_value), f_cover)
+    rebar.Rounding = rounding
+#    # Adds properties to the rebar object
+    rebar.ViewObject.addProperty("App::PropertyString","RebarShape","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Shape of rebar")).RebarShape = "Stirrup"
+    rebar.ViewObject.setEditorMode("RebarShape",2)
+    rebar.addProperty("App::PropertyDistance","SideCover","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Side cover of rebar")).SideCover = s_cover
+    rebar.setEditorMode("SideCover",2)
+    rebar.addProperty("App::PropertyDistance","FrontCover","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Top cover of rebar")).FrontCover = f_cover
+    rebar.setEditorMode("FrontCover",2)
+    rebar.addProperty("App::PropertyInteger","TrueRounding","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Bottom cover of rebar")).TrueRounding = rounding
+    rebar.setEditorMode("TrueRounding",2)
+    rebar.addProperty("App::PropertyInteger","BentFactor","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Bottom cover of rebar")).BentFactor = bent_factor
+    rebar.setEditorMode("BentFactor",2)
+    rebar.addProperty("App::PropertyBool","AmountCheck","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Amount radio button is checked")).AmountCheck
+    rebar.setEditorMode("AmountCheck",2)
+    rebar.addProperty("App::PropertyDistance","TrueSpacing","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Spacing between of rebars")).TrueSpacing = amount_spacing_value
+    rebar.setEditorMode("TrueSpacing",2)
+    if amount_spacing_check:
+        rebar.AmountCheck = True
+    else:
+        rebar.AmountCheck = False
+        rebar.TrueSpacing = amount_spacing_value
+    FreeCAD.ActiveDocument.recompute()
+
+def editStirrup(Rebar, s_cover, f_cover, bent_factor, diameter, rounding, amount_spacing_check, amount_spacing_value):
+    sketch = Rebar.Base
+    # Check if sketch support is empty.
+    if not sketch.Support:
+        showWarning("You have checked remove external geometry of base sketchs when needed.\nTo unchecked Edit->Preferences->Arch.")
+        return
+    # Assigned values
+    facename = sketch.Support[0][1][0]
+    structure = sketch.Support[0][0]
+    face = structure.Shape.Faces[int(facename[-1])-1]
+    StructurePRM = getTrueParametersOfStructure(structure)
+    # Get parameters of the face where sketch of rebar is drawn
+    FacePRM = getParametersOfFace(structure, face)
+    FaceNormal = face.normalAt(0,0)
+    FaceNormal = face.Placement.Rotation.inverted().multVec(FaceNormal)
+
+    # Calculate the coordinates value of U-Shape rebar
+
+
+
+    if amount_spacing_check == True:
+        Rebar.Amount = amount_spacing_value
+        FreeCAD.ActiveDocument.recompute()
+        Rebar.AmountCheck = True
+    else:
+        Rebar.Amount = int((StructurePRM[1]-diameter)/amount_spacing_value)
+        FreeCAD.ActiveDocument.recompute()
+        Rebar.AmountCheck = False
+    Rebar.FrontCover = f_cover
+    Rebar.SideCover = s_cover
+    Rebar.TrueRounding = rounding
+    Rebar.BentFactor = bent_factor
+    Rebar.TrueSpacing = amount_spacing_value
+    FreeCAD.ActiveDocument.recompute()
+
+def editDialog(vobj):
+    FreeCADGui.Control.closeDialog()
+    obj = _StirrupTaskPanel(vobj.Object)
+    obj.form.frontCover.setText(str(vobj.Object.FrontCover))
+    obj.form.sideCover.setText(str(vobj.Object.SideCover))
+    obj.form.diameter.setText(str(vobj.Object.Diameter))
+    obj.form.rounding.setValue(vobj.Object.TrueRounding)
+    obj.form.bentFactor.setValue(vobj.Object.BentFactor)
+    if vobj.Object.AmountCheck == True:
+        obj.form.amount.setValue(vobj.Object.Amount)
+    else:
+        obj.form.amount_radio.setChecked(False)
+        obj.form.spacing_radio.setChecked(True)
+        obj.form.amount.setDisabled(True)
+        obj.form.spacing.setEnabled(True)
+        obj.form.spacing.setText(str(vobj.Object.TrueSpacing))
+    FreeCADGui.Control.showDialog(obj)
+
+#def CommandUShapeRebar():
+#    selected_obj = check_selected_face()
+#    if selected_obj:
+FreeCADGui.Control.showDialog(_StirrupTaskPanel())

Stirrup.ui

@@ -88,9 +88,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="Gui::UIntSpinBox" name="rounding"/>
-     </item>
      <item row="4" column="0">
       <widget class="QLabel" name="diameterLabel">
        <property name="text">
@@ -193,6 +190,9 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="1">
+      <widget class="Gui::PrefSpinBox" name="rounding"/>
+     </item>
     </layout>
    </item>
   </layout>
@@ -203,11 +203,6 @@
    <extends>QLineEdit</extends>
    <header>Gui/InputField.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::UIntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>Gui/SpinBox.h</header>
-  </customwidget>
   <customwidget>
    <class>Gui::PrefSpinBox</class>
    <extends>QSpinBox</extends>

UShapeRebar.py

@@ -108,10 +108,10 @@ def makeUShapeRebar(f_cover, b_cover, s_cover, diameter, t_cover, rounding, amou
     rebar.setEditorMode("TopCover",2)
     rebar.addProperty("App::PropertyDistance","TrueSpacing","RebarDialog",QT_TRANSLATE_NOOP("App::Property","Spacing between of rebars")).TrueSpacing = amount_spacing_value
     rebar.setEditorMode("TrueSpacing",2)
-    rebar.FrontCover = f_cover
-    rebar.SideCover = s_cover
-    rebar.BottomCover = b_cover
-    rebar.TopCover = t_cover
+#    rebar.FrontCover = f_cover
+#    rebar.SideCover = s_cover
+#    rebar.BottomCover = b_cover
+#    rebar.TopCover = t_cover
     if amount_spacing_check:
         rebar.AmountCheck = True
     else: