mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-16 13:46:54 +00:00
95a31b49ec
Walls gain in-viewport parametric editing matching the door/window/stair
UX: drag handles for length, height, slope (x-angle), layer baseline
cycle, plus cursor-anchored quality-of-life operators (split at cursor,
extend to cursor, extend height, rotate 90, toggle openings) and
two-object state-machine gizmos (unjoin / merge / join-corner /
extend-to-wall / extend-vertically / add-opening).
Wall enters tool.Parametric.EDIT_TYPES, so save-time auto-commit,
GizmoPreferencesWall registration, and the in-progress-edit predicates
all light up automatically through the registry plumbing landed two
commits back.
The three-layer commit model (drag -> BIMWallProperties -> bmesh
preview -> Finish -> single ifc.run) means dragging a handle through
hundreds of intermediate values produces zero extra IFC entities. A
no-op enable->finish round-trip is byte-identical. The snapshot diff
in FinishEditingWall skips unchanged params.
_commit_active_wall_edit_if_any ensures cursor-anchored operators see
committed geometry, not the draft preview box.
Also lands the `prompt_auto_commit_parametric_edits` BoolProperty on
BIM_ADDON_preferences (consumed by the auto-commit dialog landed in
the framework commit) and refactors
`draw_{door,window,stair}_gizmo_parameters` into a shared
`_draw_parametric_gizmo_parameters` helper that the new
`draw_wall_gizmo_parameters` reuses. This commit and the framework
commit are stacked - the framework commit references the BoolProperty
defined here, so they must land together.
Tests cover pure math (core/test_model.py), DimensionGizmoConfig text
formatter, GizmoWallExtendVertically.poll() preconditions, and the
refresh_post_commit cache-invalidation regression. BDD scenarios in
model.feature cover the edit triad, auto-commit on save, and the
two-object gizmos. Documentation added to creating_walls.rst.
Generated with the assistance of an AI coding tool.
182 lines
6.1 KiB
Python
182 lines
6.1 KiB
Python
# Bonsai - OpenBIM Blender Add-on
|
|
# Copyright (C) 2026
|
|
#
|
|
# This file is part of Bonsai.
|
|
#
|
|
# Bonsai is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Bonsai is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Bonsai. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
# This file was generated with the assistance of an AI coding tool.
|
|
|
|
"""Unit tests for the poll() preconditions of wall billboarding gizmo groups.
|
|
|
|
These tests patch ``tool.Blender`` / ``tool.Ifc`` / ``tool.Model`` so the poll
|
|
logic can be exercised without a real IFC fixture. Each test pins one of the
|
|
gates ``poll()`` walks, so any silent regression in the gate order or in the
|
|
LAYER3-active / LAYER2-other contract is caught by a dedicated assertion."""
|
|
|
|
import types
|
|
from types import SimpleNamespace
|
|
from unittest.mock import patch
|
|
|
|
import bpy
|
|
import pytest
|
|
|
|
pytestmark = pytest.mark.wall
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _require_real_bpy():
|
|
if not isinstance(bpy, types.ModuleType) or hasattr(bpy, "_mock_name"):
|
|
pytest.skip("requires real Blender (bpy is mocked or absent)")
|
|
|
|
|
|
def _make_context(active, selected):
|
|
"""Build a minimal ``context`` stub with the two attributes ``poll()`` reads."""
|
|
return SimpleNamespace(active_object=active, selected_objects=list(selected))
|
|
|
|
|
|
def _patch_tools(prefs_on, selected, active_element, other_element, active_usage, other_usage):
|
|
"""Return a stack of patches that simulate one selection / IFC state for poll().
|
|
|
|
``prefs.gizmos.draw_gizmos_in_3d_viewport`` is the top-level toggle. The
|
|
selection set, the IFC entity lookup, and the usage-type lookup are stubbed
|
|
so the test only depends on the predicate ordering in poll()."""
|
|
prefs = SimpleNamespace(gizmos=SimpleNamespace(draw_gizmos_in_3d_viewport=prefs_on))
|
|
|
|
entity_map = {}
|
|
usage_map = {}
|
|
# active_element/other_element are matched by object identity from the selected set
|
|
if len(selected) == 2:
|
|
entity_map[id(selected[0])] = active_element
|
|
entity_map[id(selected[1])] = other_element
|
|
usage_map[id(active_element)] = active_usage
|
|
usage_map[id(other_element)] = other_usage
|
|
|
|
def get_entity(obj):
|
|
return entity_map.get(id(obj))
|
|
|
|
def get_usage_type(element):
|
|
return usage_map.get(id(element))
|
|
|
|
from bonsai import tool
|
|
|
|
return [
|
|
patch.object(tool.Blender, "get_addon_preferences", return_value=prefs),
|
|
patch.object(tool.Blender, "get_selected_objects", return_value=set(selected)),
|
|
patch.object(tool.Ifc, "get_entity", side_effect=get_entity),
|
|
patch.object(tool.Model, "get_usage_type", side_effect=get_usage_type),
|
|
]
|
|
|
|
|
|
def _run_poll(prefs_on, active_is_in_selected, len_override, active_usage, other_usage, active_has_entity=True):
|
|
from bonsai.bim.module.model.wall import GizmoWallExtendVertically
|
|
|
|
slab_obj = object()
|
|
wall_obj = object()
|
|
active = slab_obj if active_is_in_selected else object()
|
|
if len_override is None:
|
|
selected = [slab_obj, wall_obj]
|
|
else:
|
|
selected = [object() for _ in range(len_override)]
|
|
if active_is_in_selected and selected:
|
|
active = selected[0]
|
|
|
|
slab_element = object() if active_has_entity else None
|
|
wall_element = object()
|
|
|
|
patches = _patch_tools(prefs_on, selected, slab_element, wall_element, active_usage, other_usage)
|
|
for p in patches:
|
|
p.start()
|
|
try:
|
|
return GizmoWallExtendVertically.poll(_make_context(active, selected))
|
|
finally:
|
|
for p in patches:
|
|
p.stop()
|
|
|
|
|
|
def test_poll_accepts_layer3_active_with_layer2_other():
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=True, active_is_in_selected=True, len_override=None, active_usage="LAYER3", other_usage="LAYER2"
|
|
)
|
|
is True
|
|
)
|
|
|
|
|
|
def test_poll_rejects_when_gizmo_toggle_off():
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=False, active_is_in_selected=True, len_override=None, active_usage="LAYER3", other_usage="LAYER2"
|
|
)
|
|
is False
|
|
)
|
|
|
|
|
|
def test_poll_rejects_when_selection_count_is_not_two():
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=True, active_is_in_selected=True, len_override=3, active_usage="LAYER3", other_usage="LAYER2"
|
|
)
|
|
is False
|
|
)
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=True, active_is_in_selected=True, len_override=1, active_usage="LAYER3", other_usage="LAYER2"
|
|
)
|
|
is False
|
|
)
|
|
|
|
|
|
def test_poll_rejects_when_active_has_no_ifc_entity():
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=True,
|
|
active_is_in_selected=True,
|
|
len_override=None,
|
|
active_usage="LAYER3",
|
|
other_usage="LAYER2",
|
|
active_has_entity=False,
|
|
)
|
|
is False
|
|
)
|
|
|
|
|
|
def test_poll_rejects_when_active_is_not_layer3():
|
|
# A LAYER2 active (wall) must NOT trigger this gizmo — the wall-join gizmo
|
|
# owns that case, and extend_walls_to_underside expects the slab to be active.
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=True, active_is_in_selected=True, len_override=None, active_usage="LAYER2", other_usage="LAYER2"
|
|
)
|
|
is False
|
|
)
|
|
# Active with no usage at all (generic mesh, e.g. an opening blocker) is also rejected.
|
|
assert (
|
|
_run_poll(prefs_on=True, active_is_in_selected=True, len_override=None, active_usage=None, other_usage="LAYER2")
|
|
is False
|
|
)
|
|
|
|
|
|
def test_poll_rejects_when_other_is_not_layer2_wall():
|
|
assert (
|
|
_run_poll(
|
|
prefs_on=True, active_is_in_selected=True, len_override=None, active_usage="LAYER3", other_usage="LAYER3"
|
|
)
|
|
is False
|
|
)
|
|
assert (
|
|
_run_poll(prefs_on=True, active_is_in_selected=True, len_override=None, active_usage="LAYER3", other_usage=None)
|
|
is False
|
|
)
|