From 66ecb92cc2bf7583ed939d0a1d923d57fb2d2da3 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Sat, 7 Jan 2023 12:00:22 +1100 Subject: [PATCH] Minor UX improvements to library name and Sverchok UI --- ...uctural_assets_library.ifc => IFC4 AU Library.ifc} | 0 src/blenderbim/blenderbim/bim/module/model/data.py | 11 ++++++++++- .../blenderbim/bim/module/model/sverchok_modifier.py | 6 +++--- src/blenderbim/blenderbim/bim/module/model/ui.py | 4 +++- 4 files changed, 16 insertions(+), 5 deletions(-) rename src/blenderbim/blenderbim/bim/data/libraries/{Non_structural_assets_library.ifc => IFC4 AU Library.ifc} (100%) diff --git a/src/blenderbim/blenderbim/bim/data/libraries/Non_structural_assets_library.ifc b/src/blenderbim/blenderbim/bim/data/libraries/IFC4 AU Library.ifc similarity index 100% rename from src/blenderbim/blenderbim/bim/data/libraries/Non_structural_assets_library.ifc rename to src/blenderbim/blenderbim/bim/data/libraries/IFC4 AU Library.ifc diff --git a/src/blenderbim/blenderbim/bim/module/model/data.py b/src/blenderbim/blenderbim/bim/module/model/data.py index 31c15e905f..4ad36dbffb 100644 --- a/src/blenderbim/blenderbim/bim/module/model/data.py +++ b/src/blenderbim/blenderbim/bim/module/model/data.py @@ -385,7 +385,7 @@ class SverchokData: @classmethod def load(cls): cls.is_loaded = True - cls.data = {"parameters": cls.parameters()} + cls.data = {"parameters": cls.parameters(), "has_sverchok": cls.has_sverchok()} @classmethod def parameters(cls): @@ -396,3 +396,12 @@ class SverchokData: if parameters: parameters["data"] = json.loads(parameters.get("Data", "[]") or "[]") return parameters + + @classmethod + def has_sverchok(cls): + try: + import sverchok + + return True + except: + return False diff --git a/src/blenderbim/blenderbim/bim/module/model/sverchok_modifier.py b/src/blenderbim/blenderbim/bim/module/model/sverchok_modifier.py index e81b910ead..dad29aa6ce 100644 --- a/src/blenderbim/blenderbim/bim/module/model/sverchok_modifier.py +++ b/src/blenderbim/blenderbim/bim/module/model/sverchok_modifier.py @@ -76,7 +76,7 @@ def update_sverchok_modifier(context): # UI operators class CreateNewSverchokGraph(bpy.types.Operator, tool.Ifc.Operator): bl_idname = "bim.create_new_sverchok_graph" - bl_label = "Create new sverchok graph" + bl_label = "Create New Sverchok Graph" bl_options = {"REGISTER"} def _execute(self, context): @@ -101,7 +101,7 @@ class CreateNewSverchokGraph(bpy.types.Operator, tool.Ifc.Operator): class DeleteSverchokGraph(bpy.types.Operator, tool.Ifc.Operator): bl_idname = "bim.delete_sverchok_graph" - bl_label = "Delete selected sverchok graph" + bl_label = "Delete Selected Sverchok Graph" bl_options = {"REGISTER"} def _execute(self, context): @@ -120,7 +120,7 @@ class DeleteSverchokGraph(bpy.types.Operator, tool.Ifc.Operator): class UpdateDataFromSverchok(bpy.types.Operator, tool.Ifc.Operator): bl_idname = "bim.update_data_from_sverchok" - bl_label = "Update data from sverchok" + bl_label = "Update Data From Sverchok" bl_options = {"REGISTER"} def invoke(self, context, event): diff --git a/src/blenderbim/blenderbim/bim/module/model/ui.py b/src/blenderbim/blenderbim/bim/module/model/ui.py index 846c6ac364..80cf755b59 100644 --- a/src/blenderbim/blenderbim/bim/module/model/ui.py +++ b/src/blenderbim/blenderbim/bim/module/model/ui.py @@ -385,7 +385,9 @@ class BIM_PT_sverchok(bpy.types.Panel): if not SverchokData.is_loaded: SverchokData.load() - self.layout.label(text="Requires SVERCHOK addon to be enabled.", icon="SEQUENCE_COLOR_02") + if not SverchokData.data["has_sverchok"]: + self.layout.label(text="Requires Sverchok Add-on", icon="ERROR") + return props = context.active_object.BIMSverchokProperties self.layout.prop_search(props, "node_group", bpy.data, "node_groups")