adjusted UI based on feedback received (#1986)

* adjusted UI based on feedback received

* typo

src/blenderbim/blenderbim/bim/__init__.py

@@ -103,17 +103,19 @@ classes = [
     ui.BIM_UL_topics,
     ui.BIM_ADDON_preferences,
     #scene panel groups -->
-    ui.BIM_PT_project_and_template_setup,
+    ui.BIM_PT_project_setup,
     ui.BIM_PT_utilities,
-    ui.BIM_PT_collaboration_and_data_exchange,
+    ui.BIM_PT_collaboration,
-    ui.BIM_PT_geometry_and_spatial_structure,
+    ui.BIM_PT_geometry,
     ui.BIM_PT_4D5D,
     ui.BIM_PT_structural,
+    ui.BIM_PT_services,
     ui.BIM_PT_misc,
     ui.BIM_PT_quality_control,
     #object panel groups -->
-    ui.BIM_PT_geometry_and_spatial_structure_object,
+    ui.BIM_PT_object_metadata,
-    ui.BIM_PT_object_attributes_properties_and_relationships,
+    ui.BIM_PT_geometry_object,
+    ui.BIM_PT_services_object,
     ui.BIM_PT_utilities_object,
     ui.BIM_PT_misc_object
 ]

src/blenderbim/blenderbim/bim/module/aggregate/ui.py

@@ -28,7 +28,7 @@ class BIM_PT_aggregate(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/attribute/ui.py

@@ -59,7 +59,7 @@ class BIM_PT_object_attributes(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
     bl_options = {"DEFAULT_CLOSED"}
 
     @classmethod
@@ -82,7 +82,7 @@ class BIM_PT_material_attributes(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "material"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
     bl_options = {"DEFAULT_CLOSED"}
 
     @classmethod

src/blenderbim/blenderbim/bim/module/bcf/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_bcf(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration_and_data_exchange"
+    bl_parent_id = "BIM_PT_collaboration"
 
     def draw(self, context):
         layout = self.layout

src/blenderbim/blenderbim/bim/module/bimtester/ui.py

@@ -27,7 +27,7 @@ class BIM_PT_qa(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_quality_control"
 
     def draw(self, context):
         self.layout.use_property_split = True

src/blenderbim/blenderbim/bim/module/boundary/ui.py

@@ -31,7 +31,7 @@ class BIM_PT_SceneBoundaries(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure"
+    bl_parent_id = "BIM_PT_geometry"
 
     @classmethod
     def poll(cls, context):
@@ -50,7 +50,7 @@ class BIM_PT_Boundary(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure_object"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):
@@ -119,7 +119,7 @@ class BIM_PT_SpaceBoundaries(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure_object"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/classification/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_classifications(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):
@@ -87,7 +87,7 @@ class BIM_PT_classification_references(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/cobie/ui.py

@@ -27,7 +27,7 @@ class BIM_PT_cobie(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration_and_data_exchange"
+    bl_parent_id = "BIM_PT_collaboration"
 
     def draw(self, context):
         layout = self.layout

src/blenderbim/blenderbim/bim/module/context/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_context(bpy.types.Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure"
+    bl_parent_id = "BIM_PT_geometry"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/csv/ui.py

@@ -27,7 +27,7 @@ class BIM_PT_ifccsv(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration_and_data_exchange"
+    bl_parent_id = "BIM_PT_collaboration"
 
     def draw(self, context):
         layout = self.layout

src/blenderbim/blenderbim/bim/module/document/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_documents(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration_and_data_exchange"
+    bl_parent_id = "BIM_PT_collaboration"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/geometry/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_representations(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/georeference/ui.py

@@ -30,7 +30,7 @@ class BIM_PT_gis(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure"
+    bl_parent_id = "BIM_PT_geometry"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/gis/ui.py

@@ -26,7 +26,7 @@ class BIM_PT_cityjson_converter(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_collaboration_and_data_exchange"
+    bl_parent_id = "BIM_PT_collaboration"
 
     def draw(self, context):
         layout = self.layout

src/blenderbim/blenderbim/bim/module/layer/ui.py

@@ -28,7 +28,7 @@ class BIM_PT_layers(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure_object"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/library/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_libraries(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/material/ui.py

@@ -50,7 +50,7 @@ class BIM_PT_object_material(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/owner/ui.py

@@ -83,7 +83,7 @@ class BIM_PT_people(bpy.types.Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):
@@ -140,7 +140,7 @@ class BIM_PT_organisations(bpy.types.Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):
@@ -185,7 +185,7 @@ class BIM_PT_owner(bpy.types.Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/profile/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_profiles(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure"
+    bl_parent_id = "BIM_PT_geometry"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/project/ui.py

@@ -28,7 +28,7 @@ class BIM_PT_project(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     def draw(self, context):
         if not ProjectData.is_loaded:
@@ -176,7 +176,7 @@ class BIM_PT_project_library(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     def draw(self, context):
         self.layout.use_property_decorate = False
@@ -218,7 +218,7 @@ class BIM_PT_links(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     def draw(self, context):
         self.props = context.scene.BIMProjectProperties

src/blenderbim/blenderbim/bim/module/pset/ui.py

@@ -119,7 +119,7 @@ class BIM_PT_object_psets(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):
@@ -158,7 +158,7 @@ class BIM_PT_object_qtos(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):
@@ -192,7 +192,7 @@ class BIM_PT_material_psets(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "material"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/pset_template/ui.py

@@ -32,7 +32,7 @@ class BIM_PT_pset_template(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     def draw(self, context):
         layout = self.layout

src/blenderbim/blenderbim/bim/module/root/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_class(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/spatial/ui.py

@@ -27,7 +27,7 @@ class BIM_PT_spatial(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_geometry_and_spatial_structure_object"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/system/ui.py

@@ -28,7 +28,7 @@ class BIM_PT_systems(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_utilities"
+    bl_parent_id = "BIM_PT_services"
 
     @classmethod
     def poll(cls, context):
@@ -75,7 +75,7 @@ class BIM_PT_object_systems(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_utilities_object"
+    bl_parent_id = "BIM_PT_services_object"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/type/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_type(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
-    bl_parent_id = "BIM_PT_object_attributes_properties_and_relationships"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/unit/ui.py

@@ -29,7 +29,7 @@ class BIM_PT_units(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_project_and_template_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/module/void/ui.py

@@ -29,6 +29,7 @@ class BIM_PT_voids(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):

src/blenderbim/blenderbim/bim/ui.py

@@ -23,6 +23,7 @@ from . import ifc
 from bpy.types import Panel
 from bpy.props import StringProperty, IntProperty, BoolProperty
 from blenderbim.bim.helper import IFCHeaderSpecs
+import blenderbim.tool as tool
 
 
 class IFCFileSelector:
@@ -157,12 +158,11 @@ def ifc_units(self, context):
 
 
 # Scene Panel Groups -->
-class BIM_PT_project_and_template_setup(Panel):
+class BIM_PT_project_setup(Panel):
-    bl_label = "IFC Project and Template Setup"
+    bl_label = "IFC Project Setup"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_options = {"DEFAULT_CLOSED"}
 
     def draw(self, context):
         pass
@@ -175,12 +175,16 @@ class BIM_PT_utilities(Panel):
     bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
 
-class BIM_PT_collaboration_and_data_exchange(Panel):
+class BIM_PT_collaboration(Panel):
-    bl_label = "IFC Collaboration and Data Exchange"
+    bl_label = "IFC Collaboration"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
@@ -190,13 +194,17 @@ class BIM_PT_collaboration_and_data_exchange(Panel):
         pass
 
 
-class BIM_PT_geometry_and_spatial_structure(Panel):
+class BIM_PT_geometry(Panel):
-    bl_label = "IFC Geometry and Spatial Structure"
+    bl_label = "IFC Geometry"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
@@ -208,6 +216,10 @@ class BIM_PT_4D5D(Panel):
     bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
@@ -219,6 +231,25 @@ class BIM_PT_structural(Panel):
     bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
+    def draw(self, context):
+        pass
+
+
+class BIM_PT_services(Panel):
+    bl_label = "IFC Services"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_options = {"DEFAULT_CLOSED"}
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
@@ -230,6 +261,10 @@ class BIM_PT_misc(Panel):
     bl_context = "scene"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+
     def draw(self, context):
         pass
 
@@ -246,24 +281,46 @@ class BIM_PT_quality_control(Panel):
 
 
 # Object Panel Groups -->
-class BIM_PT_geometry_and_spatial_structure_object(Panel):
+class BIM_PT_object_metadata(Panel):
-    bl_label = "IFC Geometry and Spatial Structure"
+    bl_label = "IFC Object Metadata"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "object"
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
+    def draw(self, context):
+        pass
+    
+    
+class BIM_PT_geometry_object(Panel):
+    bl_label = "IFC Geometry"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
 
-class BIM_PT_object_attributes_properties_and_relationships(Panel):
+class BIM_PT_services_object(Panel):
-    bl_label = "IFC Object Attributes, Properties and Relationships"
+    bl_label = "IFC Services"
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
@@ -275,6 +332,10 @@ class BIM_PT_utilities_object(Panel):
     bl_context = "object"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass
 
@@ -286,5 +347,9 @@ class BIM_PT_misc_object(Panel):
     bl_context = "object"
     bl_options = {"DEFAULT_CLOSED"}
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+    
     def draw(self, context):
         pass