From 524483e9ccb89770fb4d00ce8c840c214a2e25f3 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 4 Feb 2022 12:04:20 +1100 Subject: [PATCH] Target view is now read from IFC. See #1153. --- .../blenderbim/bim/module/drawing/operator.py | 3 ++- src/blenderbim/blenderbim/bim/module/drawing/prop.py | 11 ----------- src/blenderbim/blenderbim/bim/module/drawing/ui.py | 3 --- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py index 5fa650016b..0c287fffde 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py @@ -285,9 +285,10 @@ class CreateDrawing(bpy.types.Operator): # A drawing prioritises a target view context first, followed by a body context as a fallback body_contexts = [] target_view_contexts = [] + target_view = ifcopenshell.util.element.get_psets(self.camera_element)["EPset_Drawing"]["TargetView"] for rep_context in ifc.by_type("IfcGeometricRepresentationContext"): if rep_context.is_a("IfcGeometricRepresentationSubContext"): - if rep_context.TargetView == context.scene.camera.data.BIMCameraProperties.target_view: + if rep_context.TargetView == target_view: target_view_contexts.append(rep_context.id()) continue if rep_context.ContextIdentifier in ["Body", "Facetation"]: diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py index db666f0991..d4c83d8f5b 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py @@ -330,17 +330,6 @@ class DocProperties(PropertyGroup): class BIMCameraProperties(PropertyGroup): representation: StringProperty(name="Representation") view_name: StringProperty(name="View Name") - target_view: EnumProperty( - items=[ - ("PLAN_VIEW", "PLAN_VIEW", ""), - ("ELEVATION_VIEW", "ELEVATION_VIEW", ""), - ("SECTION_VIEW", "SECTION_VIEW", ""), - ("REFLECTED_PLAN_VIEW", "REFLECTED_PLAN_VIEW", ""), - ("MODEL_VIEW", "MODEL_VIEW", ""), - ], - name="Target View", - default="PLAN_VIEW", - ) diagram_scale: EnumProperty(items=get_diagram_scales, name="Drawing Scale", update=update_diagram_scale) custom_diagram_scale: StringProperty(name="Custom Scale", update=update_diagram_scale) raster_x: IntProperty(name="Raster X", default=1000) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/ui.py b/src/blenderbim/blenderbim/bim/module/drawing/ui.py index 48e442b6cb..2362bbb89e 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/ui.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/ui.py @@ -67,9 +67,6 @@ class BIM_PT_camera(Panel): row = layout.row() row.operator("bim.resize_text") - row = layout.row() - row.prop(props, "target_view") - row = layout.row() row.prop(props, "cut_objects") if props.cut_objects == "CUSTOM":