Fix #6209 after 67bac44

Fixes mapping of vertical alignment parabola business logic to geometry. Adds creation function of h and v alignment. Adds stationing referent at start of alignment. Fixes utility functions

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Replace this text describing what problem occurred and what you expected to happen instead.
+
+1. To reproduce this, open file '...'
+2. Click on '....'
+3. See error
+
+**Attachments**
+If applicable, add screenshots to help explain your problem. Please also drag-drop any files necessary to show the error (rename the file extension from .ifc to .txt to upload). Private files can be uploaded to https://ifcopenshell.org/upload.html - only viewed by core developers and will be deleted afterwards.
+
+**Debug information**
+If this is in Bonsai, paste the output from the Copy Debug Information option in Bonsai. It can be found under Quality and Coordination -> Quality Control -> Debug. If this is a general software issue, if relevant include details about IfcOpenShell version, operating system, Python version, etc.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Replace this text and describe a feature you'd like us to add. If it's not obvious, explain why this feature is awesome. Note that feature requests must be specific and measurable.

.github/workflows/build_pyodide.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build_ifcopenshell:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout Repository
@@ -25,7 +25,9 @@ jobs:
 
       - name: Build
         run: |
-          find .. -maxdepth 2
+          VERSION=`cat IfcOpenShell/VERSION`
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
+          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
           echo '#!/usr/bin/bash' > script.sh
           echo 'cd pyodide' > script.sh
           echo 'make && pip install ./pyodide-build' >> script.sh
@@ -38,7 +40,7 @@ jobs:
           chmod +x script.sh
           sed -i s/--tty// pyodide/run_docker
           pyodide/run_docker ./script.sh
-          mv dist/IfcOpenShell-0.8.0-py3-none-any.whl dist/ifcopenshell_python-v0.8.0+${GITHUB_SHA:0:7}-cp312-cp312-emscripten_3_1_58_wasm32.whl
+          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp312-cp312-emscripten_3_1_58_wasm32.whl
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/build_rocky.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build_ifcopenshell:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container: rockylinux:8
 
     steps:
@@ -17,6 +17,7 @@ jobs:
                          sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                          readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
                          findutils
+          git config --global --add safe.directory '*'
 
       - name: Install aws cli
         run: |

.github/workflows/build_rocky_arm.yml

@@ -0,0 +1,116 @@
+name: Build IfcOpenShell Linux ARM
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_ifcopenshell:
+    runs-on: ubuntu-22.04-arm
+    container: arm64v8/rockylinux:8
+
+    steps:
+      - name: Install Dependencies
+        run: |
+          yum update -y
+          yum install -y gcc gcc-c++ git autoconf automake bison make zip cmake python3  \
+                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
+                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
+                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
+                         findutils
+          git config --global --add safe.directory '*'
+
+      - name: Install aws cli
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          ./aws/install
+          rm -rf awscliv2.zip aws
+          aws --version
+
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Checkout Build Repository
+        uses: actions/checkout@v3
+        with:
+          repository: IfcOpenShell/build-outputs
+          path: ./build
+          ref: rockylinux8-arm64
+          lfs: true
+          token: ${{ secrets.BUILD_REPO_TOKEN }}
+
+      - name: Unpack Dependencies
+        run: |
+          install_root=$(find ./build -maxdepth 4 -name install)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true
+
+      # Not supported on docker
+      # - name: ccache
+      #   uses: hendrikmuhs/ccache-action@v1
+      #   with:
+      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
+
+      - name: Run Build Script
+        run: |
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+
+      - name: Pack Dependencies
+        run: |
+          cd build
+          for install_dir in $(find $(find . -maxdepth 4 -name install) -mindepth 1 -maxdepth 1 -type d); do
+            test -f $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz || tar -czf $(dirname "$install_dir")/cache-$(basename "$install_dir").tar.gz -C $(dirname "$install_dir") $(basename "$install_dir");
+          done
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add "$(find . -maxdepth 4 -name install)/*.tar.gz"
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || true
+
+      - name: Package .zip archives
+        run: |
+          VERSION=v`cat VERSION`
+          cd ./build/`uname`/*/install/ifcopenshell
+          mkdir ~/output
+
+          ls -d python-* | while read py_version; do
+              postfix=`echo ${py_version: -1} | sed s/[0-9]//`
+              numbers=`echo $py_version | grep -oE '[0-9]+\.[0-9]+' | tr -d '.'`
+              py_version_major=python-${numbers}$postfix
+              pushd . > /dev/null
+              cd $py_version
+              if [ ! -d ifcopenshell ]; then
+                  mkdir ../ifcopenshell_
+                  mv * ../ifcopenshell_
+                  mv ../ifcopenshell_ ifcopenshell
+              fi
+              [ -d ifcopenshell/__pycache__ ] && rm -rf ifcopenshell/__pycache__
+              find ifcopenshell -name "*.pyc" -delete
+              zip -r -qq ifcopenshell-${py_version_major}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip ifcopenshell/*
+              mv *.zip ~/output
+              popd > /dev/null
+          done
+
+          cd bin
+          rm *.zip || true
+          ls | while read exe; do
+              zip -qq -r ${exe}-${VERSION}-${GITHUB_SHA:0:7}-linuxarm64.zip $exe
+          done
+          mv *.zip ~/output
+          cd ..
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_UPLOAD_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_UPLOAD_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Upload .zip archives to S3
+        run: |
+          aws s3 cp ~/output s3://ifcopenshell-builds/ --recursive

.github/workflows/ci-black-formatting.yaml

@@ -0,0 +1,73 @@
+name: ci-black-formatting
+
+on:
+  push:
+  pull_request:
+
+env:
+  PYTHON_VERSION: "3.12"
+
+jobs:
+  lint-formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Action - checkout repository
+        uses: actions/checkout@v4.2.2
+
+      - name: Action - install python
+        uses: actions/setup-python@v5.3.0
+        with:
+          python-version: "${{ env.PYTHON_VERSION }}"
+
+      - name: Step 1 - install dependencies
+        shell: bash
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install 'black>=24.10.0'
+
+      # NOTE: This would suffice, however it is less informative in terms of the 3 possible outcomes
+      # - name: QA Step - check linting
+      #   shell: bash
+      #   id: linting
+      #   run: |
+      #     python3 -m black .
+
+      # QA STEP
+      - name: QA Step - check linting
+        shell: bash
+        id: linting
+        run: |
+          python3 -m black --check . \
+          && exit 0 \
+          || (echo "exit_code=$?" >> "$GITHUB_OUTPUT" && exit 1);
+        continue-on-error: true
+
+      # OUTCOME 1 of QA STEP
+      - name: QA Step - no linting errors
+        if: steps.linting.outcome == 'success'
+        shell: bash
+        run: |-
+          echo "::notice::QA step linting succeeded"
+          exit 0;
+
+      # OUTCOME 2i of QA STEP
+      - name: QA Step - unprettified code with no syntax errors
+        if: steps.linting.outputs.exit_code == 1
+        shell: bash
+        run: |-
+          echo "::group::QA step succeeded with warnings"
+          echo "::warning::one or more files contains unformatted code but no syntax errors";
+          echo "::notice::please run the linter before pushing!";
+          echo "::endgroup::"
+          exit 0;
+
+      # OUTCOME 2ii of QA STEP
+      - name: QA Step - code contains syntax errors
+        if: steps.linting.outputs.exit_code == 123
+        shell: bash
+        run: |-
+          echo "::group::QA step failed"
+          echo "::error::one or more files contains syntax errors";
+          echo "::notice::please run the linter and fix syntax errors before pushing!";
+          echo "::endgroup::"
+          exit 1;

.github/workflows/ci-black-formatting.yml

@@ -1,12 +0,0 @@
-name: ci-black-formatting
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  lint-formatting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: psf/black@stable

.github/workflows/ci-bonsai-daily.yml

@@ -99,9 +99,9 @@ jobs:
           token: ${{ secrets.IOS_TO_BLENDER_REPO }}
           path: bonsai_unstable_repo
 
-      - name: Update index.json on extensions repo
+      - name: Download Blender and run critical tests
         run: |
-          set -x -e
+          # Ensure Bonsai and ifcsverchok enable/disable works before uploading to extensions repo.
 
           # Download Blender.
           wget -q -O blender.tar.xz https://ftp.nluug.nl/pub/graphics/blender/release/Blender4.3/blender-4.3.0-linux-x64.tar.xz
@@ -112,25 +112,25 @@ jobs:
           export PATH="$PATH:$BLENDER_PATH"
           blender --version
 
+          # Setup unstable repo to get Bonsai build.
           cd bonsai_unstable_repo
           pip install -r requirements.txt
           python setup_extensions_repo.py --last-tag
-          git config --global user.name 'IfcOpenBot'
-          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
-          git add index.json
-          git add readme.md
-          git commit -m "Update index.json"
-          git push
-      - name: Run bonsai tests
-        run: |
-          set -x -e
-          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
-          export PATH="$PATH:$BLENDER_PATH"
+          cd ..
           bonsai_zip="$(pwd)/$(ls bonsai_unstable_repo/bonsai_py311*-linux-x64.zip)"
-          blender --version
+
+          # Install Bonsai.
           blender --command extension install-file -r user_default -e $bonsai_zip
           blender --command extension list
 
+          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
+
+          # Reregister Bonsai.
+          # Note that running it in background might miss some errors
+          # (e.g. tools are not registered in background mode).
+          blender --background --python IfcOpenShell/src/bonsai/scripts/reregister_bonsai.py
+
+          # Install sverchok.
           wget -q -O sverchok.zip https://github.com/nortikin/sverchok/archive/refs/heads/master.zip
           # ifcsverchok expecting sverchok to be named "sverchok" and not "sverchok-master".
           unzip -q sverchok.zip
@@ -139,17 +139,41 @@ jobs:
           rm -r sverchok
           blender --command extension install-file -r user_default sverchok.zip
 
-          git clone https://github.com/IfcOpenShell/IfcOpenShell.git IfcOpenShell
+          # Install ifcsverchok.
           cd IfcOpenShell/src/ifcsverchok
           make dist
           sverchok_zip="$(pwd)/dist/$(ls dist)"
           blender --command extension install-file -r user_default $sverchok_zip
 
+      - name: Update index.json on extensions repo
+        run: |
+          set -x -e
+
+          # Setup Blender.
+          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
+          export PATH="$PATH:$BLENDER_PATH"
+          blender --version
+
+          cd bonsai_unstable_repo
+          git config --global user.name 'IfcOpenBot'
+          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
+          git add index.json
+          git add readme.md
+          git commit -m "Update index.json"
+          git push
+
+      - name: Run bonsai tests
+        run: |
+          set -x -e
+          BLENDER_PATH=$(find blender-*/ -maxdepth 0 -exec readlink -f {} \;)
+          export PATH="$PATH:$BLENDER_PATH"
+          blender --version
+
           # Install Sun Position extension.
           blender --online-mode --command extension sync
           blender --online-mode --command extension install --enable --sync sun_position
 
-          cd ../bonsai
+          cd IfcOpenShell/src/bonsai
           pip install pytest-blender
           blender --background --python scripts/setup_pytest.py
           blender --python-expr "import bonsai; print(bonsai.bbim_semver); import ifcopenshell; print(ifcopenshell.version)" --background

.github/workflows/ci-ifcconvert.yml

@@ -24,10 +24,6 @@ jobs:
             name: "Windows 64bit",
             short_name: win64,
           }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
           - {
             name: "Linux 64bit",
             short_name: linux64

.github/workflows/ci-ifcopenshell-python.yml

@@ -25,10 +25,6 @@ jobs:
             name: "Windows 64bit",
             short_name: win64,
           }
