Merge pull request #874 from mlampert/feature/arch-panel-scale

Arch: Added Scale property to PanelSheet.
FreeCAD · Jul 13, 2017 · 01eaca1 · 01eaca1
2 parents 828793f + 870f3eb
commit 01eaca1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py
@@ -968,6 +968,7 @@ def __init__(self, obj):
         obj.addProperty("App::PropertyPercent","FillRatio","Arch",QT_TRANSLATE_NOOP("App::Property","The fill ratio of this sheet"))
         obj.addProperty("App::PropertyBool","MakeFace","Arch",QT_TRANSLATE_NOOP("App::Property","If True, the object is rendered as a face, if possible."))
         obj.addProperty("App::PropertyAngle","GrainDirection","Arch",QT_TRANSLATE_NOOP("App::Property","Specifies an angle for the wood grain (Clockwise, 0 is North)"))
+        obj.addProperty("App::PropertyFloat","Scale","Arch", QT_TRANSLATE_NOOP("App::Property","Specifies the scale applied to each panel view."))
         obj.Proxy = self
         self.Type = "PanelSheet"
         obj.TagSize = 10
@@ -977,6 +978,7 @@ def __init__(self, obj):
         obj.MakeFace = False
         obj.FontFile = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft").GetString("FontFile","")
         obj.setEditorMode("FillRatio",2)
+        obj.Scale = 1.0
 
     def execute(self, obj):
         import Part
@@ -1020,6 +1022,7 @@ def execute(self, obj):
                 textshape.rotate(textshape.BoundBox.Center,Vector(0,0,1),obj.TagRotation.Value)
                 self.sheettag = textshape
                 base = Part.Compound([base,textshape])
+            base.scale(obj.Scale, FreeCAD.Vector())
             obj.Shape = base
             obj.Placement = pl
             obj.FillRatio = int((subarea/area)*100)
@@ -1040,12 +1043,14 @@ def getOutlines(self,obj,transform=False):
                         w = w[0]
                         if transform:
                             w.Placement = obj.Placement.multiply(w.Placement)
+                        w.scale(obj.Scale, FreeCAD.Vector())
                         outp.append(w)
             if not ispanel:
                 if p.isDerivedFrom("Part::Feature"):
                     for w in p.Shape.Wires:
                         if transform:
                             w.Placement = obj.Placement.multiply(w.Placement)
+                        w.scale(obj.Scale, FreeCAD.Vector())
                         outp.append(w)
         return outp
 
@@ -1063,6 +1068,7 @@ def getHoles(self,obj,transform=False):
                         w = w[1]
                         if transform:
                             w.Placement = obj.Placement.multiply(w.Placement)
+                        w.scale(obj.Scale, FreeCAD.Vector())
                         outp.append(w)
         return outp
 
@@ -1082,11 +1088,13 @@ def getTags(self,obj,transform=False):
                         w = w[2]
                         if transform:
                             w.Placement = obj.Placement.multiply(w.Placement)
+                        w.scale(obj.Scale, FreeCAD.Vector())
                         outp.append(w)
         if self.sheettag is not None:
             w = self.sheettag.copy()
             if transform:
                 w.Placement = obj.Placement.multiply(w.Placement)
+            w.scale(obj.Scale, FreeCAD.Vector())
             outp.append(w)
 
         return outp