Minor tweaks. See #2006.

This commit is contained in:
Dion Moult
2022-01-28 10:48:22 +11:00
parent 52739418d8
commit f2e9f76631
10 changed files with 38 additions and 44 deletions
+6 -6
View File
@@ -105,17 +105,17 @@ classes = [
ui.BIM_UL_generic, ui.BIM_UL_generic,
ui.BIM_UL_topics, ui.BIM_UL_topics,
ui.BIM_ADDON_preferences, ui.BIM_ADDON_preferences,
# scene panel groups --> # Scene panel groups
ui.BIM_PT_project_info,
ui.BIM_PT_project_setup, ui.BIM_PT_project_setup,
ui.BIM_PT_utilities,
ui.BIM_PT_collaboration, ui.BIM_PT_collaboration,
ui.BIM_PT_geometry, ui.BIM_PT_geometry,
ui.BIM_PT_4D5D,
ui.BIM_PT_structural,
ui.BIM_PT_services, ui.BIM_PT_services,
ui.BIM_PT_misc, ui.BIM_PT_structural,
ui.BIM_PT_4D5D,
ui.BIM_PT_quality_control, ui.BIM_PT_quality_control,
# object panel groups --> ui.BIM_PT_integrations,
# Object panel groups
ui.BIM_PT_object_metadata, ui.BIM_PT_object_metadata,
ui.BIM_PT_geometry_object, ui.BIM_PT_geometry_object,
ui.BIM_PT_services_object, ui.BIM_PT_services_object,
@@ -60,7 +60,6 @@ class BIM_PT_object_attributes(Panel):
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "object" bl_context = "object"
bl_parent_id = "BIM_PT_object_metadata" bl_parent_id = "BIM_PT_object_metadata"
bl_options = {"DEFAULT_CLOSED"}
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
@@ -26,6 +26,7 @@ class BIM_PT_augin(bpy.types.Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_integrations"
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
@@ -29,7 +29,7 @@ class BIM_PT_constraints(Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_misc" bl_parent_id = "BIM_PT_project_setup"
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
@@ -26,6 +26,7 @@ class BIM_PT_covetool(bpy.types.Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_integrations"
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
@@ -28,7 +28,7 @@ class BIM_PT_groups(Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_utilities" bl_parent_id = "BIM_PT_project_setup"
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
@@ -27,6 +27,7 @@ class BIM_PT_lca(Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_integrations"
def draw(self, context): def draw(self, context):
props = context.scene.BIMLCAProperties props = context.scene.BIMLCAProperties
@@ -28,7 +28,7 @@ class BIM_PT_project(Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_project_setup" bl_parent_id = "BIM_PT_project_info"
def draw(self, context): def draw(self, context):
if not ProjectData.is_loaded: if not ProjectData.is_loaded:
@@ -143,14 +143,6 @@ class BIM_PT_project(Panel):
op.should_save_as = True op.should_save_as = True
row.operator("bim.select_ifc_file", icon="FILE_FOLDER", text="") row.operator("bim.select_ifc_file", icon="FILE_FOLDER", text="")
row = self.layout.row(align=True)
row.prop(props, "schema_dir")
row.operator("bim.select_schema_dir", icon="FILE_FOLDER", text="")
row = self.layout.row(align=True)
row.prop(props, "data_dir")
row.operator("bim.select_data_dir", icon="FILE_FOLDER", text="")
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
@@ -28,7 +28,7 @@ class BIM_PT_search(Panel):
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_parent_id = "BIM_PT_utilities" bl_parent_id = "BIM_PT_collaboration"
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
+25 -25
View File
@@ -152,6 +152,14 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
row = layout.row() row = layout.row()
row.prop(context.scene.BIMModelProperties, "occurrence_name_function") row.prop(context.scene.BIMModelProperties, "occurrence_name_function")
row = self.layout.row(align=True)
row.prop(context.scene.BIMProperties, "schema_dir")
row.operator("bim.select_schema_dir", icon="FILE_FOLDER", text="")
row = self.layout.row(align=True)
row.prop(context.scene.BIMProperties, "data_dir")
row.operator("bim.select_data_dir", icon="FILE_FOLDER", text="")
row = layout.row() row = layout.row()
row.operator("bim.configure_visibility") row.operator("bim.configure_visibility")
@@ -173,9 +181,9 @@ def ifc_units(self, context):
row.prop(props, "metric_precision") row.prop(props, "metric_precision")
# Scene Panel Groups --> # Scene panel groups
class BIM_PT_project_setup(Panel): class BIM_PT_project_info(Panel):
bl_label = "IFC Project Setup" bl_label = "IFC Project Info"
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
@@ -184,17 +192,13 @@ class BIM_PT_project_setup(Panel):
pass pass
class BIM_PT_utilities(Panel): class BIM_PT_project_setup(Panel):
bl_label = "IFC Utilities" bl_label = "IFC Project Setup"
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW" bl_region_type = "WINDOW"
bl_context = "scene" bl_context = "scene"
bl_options = {"DEFAULT_CLOSED"} bl_options = {"DEFAULT_CLOSED"}
@classmethod
def poll(cls, context):
return tool.Ifc.get()
def draw(self, context): def draw(self, context):
pass pass
@@ -270,21 +274,6 @@ class BIM_PT_services(Panel):
pass pass
class BIM_PT_misc(Panel):
bl_label = "IFC Misc."
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
class BIM_PT_quality_control(Panel): class BIM_PT_quality_control(Panel):
bl_label = "IFC Quality Control" bl_label = "IFC Quality Control"
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"
@@ -296,7 +285,18 @@ class BIM_PT_quality_control(Panel):
pass pass
# Object Panel Groups --> class BIM_PT_integrations(Panel):
bl_label = "BIM Integrations"
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
bl_context = "scene"
bl_options = {"DEFAULT_CLOSED"}
def draw(self, context):
pass
# Object panel groups
class BIM_PT_object_metadata(Panel): class BIM_PT_object_metadata(Panel):
bl_label = "IFC Object Metadata" bl_label = "IFC Object Metadata"
bl_space_type = "PROPERTIES" bl_space_type = "PROPERTIES"