mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-17 14:02:27 +00:00
Run black
This commit is contained in:
@@ -1284,8 +1284,7 @@ class CreateDrawing(bpy.types.Operator):
|
|||||||
value = ifcopenshell.util.selector.get_element_value(element, key)
|
value = ifcopenshell.util.selector.get_element_value(element, key)
|
||||||
if value:
|
if value:
|
||||||
classes.append(
|
classes.append(
|
||||||
tool.Drawing.canonicalise_class_name(key) + "-" +
|
tool.Drawing.canonicalise_class_name(key) + "-" + tool.Drawing.canonicalise_class_name(str(value))
|
||||||
tool.Drawing.canonicalise_class_name(str(value))
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# ─── Target View ───────────────────────────────────────────
|
# ─── Target View ───────────────────────────────────────────
|
||||||
@@ -1295,7 +1294,6 @@ class CreateDrawing(bpy.types.Operator):
|
|||||||
|
|
||||||
return classes
|
return classes
|
||||||
|
|
||||||
|
|
||||||
def is_manifold(self, obj) -> bool:
|
def is_manifold(self, obj) -> bool:
|
||||||
result = self.is_manifold_cache.get(obj.data.name, None)
|
result = self.is_manifold_cache.get(obj.data.name, None)
|
||||||
if result is not None:
|
if result is not None:
|
||||||
@@ -1360,7 +1358,13 @@ class CreateDrawing(bpy.types.Operator):
|
|||||||
join_criteria = join_criteria.split(",")
|
join_criteria = join_criteria.split(",")
|
||||||
else:
|
else:
|
||||||
# Drawing convention states that same objects classes with the same material are merged when cut.
|
# Drawing convention states that same objects classes with the same material are merged when cut.
|
||||||
join_criteria = ["class", "material.Name", "/Pset_.*Common/.Status", "EPset_Status.Status", "EPset_Status.UserDefinedStatus"]
|
join_criteria = [
|
||||||
|
"class",
|
||||||
|
"material.Name",
|
||||||
|
"/Pset_.*Common/.Status",
|
||||||
|
"EPset_Status.Status",
|
||||||
|
"EPset_Status.UserDefinedStatus",
|
||||||
|
]
|
||||||
|
|
||||||
group = root.find("{http://www.w3.org/2000/svg}g")
|
group = root.find("{http://www.w3.org/2000/svg}g")
|
||||||
joined_paths = {}
|
joined_paths = {}
|
||||||
@@ -2349,18 +2353,19 @@ class ActivateDrawingBase(tool.Ifc.Operator):
|
|||||||
camera_element = tool.Ifc.get_entity(camera)
|
camera_element = tool.Ifc.get_entity(camera)
|
||||||
is_reflected = False
|
is_reflected = False
|
||||||
if camera_element:
|
if camera_element:
|
||||||
is_reflected = ifcopenshell.util.element.get_pset(camera_element, "EPset_Drawing", "TargetView") == "REFLECTED_PLAN_VIEW"
|
is_reflected = (
|
||||||
|
ifcopenshell.util.element.get_pset(camera_element, "EPset_Drawing", "TargetView")
|
||||||
|
== "REFLECTED_PLAN_VIEW"
|
||||||
|
)
|
||||||
if is_reflected and camera.scale != (-1, -1, -1):
|
if is_reflected and camera.scale != (-1, -1, -1):
|
||||||
camera.scale = (-1, -1, -1)
|
camera.scale = (-1, -1, -1)
|
||||||
|
|
||||||
|
|
||||||
if camera_props.update_representation(camera.matrix_world):
|
if camera_props.update_representation(camera.matrix_world):
|
||||||
bpy.ops.bim.update_representation(obj=camera.name, ifc_representation_class="")
|
bpy.ops.bim.update_representation(obj=camera.name, ifc_representation_class="")
|
||||||
# Restore the scale after update if needed
|
# Restore the scale after update if needed
|
||||||
if is_reflected:
|
if is_reflected:
|
||||||
camera.scale = (-1, -1, -1)
|
camera.scale = (-1, -1, -1)
|
||||||
|
|
||||||
|
|
||||||
return {"FINISHED"}
|
return {"FINISHED"}
|
||||||
|
|
||||||
|
|
||||||
@@ -3776,6 +3781,6 @@ class ExcludeAnnotation(bpy.types.Operator, tool.Ifc.Operator):
|
|||||||
return
|
return
|
||||||
for obj in tool.Blender.get_selected_objects(include_active=False):
|
for obj in tool.Blender.get_selected_objects(include_active=False):
|
||||||
if (element := tool.Ifc.get_entity(obj)) and tool.Drawing.is_auto_annotation(element):
|
if (element := tool.Ifc.get_entity(obj)) and tool.Drawing.is_auto_annotation(element):
|
||||||
if (referenced_element := tool.Drawing.get_annotation_element(element)):
|
if referenced_element := tool.Drawing.get_annotation_element(element):
|
||||||
tool.Drawing.exclude_annotation_from_drawing(referenced_element, drawing)
|
tool.Drawing.exclude_annotation_from_drawing(referenced_element, drawing)
|
||||||
core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=drawing)
|
core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=drawing)
|
||||||
|
|||||||
@@ -499,9 +499,7 @@ class BIMCameraProperties(PropertyGroup):
|
|||||||
update=get_update_layer_callback("linework_mode", "LineworkMode"),
|
update=get_update_layer_callback("linework_mode", "LineworkMode"),
|
||||||
)
|
)
|
||||||
generate_material_layers: bpy.props.BoolProperty(
|
generate_material_layers: bpy.props.BoolProperty(
|
||||||
name="Generate Material Layers",
|
name="Generate Material Layers", description="Generate material layer linework in drawings", default=True
|
||||||
description="Generate material layer linework in drawings",
|
|
||||||
default=True
|
|
||||||
)
|
)
|
||||||
fill_mode: EnumProperty(
|
fill_mode: EnumProperty(
|
||||||
items=[
|
items=[
|
||||||
|
|||||||
@@ -319,13 +319,12 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
|
|||||||
created_objects.append(obj)
|
created_objects.append(obj)
|
||||||
|
|
||||||
# Select the created annotation objects
|
# Select the created annotation objects
|
||||||
bpy.ops.object.select_all(action='DESELECT')
|
bpy.ops.object.select_all(action="DESELECT")
|
||||||
for obj in created_objects:
|
for obj in created_objects:
|
||||||
obj.select_set(True)
|
obj.select_set(True)
|
||||||
if created_objects:
|
if created_objects:
|
||||||
bpy.context.view_layer.objects.active = created_objects[-1]
|
bpy.context.view_layer.objects.active = created_objects[-1]
|
||||||
|
|
||||||
|
|
||||||
def hotkey_S_A(self):
|
def hotkey_S_A(self):
|
||||||
if bpy.ops.bim.add_annotation.poll():
|
if bpy.ops.bim.add_annotation.poll():
|
||||||
bpy.ops.bim.add_annotation()
|
bpy.ops.bim.add_annotation()
|
||||||
|
|||||||
@@ -520,9 +520,7 @@ class BIMStairProperties(PropertyGroup):
|
|||||||
custom_treads = kwargs.get("custom_first_last_tread_run", (0.0, 0.0))
|
custom_treads = kwargs.get("custom_first_last_tread_run", (0.0, 0.0))
|
||||||
tread_run = kwargs.get("tread_run", 0.3)
|
tread_run = kwargs.get("tread_run", 0.3)
|
||||||
# Lock is off if either custom tread differs from tread_run and is not 0
|
# Lock is off if either custom tread differs from tread_run and is not 0
|
||||||
kwargs["custom_tread_lock"] = not any(
|
kwargs["custom_tread_lock"] = not any(ct != 0.0 and ct != tread_run for ct in custom_treads)
|
||||||
ct != 0.0 and ct != tread_run for ct in custom_treads
|
|
||||||
)
|
|
||||||
|
|
||||||
for prop_name in kwargs:
|
for prop_name in kwargs:
|
||||||
setattr(self, prop_name, kwargs[prop_name])
|
setattr(self, prop_name, kwargs[prop_name])
|
||||||
|
|||||||
@@ -312,7 +312,9 @@ class BIM_PT_stair(bpy.types.Panel):
|
|||||||
if prop_name == "custom_first_last_tread_run":
|
if prop_name == "custom_first_last_tread_run":
|
||||||
# Draw the lock toggle
|
# Draw the lock toggle
|
||||||
row_lock = self.layout.row(align=True)
|
row_lock = self.layout.row(align=True)
|
||||||
lock_text = "Lock First/Last Treads" if not props.custom_tread_lock else "Unlock First/Last Treads"
|
lock_text = (
|
||||||
|
"Lock First/Last Treads" if not props.custom_tread_lock else "Unlock First/Last Treads"
|
||||||
|
)
|
||||||
row_lock.prop(
|
row_lock.prop(
|
||||||
props,
|
props,
|
||||||
"custom_tread_lock",
|
"custom_tread_lock",
|
||||||
|
|||||||
@@ -523,8 +523,12 @@ class BIMWorkScheduleProperties(PropertyGroup):
|
|||||||
active_task_input_index: IntProperty(name="Active Task Input Index")
|
active_task_input_index: IntProperty(name="Active Task Input Index")
|
||||||
task_outputs: CollectionProperty(name="Task Outputs", type=TaskProduct)
|
task_outputs: CollectionProperty(name="Task Outputs", type=TaskProduct)
|
||||||
active_task_output_index: IntProperty(name="Active Task Output Index")
|
active_task_output_index: IntProperty(name="Active Task Output Index")
|
||||||
show_nested_outputs: BoolProperty(name="Show Nested Task Elements", default=False, update=update_active_task_outputs)
|
show_nested_outputs: BoolProperty(
|
||||||
show_nested_resources: BoolProperty(name="Show Nested Task Elements", default=False, update=update_active_task_resources)
|
name="Show Nested Task Elements", default=False, update=update_active_task_outputs
|
||||||
|
)
|
||||||
|
show_nested_resources: BoolProperty(
|
||||||
|
name="Show Nested Task Elements", default=False, update=update_active_task_resources
|
||||||
|
)
|
||||||
show_nested_inputs: BoolProperty(name="Show Nested Task Elements", default=False, update=update_active_task_inputs)
|
show_nested_inputs: BoolProperty(name="Show Nested Task Elements", default=False, update=update_active_task_inputs)
|
||||||
product_input_tasks: CollectionProperty(name="Product Task Inputs", type=TaskProduct)
|
product_input_tasks: CollectionProperty(name="Product Task Inputs", type=TaskProduct)
|
||||||
product_output_tasks: CollectionProperty(name="Product Task Outputs", type=TaskProduct)
|
product_output_tasks: CollectionProperty(name="Product Task Outputs", type=TaskProduct)
|
||||||
|
|||||||
Reference in New Issue
Block a user