From c6b64baccb9d2aab458bb96e45b7c7717711dec6 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 23 Jan 2025 23:10:40 +1100 Subject: [PATCH] Fix #6028. Deprecate schema dir as it's basically just data. --- src/bonsai/Makefile | 2 +- src/bonsai/bonsai/bim/data/brick/.gitignore | 3 +++ src/bonsai/bonsai/bim/data/brick/README.md | 1 + .../classifications/BB_SfB_4_cijfers.ifc | 0 .../classifications/BIMTypeCode_V1.0_SWE.ifc | 0 .../bim/{schema => data}/classifications/Brick.ifc | 0 .../{schema => data}/classifications/CAWS Nov 2019.ifc | 0 .../classifications/CBI_L2_Classification.ifc | 0 .../classifications/CBI_L4_Classification.ifc | 0 .../{schema => data}/classifications/CC001_001_001.ifc | 0 .../bim/{schema => data}/classifications/CCI(EN).ifc | 0 .../bim/{schema => data}/classifications/CCS(DK)m.ifc | 0 .../bim/{schema => data}/classifications/CCS(EN).ifc | 0 .../bim/{schema => data}/classifications/CCTB_01.08.ifc | 0 .../{schema => data}/classifications/CD001_001_004.ifc | 0 .../{schema => data}/classifications/CD002_001_001.ifc | 0 .../classifications/EcoQuaestor Codetabel.ifc | 0 .../GuBIMclass_v.1.2_CA-ClassManager_.ifc | 0 .../GuBIMclass_v.1.2_ES-ClassManager_.ifc | 0 .../classifications/MasterFormat2016Edition.ifc | 0 .../{schema => data}/classifications/NATSPEC 2017.ifc | 0 .../bim/{schema => data}/classifications/NBS Create.ifc | 0 .../classifications/NL_SfB_4_cijfers_2005.ifc | 0 .../classifications/NL_SfB_tabel_1_2019.ifc | 0 .../bim/{schema => data}/classifications/NS3451.ifc | 0 .../classifications/ONORM 6241-2 with Properties.ifc | 0 .../{schema => data}/classifications/Omniclass_OCCS.ifc | 0 .../bim/{schema => data}/classifications/RICS NRM1.ifc | 0 .../bim/{schema => data}/classifications/RICS NRM3.ifc | 0 .../bim/{schema => data}/classifications/SFG20_.ifc | 0 .../bim/{schema => data}/classifications/SINAPI.ifc | 0 .../classifications/STABU-Element (6 Cijfers).ifc | 0 .../TALO2000_Building_Component_Classification_ENG.ifc | 0 .../classifications/TALO2000_Hankenimikkeistö_FIN.ifc | 0 .../classifications/Uniclass July 2023.ifc | 0 .../bim/{schema => data}/classifications/Uniclass2.ifc | 0 .../classifications/Uniclass2015_Jan2020.ifc | 0 .../classifications/UniformatII-0918.ifc | 0 .../classifications/Uniformat_2010_CSI.ifc | 0 .../bonsai/bim/{schema => data}/classifications/VBIS.ifc | 0 .../bim/{schema => data}/classifications/VMSW_2015.ifc | 0 src/bonsai/bonsai/bim/module/drawing/prop.py | 2 +- src/bonsai/bonsai/bim/ui.py | 6 +----- src/bonsai/bonsai/tool/brick.py | 9 ++++----- 44 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 src/bonsai/bonsai/bim/data/brick/.gitignore create mode 100644 src/bonsai/bonsai/bim/data/brick/README.md rename src/bonsai/bonsai/bim/{schema => data}/classifications/BB_SfB_4_cijfers.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/BIMTypeCode_V1.0_SWE.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/Brick.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CAWS Nov 2019.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CBI_L2_Classification.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CBI_L4_Classification.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CC001_001_001.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CCI(EN).ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CCS(DK)m.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CCS(EN).ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CCTB_01.08.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CD001_001_004.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/CD002_001_001.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/EcoQuaestor Codetabel.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/GuBIMclass_v.1.2_CA-ClassManager_.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/GuBIMclass_v.1.2_ES-ClassManager_.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/MasterFormat2016Edition.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/NATSPEC 2017.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/NBS Create.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/NL_SfB_4_cijfers_2005.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/NL_SfB_tabel_1_2019.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/NS3451.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/ONORM 6241-2 with Properties.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/Omniclass_OCCS.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/RICS NRM1.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/RICS NRM3.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/SFG20_.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/SINAPI.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/STABU-Element (6 Cijfers).ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/TALO2000_Building_Component_Classification_ENG.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/TALO2000_Hankenimikkeistö_FIN.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/Uniclass July 2023.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/Uniclass2.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/Uniclass2015_Jan2020.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/UniformatII-0918.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/Uniformat_2010_CSI.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/VBIS.ifc (100%) rename src/bonsai/bonsai/bim/{schema => data}/classifications/VMSW_2015.ifc (100%) diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile index a121379313..6398986105 100644 --- a/src/bonsai/Makefile +++ b/src/bonsai/Makefile @@ -214,7 +214,7 @@ endif # Brickschema requires pkg_resources which is provided by Blender. # Provides Brickschema functionality # For now lets bundle the latest nightly schema - cd build/bonsai/bim/schema && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl + cd build/bonsai/bim/data/brick/ && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl # Required for hipped roof generation cd build && wget https://github.com/prochitecture/bpypolyskel/archive/refs/heads/master.zip diff --git a/src/bonsai/bonsai/bim/data/brick/.gitignore b/src/bonsai/bonsai/bim/data/brick/.gitignore new file mode 100644 index 0000000000..7c9d611b59 --- /dev/null +++ b/src/bonsai/bonsai/bim/data/brick/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!README.md diff --git a/src/bonsai/bonsai/bim/data/brick/README.md b/src/bonsai/bonsai/bim/data/brick/README.md new file mode 100644 index 0000000000..0f812b8bf5 --- /dev/null +++ b/src/bonsai/bonsai/bim/data/brick/README.md @@ -0,0 +1 @@ +This directory stores Brickschema definitions in TTL format. diff --git a/src/bonsai/bonsai/bim/schema/classifications/BB_SfB_4_cijfers.ifc b/src/bonsai/bonsai/bim/data/classifications/BB_SfB_4_cijfers.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/BB_SfB_4_cijfers.ifc rename to src/bonsai/bonsai/bim/data/classifications/BB_SfB_4_cijfers.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/BIMTypeCode_V1.0_SWE.ifc b/src/bonsai/bonsai/bim/data/classifications/BIMTypeCode_V1.0_SWE.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/BIMTypeCode_V1.0_SWE.ifc rename to src/bonsai/bonsai/bim/data/classifications/BIMTypeCode_V1.0_SWE.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/Brick.ifc b/src/bonsai/bonsai/bim/data/classifications/Brick.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/Brick.ifc rename to src/bonsai/bonsai/bim/data/classifications/Brick.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CAWS Nov 2019.ifc b/src/bonsai/bonsai/bim/data/classifications/CAWS Nov 2019.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CAWS Nov 2019.ifc rename to src/bonsai/bonsai/bim/data/classifications/CAWS Nov 2019.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CBI_L2_Classification.ifc b/src/bonsai/bonsai/bim/data/classifications/CBI_L2_Classification.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CBI_L2_Classification.ifc rename to src/bonsai/bonsai/bim/data/classifications/CBI_L2_Classification.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CBI_L4_Classification.ifc b/src/bonsai/bonsai/bim/data/classifications/CBI_L4_Classification.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CBI_L4_Classification.ifc rename to src/bonsai/bonsai/bim/data/classifications/CBI_L4_Classification.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CC001_001_001.ifc b/src/bonsai/bonsai/bim/data/classifications/CC001_001_001.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CC001_001_001.ifc rename to src/bonsai/bonsai/bim/data/classifications/CC001_001_001.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CCI(EN).ifc b/src/bonsai/bonsai/bim/data/classifications/CCI(EN).ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CCI(EN).ifc rename to src/bonsai/bonsai/bim/data/classifications/CCI(EN).ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CCS(DK)m.ifc b/src/bonsai/bonsai/bim/data/classifications/CCS(DK)m.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CCS(DK)m.ifc rename to src/bonsai/bonsai/bim/data/classifications/CCS(DK)m.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CCS(EN).ifc b/src/bonsai/bonsai/bim/data/classifications/CCS(EN).ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CCS(EN).ifc rename to src/bonsai/bonsai/bim/data/classifications/CCS(EN).ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CCTB_01.08.ifc b/src/bonsai/bonsai/bim/data/classifications/CCTB_01.08.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CCTB_01.08.ifc rename to src/bonsai/bonsai/bim/data/classifications/CCTB_01.08.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CD001_001_004.ifc b/src/bonsai/bonsai/bim/data/classifications/CD001_001_004.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CD001_001_004.ifc rename to src/bonsai/bonsai/bim/data/classifications/CD001_001_004.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/CD002_001_001.ifc b/src/bonsai/bonsai/bim/data/classifications/CD002_001_001.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/CD002_001_001.ifc rename to src/bonsai/bonsai/bim/data/classifications/CD002_001_001.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/EcoQuaestor Codetabel.ifc b/src/bonsai/bonsai/bim/data/classifications/EcoQuaestor Codetabel.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/EcoQuaestor Codetabel.ifc rename to src/bonsai/bonsai/bim/data/classifications/EcoQuaestor Codetabel.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/GuBIMclass_v.1.2_CA-ClassManager_.ifc b/src/bonsai/bonsai/bim/data/classifications/GuBIMclass_v.1.2_CA-ClassManager_.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/GuBIMclass_v.1.2_CA-ClassManager_.ifc rename to src/bonsai/bonsai/bim/data/classifications/GuBIMclass_v.1.2_CA-ClassManager_.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/GuBIMclass_v.1.2_ES-ClassManager_.ifc b/src/bonsai/bonsai/bim/data/classifications/GuBIMclass_v.1.2_ES-ClassManager_.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/GuBIMclass_v.1.2_ES-ClassManager_.ifc rename to src/bonsai/bonsai/bim/data/classifications/GuBIMclass_v.1.2_ES-ClassManager_.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/MasterFormat2016Edition.ifc b/src/bonsai/bonsai/bim/data/classifications/MasterFormat2016Edition.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/MasterFormat2016Edition.ifc rename to src/bonsai/bonsai/bim/data/classifications/MasterFormat2016Edition.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/NATSPEC 2017.ifc b/src/bonsai/bonsai/bim/data/classifications/NATSPEC 2017.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/NATSPEC 2017.ifc rename to src/bonsai/bonsai/bim/data/classifications/NATSPEC 2017.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/NBS Create.ifc b/src/bonsai/bonsai/bim/data/classifications/NBS Create.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/NBS Create.ifc rename to src/bonsai/bonsai/bim/data/classifications/NBS Create.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/NL_SfB_4_cijfers_2005.ifc b/src/bonsai/bonsai/bim/data/classifications/NL_SfB_4_cijfers_2005.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/NL_SfB_4_cijfers_2005.ifc rename to src/bonsai/bonsai/bim/data/classifications/NL_SfB_4_cijfers_2005.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/NL_SfB_tabel_1_2019.ifc b/src/bonsai/bonsai/bim/data/classifications/NL_SfB_tabel_1_2019.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/NL_SfB_tabel_1_2019.ifc rename to src/bonsai/bonsai/bim/data/classifications/NL_SfB_tabel_1_2019.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/NS3451.ifc b/src/bonsai/bonsai/bim/data/classifications/NS3451.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/NS3451.ifc rename to src/bonsai/bonsai/bim/data/classifications/NS3451.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/ONORM 6241-2 with Properties.ifc b/src/bonsai/bonsai/bim/data/classifications/ONORM 6241-2 with Properties.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/ONORM 6241-2 with Properties.ifc rename to src/bonsai/bonsai/bim/data/classifications/ONORM 6241-2 with Properties.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/Omniclass_OCCS.ifc b/src/bonsai/bonsai/bim/data/classifications/Omniclass_OCCS.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/Omniclass_OCCS.ifc rename to src/bonsai/bonsai/bim/data/classifications/Omniclass_OCCS.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/RICS NRM1.ifc b/src/bonsai/bonsai/bim/data/classifications/RICS NRM1.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/RICS NRM1.ifc rename to src/bonsai/bonsai/bim/data/classifications/RICS NRM1.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/RICS NRM3.ifc b/src/bonsai/bonsai/bim/data/classifications/RICS NRM3.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/RICS NRM3.ifc rename to src/bonsai/bonsai/bim/data/classifications/RICS NRM3.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/SFG20_.ifc b/src/bonsai/bonsai/bim/data/classifications/SFG20_.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/SFG20_.ifc rename to src/bonsai/bonsai/bim/data/classifications/SFG20_.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/SINAPI.ifc b/src/bonsai/bonsai/bim/data/classifications/SINAPI.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/SINAPI.ifc rename to src/bonsai/bonsai/bim/data/classifications/SINAPI.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/STABU-Element (6 Cijfers).ifc b/src/bonsai/bonsai/bim/data/classifications/STABU-Element (6 Cijfers).ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/STABU-Element (6 Cijfers).ifc rename to src/bonsai/bonsai/bim/data/classifications/STABU-Element (6 Cijfers).ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/TALO2000_Building_Component_Classification_ENG.ifc b/src/bonsai/bonsai/bim/data/classifications/TALO2000_Building_Component_Classification_ENG.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/TALO2000_Building_Component_Classification_ENG.ifc rename to src/bonsai/bonsai/bim/data/classifications/TALO2000_Building_Component_Classification_ENG.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/TALO2000_Hankenimikkeistö_FIN.ifc b/src/bonsai/bonsai/bim/data/classifications/TALO2000_Hankenimikkeistö_FIN.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/TALO2000_Hankenimikkeistö_FIN.ifc rename to src/bonsai/bonsai/bim/data/classifications/TALO2000_Hankenimikkeistö_FIN.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/Uniclass July 2023.ifc b/src/bonsai/bonsai/bim/data/classifications/Uniclass July 2023.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/Uniclass July 2023.ifc rename to src/bonsai/bonsai/bim/data/classifications/Uniclass July 2023.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/Uniclass2.ifc b/src/bonsai/bonsai/bim/data/classifications/Uniclass2.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/Uniclass2.ifc rename to src/bonsai/bonsai/bim/data/classifications/Uniclass2.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/Uniclass2015_Jan2020.ifc b/src/bonsai/bonsai/bim/data/classifications/Uniclass2015_Jan2020.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/Uniclass2015_Jan2020.ifc rename to src/bonsai/bonsai/bim/data/classifications/Uniclass2015_Jan2020.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/UniformatII-0918.ifc b/src/bonsai/bonsai/bim/data/classifications/UniformatII-0918.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/UniformatII-0918.ifc rename to src/bonsai/bonsai/bim/data/classifications/UniformatII-0918.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/Uniformat_2010_CSI.ifc b/src/bonsai/bonsai/bim/data/classifications/Uniformat_2010_CSI.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/Uniformat_2010_CSI.ifc rename to src/bonsai/bonsai/bim/data/classifications/Uniformat_2010_CSI.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/VBIS.ifc b/src/bonsai/bonsai/bim/data/classifications/VBIS.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/VBIS.ifc rename to src/bonsai/bonsai/bim/data/classifications/VBIS.ifc diff --git a/src/bonsai/bonsai/bim/schema/classifications/VMSW_2015.ifc b/src/bonsai/bonsai/bim/data/classifications/VMSW_2015.ifc similarity index 100% rename from src/bonsai/bonsai/bim/schema/classifications/VMSW_2015.ifc rename to src/bonsai/bonsai/bim/data/classifications/VMSW_2015.ifc diff --git a/src/bonsai/bonsai/bim/module/drawing/prop.py b/src/bonsai/bonsai/bim/module/drawing/prop.py index ad4c4d97f9..594d34757c 100644 --- a/src/bonsai/bonsai/bim/module/drawing/prop.py +++ b/src/bonsai/bonsai/bim/module/drawing/prop.py @@ -403,7 +403,7 @@ class DocProperties(PropertyGroup): imperial_precision: StringProperty(default="1/32", name="Imperial Precision") tolerance: bpy.props.FloatProperty(default=0.00001, name="A tolerance used when selecting objects") classes_to_wireframe: StringProperty( - default="IfcVirtualelement", + default="IfcVirtualElement", name="Classes to Wireframe", description="Upon import, these classes will display as wireframe.\nEx: IfcVirtualelement, IfcSpace", ) diff --git a/src/bonsai/bonsai/bim/ui.py b/src/bonsai/bonsai/bim/ui.py index d33c0e6345..53587cef23 100644 --- a/src/bonsai/bonsai/bim/ui.py +++ b/src/bonsai/bonsai/bim/ui.py @@ -353,15 +353,11 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences): layout.prop(context.scene.BIMModelProperties, "occurrence_name_function") def draw_directories(self, layout, context): - row = layout.row(align=True) - row.prop(context.scene.BIMProperties, "schema_dir") - row.operator("bim.select_schema_dir", icon="FILE_FOLDER", text="") - row = layout.row(align=True) row.prop(context.scene.BIMProperties, "data_dir") row.operator("bim.select_data_dir", icon="FILE_FOLDER", text="") - row = self.layout.row(align=True) + row = layout.row(align=True) row.prop(context.scene.BIMProperties, "cache_dir") row.operator("bim.select_cache_dir", icon="FILE_FOLDER", text="") diff --git a/src/bonsai/bonsai/tool/brick.py b/src/bonsai/bonsai/tool/brick.py index 3d3f465caa..4b0a7082e6 100644 --- a/src/bonsai/bonsai/tool/brick.py +++ b/src/bonsai/bonsai/tool/brick.py @@ -18,6 +18,7 @@ import os import bpy +import datetime import ifcopenshell import ifcopenshell.guid import ifcopenshell.util.brick @@ -26,8 +27,8 @@ import ifcopenshell.util.system import bonsai.core.brick import bonsai.core.tool import bonsai.tool as tool +from pathlib import Path from contextlib import contextmanager -import datetime try: import brickschema @@ -349,8 +350,7 @@ class Brick(bonsai.core.tool.Brick): @classmethod def load_brick_file(cls, filepath): if not BrickStore.schema: # important check for running under test cases - cwd = os.path.dirname(os.path.realpath(__file__)) - BrickStore.schema = os.path.join(cwd, "..", "bim", "schema", "Brick.ttl") + BrickStore.schema = tool.Blender.get_data_dir_path(Path('brick', 'Brick.ttl')) BrickStore.graph = brickschema.persistent.VersionedGraphCollection("sqlite://") with BrickStore.graph.new_changeset("SCHEMA") as cs: cs.load_file(BrickStore.schema) @@ -366,8 +366,7 @@ class Brick(bonsai.core.tool.Brick): @classmethod def new_brick_file(cls): if not BrickStore.schema: # important check for running under test cases - cwd = os.path.dirname(os.path.realpath(__file__)) - BrickStore.schema = os.path.join(cwd, "..", "bim", "schema", "Brick.ttl") + BrickStore.schema = tool.Blender.get_data_dir_path(Path('brick', 'Brick.ttl')) BrickStore.graph = brickschema.persistent.VersionedGraphCollection("sqlite://") with BrickStore.graph.new_changeset("SCHEMA") as cs: cs.load_file(BrickStore.schema)