Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-09 05:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3414. The project wizard now doesn't load a fresh session by default. Note that File > Open still enforces a fresh session.

Browse Source
This commit is contained in:
Dion Moult
2023-07-13 22:33:52 +10:00
parent 6336241431
commit 818226d1e2
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/project/operator.py
+10 -10
View File
@@ -582,27 +582,28 @@ class LoadProject(bpy.types.Operator, IFCFileSelector):
@persistent @persistent
def load_handler(*args): def load_handler(*args):
bpy.app.handlers.load_post.remove(load_handler) bpy.app.handlers.load_post.remove(load_handler)
if tool.Blender.is_default_scene():
for obj in bpy.data.objects:
bpy.data.objects.remove(obj)
self.finish_loading_project(context) self.finish_loading_project(context)
if self.should_start_fresh_session: if self.should_start_fresh_session:
# WARNING: wm.read_homefile clears context # WARNING: wm.read_homefile clears context which could lead to some
# which could lead to some operators to fail: # operators to fail:
# https://blender.stackexchange.com/a/282558/135166 # https://blender.stackexchange.com/a/282558/135166
# So we continue using the load_post handler # So we continue using the load_post handler thats triggered when
# thats triggered when context is already restored # context is already restored
bpy.app.handlers.load_post.append(load_handler) bpy.app.handlers.load_post.append(load_handler)
bpy.ops.wm.read_homefile() bpy.ops.wm.read_homefile()
return {"FINISHED"} return {"FINISHED"}
else: else:
return self.finish_loading_project(context) return self.finish_loading_project(context)
def finish_loading_project(self, context): def finish_loading_project(self, context):
if not self.is_existing_ifc_file(): if not self.is_existing_ifc_file():
return {"FINISHED"} return {"FINISHED"}
if tool.Blender.is_default_scene():
for obj in bpy.data.objects:
bpy.data.objects.remove(obj)
context.scene.BIMProperties.ifc_file = self.get_filepath() context.scene.BIMProperties.ifc_file = self.get_filepath()
context.scene.BIMProjectProperties.is_loading = True context.scene.BIMProjectProperties.is_loading = True
context.scene.BIMProjectProperties.total_elements = len(tool.Ifc.get().by_type("IfcElement")) context.scene.BIMProjectProperties.total_elements = len(tool.Ifc.get().by_type("IfcElement"))
@@ -610,7 +611,6 @@ class LoadProject(bpy.types.Operator, IFCFileSelector):
bpy.ops.bim.load_project_elements() bpy.ops.bim.load_project_elements()
return {"FINISHED"} return {"FINISHED"}
def invoke(self, context, event): def invoke(self, context, event):
context.window_manager.fileselect_add(self) context.window_manager.fileselect_add(self)
return {"RUNNING_MODAL"} return {"RUNNING_MODAL"}
@@ -987,7 +987,7 @@ class ExportIFC(bpy.types.Operator):
if bpy.data.is_saved and bpy.data.is_dirty and bpy.data.filepath: if bpy.data.is_saved and bpy.data.is_dirty and bpy.data.filepath:
bpy.ops.wm.save_mainfile(filepath=bpy.data.filepath) bpy.ops.wm.save_mainfile(filepath=bpy.data.filepath)
blenderbim.bim.handler.purge_module_data() blenderbim.bim.handler.purge_module_data()
self.report({"INFO"}, f"IFC Project \"{os.path.basename(output_file)}\" Saved") self.report({"INFO"}, f'IFC Project "{os.path.basename(output_file)}" Saved')
if bpy.data.is_saved: if bpy.data.is_saved:
bpy.ops.wm.save_mainfile("INVOKE_DEFAULT") bpy.ops.wm.save_mainfile("INVOKE_DEFAULT")
src/blenderbim/blenderbim/bim/module/project/ui.py
+1 -2
View File
@@ -209,7 +209,6 @@ class BIM_PT_project(Panel):
row = self.layout.row() row = self.layout.row()
row.label(text="File Not Saved", icon="ERROR") row.label(text="File Not Saved", icon="ERROR")
def draw_create_project_ui(self, context): def draw_create_project_ui(self, context):
props = context.scene.BIMProperties props = context.scene.BIMProperties
pprops = context.scene.BIMProjectProperties pprops = context.scene.BIMProjectProperties
@@ -226,7 +225,7 @@ class BIM_PT_project(Panel):
row = self.layout.row(align=True) row = self.layout.row(align=True)
row.operator("bim.create_project") row.operator("bim.create_project")
row.operator("bim.load_project").should_start_fresh_session = True row.operator("bim.load_project").should_start_fresh_session = False
class BIM_PT_project_library(Panel): class BIM_PT_project_library(Panel):