kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

BIM+Draft: Bring back human figure

Browse Source 
* For the human figure attached to the Draft grid a hard-coded point list is used (instead deriving the points from human figure.brep). This is more efficient and avoids a dependency on the BIM WB.
* The default for the human figure preference of the grid was changed to false. And the tooltip adjusted.
This commit is contained in:
Roy-043
2024-11-21 14:11:54 +01:00
committed by Yorik van Havre
parent 7ff12bace9
commit af71f75b9a
5 changed files with 1644 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/BIM/Resources/create_qrc.py
View File

@@ -3,14 +3,13 @@
import os
txt = "<RCC>\n <qresource>\n"
cdir = os.path.dirname(__file__)
for subdir in ["icons/IFC", "icons", "ui", "translations"]:
for subdir in ["geometry", "icons", "icons/IFC", "translations", "ui"]:
subpath = os.path.join(cdir, subdir)
for f in sorted(os.listdir(subpath)):
if f not in ["Arch.ts", "BIM.ts", "IFC"]:
ext = os.path.splitext(f)[1]
if ext.lower() in [".qm", ".svg", ".ui", ".png"]:
if ext.lower() in [".qm", ".svg", ".ui", ".png", "brep"]:
txt += " <file>" + subdir + "/" + f + "</file>\n"
txt += " </qresource>\n</RCC>\n"
with open(os.path.join(cdir, "Arch.qrc"), "w") as resfile:
resfile.write(txt)

1595
src/Mod/BIM/Resources/geometry/HumanFigure.brep Normal file
View File

File diff suppressed because one or more lines are too long

30
src/Mod/BIM/bimcommands/BimProjectManager.py
View File

@@ -130,16 +130,11 @@ class BIM_ProjectManager:
).Value
human = None
if self.form.addHumanFigure.isChecked():
# TODO ; fix loading of human shape
humanpath = os.path.join(
os.path.dirname(__file__), "geometry", "human figure.brep"
)
if os.path.exists(humanpath):
humanshape = Part.Shape()
humanshape.importBrep(humanpath)
human = FreeCAD.ActiveDocument.addObject("Part::Feature", "Human")
human.Shape = humanshape
human.Placement.move(FreeCAD.Vector(500, 500, 0))
humanshape = Part.Shape()
humanshape.importBrep(":/geometry/HumanFigure.brep")
human = FreeCAD.ActiveDocument.addObject("Part::Feature", "Human")
human.Shape = humanshape
human.Placement.move(FreeCAD.Vector(500, 500, 0))
if self.form.groupBuilding.isChecked():
building = Arch.makeBuilding()
if site:
@@ -714,19 +709,4 @@ class BIM_ProjectManager:
self.reject()
def getHuman(loc=None):
"""Return a list of points defining a human figure,
optionally translated to a given location"""
import Part
humanshape = Part.Shape()
humanpath = os.path.join(os.path.dirname(__file__), "geometry", "human figure.brep")
humanshape.importBrep(humanpath)
pts = [v.Point for v in humanshape.Vertexes]
if loc:
pts = [p.add(loc) for p in pts]
return pts
FreeCADGui.addCommand("BIM_ProjectManager", BIM_ProjectManager())

5
src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
View File

@@ -90,14 +90,13 @@ showing the main square size in the bottom left corner</string>
</property>
<property name="toolTip">
<string>If checked, the outline of a human figure is displayed at the bottom left
corner of the grid. Only effective if the BIM workbench is installed and
&quot;Show grid border&quot; is enabled.</string>
corner of the grid. Only effective if &quot;Show grid border&quot; is enabled.</string>
</property>
<property name="text">
<string>Show human figure</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>gridShowHuman</cstring>

50
src/Mod/Draft/draftguitools/gui_trackers.py
View File

