").attr("id", "work_schedules-" + blenderId);
+ workSchedulesMainDiv.append(workSchedulesDiv);
+
+ const workSchedules = data["data"]["work_schedule_info"];
+
+ workSchedules.forEach((workSchedule) => {
+ console.log(workSchedule);
+ const mainContainer = CostUI.text(new Date(workSchedule.CreationDate).toLocaleDateString());
+ const callback = () => loadWorkSchedule(workSchedule.id);
+ const card = CostUI.createCard(workSchedule.Name,mainContainer, callback);
+ workSchedulesDiv.append(card);
+ });
+}
+
function handleGanttData(data) {
+ console.log("running handleGanttData");
const blenderId = data["blenderId"];
console.log(data);
@@ -156,7 +183,7 @@ function handleDefaultData(data) {
const blenderId = data["blenderId"];
const isDirty = data["data"]["is_dirty"];
showWarning(blenderId, isDirty);
- console.log(data);
+ console.log('default data',data);
}
// Function to add a new gantt with data and filename
@@ -551,3 +578,33 @@ function toggleClientList() {
clientList.addClass("show");
}
+
+function loadWorkSchedule(workScheduleId) {
+ const msg = {
+ sourcePage: "gantt",
+ operator: {
+ type: "loadWorkSchedule",
+ workScheduleId: workScheduleId,
+ },
+ };
+ socket.emit("web_operator", msg);
+}
+
+function removeWorkScheduleInfo(blenderId) {
+ $("#work_schedules-"+ blenderId).empty();
+}
+
+function getWorkScheduleData(blenderId) {
+ const msg = {
+ sourcePage: "gantt",
+ operator: {
+ type: "getWorkSchedules",
+ },
+ };
+
+ if (blenderId !== undefined) {
+ msg.BlenderId = blenderId;
+ }
+
+ socket.emit("web_operator", msg);
+}
diff --git a/src/bonsai/bonsai/tool/web.py b/src/bonsai/bonsai/tool/web.py
index 3485b1b3fe..099e61c136 100644
--- a/src/bonsai/bonsai/tool/web.py
+++ b/src/bonsai/bonsai/tool/web.py
@@ -383,34 +383,36 @@ class Web(bonsai.core.tool.Web):
operator_data (dict): A dictionary containing the operator data.
"""
ifc_file = tool.Ifc.get()
+ if operator_data["type"] == "getWorkSchedules":
+ work_schedules = ifc_file.by_type("IfcWorkSchedule")
+ work_schedules_json = [ws.get_info(recursive=True) for ws in work_schedules]
+ cls.send_webui_data(data=work_schedules_json, data_key="work_schedule_info", event="work_schedule_info")
+ if operator_data["type"] == "loadWorkSchedule":
+ work_schedule = ifc_file.by_id(operator_data["workScheduleId"])
+ print("Generating Gantt chart")
+ bonsai.core.sequence.enable_editing_work_schedule_tasks(tool.Sequence, work_schedule=work_schedule)
+ bonsai.core.sequence.generate_gantt_chart(tool.Sequence, work_schedule=work_schedule)
if operator_data["type"] == "editTask":
task_id = int(operator_data["taskId"])
task = ifc_file.by_id(task_id)
task_time = task.TaskTime
column = operator_data["column"]
new_value = operator_data["value"]
+ if task_time is None:
+ ifcopenshell.api.sequence.add_task_time(ifc_file, task)
+ task_time = task.TaskTime
+ ifcopenshell.api.sequence.edit_task_time(
+ ifc_file, task_time=task_time, attributes={IFC_TASK_ATTRIBUTE_MAP[column]: str(new_value)}
+ )
- try:
- ifcopenshell.api.sequence.edit_task(
- ifc_file, task, attributes={IFC_TASK_ATTRIBUTE_MAP[column]: str(new_value)}
- )
- except AttributeError:
- if task_time is None:
- ifcopenshell.api.sequence.add_task_time(ifc_file, task)
- task_time = task.TaskTime
- ifcopenshell.api.sequence.edit_task_time(
- ifc_file, task_time=task_time, attributes={IFC_TASK_ATTRIBUTE_MAP[column]: str(new_value)}
- )
-
- bpy.ops.bim.load_task_properties()
-
- # after updating, send new gantt data to handle the case where
- # changing a task cascades and changes other tasks. as this wouldn't
- # be reflected in the web ui
- work_schedule = ifc_file.by_id(operator_data["workScheduleId"])
- task_json = tool.Sequence.create_tasks_json(work_schedule)
- gantt_data = {"tasks": task_json, "work_schedule": work_schedule.get_info(recursive=True)}
- cls.send_webui_data(data=gantt_data, data_key="gantt_data", event="gantt_data")
+ bpy.ops.bim.load_task_properties()
+ # after updating, send new gantt data to handle the case where
+ # changing a task cascades and changes other tasks. as this wouldn't
+ # be reflected in the web ui
+ work_schedule = ifc_file.by_id(operator_data["workScheduleId"])
+ task_json = tool.Sequence.create_tasks_json(work_schedule)
+ gantt_data = {"tasks": task_json, "work_schedule": work_schedule.get_info(recursive=True)}
+ cls.send_webui_data(data=gantt_data, data_key="gantt_data", event="gantt_data")
@classmethod
def handle_drawings_operator(cls, operator_data: dict) -> None:
From d9f3c9d0124eefbf6d53b03f0f9dd452ef99c4d2 Mon Sep 17 00:00:00 2001
From: Andrej730
Date: Wed, 28 Aug 2024 23:53:56 +0500
Subject: [PATCH 050/556] bim.activate_model to hide all annotations #5232
---
src/bonsai/bonsai/bim/module/drawing/operator.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py
index 912d2748ce..4418693017 100644
--- a/src/bonsai/bonsai/bim/module/drawing/operator.py
+++ b/src/bonsai/bonsai/bim/module/drawing/operator.py
@@ -1463,7 +1463,7 @@ class ActivateModel(bpy.types.Operator):
bl_idname = "bim.activate_model"
bl_label = "Activate Model"
bl_options = {"REGISTER", "UNDO"}
- bl_description = "Activates the model view"
+ bl_description = "Activate the model view, hide all annotations"
def execute(self, context):
dprops = bpy.context.scene.DocProperties
@@ -1477,12 +1477,17 @@ class ActivateModel(bpy.types.Operator):
# - annotations (so we won't unhide other drawings)
ifc_file = tool.Ifc.get()
visibility_status: dict[bpy.types.Object, bool] = {}
- drawing_groups = [g for g in ifc_file.by_type("IfcGroup", include_subtypes=False)]
for obj in bpy.data.objects:
element = tool.Ifc.get_entity(obj)
- if element and not element.is_a("IfcAnnotation") and not element.is_a("IfcTypeProduct"):
+ if not element:
+ hide = obj.hide_get()
+ elif element.is_a("IfcAnnotation"):
+ hide = True
+ elif element.is_a("IfcTypeProduct"):
+ hide = obj.hide_get()
+ else:
continue
- visibility_status[obj] = obj.hide_get()
+ visibility_status[obj] = hide
if not bpy.app.background:
with context.temp_override(**tool.Blender.get_viewport_context()):
From fbcb19fdbbee9a7dad0dca31ade6b1aefdc9d510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?=
Date: Wed, 28 Aug 2024 12:06:37 -0300
Subject: [PATCH 051/556] Improved snap "stickiness". Added more control on how
the snapping system selects the snapping point, and "M" key now updates the
input panel.
Added `intersect_edge_2` to Cad tool
Revert "Improved snap "stickiness"."
This reverts commit 85e67d3996ab8002b4cef7c0b859e9da251d39bf.
A few snap and raycast changes to improve the snap feel
---
src/bonsai/bonsai/tool/cad.py | 38 +++++++++++++++++++++++++++++++
src/bonsai/bonsai/tool/raycast.py | 17 ++++++++++----
src/bonsai/bonsai/tool/snap.py | 10 ++++----
3 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/src/bonsai/bonsai/tool/cad.py b/src/bonsai/bonsai/tool/cad.py
index 6c8d1fa4c6..c83efb755a 100644
--- a/src/bonsai/bonsai/tool/cad.py
+++ b/src/bonsai/bonsai/tool/cad.py
@@ -171,6 +171,44 @@ class Cad:
return r1.to_2d() if r1 else r1, r2.to_2d() if r2 else r2
return results
+ @classmethod
+ def intersect_edges_2(cls, edge1, edge2):
+ """
+ Calculate the closest points on two line segments.
+ Note: This function doesn't use intersect_line_line
+
+ > edge1: tuple of two vectors (v1, v2) representing the first segment
+ > edge2: tuple of two vectors (v3, v4) representing the second segment
+ < returns: tuple of two vectors (C1, C2) or (None, None) if lines are parallel
+ """
+ # This function seems to work better then intersect_line_line
+ # in orthogonal view
+ # https://en.wikipedia.org/wiki/Skew_lines#Nearest_points
+
+ # Starting and ending points
+ P1, P1_end = edge1
+ P2, P2_end = edge2
+
+ # Directions
+ d1 = (P1_end - P1).normalized()
+ d2 = (P2_end - P2).normalized()
+
+ n = d1.cross(d2)
+
+ # if n is zero, lines are parallel
+ if n.length == 0:
+ return None, None
+
+ n2 = d2.cross(n)
+
+ C1 = P1 + ((P2 - P1).dot(n2) / (d1.dot(n2))) * d1
+
+ n1 = d1.cross(n)
+
+ C2 = P2 + ((P1 - P2).dot(n1) / (d2.dot(n1))) * d2
+
+ return C1, C2
+
@classmethod
def get_intersection(cls, edge1, edge2):
"""
diff --git a/src/bonsai/bonsai/tool/raycast.py b/src/bonsai/bonsai/tool/raycast.py
index bb855decec..deefed7183 100644
--- a/src/bonsai/bonsai/tool/raycast.py
+++ b/src/bonsai/bonsai/tool/raycast.py
@@ -98,8 +98,13 @@ class Raycast(bonsai.core.tool.Raycast):
return ray_origin_obj, ray_target_obj, ray_direction_obj
@classmethod
- def obj_ray_cast(cls, context, event, obj):
- ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
+ def obj_ray_cast(cls, context, event, obj, mouse_pos=None):
+ if mouse_pos:
+ ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(
+ context, event, obj.matrix_world.copy(), mouse_pos
+ )
+ else:
+ ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
success, location, normal, face_index = obj.ray_cast(ray_origin_obj, ray_direction_obj)
if success:
return location, normal, face_index
@@ -114,6 +119,10 @@ class Raycast(bonsai.core.tool.Raycast):
ray_origin, ray_target, ray_direction = cls.get_viewport_ray_data(context, event)
points = []
+ # Makes the snapping point more or less sticky then others
+ # It changes the distance and affects how the snapping point is sorted
+ sticky_factor = 0.02
+
try:
loc = view3d_utils.region_2d_to_location_3d(region, rv3d, mouse_pos, ray_direction)
except:
@@ -145,12 +154,12 @@ class Raycast(bonsai.core.tool.Raycast):
if distance < 0.2:
points.append((division_point, "Edge Center"))
- intersection = tool.Cad.intersect_edges((ray_target, loc), (world_v1, world_v2))
+ intersection = tool.Cad.intersect_edges_2((ray_target, loc), (world_v1, world_v2))
if intersection:
if tool.Cad.is_point_on_edge(intersection[1], (world_v1, world_v2)):
distance = (intersection[1] - intersection[0]).length
if distance < 0.8:
- points.append((intersection[1], "Edge"))
+ points.append([distance + 4 * sticky_factor, (intersection[1], "Edge")])
bm.free()
return points
diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py
index 6d8f88ca9a..26fc2b28b4 100644
--- a/src/bonsai/bonsai/tool/snap.py
+++ b/src/bonsai/bonsai/tool/snap.py
@@ -297,8 +297,8 @@ class Snap(bonsai.core.tool.Snap):
cls.mouse_pos = event.mouse_region_x, event.mouse_region_y
detected_snaps = []
- offset = 15
snap_threshold = 0.3
+ offset = 10
mouse_offset = (
(-offset, offset),
(0, offset),
@@ -487,6 +487,10 @@ class Snap(bonsai.core.tool.Snap):
snapping_points.append(op)
break
+ if "Plane" in list(origin.keys()):
+ intersection = origin["Plane"]
+ snapping_points.append((intersection, "Plane"))
+
for origin in detected_snaps:
if "Axis" in list(origin.keys()):
intersection = origin["Axis"]
@@ -494,10 +498,6 @@ class Snap(bonsai.core.tool.Snap):
axis_end = intersection[2]
snapping_points.append((intersection[0], "Axis"))
- if "Plane" in list(origin.keys()):
- intersection = origin["Plane"]
- snapping_points.append((intersection, "Plane"))
-
# Make Axis first priority
if event.shift or cls.snap_axis_method in {"X", "Y", "Z"}:
cls.update_snapping_ref(snapping_points[0][0], snapping_points[0][1])
From 23ec2fc48eb84e89967b2c50143e192761a8bcc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?=
Date: Wed, 28 Aug 2024 16:48:42 -0300
Subject: [PATCH 052/556] Adds `intersect_edges_v2` to Cad tools. This function
uses another method to calculate the closest points in two edges that are not
parallel. The `intersect_line_line` from mathutils were not getting good
results when using orthogonal view.
---
src/bonsai/bonsai/tool/cad.py | 2 +-
src/bonsai/bonsai/tool/raycast.py | 17 ++++-------------
src/bonsai/bonsai/tool/snap.py | 10 +++++-----
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/bonsai/bonsai/tool/cad.py b/src/bonsai/bonsai/tool/cad.py
index c83efb755a..090df007f3 100644
--- a/src/bonsai/bonsai/tool/cad.py
+++ b/src/bonsai/bonsai/tool/cad.py
@@ -172,7 +172,7 @@ class Cad:
return results
@classmethod
- def intersect_edges_2(cls, edge1, edge2):
+ def intersect_edges_v2(cls, edge1, edge2):
"""
Calculate the closest points on two line segments.
Note: This function doesn't use intersect_line_line
diff --git a/src/bonsai/bonsai/tool/raycast.py b/src/bonsai/bonsai/tool/raycast.py
index deefed7183..19a26f25df 100644
--- a/src/bonsai/bonsai/tool/raycast.py
+++ b/src/bonsai/bonsai/tool/raycast.py
@@ -98,13 +98,8 @@ class Raycast(bonsai.core.tool.Raycast):
return ray_origin_obj, ray_target_obj, ray_direction_obj
@classmethod
- def obj_ray_cast(cls, context, event, obj, mouse_pos=None):
- if mouse_pos:
- ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(
- context, event, obj.matrix_world.copy(), mouse_pos
- )
- else:
- ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
+ def obj_ray_cast(cls, context, event, obj):
+ ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
success, location, normal, face_index = obj.ray_cast(ray_origin_obj, ray_direction_obj)
if success:
return location, normal, face_index
@@ -119,10 +114,6 @@ class Raycast(bonsai.core.tool.Raycast):
ray_origin, ray_target, ray_direction = cls.get_viewport_ray_data(context, event)
points = []
- # Makes the snapping point more or less sticky then others
- # It changes the distance and affects how the snapping point is sorted
- sticky_factor = 0.02
-
try:
loc = view3d_utils.region_2d_to_location_3d(region, rv3d, mouse_pos, ray_direction)
except:
@@ -154,12 +145,12 @@ class Raycast(bonsai.core.tool.Raycast):
if distance < 0.2:
points.append((division_point, "Edge Center"))
- intersection = tool.Cad.intersect_edges_2((ray_target, loc), (world_v1, world_v2))
+ intersection = tool.Cad.intersect_edges_v2((ray_target, loc), (world_v1, world_v2))
if intersection:
if tool.Cad.is_point_on_edge(intersection[1], (world_v1, world_v2)):
distance = (intersection[1] - intersection[0]).length
if distance < 0.8:
- points.append([distance + 4 * sticky_factor, (intersection[1], "Edge")])
+ points.append((intersection[1], "Edge"))
bm.free()
return points
diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py
index 26fc2b28b4..6d8f88ca9a 100644
--- a/src/bonsai/bonsai/tool/snap.py
+++ b/src/bonsai/bonsai/tool/snap.py
@@ -297,8 +297,8 @@ class Snap(bonsai.core.tool.Snap):
cls.mouse_pos = event.mouse_region_x, event.mouse_region_y
detected_snaps = []
+ offset = 15
snap_threshold = 0.3
- offset = 10
mouse_offset = (
(-offset, offset),
(0, offset),
@@ -487,10 +487,6 @@ class Snap(bonsai.core.tool.Snap):
snapping_points.append(op)
break
- if "Plane" in list(origin.keys()):
- intersection = origin["Plane"]
- snapping_points.append((intersection, "Plane"))
-
for origin in detected_snaps:
if "Axis" in list(origin.keys()):
intersection = origin["Axis"]
@@ -498,6 +494,10 @@ class Snap(bonsai.core.tool.Snap):
axis_end = intersection[2]
snapping_points.append((intersection[0], "Axis"))
+ if "Plane" in list(origin.keys()):
+ intersection = origin["Plane"]
+ snapping_points.append((intersection, "Plane"))
+
# Make Axis first priority
if event.shift or cls.snap_axis_method in {"X", "Y", "Z"}:
cls.update_snapping_ref(snapping_points[0][0], snapping_points[0][1])
From 56e9488d3e0c068964581e6ab25139cf154aa78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?=
Date: Wed, 28 Aug 2024 16:51:12 -0300
Subject: [PATCH 053/556] A few updates on Snap and Raycast to improve the snap
feel.
---
src/bonsai/bonsai/tool/raycast.py | 15 ++++++++++++---
src/bonsai/bonsai/tool/snap.py | 10 +++++-----
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/bonsai/bonsai/tool/raycast.py b/src/bonsai/bonsai/tool/raycast.py
index 19a26f25df..324066a9c4 100644
--- a/src/bonsai/bonsai/tool/raycast.py
+++ b/src/bonsai/bonsai/tool/raycast.py
@@ -98,8 +98,13 @@ class Raycast(bonsai.core.tool.Raycast):
return ray_origin_obj, ray_target_obj, ray_direction_obj
@classmethod
- def obj_ray_cast(cls, context, event, obj):
- ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
+ def obj_ray_cast(cls, context, event, obj, mouse_pos=None):
+ if mouse_pos:
+ ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(
+ context, event, obj.matrix_world.copy(), mouse_pos
+ )
+ else:
+ ray_origin_obj, _, ray_direction_obj = cls.get_object_ray_data(context, event, obj.matrix_world.copy())
success, location, normal, face_index = obj.ray_cast(ray_origin_obj, ray_direction_obj)
if success:
return location, normal, face_index
@@ -114,6 +119,10 @@ class Raycast(bonsai.core.tool.Raycast):
ray_origin, ray_target, ray_direction = cls.get_viewport_ray_data(context, event)
points = []
+ # Makes the snapping point more or less sticky then others
+ # It changes the distance and affects how the snapping point is sorted
+ stick_factor = 0.02
+
try:
loc = view3d_utils.region_2d_to_location_3d(region, rv3d, mouse_pos, ray_direction)
except:
@@ -150,7 +159,7 @@ class Raycast(bonsai.core.tool.Raycast):
if tool.Cad.is_point_on_edge(intersection[1], (world_v1, world_v2)):
distance = (intersection[1] - intersection[0]).length
if distance < 0.8:
- points.append((intersection[1], "Edge"))
+ points.append([distance + 4 * stick_factor, (intersection[1], "Edge")])
bm.free()
return points
diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py
index 6d8f88ca9a..26fc2b28b4 100644
--- a/src/bonsai/bonsai/tool/snap.py
+++ b/src/bonsai/bonsai/tool/snap.py
@@ -297,8 +297,8 @@ class Snap(bonsai.core.tool.Snap):
cls.mouse_pos = event.mouse_region_x, event.mouse_region_y
detected_snaps = []
- offset = 15
snap_threshold = 0.3
+ offset = 10
mouse_offset = (
(-offset, offset),
(0, offset),
@@ -487,6 +487,10 @@ class Snap(bonsai.core.tool.Snap):
snapping_points.append(op)
break
+ if "Plane" in list(origin.keys()):
+ intersection = origin["Plane"]
+ snapping_points.append((intersection, "Plane"))
+
for origin in detected_snaps:
if "Axis" in list(origin.keys()):
intersection = origin["Axis"]
@@ -494,10 +498,6 @@ class Snap(bonsai.core.tool.Snap):
axis_end = intersection[2]
snapping_points.append((intersection[0], "Axis"))
- if "Plane" in list(origin.keys()):
- intersection = origin["Plane"]
- snapping_points.append((intersection, "Plane"))
-
# Make Axis first priority
if event.shift or cls.snap_axis_method in {"X", "Y", "Z"}:
cls.update_snapping_ref(snapping_points[0][0], snapping_points[0][1])
From ec5368224fd2382bc1e59e5c2f9ca344eec9dcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?=
Date: Wed, 28 Aug 2024 18:58:11 -0300
Subject: [PATCH 054/556] Fix after fbcb19fdb
---
src/bonsai/bonsai/bim/module/model/wall.py | 6 ++--
.../bonsai/bim/module/project/operator.py | 12 +++----
src/bonsai/bonsai/tool/raycast.py | 34 ++++++++++++++-----
src/bonsai/bonsai/tool/snap.py | 5 +--
4 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/model/wall.py b/src/bonsai/bonsai/bim/module/model/wall.py
index 96c1fbcc29..1c54a0ab34 100644
--- a/src/bonsai/bonsai/bim/module/model/wall.py
+++ b/src/bonsai/bonsai/bim/module/model/wall.py
@@ -393,7 +393,7 @@ class DrawPolylineWall(bpy.types.Operator):
if self.mousemove_count == 2:
self.objs_2d_bbox = []
for obj in self.visible_objs:
- self.objs_2d_bbox.append(tool.Raycast.get_objects_2d_bounding_boxes(context, obj))
+ self.objs_2d_bbox.append(tool.Raycast.get_on_screen_2d_bounding_boxes(context, obj))
if self.mousemove_count > 3:
detected_snaps = tool.Snap.detect_snapping_points(context, event, self.objs_2d_bbox)
@@ -498,6 +498,8 @@ class DrawPolylineWall(bpy.types.Operator):
if event.value == "PRESS" and event.type == "M":
self.snapping_points = tool.Snap.modify_snapping_point_selection(self.snapping_points)
+ PolylineDecorator.set_mouse_position(event)
+ self.input_panel = PolylineDecorator.calculate_distance_and_angle(context, self.is_input_on)
tool.Blender.update_viewport()
if event.type in {"MIDDLEMOUSE", "WHEELUPMOUSE", "WHEELDOWNMOUSE"}:
@@ -529,7 +531,7 @@ class DrawPolylineWall(bpy.types.Operator):
PolylineDecorator.set_input_panel(self.input_panel, self.input_type)
self.visible_objs = tool.Raycast.get_visible_objects(context)
for obj in self.visible_objs:
- self.objs_2d_bbox.append(tool.Raycast.get_objects_2d_bounding_boxes(context, obj))
+ self.objs_2d_bbox.append(tool.Raycast.get_on_screen_2d_bounding_boxes(context, obj))
detected_snaps = tool.Snap.detect_snapping_points(context, event, self.objs_2d_bbox)
self.snapping_points = tool.Snap.select_snapping_points(context, event, detected_snaps)
PolylineDecorator.set_mouse_position(event)
diff --git a/src/bonsai/bonsai/bim/module/project/operator.py b/src/bonsai/bonsai/bim/module/project/operator.py
index 039443cea4..957a34d513 100644
--- a/src/bonsai/bonsai/bim/module/project/operator.py
+++ b/src/bonsai/bonsai/bim/module/project/operator.py
@@ -2355,11 +2355,9 @@ class MeasureTool(bpy.types.Operator):
self.input_panel = PolylineDecorator.calculate_distance_and_angle(context, self.is_input_on)
elif self.input_type in {"D", "A"}:
self.input_panel = PolylineDecorator.calculate_x_y_and_z(context)
- self.input_panel = PolylineDecorator.calculate_distance_and_angle(context, self.is_input_on)
- else:
- self.input_panel[self.input_type] = self.number_output
+
+ self.input_panel[self.input_type] = self.number_output
- PolylineDecorator.set_input_panel(self.input_panel, self.input_type)
tool.Blender.update_viewport()
return is_valid
@@ -2379,7 +2377,7 @@ class MeasureTool(bpy.types.Operator):
if self.mousemove_count == 2:
self.objs_2d_bbox = []
for obj in self.visible_objs:
- self.objs_2d_bbox.append(tool.Raycast.get_objects_2d_bounding_boxes(context, obj))
+ self.objs_2d_bbox.append(tool.Raycast.get_on_screen_2d_bounding_boxes(context, obj))
if self.mousemove_count > 3:
detected_snaps = tool.Snap.detect_snapping_points(context, event, self.objs_2d_bbox)
@@ -2481,6 +2479,8 @@ class MeasureTool(bpy.types.Operator):
if event.value == "PRESS" and event.type == "M":
self.snapping_points = tool.Snap.modify_snapping_point_selection(self.snapping_points)
+ PolylineDecorator.set_mouse_position(event)
+ self.input_panel = PolylineDecorator.calculate_distance_and_angle(context, self.is_input_on)
tool.Blender.update_viewport()
if event.shift and event.value == "PRESS" and event.type == "X":
@@ -2535,7 +2535,7 @@ class MeasureTool(bpy.types.Operator):
PolylineDecorator.set_input_panel(self.input_panel, self.input_type)
self.visible_objs = tool.Raycast.get_visible_objects(context)
for obj in self.visible_objs:
- self.objs_2d_bbox.append(tool.Raycast.get_objects_2d_bounding_boxes(context, obj))
+ self.objs_2d_bbox.append(tool.Raycast.get_on_screen_2d_bounding_boxes(context, obj))
detected_snaps = tool.Snap.detect_snapping_points(context, event, self.objs_2d_bbox)
self.snapping_points = tool.Snap.select_snapping_points(context, event, detected_snaps)
PolylineDecorator.set_mouse_position(event)
diff --git a/src/bonsai/bonsai/tool/raycast.py b/src/bonsai/bonsai/tool/raycast.py
index 324066a9c4..347390c8f1 100644
--- a/src/bonsai/bonsai/tool/raycast.py
+++ b/src/bonsai/bonsai/tool/raycast.py
@@ -41,7 +41,7 @@ class Raycast(bonsai.core.tool.Raycast):
return all_objs
@classmethod
- def get_objects_2d_bounding_boxes(cls, context, obj):
+ def get_on_screen_2d_bounding_boxes(cls, context, obj):
obj_matrix = obj.matrix_world.copy()
bbox = [obj_matrix @ Vector(v) for v in obj.bound_box]
@@ -65,20 +65,28 @@ class Raycast(bonsai.core.tool.Raycast):
return (obj, bbox_2d)
@classmethod
- def in_view_2d_bounding_box(cls, mouse_pos, bbox):
+ def intersect_mouse_2d_bounding_box(cls, mouse_pos, bbox, offset=None):
x, y = mouse_pos
xmin, xmax, ymin, ymax = bbox
+ # extends bbox boundaries to improve snap
+ if offset:
+ xmin -= offset
+ xmax += offset
+ ymin -= offset
+ ymax += offset
+
if xmin < x < xmax and ymin < y < ymax:
return True
else:
return False
@classmethod
- def get_viewport_ray_data(cls, context, event):
+ def get_viewport_ray_data(cls, context, event, mouse_pos=None):
region = context.region
rv3d = context.region_data
- mouse_pos = event.mouse_region_x, event.mouse_region_y
+ if not mouse_pos:
+ mouse_pos = event.mouse_region_x, event.mouse_region_y
view_vector = view3d_utils.region_2d_to_vector_3d(region, rv3d, mouse_pos)
ray_origin = view3d_utils.region_2d_to_origin_3d(region, rv3d, mouse_pos)
@@ -88,8 +96,11 @@ class Raycast(bonsai.core.tool.Raycast):
return ray_origin, ray_target, ray_direction
@classmethod
- def get_object_ray_data(cls, context, event, obj_matrix):
- ray_origin, ray_target, _ = cls.get_viewport_ray_data(context, event)
+ def get_object_ray_data(cls, context, event, obj_matrix, mouse_pos=None):
+ if mouse_pos:
+ ray_origin, ray_target, _ = cls.get_viewport_ray_data(context, event, mouse_pos)
+ else:
+ ray_origin, ray_target, _ = cls.get_viewport_ray_data(context, event)
matrix_inv = obj_matrix.inverted()
ray_origin_obj = matrix_inv @ ray_origin
ray_target_obj = matrix_inv @ ray_target
@@ -140,7 +151,7 @@ class Raycast(bonsai.core.tool.Raycast):
intersection = tool.Cad.point_on_edge(world_vertex, (ray_target, loc))
distance = (world_vertex - intersection).length
if distance < 0.2:
- points.append((world_vertex, "Vertex"))
+ points.append([distance - stick_factor, (world_vertex, "Vertex")])
for edge in bm.edges:
v1 = edge.verts[0].co
@@ -152,7 +163,7 @@ class Raycast(bonsai.core.tool.Raycast):
intersection = tool.Cad.point_on_edge(division_point, (ray_target, loc))
distance = (division_point - intersection).length
if distance < 0.2:
- points.append((division_point, "Edge Center"))
+ points.append([distance, (division_point, "Edge Center")])
intersection = tool.Cad.intersect_edges_v2((ray_target, loc), (world_v1, world_v2))
if intersection:
@@ -162,7 +173,12 @@ class Raycast(bonsai.core.tool.Raycast):
points.append([distance + 4 * stick_factor, (intersection[1], "Edge")])
bm.free()
- return points
+ snapping_points = []
+ sorted_points = sorted(points)
+ for p in sorted_points:
+ snapping_points.append(p[1])
+
+ return snapping_points
@classmethod
def ray_cast_to_polyline(cls, context, event):
diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py
index 26fc2b28b4..64bc3e9e17 100644
--- a/src/bonsai/bonsai/tool/snap.py
+++ b/src/bonsai/bonsai/tool/snap.py
@@ -356,7 +356,7 @@ class Snap(bonsai.core.tool.Snap):
original_mouse_pos = cls.mouse_pos
for value in mouse_offset:
cls.mouse_pos = tuple(x + y for x, y in zip(original_mouse_pos, value))
- hit, normal, face_index = tool.Raycast.obj_ray_cast(context, event, obj)
+ hit, normal, face_index = tool.Raycast.obj_ray_cast(context, event, obj, cls.mouse_pos)
if hit:
break
cls.mouse_pos = original_mouse_pos
@@ -370,6 +370,7 @@ class Snap(bonsai.core.tool.Snap):
best_hit = hit_world
best_face_index = face_index
+
if best_obj is not None:
return best_obj, best_hit, best_face_index
@@ -381,7 +382,7 @@ class Snap(bonsai.core.tool.Snap):
objs_to_raycast = []
for obj, bbox_2d in objs_2d_bbox:
if obj.type == "MESH" and bbox_2d:
- if tool.Raycast.in_view_2d_bounding_box(cls.mouse_pos, bbox_2d):
+ if tool.Raycast.intersect_mouse_2d_bounding_box(cls.mouse_pos, bbox_2d, offset):
if space.local_view:
if obj.local_view_get(context.space_data):
objs_to_raycast.append(obj)
From 01a701007eda45030bafacce8b71762ce883c68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?=
Date: Wed, 28 Aug 2024 19:02:06 -0300
Subject: [PATCH 055/556] Fix b74811b3f
---
src/bonsai/bonsai/bim/module/model/decorator.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/model/decorator.py b/src/bonsai/bonsai/bim/module/model/decorator.py
index e1c47253a3..5c810a247c 100644
--- a/src/bonsai/bonsai/bim/module/model/decorator.py
+++ b/src/bonsai/bonsai/bim/module/model/decorator.py
@@ -708,12 +708,6 @@ class PolylineDecorator:
if ref_point:
self.draw_batch("POINTS", ref_point, (1.0, 0.6, 0.0, 1.0))
- # Draw polyline with selected points
- self.line_shader.uniform_float("lineWidth", 2.0)
- self.draw_batch("POINTS", polyline_points, decorator_color_selected)
- if len(polyline_points) > 1:
- self.draw_batch("LINES", polyline_points, decorator_color_selected, polyline_edges)
-
# Line between last polyline point and mouse
edges = [[0, 1]]
if polyline_points:
@@ -721,3 +715,10 @@ class PolylineDecorator:
self.draw_batch("LINES", [polyline_points[-1]] + projection_point, decorator_color_unselected, edges)
else:
self.draw_batch("LINES", [polyline_points[-1]] + mouse_point, decorator_color_unselected, edges)
+
+ # Draw polyline with selected points
+ self.line_shader.uniform_float("lineWidth", 2.0)
+ self.draw_batch("POINTS", polyline_points, decorator_color_selected)
+ if len(polyline_points) > 1:
+ self.draw_batch("LINES", polyline_points, decorator_color_selected, polyline_edges)
+
From 720eda51c35070dbe42d0b886cdc7f26aca98180 Mon Sep 17 00:00:00 2001
From: Jean-Marc Couffin
Date: Thu, 29 Aug 2024 00:25:31 +0200
Subject: [PATCH 056/556] Update README.md with new blenderBMI branding -
BONSAI
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 626c66f0f8..82849c0bb0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending
is possible at compile-time when using C++ and at run-time when using Python.
In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), the ~~BlenderBIM~~ Bonsai Add-on (an add-on to Blender providing a graphical IFC authoring platform),
and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
For more information, see:
@@ -37,7 +37,7 @@ Contents
| Name | Description | License | Service |
| ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
| bcf | Library to read and write BCF-XML and query OpenCDE BCF-API modules | LGPL-3.0-or-later | [](https://pypi.org/project/bcf-client/) |
-| blenderbim | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later | [](https://bonsaibim.org/download.html) [](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| ~~blenderbim~~ Bonsai | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later | [](https://bonsaibim.org/download.html) [](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [](https://community.chocolatey.org/packages/blenderbim-nightly/) |
| bsdd | Library to query the bSDD API | LGPL-3.0-or-later | [](https://pypi.org/project/bsdd/) |
| ifc2ca | Utility to convert IFC structural analysis models to Code_Aster | LGPL-3.0-or-later |
| ifc4d | Convert to and from IFC and project management software | LGPL-3.0-or-later | [](https://pypi.org/project/ifc4d/) |
From 8a57a5294934f192d29cb961077e105ddc5bcb08 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 09:20:32 +1000
Subject: [PATCH 057/556] Bump IOS
---
src/bonsai/Makefile | 2 +-
src/ifcopenshell-python/Makefile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile
index af92e11dc1..608af5a235 100644
--- a/src/bonsai/Makefile
+++ b/src/bonsai/Makefile
@@ -81,7 +81,7 @@ BLENDER_PLATFORM:=windows-x64
endif
# Current build commit hash.
-OLD:=d51fa2c
+OLD:=7e6607a
.PHONY: bump
bump:
cd . && $(SED) -b "s/$(OLD)/$(NEW)/" Makefile
diff --git a/src/ifcopenshell-python/Makefile b/src/ifcopenshell-python/Makefile
index c76a6fddb9..9dcbebc906 100644
--- a/src/ifcopenshell-python/Makefile
+++ b/src/ifcopenshell-python/Makefile
@@ -52,8 +52,8 @@ ifeq ($(PLATFORM), win64)
PLATFORMTAG:=win_amd64
endif
-IOS_URL:=https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.11-d51fa2c-$(PLATFORM).zip
-IFCCONVERT_URL:=https://s3.amazonaws.com/ifcopenshell-builds/IfcConvert-v0.7.11-d51fa2c-$(PLATFORM).zip
+IOS_URL:=https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.11-7e6607a-$(PLATFORM).zip
+IFCCONVERT_URL:=https://s3.amazonaws.com/ifcopenshell-builds/IfcConvert-v0.7.11-7e6607a-$(PLATFORM).zip
.PHONY: test
test:
From c3bcc2d90c82774f51f2515f8b4c93160720a8d4 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 10:10:55 +1000
Subject: [PATCH 058/556] See #5243. types_with_super() is no longer available.
Also maybe overkill in this scenario.
---
src/bonsai/bonsai/bim/module/project/operator.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/project/operator.py b/src/bonsai/bonsai/bim/module/project/operator.py
index 957a34d513..d6de9a4dac 100644
--- a/src/bonsai/bonsai/bim/module/project/operator.py
+++ b/src/bonsai/bonsai/bim/module/project/operator.py
@@ -200,10 +200,8 @@ class RefreshLibrary(bpy.types.Operator):
self.props.active_library_element = ""
- types = IfcStore.library_file.wrapped_data.types_with_super()
-
for importable_type in sorted(tool.Project.get_appendable_asset_types()):
- if importable_type in types:
+ if IfcStore.library_file.by_type(importable_type):
new = self.props.library_elements.add()
new.name = importable_type
return {"FINISHED"}
From 2b70f12d442a8c079775c6f426a867b393847ef8 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 15:17:52 +1000
Subject: [PATCH 059/556] More bonsai name fixes
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 82849c0bb0..619e403cd7 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending
is possible at compile-time when using C++ and at run-time when using Python.
In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the ~~BlenderBIM~~ Bonsai Add-on (an add-on to Blender providing a graphical IFC authoring platform),
+to convert IFC models to other formats), Bonsai (an add-on to Blender providing a graphical IFC authoring platform),
and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
For more information, see:
@@ -37,7 +37,7 @@ Contents
| Name | Description | License | Service |
| ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
| bcf | Library to read and write BCF-XML and query OpenCDE BCF-API modules | LGPL-3.0-or-later | [](https://pypi.org/project/bcf-client/) |
-| ~~blenderbim~~ Bonsai | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later | [](https://bonsaibim.org/download.html) [](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=blenderbim&expanded=true) [](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| bonsai | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later | [](https://bonsaibim.org/download.html) [](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [](https://community.chocolatey.org/packages/blenderbim-nightly/) |
| bsdd | Library to query the bSDD API | LGPL-3.0-or-later | [](https://pypi.org/project/bsdd/) |
| ifc2ca | Utility to convert IFC structural analysis models to Code_Aster | LGPL-3.0-or-later |
| ifc4d | Convert to and from IFC and project management software | LGPL-3.0-or-later | [](https://pypi.org/project/ifc4d/) |
From 80a396dc1237ddde95e6aa2e65eaf059b1a2b2c0 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 16:22:10 +1000
Subject: [PATCH 060/556] You can now select geometry library in advanced
settings
---
src/bonsai/bonsai/bim/import_ifc.py | 14 ++++++++++++--
src/bonsai/bonsai/bim/module/project/prop.py | 9 +++++++++
src/bonsai/bonsai/bim/module/project/ui.py | 2 ++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/bonsai/bonsai/bim/import_ifc.py b/src/bonsai/bonsai/bim/import_ifc.py
index c5eae6c4d9..dd944cb6e7 100644
--- a/src/bonsai/bonsai/bim/import_ifc.py
+++ b/src/bonsai/bonsai/bim/import_ifc.py
@@ -715,9 +715,17 @@ class IfcImporter:
if not products:
return results
if tool.Loader.settings.should_use_cpu_multiprocessing:
- iterator = ifcopenshell.geom.iterator(settings, self.file, multiprocessing.cpu_count(), include=products)
+ iterator = ifcopenshell.geom.iterator(
+ settings,
+ self.file,
+ multiprocessing.cpu_count(),
+ include=products,
+ geometry_library=self.ifc_import_settings.geometry_library,
+ )
else:
- iterator = ifcopenshell.geom.iterator(settings, self.file, include=products)
+ iterator = ifcopenshell.geom.iterator(
+ settings, self.file, include=products, geometry_library=self.ifc_import_settings.geometry_library
+ )
if self.ifc_import_settings.should_cache:
cache = IfcStore.get_cache()
if cache:
@@ -1473,6 +1481,7 @@ class IfcImportSettings:
self.logger: logging.Logger = None
self.input_file = None
self.diff_file = None
+ self.geometry_library = "opencascade"
self.should_use_cpu_multiprocessing = True
self.should_merge_materials_by_colour = False
self.should_load_geometry = True
@@ -1508,6 +1517,7 @@ class IfcImportSettings:
logger = logging.getLogger("ImportIFC")
settings.logger = logger
settings.diff_file = scene_diff.diff_json_file
+ settings.geometry_library = props.geometry_library
settings.should_use_cpu_multiprocessing = props.should_use_cpu_multiprocessing
settings.should_merge_materials_by_colour = props.should_merge_materials_by_colour
settings.should_load_geometry = props.should_load_geometry
diff --git a/src/bonsai/bonsai/bim/module/project/prop.py b/src/bonsai/bonsai/bim/module/project/prop.py
index 340ffcb85f..5bbad8d5fb 100644
--- a/src/bonsai/bonsai/bim/module/project/prop.py
+++ b/src/bonsai/bonsai/bim/module/project/prop.py
@@ -143,6 +143,15 @@ class BIMProjectProperties(PropertyGroup):
active_filter_category_index: IntProperty(name="Active Filter Category Index")
filter_query: StringProperty(name="Filter Query")
should_filter_spatial_elements: BoolProperty(name="Filter Spatial Elements", default=False)
+ geometry_library: bpy.props.EnumProperty(
+ items=[
+ ("opencascade", "OpenCASCADE", "Best for stability and accuracy"),
+ ("cgal", "CGAL", "Best for speed"),
+ ("cgal-simple", "CGAL Simple", "CGAL without booleans"),
+ ("hybrid-cgal-simple-opencascade", "Hybrid CGAL-OCC", "First CGAL then fallback to OCC"),
+ ],
+ name="Geometry Library",
+ )
should_use_cpu_multiprocessing: BoolProperty(name="CPU Multiprocessing", default=True)
should_merge_materials_by_colour: BoolProperty(name="Merge Materials by Colour", default=False)
should_stream: BoolProperty(name="Stream Data From IFC-SPF (Only for advanced users)", default=False)
diff --git a/src/bonsai/bonsai/bim/module/project/ui.py b/src/bonsai/bonsai/bim/module/project/ui.py
index 05f8bdbd27..ef41dd598e 100644
--- a/src/bonsai/bonsai/bim/module/project/ui.py
+++ b/src/bonsai/bonsai/bim/module/project/ui.py
@@ -175,6 +175,8 @@ class BIM_PT_project(Panel):
row = self.layout.row()
row.prop(pprops, "should_merge_materials_by_colour")
row = self.layout.row()
+ row.prop(pprops, "geometry_library")
+ row = self.layout.row()
row.prop(pprops, "deflection_tolerance")
row = self.layout.row()
row.prop(pprops, "angular_tolerance")
From 711c59706593a3ea9391a67d43fe329e376a4a18 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 16:22:35 +1000
Subject: [PATCH 061/556] See #5231. Workaround for missing offset.
---
.../bonsai/bim/module/drawing/operator.py | 60 ++++++++++++++++++-
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py
index b4544c5d79..1b6b291c90 100644
--- a/src/bonsai/bonsai/bim/module/drawing/operator.py
+++ b/src/bonsai/bonsai/bim/module/drawing/operator.py
@@ -471,11 +471,35 @@ class CreateDrawing(bpy.types.Operator):
geom_settings = ifcopenshell.geom.settings()
geom_settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)
geom_settings.set("iterator-output", ifcopenshell.ifcopenshell_wrapper.NATIVE)
+ # See bug 5231 - offset no longer available in v0.8.0
+ absolute_placements = set()
+ placement_replacements = {}
if ifc.by_id(context[0]).ContextType == "Plan" and "PLAN_VIEW" in target_view:
- offset = ifcopenshell.ifcopenshell_wrapper.float_array_3()
# A 2mm Z offset to combat Z-fighting in plan or RCPs
- offset[2] = 0.002 if target_view == "PLAN_VIEW" else -0.002
- geom_settings.offset = offset
+ offset_z = 0.002 if target_view == "PLAN_VIEW" else -0.002
+
+ for product in self.file.by_type("IfcProduct"):
+ if not product.ObjectPlacement:
+ continue
+ absolute_placement = self.get_absolute_placement(product.ObjectPlacement)
+ if absolute_placement.is_a("IfcLocalPlacement"):
+ absolute_placements.add(absolute_placement)
+
+ transformation = np.eye(4)
+ transformation[2][3] = offset_z
+
+ # Don't use undo system in case we bork up a parent caller
+ for placement in absolute_placements:
+ old = placement.RelativePlacement
+ new = self.get_relative_placement(
+ ifc, transformation @ ifcopenshell.util.placement.get_local_placement(placement)
+ )
+ placement.RelativePlacement = new
+ placement_replacements[placement] = (old, new)
+
+ # offset = ifcopenshell.ifcopenshell_wrapper.float_array_3()
+ # offset[2] = 0.002 if target_view == "PLAN_VIEW" else -0.002
+ # geom_settings.offset = offset
geom_settings.set("context-ids", context)
it = ifcopenshell.geom.iterator(
geom_settings, ifc, multiprocessing.cpu_count(), include=drawing_elements
@@ -487,6 +511,36 @@ class CreateDrawing(bpy.types.Operator):
tree.add_element(elem)
drawing_elements -= processed
+ for placement, oldnew in placement_replacements.items():
+ old, new = oldnew
+ placement.RelativePlacement = old
+ ifcopenshell.util.element.remove_deep2(ifc, new)
+ placement_replacements = {}
+
+ def get_absolute_placement(self, object_placement):
+ if object_placement.PlacementRelTo:
+ return self.get_absolute_placement(object_placement.PlacementRelTo)
+ return object_placement
+
+ def get_relative_placement(self, ifc, m):
+ x = np.array((m[0][0], m[1][0], m[2][0]))
+ z = np.array((m[0][2], m[1][2], m[2][2]))
+ o = np.array((m[0][3], m[1][3], m[2][3]))
+ object_matrix = ifcopenshell.util.placement.a2p(o, z, x)
+ return self.create_ifc_axis_2_placement_3d(
+ ifc,
+ object_matrix[:, 3][0:3],
+ object_matrix[:, 2][0:3],
+ object_matrix[:, 0][0:3],
+ )
+
+ def create_ifc_axis_2_placement_3d(self, ifc, point, up, forward):
+ return self.file.createIfcAxis2Placement3D(
+ self.file.createIfcCartesianPoint(point.tolist()),
+ self.file.createIfcDirection(up.tolist()),
+ self.file.createIfcDirection(forward.tolist()),
+ )
+
def generate_linework(self, context: bpy.types.Context) -> Union[str, None]:
if not ifcopenshell.util.element.get_pset(self.drawing, "EPset_Drawing", "HasLinework"):
return
From fda23f350a584a45c111d2846ef37193c4aaa710 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 17:19:28 +1000
Subject: [PATCH 062/556] Fix #5247. Fix typo when opening drawing web UI.
---
src/bonsai/bonsai/bim/module/drawing/operator.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py
index 1b6b291c90..70e58dfaf3 100644
--- a/src/bonsai/bonsai/bim/module/drawing/operator.py
+++ b/src/bonsai/bonsai/bim/module/drawing/operator.py
@@ -2937,5 +2937,5 @@ class OpenDocumentationWebUi(bpy.types.Operator):
if not context.scene.WebProperties.is_connected:
bpy.ops.bim.connect_websocket_server(page="documentation")
else:
- bpy.ops.bim.bim.open_web_browser(page="documentation")
+ bpy.ops.bim.open_web_browser(page="documentation")
return {"FINISHED"}
From 8164b496f87fc4092081151f4b92ef67d046b54a Mon Sep 17 00:00:00 2001
From: Ziad-I <68874104+Ziad-I@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:50:50 +0300
Subject: [PATCH 063/556] fix #5219 underlay links are now base64 encoded in
the svg before sending it to web UI
this is not really the best solution and might need to look for better ones
---
src/bonsai/bonsai/bim/data/webui/sioserver.py | 38 +++++++++++++++++--
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/bonsai/bonsai/bim/data/webui/sioserver.py b/src/bonsai/bonsai/bim/data/webui/sioserver.py
index 8d88f05aa5..fe49b03bdd 100644
--- a/src/bonsai/bonsai/bim/data/webui/sioserver.py
+++ b/src/bonsai/bonsai/bim/data/webui/sioserver.py
@@ -1,6 +1,6 @@
import sys
import os
-import webbrowser
+
bonsai_lib_path = os.environ.get("BONSAI_LIB_PATH")
bonsai_version = os.environ.get("BONSAI_VERSION")
@@ -13,6 +13,8 @@ from aiohttp import web
import socketio
import pystache
import json
+import base64
+import xml.etree.ElementTree as ET
sio_port = 8080 # default port
@@ -56,9 +58,8 @@ class WebNamespace(socketio.AsyncNamespace):
async def on_get_svg(self, sid, data):
file_path = data["path"]
- with open(file_path, "r") as file:
- svg_data = file.read()
- await sio.emit("svg_data", svg_data, room=sid, namespace="/web")
+ svg = await self.process_svg(file_path)
+ await sio.emit("svg_data", svg, room=sid, namespace="/web")
async def send_cached_messages(self, sid):
# Send cached messages to the connected web client
@@ -70,6 +71,35 @@ class WebNamespace(socketio.AsyncNamespace):
if "demo_data" in messages:
await self.emit("demo_data", {"blenderId": blenderId, "data": messages["demo_data"]}, room=sid)
+ async def process_svg(self, file_path):
+ def encode_image(filepath):
+ # Encode file content to base64 string
+ with open(filepath, "rb") as file:
+ encoded_string = base64.b64encode(file.read()).decode("utf-8")
+ return f"data:image;base64,{encoded_string}"
+
+ file_dir = os.path.dirname(file_path)
+
+ ET.register_namespace("", "http://www.w3.org/2000/svg")
+ ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")
+
+ tree = ET.parse(file_path)
+ root = tree.getroot()
+
+ namespaces = {
+ "svg": "http://www.w3.org/2000/svg",
+ "xlink": "http://www.w3.org/1999/xlink",
+ }
+
+ for element in root.findall(".//svg:image[@xlink:href]", namespaces):
+ href = element.get("{http://www.w3.org/1999/xlink}href")
+ if href and href.endswith((".png", ".svg", ".jpeg")):
+ img_path = os.path.join(file_dir, href)
+ if os.path.exists(img_path):
+ base64_data = encode_image(img_path)
+ element.set("{http://www.w3.org/1999/xlink}href", base64_data)
+ return ET.tostring(root, "unicode")
+
# Blender namespace
class BlenderNamespace(socketio.AsyncNamespace):
From 486eb259ea9e69679ee286847c2da79f4a26d10e Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 18:09:17 +1000
Subject: [PATCH 064/556] Fix #5245. Consider situation where object may not be
loaded due to partial loading.
---
src/bonsai/bonsai/tool/drawing.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bonsai/bonsai/tool/drawing.py b/src/bonsai/bonsai/tool/drawing.py
index 93dfbaf732..ce7e272b4d 100644
--- a/src/bonsai/bonsai/tool/drawing.py
+++ b/src/bonsai/bonsai/tool/drawing.py
@@ -1875,7 +1875,7 @@ class Drawing(bonsai.core.tool.Drawing):
@classmethod
def get_elements_in_camera_view(
- cls, camera: bpy.types.Object, objs: list[ifcopenshell.entity_instance]
+ cls, camera: bpy.types.Object, objs: list[bpy.types.Object]
) -> set[ifcopenshell.entity_instance]:
props = camera.data.BIMCameraProperties
x = props.width
@@ -1886,7 +1886,8 @@ class Drawing(bonsai.core.tool.Drawing):
[
tool.Ifc.get_entity(o)
for o in objs
- if cls.is_in_camera_view(o, camera_inverse_matrix, x, y, camera.data.clip_start, camera.data.clip_end)
+ if o
+ and cls.is_in_camera_view(o, camera_inverse_matrix, x, y, camera.data.clip_start, camera.data.clip_end)
and tool.Ifc.get_entity(o)
]
)
From aff893e690a4980acac7cb9cf404720754cb131d Mon Sep 17 00:00:00 2001
From: Andrej730
Date: Thu, 29 Aug 2024 13:37:02 +0500
Subject: [PATCH 065/556] bim.create_drawing - poll message
---
src/bonsai/bonsai/bim/module/drawing/operator.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py
index 70e58dfaf3..966177a56c 100644
--- a/src/bonsai/bonsai/bim/module/drawing/operator.py
+++ b/src/bonsai/bonsai/bim/module/drawing/operator.py
@@ -204,7 +204,12 @@ class CreateDrawing(bpy.types.Operator):
@classmethod
def poll(cls, context):
- return bool(tool.Ifc.get() and tool.Drawing.is_drawing_active())
+ if not tool.Ifc.get():
+ return False
+ if not tool.Drawing.is_drawing_active():
+ cls.poll_message_set("No active drawing.")
+ return False
+ return True
def invoke(self, context, event):
# printing all drawings on shift+click
From 87d696035652dd12cb9e6659d4dac64985a6bc67 Mon Sep 17 00:00:00 2001
From: Andrej730
Date: Thu, 29 Aug 2024 13:41:57 +0500
Subject: [PATCH 066/556] Fix #5249 after acf135a
---
src/bonsai/bonsai/bim/module/geometry/operator.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/geometry/operator.py b/src/bonsai/bonsai/bim/module/geometry/operator.py
index 12d0844017..2cdf73dc10 100644
--- a/src/bonsai/bonsai/bim/module/geometry/operator.py
+++ b/src/bonsai/bonsai/bim/module/geometry/operator.py
@@ -1654,8 +1654,9 @@ class OverrideModeSetEdit(bpy.types.Operator):
should_sync_changes_first=False,
apply_openings=False,
)
- tool.Geometry.apply_item_ids_as_vertex_groups(obj)
- tool.Geometry.dissolve_triangulated_edges(obj)
+ if isinstance(obj.data, bpy.types.Mesh):
+ tool.Geometry.apply_item_ids_as_vertex_groups(obj)
+ tool.Geometry.dissolve_triangulated_edges(obj)
obj.data.BIMMeshProperties.mesh_checksum = tool.Geometry.get_mesh_checksum(obj.data)
else:
obj.select_set(False)
From 4a59b30f1bc41206ae04e97a1c2db00e3431cafb Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 18:42:37 +1000
Subject: [PATCH 067/556] Fix #5244. Prioritise collection of drawing groups
over containment groups
---
.../bonsai/bim/module/drawing/operator.py | 5 +++-
src/bonsai/bonsai/tool/collector.py | 29 ++++++++++---------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py
index 966177a56c..37e8a67837 100644
--- a/src/bonsai/bonsai/bim/module/drawing/operator.py
+++ b/src/bonsai/bonsai/bim/module/drawing/operator.py
@@ -1770,7 +1770,10 @@ class ReloadDrawingStyles(bpy.types.Operator):
drawing_style.raster_style = json.dumps(style_data["raster_style"])
if current_style is not None:
- camera_props.active_drawing_style_index = styles.index(current_style)
+ try:
+ camera_props.active_drawing_style_index = styles.index(current_style)
+ except ValueError:
+ self.report({"INFO"}, f"Could not find style {current_style} in EPset_Drawing.ShadingStyles.")
return {"FINISHED"}
diff --git a/src/bonsai/bonsai/tool/collector.py b/src/bonsai/bonsai/tool/collector.py
index b5b163d967..c442df6a04 100644
--- a/src/bonsai/bonsai/tool/collector.py
+++ b/src/bonsai/bonsai/tool/collector.py
@@ -79,26 +79,19 @@ class Collector(bonsai.core.tool.Collector):
cls.link_to_collection_safe(obj, collection)
project_obj = tool.Ifc.get_object(tool.Ifc.get().by_type("IfcProject")[0])
cls.link_to_collection_safe(collection, project_obj.BIMObjectProperties.collection)
+ elif element.is_a("IfcAnnotation") and element.ObjectType == "DRAWING":
+ if collection := cls._create_own_collection(obj):
+ cls.link_to_collection_safe(obj, collection)
+ project_obj = tool.Ifc.get_object(tool.Ifc.get().by_type("IfcProject")[0])
+ cls.link_to_collection_safe(collection, project_obj.BIMObjectProperties.collection)
+ elif element.is_a("IfcAnnotation") and (drawing_obj := cls.get_annotation_drawing_obj(element)):
+ cls.link_to_collection_safe(obj, drawing_obj.BIMObjectProperties.collection)
elif container := ifcopenshell.util.element.get_container(element):
container_obj = tool.Ifc.get_object(container)
if not (collection := container_obj.BIMObjectProperties.collection):
cls.assign(container_obj)
collection = container_obj.BIMObjectProperties.collection
cls.link_to_collection_safe(obj, collection)
- elif element.is_a("IfcAnnotation"):
- if element.ObjectType == "DRAWING":
- if collection := cls._create_own_collection(obj):
- cls.link_to_collection_safe(obj, collection)
- project_obj = tool.Ifc.get_object(tool.Ifc.get().by_type("IfcProject")[0])
- cls.link_to_collection_safe(collection, project_obj.BIMObjectProperties.collection)
- else:
- for rel in element.HasAssignments or []:
- if rel.is_a("IfcRelAssignsToGroup") and rel.RelatingGroup.ObjectType == "DRAWING":
- for related_object in rel.RelatedObjects:
- if related_object.is_a("IfcAnnotation") and related_object.ObjectType == "DRAWING":
- drawing_obj = tool.Ifc.get_object(related_object)
- if drawing_obj:
- cls.link_to_collection_safe(obj, drawing_obj.BIMObjectProperties.collection)
else:
collection = cls._create_project_child_collection("Unsorted")
collection.hide_viewport = False
@@ -126,6 +119,14 @@ class Collector(bonsai.core.tool.Collector):
collection.BIMCollectionProperties.obj = obj
return collection
+ @classmethod
+ def get_annotation_drawing_obj(cls, element: ifcopenshell.entity_instance) -> bpy.types.Object | None:
+ for rel in element.HasAssignments or []:
+ if rel.is_a("IfcRelAssignsToGroup") and rel.RelatingGroup.ObjectType == "DRAWING":
+ for related_object in rel.RelatedObjects:
+ if related_object.is_a("IfcAnnotation") and related_object.ObjectType == "DRAWING":
+ return tool.Ifc.get_object(related_object)
+
@classmethod
def link_to_collection_safe(
cls, obj_or_col: Union[bpy.types.Object, bpy.types.Collection], collection: bpy.types.Collection
From f3ab21475210ba1778f94ca81db1904e588e45ac Mon Sep 17 00:00:00 2001
From: Andrej730
Date: Thu, 29 Aug 2024 17:21:18 +0500
Subject: [PATCH 068/556] Use first layer/profile from the set to pick up the
material #5238
As currently we do not support multilayer/profile geometry and therefore we can't correctly represent them when they have multiple styles. As a workaround we'll use the material/style from the first layer and apply it to the entire object.
---
src/bonsai/bonsai/tool/geometry.py | 1 +
src/bonsai/bonsai/tool/loader.py | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/bonsai/bonsai/tool/geometry.py b/src/bonsai/bonsai/tool/geometry.py
index 2ab8d261e2..7eb851a5c2 100644
--- a/src/bonsai/bonsai/tool/geometry.py
+++ b/src/bonsai/bonsai/tool/geometry.py
@@ -582,6 +582,7 @@ class Geometry(bonsai.core.tool.Geometry):
settings = ifcopenshell.geom.settings()
settings.set("weld-vertices", True)
settings.set("apply-default-materials", False)
+ settings.set("layerset-first", True)
settings.set("keep-bounding-boxes", True)
context = representation.ContextOfItems
diff --git a/src/bonsai/bonsai/tool/loader.py b/src/bonsai/bonsai/tool/loader.py
index 701ea6a83e..c10f1fde50 100644
--- a/src/bonsai/bonsai/tool/loader.py
+++ b/src/bonsai/bonsai/tool/loader.py
@@ -568,6 +568,7 @@ class Loader(bonsai.core.tool.Loader):
settings.set("context-ids", [context.id()])
settings.set("apply-default-materials", False)
settings.set("keep-bounding-boxes", True)
+ settings.set("layerset-first", True)
if is_gross:
settings.set("disable-opening-subtractions", True)
results.append(settings)
From 32b37b8823a6111689ee26f7844480d240327b81 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 21:57:45 +1000
Subject: [PATCH 069/556] Implement recursive toggling for elements in spatial
panel
---
.../bonsai/bim/module/spatial/operator.py | 9 ++-
src/bonsai/bonsai/core/spatial.py | 4 +-
src/bonsai/bonsai/tool/spatial.py | 62 +++++++++++++++----
3 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/src/bonsai/bonsai/bim/module/spatial/operator.py b/src/bonsai/bonsai/bim/module/spatial/operator.py
index 8d59dfa223..932b105acf 100644
--- a/src/bonsai/bonsai/bim/module/spatial/operator.py
+++ b/src/bonsai/bonsai/bim/module/spatial/operator.py
@@ -247,10 +247,17 @@ class ToggleContainerElement(bpy.types.Operator):
bl_idname = "bim.toggle_container_element"
bl_label = "Toggle Container Element"
bl_options = {"REGISTER", "UNDO"}
+ bl_description = "Toggle children\nALT+CLICK to recursively toggle children"
element_index: bpy.props.IntProperty()
+ is_recursive: bpy.props.BoolProperty(name="Is Recursive", default=False, options={"SKIP_SAVE"})
+
+ def invoke(self, context, event):
+ if event.type == "LEFTMOUSE" and event.alt:
+ self.is_recursive = True
+ return self.execute(context)
def execute(self, context):
- core.toggle_container_element(tool.Spatial, element_index=self.element_index)
+ core.toggle_container_element(tool.Spatial, element_index=self.element_index, is_recursive=self.is_recursive)
return {"FINISHED"}
diff --git a/src/bonsai/bonsai/core/spatial.py b/src/bonsai/bonsai/core/spatial.py
index 9a200626e4..ae05fdef08 100644
--- a/src/bonsai/bonsai/core/spatial.py
+++ b/src/bonsai/bonsai/core/spatial.py
@@ -141,8 +141,8 @@ def delete_container(
spatial.import_spatial_decomposition()
-def toggle_container_element(spatial: tool.Spatial, element_index: int) -> None:
- spatial.toggle_container_element(element_index)
+def toggle_container_element(spatial: tool.Spatial, element_index: int, is_recursive: bool) -> None:
+ spatial.toggle_container_element(element_index, is_recursive=is_recursive)
spatial.load_contained_elements()
diff --git a/src/bonsai/bonsai/tool/spatial.py b/src/bonsai/bonsai/tool/spatial.py
index 9b8cdbf46c..d9a6a75a10 100644
--- a/src/bonsai/bonsai/tool/spatial.py
+++ b/src/bonsai/bonsai/tool/spatial.py
@@ -199,14 +199,8 @@ class Spatial(bonsai.core.tool.Spatial):
src_obj.location.xy = destination_obj.location.xy
@classmethod
- def load_contained_elements(cls) -> None:
+ def get_grouped_elements_in_container(cls, container: ifcopenshell.entity_instance) -> dict:
props = bpy.context.scene.BIMSpatialDecompositionProperties
- props.elements.clear()
- if not (container := props.active_container):
- return
-
- container = tool.Ifc.get().by_id(container.ifc_definition_id)
-
results: defaultdict[str, dict[int, Any]] = defaultdict(dict)
if props.should_include_children:
elements = ifcopenshell.util.element.get_decomposition(container, is_recursive=True)
@@ -222,25 +216,39 @@ class Spatial(bonsai.core.tool.Spatial):
class_data = results.setdefault(ifc_class, {})
type_data = class_data.setdefault(ifc_definition_id, {"type_name": type_name, "elements": []})
type_data["elements"].append(element)
+ return results
+
+ @classmethod
+ def load_contained_elements(cls) -> None:
+ props = bpy.context.scene.BIMSpatialDecompositionProperties
+ props.elements.clear()
+ if not (container := props.active_container):
+ return
+
+ container = tool.Ifc.get().by_id(container.ifc_definition_id)
+ results = cls.get_grouped_elements_in_container(container)
expanded_elements = json.loads(props.expanded_elements)
expanded_classes = expanded_elements.get("CLASS", [])
expanded_ifc_ids = expanded_elements.get("IFC_ID", [])
expanded_untyped = expanded_elements.get("UNTYPED_CLASSES", [])
+ expanded_classes_r = expanded_elements.get("CLASS_R", [])
+
total_elements = 0
for ifc_class in sorted(results.keys()):
new = props.elements.add()
new.name = ifc_class
new.type = "CLASS"
class_is_expanded = ifc_class in expanded_classes
- new.is_expanded = class_is_expanded
+ class_is_expanded_r = ifc_class in expanded_classes_r
+ new.is_expanded = class_is_expanded or class_is_expanded_r
total = 0
for ifc_definition_id in sorted(
results[ifc_class].keys(), key=lambda x: results[ifc_class][x]["type_name"]
):
type_data = results[ifc_class][ifc_definition_id]
total2 = len(type_data["elements"])
- if class_is_expanded:
+ if new.is_expanded:
new2 = props.elements.add()
new2.type = "TYPE"
new2.name = type_data["type_name"]
@@ -251,9 +259,9 @@ class Spatial(bonsai.core.tool.Spatial):
type_is_expanded = ifc_class in expanded_untyped
else:
type_is_expanded = ifc_definition_id in expanded_ifc_ids
- new2.is_expanded = type_is_expanded
+ new2.is_expanded = type_is_expanded or class_is_expanded_r
- if type_is_expanded:
+ if new2.is_expanded:
for element in type_data["elements"]:
occurrence = props.elements.add()
occurrence.name = element.Name or "Unnamed"
@@ -363,25 +371,53 @@ class Spatial(bonsai.core.tool.Spatial):
props.contracted_containers = json.dumps(contracted_containers)
@classmethod
- def toggle_container_element(cls, element_index: int) -> None:
+ def toggle_container_element(cls, element_index: int, is_recursive: bool) -> None:
props = bpy.context.scene.BIMSpatialDecompositionProperties
+
expanded_elements: dict[str, list[Union[str, int]]] = json.loads(props.expanded_elements)
+
element = props.elements[element_index]
if element.type == "CLASS":
element_type = "CLASS"
filtered_item = element.name
- else:
+ elif element.type == "TYPE":
if element.ifc_definition_id == 0:
element_type = "UNTYPED_CLASSES"
filtered_item = element.ifc_class
else:
element_type = "IFC_ID"
filtered_item = element.ifc_definition_id
+ else:
+ return
+
expanded_elements_list: list[Union[str, int]] = expanded_elements.setdefault(element_type, [])
if filtered_item in expanded_elements_list:
expanded_elements_list.remove(filtered_item)
+ should_expand = False
else:
expanded_elements_list.append(filtered_item)
+ should_expand = True
+
+ if is_recursive and element.type == "CLASS":
+ container = tool.Ifc.get().by_id(props.active_container.ifc_definition_id)
+ results = cls.get_grouped_elements_in_container(container)
+ for ifc_class in results.keys():
+ if ifc_class != element.name:
+ continue
+ for ifc_definition_id in results[ifc_class].keys():
+ if ifc_definition_id == 0:
+ element_type = "UNTYPED_CLASSES"
+ filtered_item = ifc_class
+ else:
+ element_type = "IFC_ID"
+ filtered_item = ifc_definition_id
+
+ expanded_elements_list = expanded_elements.setdefault(element_type, [])
+ if should_expand is False and filtered_item in expanded_elements_list:
+ expanded_elements_list.remove(filtered_item)
+ elif should_expand is True and filtered_item not in expanded_elements_list:
+ expanded_elements_list.append(filtered_item)
+
props.expanded_elements = json.dumps(expanded_elements)
# HERE STARTS SPATIAL TOOL
From 15481c0a59733642890b03d82f17adcfbd4c1930 Mon Sep 17 00:00:00 2001
From: Dion Moult
Date: Thu, 29 Aug 2024 23:30:46 +1000
Subject: [PATCH 070/556] Bump docs to use spatial panel. Format menuselection.
---
src/bonsai/docs/quickstart/explore_model.rst | 165 +++++++++---------
.../quickstart/images/outliner-filter.png | Bin 33628 -> 0 bytes
.../quickstart/images/outliner-isolate.png | Bin 316659 -> 0 bytes
.../docs/quickstart/images/outliner.png | Bin 93463 -> 0 bytes
.../images/spatial-tree-features.png | Bin 0 -> 160951 bytes
.../docs/quickstart/images/spatial-tree.png | Bin 0 -> 47053 bytes
6 files changed, 79 insertions(+), 86 deletions(-)
delete mode 100644 src/bonsai/docs/quickstart/images/outliner-filter.png
delete mode 100644 src/bonsai/docs/quickstart/images/outliner-isolate.png
delete mode 100644 src/bonsai/docs/quickstart/images/outliner.png
create mode 100644 src/bonsai/docs/quickstart/images/spatial-tree-features.png
create mode 100644 src/bonsai/docs/quickstart/images/spatial-tree.png
diff --git a/src/bonsai/docs/quickstart/explore_model.rst b/src/bonsai/docs/quickstart/explore_model.rst
index 26851df24b..3ccc73830c 100644
--- a/src/bonsai/docs/quickstart/explore_model.rst
+++ b/src/bonsai/docs/quickstart/explore_model.rst
@@ -121,49 +121,34 @@ pressing the button on the top right of the **Viewport** panel. The hotkey is
Overview of all objects
-----------------------
-The **Outliner** panel on the top right shows a hierarchy of all the currently
-loaded physical **Objects** in your IFC project. These **Objects** correlate to
-what you can see in the **Viewport** panel.
+All physical **Elements** are organised in a hierarchy of **Spatial
+Containers**. By default, this hierarchy represents a breakdown of spaces, from
+large spaces such as a site and a building, down to smaller spaces like
+building storeys and room spaces. The hierarchy will always begin with an
+**IfcProject**.
-Every **Object** in the **Outliner** represents an IFC **Element**. These
-**Objects** have a name with the pattern ``Class/Name``. The class prefix
-represents the type of object, and the name is the name of the object. Examples
-of classes you will see are ``IfcBuilding``, or ``IfcWall``. This naming
-convention makes it easy to quickly spot types of objects.
+The :menuselection:`Properties --> Project Overview --> Spatial Decomposition`
+panel shows this hierarchy. Below, it shows a list of all **Elements**
+contained inside the actively selected **Spatial Container**.
-.. image:: images/outliner.png
+.. image:: images/spatial-tree.png
-Objects are organised in a hierarchy. By default, this hierarchy represents a
-breakdown of spaces, from large spaces such as a site and a building, down to
-smaller spaces like building storeys and room spaces. The hierarchy will always
-begin with an **IfcProject** object. You can click on the triangle to toggle the
-hierarchy.
+With a **Spatial Container** selected, use the **Isolate** button or **Hide /
+Show Icons** to quickly focus or control visibility. Use the search filters at
+the bottom of the **Container** or **Element** lists to quickly find objects,
+and use the **Select Icon** to select them.
+
+.. image:: images/spatial-tree-features.png
+
+**Elements** are grouped into IFC **Classes**, such as Wall, Slab, or Door.
+Within that, **Elements** are grouped into **Construction Types**. You'll see a
+count of how many objects of that type exist. In the example above, there is
+only one stair contained in the building storey.
.. tip::
- In large projects with deep hierarchies, you can ``Shift-LMB`` click the
- triangle to recursively toggle the hierarchy. You can also click and drag the
- ``MMB`` to pan left and right.
-
-When there are lots of objects, you can type a name in the filter box to quickly
-identify objects by name or type.
-
-.. image:: images/outliner-filter.png
-
-Clicking on an object in the **Outliner** panel also selects the corresponding
-object in the **Viewport** panel. A good strategy to find objects is to then use
-``View > Frame Selected`` to zoom to it in the **Viewport**.
-
-The **Outliner** panel is also great for isolating portions of your project. You
-can include and exclude portions by clicking on the **Tick Icon** next to
-collections of objects in the hierarchy.
-
-Let's isolate a single building storey. Start by disabling the **Tick Icon**
-next to the **IfcProject** collection. This will hide everything in the project.
-Then navigate through the hierarchy and enable the **Tick Icon** next to an
-**IfcBuildingStory**.
-
-.. image:: images/outliner-isolate.png
+ Hold :kbd:`Alt` when clicking on triangles in the hierarchy to show / hide
+ children recursively.
Viewing element classes
-----------------------
@@ -185,16 +170,15 @@ properties and relationships it is allowed to have. For example, a Wall
worry about memorising all the available **Classes**, you'll get a feel for them
as you explore more.
-To view an object's class, click on an object in the **Viewport** or **Outliner**
-panel, then switch to the **Object Information** tab in the **Properties** panel.
-You can see the **Class** name in the **Object Metadata** subpanel.
+To view an object's class, click on an object in the :menuselection:`3D
+Viewport`, then go to :menuselection:`Properties --> Object Information -->
+Object Metadata` to see the **Class** name.
.. image:: images/element-class.png
-In this case, the **Class** of our roof is an **IfcSlab**. You'll notice this is
-the same **Class** name used as a prefix for the object name in the **Outliner**
-panel. You can also see the name of the actively selected object in the top left
-of the **Viewport** panel.
+In this case, the **Class** of our roof is an **IfcSlab**. You can also see the
+name of the actively selected object in the top left of the :menuselection:`3D
+Viewport`.
.. warning::
@@ -219,24 +203,26 @@ not see it all the time.
classes and predefined types you should see.
Press the **Select Icon** to select all objects that are of the same
-**IfcSlab** **Class**. Then, you can isolate these elements by going to ``Object
-> Show/Hide > Hide Unselected`` (hotkey ``Shift-H``). To show all elements again, you can use
-``Object > Show/Hide > Show Hidden Objects`` (hotkey ``Alt-H``). If you want to
-hide elements instead, you can use ``Object > Show/Hidden > Hide Selected``
-(hotkey ``H``).
+**IfcSlab** **Class**. Then, you can isolate these elements by going to
+:menuselection:`3D Viewport --> Object --> Show/Hide --> Hide Unselected`
+(:kbd:`Shift-H`). To show all elements again, you can use :menuselection:`3D
+Viewport --> Object --> Show/Hide --> Show Hidden Objects` (:kbd:`Alt-H`). If
+you want to hide elements instead, you can use :menuselection:`3D Viewport -->
+Object --> Show/Hidden --> Hide Selected` (:kbd:`H`).
.. image:: images/element-class-select.png
.. note::
Remember that Blender's hotkeys are context sensitive. Make sure your mouse
- is hovering over the **Viewport** panel when you press a hotkey or no cake
- for you.
+ is hovering over the :menuselection:`Viewport` panel when you press a hotkey
+ or no cake for you.
You can also see statistics about the number of selected objects. If you right
-click on the bottom right status bar and enable **Scene Statistics** you will
-see information like **Objects 4/4**, which means that 4 objects are selected
-out of 4 available objects. This is a great way of counting objects like toilets.
+click on the bottom right :menuselection:`Status Bar` and enable **Scene
+Statistics** you will see information like **Objects 4/4**, which means that 4
+objects are selected out of 4 available objects. This is a great way of
+counting objects like toilets.
.. image:: images/scene-statistics.png
@@ -244,7 +230,7 @@ Viewing attributes and properties
---------------------------------
You can view the **Attributes**, **Properties**, and **Quantities** of the
-selected object in the **Object Properties** tab.
+selected object in the :menuselection:`Properties --> Object Information` tab.
Let's focus on **Attributes** first. Scroll down to the **Attributes**
subpanel. **Attributes** are a limited set of fundamental data (usually less
@@ -279,7 +265,8 @@ have different **Properties** depending on what information they want to store.
Each **Property** has a name and a value, and are grouped into **Property
Sets**. Each **Property Set** also has a name.
-You can find **Properties** in the **Object Property Sets** subpanel.
+You can find **Properties** in the :menuselection:`Properties --> Object
+Information --> Property Sets` panel.
.. image:: images/psets.png
@@ -303,7 +290,8 @@ value, and are grouped into **Quantity Sets**. Similarly, there are also common
quantities defined as part of the international standard, denoted by the prefix
``Qto_``. This prefix is short for "Quantity Take-Off".
-You can find **Quantities** in the **Object Quantity Sets** subpanel.
+You can find **Quantities** in the :menuselection:`Properties --> Object
+Information --> Quantity Sets` panel.
.. image:: images/qtos.png
@@ -313,16 +301,17 @@ Finding the location of objects
Every object in the built environment has a location in the world. For example,
a chair will be located in a space, and a wall is typically located in a
building storey. You've already seen this hierarchy of spaces in the
-**Outliner** panel, where an IFC project is broken down into site, building,
-storeys, and spaces.
+:menuselection:`Properties --> Project Overview --> Spatial Decomposition`
+panel, where an IFC project is broken down into site, building, storeys, and
+spaces.
Sometimes, objects may have multiple relevant locations, such
as a multi-storey column which can be related to multiple building storeys.
Even in these cases, IFC enforces one location to be its primary
location, known as its **Spatial Container**.
-If you click on any object, you can see its location in the **Spatial
-Container** subpanel in the **Object Information** tab.
+If you click on any object, you can see its location in the
+:menuselection:`Properties --> Object Information --> Spatial Container` panel.
Press the **Select Icon** to select all objects that are in the same location.
@@ -334,20 +323,22 @@ Checking construction types
Almost everything in the built environment will have a **Construction Type**.
For example, an architect will specify a door type for every door in a project.
-You can see a list of **Construction Types** in the **Outliner** panel in the
-**Types** collection. For example, if the architect has a wall types schedule
-with the wall type names of ``WT01``, ``WT02``, and ``WT03``, you should see
-three **IfcWallType** objects with those same names in the **Outliner**.
+You can see a list of **Construction Types** in the :menuselection:`Outliner`
+in the **Types** collection. For example, if the architect has a wall types
+schedule with the wall type names of ``WT01``, ``WT02``, and ``WT03``, you
+should see three **IfcWallType** objects with those same names in the
+**Outliner**.
You can click on these types to see more details about them in the
-**Properties** panel.
+:menuselection:`Properties` panel.
.. image:: images/outliner-types.png
-When selecting an object, you can also see its construction type in **Object
-Information** under the **Type** subpanel. You can press the **Select Icon** to
-select all objects that are of the same **Construction Type**. You can use the
-hide and isolate hotkeys to quickly view them in the model.
+When selecting an object, you can also see its construction type in
+:menuselection:`Properties --> Object Information --> Type`. You can press the
+**Select Icon** to select all objects that are of the same **Construction
+Type**. You can use the hide and isolate hotkeys to quickly view them in the
+model.
.. image:: images/properties-types.png
@@ -361,10 +352,10 @@ geometry of the pump, so all occurrences of that pump will have the same
geometry.
You can visually inspect types in isolation to the rest of the model. Types are
-hidden by default, so first enable the visibility of the **Types** collection in
-the **Outliner** by pressing the **Visibility Icon**. Then, select a type, and
-click on ``View > Local View > Toggle Local View`` (hotkey ``/``) in the
-**Viewport**. Toggle the view to see the entire model again.
+hidden by default, so first enable the visibility of the **Types** collection
+in the **Outliner** by pressing the **Visibility Icon**. Then, select a type,
+and click on :menuselection:`3D Viewport --> View --> Local View --> Toggle
+Local View` (:kbd:`/`). Toggle the view to see the entire model again.
.. image:: images/type-local-view.png
@@ -383,8 +374,8 @@ resources. For example, a **Material** might be blockwork. Another
**Material** might be in-situ concrete. **Materials** are grouped into
categories like steel, concrete, brick, block, and so on.
-We can see a list of **Materials** used in the project in the **Materials**
-subpanel in the **Geometry and Materials** tab.
+We can see a list of **Materials** used in the project in the
+:menuselection:`Properties --> Geometry and Materials --> Materials` panel.
Press the **Select Icon** to select all objects that are of the selected
material.
@@ -395,18 +386,20 @@ Taking simple measurements
--------------------------
The simplest form of measurement is the one that's already taken for you. The
-**Viewing attributes and properties** section describes how to view
-pre-calculated **Quantities**.
+:ref:`quickstart/explore_model:Viewing attributes and properties` section
+describes how to view pre-calculated **Quantities**.
Sometimes, you may wish to take manual measurements yourself. You can view the
overall X, Y, and Z dimensions of the currently selected object in the
-**Derived Coordinates** subpanel in the **Geometry and Materials** tab.
+:menuselection:`Properties --> Geometry and Materials --> Placement --> Derived
+Coordinates` panel.
.. image:: images/dimensions.png
Another way to manually measure from two points is to use the **Measure** tool.
First, press the **Snap Icon** to enable snapping. Then choose snap targets in
-the **Snap Menu** in the top middle section of the **Viewport** panel.
+the **Snap Menu** in the top middle section of the :menuselection:`3D
+Viewport`.
.. image:: images/snap-targets.png
@@ -418,12 +411,12 @@ the **Snap Menu** in the top middle section of the **Viewport** panel.
measurements will automatically snap to the nearest object's surface.
Now that you have configured snapping, press the **Measure Tool Icon** on the
-left of the **Viewport** panel. **Click** and **Drag** in the 3D viewport to
-take a measurement. A circle will appear guiding the first point of your
-measurement. While **Dragging**, press the ``X`` key to lock the measurement
-line along the X axis. Alternatively, press the ``Y`` or ``Z`` key to lock the
-measurement line along the Y or Z axis. Let go of the mouse to finish your
-measurement.
+left of the :menuselection:`3D Viewport`. **Click** and **Drag** in the 3D
+viewport to take a measurement. A circle will appear guiding the first point of
+your measurement. While **Dragging**, press the ``X`` key to lock the
+measurement line along the X axis. Alternatively, press the ``Y`` or ``Z`` key
+to lock the measurement line along the Y or Z axis. Let go of the mouse to
+finish your measurement.
.. image:: images/measure-tool.png
diff --git a/src/bonsai/docs/quickstart/images/outliner-filter.png b/src/bonsai/docs/quickstart/images/outliner-filter.png
deleted file mode 100644
index 08cafb6632b9948661d7e0715035ebfeaef82ad4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 33628
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
diff --git a/src/bonsai/docs/quickstart/images/outliner-isolate.png b/src/bonsai/docs/quickstart/images/outliner-isolate.png
deleted file mode 100644
index ee6cc3ff2a7a53e2dea8f21c7ae804f2cb6ae6cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 316659
zcmeFZc{G*%|311iL`W(!XKIjn3K^535fP$9+Zbh@GlkG#NRy0}LZL{e44FcxWJ*zH
zsmzio!@2IB=lKlh{MI__yVg1XeLYXB-M06=@B4kf-mlm7x~}WBFCW#}zn+eRjzl7@
zKX^bxpG2ZEB9SOkY1iVJzAa})@Yj25
zlq5<#ABI1h@R)cF@rPp#^`E~Z@R;-O$2aj<@bA~)tt81c6r}a|I}v}R@R%8YXW)-r
z_+Ov(5|4==+CTptz$4#o(S2H$eNWzJgw&^+zkkSg(8Yz>l%6p_#E9E8(Zj=;g{pD`({a|FnykB~
z0`2Z=M$ptPdwWf|%rP=?u%wv;$=~~45T~=_)j3DQQGZP)bz0uAJ8wiRb*}4Aa+%Lf
zPW=*VcwXAHyl1h!w1#x|0GDl;-DW4IrgNQZhyD8{gzJT-_Do$o$hs|Hu(+jP?ww{V
zbuzoG^mm_riD$;67O7WF>f0`*UlzznJNELL!?OmTtIv%dKbuuvpjY?tw~iZ;*&p+Y
z|2D7M#bAzxM-^H(jgpw@?K*Y6=l7eIYlwxKT1&W!+@o8cJ3_M>((~m+=;L}LeZe&|
zrSk9U*xr}W%Zx<*^dFUfySZYO!Sp+KVE&pn0oTnY&cq0uKFwKFG=8RGtMdy=237Xl
zT_xA=rX3X|P1w$8?>RlWh4yLw`Lh!PGizQSJ^q-px0i`cTz|H>uH<*I@9()ICFMNK
zdtHaigVhcq2EFYJjNOg3k0@9=If#+1oGh%xyd9j08%9!6^>!v(p0#%8wXn9eb5!P^
zC@JUXwX;&@KfYUALfcv0`i$Ly^RCv%&g&Rho?CJDhWL
zQ}9;i|8ragJSLtN=jZ+N68E#p{KkkQbthMAUKueNF$qykZ#z#Zeib@iC08pO1$_;z
zzYl?bDf6FkcXw707x(h=67!N4b8@v6m)x^wkGO=CxRjJAULoq{`hu4$gnxg~k4_SGwET{Clzf>)eRn{JEU}JQ2M8
zU&sBgSO0VEe_o7NX=^KJI9YlSr*}|8nV~47(8Oc48QnE7t
zevy&2s~aMbIOd<+`R6ypZBf9*U}4EboZwd=pn#p{eUaTl;)qLLD#Qj-5Hn9Sb`CjR#YixWBHpDR`p
z|9`BB(w`UnN0Pz&{(26{3%OAIU&-+AHN*M-|M~Oxz4-t0BY1iL_e1_i>-)dU^}oyY
zKU#tR(To2#y8d^${zohDKYH>1M%Vvm%SHF^cFNijD98)V(tQp3Bs5xUEe`M3AbleB
zlKAe3+C0WH>zogmxRFTon~6VbNb!kmc#_8bptdH>FdYju8|9qh?qm{)mvm4=&A_{J
z)Zfe4z;!vi#YTc}3wU3jEt+4kyDv!;aSjc>)0@prUkGaW5*C2Phr
zdS2c67XM0YmQ9ms({TB_nF>y;>3yK
znZ%DDjpyg*A1NI-F}d8N@;j?8gahZnAM>cu_2>8WyB4pn@r|wMSX*yT)4i*6C;VR5
zw=vi1AZwE`Dx=Y{G4kot7ls;Rt6#mMqG9CXHT~zF?44{=)4N%F)4|{0fByIH>W&W9
zj%@R~2m7Pv-O|$1yyw1ntx-CtXI|ndYGGkPtGD{9)QU_FDlS$qFf=62{uJZWI|&Jv
zT?GyYbaju*i^Uw6>