From 7b3410c7b1f8d82fa9c8840ba9e7a9ed2ac6960d Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 14 Apr 2023 20:04:33 +1000 Subject: [PATCH] Fix #2985. Purge obsolete vector style feature. --- .../blenderbim/bim/module/drawing/__init__.py | 1 - .../blenderbim/bim/module/drawing/operator.py | 14 -------------- .../blenderbim/bim/module/drawing/prop.py | 14 -------------- src/blenderbim/blenderbim/bim/module/drawing/ui.py | 3 --- 4 files changed, 32 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/__init__.py b/src/blenderbim/blenderbim/bim/module/drawing/__init__.py index d828f6dea5..17988a7090 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/__init__.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/__init__.py @@ -47,7 +47,6 @@ classes = ( operator.EditAssignedProduct, operator.EditText, operator.EditTextPopup, - operator.EditVectorStyle, operator.EnableEditingAssignedProduct, operator.EnableEditingText, operator.ExpandSheet, diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py index c7db6cca76..65d04f6330 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py @@ -1230,20 +1230,6 @@ class ActivateDrawingStyle(bpy.types.Operator): return space -class EditVectorStyle(bpy.types.Operator): - bl_idname = "bim.edit_vector_style" - bl_label = "Edit Vector Style" - bl_options = {"REGISTER", "UNDO"} - - def execute(self, context): - camera = context.scene.camera - vector_style = context.scene.DocProperties.drawing_styles[ - camera.data.BIMCameraProperties.active_drawing_style_index - ].vector_style - bpy.data.texts.load(os.path.join(context.scene.BIMProperties.data_dir, "styles", vector_style + ".css")) - return {"FINISHED"} - - class RemoveSheet(bpy.types.Operator, Operator): bl_idname = "bim.remove_sheet" bl_label = "Remove Sheet" diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py index f34c7982c8..961652bf9f 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py @@ -45,16 +45,13 @@ from bpy.props import ( diagram_scales_enum = [] sheets_enum = [] -vector_styles_enum = [] def purge(): global diagram_scales_enum global sheets_enum - global vector_styles_enum diagram_scales_enum = [] sheets_enum = [] - vector_styles_enum = [] def update_target_view(self, context): @@ -211,16 +208,6 @@ def toggleDecorations(self, context): decoration.DecorationsHandler.uninstall() -def getVectorStyles(self, context): - global vector_styles_enum - if len(vector_styles_enum) < 1: - sheets_enum.clear() - for filename in Path(os.path.join(context.scene.BIMProperties.data_dir, "styles")).glob("*.css"): - f = str(filename.stem) - vector_styles_enum.append((f, f, "")) - return vector_styles_enum - - class Variable(PropertyGroup): name: StringProperty(name="Name") prop_key: StringProperty(name="Property Key") @@ -260,7 +247,6 @@ class DrawingStyle(PropertyGroup): name="Render Type", default="VIEWPORT", ) - vector_style: EnumProperty(items=getVectorStyles, name="Vector Style") include_query: StringProperty(name="Include Query") exclude_query: StringProperty(name="Exclude Query") attributes: CollectionProperty(name="Attributes", type=StrProperty) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/ui.py b/src/blenderbim/blenderbim/bim/module/drawing/ui.py index aead40f808..38d617c884 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/ui.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/ui.py @@ -123,9 +123,6 @@ class BIM_PT_drawing_underlay(Panel): row = layout.row() row.prop(drawing_style, "render_type") row = layout.row(align=True) - row.prop(drawing_style, "vector_style") - row.operator("bim.edit_vector_style", text="", icon="GREASEPENCIL") - row = layout.row(align=True) row.prop(drawing_style, "include_query") row = layout.row(align=True) row.prop(drawing_style, "exclude_query")