From 3a8a4b7c861166f3856f30a8f992d604171366fc Mon Sep 17 00:00:00 2001 From: Walter Stanish Date: Thu, 4 Jun 2020 11:06:46 +1000 Subject: [PATCH 1/3] Normalize UI panel naming --- src/ifcblenderexport/blenderbim/bim/ui.py | 44 +++++++++---------- .../docs/blenderbim/scene.rst | 16 +++---- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/ifcblenderexport/blenderbim/bim/ui.py b/src/ifcblenderexport/blenderbim/bim/ui.py index 233301d2e8..86a8e6b851 100644 --- a/src/ifcblenderexport/blenderbim/bim/ui.py +++ b/src/ifcblenderexport/blenderbim/bim/ui.py @@ -2,7 +2,7 @@ import bpy from bpy.types import Panel class BIM_PT_object(Panel): - bl_label = 'IFC Object' + bl_label = 'BIM/IFC Object' bl_idname = 'BIM_PT_object' bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -102,7 +102,7 @@ class BIM_PT_object(Panel): class BIM_PT_document_information(Panel): - bl_label = 'Documents' + bl_label = 'BIM/IFC Documents' bl_idname = 'BIM_PT_document_information' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -181,7 +181,7 @@ class BIM_PT_document_information(Panel): class BIM_PT_documents(Panel): - bl_label = 'Documents' + bl_label = 'BIM/IFC Documents' bl_idname = 'BIM_PT_documents' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -222,7 +222,7 @@ class BIM_PT_documents(Panel): class BIM_PT_representations(Panel): - bl_label = 'Representations' + bl_label = 'BIM/IFC Representations' bl_idname = 'BIM_PT_representations' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -255,7 +255,7 @@ class BIM_PT_representations(Panel): class BIM_PT_classification_references(Panel): - bl_label = 'Classification References' + bl_label = 'BIM/IFC Classification References' bl_idname = 'BIM_PT_classification_references' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -285,7 +285,7 @@ class BIM_PT_classification_references(Panel): class BIM_PT_psets(Panel): - bl_label = 'Psets' + bl_label = 'BIM/IFC Item Property Sets' bl_idname = 'BIM_PT_psets' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -329,7 +329,7 @@ class BIM_PT_psets(Panel): class BIM_PT_classifications(Panel): - bl_label = 'Classifications' + bl_label = 'BIM/IFC Item Classifications' bl_idname = 'BIM_PT_classifications' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -379,7 +379,7 @@ class BIM_PT_classifications(Panel): row.prop(props, 'classifications') class BIM_PT_mesh(Panel): - bl_label = 'IFC Representations' + bl_label = 'BIM/IFC Representations' bl_idname = 'BIM_PT_mesh' bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -441,7 +441,7 @@ class BIM_PT_mesh(Panel): class BIM_PT_material(Panel): - bl_label = 'IFC Materials' + bl_label = 'BIM/IFC Materials' bl_idname = 'BIM_PT_material' bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -508,7 +508,7 @@ class BIM_PT_material(Panel): class BIM_PT_gis(Panel): - bl_label = 'IFC Georeferencing' + bl_label = 'BIM/IFC Georeferencing' bl_idname = "BIM_PT_gis" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -543,7 +543,7 @@ class BIM_PT_gis(Panel): class BIM_PT_documentation(Panel): - bl_label = "Documentation" + bl_label = "BIM/IFC Documentation" bl_idname = "BIM_PT_documentation" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -722,7 +722,7 @@ class BIM_PT_text(Panel): class BIM_PT_owner(Panel): - bl_label = "Owner History" + bl_label = "BIM/IFC Owner History" bl_idname = "BIM_PT_owner" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -743,7 +743,7 @@ class BIM_PT_owner(Panel): class BIM_PT_context(Panel): - bl_label = "Geometric Representation Contexts" + bl_label = "BIM/IFC Geometric Representation Contexts" bl_idname = "BIM_PT_context" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -777,7 +777,7 @@ class BIM_PT_context(Panel): class BIM_PT_bim(Panel): - bl_label = "Building Information Modeling" + bl_label = "BIM/IFC Setup" bl_idname = "BIM_PT_bim" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -847,7 +847,7 @@ class BIM_PT_bim(Panel): class BIM_PT_search(Panel): - bl_label = "BIM Search" + bl_label = "BIM/IFC Search" bl_idname = "BIM_PT_search" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -887,7 +887,7 @@ class BIM_PT_search(Panel): class BIM_PT_ifccsv(Panel): - bl_label = "IFC CSV" + bl_label = "BIM/IFC CSV Import/Export" bl_idname = "BIM_PT_ifccsv" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -918,7 +918,7 @@ class BIM_PT_ifccsv(Panel): class BIM_PT_bcf(Panel): - bl_label = "BIM Collaboration Format" + bl_label = "BIM/IFC Collaboration" bl_idname = "BIM_PT_bcf" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1033,7 +1033,7 @@ class BIM_PT_bcf(Panel): class BIM_PT_qa(Panel): - bl_label = "BIMTester Quality Auditing" + bl_label = "BIM/IFC BIMTester Quality Auditing" bl_idname = "BIM_PT_qa" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1082,7 +1082,7 @@ class BIM_PT_qa(Panel): row.operator("bim.select_audited") class BIM_PT_library(Panel): - bl_label = "BIM Server Library" + bl_label = "BIM/IFC BIM Server Library" bl_idname = "BIM_PT_library" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1107,7 +1107,7 @@ class BIM_PT_library(Panel): layout.row().prop(scene.BIMLibrary, 'description') class BIM_PT_diff(Panel): - bl_label = "IFC Diff" + bl_label = "BIM/IFC Diff" bl_idname = "BIM_PT_diff" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1143,7 +1143,7 @@ class BIM_PT_diff(Panel): class BIM_PT_mvd(Panel): - bl_label = "Model View Definitions" + bl_label = "BIM/IFC Model View Definitions" bl_idname = "BIM_PT_mvd" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -1293,7 +1293,7 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): class BIM_PT_ifcclash(Panel): - bl_label = "IFC Clash" + bl_label = "BIM/IFC Clash Sets" bl_idname = "BIM_PT_ifcclash" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' diff --git a/src/ifcblenderexport/docs/blenderbim/scene.rst b/src/ifcblenderexport/docs/blenderbim/scene.rst index c5acbcf996..0d2cac92de 100644 --- a/src/ifcblenderexport/docs/blenderbim/scene.rst +++ b/src/ifcblenderexport/docs/blenderbim/scene.rst @@ -4,8 +4,8 @@ Scene Properties The scene properties panels allow you to manage data that applies to your entire IFC project as a whole, or to multiple elements. -Building Information Modeling Panel ------------------------------------ +BIM/IFC Setup Panel +------------------- System Setup ^^^^^^^^^^^^ @@ -112,8 +112,8 @@ Aggregates to select and modify the aggregate parts. - **Save Aggregate** - this does the opposite of *Edit Aggregate*. -Classifications -^^^^^^^^^^^^^^^ +BIM/IFC Classifications Panel +----------------------------- - **Classification** - this lets you select which classification system you'd like to use. The list of possible classification systems is derived from the @@ -132,8 +132,8 @@ Classifications - **Unassign Classification** - this removes the currently active *Reference* in all of the selected objects. -Owner History Panel -------------------- +BIM/IFC Owner History Panel +--------------------------- - **Person** - this lets you select who you are. The values are derived from the ``{DATA_DIR}/owner/person.json`` file, particularly the @@ -151,8 +151,8 @@ Owner History Panel will also be recorded as the author of the IFC file. -Geometric Representation Contexts Panel ---------------------------------------- +BIM/IFC Geometric Representation Contexts Panel +----------------------------------------------- - **Has Model Context** - enabling this will allow you to export geometric data related to the model view of your BIM data. This is generally 3D From f5d01a90a9cd4409cfe7cadbf3e7203f9a72b63d Mon Sep 17 00:00:00 2001 From: Walter Stanish Date: Thu, 4 Jun 2020 11:08:34 +1000 Subject: [PATCH 2/3] Note on platform specificity --- src/ifcblenderexport/docs/blenderbim/installation.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ifcblenderexport/docs/blenderbim/installation.rst b/src/ifcblenderexport/docs/blenderbim/installation.rst index a84420dd89..7c4df4ff3c 100644 --- a/src/ifcblenderexport/docs/blenderbim/installation.rst +++ b/src/ifcblenderexport/docs/blenderbim/installation.rst @@ -48,6 +48,9 @@ bunch of library files in the ``2.81/`` folder too. This is a non-standard location to place files, but is a hack to allow people to use precompiled builds from Conda. +If you receive an error when enabling the add-on, you may have installed the +package for the wrong platform. + Updating -------- From 619abdae5195befee008a48725736f68de6beb32 Mon Sep 17 00:00:00 2001 From: Walter Stanish Date: Thu, 4 Jun 2020 11:42:29 +1000 Subject: [PATCH 3/3] Update strings as per pull request --- src/ifcblenderexport/blenderbim/bim/ui.py | 44 +++++++++---------- .../docs/blenderbim/scene.rst | 16 +++---- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/ifcblenderexport/blenderbim/bim/ui.py b/src/ifcblenderexport/blenderbim/bim/ui.py index 86a8e6b851..71e441bc17 100644 --- a/src/ifcblenderexport/blenderbim/bim/ui.py +++ b/src/ifcblenderexport/blenderbim/bim/ui.py @@ -2,7 +2,7 @@ import bpy from bpy.types import Panel class BIM_PT_object(Panel): - bl_label = 'BIM/IFC Object' + bl_label = 'IFC Object' bl_idname = 'BIM_PT_object' bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -102,7 +102,7 @@ class BIM_PT_object(Panel): class BIM_PT_document_information(Panel): - bl_label = 'BIM/IFC Documents' + bl_label = 'IFC Documents' bl_idname = 'BIM_PT_document_information' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -181,7 +181,7 @@ class BIM_PT_document_information(Panel): class BIM_PT_documents(Panel): - bl_label = 'BIM/IFC Documents' + bl_label = 'IFC Documents' bl_idname = 'BIM_PT_documents' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -222,7 +222,7 @@ class BIM_PT_documents(Panel): class BIM_PT_representations(Panel): - bl_label = 'BIM/IFC Representations' + bl_label = 'IFC Representations' bl_idname = 'BIM_PT_representations' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -255,7 +255,7 @@ class BIM_PT_representations(Panel): class BIM_PT_classification_references(Panel): - bl_label = 'BIM/IFC Classification References' + bl_label = 'IFC Classification References' bl_idname = 'BIM_PT_classification_references' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -285,7 +285,7 @@ class BIM_PT_classification_references(Panel): class BIM_PT_psets(Panel): - bl_label = 'BIM/IFC Item Property Sets' + bl_label = 'IFC Property Sets' bl_idname = 'BIM_PT_psets' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -329,7 +329,7 @@ class BIM_PT_psets(Panel): class BIM_PT_classifications(Panel): - bl_label = 'BIM/IFC Item Classifications' + bl_label = 'IFC Classifications References' bl_idname = 'BIM_PT_classifications' bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -379,7 +379,7 @@ class BIM_PT_classifications(Panel): row.prop(props, 'classifications') class BIM_PT_mesh(Panel): - bl_label = 'BIM/IFC Representations' + bl_label = 'IFC Representations' bl_idname = 'BIM_PT_mesh' bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -441,7 +441,7 @@ class BIM_PT_mesh(Panel): class BIM_PT_material(Panel): - bl_label = 'BIM/IFC Materials' + bl_label = 'IFC Materials' bl_idname = 'BIM_PT_material' bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -508,7 +508,7 @@ class BIM_PT_material(Panel): class BIM_PT_gis(Panel): - bl_label = 'BIM/IFC Georeferencing' + bl_label = 'IFC Georeferencing' bl_idname = "BIM_PT_gis" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -543,7 +543,7 @@ class BIM_PT_gis(Panel): class BIM_PT_documentation(Panel): - bl_label = "BIM/IFC Documentation" + bl_label = "BIM Documentation" bl_idname = "BIM_PT_documentation" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -722,7 +722,7 @@ class BIM_PT_text(Panel): class BIM_PT_owner(Panel): - bl_label = "BIM/IFC Owner History" + bl_label = "IFC Owner History" bl_idname = "BIM_PT_owner" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -743,7 +743,7 @@ class BIM_PT_owner(Panel): class BIM_PT_context(Panel): - bl_label = "BIM/IFC Geometric Representation Contexts" + bl_label = "IFC Geometric Representation Contexts" bl_idname = "BIM_PT_context" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -777,7 +777,7 @@ class BIM_PT_context(Panel): class BIM_PT_bim(Panel): - bl_label = "BIM/IFC Setup" + bl_label = "Building Information Modeling" bl_idname = "BIM_PT_bim" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -847,7 +847,7 @@ class BIM_PT_bim(Panel): class BIM_PT_search(Panel): - bl_label = "BIM/IFC Search" + bl_label = "IFC Search" bl_idname = "BIM_PT_search" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -887,7 +887,7 @@ class BIM_PT_search(Panel): class BIM_PT_ifccsv(Panel): - bl_label = "BIM/IFC CSV Import/Export" + bl_label = "IFC CSV Import/Export" bl_idname = "BIM_PT_ifccsv" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -918,7 +918,7 @@ class BIM_PT_ifccsv(Panel): class BIM_PT_bcf(Panel): - bl_label = "BIM/IFC Collaboration" + bl_label = "BIM Collaboration Format (BCF)" bl_idname = "BIM_PT_bcf" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1033,7 +1033,7 @@ class BIM_PT_bcf(Panel): class BIM_PT_qa(Panel): - bl_label = "BIM/IFC BIMTester Quality Auditing" + bl_label = "BIMTester Quality Auditing" bl_idname = "BIM_PT_qa" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1082,7 +1082,7 @@ class BIM_PT_qa(Panel): row.operator("bim.select_audited") class BIM_PT_library(Panel): - bl_label = "BIM/IFC BIM Server Library" + bl_label = "IFC BIM Server Library" bl_idname = "BIM_PT_library" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1107,7 +1107,7 @@ class BIM_PT_library(Panel): layout.row().prop(scene.BIMLibrary, 'description') class BIM_PT_diff(Panel): - bl_label = "BIM/IFC Diff" + bl_label = "IFC Diff" bl_idname = "BIM_PT_diff" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' @@ -1143,7 +1143,7 @@ class BIM_PT_diff(Panel): class BIM_PT_mvd(Panel): - bl_label = "BIM/IFC Model View Definitions" + bl_label = "Model View Definitions (MVD)" bl_idname = "BIM_PT_mvd" bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -1293,7 +1293,7 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): class BIM_PT_ifcclash(Panel): - bl_label = "BIM/IFC Clash Sets" + bl_label = "IFC Clash Sets" bl_idname = "BIM_PT_ifcclash" bl_options = {'DEFAULT_CLOSED'} bl_space_type = 'PROPERTIES' diff --git a/src/ifcblenderexport/docs/blenderbim/scene.rst b/src/ifcblenderexport/docs/blenderbim/scene.rst index 0d2cac92de..74fa0a98a7 100644 --- a/src/ifcblenderexport/docs/blenderbim/scene.rst +++ b/src/ifcblenderexport/docs/blenderbim/scene.rst @@ -4,8 +4,8 @@ Scene Properties The scene properties panels allow you to manage data that applies to your entire IFC project as a whole, or to multiple elements. -BIM/IFC Setup Panel -------------------- +Building Information Modeling Panel +----------------------------------- System Setup ^^^^^^^^^^^^ @@ -112,8 +112,8 @@ Aggregates to select and modify the aggregate parts. - **Save Aggregate** - this does the opposite of *Edit Aggregate*. -BIM/IFC Classifications Panel ------------------------------ +IFC Classifications Panel +------------------------- - **Classification** - this lets you select which classification system you'd like to use. The list of possible classification systems is derived from the @@ -132,8 +132,8 @@ BIM/IFC Classifications Panel - **Unassign Classification** - this removes the currently active *Reference* in all of the selected objects. -BIM/IFC Owner History Panel ---------------------------- +IFC Owner History Panel +----------------------- - **Person** - this lets you select who you are. The values are derived from the ``{DATA_DIR}/owner/person.json`` file, particularly the @@ -151,8 +151,8 @@ BIM/IFC Owner History Panel will also be recorded as the author of the IFC file. -BIM/IFC Geometric Representation Contexts Panel ------------------------------------------------ +IFC Geometric Representation Contexts Panel +------------------------------------------- - **Has Model Context** - enabling this will allow you to export geometric data related to the model view of your BIM data. This is generally 3D