Refactor to use blender properties so loading metadata preserves session settings

src/bonsai/bonsai/bim/__init__.py

@@ -144,6 +144,7 @@ classes = [
     prop.ISODuration,
     prop.BIMAreaProperties,
     prop.BIMTabProperties,
+    prop.BIMPanelProperties,  # Must be registered before BIMProperties
     prop.BIMProperties,
     prop.IfcParameter,
     prop.PsetQto,
@@ -238,42 +239,6 @@ def on_register(scene):
     is_registering = False
 
 
-def register_panel_visibility_properties():
-    for panel_list in ui.TAB_PANELS.values():
-        for panel in panel_list:
-            bl_idname = panel.get("bl_idname", "")
-            prop_name = f"show_{bl_idname.lower()}"
-            setattr(
-                bpy.types.Scene,
-                prop_name,
-                bpy.props.BoolProperty(
-                    name=f"Show {bl_idname}",
-                    description=f"Show or hide the {bl_idname} panel",
-                    default=True,
-                ),
-            )
-            prop_name = f"bookmark_{bl_idname.lower()}"
-            setattr(
-                bpy.types.Scene,
-                prop_name,
-                bpy.props.BoolProperty(
-                    name=f"Bookmark {bl_idname}",
-                    description=f"Move to Bookmark or not {bl_idname} panel",
-                    default=False,
-                ),
-            )
-
-
-def unregister_panel_visibility_properties():
-    for panel_list in ui.TAB_PANELS.values():
-        for panel in panel_list:
-            bl_idname = panel.get("bl_idname", "")
-            prop_name = f"show_{bl_idname.lower()}"
-            if hasattr(bpy.types.Scene, prop_name):
-                delattr(bpy.types.Scene, prop_name)
-            prop_name = f"bookmark_{bl_idname.lower()}"
-            if hasattr(bpy.types.Scene, prop_name):
-                delattr(bpy.types.Scene, prop_name)
 
 
 # Classes that need to be registered after modules (due to cross-module dependencies)
@@ -319,6 +284,9 @@ def register():
     bpy.types.Curve.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
     bpy.types.Camera.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
     bpy.types.PointLight.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
+    
+    ui.initialize_panel_properties()
+    
     if hasattr(bpy.types, "UI_MT_button_context_menu"):
         bpy.types.UI_MT_button_context_menu.append(ui.draw_custom_context_menu)
     bpy.types.STATUSBAR_HT_header.append(ui.draw_statusbar)
@@ -357,7 +325,6 @@ def register():
     bpy.types.Scene.active_tab_name = bpy.props.StringProperty()
     bpy.types.Scene.tab_panels = bpy.props.CollectionProperty(type=bpy.types.PropertyGroup)
     bpy.types.Scene.active_tab_panel_index = bpy.props.IntProperty()
-    register_panel_visibility_properties()
 
 
 def unregister():

src/bonsai/bonsai/bim/operator.py

@@ -33,7 +33,7 @@ import bonsai.bim
 import bonsai.tool as tool
 import bonsai.bim.handler
 from enum import Enum
-from bonsai.bim.ui import TAB_PANELS, get_tab_visibility, set_tab_visibility, get_tab_names
+from bonsai.bim.ui import get_all_tab_panels, get_tab_visibility, set_tab_visibility, get_tab_names, get_panel_config, initialize_panel_properties
 from bpy_extras.io_utils import ImportHelper
 from bonsai.bim import import_ifc
 from bonsai.bim.prop import StrProperty
@@ -1725,24 +1725,29 @@ class BIM_OT_toggle_panel_visibility(bpy.types.Operator):
 
     def execute(self, context):
         panel_name = self.action.replace("TOGGLE_VISIBILITY_", "")
+        active_tab = getattr(context.scene, "active_tab_name", None) or getattr(tool.Blender.get_bim_props(), "tab", None)
+        is_bookmark_tab = active_tab == "BOOKMARK"
         
-        for item in context.scene.tab_panels:
+        panel_config = get_panel_config(panel_name)
-            if item.name == panel_name:
+        if panel_config:
-                item["visible"] = not item.get("visible", True)
+            if is_bookmark_tab:
+                panel_config.is_visible_in_bookmarks = not panel_config.is_visible_in_bookmarks
+                new_value = panel_config.is_visible_in_bookmarks
+            else:
+                panel_config.is_visible_in_tab = not panel_config.is_visible_in_tab
+                new_value = panel_config.is_visible_in_tab
             
-                prop_name = f"show_{panel_name.lower()}"
+            for item in context.scene.tab_panels:
-                if hasattr(context.scene, prop_name):
+                if item.name == panel_name:
-                    setattr(context.scene, prop_name, item["visible"])
+                    item["visible"] = new_value
-                    print(f"Toggled visibility for panel: {panel_name} to {'visible' if item['visible'] else 'hidden'}")
+                    break
-                else:
-                    print(f"Property '{prop_name}' not found on Scene.")
-                break
         
         for area in bpy.context.window.screen.areas:
             if area.type == "PROPERTIES":
                 area.tag_redraw()
         
-        self.report({"INFO"}, f"Toggled visibility for {panel_name}.")
+        tab_context = "Bookmarks" if is_bookmark_tab else "Tab"
+        self.report({"INFO"}, f"Toggled visibility for {panel_name} in {tab_context}.")
         return {"FINISHED"}
 
 
@@ -1757,35 +1762,15 @@ class BIM_OT_bookmark_panel(bpy.types.Operator):
 
     def execute(self, context):
         panel_name = self.action.replace("BOOKMARK_", "")
+        panel_config = get_panel_config(panel_name)
         
-        for item in context.scene.tab_panels:
+        if panel_config:
-            if item.name == panel_name:
+            panel_config.is_bookmarked = not panel_config.is_bookmarked
-                item["bookmarked"] = not item.get("bookmarked", False)
             
-                prop_name = f"bookmark_{panel_name.lower()}"
+            for item in context.scene.tab_panels:
-                if hasattr(context.scene, prop_name):
+                if item.name == panel_name:
-                    setattr(context.scene, prop_name, item["bookmarked"])
+                    item["bookmarked"] = panel_config.is_bookmarked
-                    print(
+                    break
-                        f"Toggled bookmark for panel: {panel_name} to {'bookmarked' if item['bookmarked'] else 'Not bookmarked'}"
-                    )
-                else:
-                    print(f"Property '{prop_name}' not found on Scene.")
-
-                panel_label = item["bl_label"]
-                if item["bookmarked"]:
-                    if not any(p.get("bl_idname") == panel_name for p in TAB_PANELS["BOOKMARK"]):
-                        TAB_PANELS["BOOKMARK"].append({"bl_idname": panel_name, "bl_label": panel_label})
-                        print(f"Added {panel_name} to BOOKMARK tab.")
-                else:
-                    for i, p in enumerate(TAB_PANELS["BOOKMARK"]):
-                        if p.get("bl_idname") == panel_name:
-                            del TAB_PANELS["BOOKMARK"][i]
-                            print(f"Removed {panel_name} from BOOKMARK tab.")
-                            if context.scene.active_tab_name == "BOOKMARK":
-                                index = context.scene.tab_panels.find(panel_name)
-                                if index != -1:
-                                    context.scene.tab_panels.remove(index)
-                            break
         
         for area in bpy.context.window.screen.areas:
             if area.type == "PROPERTIES":
@@ -1805,25 +1790,33 @@ class BIM_OT_manage_tab_panels(bpy.types.Operator):
     tab_name: bpy.props.StringProperty()
 
     def invoke(self, context, event):
-        context.scene.active_tab_name = self.tab_name
         
+        context.scene.active_tab_name = self.tab_name
         context.scene.tab_panels.clear()
-        for panel_data in TAB_PANELS.get(self.tab_name, []):
+        
+        initialize_panel_properties()
+        all_panels = get_all_tab_panels(force_refresh=True)
+        
+        for panel_data in all_panels.get(self.tab_name, []):
             panel_name = panel_data.get("bl_idname", "")
             panel_label = panel_data.get("bl_label", "")
             if not panel_name or not panel_label:
                 continue
+                
             item = context.scene.tab_panels.add()
             item.name = panel_name
             item["bl_label"] = panel_label
 
-            show_prop_name = f"show_{panel_name.lower()}"
+            panel_config = get_panel_config(panel_name)
-            bookmark_prop_name = f"bookmark_{panel_name.lower()}"
+            if panel_config:
-
+                if self.tab_name == "BOOKMARK":
-            item["visible"] = getattr(context.scene, show_prop_name, True)
+                    item["visible"] = panel_config.is_visible_in_bookmarks
-            item["bookmarked"] = getattr(context.scene, bookmark_prop_name, False)
+                else:
-
+                    item["visible"] = panel_config.is_visible_in_tab
-        print(f"Tab Panels for {self.tab_name}: {[item.name for item in context.scene.tab_panels]}")
+                item["bookmarked"] = panel_config.is_bookmarked
+            else:
+                item["visible"] = True
+                item["bookmarked"] = False
 
         return context.window_manager.invoke_popup(self)
 
@@ -1836,11 +1829,15 @@ class BIM_OT_manage_tab_panels(bpy.types.Operator):
 
     def execute(self, context):
         for item in context.scene.tab_panels:
-            show_prop_name = f"show_{item.name.lower()}"
+            panel_config = get_panel_config(item.name)
-            bookmark_prop_name = f"bookmark_{item.name.lower()}"
+            if panel_config:
+                if self.tab_name == "BOOKMARK":
+                    panel_config.is_visible_in_bookmarks = item["visible"]
+                else:
+                    panel_config.is_visible_in_tab = item["visible"]
+                panel_config.is_bookmarked = item["bookmarked"]
+
 
-            setattr(context.scene, show_prop_name, item["visible"])
-            setattr(context.scene, bookmark_prop_name, item["bookmarked"])
 
         self.report({"INFO"}, f"Panels for {self.tab_name} managed successfully.")
         return {"FINISHED"}
@@ -1912,14 +1909,13 @@ class BIM_OT_reset_ui_layout(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        global TAB_PANELS
 
         for tab_name in get_tab_names():
             set_tab_visibility(tab_name, True)
 
-        TAB_PANELS["BOOKMARK"] = [{}]
+        get_all_tab_panels()["BOOKMARK"] = [{}]
 
-        for tab_name, panels in TAB_PANELS.items():
+        for tab_name, panels in get_all_tab_panels().items():
             for panel in panels:
                 panel_name = panel.get("bl_idname", "")
                 if not panel_name:

src/bonsai/bonsai/bim/prop.py

@@ -530,6 +530,17 @@ class BIMTabProperties(PropertyGroup):
         inactive_tab: bool
 
 
+class BIMPanelProperties(PropertyGroup):
+    is_visible_in_tab: BoolProperty(name="Is Visible in Tab", default=True)
+    is_visible_in_bookmarks: BoolProperty(name="Is Visible in Bookmarks", default=True)
+    is_bookmarked: BoolProperty(name="Is Bookmarked", default=False)
+
+    if TYPE_CHECKING:
+        is_visible_in_tab: bool
+        is_visible_in_bookmarks: bool
+        is_bookmarked: bool
+
+
 class BIMProperties(PropertyGroup):
     is_dirty: BoolProperty(name="Is Dirty", default=False)
     schema_dir: StringProperty(
@@ -623,6 +634,7 @@ class BIMProperties(PropertyGroup):
     tab_visibility_fm: BoolProperty(name="FM Tab Visible", default=True)
     tab_visibility_quality: BoolProperty(name="Quality Tab Visible", default=True)
     tab_visibility_bookmark: BoolProperty(name="Bookmark Tab Visible", default=True)
+    panel_properties: CollectionProperty(type=BIMPanelProperties, name="Panel Properties")
 
     if TYPE_CHECKING:
         is_dirty: bool
@@ -648,6 +660,7 @@ class BIMProperties(PropertyGroup):
         tab_visibility_fm: bool
         tab_visibility_quality: bool
         tab_visibility_bookmark: bool
+        panel_properties: bpy.types.bpy_prop_collection[BIMPanelProperties]
 
 
 class IfcParameter(PropertyGroup):