suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arch : Added mid-point to Frame Basepoint - fixes #1892

Browse Source
This commit is contained in:
wood galaxy 2015-01-06 02:09:43 +01:00 committed by Yorik van Havre
parent fb19ea5089
commit 641c295d44
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Arch/ArchFrame.py
View File

@ -84,7 +84,7 @@ class _Frame(ArchComponent.Component):
obj.addProperty("App::PropertyLink","Profile","Arch","The profile used to build this frame") obj.addProperty("App::PropertyLink","Profile","Arch","The profile used to build this frame")
obj.addProperty("App::PropertyBool","Align","Arch","Specifies if the profile must be aligned with the extrusion wires") obj.addProperty("App::PropertyBool","Align","Arch","Specifies if the profile must be aligned with the extrusion wires")
obj.addProperty("App::PropertyVector","Offset","Arch","An offset vector between the base sketch and the frame") obj.addProperty("App::PropertyVector","Offset","Arch","An offset vector between the base sketch and the frame")
obj.addProperty("App::PropertyInteger","BasePoint","Arch","The point of the profile by which the path passes.") obj.addProperty("App::PropertyInteger","BasePoint","Arch","Crossing point of the path on the profile.")
obj.addProperty("App::PropertyAngle","Rotation","Arch","The rotation of the profile around its extrusion axis") obj.addProperty("App::PropertyAngle","Rotation","Arch","The rotation of the profile around its extrusion axis")
self.Type = "Frame" self.Type = "Frame"
obj.Role = Roles obj.Role = Roles
@ -135,11 +135,16 @@ class _Frame(ArchComponent.Component):
profile = baseprofile.copy() profile = baseprofile.copy()
#basepoint = profile.Placement.Base #basepoint = profile.Placement.Base
if hasattr(obj,"BasePoint"): if hasattr(obj,"BasePoint"):
if obj.BasePoint == 0 : edges = DraftGeomUtils.sortEdges(profile.Edges)
basepoint = profile.CenterOfMass basepointliste = [profile.CenterOfMass]
else : for edge in edges:
# TODO add mid point of edges and make an ordered list point, mid point , ... basepointliste.append(DraftGeomUtils.findMidpoint(edge))
basepoint = profile.Vertexes[obj.BasePoint - 1].Point basepointliste.append(edge.Vertexes[-1].Point)
try:
basepoint = basepointliste[obj.BasePoint]
except IndexError:
FreeCAD.Console.PrintMessage(translate("Arch","There is no more cross point.\n"))
basepoint = basepointliste[0]
else : else :
basepoint = profile.CenterOfMass basepoint = profile.CenterOfMass
profile.translate(bpoint.sub(basepoint)) profile.translate(bpoint.sub(basepoint))