-          - {
-            name: "Windows 32bit",
-            short_name: win32,
-          }
           - {
             name: "Linux 64bit",
             short_name: linux64

.github/workflows/ci.yml

@@ -24,15 +24,15 @@ on:
 
 jobs:
   activate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell' &&
       !contains(github.event.head_commit.message, 'skip ci')
     steps:
       - run: echo ok go
 
-  build:
-    runs-on: ubuntu-latest
+  compile-and-test:
+    runs-on: ubuntu-22.04
     needs: activate
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +48,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
-          pip install mathutils
           pip install src/bcf --no-deps
           pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
 
@@ -135,4 +134,5 @@ jobs:
           pip install deepdiff
           cd ../ifcdiff && make test
           cd ../ifcpatch && make test
+          pip install -e ../ifctester --no-deps
           cd ../ifctester && make test

.github/workflows/docs-deployment-unstable.yml

@@ -0,0 +1,38 @@
+name: Build and Deploy Unstable Documentation
+
+on:
+  push:
+    branches:
+      - v0.8.0  # Trigger the workflow on pushes to the default branch which is currently v0.8.0
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs  # Navigate to the docs directory
+          pip install -r requirements.txt  # Install dependencies from requirements.txt
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs  # Navigate to the docs directory
+          make html  # Build the documentation
+
+      - name: Deploy to GitHub Pages (Unstable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}  # SSH key for deployment
+          external_repository: IfcOpenShell/bonsaibim_org_docs_unstable  # Target repository
+          publish_branch: main  # Branch to deploy to
+          cname: docs-unstable.bonsaibim.org  # Custom domain for unstable docs
+          publish_dir: src/bonsai/docs/_build/html  # Directory containing built docs

.github/workflows/docs-deployment.yml

@@ -0,0 +1,36 @@
+name: Build and Deploy Stable Documentation
+
+on:
+  workflow_dispatch:  # Manual trigger
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          cd src/bonsai/docs
+          pip install -r requirements.txt  # Run pip install from the docs directory
+
+      - name: Build documentation
+        run: |
+          cd src/bonsai/docs
+          make html
+
+      - name: Deploy to GitHub Pages (Stable)
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          external_repository: IfcOpenShell/bonsaibim_org_docs
+          publish_branch: main
+          cname: docs.bonsaibim.org
+          publish_dir: src/bonsai/docs/_build/html

.github/workflows/publish-pyodide-demo-app.yml

@@ -0,0 +1,48 @@
+name: Deploy Pyodide Demo App to GitHub Pages
+
+permissions:
+  id-token: write
+  pages: write
+
+on:
+  push:
+    paths:
+      - 'src/pyodide/**'
+      - '.github/workflows/publish-pyodide-demo-app.yml'
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+    - name: Set env
+      run: echo ok go
+      
+  build:
+    needs: activate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (recursive)
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: src/pyodide/demo-app/
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -81,6 +81,12 @@ src/bonsai/test/files/temp
 src/bonsai/test/files/basic.ifc.cache.blend
 src/bonsai/test/files/basic.ifc.cache.sqlite
 
+# bonsai data
+src/bonsai/bonsai/bim/data/build/
+src/bonsai/bonsai/bim/data/gantt/index.html
+src/bonsai/bonsai/bim/data/gantt/jsgantt.js
+src/bonsai/bonsai/bim/data/gantt/jsgantt.css
+
 src/bonsai/drawings
 src/bonsai/layouts
 
@@ -98,3 +104,6 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 
 # Brickschema
 src/bonsai/bonsai/bim/schema/Brick.ttl
+
+bonsaiDecoratorForLoads.code-workspace
+dev_environment.bat

.gitmodules

@@ -20,3 +20,6 @@
 [submodule "src/ifcopenshell-python/ifcopenshell/simple_spf"]
 	path = src/ifcopenshell-python/ifcopenshell/simple_spf
 	url = https://github.com/IfcOpenShell/step-file-parser
+[submodule "src/pyodide/demo-app/wheels"]
+	path = src/pyodide/demo-app/wheels
+	url = https://github.com/IfcOpenShell/wasm-wheels

README.md

@@ -6,6 +6,7 @@ IfcOpenShell
 <img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/88302/34901387-e2dd-4a0c-8e38-9ffc32a66cde">
 </p>
 
+
 IfcOpenShell is an open source ([LGPL]) software library for working with Industry Foundation Classes ([IFC]). Complete
 parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x2, and [IFC4x3 Add2]. Extensive geometric support
 is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas

VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

cmake/CMakeLists.txt

@@ -1148,6 +1148,7 @@ if(ADD_COMMIT_SHA)
             message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
             execute_process(
                 COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                 OUTPUT_VARIABLE git_branches
                 OUTPUT_STRIP_TRAILING_WHITESPACE
             )
@@ -1165,11 +1166,18 @@ if(ADD_COMMIT_SHA)
 
         execute_process(
             COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             OUTPUT_VARIABLE git_sha
             OUTPUT_STRIP_TRAILING_WHITESPACE
         )
+
         message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
         message(STATUS "IfcOpenShell commit: \"${git_sha}\"")
+
+        if ("${git_branch}" STREQUAL "" OR "${git_sha}" STREQUAL "")
+            message(FATAL_ERROR "Unable to determine commit sha and/or branch")
+        endif()
+
         add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
         add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
     endif()

nix/build-all.py

@@ -307,7 +307,7 @@ if platform.system() == "Darwin":
 BOOST_VERSION_UNDERSCORE = BOOST_VERSION.replace(".", "_")
 
 OCE_LOCATION = f"https://github.com/tpaviot/oce/archive/OCE-{OCE_VERSION}.tar.gz"
-BOOST_LOCATION = f"https://boostorg.jfrog.io/artifactory/main/release/{BOOST_VERSION}/source/"
+BOOST_LOCATION = f"https://github.com/boostorg/boost/releases/download/boost-{BOOST_VERSION}/"
 
 # Helper functions
 
@@ -747,7 +747,7 @@ if "boost" in targets:
         download_url=BOOST_LOCATION,
         # don't remember what this is, but fail on 1.86
         # patch="./patches/boost/boostorg_regex_62.patch",
-        download_name=f"boost_{BOOST_VERSION_UNDERSCORE}.tar.bz2"
+        download_name=f"boost-{BOOST_VERSION}-b2-nodocs.tar.gz"
     )
     if "wasm" in flags:
         # only supported on nix for now

pyodide/setup.py

@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages
 
