Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 09:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix miscalculated stair lengths in some cases (f52aafd)

Browse Source 
`get_active_stair_calculated_params` wasn't updated when zero tread runs support was added and it's still was relying on a convention that `0.0` custom tread run = no custom tread run.
This commit is contained in:
Andrej730
2025-11-05 19:37:24 +05:00
parent 0c171a457b
commit 3bed9262e5
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/tool/model.py
+17 -11
View File
@@ -1333,9 +1333,12 @@ class Model(bonsai.core.tool.Model):
return bool((DoorData.is_loaded or not DoorData.load()) and DoorData.data["pset_data"])
CustomTreadRunType = Union[tuple[float, float], tuple[None, None]]
@classmethod
def get_active_stair_calculated_params(cls, pset_data: Optional[dict[str, Any]] = None) -> dict[str, Any]:
props = bpy.context.active_object.BIMStairProperties
assert (obj := bpy.context.active_object)
props = tool.Model.get_stair_props(obj)
if props.is_editing:
si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
@@ -1346,15 +1349,18 @@ class Model(bonsai.core.tool.Model):
last_tread_run = props.custom_first_last_tread_run[1] / si_conversion
nosing_length = props.nosing_length / si_conversion
else:
number_of_treads = pset_data["number_of_treads"]
height = pset_data["height"]
tread_run = pset_data["tread_run"]
assert pset_data
number_of_treads: int = pset_data["number_of_treads"]
height: float = pset_data["height"]
tread_run: float = pset_data["tread_run"]
# use .get to not break the old .ifc models
custom_first_last_tread_run = pset_data.get("custom_first_last_tread_run", (0, 0))
custom_first_last_tread_run: tool.Model.CustomTreadRunType = pset_data.get(
"custom_first_last_tread_run", (0, 0)
)
first_tread_run, last_tread_run = custom_first_last_tread_run
nosing_length = pset_data.get("nosing_length", 0)
calculated_params = {}
calculated_params: dict[str, Any] = {}
number_of_rises = number_of_treads + 1
calculated_params["Number of Risers"] = number_of_rises
calculated_params["Tread Rise"] = round(height / number_of_rises, 5)
@@ -1362,15 +1368,15 @@ class Model(bonsai.core.tool.Model):
# calculate stair length
# Start with all treads using default tread_run
n_default_tread_runs = number_of_rises
length = 0
length = 0.0
# If first tread has custom width (non-zero), use it instead of default
if first_tread_run != 0:
# If first tread has custom width (non-None), use it instead of default.
if first_tread_run is not None:
n_default_tread_runs -= 1
length += first_tread_run
# If last tread has custom width (non-zero), use it instead of default
if last_tread_run != 0:
# If last tread has custom width (non-None), use it instead of default
if last_tread_run is not None:
n_default_tread_runs -= 1
length += last_tread_run
src/bonsai/test/tool/test_model.py
+1 -1
View File
@@ -160,7 +160,7 @@ class TestStairCalculatedParams(NewFile):
"number_of_treads": 3,
"height": 1.0,
"tread_run": 0.3,
"custom_first_last_tread_run": (0.0, 0.0),
"custom_first_last_tread_run": (None, None),
"nosing_length": 0.0,
}
calculated_data_base = {