From c12636f4cca17bcb60ea83153db2a3129b7aec36 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Fri, 24 Jan 2025 12:25:10 +0500 Subject: [PATCH] black . --- src/bonsai/bonsai/bim/data/webui/sioserver.py | 6 +--- .../bonsai/bim/module/model/polyline.py | 34 +++++++++++-------- src/bonsai/bonsai/bim/module/model/slab.py | 5 +-- src/bonsai/bonsai/bim/module/model/wall.py | 4 +-- .../bonsai/bim/module/project/operator.py | 4 +-- src/bonsai/bonsai/tool/brick.py | 4 +-- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/bonsai/bonsai/bim/data/webui/sioserver.py b/src/bonsai/bonsai/bim/data/webui/sioserver.py index 55a1b73f29..4701268232 100644 --- a/src/bonsai/bonsai/bim/data/webui/sioserver.py +++ b/src/bonsai/bonsai/bim/data/webui/sioserver.py @@ -18,11 +18,7 @@ import xml.etree.ElementTree as ET sio_port = 8080 # default port -sio = socketio.AsyncServer( - cors_allowed_origins="*", - async_mode="aiohttp", - max_http_buffer_size=10000000 -) +sio = socketio.AsyncServer(cors_allowed_origins="*", async_mode="aiohttp", max_http_buffer_size=10000000) app = web.Application() sio.attach(app) diff --git a/src/bonsai/bonsai/bim/module/model/polyline.py b/src/bonsai/bonsai/bim/module/model/polyline.py index 5243ec24ca..e2397c0852 100644 --- a/src/bonsai/bonsai/bim/module/model/polyline.py +++ b/src/bonsai/bonsai/bim/module/model/polyline.py @@ -43,6 +43,7 @@ from bonsai.bim.module.geometry.decorator import ItemDecorator from typing import Optional, Union, Literal from lark import Lark, Transformer + def create_bmesh_from_vertices(vertices, is_closed=False): bm = bmesh.new() @@ -59,6 +60,7 @@ def create_bmesh_from_vertices(vertices, is_closed=False): bm.edges.index_update() return bm + def get_wall_preview_data(context, relating_type): # Get properties from object type model_props = context.scene.BIMModelProperties @@ -185,6 +187,7 @@ def get_wall_preview_data(context, relating_type): return data + def get_slab_preview_data(context, relating_type): props = context.scene.BIMModelProperties x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else props.x_angle @@ -235,7 +238,7 @@ def get_slab_preview_data(context, relating_type): bm = create_bmesh_from_vertices(polyline_vertices, is_closed) bm.verts.ensure_lookup_table() if x_angle: - bmesh.ops.rotate(bm, cent=Vector(bm.verts[0].co), verts=bm.verts, matrix=Matrix.Rotation(x_angle, 3, 'X')) + bmesh.ops.rotate(bm, cent=Vector(bm.verts[0].co), verts=bm.verts, matrix=Matrix.Rotation(x_angle, 3, "X")) new_faces = bmesh.ops.contextual_create(bm, geom=bm.edges) new_faces = bmesh.ops.extrude_face_region(bm, geom=bm.edges[:] + bm.faces[:]) new_verts = [e for e in new_faces["geom"] if isinstance(e, bmesh.types.BMVert)] @@ -250,6 +253,7 @@ def get_slab_preview_data(context, relating_type): data["tris"] = tris return data + def get_vertical_profile_preview_data(context, relating_type): material = ifcopenshell.util.element.get_material(relating_type) try: @@ -567,16 +571,16 @@ class PolylineOperator: self.snap_angle = None self.snapping_points = [] self.instructions = { - 'Cycle Input': {'icons':True, 'keys': ['EVENT_TAB']}, - 'Distance Input': {'icons':True, 'keys': ['EVENT_D']}, - 'Angle Lock': {'icons':True, 'keys': ['EVENT_A']}, - 'Increment Angle': {'icons':True, 'keys': ['EVENT_SHIFT', 'MOUSE_MMB_SCROLL']}, - 'Modify Snap Point': {'icons':True, 'keys': ['EVENT_M']}, - 'Close Polyline': {'icons':True, 'keys': ['EVENT_C']}, - 'Remove Point': {'icons':True, 'keys': ['EVENT_BACKSPACE']}, + "Cycle Input": {"icons": True, "keys": ["EVENT_TAB"]}, + "Distance Input": {"icons": True, "keys": ["EVENT_D"]}, + "Angle Lock": {"icons": True, "keys": ["EVENT_A"]}, + "Increment Angle": {"icons": True, "keys": ["EVENT_SHIFT", "MOUSE_MMB_SCROLL"]}, + "Modify Snap Point": {"icons": True, "keys": ["EVENT_M"]}, + "Close Polyline": {"icons": True, "keys": ["EVENT_C"]}, + "Remove Point": {"icons": True, "keys": ["EVENT_BACKSPACE"]}, } - self.info = [ + self.info = [ "Axis: ", "Plane: ", "Snap: ", @@ -645,7 +649,9 @@ class PolylineOperator: self.tool_state.axis_method = None tool.Blender.update_viewport() - def handle_instructions(self, context: bpy.types.Context, custom_instructions: dict = {}, custom_info: str = "") -> None: + def handle_instructions( + self, context: bpy.types.Context, custom_instructions: dict = {}, custom_info: str = "" + ) -> None: self.info = [ f"Axis: {self.tool_state.axis_method}", f"Plane: {self.tool_state.plane_method}", @@ -663,7 +669,7 @@ class PolylineOperator: self.layout.label(text=action) else: key = settings["keys"][0] - self.layout.label(text=key+action) + self.layout.label(text=key + action) self.layout.label(text="|") @@ -910,9 +916,9 @@ class PolylineOperator: def set_offset(self, context: bpy.types.Context, relating_type: ifcopenshell.entity_instance) -> None: props = bpy.context.scene.BIMModelProperties if tool.Model.get_usage_type(relating_type) == "LAYER2": - offset_type = "offset_type_vertical" + offset_type = "offset_type_vertical" elif tool.Model.get_usage_type(relating_type) == "LAYER3": - offset_type = "offset_type_horizontal" + offset_type = "offset_type_horizontal" else: return @@ -926,7 +932,7 @@ class PolylineOperator: props.offset = self.offset / self.unit_scale tool.Blender.update_viewport() - + def modal(self, context: bpy.types.Context, event: bpy.types.Event) -> Union[set[str], None]: PolylineDecorator.update(event, self.tool_state, self.input_ui, self.snapping_points[0]) tool.Blender.update_viewport() diff --git a/src/bonsai/bonsai/bim/module/model/slab.py b/src/bonsai/bonsai/bim/module/model/slab.py index 3f866e70e0..c85a01ab69 100644 --- a/src/bonsai/bonsai/bim/module/model/slab.py +++ b/src/bonsai/bonsai/bim/module/model/slab.py @@ -873,7 +873,6 @@ class DrawPolylineSlab(bpy.types.Operator, PolylineOperator): ) DumbSlabPlaner().regenerate_from_occurence(element, material_set_usage) - def modal(self, context, event): if not self.relating_type: self.report({"WARNING"}, "You need to select a slab type.") @@ -904,9 +903,7 @@ class DrawPolylineSlab(bpy.types.Operator, PolylineOperator): props.offset_type_horizontal = items[((index + 1) % size)] self.set_offset(context, self.relating_type) - custom_instructions = { - 'Choose Axis': {'icons':True, 'keys': ['EVENT_X', 'EVENT_Y']} - } + custom_instructions = {"Choose Axis": {"icons": True, "keys": ["EVENT_X", "EVENT_Y"]}} slab_config = [ f"Direction: {props.direction_sense}", diff --git a/src/bonsai/bonsai/bim/module/model/wall.py b/src/bonsai/bonsai/bim/module/model/wall.py index a80c200556..85c9f4876a 100644 --- a/src/bonsai/bonsai/bim/module/model/wall.py +++ b/src/bonsai/bonsai/bim/module/model/wall.py @@ -427,9 +427,7 @@ class DrawPolylineWall(bpy.types.Operator, PolylineOperator): props.offset_type_vertical = items[((index + 1) % size)] self.set_offset(context, self.relating_type) - custom_instructions = { - 'Choose Axis': {'icons':True, 'keys': ['EVENT_X', 'EVENT_Y']} - } + custom_instructions = {"Choose Axis": {"icons": True, "keys": ["EVENT_X", "EVENT_Y"]}} wall_config = [ f"Direction: {props.direction_sense}", diff --git a/src/bonsai/bonsai/bim/module/project/operator.py b/src/bonsai/bonsai/bim/module/project/operator.py index 71596ec08d..8afa3c77cc 100644 --- a/src/bonsai/bonsai/bim/module/project/operator.py +++ b/src/bonsai/bonsai/bim/module/project/operator.py @@ -2400,8 +2400,8 @@ class MeasureTool(bpy.types.Operator, PolylineOperator): return {"PASS_THROUGH"} custom_instructions = { - 'Choose Axis': {'icons':True, 'keys': ['EVENT_X', 'EVENT_Y', 'EVENT_Z']}, - 'Choose Plane': {'icons':True, 'keys': ['EVENT_SHIFT', 'EVENT_X', 'EVENT_Y', 'EVENT_Z']}, + "Choose Axis": {"icons": True, "keys": ["EVENT_X", "EVENT_Y", "EVENT_Z"]}, + "Choose Plane": {"icons": True, "keys": ["EVENT_SHIFT", "EVENT_X", "EVENT_Y", "EVENT_Z"]}, } self.handle_instructions(context, custom_instructions) diff --git a/src/bonsai/bonsai/tool/brick.py b/src/bonsai/bonsai/tool/brick.py index 4b0a7082e6..4b034f2160 100644 --- a/src/bonsai/bonsai/tool/brick.py +++ b/src/bonsai/bonsai/tool/brick.py @@ -350,7 +350,7 @@ class Brick(bonsai.core.tool.Brick): @classmethod def load_brick_file(cls, filepath): if not BrickStore.schema: # important check for running under test cases - BrickStore.schema = tool.Blender.get_data_dir_path(Path('brick', 'Brick.ttl')) + BrickStore.schema = tool.Blender.get_data_dir_path(Path("brick", "Brick.ttl")) BrickStore.graph = brickschema.persistent.VersionedGraphCollection("sqlite://") with BrickStore.graph.new_changeset("SCHEMA") as cs: cs.load_file(BrickStore.schema) @@ -366,7 +366,7 @@ class Brick(bonsai.core.tool.Brick): @classmethod def new_brick_file(cls): if not BrickStore.schema: # important check for running under test cases - BrickStore.schema = tool.Blender.get_data_dir_path(Path('brick', 'Brick.ttl')) + BrickStore.schema = tool.Blender.get_data_dir_path(Path("brick", "Brick.ttl")) BrickStore.graph = brickschema.persistent.VersionedGraphCollection("sqlite://") with BrickStore.graph.new_changeset("SCHEMA") as cs: cs.load_file(BrickStore.schema)