-setup(name='IfcOpenShell',
+setup(name='ifcopenshell',
       version='0.8.0',
       description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
       author='Thomas Krijnen',
       author_email='thomas@aecgeeks.com',
       url='http://ifcopenshell.org',
       packages=find_packages(),
-      package_data={'': ['*.so']},
+      package_data={'': ['*.so', '*.json']},
 )

pyproject.toml

@@ -27,7 +27,9 @@ include = '''
 extend-exclude = '''
     src/ifcopenshell-python/ifcopenshell/express/*
     |src/ifcopenshell-python/ifcopenshell/mvd/*
+    |src/ifcopenshell-python/ifcopenshell/simple_spf/*
     |src/ifc2ca/templates/*
+    |src/ifcconvert/cityjson/*
 '''
 
 [tool.pyright]

src/bonsai/Makefile

@@ -85,7 +85,7 @@ BLENDER_PLATFORM:=windows-x64
 endif
 
 # Current build commit hash.
-OLD:=a2538fd
+OLD:=c49ca69
 .PHONY: bump
 bump:
 ifndef NEW
@@ -177,6 +177,8 @@ endif
 	# Is not platform specific but has platform specific dependencies.
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download python-socketio[asyncio_client] $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download aiohttp $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
+	# Required to access platform specific paths
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download platformdirs --dest=./wheels
 	# Required by light module
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pytz --dest=./wheels
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download tzfpy $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
@@ -212,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
@@ -226,8 +228,16 @@ endif
 		)" bdist_wheel
 	cp -r build/bpypolyskel-master/dist/*.whl build/wheels/
 
-	# Required for Desktop icon and file association
-	cp -r bonsai/libs/desktop build/bonsai/libs/
+	# folder for executable files
+	mkdir -p build/bonsai/libs/bin
+
+	# required for three-way git merging
+ifeq ($(PLATFORM), win)
+	cd build/bonsai/libs/bin && wget https://github.com/brunopostle/ifcmerge/releases/download/2025-01-26/ifcmerge.zip
+	cd build/bonsai/libs/bin && unzip ifcmerge.zip && rm ifcmerge.zip
+else
+	cd build/bonsai/libs/bin && wget https://raw.githubusercontent.com/brunopostle/ifcmerge/main/ifcmerge && chmod +x ifcmerge
+endif
 
 	# Generate translations module for Bonsai build
 	git clone https://github.com/IfcOpenShell/bonsai-translations.git build/working
@@ -268,69 +278,11 @@ endif
 	fi
 	mv build/wheels/*.whl build/bonsai/wheels/
 
-	# Ugly patch to accomodate MacOS universal builds not being recognized by Blender.
-	# Blender doesn't look into the wheel contents, it just checks the name.
-	# So this hack works without working out some way to repack those wheels.
-	# See: https://projects.blender.org/blender/blender/issues/125091
-
-ifeq ($(PLATFORM), macosm1)
-	# Has universal and x86_64 builds.
-	prev_whl_name=$$(find build/bonsai/wheels/lxml-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# Has only universal build.
-	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# has universal and x86_64 builds.
-	prev_whl_name=$$(find build/bonsai/wheels/fonttools-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	# Has only universal build.
-	prev_whl_name=$$(find build/bonsai/wheels/charset_normalizer-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-endif
-ifeq ($(PLATFORM), macos)
-	# Has universal and arm64 builds.
-	prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/bonsai/wheels/greenlet-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-
-	prev_whl_name=$$(find build/bonsai/wheels/charset_normalizer-*.whl); \
-	whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
-	mv "$$prev_whl_name" "$$whl_name";
-endif
-
-	# Safeguard for unhandled universal files.
-	wheels=$$(find build/bonsai/wheels/*universal2*.whl); \
-	if [ -n "$$wheels" ]; then \
-		echo "Found universal2 wheel files:"; \
-		echo "$$wheels"; \
-		echo "Error: universal2 wheel files are not supported by Blender!"; \
-		exit 1; \
-	fi
-
 	# Temporary workaround for Blender not handling non-3.11 wheels #5743.
 	# Use '-n' as on macos x86-64 doesn't have a binary wheel and it autoincludes 'cp311'.
 	prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
 	whl_name=$$(echo $$prev_whl_name | sed "s/-cp39-/-cp$(PYNUMBER)-/"); \
-	mv -n "$$prev_whl_name" "$$whl_name";
+	mv --update=none "$$prev_whl_name" "$$whl_name";
 
 ifneq ($(PLATFORM), linux)
 	# Safeguard: in case one of `pip download` will break,
@@ -348,6 +300,7 @@ endif
 	rm -rf build/bonsai/bim/
 	rm -rf build/bonsai/core/
 	rm -rf build/bonsai/tool/
+	rm -rf build/bonsai/libs/
 
 ifeq ($(IS_STABLE), TRUE)
 	cd build && zip -r bonsai_$(PYVERSION)-$(VERSION)-$(BLENDER_PLATFORM).zip ./bonsai
@@ -391,6 +344,12 @@ else
 	pytest test/tool/test_$(MODULE).py
 endif
 
+# Reregistering test is not added to the standard test suite because during unregister
+# Blender removes all Bonsai dependencies breaking dev-environment symlinks.
+.PHONY: test-reregister
+test-reregister:
+	blender --python scripts/reregister_bonsai.py
+
 .PHONY: qa
 qa:
 	black .

src/bonsai/bonsai/bim/.gitignore

@@ -1,2 +0,0 @@
-# addon writes tmp stuff directly to its dir
-/data/

src/bonsai/bonsai/bim/__init__.py

@@ -20,8 +20,7 @@ import os
 import bpy
 import bpy.utils.previews
 import importlib
-from pathlib import Path
-from . import handler, ui, prop, operator, helper
+from . import handler, ui, prop, operator
 from typing import Callable, Union
 
 try:
@@ -99,6 +98,7 @@ classes = [
     operator.BIM_OT_add_section_plane,
     operator.BIM_OT_delete_object,
     operator.BIM_OT_remove_section_plane,
+    operator.BIM_OT_select_entity,
     operator.BIM_OT_select_object,
     operator.BIM_OT_show_description,
     operator.BIM_OT_multiple_file_selector,
@@ -109,14 +109,14 @@ classes = [
     operator.EditBlenderCollection,
     operator.FileAssociate,
     operator.FileUnassociate,
+    operator.OpenPath,
     operator.OpenUpstream,
     operator.OpenUri,
     operator.ReloadIfcFile,
     operator.RemoveIfcFile,
     operator.RevertClippingPlaneCut,
-    operator.SelectDataDir,
+    operator.SelectDir,
     operator.SelectIfcFile,
-    operator.SelectSchemaDir,
     operator.SelectURIAttribute,
     operator.SetTab,
     operator.SwitchTab,
@@ -136,6 +136,8 @@ classes = [
     prop.BIMMeshProperties,
     prop.BIMFacet,
     prop.BIMFilterGroup,
+    prop.BIMSnapProperties,
+    prop.BIMSnapGroups,
     ui.BIM_UL_clipping_plane,
     ui.BIM_UL_generic,
     ui.BIM_UL_topics,
@@ -191,6 +193,8 @@ classes = [
     # TODO: move this somewhere else and clean it up
     ui.BIM_PT_section_plane,
     ui.BIM_PT_section_with_cappings,
+    ui.BIM_PT_decorators_overlay,
+    ui.BIM_PT_snappping,
 ]
 
 for mod in modules.values():
@@ -223,6 +227,8 @@ def register():
     bpy.app.handlers.load_post.append(handler.load_post)
     bpy.app.handlers.load_post.append(handler.loadIfcStore)
     bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
+    bpy.types.Scene.BIMSnapProperties = bpy.props.PointerProperty(type=prop.BIMSnapProperties)
+    bpy.types.Scene.BIMSnapGroups = bpy.props.PointerProperty(type=prop.BIMSnapGroups)
     bpy.types.Screen.BIMAreaProperties = bpy.props.CollectionProperty(type=prop.BIMAreaProperties)
     bpy.types.Screen.BIMTabProperties = bpy.props.PointerProperty(type=prop.BIMTabProperties)
     bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
@@ -257,6 +263,12 @@ def register():
     icons = icon_preview
     bpy.app.translations.register("bonsai", translations_dict)
 
+    import bonsai.tool as tool
+
+    tool.Blender.ensure_bin_in_path()
+    # RestrictedContext doesn't allow accessing scene attribute, postpone it for a bit.
+    bpy.app.timers.register(tool.Blender.setup_user_data_dir, first_interval=0.1)
+
 
 def unregister():
     global icons

src/bonsai/bonsai/bim/data/brick/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!README.md

src/bonsai/bonsai/bim/data/brick/README.md

@@ -0,0 +1 @@
+This directory stores Brickschema definitions in TTL format.

src/bonsai/bonsai/bim/data/diagrams/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!README.md

src/bonsai/bonsai/bim/data/diagrams/README.md

@@ -0,0 +1 @@
+This directory stores generated drawings in SVG format.

src/bonsai/bonsai/bim/data/schedules/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!README.md

src/bonsai/bonsai/bim/data/schedules/README.md

@@ -0,0 +1 @@
+This directory stores generated tabular schedules in SVG format.

src/bonsai/bonsai/bim/data/sheets/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!README.md

src/bonsai/bonsai/bim/data/sheets/README.md

@@ -0,0 +1 @@
+This directory stores generated sheets in SVG format. Sheets typically contain drawings and schedules.

src/bonsai/bonsai/bim/data/webui/sioserver.py

@@ -18,11 +18,7 @@ import xml.etree.ElementTree as ET
 
 sio_port = 8080  # default port
 
-sio = socketio.AsyncServer(
-    cors_allowed_origins="*",
-    async_mode="aiohttp",
-    max_http_buffer_size=10000000
-)
+sio = socketio.AsyncServer(cors_allowed_origins="*", async_mode="aiohttp", max_http_buffer_size=10000000)
 app = web.Application()
 sio.attach(app)
 

src/bonsai/bonsai/bim/data/webui/static/js/index.js

@@ -269,13 +269,7 @@ function addTableElement(blenderId, csvData, filename) {
     },
   });
 
-  var downloadCsv = $('<a><i class="fa-solid fa-file-csv"></i></a>')
-    .css("margin-left", "10px")
-    .css("cursor", "pointer");
-  tableTitle.append(downloadCsv);
-  downloadCsv.on("click", function () {
-    table.download("csv", "data.csv");
-  });
+  createDownloadIcon(blenderId);
 
   table.on("rowSelected", function (row) {
     var index = row.getIndex(); // the guid of the object
@@ -301,6 +295,18 @@ function addTableElement(blenderId, csvData, filename) {
   });
 }
 
+function createDownloadIcon(blenderId) {
+  const table = Tabulator.findTable("#table-" + blenderId)[0];
+  const tableTitle = $("#title-" + blenderId);
+  var downloadCsv = $('<a><i class="fa-solid fa-file-csv"></i></a>')
+    .css("margin-left", "10px")
+    .css("cursor", "pointer");
+  tableTitle.append(downloadCsv);
+  downloadCsv.on("click", function () {
+    table.download("csv", "data.csv");
+  });
+}
+
 // Function to update table and filename
 function updateTableElement(blenderId, csvData, filename) {
   // check if the headers are the same
@@ -329,6 +335,7 @@ function updateTableElement(blenderId, csvData, filename) {
       }
     }
     $("#title-" + blenderId).text(filename);
+    createDownloadIcon(blenderId);
   }
 }
 

src/bonsai/bonsai/bim/export_ifc.py

@@ -20,7 +20,6 @@ from __future__ import annotations
 import os
 import bpy
 import json
-import numpy as np
 import datetime
 import zipfile
 import tempfile
@@ -133,7 +132,8 @@ class IfcExporter:
         bpy.ops.bim.update_representation(obj=obj.name)
 
     def has_changed_materials(self, obj: bpy.types.Object) -> bool:
-        checksum = obj.data.BIMMeshProperties.material_checksum
+        mprops = tool.Geometry.get_mesh_props(obj.data)
+        checksum = mprops.material_checksum
         return checksum != tool.Geometry.get_material_checksum(obj)
 
     def sync_object_placement(self, obj: bpy.types.Object) -> Union[ifcopenshell.entity_instance, None]:

src/bonsai/bonsai/bim/handler.py

@@ -29,7 +29,10 @@ from bpy.app.handlers import persistent
 from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.owner.prop import get_user_person, get_user_organisation
 from bonsai.bim.module.model.data import AuthoringData
-from bonsai.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
+from bonsai.bim.module.aggregate.decorator import AggregateDecorator
+from bonsai.bim.module.georeference.decorator import GeoreferenceDecorator
+from bonsai.bim.module.model.decorator import WallAxisDecorator, SlabDirectionDecorator
+from bonsai.bim.module.nest.decorator import NestDecorator
 from mathutils import Vector
 from math import cos, degrees
 from typing import Union, Callable
@@ -52,9 +55,13 @@ def name_callback(obj: Union[bpy.types.Object, bpy.types.Material], data: str) -
         return
 
     if isinstance(obj, bpy.types.Material):
-        if ifc_definition_id := obj.BIMStyleProperties.ifc_definition_id:
-            IfcStore.get_file().by_id(ifc_definition_id).Name = obj.name
-        refresh_ui_data()
+        props = obj.BIMStyleProperties
+        if ifc_definition_id := props.ifc_definition_id:
+            if props.is_renaming:
+                props.is_renmaing = False
+                return
+            tool.Ifc.get().by_id(ifc_definition_id).Name = obj.name
+            refresh_ui_data()
         return
 
     if not obj.BIMObjectProperties.ifc_definition_id:
@@ -64,7 +71,7 @@ def name_callback(obj: Union[bpy.types.Object, bpy.types.Material], data: str) -
         obj.BIMObjectProperties.is_renaming = False
         return
 
-    element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
+    element = tool.Ifc.get().by_id(obj.BIMObjectProperties.ifc_definition_id)
     if "/" in obj.name:
         object_name = obj.name
         element_name = obj.name.split("/", 1)[1]
@@ -100,29 +107,44 @@ def update_bim_tool_props():
         return
     mode = bpy.context.mode
     current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode)
-    if not current_tool or current_tool.idname not in LIST_OF_TOOLS:
+    if not current_tool or current_tool.idname not in tool.Blender.get_list_of_tools():
         return
     element = tool.Ifc.get_entity(obj)
     if not element:
         return
+
+    props = tool.Model.get_model_props()
+    aprops = tool.Drawing.get_annotation_props()
+    TOOLS_TO_CLASSES_MAP = tool.Blender.get_tools_to_classes_map()
+    is_annotation_tool = current_tool.idname == "bim.annotation_tool"
+    if element.is_a("IfcTypeProduct") or element.is_a("IfcProduct"):
+        element_type = ifcopenshell.util.element.get_type(element)
+        if element_type:
+            is_bim_tool = current_tool.idname == "bim.bim_tool"
+
+            if is_annotation_tool and (object_type := tool.Drawing.get_annotation_type_object_type(element_type)):
+                aprops.object_type = object_type
+                aprops.relating_type_id = str(element_type.id())
+                return
+
+            if is_bim_tool:
+                props.ifc_class = element_type.is_a()
+
+            if is_bim_tool or TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a():
+                props.relating_type_id = str(element_type.id())
+
+    if is_annotation_tool:
+        return
+
     representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
     if not representation:
         return
 
-    props = bpy.context.scene.BIMModelProperties
-    if element.is_a("IfcElementType") or element.is_a("IfcElement"):
-        element_type = ifcopenshell.util.element.get_type(element)
-        if element_type:
-            is_bim_tool = current_tool.idname == "bim.bim_tool"
-            if is_bim_tool:
-                props.ifc_class = element_type.is_a()
-            if is_bim_tool or TOOLS_TO_CLASSES_MAP.get(current_tool.idname) == element_type.is_a():
-                props.relating_type_id = str(element_type.id())
     extrusion = tool.Model.get_extrusion(representation)
     if not extrusion:
         return
 
-    def get_x_angle(extrusion):
+    def get_x_angle(extrusion: ifcopenshell.entity_instance) -> float:
         x, y, z = extrusion.ExtrudedDirection.DirectionRatios
         x_angle = Vector((0, 1)).angle_signed(Vector((y, z)))
         return x_angle
@@ -134,7 +156,7 @@ def update_bim_tool_props():
     if AuthoringData.data["active_material_usage"] == "LAYER2":
         x_angle = get_x_angle(extrusion)
         axis = tool.Model.get_wall_axis(obj)["reference"]
-        props.extrusion_depth = extrusion.Depth * si_conversion * cos(x_angle)
+        props.extrusion_depth = abs(extrusion.Depth * si_conversion * cos(x_angle))
         props.length = (axis[1] - axis[0]).length
         props.x_angle = x_angle
 
@@ -180,6 +202,9 @@ def refresh_ui_data():
     and it need to be refreshed manually if needed.
     """
     from bonsai.bim import modules
+    import bonsai.bim.ui
+
+    bonsai.bim.ui.refresh()
 
     for name, value in modules.items():
         try:
@@ -196,35 +221,38 @@ def refresh_ui_data():
     if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
         tool.Ifc.get().clear_cache()
 
-    bpy.context.scene.DocProperties.should_draw_decorations = bpy.context.scene.DocProperties.should_draw_decorations
+    props = tool.Drawing.get_document_props()
+    props.should_draw_decorations = props.should_draw_decorations
     if bpy.context.scene.WebProperties.is_connected:
         tool.Web.send_webui_data()
 
 
 @persistent
-def loadIfcStore(scene):
+def loadIfcStore(scene: bpy.types.Scene) -> None:
     IfcStore.purge()
     refresh_ui_data()
-    if not IfcStore.get_file():
+    if not tool.Ifc.get():
         return
-    IfcStore.get_schema()
+    tool.Ifc.schema()
     IfcStore.relink_all_objects()
 
 
 @persistent
-def undo_post(scene):
-    if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
-        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
-        IfcStore.undo(until_key=bpy.context.scene.BIMProperties.last_transaction)
+def undo_post(scene: bpy.types.Scene) -> None:
+    props = tool.Blender.get_bim_props()
+    if IfcStore.last_transaction != props.last_transaction:
+        IfcStore.last_transaction = props.last_transaction
+        IfcStore.undo(until_key=props.last_transaction)
         refresh_ui_data()
     tool.Ifc.rebuild_element_maps()
 
 
 @persistent
-def redo_post(scene):
-    if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
-        IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
-        IfcStore.redo(until_key=bpy.context.scene.BIMProperties.last_transaction)
+def redo_post(scene: bpy.types.Scene) -> None:
+    props = tool.Blender.get_bim_props()
+    if IfcStore.last_transaction != props.last_transaction:
+        IfcStore.last_transaction = props.last_transaction
+        IfcStore.redo(until_key=props.last_transaction)
         refresh_ui_data()
     tool.Ifc.rebuild_element_maps()
 
@@ -257,7 +285,7 @@ def get_user(ifc: ifcopenshell.file) -> Union[ifcopenshell.entity_instance, None
         return pao
 
 
-def viewport_shading_changed_callback(area):
+def viewport_shading_changed_callback(area: bpy.types.Area) -> None:
     shading = area.spaces.active.shading.type
     if shading == "RENDERED":
         bpy.context.scene.BIMStylesProperties.active_style_type = "External"
@@ -315,4 +343,27 @@ def load_post(scene):
     tool.Blender.setup_tabs()
 
     if tool.Ifc.get() and bpy.data.is_saved:
-        bpy.context.scene.BIMProperties.has_blend_warning = True
+        props = tool.Blender.get_bim_props()
+        props.has_blend_warning = True
+
+    # Bonsai overlays
+    georeference_props = tool.Georeference.get_georeference_props()
+    aggregate_props = bpy.context.scene.BIMAggregateProperties
+    nest_props = bpy.context.scene.BIMNestProperties
+    model_props = tool.Model.get_model_props()
+    if georeference_props.should_visualise:
+        GeoreferenceDecorator.install(bpy.context)
+    if aggregate_props.aggregate_decorator:
+        AggregateDecorator.install(bpy.context)
+    if nest_props.nest_decorator:
+        NestDecorator.install(bpy.context)
+    if model_props.show_wall_axis:
+        WallAxisDecorator.install(bpy.context)
+    if model_props.show_slab_direction:
+        SlabDirectionDecorator.install(bpy.context)
+
+    if scene := bpy.context.scene:
+        # Snapping is off by default in Blender, but in BIM, it's more useful to be on
+        scene.tool_settings.use_snap = True
+        # Match default Bonsai snaps
+        scene.tool_settings.snap_elements_base = {"EDGE", "EDGE_PERPENDICULAR", "VERTEX", "EDGE_MIDPOINT", "FACE"}

src/bonsai/bonsai/bim/helper.py

@@ -20,21 +20,19 @@ from __future__ import annotations
 import importlib
 import bpy
 import json
-import math
 import ifcopenshell
 import ifcopenshell.ifcopenshell_wrapper as W
 import ifcopenshell.util.attribute
 import ifcopenshell.util.element
 import ifcopenshell.util.unit
 from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc
-from mathutils import geometry
-from mathutils import Vector
 import bonsai.tool as tool
-from bonsai.bim.ifc import IfcStore
 from typing import Optional, Callable, Any, Union, Iterable, TYPE_CHECKING
 
 if TYPE_CHECKING:
     import bonsai.bim.prop
+    from bonsai.bim.prop import Attribute
+    from bonsai.bim.module.search.prop import BIMFilterGroup
 
     # ImportCallback return values:
     # - None  - property should be imported by default workflow
@@ -48,13 +46,15 @@ if TYPE_CHECKING:
 
 
 def draw_attributes(
-    props: list[bonsai.bim.prop.Attribute],
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
     layout: bpy.types.UILayout,
     copy_operator: Optional[str] = None,
     popup_active_attribute: Optional[bonsai.bim.prop.Attribute] = None,
     callback: Optional[Callable[[bonsai.bim.prop.Attribute, bpy.types.UILayout], None]] = None,
 ) -> None:
-    """you can set attribute active in popup with `active_attribute`
+    """Draw editable UI for prop.Attributes.
+
+    You can set attribute active in popup with `active_attribute`
     meaning you will be able to type into attribute's field without having to click
     on it first
     """
@@ -92,41 +92,42 @@ def draw_attribute(
         layout.prop(
             attribute,
             value_name,
-            text=attribute.name,
+            text=attribute.display_name,
         )
 
     if attribute.is_uri:
         op = layout.operator("bim.select_uri_attribute", text="", icon="FILE_FOLDER")
         op.data_path = attribute.path_from_id("string_value")
-    elif attribute.special_type == "DATE":
+    elif attribute.special_type in ("DATE", "DATETIME"):
         op = layout.operator("bim.datepicker", text="", icon="TIME")
         op.target_prop = attribute.path_from_id("string_value")
+        op.include_time = attribute.special_type == "DATETIME"
 
     if attribute.is_optional:
         layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
 
     if attribute.name == "GlobalId":
         layout.operator("bim.generate_global_id", icon="FILE_REFRESH", text="")
-
-    if copy_operator:
+    elif copy_operator:
         op = layout.operator(f"{copy_operator}", text="", icon="COPYDOWN")
         op.name = attribute.name
 
 
 def import_attributes(
     ifc_class: str,
-    props: bpy.types.bpy_prop_collection,
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
     data: dict[str, Any],
     callback: Optional[ImportCallback] = None,
 ) -> None:
-    for attribute in IfcStore.get_schema().declaration_by_name(ifc_class).all_attributes():
+    schema = tool.Ifc.schema()
+    for attribute in schema.declaration_by_name(ifc_class).all_attributes():
         import_attribute(attribute, props, data, callback=callback)
 
 
 # A more elegant attribute importer signature, intended to supersede import_attributes
 def import_attributes2(
     element: Union[str, ifcopenshell.entity_instance],
-    props: bpy.types.bpy_prop_collection,
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
     callback: Optional[ImportCallback] = None,
 ) -> None:
     if isinstance(element, str):
@@ -142,7 +143,7 @@ def import_attributes2(
 
 def import_attribute(
     attribute: W.attribute,
-    props: bpy.types.bpy_prop_collection,
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
     data: dict[str, Any],
     callback: Optional[ImportCallback] = None,
 ) -> None:
@@ -151,7 +152,7 @@ def import_attribute(
     if isinstance(data_type, tuple) or data_type == "entity":
         callback(attribute.name(), None, data) if callback else None
         return
-    new = props.add()
+    new: bonsai.bim.prop.Attribute = props.add()
     new.name = attribute.name()
     new.is_null = data[attribute.name()] is None
     new.is_optional = attribute.optional()
@@ -170,20 +171,37 @@ def import_attribute(
             new.is_uri = True
         elif attribute.type_of_attribute()._is("IfcDate"):
             new.special_type = "DATE"
+        elif attribute.type_of_attribute()._is("IfcDateTime"):
+            new.special_type = "DATETIME"
     elif data_type == "boolean":
         new.bool_value = False if new.is_null else bool(data[attribute.name()])
     elif data_type == "integer":
         new.int_value = 0 if new.is_null else int(data[attribute.name()])
     elif data_type == "float":
-        if attribute.type_of_attribute()._is("IfcLengthMeasure"):
+        attribute_type = attribute.type_of_attribute()
+        if attribute_type._is("IfcLengthMeasure"):
             new.special_type = "LENGTH"
+        elif attribute_type._is("IfcForceMeasure"):
+            new.special_type = "FORCE"
         new.float_value = 0.0 if new.is_null else float(data[attribute.name()])
     elif data_type == "enum":
-        enum_items = ifcopenshell.util.attribute.get_enum_items(attribute)
-        new.enum_items = json.dumps(enum_items)
-        add_attribute_enum_items_descriptions(new, enum_items)
-        if data[new.name]:
-            new.enum_value = data[new.name]
+        attribute_type = attribute.type_of_attribute()
+        is_logical = str(attribute_type) == "<type IfcLogical: <logical>>"
+        enum_value = data[new.name]
+        if is_logical:
+            new.special_type = "LOGICAL"
+            enum_items = ("TRUE", "FALSE", "UNKNOWN")
+            new.enum_items = json.dumps(enum_items)
+            if enum_value is not None and enum_value != "UNKNOWN":
+                # IfcOpenShell returns bool if IfcLogical is True/False.
+                enum_value = "TRUE" if enum_value else "FALSE"
+        else:
+            enum_items = ifcopenshell.util.attribute.get_enum_items(attribute)
+            new.enum_items = json.dumps(enum_items)
+            add_attribute_enum_items_descriptions(new, enum_items)
+
+        if enum_value is not None:
+            new.enum_value = enum_value
     add_attribute_description(new, data)
     add_attribute_min_max(attribute, new)
 
@@ -239,7 +257,7 @@ def add_attribute_description(attribute_blender: bonsai.bim.prop.Attribute, attr
 
 
 def export_attributes(
-    props: bpy.types.bpy_prop_collection,
+    props: bpy.types.bpy_prop_collection_idprop[Attribute],
     callback: Optional[ExportCallback] = None,
 ) -> dict[str, Any]:
     attributes: dict[str, Any] = {}
@@ -254,11 +272,25 @@ def export_attributes(
 ENUM_ITEMS_DATA = Union[bpy.types.PropertyGroup, bpy.types.ID, bpy.types.Operator, bpy.types.OperatorProperties]
 
 
+def get_display_value(value: str, float_decimal_precision: int = 6) -> str:
+    """
+    This will get rid of the floating point precision artifacts in float values stored as a string
+    """
+    try:
+        digits = len(value.split(".")[1])
+        value = float(value)
+        if digits > 6:  # Maximal decimal float precision
+            value = round(value, float_decimal_precision)
+    except (ValueError, IndexError):  # Not castable to a float or no decimal places (eg integer)
+        pass
+    return str(value)
+
+
 def prop_with_search(
     layout: bpy.types.UILayout,
     data: ENUM_ITEMS_DATA,
     prop_name: str,
-    should_click_ok_to_validate: bool = False,
+    should_click_ok: bool = False,
     original_operator_path: Optional[str] = None,
     **kwargs: Any,
 ):
@@ -271,7 +303,7 @@ def prop_with_search(
             row.context_pointer_set(name="data", data=data)
             op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM")
             op.prop_name = prop_name
-            op.should_click_ok_to_validate = should_click_ok_to_validate
+            op.should_click_ok = should_click_ok
             op.original_operator_path = original_operator_path or ""
     except TypeError:  # Prop is not iterable
         pass
@@ -315,6 +347,13 @@ def get_enum_items(
     return items
 
 
+def draw_expandable_panel(layout, context, label: str, ui_func, default_closed: bool = True):
+    header, panel = layout.panel(label, default_closed=default_closed)
+    header.label(text=label)
+    if panel:
+        ui_func(panel, context)
+
+
 def convert_property_group_from_si(property_group: bpy.types.PropertyGroup, skip_props: tuple[str, ...] = ()) -> None:
     """Method converts property group values from si to current ifc project units
 
@@ -334,11 +373,16 @@ def convert_property_group_from_si(property_group: bpy.types.PropertyGroup, skip
         setattr(property_group, prop_name, prop_value)
 
 
-def draw_filter(layout: bpy.types.UILayout, filter_groups, data, module: str) -> None:
+def draw_filter(
+    layout: bpy.types.UILayout,
+    filter_groups: bpy.types.bpy_prop_collection_idprop[BIMFilterGroup],
+    data,
+    module: str,
+) -> None:
     if not data.is_loaded:
         data.load()
 
-    sprops = bpy.context.scene.BIMSearchProperties
+    sprops = tool.Search.get_search_props()
 
     if tool.Ifc.get():
         row = layout.row(align=True)

src/bonsai/bonsai/bim/ifc.py

@@ -105,7 +105,8 @@ class IfcStore:
     @staticmethod
     def get_file():
         if IfcStore.file is None:
-            IfcStore.path = cast(str, bpy.context.scene.BIMProperties.ifc_file)
+            props = tool.Blender.get_bim_props()
+            IfcStore.path = props.ifc_file
             # Interpret relative paths as relative to .blend file.
             if IfcStore.path and not os.path.isabs(IfcStore.path):
                 IfcStore.path = os.path.abspath(os.path.join(bpy.path.abspath("//"), IfcStore.path))
@@ -119,9 +120,11 @@ class IfcStore:
     @staticmethod
     def get_cache():
         if IfcStore.cache is None and IfcStore.path:
+            props = tool.Blender.get_bim_props()
             ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
             ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
-            IfcStore.cache_path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "cache", f"{ifc_hash}.h5")
+            os.makedirs(props.cache_dir, exist_ok=True)
+            IfcStore.cache_path = os.path.join(props.cache_dir, f"{ifc_hash}.h5")
             cache_path = Path(IfcStore.cache_path)
             cache_settings = ifcopenshell.geom.settings()
             serializer_settings = ifcopenshell.geom.serializer_settings()
@@ -161,7 +164,8 @@ class IfcStore:
         assert IfcStore.file
         ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
         ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
-        new_cache_path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "cache", f"{ifc_hash}.h5")
+        props = tool.Blender.get_bim_props()
+        new_cache_path = os.path.join(props.cache_dir, f"{ifc_hash}.h5")
         IfcStore.cache = None
         try:
             shutil.move(IfcStore.cache_path, new_cache_path)
@@ -177,6 +181,7 @@ class IfcStore:
         if not os.path.isfile(path):
             return
         extension = path.split(".")[-1]
+        props = tool.Project.get_project_props()
         if extension.lower() == "ifczip":
             with tempfile.TemporaryDirectory() as unzipped_path:
                 with zipfile.ZipFile(path, "r") as zip_ref:
@@ -186,7 +191,7 @@ class IfcStore:
                     return
         elif extension.lower() == "ifcxml":
             IfcStore.file = ifcopenshell.file(ifcopenshell.ifcopenshell_wrapper.parse_ifcxml(path))
-        elif bpy.context.scene.BIMProjectProperties.should_stream:
+        elif props.should_stream:
             IfcStore.file = ifcopenshell.open(path, should_stream=True)
         else:
             IfcStore.file = ifcopenshell.open(path)
@@ -194,9 +199,8 @@ class IfcStore:
     @staticmethod
     def get_schema() -> ifcopenshell.ifcopenshell_wrapper.schema_definition:
         if IfcStore.file is None:
-            IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(
-                bpy.context.scene.BIMProjectProperties.export_schema
-            )
+            props = tool.Project.get_project_props()
+            IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(props.export_schema)
         elif IfcStore.schema is None:
             IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(IfcStore.file.schema_identifier)
         return IfcStore.schema
@@ -246,7 +250,7 @@ class IfcStore:
         # refactor this class and deprecate usage of IfcStore in favour of
         # tools.
         if not isinstance(obj, (bpy.types.Object, bpy.types.Material)):
-            obj.BIMMeshProperties.ifc_definition_id = element.id()
+            tool.Geometry.get_mesh_props(obj).ifc_definition_id = element.id()
             return
 
         existing_obj = IfcStore.id_map.get(element.id(), None)
@@ -404,15 +408,19 @@ class IfcStore:
             obj.BIMStyleProperties.ifc_definition_id = 0
         else:  # bpy.types.Object
             obj.BIMObjectProperties.ifc_definition_id = 0
-        # NOTE: in theory this will also remove listeners added by other addons
-        # though never had a report when this would be a problem.
-        bpy.msgbus.clear_by_owner(obj)
 
     @staticmethod
-    def execute_ifc_operator(operator: tool.Ifc.Operator, context: bpy.types.Context, is_invoke=False) -> set[str]:
+    def execute_ifc_operator(
+        operator: tool.Ifc.Operator,
+        context: bpy.types.Context,
+        event=None,
+        method: Literal["EXECUTE", "INVOKE", "MODAL"] = "EXECUTE",
+    ) -> set[str]:
         bonsai.last_actions.append({"type": "operator", "name": operator.bl_idname})
-        bpy.context.scene.BIMProperties.is_dirty = True
-        is_top_level_operator = not bool(IfcStore.current_transaction)
+        props = tool.Blender.get_bim_props()
+        props.is_dirty = True
+        # Modals don't nest, and Blender handles the loop that continuously calls modal()
+        is_top_level_operator = not bool(IfcStore.current_transaction) or (method == "MODAL")
 
         if is_top_level_operator:
             IfcStore.begin_transaction(operator)
@@ -438,10 +446,12 @@ class IfcStore:
                 bonsai.bim.handler.refresh_ui_data()
 
         try:
-            if is_invoke:
-                result = getattr(operator, "_invoke")(context, None)
-            else:
+            if method == "EXECUTE":
                 result = getattr(operator, "_execute")(context)
+            elif method == "INVOKE":
+                result = getattr(operator, "_invoke")(context, event)
+            elif method == "MODAL":
+                result = getattr(operator, "_modal")(context, event)
         except:
             bonsai.last_error = traceback.format_exc()
             # Try to ensure undo will work since Blender undo does work in case of errors.
@@ -453,12 +463,27 @@ class IfcStore:
             end_top_level_operator()
             raise
 
-        end_top_level_operator()
+        if method == "MODAL":
+            if result == {"FINISHED"}:
+                end_top_level_operator()
+            elif result == {"CANCELLED"}:
+                # Please read the docs: https://docs.blender.org/api/current/bpy.types.Operator.html
+                # > "when an operator returns {'CANCELLED'}, no undo step will be created".
+                # This means that if your modal edits IFC data, then the user
+                # cancels it, Blender's undo history will not be in sync with
+                # Bonsai / IfcOpenShell's undo history. Instead of hoping for
+                # Bonsai devs to remember to handle the "cancel" state (i.e.
+                # detect escape keypress) and return {"FINISHED"}, we instead
+                # always enforce an undo step.
+                bpy.ops.ed.undo_push(message=f"Cancel {operator.bl_idname}")
+                end_top_level_operator()
+        else:
+            end_top_level_operator()
         return result
 
     @staticmethod
     def begin_transaction(operator: tool.Ifc.Operator) -> None:
-        IfcStore.current_transaction = str(uuid.uuid4())
+        IfcStore.current_transaction = str(uuid.uuid4()) + operator.__class__.__name__
         operator.transaction_key = IfcStore.current_transaction
 
     @staticmethod
@@ -472,7 +497,8 @@ class IfcStore:
     ) -> None:
         key = getattr(operator, "transaction_key", None)
         data = getattr(operator, "transaction_data", None)
-        bpy.context.scene.BIMProperties.last_transaction = key
+        props = tool.Blender.get_bim_props()
+        props.last_transaction = key
         IfcStore.last_transaction = key
         rollback = rollback or getattr(operator, "rollback", lambda data: True)
         commit = commit or getattr(operator, "commit", lambda data: True)

src/bonsai/bonsai/bim/import_ifc.py

@@ -24,6 +24,7 @@ import logging
 import traceback
 import mathutils
 import numpy as np
+import numpy.typing as npt
 import multiprocessing
 import ifcopenshell
 import ifcopenshell.geom
@@ -34,10 +35,9 @@ import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import ifcopenshell.util.shape
 import bonsai.tool as tool
-from itertools import chain, accumulate
 from bonsai.bim.ifc import IfcStore, IFC_CONNECTED_TYPE
 from bonsai.tool.loader import OBJECT_DATA_TYPE
-from typing import Dict, Union, Optional, Any, cast
+from typing import Dict, Union, Optional, Any, Literal
 
 
 class MaterialCreator:
@@ -69,8 +69,13 @@ class MaterialCreator:
         if isinstance(mesh, bpy.types.Curve):
             return
 
+        if mesh.get("has_layer_styles", None) == True:
+            return
+
         self.mesh = mesh
         self.obj = obj
+        if element.is_a("IfcTypeProduct"):
+            self.parse_element_type_material_styles(element)
         self.parsed_meshes.add(self.mesh.name)
         if not self.ifc_import_settings.load_indexed_maps:
             self.load_texture_maps(shape_has_openings)
@@ -83,6 +88,19 @@ class MaterialCreator:
             if ifc_definition_id := material.BIMStyleProperties.ifc_definition_id:
                 self.styles[ifc_definition_id] = material
 
+    def parse_element_type_material_styles(self, element: ifcopenshell.entity_instance) -> None:
+        if self.mesh["ios_materials"]:
+            return  # Already has materials assign to the representation itself
+        # Otherwise, we need to check for material styles on the element, since
+        # create_shape on types only works on representations.
+        mprops = tool.Geometry.get_mesh_props(self.mesh)
+        context = tool.Ifc.get().by_id(mprops.ifc_definition_id).ContextOfItems
+        for material in ifcopenshell.util.element.get_materials(element):
+            if style := ifcopenshell.util.representation.get_material_style(material, context):
+                self.mesh["ios_materials"] = (style.id(),)
+                self.mesh["ios_material_ids"] = [0] * len(self.mesh.polygons)
+                break
+
     def get_ifc_coordinate(self, material: bpy.types.Material) -> Union[ifcopenshell.entity_instance, None]:
         """Get IfcTextureCoordinate"""
         texture_style = tool.Style.get_texture_style(material)
@@ -96,7 +114,7 @@ class MaterialCreator:
                     return coords
                 # TODO: support IfcTextureMap
                 if coords.is_a("IfcTextureMap"):
-                    print(f"WARNING. IfcTextureMap texture coordinates is not supported.")
+                    print("WARNING. IfcTextureMap texture coordinates is not supported.")
                     return
 
     def load_texture_maps(self, shape_has_openings: bool) -> None:
@@ -154,7 +172,7 @@ class MaterialCreator:
             if -1 in self.mesh["ios_material_ids"]:
                 material_to_slot[-1] = get_empty_slot_index()
 
-            material_index = [material_to_slot[mat_id] for mat_id in self.mesh["ios_material_ids"]]
+            material_index = np.array([material_to_slot[mat_id] for mat_id in self.mesh["ios_material_ids"]], dtype="I")
             self.mesh.polygons.foreach_set("material_index", material_index)
 
     def resolve_all_stylable_representation_items(
@@ -204,7 +222,7 @@ class IfcImporter:
         self.progress = 0
 
         self.material_creator = MaterialCreator(ifc_import_settings, self)
-        classes_to_wireframe_str = bpy.context.scene.DocProperties.classes_to_wireframe
+        classes_to_wireframe_str = tool.Drawing.get_document_props().classes_to_wireframe
         self.classes_to_wireframe_list = [word.strip() for word in classes_to_wireframe_str.split(",")]
 
     def profile_code(self, message: str) -> None:
@@ -257,12 +275,9 @@ class IfcImporter:
         self.place_objects_in_collections()
         self.profile_code("Place objects in collections")
         self.setup_arrays()
-        self.setup_aggregates()
         self.profile_code("Setup arrays")
         tool.Project.load_linked_models_from_ifc()
         self.profile_code("Load linked models")
-        self.lock_scales()
-        self.profile_code("Lock objects scales")
         self.add_project_to_scene()
         self.profile_code("Add project to scene")
         if self.ifc_import_settings.should_clean_mesh and len(self.file.by_type("IfcElement")) < 1000:
@@ -423,7 +438,7 @@ class IfcImporter:
         return False
 
     def calculate_model_offset(self) -> None:
-        props = bpy.context.scene.BIMGeoreferenceProperties
+        props = tool.Georeference.get_georeference_props()
         if self.ifc_import_settings.false_origin_mode == "MANUAL":
             tool.Loader.set_manual_blender_offset(self.file)
         elif self.ifc_import_settings.false_origin_mode == "AUTOMATIC":
@@ -578,6 +593,7 @@ class IfcImporter:
                 obj.hide_select = True
 
     def create_generic_sqlite_elements(self, elements: set[ifcopenshell.entity_instance]) -> None:
+        assert isinstance(self.file, ifcopenshell.sql.sqlite)
         self.geometry_cache = self.file.get_geometry([e.id() for e in elements])
         for geometry_id, geometry in self.geometry_cache["geometry"].items():
             mesh_name = tool.Loader.get_mesh_name_from_shape(type("Geometry", (), {"id": geometry_id}))
@@ -587,21 +603,9 @@ class IfcImporter:
             mesh["has_cartesian_point_offset"] = False
 
             if geometry["faces"]:
-                num_vertices = len(verts) // 3
-                total_faces = len(geometry["faces"])
-                loop_start = range(0, total_faces, 3)
-                num_loops = total_faces // 3
-                loop_total = [3] * num_loops
-                num_vertex_indices = len(geometry["faces"])
-
-                mesh.vertices.add(num_vertices)
-                mesh.vertices.foreach_set("co", verts)
-                mesh.loops.add(num_vertex_indices)
-                mesh.loops.foreach_set("vertex_index", geometry["faces"])
-                mesh.polygons.add(num_loops)
-                mesh.polygons.foreach_set("loop_start", loop_start)
-                mesh.polygons.foreach_set("loop_total", loop_total)
-                mesh.update()
+                mesh = tool.Loader.create_mesh_from_shape(
+                    mesh=mesh, faces=geometry["faces"].reshape(-1, 3), verts=verts.reshape(-1, 3)
+                )
             else:
                 e = geometry["edges"]
                 v = verts
@@ -694,24 +698,15 @@ class IfcImporter:
     def create_structural_point_connections(self):
         for product in self.file.by_type("IfcStructuralPointConnection"):
             # TODO: make this based off ifcopenshell. See #1409
+            representation: ifcopenshell.entity_instance = next(
+                rep for rep in product.Representation.Representations if rep.RepresentationType == "Vertex"
+            )
+            mesh = tool.Loader.create_structural_point_connection_mesh(representation)
+            if mesh is None:
+                continue
+            tool.Ifc.link(representation, mesh)
+
             placement_matrix = ifcopenshell.util.placement.get_local_placement(product.ObjectPlacement)
-            vertex = None
-            context = None
-            representation = None
-            for subelement in self.file.traverse(product.Representation):
-                if subelement.is_a("IfcVertex") and subelement.VertexGeometry.is_a("IfcCartesianPoint"):
-                    vertex = list(subelement.VertexGeometry.Coordinates)
-                elif subelement.is_a("IfcGeometricRepresentationContext"):
-                    context = subelement
-                elif subelement.is_a("IfcTopologyRepresentation"):
-                    representation = subelement
-            if not vertex or not context or not representation:
-                continue  # TODO implement non cartesian point vertexes
-
-            mesh_name = tool.Geometry.get_representation_name(representation)
-            mesh = bpy.data.meshes.new(mesh_name)
-            mesh.from_pydata([mathutils.Vector(vertex) * self.unit_scale], [], [])
-
             obj = bpy.data.objects.new(tool.Loader.get_name(product), mesh)
             self.set_matrix_world(obj, tool.Loader.apply_blender_offset_to_matrix_world(obj, placement_matrix))
             self.link_element(product, obj)
@@ -887,18 +882,20 @@ class IfcImporter:
 
     def load_file(self):
         self.ifc_import_settings.logger.info("loading file %s", self.ifc_import_settings.input_file)
-        if not bpy.context.scene.BIMProperties.ifc_file:
-            bpy.context.scene.BIMProperties.ifc_file = self.ifc_import_settings.input_file
-        self.file = IfcStore.get_file()
+        props = tool.Blender.get_bim_props()
+        if not props.ifc_file:
+            props.ifc_file = self.ifc_import_settings.input_file
+        self.file = tool.Ifc.get()
 
     def calculate_unit_scale(self):
         self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
         tool.Loader.set_unit_scale(self.unit_scale)
 
-    def set_units(self):
-        if not (units := self.file.by_type("IfcUnitAssignment")):
+    def set_units(self) -> None:
+        if not (assignment := self.file.by_type("IfcProject")[0].UnitsInContext):
             return  # Geometry is optional in IFC
-        for unit in units[0].Units:
+        props = tool.Blender.get_bim_props()
+        for unit in assignment.Units:
             if unit.is_a("IfcNamedUnit") and unit.UnitType == "LENGTHUNIT":
                 if unit.is_a("IfcSIUnit"):
                     bpy.context.scene.unit_settings.system = "METRIC"
@@ -917,19 +914,19 @@ class IfcImporter:
             elif unit.is_a("IfcNamedUnit") and unit.UnitType == "AREAUNIT":
                 name = unit.Name if unit.is_a("IfcSIUnit") else unit.Name.lower()
                 try:
-                    bpy.context.scene.BIMProperties.area_unit = "{}{}".format(
+                    props.area_unit = "{}{}".format(
                         unit.Prefix + "/" if hasattr(unit, "Prefix") and unit.Prefix else "", name
                     )
                 except:  # Probably an invalid unit.
-                    bpy.context.scene.BIMProperties.area_unit = "SQUARE_METRE"
+                    props.area_unit = "SQUARE_METRE"
             elif unit.is_a("IfcNamedUnit") and unit.UnitType == "VOLUMEUNIT":
                 name = unit.Name if unit.is_a("IfcSIUnit") else unit.Name.lower()
                 try:
-                    bpy.context.scene.BIMProperties.volume_unit = "{}{}".format(
+                    props.volume_unit = "{}{}".format(
                         unit.Prefix + "/" if hasattr(unit, "Prefix") and unit.Prefix else "", name
                     )
                 except:  # Probably an invalid unit.
-                    bpy.context.scene.BIMProperties.volume_unit = "CUBIC_METRE"
+                    props.volume_unit = "CUBIC_METRE"
 
     def create_project(self):
         project = self.file.by_type("IfcProject")[0]
@@ -973,10 +970,10 @@ class IfcImporter:
                 tool.Collector.assign(obj, should_clean_users_collection=False)
 
     def is_curve_annotation(self, element: ifcopenshell.entity_instance) -> bool:
-        object_type = element.ObjectType
+        object_type = ifcopenshell.util.element.get_predefined_type(element)
         return (
             object_type in tool.Drawing.ANNOTATION_TYPES_DATA
-            and tool.Drawing.ANNOTATION_TYPES_DATA[object_type][3] == "curve"
+            and tool.Drawing.ANNOTATION_TYPES_DATA[object_type].data_type == "curve"
         )
 
     def get_drawing_group(self, element):
@@ -1029,7 +1026,7 @@ class IfcImporter:
         self,
         element: ifcopenshell.entity_instance,
         shape: Union[ifcopenshell.geom.ShapeElementType, ifcopenshell.geom.ShapeType],
-        cartesian_point_offset=None,
+        cartesian_point_offset: Union[npt.NDArray[np.float64], Literal[False]] = None,
     ) -> bpy.types.Mesh:
         try:
             if hasattr(shape, "geometry"):
@@ -1045,40 +1042,33 @@ class IfcImporter:
                 old_mesh.name = mesh_name + ".old"
             mesh = bpy.data.meshes.new(mesh_name)
 
+            verts = ifcopenshell.util.shape.get_vertices(geometry)
             if cartesian_point_offset is False:
-                verts = geometry.verts
                 mesh["has_cartesian_point_offset"] = False
             elif cartesian_point_offset is not None:
-                verts_array = np.array(geometry.verts)
-                offset = np.array([-cartesian_point_offset[0], -cartesian_point_offset[1], -cartesian_point_offset[2]])
-                offset_verts = verts_array + np.tile(offset, len(verts_array) // 3)
-                verts = offset_verts.tolist()
+                verts = verts - cartesian_point_offset
 
                 mesh["has_cartesian_point_offset"] = True
                 mesh["cartesian_point_offset"] = (
                     f"{cartesian_point_offset[0]},{cartesian_point_offset[1]},{cartesian_point_offset[2]}"
                 )
-            elif geometry.verts and tool.Loader.is_point_far_away(
-                (geometry.verts[0], geometry.verts[1], geometry.verts[2]), is_meters=True
-            ):
+            elif verts.size and tool.Loader.is_point_far_away(verts[0], is_meters=True):
                 # Shift geometry close to the origin based off that first vert it found
-                verts_array = np.array(geometry.verts)
-                offset = np.array([-geometry.verts[0], -geometry.verts[1], -geometry.verts[2]])
-                offset_verts = verts_array + np.tile(offset, len(verts_array) // 3)
-                verts = offset_verts.tolist()
+                offset = verts[0]
+                verts = verts - offset
 
                 mesh["has_cartesian_point_offset"] = True
-                mesh["cartesian_point_offset"] = f"{geometry.verts[0]},{geometry.verts[1]},{geometry.verts[2]}"
+                mesh["cartesian_point_offset"] = f"{offset[0]},{offset[1]},{offset[2]}"
             else:
-                verts = geometry.verts
                 mesh["has_cartesian_point_offset"] = False
 
-            return tool.Loader.convert_geometry_to_mesh(
+            mesh = tool.Loader.convert_geometry_to_mesh(
                 geometry,
                 mesh,
                 verts=verts,
                 load_indexed_maps=self.ifc_import_settings.load_indexed_maps,
             )
+            return tool.Loader.slice_layerset_mesh(element, mesh)
         except:
             self.ifc_import_settings.logger.error("Could not create mesh for %s", element)
             import traceback
@@ -1119,31 +1109,6 @@ class IfcImporter:
                         tool.Blender.Modifier.Array.set_children_lock_state(element, i, True)
                         tool.Blender.Modifier.Array.constrain_children_to_parent(element)
 
-    def setup_aggregates(self):
-        elements = set(self.file.by_type("IfcElement"))
-        for element in elements:
-            parts = ifcopenshell.util.element.get_parts(element)
-            if parts:
-                relating_obj = tool.Ifc.get_object(element)
-                if relating_obj:
-                    tool.Aggregate.constrain_all_parts_to_aggregate(relating_obj)
-        bpy.context.scene.BIMAggregateProperties.aggregate_decorator = True
-
-
-    def lock_scales(self) -> None:
-        elements = set(self.file.by_type("IfcProduct"))
-        while elements:
-            element = elements.pop()
-            if not getattr(element, "HasOpenings", False):
-                continue
-            voided_elements = tool.Aggregate.get_parts_recursively(element)
-            voided_elements.add(element)
-            elements.difference_update(voided_elements)
-            for element in voided_elements:
-                if not (obj := tool.Ifc.get_object(element)):
-                    continue
-                tool.Geometry.lock_scale(obj)
-
 
 class IfcImportSettings:
     def __init__(self):
@@ -1180,7 +1145,7 @@ class IfcImportSettings:
     @staticmethod
     def factory(context=None, input_file=None, logger=None):
         scene_diff = bpy.context.scene.DiffProperties
-        props = bpy.context.scene.BIMProjectProperties
+        props = tool.Project.get_project_props()
         settings = IfcImportSettings()
         settings.input_file = input_file
         if logger is None:

src/bonsai/bonsai/bim/module/aggregate/__init__.py

@@ -32,7 +32,6 @@ classes = (
     operator.BIM_OT_select_linked_aggregates,
     operator.BIM_OT_disable_aggregate_mode,
     operator.BIM_OT_toggle_aggregate_mode_local_view,
-    operator.BIM_OT_aggregate_assing_new_objects_in_aggregate_mode,
     prop.BIMObjectAggregateProperties,
     prop.Objects,
     prop.BIMAggregateProperties,

src/bonsai/bonsai/bim/module/aggregate/decorator.py

@@ -167,6 +167,8 @@ class AggregateDecorator:
         theme = context.preferences.themes.items()[0][1]
         selected_object_color = (*theme.view_3d.object_active, 1)
 
+        self.shader = gpu.shader.from_builtin("UNIFORM_COLOR")
+        self.shader.bind()
         self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
         self.line_shader.bind()
         # POLYLINE_UNIFORM_COLOR specific uniforms
@@ -207,7 +209,6 @@ class AggregateDecorator:
             parts = ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(aggregate))
             parts_objs = [tool.Ifc.get_object(p) for p in parts]
 
-
             indices, edges = create_bounding_box(parts_objs)
             self.line_shader.uniform_float("lineWidth", 0.5)
             self.draw_batch("LINES", indices, color, edges)
@@ -230,9 +231,6 @@ class AggregateModeDecorator:
         cls.handlers.append(
             SpaceView3D.draw_handler_add(handler.draw_aggregate_empty, (context,), "WINDOW", "POST_VIEW")
         )
-        cls.handlers.append(
-            SpaceView3D.draw_handler_add(handler.draw_new_objects, (context,), "WINDOW", "POST_VIEW")
-        )
         cls.is_installed = True
 
     @classmethod
@@ -272,6 +270,8 @@ class AggregateModeDecorator:
         blf.color(self.font_id, *color)
         text = aggregate_obj.name
         text_coords = view3d_utils.location_3d_to_region_2d(region, rv3d, aggregate_obj.location)
+        if not text_coords:
+            return
         text_length = blf.dimensions(self.font_id, text)
         text_coords[0] -= text_length[0] / 2
         text_coords[1] -= 20
@@ -330,34 +330,3 @@ class AggregateModeDecorator:
         indices, edges = create_bounding_box(parts_objs)
         self.line_shader.uniform_float("lineWidth", 0.5)
         self.draw_batch("LINES", indices, color, edges)
-
-    def draw_new_objects(self, context):
-        if not context.scene.BIMAggregateProperties.in_aggregate_mode:
-            return
-        self.addon_prefs = tool.Blender.get_addon_preferences()
-        self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
-        self.line_shader.bind()
-        self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
-        self.line_shader.uniform_float("lineWidth", 2.0)
-        color = self.addon_prefs.decorator_color_unselected
-        props = context.scene.BIMAggregateProperties
-        editing_objects = set([o.obj for o in props.editing_objects])
-        not_editing_objects = set([o.obj for o in props.not_editing_objects])
-        objs = []
-        visible_objects = tool.Raycast.get_visible_objects(context)
-        for obj in visible_objects:
-            if obj.visible_in_viewport_get(context.space_data):
-                objs.append(obj.original)
-        new_objs = set(objs) - not_editing_objects - editing_objects
-        new_objs = [o for o in new_objs if o.data]
-        for obj in new_objs:
-            element = tool.Ifc.get_entity(obj)
-            if (aggregate := ifcopenshell.util.element.get_aggregate(element)) == tool.Ifc.get_entity(props.editing_aggregate):
-                continue
-            if element and element.is_a("IfcElement"):
-                data = ItemDecorator.get_obj_data(obj)
-                if data:
-                    self.draw_batch(
-                        "TRIS", data["verts"], transparent_color((1, 0, 0, 1)), data["tris"]
-                    )
-

src/bonsai/bonsai/bim/module/aggregate/operator.py

@@ -23,7 +23,6 @@ import ifcopenshell.util.element
 import bonsai.tool as tool
 import bonsai.core.aggregate as core
 import bonsai.core.spatial
-from bonsai.bim.ifc import IfcStore
 
 
 class BIM_OT_aggregate_assign_object(bpy.types.Operator, tool.Ifc.Operator):
@@ -67,7 +66,6 @@ class BIM_OT_aggregate_assign_object(bpy.types.Operator, tool.Ifc.Operator):
                     relating_obj=relating_obj,
                     related_obj=obj,
                 )
-                tool.Aggregate.constrain_part_to_aggregate(obj, relating_obj)
                 props = context.scene.BIMAggregateProperties
                 if relating_obj == props.editing_aggregate and props.in_aggregate_mode:
                     new_editing_obj = props.editing_objects.add()
@@ -101,8 +99,6 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, tool.Ifc.Operator):
                 related_obj=tool.Ifc.get_object(element),
             )
 
-            tool.Aggregate.apply_constraints(tool.Ifc.get_object(element))
-
             # Removes Pset related to Linked Aggregates
             if not element.is_a("IfcElementAssembly"):
                 pset = ifcopenshell.util.element.get_pset(element, "BBIM_Linked_Aggregate")
@@ -185,7 +181,6 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
                     element_obj=aggregate,
                 )
             core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
-            tool.Aggregate.constrain_all_parts_to_aggregate(aggregate)
 
     def create_aggregate(self, context, ifc_class, aggregate_name):
         aggregate = bpy.data.objects.new(aggregate_name, None)
@@ -375,6 +370,7 @@ class BIM_OT_select_linked_aggregates(bpy.types.Operator):
 
         return {"FINISHED"}
 
+
 class BIM_OT_disable_aggregate_mode(bpy.types.Operator):
     bl_idname = "bim.disable_aggregate_mode"
     bl_label = "Disable Aggregate Mode"
@@ -385,6 +381,7 @@ class BIM_OT_disable_aggregate_mode(bpy.types.Operator):
         bonsai.core.aggregate.disable_aggregate_mode(tool.Aggregate)
         return {"FINISHED"}
 
+
 class BIM_OT_toggle_aggregate_mode_local_view(bpy.types.Operator):
     bl_idname = "bim.toggle_aggregate_mode_local_view"
     bl_label = "Toggle Aggregate Mode Local View"
@@ -402,40 +399,3 @@ class BIM_OT_toggle_aggregate_mode_local_view(bpy.types.Operator):
                 bpy.ops.view3d.localview()
 
         return {"FINISHED"}
-
-class BIM_OT_aggregate_assing_new_objects_in_aggregate_mode(bpy.types.Operator):
-    bl_idname = "bim.aggregate_assing_new_objects_in_aggregate_mode"
-    bl_label = "Aggregate Assing New Objects In Aggregate Mode"
-    bl_options = {"REGISTER", "UNDO"}
-    relating_object: bpy.props.IntProperty()
-    related_object: bpy.props.IntProperty()
-
-    def execute(self, context):
-        bpy.ops.object.select_all(action="DESELECT")
-        props = context.scene.BIMAggregateProperties
-        editing_objects = set([o.obj for o in props.editing_objects])
-        not_editing_objects = set([o.obj for o in props.not_editing_objects])
-        objs = []
-        visible_objects = tool.Raycast.get_visible_objects(context)
-        for obj in visible_objects:
-            if obj.visible_in_viewport_get(context.space_data):
-                objs.append(obj.original)
-        new_objs = set(objs) - not_editing_objects - editing_objects
-        new_objs = [o for o in new_objs if o.data]
-        for obj in new_objs:
-            element = tool.Ifc.get_entity(obj)
-            if (aggregate := ifcopenshell.util.element.get_aggregate(element)) == tool.Ifc.get_entity(props.editing_aggregate):
-                continue
-            if element and element.is_a("IfcElement"):
-                obj.select_set(True)
-                editing_obj = props.editing_objects.add()
-                editing_obj.obj = obj
-                props.editing_aggregate.select_set(True)
-        context.view_layer.objects.active = new_objs[0]
-        self.relating_object = tool.Ifc.get_entity(props.editing_aggregate).id()
-        self.related_object = tool.Ifc.get_entity(obj).id()
-
-        BIM_OT_aggregate_assign_object._execute(self, context)
-
-        return {"FINISHED"}
-

src/bonsai/bonsai/bim/module/aggregate/prop.py

@@ -101,6 +101,7 @@ class BIMObjectAggregateProperties(PropertyGroup):
 
 class Objects(bpy.types.PropertyGroup):
     obj: PointerProperty(type=bpy.types.Object)
+    previous_display_type: bpy.props.StringProperty(default="TEXTURED")
 
 
 class BIMAggregateProperties(PropertyGroup):

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

@@ -39,7 +39,7 @@ class BIM_PT_aggregate(Panel):
         props = context.active_object.BIMObjectProperties
         if not props.ifc_definition_id:
             return False
-        if not IfcStore.get_element(props.ifc_definition_id):
+        if not tool.Ifc.get_object_by_identifier(props.ifc_definition_id):
             return False
         if not IfcStore.get_file().by_id(props.ifc_definition_id).is_a("IfcObjectDefinition"):
             return False
@@ -120,9 +120,9 @@ class BIM_PT_linked_aggregate(Panel):
         props = context.active_object.BIMObjectProperties
         if not props.ifc_definition_id:
             return False
-        if not IfcStore.get_element(props.ifc_definition_id):
+        if not tool.Ifc.get_object_by_identifier(props.ifc_definition_id):
             return False
-        if not IfcStore.get_file().by_id(props.ifc_definition_id).is_a("IfcObjectDefinition"):
+        if not tool.Ifc.get().by_id(props.ifc_definition_id).is_a("IfcObjectDefinition"):
             return False
         return True
 

src/bonsai/bonsai/bim/module/attribute/operator.py

@@ -19,29 +19,42 @@
 import bpy
 import json
 import ifcopenshell
-import ifcopenshell.api
+import ifcopenshell.api.attribute
 import ifcopenshell.guid
 import ifcopenshell.util.element
 import bonsai.bim.helper
 import bonsai.tool as tool
 import bonsai.core.attribute as core
-from bonsai.bim.ifc import IfcStore
+import bonsai.core.spatial
+
+
+def get_objs_for_operation(operator_properties, context):
+    if operator_properties.obj:
+        return [bpy.data.objects[operator_properties.obj]]
+    if operator_properties.mass_operation:
+        return context.selected_objects[:]
+    return [context.active_object]
 
 
 class EnableEditingAttributes(bpy.types.Operator):
     bl_idname = "bim.enable_editing_attributes"
     bl_label = "Enable Editing Attributes"
+    bl_description = "ALT + Left Click to enable editing attributes on all selected objects"
     bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
+    obj: bpy.props.StringProperty(options={"SKIP_SAVE"})
+    mass_operation: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})
 
-    def execute(self, context):
-        self.file = IfcStore.get_file()
-        obj = bpy.data.objects[self.obj]
+    def invoke(self, context, event):
+        self.mass_operation = event.alt
+        return self.execute(context)
+
+    def enable_editing_attribute_on_obj(self, obj):
         props = obj.BIMAttributeProperties
         props.attributes.clear()
 
         element = tool.Ifc.get_entity(obj)
-        assert element
+        if not element:
+            return
         has_inherited_predefined_type = False
         if not element.is_a("IfcTypeObject") and (element_type := ifcopenshell.util.element.get_type(element)):
             # Allow for None due to https://github.com/buildingSMART/IFC4.3.x-development/issues/818
@@ -67,52 +80,65 @@ class EnableEditingAttributes(bpy.types.Operator):
 
         bonsai.bim.helper.import_attributes2(element, props.attributes, callback=callback)
         props.is_editing_attributes = True
+
+    def execute(self, context):
+        for obj in get_objs_for_operation(self, context):
+            self.enable_editing_attribute_on_obj(obj)
         return {"FINISHED"}
 
 
 class DisableEditingAttributes(bpy.types.Operator):
     bl_idname = "bim.disable_editing_attributes"
     bl_label = "Disable Editing Attributes"
+    bl_description = "ALT + Left Click to disable editing attributes on all selected objects"
     bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
+    obj: bpy.props.StringProperty(options={"SKIP_SAVE"})
+    mass_operation: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})
 
-    def execute(self, context):
-        obj = bpy.data.objects.get(self.obj)
+    def invoke(self, context, event):
+        self.mass_operation = event.alt
+        return self.execute(context)
+
+    def disable_editing_attributes_on_obj(self, obj):
         props = obj.BIMAttributeProperties
         props.is_editing_attributes = False
+
+    def execute(self, context):
+        for obj in get_objs_for_operation(self, context):
+            self.disable_editing_attributes_on_obj(obj)
         return {"FINISHED"}
 
 
 class EditAttributes(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.edit_attributes"
     bl_label = "Edit Attributes"
+    bl_description = "Edit the attributes of the active object"
     bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
 
     def _execute(self, context):
-        self.file = IfcStore.get_file()
-        obj = bpy.data.objects.get(self.obj)
-        props = obj.BIMAttributeProperties
-        product = tool.Ifc.get_entity(obj)
+        self.file = tool.Ifc.get()
+        obj = tool.Blender.get_active_object(is_selected=False)
+        if not (element := tool.Ifc.get_entity(obj)):
+            return
 
         def callback(attributes, prop):
             if prop.name in ("RefLatitude", "RefLongitude"):
-                if prop.is_null:
-                    attributes[prop.name] = None
-                else:
+                if not prop.is_null:
                     try:
                         attributes[prop.name] = json.loads(prop.string_value)
                     except:
                         attributes[prop.name] = None
-                return True
+                    return True
 
+        props = obj.BIMAttributeProperties
         attributes = bonsai.bim.helper.export_attributes(props.attributes, callback=callback)
-        ifcopenshell.api.run("attribute.edit_attributes", self.file, product=product, attributes=attributes)
+        ifcopenshell.api.attribute.edit_attributes(self.file, product=element, attributes=attributes)
 
-        if (name := tool.Loader.get_name(product)) and obj.name != name:
-            obj.name = name
+        tool.Root.set_object_name(obj, element)
         bpy.ops.bim.disable_editing_attributes(obj=obj.name)
-        return {"FINISHED"}
+
+        if tool.Root.is_spatial_element(element):
+            bonsai.core.spatial.import_spatial_decomposition(tool.Spatial)
 
 
 class GenerateGlobalId(bpy.types.Operator, tool.Ifc.Operator):
@@ -161,9 +187,12 @@ class GenerateGlobalId(bpy.types.Operator, tool.Ifc.Operator):
 class CopyAttributeToSelection(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.copy_attribute_to_selection"
     bl_label = "Copy Attribute To Selection"
+    bl_options = {"REGISTER", "UNDO"}
     name: bpy.props.StringProperty()
 
     def _execute(self, context):
-        value = context.active_object.BIMAttributeProperties.attributes.get(self.name).get_value()
-        for obj in tool.Blender.get_selected_objects():
-            core.copy_attribute_to_selection(tool.Ifc, name=self.name, value=value, obj=obj)
+        value = tool.Blender.get_active_object().BIMAttributeProperties.attributes.get(self.name).get_value()
+        total = core.copy_attribute_to_selection(
+            tool.Ifc, tool.Blender, tool.Root, tool.Spatial, name=self.name, value=value
+        )
+        self.report({"INFO"}, f"Attribute was successfully copied to {total} elements.")

src/bonsai/bonsai/bim/module/attribute/prop.py

@@ -17,7 +17,6 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from bonsai.bim.ifc import IfcStore
 from bonsai.bim.prop import StrProperty, Attribute
 from bpy.types import PropertyGroup
 from bpy.props import (

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

@@ -18,33 +18,29 @@
 
 import bonsai.bim.helper
 from bpy.types import Panel
-from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.attribute.data import AttributesData
+import bonsai.tool as tool
 
 
 def draw_ui(context, layout, attributes):
     obj = context.active_object
-    oprops = obj.BIMObjectProperties
     props = obj.BIMAttributeProperties
 
     if props.is_editing_attributes:
         row = layout.row(align=True)
-        op = row.operator("bim.edit_attributes", icon="CHECKMARK", text="Save Attributes")
-        op.obj = obj.name
-        op = row.operator("bim.disable_editing_attributes", icon="CANCEL", text="")
-        op.obj = obj.name
+        row.operator("bim.edit_attributes", icon="CHECKMARK", text="Save Attributes")
+        row.operator("bim.disable_editing_attributes", icon="CANCEL", text="")
 
         bonsai.bim.helper.draw_attributes(props.attributes, layout, copy_operator="bim.copy_attribute_to_selection")
     else:
         row = layout.row()
         op = row.operator("bim.enable_editing_attributes", icon="GREASEPENCIL", text="Edit")
-        op.obj = obj.name
 
         for attribute in attributes:
             row = layout.row(align=True)
             row.label(text=attribute["name"])
-            # row.label(text=attribute["value"])
-            op = row.operator("bim.select_similar", text=attribute["value"], icon="NONE", emboss=False)
+            value = bonsai.bim.helper.get_display_value(attribute["value"])
+            op = row.operator("bim.select_similar", text=value, icon="NONE", emboss=False)
             op.key = attribute["name"]
 
     # TODO: reimplement, see #1222
@@ -62,11 +58,7 @@ class BIM_PT_object_attributes(Panel):
 
     @classmethod
     def poll(cls, context):
-        if not context.active_object:
-            return False
-        if not IfcStore.get_element(context.active_object.BIMObjectProperties.ifc_definition_id):
-            return False
-        return bool(context.active_object.BIMObjectProperties.ifc_definition_id)
+        return tool.Ifc.get_entity(context.active_object)
 
     def draw(self, context):
         if not AttributesData.is_loaded:

src/bonsai/bonsai/bim/module/augin/operator.py

@@ -113,7 +113,7 @@ class AuginCreateNewModel(bpy.types.Operator):
         context.scene.collection.objects.link(cam_obj)
         context.scene.camera = cam_obj
 
-        tmpdir = tempfile.mkdtemp()
+        tmpdir = tempfile.mkdtemp(dir=tool.Blender.get_addon_preferences().tmp_dir or None)
         thumb_path = os.path.join(tmpdir, "thumb.png")
         context.scene.render.image_settings.file_format = "PNG"
         context.scene.render.filepath = thumb_path
@@ -122,15 +122,16 @@ class AuginCreateNewModel(bpy.types.Operator):
         context.scene.render.image_settings.file_format = old_file_format
         context.scene.render.filepath = old_filepath
 
-        client.upload_file(context.scene.BIMProperties.ifc_file, result["s3_bucket"], result["model_path"])
+        bim_props = tool.Blender.get_bim_props()
+        client.upload_file(bim_props.ifc_file, result["s3_bucket"], result["model_path"])
         client.upload_file(thumb_path, result["s3_bucket"], result["thumb_path"])
 
         # Notify done
         url = "https://server.auge.pro.br/API/v3/augin_rest.php/files_uploaded"
         payload = {
             "user_token": props.token,
-            "ifc_filesize": os.path.getsize(context.scene.BIMProperties.ifc_file),
-            "model_filesize": os.path.getsize(context.scene.BIMProperties.ifc_file),
+            "ifc_filesize": os.path.getsize(bim_props.ifc_file),
+            "model_filesize": os.path.getsize(bim_props.ifc_file),
             "thumb_filesize": os.path.getsize(thumb_path),
             "model_upload_path": result["model_path"],
             "thumb_upload_path": result["thumb_path"],

src/bonsai/bonsai/bim/module/augin/ui.py

@@ -17,6 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy.types
+import bonsai.tool as tool
 
 
 class BIM_PT_augin(bpy.types.Panel):
@@ -47,7 +48,8 @@ class BIM_PT_augin(bpy.types.Panel):
         row = layout.row()
         row.label(text="Logged in as " + props.username)
 
-        if not context.scene.BIMProperties.ifc_file:
+        bim_props = tool.Blender.get_bim_props()
+        if not bim_props.ifc_file:
             row = layout.row()
             row.label(text="No IFC Found")
             return

src/bonsai/bonsai/bim/module/bcf/bcfstore.py

@@ -21,6 +21,7 @@ import bpy
 import bcf
 import bcf.bcfxml
 import bcf.v2.bcfxml
+import bonsai.tool as tool
 from typing import Union
 
 
@@ -30,7 +31,8 @@ class BcfStore:
     @classmethod
     def get_bcfxml(cls) -> Union[bcf.bcfxml.BcfXml, None]:
         if not cls.bcfxml:
-            bcf_filepath = bpy.context.scene.BCFProperties.bcf_file
+            props = tool.Bcf.get_bcf_props()
+            bcf_filepath = props.bcf_file
             if not os.path.isabs(bcf_filepath):
                 bcf_filepath = os.path.abspath(os.path.join(bpy.path.abspath("//"), bcf_filepath))
             if bcf_filepath:
@@ -46,7 +48,7 @@ class BcfStore:
     @classmethod
     def set(cls, bcfxml: Union[bcf.bcfxml.BcfXml, None], filepath: str) -> None:
         cls.bcfxml = bcfxml
-        props = bpy.context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         props.bcf_file = filepath
 
         # Set bcf_version prop on load.

src/bonsai/bonsai/bim/module/bcf/operator.py

@@ -43,7 +43,6 @@ import bonsai.tool as tool
 import bonsai.bim.module.bcf.prop as bcf_prop
 import bonsai.bim.module.bcf.bcfstore as bcfstore
 from pathlib import Path
-from bonsai.bim.ifc import IfcStore
 from math import radians, degrees, atan, tan, cos, sin
 from mathutils import Vector, Matrix, Euler, geometry
 from xsdata.models.datatype import XmlDateTime
@@ -55,7 +54,7 @@ class NewBcfProject(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         bcf_v2 = props.bcf_version == "2"
         bcf_class = bcf.v2.bcfxml.BcfXml if bcf_v2 else bcf.v3.bcfxml.BcfXml
         bcfxml = bcf_class.create_new("New Project")
@@ -103,7 +102,8 @@ class LoadBcfProject(bpy.types.Operator):
         assert bcfxml.project
         if bcfxml.project.name is None:
             bcfxml.project.name = nameless
-        context.scene.BCFProperties.name = bcfxml.project.name
+        props = tool.Bcf.get_bcf_props()
+        props.name = bcfxml.project.name
         bpy.ops.bim.load_bcf_topics()
         self.report({"INFO"}, f"BCF Project '{Path(self.filepath).name}' is loaded.")
         return {"FINISHED"}
@@ -131,7 +131,7 @@ class LoadBcfTopics(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         props.topics.clear()
         # workaround, one non standard topic would break reading entire bcf
         # ignored these topics ATM
@@ -163,7 +163,8 @@ class LoadBcfTopic(bpy.types.Operator):
         assert bcfxml
         topic = bcfxml.topics[self.topic_guid]
         bcfxml.get_header(self.topic_guid)
-        new = context.scene.BCFProperties.topics[self.topic_index]
+        props = tool.Bcf.get_bcf_props()
+        new = props.topics[self.topic_index]
         data_map = {
             "name": topic.guid,
             "title": topic.topic.title,
@@ -244,7 +245,8 @@ class LoadBcfComments(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        blender_topic = context.scene.BCFProperties.topics.get(self.topic_guid)
+        props = tool.Bcf.get_bcf_props()
+        blender_topic = props.topics.get(self.topic_guid)
         blender_topic.comments.clear()
         for comment in bcfxml.topics[self.topic_guid].comments:
             new = blender_topic.comments.add()
@@ -274,7 +276,9 @@ class EditBcfProjectName(bpy.types.Operator):
 
         # Bonsai creates default project on load.
         assert bcfxml.project
-        bcfxml.project.name = context.scene.BCFProperties.name
+
+        props = tool.Bcf.get_bcf_props()
+        bcfxml.project.name = props.name
         return {"FINISHED"}
 
 
@@ -284,7 +288,7 @@ class EditBcfTopicName(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
@@ -300,7 +304,7 @@ class EditBcfTopic(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
@@ -371,13 +375,15 @@ class AddBcfTopic(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.BCFProperties.author
+        props = tool.Bcf.get_bcf_props()
+        return props.author
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        bcfxml.add_topic("New Topic", "", context.scene.BCFProperties.author)
+        props = tool.Bcf.get_bcf_props()
+        bcfxml.add_topic("New Topic", "", props.author)
         bpy.ops.bim.load_bcf_topics()
         return {"FINISHED"}
 
@@ -389,7 +395,7 @@ class AddBcfBimSnippet(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         props_are_filled = all(
             (getattr(props, attr) for attr in ("bim_snippet_reference", "bim_snippet_schema", "bim_snippet_type"))
         )
@@ -403,7 +409,7 @@ class AddBcfBimSnippet(bpy.types.Operator):
         assert bcfxml
         bcf_v2 = (bcfxml.version.version_id or "").startswith("2")
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         is_external = "://" in props.bim_snippet_reference
@@ -435,7 +441,7 @@ class AddBcfRelatedTopic(bpy.types.Operator):
         assert bcfxml
         bcf_v2 = (bcfxml.version.version_id or "").startswith("2")
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         related_topics = tool.Bcf.get_topic_related_topics(topic)
@@ -462,14 +468,15 @@ class AddBcfHeaderFile(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.BCFProperties.file_reference
+        props = tool.Bcf.get_bcf_props()
+        return props.file_reference
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
         bcf_v2 = (bcfxml.version.version_id or "").startswith("2")
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
 
@@ -519,9 +526,10 @@ class ViewBcfTopic(bpy.types.Operator):
     topic_guid: bpy.props.StringProperty()
 
     def execute(self, context):
-        for index, topic in enumerate(context.scene.BCFProperties.topics):
+        props = tool.Bcf.get_bcf_props()
+        for index, topic in enumerate(props.topics):
             if topic.name.lower() == self.topic_guid.lower():
-                context.scene.BCFProperties.active_topic_index = index
+                props.active_topic_index = index
                 break
         return {"FINISHED"}
 
@@ -546,7 +554,7 @@ class AddBcfViewpoint(bpy.types.Operator):
         blender_camera = context.scene.camera
         assert blender_camera
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
 
@@ -616,7 +624,7 @@ class AddBcfViewpoint(bpy.types.Operator):
         old_file_format = blender_render.image_settings.file_format
         blender_render.image_settings.file_format = "PNG"
         old_filepath = blender_render.filepath
-        blender_render.filepath = os.path.join(context.scene.BIMProperties.data_dir, "snapshot.png")
+        blender_render.filepath = tool.Blender.get_data_dir_path("snapshot.png").__str__()
         bpy.ops.render.opengl(write_still=True)
         with open(blender_render.filepath, "rb") as f:
             snapshot = f.read()
@@ -675,7 +683,7 @@ class RemoveBcfViewpoint(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         if not bcfxml:
             return False
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         topic = props.active_topic
         if not topic:
             return False
@@ -690,7 +698,7 @@ class RemoveBcfViewpoint(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         del topic.viewpoints[blender_topic.viewpoints]
@@ -715,7 +723,7 @@ class RemoveBcfFile(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         header_files = tool.Bcf.get_topic_header_files(topic)
@@ -733,13 +741,14 @@ class RemoveBcfTopic(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.BCFProperties.topics
+        props = tool.Bcf.get_bcf_props()
+        return props.topics
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         del bcfxml.topics[props.active_topic.name]
         bpy.ops.bim.load_bcf_topics()
         return {"FINISHED"}
@@ -752,13 +761,14 @@ class AddBcfReferenceLink(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.BCFProperties.reference_link
+        props = tool.Bcf.get_bcf_props()
+        return bool(props.reference_link)
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         reference_links = tool.Bcf.get_topic_reference_links(topic)
@@ -776,14 +786,15 @@ class AddBcfDocumentReference(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.BCFProperties.document_reference
+        props = tool.Bcf.get_bcf_props()
+        return bool(props.document_reference)
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
         bcf_v2 = (bcfxml.version.version_id or "").startswith("2")
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
 
@@ -855,13 +866,14 @@ class AddBcfLabel(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        return context.scene.BCFProperties.label
+        props = tool.Bcf.get_bcf_props()
+        return bool(props.label)
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         new = blender_topic.labels.add()
@@ -883,7 +895,7 @@ class EditBcfReferenceLinks(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         reference_links = [r.name for r in blender_topic.reference_links]
@@ -900,7 +912,7 @@ class EditBcfLabels(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         labels = [l.name for l in blender_topic.labels]
@@ -918,7 +930,7 @@ class RemoveBcfReferenceLink(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         reference_links = tool.Bcf.get_topic_reference_links(topic)
@@ -938,7 +950,7 @@ class RemoveBcfLabel(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         labels = tool.Bcf.get_topic_labels(topic)
@@ -957,7 +969,7 @@ class RemoveBcfBimSnippet(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         tool.Bcf.set_topic_bim_snippet(topic, None)
@@ -978,7 +990,7 @@ class RemoveBcfDocumentReference(bpy.types.Operator):
         assert bcfxml
         bcf_v2 = (bcfxml.version.version_id or "").startswith("2")
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
 
@@ -1043,7 +1055,7 @@ class RemoveBcfRelatedTopic(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         related_topics = tool.Bcf.get_topic_related_topics(topic)
@@ -1063,7 +1075,7 @@ class RemoveBcfComment(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         comments = topic.comments
@@ -1084,7 +1096,7 @@ class EditBcfComment(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         blender_comment = blender_topic.comments.get(self.comment_guid)
         topic = bcfxml.topics[blender_topic.name]
@@ -1092,7 +1104,7 @@ class EditBcfComment(bpy.types.Operator):
             if comment.guid == self.comment_guid:
                 comment.comment = blender_comment.comment
                 comment.modified_date = XmlDateTime.now()
-                comment.modified_author = context.scene.BCFProperties.author
+                comment.modified_author = props.author
         bpy.ops.bim.load_bcf_comments(topic_guid=topic.guid)
         return {"FINISHED"}
 
@@ -1105,7 +1117,7 @@ class AddBcfComment(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         if not props.comment:
             cls.poll_message_set("No comment to add.")
             return False
@@ -1128,7 +1140,7 @@ class AddBcfComment(bpy.types.Operator):
         assert bcfxml
         bcf_v2 = (bcfxml.version.version_id or "").startswith("2")
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         comments = topic.comments
@@ -1136,7 +1148,7 @@ class AddBcfComment(bpy.types.Operator):
         if bcf_v2:
             comment = bcf.v2.model.Comment(
                 date=XmlDateTime.now(),
-                author=context.scene.BCFProperties.author,
+                author=props.author,
                 comment=props.comment,
                 guid=str(uuid.uuid4()),
             )
@@ -1149,7 +1161,7 @@ class AddBcfComment(bpy.types.Operator):
         else:
             comment = bcf.v3.model.Comment(
                 date=XmlDateTime.now(),
-                author=context.scene.BCFProperties.author,
+                author=props.author,
                 comment=props.comment,
                 guid=str(uuid.uuid4()),
             )
@@ -1179,7 +1191,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         if blender_topic is None:
             cls.poll_message_set("No topic is active.")
@@ -1193,11 +1205,11 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         return True
 
     def execute(self, context):
-        self.file = IfcStore.get_file()
+        self.file = tool.Ifc.get()
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         if self.viewpoint_guid:
@@ -1303,7 +1315,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                 [0, 0, 0, 1],
             )
         )
-        props = context.scene.BIMGeoreferenceProperties
+        props = tool.Georeference.get_georeference_props()
         if props.has_blender_offset:
             unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
             matrix = ifcopenshell.util.geolocation.global2local(
@@ -1342,7 +1354,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
 
         objs: list[bpy.types.Object] = []
         for global_id in exception_global_ids:
-            obj = IfcStore.get_element(global_id)
+            obj = tool.Ifc.get_object_by_identifier(global_id)
             if obj and context.view_layer.objects.get(obj.name):
                 assert isinstance(obj, bpy.types.Object)
                 objs.append(obj)
@@ -1401,7 +1413,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
             return
         bpy.ops.object.select_all(action="DESELECT")
         for global_id in selected_global_ids:
-            obj = IfcStore.get_element(global_id)
+            obj = tool.Ifc.get_object_by_identifier(global_id)
             if obj:
                 obj.select_set(True)
                 obj.hide_set(False)
@@ -1414,7 +1426,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
             for acomponent in acoloring.component:
                 global_id_colours.setdefault(acomponent.ifc_guid, acoloring.color)
         for global_id, color in global_id_colours.items():
-            obj = IfcStore.get_element(global_id)
+            obj = tool.Ifc.get_object_by_identifier(global_id)
             if obj:
                 obj.color = self.hex_to_rgb(color)
 
@@ -1517,7 +1529,8 @@ class OpenBcfReferenceLink(bpy.types.Operator):
     index: bpy.props.IntProperty()
 
     def execute(self, context):
-        webbrowser.open(context.scene.BCFProperties.topic_links[self.index].name)
+        props = tool.Bcf.get_bcf_props()
+        webbrowser.open(props.topic_links[self.index].name)
         return {"FINISHED"}
 
 
@@ -1530,7 +1543,8 @@ class SelectBcfHeaderFile(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            context.scene.BCFProperties.file_reference = self.filepath
+            props = tool.Bcf.get_bcf_props()
+            props.file_reference = self.filepath
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -1546,7 +1560,8 @@ class SelectBcfBimSnippetReference(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            context.scene.BCFProperties.bim_snippet_reference = self.filepath
+            props = tool.Bcf.get_bcf_props()
+            props.bim_snippet_reference = self.filepath
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -1562,7 +1577,8 @@ class SelectBcfDocumentReference(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            context.scene.BCFProperties.document_reference = self.filepath
+            props = tool.Bcf.get_bcf_props()
+            props.document_reference = self.filepath
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -1585,7 +1601,8 @@ class LoadBcfHeaderIfcFile(bpy.types.Operator):
         assert bcfxml
 
         bcf_path = tool.Bcf.get_path()
-        topic = bcfxml.topics[context.scene.BCFProperties.active_topic.name]
+        props = tool.Bcf.get_bcf_props()
+        topic = bcfxml.topics[props.active_topic.name]
         entity = tool.Bcf.get_topic_header_files(topic)[self.index]
         ifc_path = bcf.agnostic.topic.extract_file(topic, entity)
         bpy.ops.bim.load_project(filepath=ifc_path)
@@ -1605,7 +1622,8 @@ class ExtractBcfFile(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
 
-        topic = bcfxml.topics[context.scene.BCFProperties.active_topic.name]
+        props = tool.Bcf.get_bcf_props()
+        topic = bcfxml.topics[props.active_topic.name]
 
         if self.entity_type == "HEADER_FILE":
             entity = tool.Bcf.get_topic_header_files(topic)[self.index]

src/bonsai/bonsai/bim/module/bcf/prop.py

@@ -17,6 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
+import bonsai.tool as tool
 from . import bcfstore
 from bonsai.bim.prop import StrProperty
 from bpy.types import PropertyGroup
@@ -34,6 +35,7 @@ from functools import partial
 from typing import Literal
 from typing_extensions import assert_never
 from bcf.agnostic.extensions import get_extensions_attributes
+from typing import TYPE_CHECKING, Union
 
 
 bcfviewpoints_enum = None
@@ -95,7 +97,7 @@ def getBcfViewpoints(self, context, force_update=False):
     global bcfviewpoints_enum
     if bcfviewpoints_enum is None or force_update:  # Retrieving Viewpoints is slow. Make sure we only do when needed
         bcfviewpoints_enum = []
-        props = context.scene.BCFProperties
+        props = tool.Bcf.get_bcf_props()
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         assert bcfxml
         topic = props.active_topic
@@ -110,6 +112,12 @@ class BcfBimSnippet(PropertyGroup):
     type: StringProperty(name="Type")
     is_external: BoolProperty(name="Is External")
 
+    if TYPE_CHECKING:
+        schema: str
+        reference: str
+        type: str
+        is_external: bool
+
 
 class BcfDocumentReference(PropertyGroup):
     reference: StringProperty(name="Reference")
@@ -117,6 +125,12 @@ class BcfDocumentReference(PropertyGroup):
     guid: StringProperty(name="GUID")
     is_external: BoolProperty(name="Is External")
 
+    if TYPE_CHECKING:
+        reference: str
+        description: str
+        guid: str
+        is_external: bool
+
 
 class BcfComment(PropertyGroup):
     name: StringProperty(name="GUID")
@@ -128,6 +142,16 @@ class BcfComment(PropertyGroup):
     modified_author: StringProperty(name="Modified Author")
     is_editable: BoolProperty(name="Is Editable", default=False, update=updateBcfCommentIsEditable)
 
+    if TYPE_CHECKING:
+        name: str
+        date: str
+        author: str
+        comment: str
+        viewpoint: str
+        modified_date: str
+        modified_author: str
+        is_editable: bool
+
 
 def get_extensions_items(
     self: "BCFProperties", context: bpy.types.Context, edit_text: str, extensions_attr: str
@@ -183,6 +207,30 @@ class BcfTopic(PropertyGroup):
     comments: CollectionProperty(name="Comments", type=BcfComment)
     is_editable: BoolProperty(name="Edit Topic Attributes", default=False, update=updateBcfTopicIsEditable)
 
+    if TYPE_CHECKING:
+        name: str
+        title: str
+        type: str
+        status: str
+        priority: str
+        stage: str
+        creation_date: str
+        creation_author: str
+        modified_date: str
+        modified_author: str
+        assigned_to: str
+        due_date: str
+        description: str
+        viewpoints: str
+        files: bpy.types.bpy_prop_collection_idprop[StrProperty]
+        reference_links: bpy.types.bpy_prop_collection_idprop[BcfReferenceLink]
+        labels: bpy.types.bpy_prop_collection_idprop[BcfLabel]
+        bim_snippet: BcfBimSnippet
+        document_references: bpy.types.bpy_prop_collection_idprop[BcfDocumentReference]
+        related_topics: bpy.types.bpy_prop_collection_idprop[StrProperty]
+        comments: bpy.types.bpy_prop_collection_idprop[BcfComment]
+        is_editable: bool
+
 
 def get_related_topics(self: "BCFProperties", context: bpy.types.Context) -> list[tuple[str, str, str]]:
     global RELATED_TOPICS_ENUM_ITEMS
@@ -235,7 +283,30 @@ class BCFProperties(PropertyGroup):
     comment: StringProperty(default="", name="Comment")
     has_related_viewpoint: BoolProperty(name="Has Related Viewpoint", default=False)
 
-    def clear_input_fields(self):
+    if TYPE_CHECKING:
+        bcf_file: str
+        bcf_version: str
+        comment_text_width: int
+        name: str
+        author: str
+        topics: bpy.types.bpy_prop_collection_idprop[BcfTopic]
+        active_topic_index: int
+        file_reference: str
+        file_ifc_project: str
+        file_ifc_spatial_structure_element: str
+        reference_link: str
+        label: str
+        bim_snippet_reference: str
+        bim_snippet_type: str
+        bim_snippet_schema: str
+        document_reference: str
+        document_reference_description: str
+        document_description: str
+        related_topic: str
+        comment: str
+        has_related_viewpoint: bool
+
+    def clear_input_fields(self) -> None:
         self.file_reference = ""
         self.file_ifc_project = ""
         self.file_ifc_spatial_structure_element = ""
@@ -250,7 +321,7 @@ class BCFProperties(PropertyGroup):
         self.has_related_viewpoint = False
 
     @property
-    def active_topic(self):
+    def active_topic(self) -> Union[BcfTopic, None]:
         if len(self.topics) == 0:
             return None
         if self.active_topic_index < 0:
@@ -259,5 +330,5 @@ class BCFProperties(PropertyGroup):
             self.active_topic_index = len(self.topics) - 1
         return self.topics[self.active_topic_index]
 
-    def refresh_topic(self, context):
+    def refresh_topic(self, context: bpy.types.Context) -> None:
         refreshBcfTopic(self, context)