From c4204023349dde562d8df3cbbde017fa685289ae Mon Sep 17 00:00:00 2001 From: falken10 Date: Fri, 16 May 2025 11:17:09 +0200 Subject: [PATCH] black . formating --- .../bonsai/bim/module/geometry/__init__.py | 1 - .../bonsai/bim/module/geometry/operator.py | 1 - .../bonsai/bim/module/project/__init__.py | 4 +++- .../bonsai/bim/module/project/operator.py | 24 +++++++++++++++---- src/bonsai/bonsai/bim/module/project/prop.py | 7 ++++-- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/geometry/__init__.py b/src/bonsai/bonsai/bim/module/geometry/__init__.py index 690f02f870..bba979af30 100644 --- a/src/bonsai/bonsai/bim/module/geometry/__init__.py +++ b/src/bonsai/bonsai/bim/module/geometry/__init__.py @@ -214,4 +214,3 @@ def unregister(): for km, kmi in addon_keymaps: km.keymap_items.remove(kmi) addon_keymaps.clear() - diff --git a/src/bonsai/bonsai/bim/module/geometry/operator.py b/src/bonsai/bonsai/bim/module/geometry/operator.py index 2b414cc043..7fcc3c6e8e 100644 --- a/src/bonsai/bonsai/bim/module/geometry/operator.py +++ b/src/bonsai/bonsai/bim/module/geometry/operator.py @@ -3435,7 +3435,6 @@ class UnassignRepresentationLayer(bpy.types.Operator, tool.Ifc.Operator): ifcopenshell.api.layer.unassign_layer(ifc_file, [representation], layer) return {"FINISHED"} - class CreateInstance(bpy.types.Operator, tool.Ifc.Operator): bl_idname = "bim.create_instance" bl_label = "IFC Create Instance" diff --git a/src/bonsai/bonsai/bim/module/project/__init__.py b/src/bonsai/bonsai/bim/module/project/__init__.py index 0a03e0ca57..de8d1060ed 100644 --- a/src/bonsai/bonsai/bim/module/project/__init__.py +++ b/src/bonsai/bonsai/bim/module/project/__init__.py @@ -101,7 +101,9 @@ def register(): bpy.types.TOPBAR_MT_file_import.append(ui.file_import_menu) bpy.types.TOPBAR_MT_file.prepend(ui.file_menu) bpy.types.TOPBAR_MT_file_context_menu.prepend(ui.file_menu) - bpy.types.Scene.prev_transform_orientation_slot_type = bpy.props.StringProperty(name="Previous Gizmo Orientation Type") + bpy.types.Scene.prev_transform_orientation_slot_type = bpy.props.StringProperty( + name="Previous Gizmo Orientation Type" + ) bpy.types.Scene.prev_show_gizmo_object_translate = bpy.props.BoolProperty(name="Previous Gizmo Translate") wm = bpy.context.window_manager if wm.keyconfigs.addon: diff --git a/src/bonsai/bonsai/bim/module/project/operator.py b/src/bonsai/bonsai/bim/module/project/operator.py index 9ecadf37c8..bdb0284c3b 100644 --- a/src/bonsai/bonsai/bim/module/project/operator.py +++ b/src/bonsai/bonsai/bim/module/project/operator.py @@ -2791,6 +2791,7 @@ class MeasureFaceAreaTool(bpy.types.Operator, PolylineOperator): FaceAreaDecorator.install(context) return {"RUNNING_MODAL"} + class MeasureXYZDimensionsTool(bpy.types.Operator): bl_idname = "bim.measure_xyz_dimensions_tool" bl_label = "Show bonding box dimensions" @@ -2803,6 +2804,7 @@ class MeasureXYZDimensionsTool(bpy.types.Operator): @staticmethod def get_combined_bounding_box_corners(objects): import mathutils + if not objects: return None, None, None if len(objects) == 1: @@ -2830,9 +2832,18 @@ class MeasureXYZDimensionsTool(bpy.types.Operator): mathutils.Vector((max_corner.x, max_corner.y, min_corner.z)), ] edges = [ - (0, 1, "Z"), (1, 2, "Y"), (2, 3, "Z"), (3, 0, "Y"), - (4, 5, "Z"), (5, 6, "Y"), (6, 7, "Z"), (7, 4, "Y"), - (0, 4, "X"), (1, 5, "X"), (2, 6, "X"), (3, 7, "X"), + (0, 1, "Z"), + (1, 2, "Y"), + (2, 3, "Z"), + (3, 0, "Y"), + (4, 5, "Z"), + (5, 6, "Y"), + (6, 7, "Z"), + (7, 4, "Y"), + (0, 4, "X"), + (1, 5, "X"), + (2, 6, "X"), + (3, 7, "X"), ] axis_colors = { "X": (0.956, 0.282, 0.322, 1), @@ -2844,6 +2855,7 @@ class MeasureXYZDimensionsTool(bpy.types.Operator): @staticmethod def find_closest_trihedron(corners, edges, region, rv3d): from bpy_extras.view3d_utils import location_3d_to_region_2d + min_y = float("inf") best_origin = None for idx, corner in enumerate(corners): @@ -2894,6 +2906,7 @@ class MeasureXYZDimensionsTool(bpy.types.Operator): def draw_dimension_text(cls): from bpy_extras.view3d_utils import location_3d_to_region_2d from bonsai.bim.module.drawing.helper import format_distance + selected_objects = [obj for obj in bpy.context.selected_objects if hasattr(obj, "bound_box")] if not selected_objects: return @@ -2983,7 +2996,9 @@ class MeasureXYZDimensionsTool(bpy.types.Operator): if not scene.get("prev_transform_orientation_slot_type", None): scene["prev_transform_orientation_slot_type"] = scene.transform_orientation_slots[1].type if not scene.get("prev_show_gizmo_object_translate", None): - scene["prev_show_gizmo_object_translate"] = space_3d.show_gizmo_object_translate if space_3d else False + scene["prev_show_gizmo_object_translate"] = ( + space_3d.show_gizmo_object_translate if space_3d else False + ) if space_3d: if len(context.selected_objects) == 1: scene.transform_orientation_slots[1].type = "LOCAL" @@ -3006,6 +3021,7 @@ class MeasureXYZDimensionsTool(bpy.types.Operator): self.report({"WARNING"}, "Could not set transform orientation.") return {"FINISHED"} + class ClearMeasurement(bpy.types.Operator): bl_idname = "bim.clear_measurement" bl_label = "Clear measurement from the screen" diff --git a/src/bonsai/bonsai/bim/module/project/prop.py b/src/bonsai/bonsai/bim/module/project/prop.py index 45d505240f..e322ec2d6a 100644 --- a/src/bonsai/bonsai/bim/module/project/prop.py +++ b/src/bonsai/bonsai/bim/module/project/prop.py @@ -508,9 +508,10 @@ class BIMProjectProperties(PropertyGroup): def measurement_type_update(self, context): - #We enable/disable the measure_xyz_dimensions_tool depending on the selected type + # We enable/disable the measure_xyz_dimensions_tool depending on the selected type bpy.ops.bim.measure_xyz_dimensions_tool() + class MeasureToolSettings(PropertyGroup): measurement_type_items = [ ("SINGLE", "SINGLE", "Single", "FIXED_SIZE", 1), @@ -520,7 +521,9 @@ class MeasureToolSettings(PropertyGroup): ("XYZ_DIMENSIONS", "XYZ_DIMENSIONS", "XYZ Dimensions", "ORIENTATION_LOCAL", 5), ] - measurement_type: bpy.props.EnumProperty(items=measurement_type_items, default="POLYLINE", update= measurement_type_update) + measurement_type: bpy.props.EnumProperty( + items=measurement_type_items, default="POLYLINE", update=measurement_type_update + ) if TYPE_CHECKING: measurement_type: Literal["SINGLE", "POLYLINE", "AREA"]