From cab1fdf6704afd168fca371304e04cbbada65436 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 7 Sep 2013 19:32:36 -0300 Subject: [PATCH 1/3] Arch: Added additional steel profiles from ifcuser --- src/Mod/Arch/ArchStructure.py | 297 ++++++++++++++++++++++++++-------- 1 file changed, 234 insertions(+), 63 deletions(-) diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index 677205ec3..ad8a87316 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -38,70 +38,241 @@ QtCore.QT_TRANSLATE_NOOP("Arch","Steel") Presets = [None, # wood sections + + ["Wood","1x2in",19,28], + ["Wood","1x3in",19,64], + ["Wood","1x4in",19,89], + ["Wood","1x6in",19,89], + ["Wood","1x8in",19,140], + ["Wood","1x10in",19,184], + ["Wood","1x12in",19,286], + + ["Wood","2x2in",38,38], + ["Wood","2x3in",38,64], + ["Wood","2x4in",38,89], + ["Wood","2x6in",38,140], + ["Wood","2x8in",38,184], + ["Wood","2x10in",38,235], + ["Wood","2x12in",38,286], + + ["Wood","4x4in",89,89], + ["Wood","4x6in",89,140], + ["Wood","6x6in",140,140], + ["Wood","8x8in",184,184], + + # HEA + + ["Steel","HEA100",96,100,5,8], + ["Steel","HEA120",114,120,5,8], + ["Steel","HEA140",133,140,5.5,8.5], + ["Steel","HEA160",152,160,6,9], + ["Steel","HEA180",171,180,6,9.5], + ["Steel","HEA200",190,200,6.5,10], + ["Steel","HEA220",210,220,7,11], + ["Steel","HEA240",230,240,7.5,12], + ["Steel","HEA260",250,260,7.5,12.5], + ["Steel","HEA280",270,280,8,13], + ["Steel","HEA300",290,300,8.5,14], + ["Steel","HEA320",310,300,9,15.5], + ["Steel","HEA340",330,300,9.5,16.5], + ["Steel","HEA360",350,300,10,17.5], + ["Steel","HEA400",390,300,11,19], + ["Steel","HEA450",440,300,11.5,21], + ["Steel","HEA500",490,300,12,23], + ["Steel","HEA550",540,300,12.5,24], + ["Steel","HEA600",590,300,13,25], + ["Steel","HEA650",640,300,13.5,26], + ["Steel","HEA700",690,300,14.5,27], + ["Steel","HEA800",790,300,15,28], + ["Steel","HEA900",890,300,16,30], + ["Steel","HEA1000",990,300,16.5,31], + + # HEAA + + ["Steel","HEAA100",91,100,4.2,5.5], + ["Steel","HEAA120",109,120,4.2,5.5], + ["Steel","HEAA140",128,140,4.3,6], + ["Steel","HEAA160",148,160,4.5,7], + ["Steel","HEAA180",167,180,5,7.5], + ["Steel","HEAA200",186,200,5.5,8], + ["Steel","HEAA220",205,220,6,8.5], + ["Steel","HEAA240",224,240,6.5,9], + ["Steel","HEAA260",244,260,6.5,9.5], + ["Steel","HEAA280",264,280,7,10], + ["Steel","HEAA300",283,300,7.5,10.5], + ["Steel","HEAA320",301,300,8,11], + ["Steel","HEAA340",320,300,8.5,11.5], + ["Steel","HEAA360",339,300,9,12], + ["Steel","HEAA400",378,300,9.5,13], + ["Steel","HEAA450",425,300,10,13.5], + ["Steel","HEAA500",472,300,10.5,14], + ["Steel","HEAA550",522,300,11.5,15], + ["Steel","HEAA600",571,300,12,15.5], + ["Steel","HEAA650",620,300,12.5,16], + ["Steel","HEAA700",670,300,13,17], + ["Steel","HEAA800",770,300,14,18], + ["Steel","HEAA900",870,300,15,20], + ["Steel","HEAA1000",970,300,16,21], + + # HEB + + ["Steel","HEB100",100,100,6,10], + ["Steel","HEB120",120,120,6.5,11], + ["Steel","HEB140",140,140,7,12], + ["Steel","HEB160",160,160,8,13], + ["Steel","HEB180",180,180,8.5,14], + ["Steel","HEB200",200,200,9,15], + ["Steel","HEB220",220,220,9.5,16], + ["Steel","HEB240",240,240,10,17], + ["Steel","HEB260",260,260,10,17.5], + ["Steel","HEB280",280,280,10.5,18], + ["Steel","HEB300",300,300,11,19], + ["Steel","HEB320",320,300,11.5,20.5], + ["Steel","HEB340",340,300,12,21.5], + ["Steel","HEB360",360,300,12.5,22.5], + ["Steel","HEB400",400,300,13.5,24], + ["Steel","HEB450",450,300,14,26], + ["Steel","HEB500",500,300,14.5,28], + ["Steel","HEB550",550,300,15,29], + ["Steel","HEB600",600,300,15.5,30], + ["Steel","HEB650",650,300,16,31], + ["Steel","HEB700",700,300,17,32], + ["Steel","HEB800",800,300,17.5,33], + ["Steel","HEB900",900,300,18.5,35], + ["Steel","HEB1000",1000,300,19,36], + + # HEM + + ["Steel","HEM160",180,166,14,23], + ["Steel","HEM180",200,186,14.5,24], + ["Steel","HEM200",220,206,15,25], + ["Steel","HEM220",240,226,15.5,26], + ["Steel","HEM240",270,248,18,32], + ["Steel","HEM260",290,268,18,32.5], + ["Steel","HEM280",310,288,18.5,33], + ["Steel","HEM300",340,310,21,39], + ["Steel","HEM320",359,309,21,40], + ["Steel","HEM340",377,309,21,40], + ["Steel","HEM360",395,308,21,40], + ["Steel","HEM400",432,307,21,40], + ["Steel","HEM450",478,307,21,40], + ["Steel","HEM500",524,306,21,40], + ["Steel","HEM550",572,306,21,40], + ["Steel","HEM600",620,305,21,40], + ["Steel","HEM650",668,305,21,40], + ["Steel","HEM700",716,304,21,40], + ["Steel","HEM800",814,303,21,40], + ["Steel","HEM900",910,302,21,40], + ["Steel","HEM1000",1008,302,21,40], + + # INP + + ["Steel","INP80",42,80,3.9,5.9], + ["Steel","INP100",50,100,4.5,6.8], + ["Steel","INP120",58,120,5.1,7.7], + ["Steel","INP140",66,140,5.7,8.6], + ["Steel","INP160",74,160,6.3,9.5], + ["Steel","INP180",82,180,6.9,10.4], + ["Steel","INP200",90,200,7.5,11.3], + ["Steel","INP220",98,220,8.1,12.2], + ["Steel","INP240",106,240,8.7,13.1], + ["Steel","INP260",113,260,9.4,14.1], + ["Steel","INP280",119,280,10.1,15.2], + ["Steel","INP300",125,300,10.8,16.2], + ["Steel","INP320",131,320,11.5,17.3], + ["Steel","INP340",137,340,12.2,18.3], + ["Steel","INP360",143,360,13,19.5], + ["Steel","INP380",149,380,13.7,20.5], + ["Steel","INP400",155,400,14.4,21.6], + + # IPE + + ["Steel","IPE100",100,55,4.1,5.7], + ["Steel","IPE120",120,64,4.4,6.3], + ["Steel","IPE140",140,73,4.7,6.9], + ["Steel","IPE160",160,82,5,7.4], + ["Steel","IPE180",180,91,5.3,8], + ["Steel","IPE200",200,100,5.6,8.5], + ["Steel","IPE220",220,110,5.9,9.2], + ["Steel","IPE240",240,120,6.2,9.8], + ["Steel","IPE270",270,135,6.6,10.2], + ["Steel","IPE300",300,150,7.1,10.7], + ["Steel","IPE330",330,160,7.5,11.5], + ["Steel","IPE360",360,170,8,12.7], + ["Steel","IPE400",400,180,8.6,13.5], + ["Steel","IPE450",450,190,9.4,14.6], + ["Steel","IPE500",500,200,10.2,16], + ["Steel","IPE550",550,210,11.1,17.2], + ["Steel","IPE600",600,220,12,19], + ["Steel","IPE750x137",753,263,11.5,17], + ["Steel","IPE750x147",753,265,13.2,17], + ["Steel","IPE750x161",758,266,13.8,19.3], + ["Steel","IPE750x173",762,267,14.4,21.6], + ["Steel","IPE750x185",766,267,14.9,23.6], + ["Steel","IPE750x196",770,268,15.6,25.4], + ["Steel","IPE750x210",775,268,16,28], + ["Steel","IPE750x222",778,269,17,29.5], + + # IPEA + + ["Steel","IPEA100",98,55,3.6,4.7], + ["Steel","IPEA120",118,64,3.8,5.1], + ["Steel","IPEA140",138,73,3.8,5.6], + ["Steel","IPEA160",157,82,4,5.9], + ["Steel","IPEA180",177,91,4.3,6.5], + ["Steel","IPEA200",197,100,4.5,7], + ["Steel","IPEA220",217,110,5,7.7], + ["Steel","IPEA240",237,120,5.2,8.3], + ["Steel","IPEA270",267,135,5.5,8.7], + ["Steel","IPEA300",297,150,6.1,9.2], + ["Steel","IPEA330",327,160,6.5,10], + ["Steel","IPEA360",357.6,170,6.6,11.5], + ["Steel","IPEA400",397,180,7,12], + ["Steel","IPEA450",447,190,7.6,13.1], + ["Steel","IPEA500",497,200,8.4,14.5], + ["Steel","IPEA550",547,210,9,15.7], + ["Steel","IPEA600",597,220,9.8,17.5], + + # IPEO + + ["Steel","IPEO180",182,89,6.4,9.5], + ["Steel","IPEO200",202,102,6.2,9.5], + ["Steel","IPEO220",222,112,6.6,10.2], + ["Steel","IPEO240",242,122,7,10.8], + ["Steel","IPEO270",274,136,7.5,12.2], + ["Steel","IPEO300",304,152,8,12.7], + ["Steel","IPEO330",334,162,8.5,13.5], + ["Steel","IPEO360",364,172,9.2,14.7], + ["Steel","IPEO400",404,182,9.7,15.5], + ["Steel","IPEO450",456,192,11,17.6], + ["Steel","IPEO500",506,202,12,19], + ["Steel","IPEO550",556,212,12.7,20.2], + ["Steel","IPEO600",610,224,15,24], + ["Steel","IPER140",142,72,5.3,7.8], + ["Steel","IPER160",162,81,5.6,8.5], + ["Steel","IPER180",183,92,6,9], + ["Steel","IPER200",204,98,6.6,10.5], + ["Steel","IPER220",225,108,6.7,11.8], + ["Steel","IPER240",245,118,7.5,12.3], + ["Steel","IPER270",276,133,7.1,13.1], + ["Steel","IPER300",306,147,8.5,13.7], + ["Steel","IPER330",336,158,9.2,14.5], + ["Steel","IPER360",366,168,9.9,16], + ["Steel","IPER400",407,178,10.6,17], + ["Steel","IPER450",458,188,11.3,18.6], + ["Steel","IPER500",508,198,12.6,20], + ["Steel","IPER550",560,210,14,22.2], + ["Steel","IPER600",608,218,14,23], + + # IPEV + + ["Steel","IPEV400",408,182,10.6,17.5], + ["Steel","IPEV450",460,194,12.4,19.6], + ["Steel","IPEV500",514,204,14.2,23], + ["Steel","IPEV550",566,216,17.1,25.2], + ["Steel","IPEV600",618,228,18,28] - ["Wood","1x2in",19,28], - ["Wood","1x3in",19,64], - ["Wood","1x4in",19,89], - ["Wood","1x6in",19,89], - ["Wood","1x8in",19,140], - ["Wood","1x10in",19,184], - ["Wood","1x12in",19,286], - - ["Wood","2x2in",38,38], - ["Wood","2x3in",38,64], - ["Wood","2x4in",38,89], - ["Wood","2x6in",38,140], - ["Wood","2x8in",38,184], - ["Wood","2x10in",38,235], - ["Wood","2x12in",38,286], - - ["Wood","4x4in",89,89], - ["Wood","4x6in",89,140], - ["Wood","6x6in",140,140], - ["Wood","8x8in",184,184], - - # IPE beams - - ["Steel","IPE90",46,80,3.8,5.2], - ["Steel","IPE100",55,100,4.1,5.7], - ["Steel","IPE120",64,120,4.4,6.3], - ["Steel","IPE140",73,140,4.7,6.9], - ["Steel","IPE160",82,160,5,7.4], - ["Steel","IPE180",91,180,5.3,8], - ["Steel","IPE200",100,200,5.6,8.5], - ["Steel","IPE220",110,220,5.9,9.2], - ["Steel","IPE240",120,240,6.2,9.8], - ["Steel","IPE270",135,270,6.6,10.2], - ["Steel","IPE300",150,300,7.1,10.7], - ["Steel","IPE330",160,330,7.5,11.5], - ["Steel","IPE360",170,360,8,12.7], - ["Steel","IPE400",180,400,8.6,13.5], - ["Steel","IPE450",190,450,9.4,14.6], - ["Steel","IPE500",200,500,10.2,16], - ["Steel","IPE550",210,550,11.1,17.2], - ["Steel","IPE600",220,600,12,19], - - # INP beams - - ["Steel","INP80",42,80,3.9,5.9], - ["Steel","INP100",50,100,4.5,6.8], - ["Steel","INP120",58,120,5.1,7.7], - ["Steel","INP140",66,140,5.7,8.6], - ["Steel","INP160",74,160,6.3,9.5], - ["Steel","INP180",82,180,6.9,10.4], - ["Steel","INP200",90,200,7.5,11.3], - ["Steel","INP220",98,220,8.1,12.2], - ["Steel","INP240",106,240,8.7,13.1], - ["Steel","INP260",113,260,9.4,14.1], - ["Steel","INP280",119,280,10.1,15.2], - ["Steel","INP300",125,300,10.8,16.2], - ["Steel","INP320",131,320,11.5,17.3], - ["Steel","INP340",137,340,12.2,18.3], - ["Steel","INP360",143,360,13,19.5], - ["Steel","INP380",149,380,13.7,20.5], - ["Steel","INP400",155,400,14.4,21.6] - - ] + ] def makeStructure(baseobj=None,length=0,width=0,height=0,name=str(translate("Arch","Structure"))): '''makeStructure([obj],[length],[width],[heigth],[swap]): creates a From 247ab055d453bdf65243d3c7bd35907b27d5cb0d Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 7 Sep 2013 20:00:27 -0300 Subject: [PATCH 2/3] Draft: grouped all properties into a Draft group --- src/Mod/Draft/Draft.py | 156 ++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 9b8161a3e..5b984b1d0 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -2475,9 +2475,9 @@ class _ViewProviderDraft: vobj.Proxy = self self.Object = vobj.Object vobj.addProperty("App::PropertyEnumeration","Pattern", - "Pattern","Defines a hatch pattern") + "Draft","Defines a hatch pattern") vobj.addProperty("App::PropertyFloat","PatternSize", - "Pattern","Sets the size of the pattern") + "Draft","Sets the size of the pattern") vobj.Pattern = [str(translate("draft","None"))]+svgpatterns().keys() vobj.PatternSize = 1 @@ -2607,17 +2607,17 @@ class _Dimension(_DraftObject): "The Draft Dimension object" def __init__(self, obj): _DraftObject.__init__(self,obj,"Dimension") - obj.addProperty("App::PropertyVector","Start","Base", + obj.addProperty("App::PropertyVector","Start","Draft", "Startpoint of dimension") - obj.addProperty("App::PropertyVector","End","Base", + obj.addProperty("App::PropertyVector","End","Draft", "Endpoint of dimension") - obj.addProperty("App::PropertyVector","Dimline","Base", + obj.addProperty("App::PropertyVector","Dimline","Draft", "Point through which the dimension line passes") - obj.addProperty("App::PropertyLink","Base","Base", + obj.addProperty("App::PropertyLink","Base","Draft", "The base object this dimension is linked to") - obj.addProperty("App::PropertyIntegerList","LinkedVertices","Base", + obj.addProperty("App::PropertyIntegerList","LinkedVertices","Draft", "The indices of the vertices from the base object to measure") - obj.addProperty("App::PropertyLength","Distance","Base","The measurement of this dimension") + obj.addProperty("App::PropertyLength","Distance","Draft","The measurement of this dimension") obj.Start = FreeCAD.Vector(0,0,0) obj.End = FreeCAD.Vector(1,0,0) obj.Dimline = FreeCAD.Vector(0,1,0) @@ -2632,13 +2632,13 @@ class _Dimension(_DraftObject): class _ViewProviderDimension(_ViewProviderDraft): "A View Provider for the Draft Dimension object" def __init__(self, obj): - obj.addProperty("App::PropertyLength","FontSize","Base","Font size") - obj.addProperty("App::PropertyString","FontName","Base","Font name") - obj.addProperty("App::PropertyLength","LineWidth","Base","Line width") - obj.addProperty("App::PropertyColor","LineColor","Base","Line color") - obj.addProperty("App::PropertyLength","ExtLines","Base","Ext lines") - obj.addProperty("App::PropertyVector","TextPosition","Base","The position of the text. Leave (0,0,0) for automatic position") - obj.addProperty("App::PropertyString","Override","Base","Text override. Use $dim to insert the dimension length") + obj.addProperty("App::PropertyLength","FontSize","Draft","Font size") + obj.addProperty("App::PropertyString","FontName","Draft","Font name") + obj.addProperty("App::PropertyLength","LineWidth","Draft","Line width") + obj.addProperty("App::PropertyColor","LineColor","Draft","Line color") + obj.addProperty("App::PropertyLength","ExtLines","Draft","Ext lines") + obj.addProperty("App::PropertyVector","TextPosition","Draft","The position of the text. Leave (0,0,0) for automatic position") + obj.addProperty("App::PropertyString","Override","Draft","Text override. Use $dim to insert the dimension length") obj.FontSize=getParam("textheight") obj.FontName=getParam("textfont") obj.ExtLines=0.3 @@ -2934,13 +2934,13 @@ class _AngularDimension(_DraftObject): "The Draft AngularDimension object" def __init__(self, obj): _DraftObject.__init__(self,obj,"AngularDimension") - obj.addProperty("App::PropertyAngle","FirstAngle","Base", + obj.addProperty("App::PropertyAngle","FirstAngle","Draft", "Start angle of the dimension") - obj.addProperty("App::PropertyAngle","LastAngle","Base", + obj.addProperty("App::PropertyAngle","LastAngle","Draft", "End angle of the dimension") - obj.addProperty("App::PropertyVector","Dimline","Base", + obj.addProperty("App::PropertyVector","Dimline","Draft", "Point through which the dimension line passes") - obj.addProperty("App::PropertyVector","Center","Base", + obj.addProperty("App::PropertyVector","Center","Draft", "The center point of this dimension") obj.FirstAngle = 0 obj.LastAngle = 90 @@ -2954,12 +2954,12 @@ class _AngularDimension(_DraftObject): class _ViewProviderAngularDimension(_ViewProviderDraft): "A View Provider for the Draft Angular Dimension object" def __init__(self, obj): - obj.addProperty("App::PropertyLength","FontSize","Base","Font size") - obj.addProperty("App::PropertyString","FontName","Base","Font name") - obj.addProperty("App::PropertyLength","LineWidth","Base","Line width") - obj.addProperty("App::PropertyColor","LineColor","Base","Line color") - obj.addProperty("App::PropertyVector","TextPosition","Base","The position of the text. Leave (0,0,0) for automatic position") - obj.addProperty("App::PropertyString","Override","Base","Text override. Use 'dim' to insert the dimension length") + obj.addProperty("App::PropertyLength","FontSize","Draft","Font size") + obj.addProperty("App::PropertyString","FontName","Draft","Font name") + obj.addProperty("App::PropertyLength","LineWidth","Draft","Line width") + obj.addProperty("App::PropertyColor","LineColor","Draft","Line color") + obj.addProperty("App::PropertyVector","TextPosition","Draft","The position of the text. Leave (0,0,0) for automatic position") + obj.addProperty("App::PropertyString","Override","Draft","Text override. Use 'dim' to insert the dimension length") obj.FontSize=getParam("textheight") obj.FontName=getParam("textfont") obj.Override = '' @@ -3142,10 +3142,10 @@ class _Rectangle(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"Rectangle") - obj.addProperty("App::PropertyDistance","Length","Base","Length of the rectangle") - obj.addProperty("App::PropertyDistance","Height","Base","Height of the rectange") - obj.addProperty("App::PropertyDistance","FilletRadius","Base","Radius to use to fillet the corners") - obj.addProperty("App::PropertyDistance","ChamferSize","Base","Size of the chamfer to give to the corners") + obj.addProperty("App::PropertyDistance","Length","Draft","Length of the rectangle") + obj.addProperty("App::PropertyDistance","Height","Draft","Height of the rectange") + obj.addProperty("App::PropertyDistance","FilletRadius","Draft","Radius to use to fillet the corners") + obj.addProperty("App::PropertyDistance","ChamferSize","Draft","Size of the chamfer to give to the corners") obj.Length=1 obj.Height=1 @@ -3183,18 +3183,18 @@ class _ViewProviderRectangle(_ViewProviderDraft): def __init__(self,vobj): _ViewProviderDraft.__init__(self,vobj) vobj.addProperty("App::PropertyFile","TextureImage", - "Pattern","Defines a texture image (overrides hatch patterns)") + "Draft","Defines a texture image (overrides hatch patterns)") class _Circle(_DraftObject): "The Circle object" def __init__(self, obj): _DraftObject.__init__(self,obj,"Circle") - obj.addProperty("App::PropertyAngle","FirstAngle","Base", + obj.addProperty("App::PropertyAngle","FirstAngle","Draft", "Start angle of the arc") - obj.addProperty("App::PropertyAngle","LastAngle","Base", + obj.addProperty("App::PropertyAngle","LastAngle","Draft", "End angle of the arc (for a full circle, give it same value as First Angle)") - obj.addProperty("App::PropertyDistance","Radius","Base", + obj.addProperty("App::PropertyDistance","Radius","Draft", "Radius of the circle") def execute(self, fp): @@ -3220,9 +3220,9 @@ class _Ellipse(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"Ellipse") - obj.addProperty("App::PropertyDistance","MinorRadius","Base", + obj.addProperty("App::PropertyDistance","MinorRadius","Draft", "The minor radius of the ellipse") - obj.addProperty("App::PropertyDistance","MajorRadius","Base", + obj.addProperty("App::PropertyDistance","MajorRadius","Draft", "The major radius of the ellipse") def execute(self, fp): @@ -3250,20 +3250,20 @@ class _Wire(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"Wire") - obj.addProperty("App::PropertyVectorList","Points","Base", + obj.addProperty("App::PropertyVectorList","Points","Draft", "The vertices of the wire") - obj.addProperty("App::PropertyBool","Closed","Base", + obj.addProperty("App::PropertyBool","Closed","Draft", "If the wire is closed or not") - obj.addProperty("App::PropertyLink","Base","Base", + obj.addProperty("App::PropertyLink","Base","Draft", "The base object is the wire is formed from 2 objects") - obj.addProperty("App::PropertyLink","Tool","Base", + obj.addProperty("App::PropertyLink","Tool","Draft", "The tool object is the wire is formed from 2 objects") - obj.addProperty("App::PropertyVector","Start","Base", + obj.addProperty("App::PropertyVector","Start","Draft", "The start point of this line") - obj.addProperty("App::PropertyVector","End","Base", + obj.addProperty("App::PropertyVector","End","Draft", "The end point of this line") - obj.addProperty("App::PropertyDistance","FilletRadius","Base","Radius to use to fillet the corners") - obj.addProperty("App::PropertyDistance","ChamferSize","Base","Size of the chamfer to give to the corners") + obj.addProperty("App::PropertyDistance","FilletRadius","Draft","Radius to use to fillet the corners") + obj.addProperty("App::PropertyDistance","ChamferSize","Draft","Size of the chamfer to give to the corners") obj.Closed = False def execute(self, fp): @@ -3368,7 +3368,7 @@ class _ViewProviderWire(_ViewProviderDraft): "A View Provider for the Wire object" def __init__(self, obj): _ViewProviderDraft.__init__(self,obj) - obj.addProperty("App::PropertyBool","EndArrow","Base", + obj.addProperty("App::PropertyBool","EndArrow","Draft", "Displays a dim symbol at the end of the wire") def attach(self, obj): @@ -3412,11 +3412,11 @@ class _Polygon(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"Polygon") - obj.addProperty("App::PropertyInteger","FacesNumber","Base","Number of faces") - obj.addProperty("App::PropertyDistance","Radius","Base","Radius of the control circle") - obj.addProperty("App::PropertyEnumeration","DrawMode","Base","How the polygon must be drawn from the control circle") - obj.addProperty("App::PropertyDistance","FilletRadius","Base","Radius to use to fillet the corners") - obj.addProperty("App::PropertyDistance","ChamferSize","Base","Size of the chamfer to give to the corners") + obj.addProperty("App::PropertyInteger","FacesNumber","Draft","Number of faces") + obj.addProperty("App::PropertyDistance","Radius","Draft","Radius of the control circle") + obj.addProperty("App::PropertyEnumeration","DrawMode","Draft","How the polygon must be drawn from the control circle") + obj.addProperty("App::PropertyDistance","FilletRadius","Draft","Radius to use to fillet the corners") + obj.addProperty("App::PropertyDistance","ChamferSize","Draft","Size of the chamfer to give to the corners") obj.DrawMode = ['inscribed','circumscribed'] obj.FacesNumber = 0 obj.Radius = 1 @@ -3513,9 +3513,9 @@ class _BSpline(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"BSpline") - obj.addProperty("App::PropertyVectorList","Points","Base", + obj.addProperty("App::PropertyVectorList","Points","Draft", "The points of the b-spline") - obj.addProperty("App::PropertyBool","Closed","Base", + obj.addProperty("App::PropertyBool","Closed","Draft", "If the b-spline is closed or not") obj.Closed = False @@ -3554,7 +3554,7 @@ class _Block(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"Block") - obj.addProperty("App::PropertyLinkList","Components","Base", + obj.addProperty("App::PropertyLinkList","Components","Draft", "The components of this block") def execute(self, fp): @@ -3579,15 +3579,15 @@ class _Shape2DView(_DraftObject): "The Shape2DView object" def __init__(self,obj): - obj.addProperty("App::PropertyLink","Base","Base", + obj.addProperty("App::PropertyLink","Base","Draft", "The base object this 2D view must represent") - obj.addProperty("App::PropertyVector","Projection","Base", + obj.addProperty("App::PropertyVector","Projection","Draft", "The projection vector of this object") - obj.addProperty("App::PropertyEnumeration","ProjectionMode","Base", + obj.addProperty("App::PropertyEnumeration","ProjectionMode","Draft", "The way the viewed object must be projected") - obj.addProperty("App::PropertyIntegerList","FaceNumbers","Base", + obj.addProperty("App::PropertyIntegerList","FaceNumbers","Draft", "The indices of the faces to be projected in Individual Faces mode") - obj.addProperty("App::PropertyBool","HiddenLines","Base", + obj.addProperty("App::PropertyBool","HiddenLines","Draft", "Show hidden lines") obj.Projection = Vector(0,0,1) obj.ProjectionMode = ["Solid","Individual Faces","Cutlines"] @@ -3677,29 +3677,29 @@ class _Array(_DraftObject): def __init__(self,obj): _DraftObject.__init__(self,obj,"Array") - obj.addProperty("App::PropertyLink","Base","Base", + obj.addProperty("App::PropertyLink","Base","Draft", "The base object that must be duplicated") - obj.addProperty("App::PropertyEnumeration","ArrayType","Base", + obj.addProperty("App::PropertyEnumeration","ArrayType","Draft", "The type of array to create") - obj.addProperty("App::PropertyVector","Axis","Base", + obj.addProperty("App::PropertyVector","Axis","Draft", "The axis direction") - obj.addProperty("App::PropertyInteger","NumberX","Base", + obj.addProperty("App::PropertyInteger","NumberX","Draft", "Number of copies in X direction") - obj.addProperty("App::PropertyInteger","NumberY","Base", + obj.addProperty("App::PropertyInteger","NumberY","Draft", "Number of copies in Y direction") - obj.addProperty("App::PropertyInteger","NumberZ","Base", + obj.addProperty("App::PropertyInteger","NumberZ","Draft", "Number of copies in Z direction") - obj.addProperty("App::PropertyInteger","NumberPolar","Base", + obj.addProperty("App::PropertyInteger","NumberPolar","Draft", "Number of copies") - obj.addProperty("App::PropertyVector","IntervalX","Base", + obj.addProperty("App::PropertyVector","IntervalX","Draft", "Distance and orientation of intervals in X direction") - obj.addProperty("App::PropertyVector","IntervalY","Base", + obj.addProperty("App::PropertyVector","IntervalY","Draft", "Distance and orientation of intervals in Y direction") - obj.addProperty("App::PropertyVector","IntervalZ","Base", + obj.addProperty("App::PropertyVector","IntervalZ","Draft", "Distance and orientation of intervals in Z direction") - obj.addProperty("App::PropertyVector","Center","Base", + obj.addProperty("App::PropertyVector","Center","Draft", "Center point") - obj.addProperty("App::PropertyAngle","Angle","Base", + obj.addProperty("App::PropertyAngle","Angle","Draft", "Angle to cover with copies") obj.ArrayType = ['ortho','polar'] obj.NumberX = 1 @@ -3803,9 +3803,9 @@ class _Point(_DraftObject): "The Draft Point object" def __init__(self, obj,x,y,z): _DraftObject.__init__(self,obj,"Point") - obj.addProperty("App::PropertyFloat","X","Point","Location").X = x - obj.addProperty("App::PropertyFloat","Y","Point","Location").Y = y - obj.addProperty("App::PropertyFloat","Z","Point","Location").Z = z + obj.addProperty("App::PropertyFloat","X","Draft","Location").X = x + obj.addProperty("App::PropertyFloat","Y","Draft","Location").Y = y + obj.addProperty("App::PropertyFloat","Z","Draft","Location").Z = z mode = 2 obj.setEditorMode('Placement',mode) @@ -3845,9 +3845,9 @@ class _Clone(_DraftObject): def __init__(self,obj): _DraftObject.__init__(self,obj,"Clone") - obj.addProperty("App::PropertyLinkList","Objects","Base", + obj.addProperty("App::PropertyLinkList","Objects","Draft", "The objects included in this scale object") - obj.addProperty("App::PropertyVector","Scale","Base", + obj.addProperty("App::PropertyVector","Scale","Draft", "The scale vector of this object") obj.Scale = Vector(1,1,1) @@ -3893,10 +3893,10 @@ class _ShapeString(_DraftObject): def __init__(self, obj): _DraftObject.__init__(self,obj,"ShapeString") - obj.addProperty("App::PropertyString","String","Base","Text string") - obj.addProperty("App::PropertyFile","FontFile","Base","Font file name") - obj.addProperty("App::PropertyFloat","Size","Base","Height of text") - obj.addProperty("App::PropertyInteger","Tracking","Base", + obj.addProperty("App::PropertyString","String","Draft","Text string") + obj.addProperty("App::PropertyFile","FontFile","Draft","Font file name") + obj.addProperty("App::PropertyFloat","Size","Draft","Height of text") + obj.addProperty("App::PropertyInteger","Tracking","Draft", "Inter-character spacing") def execute(self, fp): From 738b75043bdd4ee640e5e6b97755208e104f0467 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 7 Sep 2013 20:00:41 -0300 Subject: [PATCH 3/3] Arch: grouped all properties into an Arch group --- src/Mod/Arch/ArchAxis.py | 10 +++++----- src/Mod/Arch/ArchComponent.py | 8 ++++---- src/Mod/Arch/ArchFloor.py | 4 ++-- src/Mod/Arch/ArchSectionPlane.py | 4 ++-- src/Mod/Arch/ArchSite.py | 2 +- src/Mod/Arch/ArchSpace.py | 4 ++-- src/Mod/Arch/ArchStructure.py | 14 +++++++------- src/Mod/Arch/ArchWall.py | 14 +++++++------- src/Mod/Arch/ArchWindow.py | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py index 0b86cd657..b4def8b85 100644 --- a/src/Mod/Arch/ArchAxis.py +++ b/src/Mod/Arch/ArchAxis.py @@ -71,9 +71,9 @@ class _CommandAxis: class _Axis: "The Axis object" def __init__(self,obj): - obj.addProperty("App::PropertyFloatList","Distances","Base", str(translate("Arch","The intervals between axes"))) - obj.addProperty("App::PropertyFloatList","Angles","Base", str(translate("Arch","The angles of each axis"))) - obj.addProperty("App::PropertyFloat","Length","Base", str(translate("Arch","The length of the axes"))) + obj.addProperty("App::PropertyFloatList","Distances","Arch", str(translate("Arch","The intervals between axes"))) + obj.addProperty("App::PropertyFloatList","Angles","Arch", str(translate("Arch","The angles of each axis"))) + obj.addProperty("App::PropertyFloat","Length","Arch", str(translate("Arch","The length of the axes"))) self.Type = "Axis" obj.Length=1.0 obj.Proxy = self @@ -113,8 +113,8 @@ class _ViewProviderAxis: "A View Provider for the Axis object" def __init__(self,vobj): - vobj.addProperty("App::PropertyLength","BubbleSize","Base", str(translate("Arch","The size of the axis bubbles"))) - vobj.addProperty("App::PropertyEnumeration","NumerationStyle","Base", str(translate("Arch","The numeration style"))) + vobj.addProperty("App::PropertyLength","BubbleSize","Arch", str(translate("Arch","The size of the axis bubbles"))) + vobj.addProperty("App::PropertyEnumeration","NumerationStyle","Arch", str(translate("Arch","The numeration style"))) vobj.NumerationStyle = ["1,2,3","01,02,03","001,002,003","A,B,C","a,b,c","I,II,III","L0,L1,L2"] vobj.Proxy = self vobj.BubbleSize = .1 diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py index 68e3eb110..7d2ea6b09 100644 --- a/src/Mod/Arch/ArchComponent.py +++ b/src/Mod/Arch/ArchComponent.py @@ -275,13 +275,13 @@ class ComponentTaskPanel: class Component: "The default Arch Component object" def __init__(self,obj): - obj.addProperty("App::PropertyLink","Base","Base", + obj.addProperty("App::PropertyLink","Base","Arch", "The base object this component is built upon") - obj.addProperty("App::PropertyLinkList","Additions","Base", + obj.addProperty("App::PropertyLinkList","Additions","Arch", "Other shapes that are appended to this object") - obj.addProperty("App::PropertyLinkList","Subtractions","Base", + obj.addProperty("App::PropertyLinkList","Subtractions","Arch", "Other shapes that are subtracted from this object") - obj.addProperty("App::PropertyLinkList","Fixtures","Base", + obj.addProperty("App::PropertyLinkList","Fixtures","Arch", "Shapes or Meshes that are appended to this object without modifying its geometry") obj.Proxy = self self.Type = "Component" diff --git a/src/Mod/Arch/ArchFloor.py b/src/Mod/Arch/ArchFloor.py index bdbcb8b59..df0f488c9 100644 --- a/src/Mod/Arch/ArchFloor.py +++ b/src/Mod/Arch/ArchFloor.py @@ -76,9 +76,9 @@ class _CommandFloor: class _Floor: "The Floor object" def __init__(self,obj): - obj.addProperty("App::PropertyLength","Height","Base", + obj.addProperty("App::PropertyLength","Height","Arch", str(translate("Arch","The height of this floor"))) - obj.addProperty("App::PropertyPlacement","Placement","Base", + obj.addProperty("App::PropertyPlacement","Placement","Arch", str(translate("Arch","The placement of this group"))) self.Type = "Floor" obj.Proxy = self diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py index ebb4549ba..b60e7275d 100644 --- a/src/Mod/Arch/ArchSectionPlane.py +++ b/src/Mod/Arch/ArchSectionPlane.py @@ -92,7 +92,7 @@ class _SectionPlane: "A section plane object" def __init__(self,obj): obj.Proxy = self - obj.addProperty("App::PropertyLinkList","Objects","Base", + obj.addProperty("App::PropertyLinkList","Objects","Arch", str(translate("Arch","The objects that must be considered by this section plane. Empty means all document"))) self.Type = "SectionPlane" @@ -120,7 +120,7 @@ class _SectionPlane: class _ViewProviderSectionPlane(ArchComponent.ViewProviderComponent): "A View Provider for Section Planes" def __init__(self,vobj): - vobj.addProperty("App::PropertyLength","DisplaySize","Base", + vobj.addProperty("App::PropertyLength","DisplaySize","Arch", str(translate("Arch","The display size of this section plane"))) vobj.DisplaySize = 1 vobj.Transparency = 85 diff --git a/src/Mod/Arch/ArchSite.py b/src/Mod/Arch/ArchSite.py index 0626054d0..3d76422df 100644 --- a/src/Mod/Arch/ArchSite.py +++ b/src/Mod/Arch/ArchSite.py @@ -80,7 +80,7 @@ class _Site(ArchFloor._Floor): "The Site object" def __init__(self,obj): ArchFloor._Floor.__init__(self,obj) - obj.addProperty("App::PropertyLink","Terrain","Base", + obj.addProperty("App::PropertyLink","Terrain","Arch", str(translate("Arch","The terrain of this site"))) self.Type = "Site" obj.setEditorMode('Height',2) diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py index d3161e555..047716444 100644 --- a/src/Mod/Arch/ArchSpace.py +++ b/src/Mod/Arch/ArchSpace.py @@ -90,9 +90,9 @@ class _Space(ArchComponent.Component): "A space object" def __init__(self,obj): obj.Proxy = self - obj.addProperty("App::PropertyLink","Base","Base", + obj.addProperty("App::PropertyLink","Base","Arch", str(translate("Arch","A base shape defining this space"))) - obj.addProperty("App::PropertyLinkSubList","Boundaries","Base", + obj.addProperty("App::PropertyLinkSubList","Boundaries","Arch", str(translate("Arch","The objects that make the boundaries of this space object"))) self.Type = "Space" diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index ad8a87316..8e5d8e975 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -505,19 +505,19 @@ class _Structure(ArchComponent.Component): "The Structure object" def __init__(self,obj): ArchComponent.Component.__init__(self,obj) - obj.addProperty("App::PropertyLink","Tool","Base", + obj.addProperty("App::PropertyLink","Tool","Arch", "An optional extrusion path for this element") - obj.addProperty("App::PropertyLength","Length","Base", + obj.addProperty("App::PropertyLength","Length","Arch", str(translate("Arch","The length of this element, if not based on a profile"))) - obj.addProperty("App::PropertyLength","Width","Base", + obj.addProperty("App::PropertyLength","Width","Arch", str(translate("Arch","The width of this element, if not based on a profile"))) - obj.addProperty("App::PropertyLength","Height","Base", + obj.addProperty("App::PropertyLength","Height","Arch", str(translate("Arch","The height or extrusion depth of this element. Keep 0 for automatic"))) - obj.addProperty("App::PropertyLinkList","Axes","Base", + obj.addProperty("App::PropertyLinkList","Axes","Arch", str(translate("Arch","Axes systems this structure is built on"))) - obj.addProperty("App::PropertyVector","Normal","Base", + obj.addProperty("App::PropertyVector","Normal","Arch", str(translate("Arch","The normal extrusion direction of this object (keep (0,0,0) for automatic normal)"))) - obj.addProperty("App::PropertyIntegerList","Exclude","Base", + obj.addProperty("App::PropertyIntegerList","Exclude","Arch", str(translate("Arch","The element numbers to exclude when this structure is based on axes"))) self.Type = "Structure" obj.Length = 1 diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py index ac625c589..8a0adfb7b 100644 --- a/src/Mod/Arch/ArchWall.py +++ b/src/Mod/Arch/ArchWall.py @@ -350,19 +350,19 @@ class _Wall(ArchComponent.Component): "The Wall object" def __init__(self,obj): ArchComponent.Component.__init__(self,obj) - obj.addProperty("App::PropertyLength","Length","Base", + obj.addProperty("App::PropertyLength","Length","Arch", str(translate("Arch","The length of this wall. Not used if this wall is based on an underlying object"))) - obj.addProperty("App::PropertyLength","Width","Base", + obj.addProperty("App::PropertyLength","Width","Arch", str(translate("Arch","The width of this wall. Not used if this wall is based on a face"))) - obj.addProperty("App::PropertyLength","Height","Base", + obj.addProperty("App::PropertyLength","Height","Arch", str(translate("Arch","The height of this wall. Keep 0 for automatic. Not used if this wall is based on a solid"))) - obj.addProperty("App::PropertyEnumeration","Align","Base", + obj.addProperty("App::PropertyEnumeration","Align","Arch", str(translate("Arch","The alignment of this wall on its base object, if applicable"))) - obj.addProperty("App::PropertyVector","Normal","Base", + obj.addProperty("App::PropertyVector","Normal","Arch", str(translate("Arch","The normal extrusion direction of this object (keep (0,0,0) for automatic normal)"))) - obj.addProperty("App::PropertyBool","ForceWire","Base", + obj.addProperty("App::PropertyBool","ForceWire","Arch", str(translate("Arch","If True, if this wall is based on a face, it will use its border wire as trace, and disconsider the face."))) - obj.addProperty("App::PropertyInteger","Face","Base", + obj.addProperty("App::PropertyInteger","Face","Arch", str(translate("Arch","The face number of the base object used to build this wall"))) obj.Align = ['Left','Right','Center'] obj.ForceWire = False diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py index ab58b74a9..e9731c9fa 100644 --- a/src/Mod/Arch/ArchWindow.py +++ b/src/Mod/Arch/ArchWindow.py @@ -115,7 +115,7 @@ class _Window(ArchComponent.Component): "The Window object" def __init__(self,obj): ArchComponent.Component.__init__(self,obj) - obj.addProperty("App::PropertyStringList","WindowParts","Base", + obj.addProperty("App::PropertyStringList","WindowParts","Arch", str(translate("Arch","the components of this window"))) self.Type = "Window" obj.Proxy = self