Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 09:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

drawing.operator not to use DrawingsData

Browse Source
This commit is contained in:
Andrej730
2025-05-14 11:35:46 +05:00
parent b8e5cd740a
commit c2860e6e25
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/module/drawing/operator.py
+7 -10
View File
@@ -47,7 +47,7 @@ import bonsai.bim.module.drawing.sheeter as sheeter
import bonsai.bim.export_ifc import bonsai.bim.export_ifc
from bpy_extras.io_utils import ImportHelper from bpy_extras.io_utils import ImportHelper
from bonsai.bim.module.drawing.decoration import CutDecorator from bonsai.bim.module.drawing.decoration import CutDecorator
from bonsai.bim.module.drawing.data import DecoratorData, DrawingsData from bonsai.bim.module.drawing.data import DecoratorData
from typing import NamedTuple, List, Union, Optional, Literal, TYPE_CHECKING, Any, TypedDict from typing import NamedTuple, List, Union, Optional, Literal, TYPE_CHECKING, Any, TypedDict
from lxml import etree from lxml import etree
from math import radians from math import radians
@@ -2165,8 +2165,6 @@ class ActivateDrawingBase(tool.Ifc.Operator):
tool.Blender.set_viewport_position(viewport_position) tool.Blender.set_viewport_position(viewport_position)
dprops.active_drawing_id = self.drawing dprops.active_drawing_id = self.drawing
# reset DrawingsData to reload_drawing_styles work correctly
DrawingsData.is_loaded = False
dprops.drawing_styles.clear() dprops.drawing_styles.clear()
if ifcopenshell.util.element.get_pset(drawing, "EPset_Drawing", "HasUnderlay"): if ifcopenshell.util.element.get_pset(drawing, "EPset_Drawing", "HasUnderlay"):
bpy.ops.bim.reload_drawing_styles() bpy.ops.bim.reload_drawing_styles()
@@ -2314,9 +2312,10 @@ class ReloadDrawingStyles(bpy.types.Operator):
bl_description = "Reload drawing styles for the active camera from the related JSON file." bl_description = "Reload drawing styles for the active camera from the related JSON file."
def execute(self, context): def execute(self, context):
if not DrawingsData.is_loaded: props = tool.Drawing.get_document_props()
DrawingsData.load() assert (drawing := props.get_active_drawing())
drawing_pset_data = DrawingsData.data["active_drawing_pset_data"] drawing_pset_data = ifcopenshell.util.element.get_pset(drawing, "EPset_Drawing")
assert context.scene and (camera := context.scene.camera) assert context.scene and (camera := context.scene.camera)
camera_props = tool.Drawing.get_camera_props(camera) camera_props = tool.Drawing.get_camera_props(camera)
@@ -2341,7 +2340,6 @@ class ReloadDrawingStyles(bpy.types.Operator):
with open(json_path, "r") as fi: with open(json_path, "r") as fi:
shading_styles_json: dict[str, DrawingStyleJson] = json.load(fi) shading_styles_json: dict[str, DrawingStyleJson] = json.load(fi)
props = tool.Drawing.get_document_props()
drawing_styles = props.drawing_styles drawing_styles = props.drawing_styles
drawing_styles.clear() drawing_styles.clear()
styles = [style for style in shading_styles_json] styles = [style for style in shading_styles_json]
@@ -2468,10 +2466,9 @@ class SaveDrawingStylesData(bpy.types.Operator, tool.Ifc.Operator):
rename_style_to: bpy.props.StringProperty(default="") rename_style_to: bpy.props.StringProperty(default="")
def _execute(self, context): def _execute(self, context):
if not DrawingsData.is_loaded:
DrawingsData.load()
drawing_pset_data = DrawingsData.data["active_drawing_pset_data"]
props = tool.Drawing.get_document_props() props = tool.Drawing.get_document_props()
assert (drawing := props.get_active_drawing())
drawing_pset_data = ifcopenshell.util.element.get_pset(drawing, "EPset_Drawing")
drawing_styles = props.drawing_styles drawing_styles = props.drawing_styles
rel_path = drawing_pset_data["ShadingStyles"] rel_path = drawing_pset_data["ShadingStyles"]