@@ -1214,10 +1214,45 @@ class gridTracker(Tracker):
blue = col
return col, red, green, blue, gtrans
def get_human_figure(self, loc=None):
"""Return a list of points defining a human figure,
optionally translated to a given location.
Based on "HumanFigure.brep" from the BIM Workbench.
"""
pts = [
Vector (131.2, 0.0, 175.8), Vector (135.7, 0.0, 211.7), Vector (142.1, 0.0, 229.3),
Vector (154.0, 0.0, 276.3), Vector (163.6, 0.0, 333.4), Vector (173.8, 0.0, 411.5),
Vector (186.0, 0.0, 491.7), Vector (200.2, 0.0, 591.8), Vector (215.4, 0.0, 714.8),
Vector (224.1, 0.0, 650.0), Vector (234.1, 0.0, 575.8), Vector (251.9, 0.0, 425.5),
Vector (240.8, 0.0, 273.3), Vector (235.9, 0.0, 243.2), Vector (197.3, 0.0, 81.7),
Vector (188.8, 0.0, 37.6), Vector (195.1, 0.0, 0.0), Vector (278.8, 0.0, 0.0),
Vector (294.5, 0.0, 121.0), Vector (308.4, 0.0, 184.3), Vector (318.1, 0.0, 225.4),
Vector (322.0, 0.0, 235.2), Vector (340.1, 0.0, 283.5), Vector (349.0, 0.0, 341.4),
Vector (354.2, 0.0, 523.7), Vector (383.1, 0.0, 719.7), Vector (399.6, 0.0, 820.3),
Vector (381.2, 0.0, 1029.6), Vector (385.6, 0.0, 1164.0), Vector (390.1, 0.0, 1184.6),
Vector (398.3, 0.0, 1201.9), Vector (430.2, 0.0, 1273.1), Vector (438.2, 0.0, 1321.2),
Vector (441.3, 0.0, 1368.2), Vector (428.1, 0.0, 1405.3), Vector (395.0, 0.0, 1424.3),
Vector (365.5, 0.0, 1446.6), Vector (349.8, 0.0, 1460.2), Vector (345.6, 0.0, 1476.7),
Vector (337.9, 0.0, 1570.3), Vector (332.8, 0.0, 1624.7), Vector (322.2, 0.0, 1666.9),
Vector (216.2, 0.0, 1680.2), Vector (163.5, 0.0, 1559.1), Vector (179.8, 0.0, 1475.5),
Vector (195.6, 0.0, 1459.9), Vector (193.1, 0.0, 1447.8), Vector (171.0, 0.0, 1429.4),
Vector (132.3, 0.0, 1399.8), Vector (96.8, 0.0, 1374.7), Vector (74.0, 0.0, 1275.1),
Vector (46.2, 0.0, 1095.6), Vector (38.0, 0.0, 1041.5), Vector (25.2, 0.0, 958.5),
Vector (15.9, 0.0, 889.7), Vector (2.5, 0.0, 842.1), Vector (-5.8, 0.0, 785.4),
Vector (15.8, 0.0, 755.1), Vector (38.0, 0.0, 750.4), Vector (45.0, 0.0, 755.4),
Vector (53.1, 0.0, 736.1), Vector (76.4, 0.0, 572.2), Vector (83.6, 0.0, 512.0),
Vector (81.3, 0.0, 499.0), Vector (74.0, 0.0, 460.9), Vector (61.9, 0.0, 363.4),
Vector (53.4, 0.0, 269.3), Vector (44.5, 0.0, 179.7), Vector (25.6, 0.0, 121.6),
Vector (0.6, 0.0, 76.5), Vector (-23.7, 0.0, 54.5), Vector (-43.8, 0.0, 33.5),
Vector (-25.6, 0.0, 0.0), Vector (117.9, 0.0, 0.0), Vector (131.2, 0.0, 175.8)
]
if loc:
pts = [p.add(loc) for p in pts]
return pts
def displayHumanFigure(self, wp):
""" Display the human figure at the grid corner.
The silhouette is displayed only if:
- BIM Workbench is available;
- preference BaseApp/Preferences/Mod/Draft/gridBorder is True;
- preference BaseApp/Preferences/Mod/Draft/gridShowHuman is True;
- the working plane normal is vertical.
@@ -1229,15 +1264,10 @@ class gridTracker(Tracker):
if params.get_param("gridBorder") \
and params.get_param("gridShowHuman") \
and wp.axis.getAngle(FreeCAD.Vector(0,0,1)) < 0.001:
try:
import BimProjectManager
loc = FreeCAD.Vector(-bound+self.space/2,-bound+self.space/2,0)
hpts = BimProjectManager.getHuman(loc)
pts.extend([tuple(p) for p in hpts])
pidx.append(len(hpts))
except Exception:
# BIM not installed
return
loc = FreeCAD.Vector(-bound+self.space/2,-bound+self.space/2,0)
hpts = self.get_human_figure(loc)
pts.extend([tuple(p) for p in hpts])
pidx.append(len(hpts))
self.human.numVertices.deleteValues(0)
self.coords_human.point.setValues(pts)
self.human.numVertices.setValues(pidx)