Remove triangulation on switch_representation

Now all walls, beams etc should become be displayed with quads.

.github/workflows/cd.yml

@@ -16,7 +16,7 @@ jobs:
     - run: echo ok go
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: activate
     steps:
     - uses: actions/checkout@v2
@@ -80,7 +80,7 @@ jobs:
         path: build/assets/Ifc*
 
   deliver:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: build
     name: Docker Build, Tag, Push
 

.github/workflows/ci-bcf-pypi.yml

@@ -1,57 +0,0 @@
-name: ci-bcf-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  push:
-    paths:
-      - '.github/workflows/ci-bcf-pypi.yml'
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2 # https://github.com/actions/checkout
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-      - run: echo ${{ env.DATE }}
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%y%m%d')"
-      - name: Compile
-        run: |
-          pip install build
-          cd src/bcf &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/bcf/dist

.github/workflows/ci-bcf.yml

@@ -0,0 +1,37 @@
+name: ci-bcf
+
+on:
+  push:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell' &&
+      contains(github.event.head_commit.message, '[bcf release]')
+    steps:
+      - run: echo ok go
+  upload:
+    needs: activate
+    name: Upload BCF package to Pypi
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+      - name: Build package
+        run: |
+          cd src/bcf
+          pip install build
+          python -m build
+      - name: Test
+        run: |
+          cd src/bcf
+          make test
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_TOKEN }}
+          packages_dir: src/bcf/dist

.github/workflows/ci-blenderbim-matrix.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311]
+        pyver: [py39, py310]
         config:
           - {
             name: "Windows Build",
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
+          python-version: '3.10'
       - run: echo ${{ env.DATE }}
       - name: Get current date
         id: date

.github/workflows/ci-bsdd-pypi.yaml

@@ -1,48 +0,0 @@
-name: ci-bsdd-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/bsdd &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/bsdd/dist

.github/workflows/ci-ifcclash-pypi.yaml

@@ -1,48 +0,0 @@
-name: ci-ifcclash-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcclash &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcclash/dist

.github/workflows/ci-ifccsv-pypi.yaml

@@ -1,48 +0,0 @@
-name: ci-ifccsv-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifccsv &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifccsv/dist

.github/workflows/ci-ifcopenshell-conda-daily.yml

@@ -1,7 +1,10 @@
 name: ci-ifcopenshell-conda-daily
 
 on:
-  workflow_dispatch:
+  push:
+      paths:
+        - .github/workflows/ci-ifcopenshell-conda-daily.yml
+        - conda/**
   schedule:
   #         ┌───────────── minute (0 - 59)
   #         │  ┌───────────── hour (0 - 23)
@@ -12,8 +15,17 @@ on:
   - cron: "49 23 * * *" # 11min before utc midnight every day
 
 jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell'
+    steps:
+      - name: Set env
+        run: echo ok go
+
   test:
-    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}-${{ matrix.variant }}
+    name: ${{ matrix.platform.distver }}-${{ matrix.pyver.name }}
+    needs: activate
     runs-on: ${{ matrix.platform.distver }}
     defaults:
       run:
@@ -22,23 +34,18 @@ jobs:
       fail-fast: false
       matrix:
         pyver: [
-          { name: py311, distver: '3.11'},
-          { name: py312, distver: '3.12'}
+          { name: py310, distver: '3.10'},
+          { name: py311, distver: '3.11'}
         ]
         platform: [
           { name: Windows, distver: windows-2022, upload: 'true' },
           { name: Linux, distver: ubuntu-22.04,  upload: 'true' },
           { name: macOS, distver: macos-12, upload: 'true' }
         ]
-        variant: [
-          'novtk',
-#          'all'
-        ]
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-
       - name: Download MacOSX SDK
         if: ${{ matrix.platform.name == 'macOS' }}
         run: |
@@ -46,22 +53,21 @@ jobs:
           tar xf MacOSX10.13.sdk.tar.xz && \
           sudo mv -v MacOSX10.13.sdk /opt/ && \
           ls /opt/
-
-      - uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - uses: mamba-org/provision-with-micromamba@main # https://github.com/mamba-org/provision-with-micromamba
         with:
-          environment-name: build-env
-          cache-environment: true
-          condarc: |
-            channels:
-              - conda-forge
-            channel_priority: strict
-          create-args: >-
-            python=3.11
-            anaconda-client
-            boa
-
+          channels: conda-forge
+          channel-priority: strict
+          environment-file: conda/environment.yml
+          extra-specs: |
+            python=${{ matrix.pyver.distver }}
       - name: build, test and upload ifcopenshell
         if: ${{ matrix.platform.upload == 'true' }}
         run: |
-          conda mambabuild . --python ${{ matrix.pyver.distver }} -c conda-forge --variants "{variant: ${{ matrix.variant }}}" --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge --token ${{ secrets.ANACONDA_TOKEN }} --user ifcopenshell
+        working-directory: ./conda
+      - name: build & test ifcopenshell
+        if: ${{ matrix.platform.upload == 'false' }}
+        run: |
+          conda-build . --python ${{ matrix.pyver.distver }} -c conda-forge
         working-directory: ./conda

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

@@ -1,7 +1,6 @@
 name: ci-ifcopenshell-pypi
 
 on:
-  workflow_dispatch:
   schedule:
     #         ┌───────────── minute (0 - 59)
     #         │  ┌───────────── hour (0 - 23)
@@ -36,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py36, py37, py38, py39, py310, py311]
         config:
           - {
             name: "Windows Build",
@@ -58,7 +57,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
       - run: echo ${{ env.DATE }}
       - name: Get current date

.github/workflows/ci-ifcpatch-pypi.yaml

@@ -1,48 +0,0 @@
-name: ci-ifcpatch-pypi
-
-on:
-  schedule:
-    #         ┌───────────── minute (0 - 59)
-    #         │  ┌───────────── hour (0 - 23)
-    #         │  │ ┌───────────── day of the month (1 - 31)
-    #         │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-    #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-    #         *  * * * *
-    - cron: "0 0 18 * *"
-  workflow_dispatch:
-
-env:
-  major: 0
-  minor: 0
-  name: ifcopenshell
-
-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
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
-      - name: Compile
-        run: |
-          pip install build
-          cd src/ifcpatch &&
-          make dist
-      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: src/ifcpatch/dist

.github/workflows/ci-ifcsverchok-build.yml

@@ -1,53 +0,0 @@
-name: Publish-ifcsverchok
-
-on:
-  push:
-    paths:
-      - '.github/workflows/ci-ifcsverchok-build.yml'
-      - 'src/ifcsverchok/*'
-    branches:
-      - v0.7.0
-
-env:
-  major: 0
-  minor: 0
-  name: ifcsverchok
-
-jobs:
-  activate:
-    runs-on: ubuntu-latest
-    if: |
-      github.repository == 'IfcOpenShell/IfcOpenShell'
-    steps:
-    - name: Set env
-      run: echo ok go
-
-  build:
-    needs: activate
-    name: ifcsverchok
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
-        with:
-          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
-          python-version: '3.11'
-      - run: echo ${{ env.DATE }}
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%y%m%d')"
-      - name: Compile
-        run: |
-          cd src/ifcsverchok
-          make dist
-      - name: Upload Zip file to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: src/ifcsverchok/dist/ifcsverchok-${{steps.date.outputs.date}}.zip
-          asset_name: ifcsverchok-${{steps.date.outputs.date}}.zip
-          tag: "ifcsverchok-${{steps.date.outputs.date}}"
-          overwrite: true
-          body: "ifcsverchok build for ${{steps.date.outputs.date}}"

.github/workflows/ci-ifctester-pypi.yml

@@ -9,6 +9,9 @@ on:
     #         │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
     #         *  * * * *
     - cron: "0 0 18 * *"
+  push:
+    paths:
+      - '.github/workflows/ci-ifctester-pypi.yml'
   workflow_dispatch:
 
 env:
@@ -27,6 +30,7 @@ jobs:
 
   build:
     needs: activate
+    name: ${{ matrix.config.name }}-${{ matrix.pyver }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -34,7 +38,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
-          python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.10' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+      - run: echo ${{ env.DATE }}
+      - name: Get current date
+        id: date
+        run: echo "::set-output name=date::$(date +'%y%m%d')"
       - name: Compile
         run: |
           pip install build

.github/workflows/ci-py-only.yml

@@ -0,0 +1,98 @@
+name: ci_py_only
+
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'test/**'
+      - 'conda/**'
+      - 'cmake/**'
+      - '.github/workflows/ci-py-only.yml'
+  pull_request:
+
+jobs:
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell' &&
+      !contains(github.event.head_commit.message, 'skip ci')
+    steps:
+      - run: echo ok go
+
+  build:
+    runs-on: ubuntu-20.04
+    needs: activate
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: recursive
+      - name: Install C++ dependencies
+        run: |
+          sudo apt update
+          sudo apt-get install --no-install-recommends \
+          git cmake gcc g++ \
+          libboost-date-time-dev \
+          libboost-filesystem-dev \
+          libboost-iostreams-dev \
+          libboost-program-options-dev \
+          libboost-regex-dev \
+          libboost-system-dev \
+          libboost-thread-dev \
+          python3-all-dev python3-pip \
+          swig libpcre3-dev libxml2-dev \
+          libtbb-dev nlohmann-json3-dev \
+          libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
+          libhdf5-dev libcgal-dev
+          
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${GITHUB_WORKFLOW}
+
+      - name: Build ifcopenshell
+        run: |
+          sudo /usr/sbin/update-ccache-symlinks
+          mkdir build && cd build
+          PATH="/usr/lib/ccache:$PATH" cmake \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_PREFIX_PATH=/usr \
+               -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+               -DOCC_INCLUDE_DIR=/usr/include/opencascade \
+               -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
+               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
+               -DCOLLADA_SUPPORT=Off \
+               "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
+               -DBUILD_CONVERT=Off \
+               -DGLTF_SUPPORT=On \
+               -DJSON_INCLUDE_DIR=/usr/include \
+               -DCGAL_INCLUDE_DIR=/usr/include \
+               -DGMP_INCLUDE_DIR=/usr/include \
+               -DMPFR_INCLUDE_DIR=/usr/include \
+               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
+               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
+             ../cmake
+          sudo make -j $(nproc)
+          sudo make install
+
+      - name: Install Python dependencies
+        run: |
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf --no-deps
+          sudo /usr/bin/python -m pip install pytest
+          sudo /usr/bin/python -m pip install isodate
+          sudo /usr/bin/python -m pip install lark
+          sudo /usr/bin/python -m pip install networkx
+          sudo /usr/bin/python -m pip install tabulate
+          sudo /usr/bin/python -m pip install python-dateutil
+
+      - name: Test
+        run: |
+          cd test
+          sudo /usr/bin/python tests.py
+          cd ../src/ifcopenshell-python
+          mv ifcopenshell ifcopenshell-local # Force testing on installed module
+          make test

.github/workflows/ci.yml

@@ -31,25 +31,12 @@ jobs:
       - run: echo ok go
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: activate
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
             submodules: recursive
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil
-          pip install src/bcf --no-deps
-          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
-
       - name: Install C++ dependencies
         run: |
           sudo apt update
@@ -62,6 +49,7 @@ jobs:
           libboost-regex-dev \
           libboost-system-dev \
           libboost-thread-dev \
+          python3-all-dev python3-pip \
           swig libpcre3-dev libxml2-dev \
           libtbb-dev nlohmann-json3-dev \
           libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
@@ -74,9 +62,6 @@ jobs:
 
       - name: Build ifcopenshell
         run: |
-          echo $Python3_ROOT_DIR
-          echo ${{ env.pythonLocation }}
-          
           mkdir build && cd build
           cmake \
                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -86,9 +71,9 @@ jobs:
                -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
                -DOCC_INCLUDE_DIR=/usr/include/opencascade \
                -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
-               -DPYTHON_EXECUTABLE:FILEPATH=${{ env.pythonLocation }}/bin/python \
-               -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
-               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
+               -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
+               -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python3.8 \
+               -DPYTHON_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
                -DCOLLADA_SUPPORT=Off \
                "-DSCHEMA_VERSIONS=2x3;4;4x3_add1" \
                -DGLTF_SUPPORT=On \
@@ -117,11 +102,23 @@ jobs:
           grep 0$ statuses
           grep 0$ statuses | wc -l
 
+      - name: Install Python dependencies
+        run: |
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema xsdata numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf --no-deps
+          sudo /usr/bin/python -m pip install pytest
+          sudo /usr/bin/python -m pip install isodate
+          sudo /usr/bin/python -m pip install lark
+          sudo /usr/bin/python -m pip install networkx
+          sudo /usr/bin/python -m pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
+          sudo /usr/bin/python -m pip install tabulate
+          sudo /usr/bin/python -m pip install python-dateutil
 
-      - name: Test ifcopenshell-python
+      - name: Test
         run: |
           cd test
-          python tests.py
+          sudo /usr/bin/python tests.py
           cd ../src/ifcopenshell-python
           mv ifcopenshell ifcopenshell-local # Force testing on installed module
-          make test-safe
+          make test

.gitignore

@@ -7,26 +7,34 @@
 
 # output directories
 /cmake/out/
+/docs/out/
 /src/examples/out/
 /src/ifcmax/out/
 /src/ifcwrap/out/
 /src/qtviewer/out/
 
-/win/BuildDepsCache*.txt
 
+/win/BuildDepsCache*.txt
+# IfcExpressParser residue
+/src/ifcexpressparser/express_parser.py
 # General Python residue
 __pycache__
 *.py.bak
-
 # Visual Studio Code files
 .vscode
 .vs
-
 # PyCharm files
 .idea
 
+#Virtual Env Files
+Pipfile
+Pipfile.lock
+
 # Docs
-/docs/cpp-api/output
+/docs/output
+/docs/rst_files
+/docs/doxygen
+/src/ifcblenderexport/docs/_build
 
 # gettext binary translation files
 *.mo
@@ -76,14 +84,8 @@ src/ifcopenshell-python/test/build
 # blenderbim libs
 src/blenderbim/blenderbim/libs
 
-# blenderbim i18n
-src/blenderbim/blenderbim/translations.py
-
 # blenderbim test temp files
 src/blenderbim/test/files/temp
-src/blenderbim/test/files/basic.ifc.cache.blend
-src/blenderbim/test/files/basic.ifc.cache.sqlite
-
 src/blenderbim/drawings
 src/blenderbim/layouts
 
@@ -94,10 +96,5 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 # apple
 .DS_Store
 
-# clangd config
-.clangd
-# clangd cache
-.cache
-
 # Brickschema
-src/blenderbim/blenderbim/bim/schema/Brick.ttl
+src/blenderbim/blenderbim/bim/schema/Brick.ttl

.gitmodules

@@ -10,7 +10,4 @@
 	url = https://github.com/IfcOpenShell/svgfill
 [submodule "src/ifcopenshell-python/test/Sample-BIM-Files"]
 	path = src/ifcopenshell-python/test/Sample-BIM-Files
-	url = https://github.com/IfcOpenShell/ids-test-files
-[submodule "docs/cpp-api/assets/doxygen-awesome-css"]
-	path = docs/cpp-api/assets/doxygen-awesome-css
-	url = https://github.com/jothepro/doxygen-awesome-css.git
+	url = https://github.com/IfcOpenShell/ids-test-files

README.md

@@ -7,33 +7,33 @@ IfcOpenShell
 </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
+parsing support is provided for [IFC2x3 TC1], [IFC4 Add2 TC1], IFC4x1, IFC4x2, and IFC4x3. Extensive geometric support
 is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1]. Extending with support for arbitrary IFC schemas
 is possible at compile-time when using C++ and at run-time when using Python.
 
-In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application
-to convert IFC models to other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform),
-and many other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
+In addition to a C++ and Python API, IfcOpenShell comes with an ecosystem of tools, notably including IfcConvert (an application to convert IFC models to
+other formats), the BlenderBIM Add-on (an add-on to Blender providing a graphical IFC authoring platform), and many
+other libraries, CLI apps, and more. Support is also provided for auxiliary standards such as BCF and IDS.
 
 For more information, see:
 
 * [IfcOpenShell Website](http://ifcopenshell.org)
-* [IfcOpenShell Documentation](https://docs.ifcopenshell.org)
-  * [IfcOpenShell C++ Installation](https://docs.ifcopenshell.org/ifcopenshell/installation.html)
-  * [IfcOpenShell Python Installation](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
-  * [IfcOpenShell Python Hello World Tutorial](https://docs.ifcopenshell.org/ifcopenshell-python/hello_world.html)
+* [IfcOpenShell Documentation](http://blenderbim.org/docs-python)
+  * [IfcOpenShell C++ Installation](https://blenderbim.org/docs-python/ifcopenshell/installation.html)
+  * [IfcOpenShell Python Installation](https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
+  * [IfcOpenShell Python Hello World Tutorial](https://blenderbim.org/docs-python/ifcopenshell-python/hello_world.html)
 * [BlenderBIM Add-on Website](https://blenderbim.org)
-* [BlenderBIM Add-on Documentation](https://docs.blenderbim.org/index.html)
-  * [Add-on Installation](https://docs.blenderbim.org/users/installation.html)
-  * [Exploring an IFC model](https://docs.blenderbim.org/users/exploring_an_ifc_model.html)
+* [BlenderBIM Add-on Documentation](http://blenderbim.org/docs)
+  * [Add-on Installation](https://blenderbim.org/docs/users/installation.html)
+  * [Exploring an IFC model](https://blenderbim.org/docs/users/exploring_an_ifc_model.html)
 
 | Service                                         | Status                                                                                                                                       |
 | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
 | Anaconda Daily Build                            | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell)](https://anaconda.org/ifcopenshell/ifcopenshell)        |
 | Anaconda v0.7.0 Stable                          | [![Anaconda-Server Badge](https://img.shields.io/conda/vn/conda-forge/ifcopenshell)](https://anaconda.org/conda-forge/ifcopenshell)          |
 | PyPi Daily Build                                | [![PyPi Badge](https://img.shields.io/pypi/v/ifcopenshell)](https://pypi.org/project/ifcopenshell/)                                          |
-| ArchLinux AUR Package Stable                    | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell)](https://aur.archlinux.org/packages/ifcopenshell)                             |
-| ArchLinux AUR Package git                       | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell-git)](https://aur.archlinux.org/packages/ifcopenshell-git)                     |
+| ArchLinux AUR Package Stable                           | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell)](https://aur.archlinux.org/packages/ifcopenshell)                     |
+| ArchLinux AUR Package git                           | [![AUR Badge](https://img.shields.io/aur/version/ifcopenshell-git)](https://aur.archlinux.org/packages/ifcopenshell-git)                     |
 | BlenderBIM Add-on Chocolatey (under moderation) | [![Chocolatey Badge](https://img.shields.io/chocolatey/v/blenderbim-nightly)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
 | Sponsor development on OpenCollective           | [![Financial Contributors](https://opencollective.com/opensourcebim/tiers/badge.svg)](https://opencollective.com/opensourcebim/)             |
 | Docker hub                                      | [![Docker Pulls](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell)](https://hub.docker.com/r/aecgeeks/ifcopenshell)                 |
@@ -44,7 +44,7 @@ Contents
 Those marked with an asterisk are part of IfcOpenShell.
 
 | Name                      | Description                                                           | License             |
-| ------------------------- | --------------------------------------------------------------------- | ------------------- |
+| ------------------------- | ----------------------------------------------------------------------| ------------------- |
 | bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   |
 | blenderbim                | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    |
 | bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   |
@@ -55,6 +55,7 @@ Those marked with an asterisk are part of IfcOpenShell.
 | ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
 | ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   |
 | ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   |
+| ifccobie                  | Extract IFC data for COBie handover requirements                      | LGPL-3.0-or-later   |
 | ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* |
 | ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   |
 | ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   |
@@ -77,7 +78,6 @@ Those marked with an asterisk are part of IfcOpenShell.
 [IFC]: https://technical.buildingsmart.org/standards/ifc/ "IFC"
 [IFC2x3 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC2x3/TC1/HTML/ "IFC2x3 TC1"
 [IFC4 Add2 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/ "IFC4 Add2 TC1"
-[IFC4x3 Add2]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4_3/ "IFC4x3 Add2"
 [Visual Studio]: https://www.visualstudio.com/ "Visual Studio"
 [Visual C++ Build Tools]: http://landinghub.visualstudio.com/visual-cpp-build-tools "Visual C++ Build Tools"
 [MSYS2]: https://msys2.github.io/ "MSYS2"

aws/lambda/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get -y update && apt-get -y install unzip curl
 # Install AWS Lambda runtime interface client
 RUN pip install --target ${FUNCTION_DIR} awslambdaric
 
-# Set the IfcOpenShell build version (check available builds at: https://docs.ifcopenshell.org/ifcopenshell-python/installation.html)
+# Set the IfcOpenShell build version (check available builds at: https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
 ARG IFC_OPENSHELL_BUILD="39-v0.7.0-476ab50"
 
 # Download and extract IfcOpenShell

choco/blenderbim/blenderbim.nuspec

@@ -15,7 +15,7 @@
     <licenseUrl>https://github.com/IfcOpenShell/IfcOpenShell/blob/v0.7.0/COPYING</licenseUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <projectSourceUrl>https://github.com/IfcOpenShell/IfcOpenShell</projectSourceUrl>
-    <docsUrl>https://docs.blenderbim.org/</docsUrl>
+    <docsUrl>https://blenderbim.org/docs/</docsUrl>
     <!--<mailingListUrl></mailingListUrl>-->
     <bugTrackerUrl>https://github.com/IfcOpenShell/IfcOpenShell/issues</bugTrackerUrl>
     <tags>blender bim blenderbim ifc python opensource foss</tags>

choco/blenderbim/check_repo_infos.py

@@ -29,7 +29,7 @@ URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
 URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
 RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
 RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
-RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"(?:set|SET)\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
+RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"SET\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
 
 
 if sys.argv[1] == "--do_choco_release?":

cmake/cmake_uninstall.cmake.in

@@ -1,43 +0,0 @@
-################################################################################
-#                                                                              #
-# This file is part of IfcOpenShell.                                           #
-#                                                                              #
-# IfcOpenShell is free software: you can redistribute it and/or modify         #
-# it under the terms of the Lesser GNU General Public License as published by  #
-# the Free Software Foundation, either version 3.0 of the License, or          #
-# (at your option) any later version.                                          #
-#                                                                              #
-# IfcOpenShell is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 #
-# Lesser GNU General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the Lesser GNU General Public License     #
-# along with this program. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                              #
-################################################################################
-
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-    message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif()
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-
-foreach(file ${files})
-    message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-
-    if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-        exec_program(
-            "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-            OUTPUT_VARIABLE rm_out
-            RETURN_VALUE rm_retval
-        )
-
-        if(NOT "${rm_retval}" STREQUAL 0)
-            message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-        endif()
-    else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-        message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-    endif()
-endforeach()

conda/Makefile

@@ -0,0 +1,8 @@
+compile:
+	conda activate conda-build && conda-build -c conda-forge . --keep-old-work --python 3.10.5
+
+debug:
+	conda activate conda-build && conda-debug -c conda-forge . --python 3.10.4
+
+env:
+	conda env update --f environment.yml --prune

conda/bld.bat

@@ -4,7 +4,6 @@ set MY_PY_VER=%PY_VER:.=%
 set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib"
 
 cmake -G "Ninja" ^
- -D SCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" ^
  -D CMAKE_BUILD_TYPE:STRING=Release ^
  -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
  -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^

conda/build.sh

@@ -13,7 +13,6 @@ if [ `uname` == Darwin ]; then
 fi
 
 cmake -G Ninja \
- -DSCHEMA_VERSIONS="2x3;4;4x1;4x3;4x3_add1" \
  -DCMAKE_BUILD_TYPE=Release \
  -DCMAKE_INSTALL_PREFIX=$PREFIX \
   ${CMAKE_PLATFORM_FLAGS[@]} \

conda/conda_build_config.yaml

@@ -1,6 +1,2 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.13.sdk       # [osx]
-
-variant:
-  - novtk
-  - all
+  - /opt/MacOSX10.13.sdk       # [osx]

conda/environment.yml

@@ -0,0 +1,13 @@
+name: conda-build
+channels:
+  - conda-forge
+dependencies:
+  - conda-build
+  - conda-verify
+  - anaconda-client
+  - ninja
+  - doxygen
+  - ripgrep
+  - pip
+  - pip:
+      - lief==0.13

conda/meta.yaml

@@ -1,10 +1,6 @@
 {% set name = "ifcopenshell" %}
 {% set version = "0.7.0" %}
-{% set build = 1 %}
 
-# Higher number -> Always prioritize "novtk" variant over "all" variant
-{% set build = build + 200 %}   # [variant == "novtk"]
-{% set build = build + 100 %}   # [variant == "all"]
 
 package:
   name: {{ name }}
@@ -14,9 +10,8 @@ source:
   path: ..
 
 build:
-  string: py{{ CONDA_PY }}_{{ variant }}_h{{ PKG_HASH }}_{{ build }}
   binary_relocation: false [osx]
-  number: {{ build }}
+  number: 1
 
 requirements:
   build:
@@ -24,12 +19,12 @@ requirements:
     - {{ compiler('cxx') }}
     - ninja >=1.10.2
     - cmake
-    - swig 4.1.1
+    - swig >=4.0.2
 
   host:
     - python
     - boost-cpp
-    - occt 7.7.2 *{{ variant }}*
+    - occt ==7.7.0
     - libxml2
     - cgal-cpp
     - hdf5
@@ -41,11 +36,11 @@ requirements:
 
   run:
     - python
-    - occt 7.7.2 *{{ variant }}*
-    - {{ pin_compatible('cgal-cpp', max_pin='x.x.x') }}
-    - {{ pin_compatible('boost-cpp', max_pin='x.x.x') }}
-    - {{ pin_compatible('hdf5', max_pin='x.x.x') }}
+    - boost-cpp
+    - occt ==7.7.0
     - libxml2
+    - cgal-cpp
+    - hdf5
     - mpfr
     - gmp  # [unix]
     - mpir  # [win]
@@ -57,12 +52,12 @@ test:
     - ifcopenshell
 
 about:
-  home: https://ifcopenshell.org
+  home: http://ifcopenshell.org
   license: LGPL-3.0-or-later
   license_file: COPYING
   summary: 'IfcOpenShell is a library to support the IFC file format'
   description: |
     IfcOpenShell is an open source (LGPL) software library for 
     working with the Industry Foundation Classes (IFC) file format.
-  doc_url: https://ifcopenshell.org/
+  doc_url: http://ifcopenshell.org/
   dev_url: https://github.com/IfcOpenShell/IfcOpenShell

docs/cmake/FindSphinx.cmake

@@ -0,0 +1,11 @@
+#Look for an executable called sphinx-build
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")
+
+include(FindPackageHandleStandardArgs)
+
+#Handle standard arguments to find_package like REQUIRED and QUIET
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)

docs/cmake/SphinxConfig.cmake

@@ -0,0 +1,11 @@
+#Look for an executable called sphinx-build
+find_program(SPHINX_EXECUTABLE
+             NAMES sphinx-build
+             DOC "Path to sphinx-build executable")
+
+include(FindPackageHandleStandardArgs)
+
+#Handle standard arguments to find_package like REQUIRED and QUIET
+find_package_handle_standard_args(Sphinx
+                                  "Failed to find sphinx-build executable"
+                                  SPHINX_EXECUTABLE)

docs/cpp-api/README.md

@@ -1,33 +0,0 @@
-# IfcOpenShell C++ API documentation
-
-This folder contains the setup to build the IfcOpenShell C++ API documentation from the source code.
-
-## Generating the documentation
-
-> Prerequisites:
-> 
-> Make sure to have [Doxygen](https://www.doxygen.nl) and [Graphviz](https://graphviz.org) installed into your `$PATH` variable.
-> 
-> The documentation also use the [doxygen-awesome](https://jothepro.github.io/doxygen-awesome-css) theme as a git submodule.
-
-Build with the command (from within the `/docs/cpp-api` folder):
-
-```shell
-$ doxygen
-```
-
-To include the current git commit hash into the build documentation, use the following command:
-
-```shell
-$ PROJECT_NUMBER=$(git rev-parse --short HEAD) doxygen
-```
-
-This will extract the current commit hash in short version and sets the propper ENV variable used by doxygen.
-
-The generation of the documentation might take a while depending on your systems hardware, as it is configured to generate the Class graphs using .
-
-The resulting documentation is located unter `/cpp-api/output/html` and can be directly accessed with your browser:
-
-```shell
-$ open ./output/html/index.html
-```

docs/geom/settings.md

@@ -0,0 +1,240 @@
+APPLY_DEFAULT_MATERIALS
+-----------------------
+
+Given the command invocation:
+
+    Duplex_A_20110907_optimized.ifc d.dae -yv --include attribute GlobalId 3bXiCStxP6Fgxdej$yc50U
+
+You will find log messages along the lines of
+
+    [Warning] {3bXiCStxP6Fgxdej$yc50U} No material and surface styles for:
+    #333=IfcCovering('3bXiCStxP6Fgxdej$yc50U',#1,'Compound Ceiling:Gypsum Board:187483',$,'Compound Ceiling:Gypsum Board',#17840,#17052,'187483',.CEILING.)
+
+This means that there is no IfcStyledItem associated to the representation items and that the element does not have an IfcMaterial association with IfcMaterialRepresentation from which we can derive a style (colour) for the element.
+
+The interactive session below shows how with this setting enabled you will get a default generated material from the IFC element entity type and material indices of 0 pointing to that. With this setting disabled the material index would be -1 to indicate a missing style. Note that there is one material index for every triangle in the list of `shp.geometry.faces`.
+
+    >>> import ifcopenshell, ifcopenshell.geom
+    >>> f = ifcopenshell.open("Duplex_A_20110907_optimized.ifc")
+    >>> s = ifcopenshell.geom.settings()
+    >>> c = f["3bXiCStxP6Fgxdej$yc50U"]
+    >>>
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.material_ids
+    (-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1)
+    >>> [(m.name, m.diffuse) for m in shp.geometry.materials]
+    []
+    >>>
+    >>> s.set(s.APPLY_DEFAULT_MATERIALS, True)
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.material_ids
+    (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    >>> [(m.name, m.diffuse) for m in shp.geometry.materials]
+    [('IfcCovering', (0.7, 0.7, 0.7))]
+
+This is enabled by default for the IfcConvert serializers as they will not gracefully handle -1 material indices and allows users to quickly assign colours based on entity types in their modelling applications.
+
+APPLY_LAYERSETS
+---------------
+
+This setting is available in IfcConvert as `--enable-layerset-slicing`.
+
+For IfcWall and IfcSlab elements, takes the associated IfcMaterialLayerSet and builds a set of surfaces to segment the building element geometry.
+
+Note that enabling this settings is computationally intensive as it involves 3D Boolean operations.
+
+    Duplex_A_20110907_optimized.ifc d1.dae -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d1.dae](images/settings-1.png)
+    
+    Duplex_A_20110907_optimized.ifc d2.dae --enable-layerset-slicing -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d2.dae](images/settings-2.png)
+
+BUILDING_LOCAL_PLACEMENT
+------------------------
+
+This setting is available in IfcConvert using `--building-local-placement`.
+
+In the typical IfcSite > IfcBuilding > IfcBuildingStorey > ... hierarchy of elements, don't incorporate the ObjectPlacement of the IfcBuilding and above in the placement of elements in the output. This is useful when there is a large offset in this placement that reduces precision in further processing.
+
+CONVERT_BACK_UNITS
+------------------
+
+This setting is available in IfcConvert using `--convert-back-units`.
+
+Internally IfcOpenShell uses meters as the global length unit to do calculations. This setting restores the coordinate positions after conversion by multiplying the factor of the IfcUnit with UnitType=LENGTHUNIT into the output geometry coordinate values.
+
+DISABLE_OPENING_SUBTRACTIONS
+----------------------------
+
+This setting is available in IfcConvert using `--disable-opening-subtraction`.
+
+As in most viewer applications, IfcOpeningElement geometry is subtracted from their host elements. This setting disables this behavior.
+
+    Duplex_A_20110907_optimized.ifc d1.dae -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d1.dae](images/settings-1.png)
+    
+    Duplex_A_20110907_optimized.ifc d3.dae --disable-opening-subtraction -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d3.dae](images/settings-3.png)
+
+Note that disabling this settings will reduce processing time and improve robustness as it involves 3D Boolean operations.
+
+DISABLE_TRIANGULATION
+---------------------
+
+To be used in conjunction with `USE_BREP_DATA`. Do not apply the triangulation and - when `USE_BREP_DATA` is set - return a OpenCASCADE serialized TopoDS_Shape from `create_shape()` and `iterator`.
+
+    >>> import ifcopenshell, ifcopenshell.geom
+    >>> s = ifcopenshell.geom.settings()
+    >>> s.set(s.DISABLE_TRIANGULATION, True)
+    >>> s.set(s.USE_BREP_DATA, True)
+    >>> f = ifcopenshell.open("Duplex_A_20110907_optimized.ifc")
+    >>> c = f["3bXiCStxP6Fgxdej$yc50U"]
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> print(shp.geometry.brep_data)
+
+    CASCADE Topology V1, (c) Matra-Datavision
+    Locations 0
+    Curve2ds 0
+    Curves 12
+    1 4.6750000000000034 -8.0749999999999904 2.657 -2.0455514041918775e-15 -1 0
+    1 4.6750000000000034 -8.0749999999999904 2.657 1 -3.435893306383461e-15 0
+    1 6.2260000000000044 -8.0749999999999957 2.657 -2.0455514041918724e-15 -1 0
+    1 6.226 -10.246000000000031 2.657 -1 6.8717866127669219e-15 0
+    ...
+
+EDGE_ARROWS
+-----------
+
+When `INCLUDE_CURVES` is true and geometric elements include curves (such as the wall axis), add arrow heads to the edges to indicate direction of the curve.
+
+    Duplex_A_20110907_optimized.ifc d4.dae --model --plan --edge-arrows -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+    
+![Image of d4.dae](images/settings-4.png)
+
+EXCLUDE_SOLIDS_AND_SURFACES
+---------------------------
+
+Exclude faces, shells and solids from geometrical output. Implied when using `--plan` without `--model` in IfcConvert.
+
+FASTER_BOOLEANS
+---------------
+
+NOTE: Only applicable when using OCCT 6.9 and earlier.
+
+This setting is available in IfcConvert using `--merge-boolean-operands`.
+
+Fuse the collection of all boolean operands into a single union before applying the boolean subtraction, as opposed to doing individual subtractions. This likely improves performance. From OCCT 7.0 onwards the boolean operations with multiple arguments is used.
+
+GENERATE_UVS
+------------
+
+This setting is available in IfcConvert using `--generate-uvs`.
+
+Applies a box projection on the generated geometry for the element to obtain UV coordinates. This is purely generated, it does not involve texture coordinates stored in the IFC model.
+
+    Duplex_A_20110907_optimized.ifc d5.dae --generate-uvs -yv --include attribute GlobalId 2O2Fr$t4X7Zf8NOew3FNr2
+
+![Image of d5.dae with a UV grid applied in Blender](images/settings-5.png)
+
+INCLUDE_CURVES
+--------------
+
+This setting is available in IfcConvert using `--plan`.
+
+Include edge and wire geometries in the geometric output.
+
+LAYERSET_FIRST
+--------------
+
+This setting is available in IfcConvert using `--layerset-first`.
+
+When not using APPLY_LAYERSETS, take the first material layer from the set to use as the material for the overall element.
+
+NO_NORMALS
+----------
+
+This setting is available in IfcConvert using `--no-normals`.
+
+Do not emit normals on geometric output
+
+SEARCH_FLOOR
+------------
+
+Note: Only applicable to Collada .DAE output when used from IfcConvert.
+
+This setting is available in IfcConvert using `--use-element-hierarchy`.
+
+Include the spatial hierarchy in the elements.
+
+SEW_SHELLS
+----------
+
+This setting is available in IfcConvert using `--orient-shells`.
+
+Re-orient or sew connected face sets to have a consistent outwards orientation.
+
+SITE_LOCAL_PLACEMENT
+--------------------
+
+This setting is available in IfcConvert using `--site-local-placement`.
+
+See `BUILDING_LOCAL_PLACEMENT`, but exclude also the ObjectPlacement of the IfcSite.
+
+USE_BREP_DATA
+-------------
+
+See `DISABLE_TRIANGULATION`.
+
+USE_PYTHON_OPENCASCADE
+----------------------
+
+Note: Only available when an import of `OCC.Core.BRepTools` or `OCC.BRepTools` succeeds.
+
+This implies `USE_WORLD_COORDS` `USE_BREP_DATA` and `DISABLE_TRIANGULATION`. The serialized TopoDS_Shape of `USE_BREP_DATA` is deserialized by Python OpenCASCADE.
+
+USE_WORLD_COORDS
+----------------
+
+Apply the ObjectPlacement of the building elements to the geometric output. This is implied when using the Wavefront .OBJ output in IfcConvert. Note that this also eliminates the possibility for geometric elements to point to the same interpreted geometry result.
+
+VALIDATE_QUANTITIES
+-------------------
+
+This setting is available in IfcConvert using `--validate`.
+
+Running IfcConvert with `--validate` will set a non-zero exit code when ever a log message with severity equal or greater than ERROR has been emitted.
+
+Currently for internal use only. For every building element geometry converted, looks for an associated quantity set where the OwnerHistory's organization name is IfcOpenShell. And looks for the quantities "Total Surface Area", "Volume", "Shape Validation Properties.Surface Genus" and validates these according to the interpreted geometry definition. Emit Logger::Error when calculated values are outside of the tolerance range for the value stored in the model.
+
+WELD_VERTICES
+-------------
+
+Note: In Python, this setting is *on* by default.
+
+Note: This setting only affects triangulated output.
+
+This setting is available in IfcConvert using `--weld-vertices`.
+
+Discards normals and joins vertices solely based on position. This is useful when output is to be modified in a modeling application.
+
+    >>> import ifcopenshell, ifcopenshell.geom
+    >>> s = ifcopenshell.geom.settings()
+    >>> s.set(s.WELD_VERTICES, False)
+    >>> f = ifcopenshell.open("Duplex_A_20110907_optimized.ifc")
+    >>> c = f["3bXiCStxP6Fgxdej$yc50U"]
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.verts
+    (4.675000000000003, -8.07499999999999, 2.657, 4.674999999999999, -10.24600000000002, 2.657, 6.226000000000004, -8.074999999999996, 2.657, 6.226, -10.24600000000003, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 4.674999999999999, -10.24600000000002, 2.6, 6.226000000000004, -8.074999999999996, 2.6, 6.226, -10.24600000000003, 2.6, 4.674999999999999, -10.24600000000002, 2.657, 4.674999999999999, -10.24600000000002, 2.6, 4.675000000000003, -8.07499999999999, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 6.226, -10.24600000000003, 2.657, 4.674999999999999, -10.24600000000002, 2.657, 6.226, -10.24600000000003, 2.6, 4.674999999999999, -10.24600000000002, 2.6, 6.226000000000004, -8.074999999999996, 2.657, 6.226, -10.24600000000003, 2.657, 6.226000000000004, -8.074999999999996, 2.6, 6.226, -10.24600000000003, 2.6, 4.675000000000003, -8.07499999999999, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 6.226000000000004, -8.074999999999996, 2.657, 6.226000000000004, -8.074999999999996, 2.6)
+    >>> shp.geometry.normals
+    (3.059754518198021e-17, 0.0, -1.0, 3.059754518198021e-17, 0.0, -1.0, 3.059754518198021e-17, 0.0, -1.0, 3.059754518198021e-17, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, 2.110175529791737e-16, 0.0, -1.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, 6.8717866127669046e-15, 1.0, 0.0, 6.8717866127669046e-15, 1.0, 0.0, 6.8717866127669046e-15, 1.0, 0.0, 6.8717866127669046e-15, 1.0, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, -1.0, 1.79434333701042e-15, 0.0, 3.4358933063834523e-15, 1.0, 0.0, 3.4358933063834523e-15, 1.0, 0.0, 3.4358933063834523e-15, 1.0, 0.0, 3.4358933063834523e-15, 1.0, 0.0)
+    >>>
+    >>> s.set(s.WELD_VERTICES, True)
+    >>> shp = ifcopenshell.geom.create_shape(s, c)
+    >>> shp.geometry.verts
+    (4.675000000000003, -8.07499999999999, 2.657, 4.674999999999999, -10.24600000000002, 2.657, 6.226000000000004, -8.074999999999996, 2.657, 6.226, -10.24600000000003, 2.657, 4.675000000000003, -8.07499999999999, 2.6, 4.674999999999999, -10.24600000000002, 2.6, 6.226000000000004, -8.074999999999996, 2.6, 6.226, -10.24600000000003, 2.6)
+    >>> shp.geometry.normals
+    ()

nix/build-all.py

@@ -76,7 +76,7 @@ PROJECT_NAME = "IfcOpenShell"
 USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
 ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
-PYTHON_VERSIONS = ["3.9.11", "3.10.3", "3.11.8", "3.12.1"]
+PYTHON_VERSIONS = ["3.6.14", "3.7.13", "3.8.13", "3.9.11", "3.10.3", "3.11.0"]
 JSON_VERSION = "v3.6.1"
 OCE_VERSION = "0.18.3"
 OCCT_VERSION = "7.5.3"
@@ -254,11 +254,6 @@ if not os.path.exists(LOG_FILE):
     open(LOG_FILE, "w").close()
 logger.info(f"using command log file '{LOG_FILE}'")
 
-# Causing havoc in python 3.11 build
-try:
-    del os.environ['__PYVENV_LAUNCHER__']
-except: pass
-
 def run(cmds, cwd=None, can_fail=False):
 
     """
@@ -289,9 +284,8 @@ if platform.system() == "Darwin":
         # Apparently not supported
         PYTHON_VERSIONS = [pv for pv in PYTHON_VERSIONS if tuple(map(int, pv.split("."))) >= (3, 7)]
     if run(["sw_vers", "-productVersion"]) < "10.16":
-        # This is now solved with the '__PYVENV_LAUNCHER__' hack
-        # PYTHON_VERSIONS = [pv for pv in PYTHON_VERSIONS if tuple(map(int, pv.split("."))) < (3, 11)]
-        pass
+        # Apparently not supported
+        PYTHON_VERSIONS = [pv for pv in PYTHON_VERSIONS if tuple(map(int, pv.split("."))) < (3, 11)]
 
 BOOST_VERSION_UNDERSCORE = BOOST_VERSION.replace(".", "_")
 
@@ -898,9 +892,8 @@ if "IfcOpenShell-Python" in targets:
             module_dir = os.path.dirname(run([python_executable, "-c", "import inspect, ifcopenshell; print(inspect.getfile(ifcopenshell))"]))
 
             if platform.system() != "Darwin":
-                if BUILD_CFG == "Release":
-                    # TODO: This symbol name depends on the Python version?
-                    run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)
+                # TODO: This symbol name depends on the Python version?
+                run([strip, "-s", "-K", "PyInit__ifcopenshell_wrapper", "_ifcopenshell_wrapper.so"], cwd=module_dir)
 
             return module_dir
 

src/bcf/Makefile

@@ -1,9 +1,3 @@
-VERSION:=`date '+%y%m%d'`
-SED:=sed -i
-ifeq ($(UNAME_S),Darwin)
-SED:=sed -i '' -e
-endif
-
 .PHONY: ci
 ci:
 	tox
@@ -18,13 +12,6 @@ models:
 	cd src && xsdata generate -p bcf.v2.model --unnest-classes --kw-only --slots -ds Google bcf/v2/xsd
 	cd src && xsdata generate -p bcf.v3.model --unnest-classes --kw-only --slots -ds Google bcf/v3/xsd
 
-.PHONY: dist
-dist:
-	rm -rf dist
-	$(SED) "s/999999/$(VERSION)/" pyproject.toml
-	python -m build
-	$(SED) "s/$(VERSION)/999999/" pyproject.toml
-
 # .PHONY
 # api:
-#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0
+#     openapi-python-client generate --url https://api.swaggerhub.com/apis/buildingSMART/BCF/3.0

src/bcf/README.md

@@ -1,5 +1,84 @@
 # bcf
 
-A simple Python implementation of the BCF standard. Manipulation of BCF-XML is
-available via `bcfxml.py` and manipulation of BCF-API is available via
-`bcfapi.py`.
+A simple Python implementation of BCF.
+Manipulation of BCF-XML is available via `bcfxml.py` and manipulation of BCF-API
+is available via `bcfapi.py`.
+
+It tries to support BCF-XML version 2.1 and 3.0, and BCF-API 3.0.
+
+## bcfxml
+
+The `bcfxml.load` function lets you read a BCF-XML file.
+It takes care of using the right version based on the "bcf.version" file contained in the BCF package.
+
+The BCF files are extracted and parsed on-demand, and edits are stored in memory until you call the `save` method.
+
+```python
+from bcf.bcfxml import load
+
+# Load a project
+with load("/path/to/file.bcf") as bcfxml:
+    project = bcfxml.project
+    print(project.name)
+
+    # To edit a project, just modify the object directly
+    bcfxml.project.name = "New name"
+
+    # Get a dictionary of topics
+    topics = bcfxml.topics
+
+    for topic_guid, topic_handler in bcfxml.topics.items():
+        topic = topic_handler.topic
+        print("Topic guid is", topic.guid)
+        print("Topic title is", topic.title)
+
+        # Fetch extra data about a topic
+        header = topic_handler.header
+        comments = topic_handler.comments
+        viewpoints = topic_handler.viewpoints
+
+        for comment in comments:
+            print(comment.guid)
+            print(comment.comment)
+            print(comment.author)
+
+    # Get a particular topic
+    topic = bcfxml.get_topic(guid)
+
+    # Modify a topic
+    topic.title = "New title"
+
+    bcfxml.save()
+```
+
+## bcfapi
+
+The `bcfapi` module lets you interact with the BCF-API standard.
+
+```python
+from bcf.v3.bcfapi import FoundationClient, BcfClient
+
+foundation_client = FoundationClient("YOUR_CLIENT_ID", "YOUR_CLIENT_SECRET", "OPENCDE_BASEURL")
+auth_methods = foundation_client.get_auth_methods()
+
+# Our library currently only implements the authorization_code flow
+if "authorization_code" in auth_methods:
+    foundation_client.login()
+
+bcf_client = BcfClient(foundation_client)
+
+versions = foundation_client.get_versions()
+for version in versions:
+if "3.0" in versions:
+    if version["api_id"] == "bcf" and version["version_id"] == "3.0":
+        bcf_client.set_version(version)
+
+data = bcf_client.get_projects()
+print(data)
+project_id = data[0]["project_id"]
+print(project_id)
+data = bcf_client.get_project(project_id)
+print(data)
+data = bcf_client.get_extensions(project_id)
+print(data)
+```

src/bcf/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "numpy",
     "ifcopenshell",
 ]
-version = "0.0.999999"
+version = "0.0.1"
 classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: OS Independent",
@@ -76,7 +76,7 @@ deps =
     black
     isort
     pylint
-commands =
+commands = 
     black {posargs:.}
     isort {posargs:.}
     pylint {posargs:.} --output-format=colorized
@@ -138,4 +138,4 @@ max-attributes = 10
 
 [tool.pylint.format]
 expected-line-ending-format = "LF"
-max-line-length = 120
+max-line-length = 120

src/blenderbim/Makefile

@@ -38,86 +38,113 @@ endif
 VERSION:=`date '+%y%m%d'`
 LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
 PYVERSION:=py310
-PYPI_IMP:=cp
 
 ifeq ($(PYVERSION), py39)
 PYLIBDIR:=python3.9
 PYNUMBER:=39
-PYPI_VERSION:=3.9
 endif
 ifeq ($(PYVERSION), py310)
 PYLIBDIR:=python3.10
 PYNUMBER:=310
-PYPI_VERSION:=3.10
-endif
-ifeq ($(PYVERSION), py311)
-PYLIBDIR:=python3.11
-PYNUMBER:=311
-PYPI_VERSION:=3.11
 endif
 
 ifeq ($(PLATFORM), linux)
-PYPI_PLATFORM:=--platform manylinux_2_17_x86_64
-LXML_ARCH:=manylinux_2_28_x86_64
-SHAPELY_ARCH:=manylinux_2_17_x86_64.manylinux2014_x86_64
-PILLOW_ARCH:=manylinux_2_28_x86_64
+ifeq ($(PYVERSION), py39)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/linux-64/hpp-fcl-2.3.4-py39h40a70d0_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/linux-64/eigenpy-3.1.0-py39hdfdd6bb_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py39h7c9e3ff_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/2d/f2/8ec281d357e8bb7d08dc8d727f0e4c8ef3dae7d3fa75c69c8e452bb82d50/shapely-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/01/61/3ff85fb4bb596ce3d223c8fcf93c8df5c12bc8899dfb4fb3cb1c5b20dd5f/Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl
+endif
+ifeq ($(PYVERSION), py310)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/linux-64/hpp-fcl-2.3.4-py310h995690b_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/linux-64/eigenpy-3.1.0-py310hf02b7e0_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py310hc4a4660_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/25/1e/19b46d8e8881fe0df2e20945d51919eeb1817836d62a90efa8506530e45c/lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/a8/a5/403728b5614b28083f6424dfdefec5fcf58068495fb03bb08532671c642f/shapely-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/f6/51/320986ebd6d46a0e95c2240468ced73153b691ce07617078bcdf30c609ec/Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl
+endif
+ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/linux-64/assimp-5.0.1-hedfc422_6.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/linux-64/octomap-1.9.8-h924138e_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/linux-64/boost-cpp-1.78.0-h6582d0a_3.conda
+ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2
 endif
 
 ifeq ($(PLATFORM), macos)
-PYPI_PLATFORM:=--platform macosx_10_9_x86_64
-SHAPELY_ARCH:=macosx_10_9_x86_64
-PILLOW_ARCH:=macosx_10_10_x86_64
 ifeq ($(PYVERSION), py39)
-LXML_ARCH:=macosx_11_0_x86_64
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-64/hpp-fcl-2.3.4-py39hd85b194_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-64/eigenpy-3.1.0-py39hc4d6e28_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py39h953a6b8_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/36/a4/7e542a209f862f967d7cb8e939eff155f4294a27d17e16441fb8bdd51a2c/shapely-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/88/7a/ddfe28b485b623361457d4783007c1f9ba83a87f93e7fec32f64793efb6c/Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-LXML_ARCH:=macosx_11_0_x86_64
-endif
-ifeq ($(PYVERSION), py311)
-LXML_ARCH:=macosx_11_0_universal2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-64/hpp-fcl-2.3.4-py310h1db6f5f_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-64/eigenpy-3.1.0-py310h43da829_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py310h3e792ce_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/a1/44/17b7dac7a18807d30e2fe10c3328c152808f5464565e230bfd0e77f178c6/lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/1f/2a/dc3353c2431cf53e8d04bb8fba27e584410ca3435c9c85f76d71bf0c0e80/shapely-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/d8/60/b13c00d403f34110e96c1b5c0afa73ce461efe3fe960c3a7e3e7fe190d82/Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl
 endif
+ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-64/assimp-5.0.1-h1224e73_6.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-64/octomap-1.9.8-hb8565cd_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-64/boost-cpp-1.78.0-hf5ba120_3.conda
+ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-64/zlib-1.2.11-h7795811_1010.tar.bz2
 endif
 
 ifeq ($(PLATFORM), macosm1)
-PYPI_PLATFORM:=--platform macosx_11_0_arm64
-LXML_ARCH:=macosx_11_0_universal2
-SHAPELY_ARCH:=macosx_11_0_arm64
-PILLOW_ARCH:=macosx_11_0_arm64
+ifeq ($(PYVERSION), py39)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-arm64/hpp-fcl-2.3.4-py39hc34188a_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-arm64/eigenpy-3.1.0-py39h13cfc01_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h99de9ae_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h9eb174b_0.tar.bz2
+SHAPELY_URL:=https://files.pythonhosted.org/packages/ea/aa/45fbd031edf3149cb767d8b9f9db45d5faf0324d743c6b8fb0298cc022d0/shapely-2.0.1-cp39-cp39-macosx_11_0_arm64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
+endif
+ifeq ($(PYVERSION), py310)
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-arm64/hpp-fcl-2.3.4-py310h46fc4cd_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-arm64/eigenpy-3.1.0-py310ha2643af_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h629746b_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
+LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
+SHAPELY_URL:=https://files.pythonhosted.org/packages/ec/41/d59208743e737184e1b403e95a937aebb022b8459e99efbcd5208fc8be46/shapely-2.0.1-cp310-cp310-macosx_11_0_arm64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/0c/5f/117b653cad585f3aedfe0de996c292e67d4b020ed77f652e5a6c8c24f908/Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl
+endif
+ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-arm64/assimp-5.0.1-h0f81e16_7.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-arm64/octomap-1.9.8-hffc8910_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-arm64/boost-cpp-1.78.0-h9ed8d21_3.conda
+ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-arm64/zlib-1.2.11-h90dfc92_1014.tar.bz2
 endif
 
 ifeq ($(PLATFORM), win)
-PYPI_PLATFORM:=--platform win_amd64
-LXML_ARCH:=win_amd64
-SHAPELY_ARCH:=win_amd64
-PILLOW_ARCH:=win_amd64
-endif
-
-LXML_NAME:=lxml
-LXML_VER:=4.9.4
-SHAPELY_NAME:=shapely
-SHAPELY_VER:=2.0.2
-PILLOW_NAME:=pillow
-PILLOW_PKG_NAME:=Pillow
-PILLOW_VER:=9.5.0
-SHAPELY_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/s/$(SHAPELY_NAME)/$(SHAPELY_NAME)-$(SHAPELY_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(SHAPELY_ARCH).whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/p/$(PILLOW_NAME)/$(PILLOW_PKG_NAME)-$(PILLOW_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(PILLOW_ARCH).whl
-
-ifeq ($(PLATFORM), macosm1)
 ifeq ($(PYVERSION), py39)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h0520ce3_1.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/win-64/hpp-fcl-2.3.4-py39h39b25cb_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/win-64/eigenpy-3.1.0-py39hb6c915b_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py39hea4d8d1_4.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/a7/ae/eab645c4075093584b7a65ab71cb8ff4563a015bd935c9b55dba14b2c1eb/shapely-2.0.1-cp39-cp39-win_amd64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/19/3f/b4d4bcf05dbcbe07f2e9613a8f4180c297395e73a91d8ad22c32c6624f8c/Pillow-9.2.0-cp39-cp39-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py310)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/win-64/hpp-fcl-2.3.4-py310heb59267_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/win-64/eigenpy-3.1.0-py310hd146abe_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py310h220cb41_4.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/f6/71/65c80a4caa1617a4c6e8fe1500cebb179db96232e2f623bfe6a1f4294e39/lxml-4.8.0-cp310-cp310-win_amd64.whl
+SHAPELY_URL:=https://files.pythonhosted.org/packages/81/8a/7ac076a86b2632f1872284c5e60ed5f2fc26094875a85b35d9fa17b52504/shapely-2.0.1-cp310-cp310-win_amd64.whl
+PILLOW_URL:=https://files.pythonhosted.org/packages/02/55/67a3c17b9e7d972ed8c246f104da99ca4f3ea42fba566697e479011b84b6/Pillow-9.2.0-cp310-cp310-win_amd64.whl
 endif
-ifeq ($(PYVERSION), py311)
-LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py311h246f609_1.tar.bz2
+ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/win-64/assimp-5.0.1-hc2aa0de_6.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/win-64/octomap-1.9.8-h91493d7_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/win-64/boost-cpp-1.78.0-h9f4b32c_3.conda
+ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/win-64/zlib-1.2.11-h62dcd97_1010.tar.bz2
 endif
-else
-LXML_URL:=https://files.pythonhosted.org/packages/cp$(PYNUMBER)/l/$(LXML_NAME)/$(LXML_NAME)-$(LXML_VER)-cp$(PYNUMBER)-cp$(PYNUMBER)-$(LXML_ARCH).whl
-endif
-$(info $$LXML_URL is [${LXML_URL}])
-$(info $$SHAPELY_URL is [${SHAPELY_URL}])
-$(info $$PILLOW_URL is [${PILLOW_URL}])
 
 .PHONY: bump
 bump:
@@ -137,7 +164,7 @@ endif
 	cp -r blenderbim/* dist/blenderbim/
 
 	# Provides IfcOpenShell Python functionality
-	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-f7c03db-$(PLATFORM)64.zip
+	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-fc50bdd-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcopenshell-python*
 	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/
 
@@ -167,10 +194,8 @@ endif
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
 	# Provides IFCTester functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifctester/ifctester dist/blenderbim/libs/site/packages/
-	# Provides IFCFM functionality
-	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcfm/ifcfm dist/blenderbim/libs/site/packages/
-	# Provides bSDD functionality
-	cp -r dist/working/IfcOpenShell-0.7.0/src/bsdd/* dist/blenderbim/libs/site/packages/
+	# Provides IFCCOBie functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
 	# Provides IFCDiff functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
 	# Provides IFCCSV functionality
@@ -351,23 +376,165 @@ endif
 	mkdir dist/working
 	cd dist/working && $(PYTHON) -m venv env
 	cd dist/working && mkdir site-packages
-	# Required by IfcCSV
-	cd dist/working && . env/bin/activate && $(PIP) install pandas $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --target=./site-packages
-	# Pandas ships with very heavy tests
-	cd dist/working/site-packages/pandas && rm -rf tests
-	cd dist/working && . env/bin/activate && $(PIP) install openpyxl --target=./site-packages
-	cd dist/working && . env/bin/activate && $(PIP) install odfpy --target=./site-packages
 	# Required by IFCCityJSON
 	cd dist/working && . env/bin/activate && $(PIP) install cjio --target=./site-packages
 	# Provides express rule validation for ifcopenshell.validate
 	cd dist/working && . env/bin/activate && $(PIP) install pytest --target=./site-packages
 	# Provides Brickschema functionality
-	cd dist/working && . env/bin/activate && $(PIP) install "brickschema[persistence]==0.7.6a2" --target=./site-packages
-	# Required for SVG to DXF conversion
-	cd dist/working && . env/bin/activate && $(PIP) install "ezdxf" --target=./site-packages
+	cd dist/working && . env/bin/activate && $(PIP) install brickschema[persistence] --target=./site-packages
 	cp -r dist/working/site-packages/* dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Required by IFCClash
+	mkdir dist/working
+	cd dist/working && wget $(HPPFCL_URL)
+	cd dist/working && unzip hpp-fcl*
+	cd dist/working && tar -I zstd -xvf pkg*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Lib/site-packages/hppfcl dist/blenderbim/libs/site/packages/
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(ASSIMP_URL)
+	cd dist/working && tar -xf assimp*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl except on Windows
+ifneq ($(PLATFORM), win)
+	mkdir dist/working
+	cd dist/working && wget $(QHULL_URL)
+	cd dist/working && tar -xf qhull*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+	rm -rf dist/working
+endif
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(EIGENPY_URL)
+	cd dist/working && unzip eigenpy*
+	cd dist/working && tar -I zstd -xvf pkg*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(OCTOMAP_URL)
+	cd dist/working && tar -xf octomap*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	# Uh, do nothing, apparently? No DLLs are shipped.
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(BOOST_URL)
+	cd dist/working && tar -xf boost*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(BOOSTCPP_URL)
+	cd dist/working && unzip boost-cpp*
+	cd dist/working && tar -I zstd -xvf pkg*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/libboost_serialization.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/libboost_serialization.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/libboost_serialization.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/boost_serialization.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(ZLIB_URL)
+	cd dist/working && tar -xf zlib*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
 	# Required by BIMTester
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/c8/4b/d0a8c23b6c8985e5544ea96d27105a273ea22051317f850c2cdbf2029fe4/behave-1.2.6.tar.gz
@@ -415,6 +582,56 @@ endif
 	cd dist/working/parse_type-0.5.2/ && cp -r parse_type ../../blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Required by IFCCOBie for XLSX support
+	# TODO: see if we can replace this with openpyxl which does both read/write
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/0c/bc/82d6783f83f65f56d8b77d052773c4a2f952fa86385f0cd54e1e006658d7/XlsxWriter-1.2.9.tar.gz
+	cd dist/working && tar -xzvf XlsxWriter*
+	cd dist/working/XlsxWriter-1.2.9/ && cp -r xlsxwriter ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by IFCCOBie for ODS support
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/97/73/8ade73f6749177003f7ce3304f524774adda96e6aaab30ea79fd8fda7934/odfpy-1.4.1.tar.gz
+	cd dist/working && tar -xzvf odfpy*
+	cd dist/working/odfpy-1.4.1/ && cp -r odf ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by odfpy
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/a4/5f/f8aa58ca0cf01cbcee728abc9d88bfeb74e95e6cb4334cfd5bed5673ea77/defusedxml-0.6.0.tar.gz
+	cd dist/working && tar -xzvf defusedxml*
+	cd dist/working/defusedxml-0.6.0/ && cp -r defusedxml ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by augin
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/76/b4/b7baffbda025efd5dc8fcd8d2e953e3aa939c236a484084fa8f4c3588ee9/boto3-1.17.17.tar.gz
+	cd dist/working && tar -xzvf boto3*
+	cd dist/working/boto3-1.17.17/ && cp -r boto3 ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by boto3
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/7f/2e/e02fdfd0f0377c4e44e61de27b05d5cfe93575770661ef9ded80ed90fa88/botocore-1.20.17.tar.gz
+	cd dist/working && tar -xzvf botocore*
+	cd dist/working/botocore-1.20.17/ && cp -r botocore ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by boto3
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/3c/56/3f325b1eef9791759784aa5046a8f6a1aff8f7c898a2e34506771d3b99d8/jmespath-0.10.0.tar.gz
+	cd dist/working && tar -xzvf jmespath*
+	cd dist/working/jmespath-0.10.0/ && cp -r jmespath ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by boto3
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/08/e1/3ee2096ebaeeb8c186d20ed16c8faf4a503913e5c9a0e14cd6b8ffc405a3/s3transfer-0.3.4.tar.gz
+	cd dist/working && tar -xzvf s3transfer*
+	cd dist/working/s3transfer-0.3.4/ && cp -r s3transfer ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides IFCJSON functionality
 	mkdir dist/working
 	cd dist/working && wget https://github.com/IFCJSON-Team/IFC2JSON_python/archive/master.zip
@@ -422,6 +639,13 @@ endif
 	cp -r dist/working/IFC2JSON_python-master/file_converters/ifcjson dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Provides OpenLCA functionality
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/85/33/f91b96e9e8608ff65a003b692e8a9cdd60f2178f60617e5b1d21334c009c/olca-ipc-0.0.10.tar.gz
+	cd dist/working && tar -xzvf olca-ipc*
+	cd dist/working/olca-ipc-0.0.10/ && cp -r olca ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Provides Brickschema functionality
 	mkdir dist/working
 	# For now lets bundle the latest nightly schema
@@ -432,7 +656,7 @@ endif
 	# Required by brickschema
 	# This is a bit of a dodgy one, it should be provided by setuptools which Blender doesn't ship.
 	mkdir dist/working
-	cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/raw/v0.7.0/src/blenderbim/scripts/pkg_resources.tar.gz
+	cd dist/working && wget https://blenderbim.org/builds/pkg_resources.tar.gz
 	cd dist/working && tar -xzvf pkg_resources*
 	cd dist/working/ && cp -r pkg_resources ../blenderbim/libs/site/packages/
 	rm -rf dist/working
@@ -447,17 +671,11 @@ endif
 	# Required for Desktop icon and file association
 	cp -r blenderbim/libs/desktop dist/blenderbim/libs/
 
-	# Generate translations module for BBIM build
-	git clone https://github.com/IfcOpenShell/blenderbim-translations.git dist/working
-	$(PYTHON) scripts/bbim_translations.py -i "dist/working" -o "dist/blenderbim"
-	rm -rf dist/working
-
 	# Remove dependencies also bundled with Blender
 	rm -rf dist/blenderbim/libs/site/packages/numpy
 	rm -rf dist/blenderbim/libs/site/packages/numpy.libs
 
 	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
-	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" blender_manifest.toml
 	cd dist/blenderbim/bim && $(SED) "s/8888888/$(LAST_COMMIT_HASH)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim

src/blenderbim/blenderbim/__init__.py

@@ -27,7 +27,7 @@ bl_info = {
     "blender": (3, 1, 0),
     "version": (0, 0, 999999),
     "location": "File Menu, Scene Properties Tab. See documentation for more.",
-    "doc_url": "https://docs.blenderbim.org/",
+    "doc_url": "https://blenderbim.org/docs",
     "tracker_url": "https://github.com/IfcOpenShell/IfcOpenShell/issues",
     "category": "System",
 }

src/blenderbim/blenderbim/bim/__init__.py

@@ -23,19 +23,13 @@ import bpy.utils.previews
 import blenderbim
 import importlib
 from . import handler, ui, prop, operator, helper
-from typing import Callable, Union
 
-try:
-    from blenderbim.translations import translations_dict
-except ImportError:
-    translations_dict = {}
 cwd = os.path.dirname(os.path.realpath(__file__))
 
 modules = {
     "project": None,
     "search": None,
     "bcf": None,
-    "bsdd": None,
     "root": None,
     "unit": None,
     "model": None,
@@ -49,9 +43,8 @@ modules = {
     "spatial": None,
     "void": None,
     "aggregate": None,
-    "nest": None,
     "geometry": None,
-    "fm": None,
+    "cobie": None,
     "resource": None,
     "cost": None,
     "sequence": None,
@@ -73,6 +66,7 @@ modules = {
     "document": None,
     "pset_template": None,
     "clash": None,
+    "lca": None,
     "csv": None,
     "tester": None,
     "bimtester": None,
@@ -83,7 +77,6 @@ modules = {
     "augin": None,
     "debug": None,
     "ifcgit": None,
-    "covering": None,
     # Uncomment this line to enable loading of the demo module. Happy hacking!
     # The name "demo" must correlate to a folder name in `bim/module/`.
     # "demo": None,
@@ -97,32 +90,28 @@ for name in modules.keys():
 classes = [
     operator.AddIfcFile,
     operator.BIM_OT_add_section_plane,
-    operator.BIM_OT_delete_object,
-    operator.BIM_OT_open_webbrowser,
     operator.BIM_OT_remove_section_plane,
-    operator.BIM_OT_select_object,
-    operator.BIM_OT_show_description,
-    operator.ClippingPlaneCutWithCappings,
-    operator.EditBlenderCollection,
-    operator.FileAssociate,
-    operator.FileUnassociate,
     operator.OpenUpstream,
     operator.OpenUri,
+    operator.SwitchTab,
+    operator.SetTab,
     operator.ReloadIfcFile,
     operator.RemoveIfcFile,
-    operator.RevertClippingPlaneCut,
     operator.SelectDataDir,
     operator.SelectIfcFile,
+    operator.ReloadSelectedIfcFile,
     operator.SelectSchemaDir,
+    operator.FileAssociate,
+    operator.FileUnassociate,
     operator.SelectURIAttribute,
-    operator.SetTab,
-    operator.SwitchTab,
+    operator.EditBlenderCollection,
+    operator.BIM_OT_open_webbrowser,
+    operator.BIM_OT_show_description,
     prop.StrProperty,
     operator.BIM_OT_enum_property_search,  # /!\ Register AFTER prop.StrProperty
     prop.ObjProperty,
     prop.Attribute,
     prop.BIMAreaProperties,
-    prop.BIMTabProperties,
     prop.BIMProperties,
     prop.IfcParameter,
     prop.PsetQto,
@@ -131,57 +120,40 @@ classes = [
     prop.BIMCollectionProperties,
     prop.BIMMaterialProperties,
     prop.BIMMeshProperties,
-    prop.BIMFacet,
-    prop.BIMFilterGroup,
-    ui.BIM_UL_clipping_plane,
     ui.BIM_UL_generic,
     ui.BIM_UL_topics,
     ui.BIM_ADDON_preferences,
+    # Project overview
+    ui.BIM_PT_project_info,
+    ui.BIM_PT_project_setup,
+    ui.BIM_PT_geometry,
+    ui.BIM_PT_tab_grouping_and_filtering,
     # Tabs panel
     ui.BIM_PT_tabs,
-    # Project overview
-    ui.BIM_PT_tab_project_info,
-    ui.BIM_PT_tab_project_setup,
-    ui.BIM_PT_tab_geometry,
-    ui.BIM_PT_tab_stakeholders,
-    ui.BIM_PT_tab_grouping_and_filtering,
     # Object information
     ui.BIM_PT_tab_object_metadata,
     ui.BIM_PT_tab_misc,
     # Geometry and materials
-    ui.BIM_PT_tab_placement,
     ui.BIM_PT_tab_representations,
     ui.BIM_PT_tab_geometric_relationships,
     ui.BIM_PT_tab_parametric_geometry,
-    ui.BIM_PT_tab_profiles,
     ui.BIM_PT_tab_materials,
     ui.BIM_PT_tab_styles,
     # Drawings and documents
-    ui.BIM_PT_tab_sheets,
-    ui.BIM_PT_tab_drawings,
-    ui.BIM_PT_tab_schedules,
-    ui.BIM_PT_tab_references,
     # Services and systems
     ui.BIM_PT_tab_services,
-    ui.BIM_PT_tab_zones,
+    ui.BIM_PT_tab_services_object,
     # Structural analysis
     ui.BIM_PT_tab_structural,
-    # Construction scheduling
-    ui.BIM_PT_tab_status,
-    ui.BIM_PT_tab_resources,
-    ui.BIM_PT_tab_cost,
-    ui.BIM_PT_tab_sequence,
     # Facility management
     ui.BIM_PT_tab_handover,
     ui.BIM_PT_tab_operations,
     # Quality and coordination
     ui.BIM_PT_tab_quality_control,
-    ui.BIM_PT_tab_clash_detection,
     ui.BIM_PT_tab_collaboration,
     ui.BIM_PT_tab_sandbox,
     # TODO: move this somewhere else and clean it up
     ui.BIM_PT_section_plane,
-    ui.BIM_PT_section_with_cappings,
 ]
 
 for mod in modules.values():
@@ -191,7 +163,6 @@ addon_keymaps = []
 icons = None
 is_registering = False
 last_commit_hash = "8888888"
-original_scene_panels_polls: dict[bpy.types.Panel, Union[Callable, None]] = dict()
 
 
 def on_register(scene):
@@ -216,7 +187,6 @@ def register():
     bpy.app.handlers.load_post.append(handler.loadIfcStore)
     bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
     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)
     bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
     bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
@@ -234,8 +204,8 @@ def register():
 
     wm = bpy.context.window_manager
     if wm.keyconfigs.addon:
-        km = wm.keyconfigs.addon.keymaps.new(name="Window", space_type="EMPTY")
-        kmi = km.keymap_items.new("bim.switch_tab", "TAB", "PRESS", ctrl=True)
+        km = wm.keyconfigs.addon.keymaps.new(name='Window', space_type='EMPTY')
+        kmi = km.keymap_items.new('bim.switch_tab', 'TAB', 'PRESS', ctrl=True)
         addon_keymaps.append((km, kmi))
 
     global icons
@@ -253,16 +223,12 @@ def register():
     global last_commit_hash
     try:
         import git
-
         path = Path(__file__).resolve().parent
         repo = git.Repo(str(path), search_parent_directories=True)
         last_commit_hash = repo.head.object.hexsha
     except:
         pass
 
-    bpy.app.translations.register("blenderbim", translations_dict)
-
-
 def unregister():
     global icons
 
@@ -299,10 +265,16 @@ def unregister():
             km.keymap_items.remove(kmi)
     addon_keymaps.clear()
 
-    import blenderbim.tool as tool
-
-    # use tuple() as method will be removing keys from dict
-    for panel in tuple(original_scene_panels_polls.keys()):
-        tool.Blender.remove_scene_panel_override(panel)
-
-    bpy.app.translations.unregister("blenderbim")
+    for panel in [
+        "SCENE_PT_scene",
+        "SCENE_PT_unit",
+        "SCENE_PT_physics",
+        "SCENE_PT_rigid_body_world",
+        "SCENE_PT_audio",
+        "SCENE_PT_keying_sets",
+        "SCENE_PT_custom_props",
+    ]:
+        try:
+            bpy.utils.unregister_class(getattr(handler, f"Override_{panel}"))
+        except:
+            pass

src/blenderbim/blenderbim/bim/data/assets/default.css

@@ -10,7 +10,7 @@
  * (at your option) any later version.
  *
  * BlenderBIM Add-on is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *

src/blenderbim/blenderbim/bim/data/assets/sample.css

@@ -10,7 +10,7 @@
  * (at your option) any later version.
  *
  * BlenderBIM Add-on is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *

src/blenderbim/blenderbim/bim/data/assets/symbols.svg

@@ -44,29 +44,17 @@
         <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
         <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
     </g>
-    <g id="dot">
+    <g id="SurveyArea">
         <circle r="1" fill="black" stroke="black" style="stroke-width: 0.25;" />
     </g>
-    <g id="setout-tag">
-        <circle fill="white" stroke="black" r="2.5" style="stroke-width: 0.5"/>
-        <path d="M 0 0 L -2.5 0 A 2.5 2.5 0 0 1 0 -2.5 Z" fill="black"/>
-        <path d="M 0 0 L 2.5 0 A 2.5 2.5 0 0 1 0 2.5 Z" fill="black"/>
-        <text x="3" y="-8" class="regular" text-anchor="start" dominant-baseline="auto" data-type="text-template"></text>
-        <text x="3" y="-4" class="regular" text-anchor="start" dominant-baseline="auto" data-type="text-template"></text>
-    </g>
-    <g id="setout-point">
-        <circle fill="white" stroke="black" r="2.5" style="stroke-width: 0.5"/>
-        <path d="M 0 0 L -2.5 0 A 2.5 2.5 0 0 1 0 -2.5 Z" fill="black"/>
-        <path d="M 0 0 L 2.5 0 A 2.5 2.5 0 0 1 0 2.5 Z" fill="black"/>
-    </g>
-    <g id="control-point">
-        <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 2.286165,1.4798666 H -1.0000316e-7 -2.2861651 L -1.1430826,-0.5000101 -1.0000316e-7,-2.479888 1.1430827,-0.5000101 Z" />
+    <g id="SurveyArea-CONTROLPOINT">
+        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="M 2.286165,1.4798666 H -1.0000316e-7 -2.2861651 L -1.1430826,-0.5000101 -1.0000316e-7,-2.479888 1.1430827,-0.5000101 Z" />
         <circle r="0.5" fill="black" stroke="black" style="stroke-width: 0.25;" />
     </g>
-    <g id="traverse-point">
+    <g id="SurveyArea-TRAVERSEPOINT">
         <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M -2,-2 2,2 M -2,2 2,-2" />
     </g>
-    <g id="spot-elevation">
+    <g id="SurveyArea-SPOTELEVATION">
         <path style="fill: white; stroke: black; stroke-width: 0.5;" d="M 0,-2 0,2 M -2,0 2,0" />
     </g>
 </svg>

src/blenderbim/blenderbim/bim/data/gantt/index.mustache

@@ -51,5 +51,5 @@ var json_data = `{{{json_data}}}`;
 <script>
 var data = `{{{data}}}`;
 setupPage(data);
-create_gantt_chart(atob(json_data))
-</script>
+create_gantt_chart(json_data)
+</script>

src/blenderbim/blenderbim/bim/data/libraries/IFC4 Demo Library.ifc

@@ -1,13 +1,13 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('/dev/null','2024-03-03T16:03:58+11:00',(),(),'IfcOpenShell v0.7.0-eaa2aa05a','IfcOpenShell v0.7.0-eaa2aa05a','Nobody');
+FILE_NAME('/dev/null','2023-07-30T21:07:33+10:00',(),(),'IfcOpenShell v0.7.0-8f41ae0c1','IfcOpenShell v0.7.0-8f41ae0c1','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROJECT('3NJUxHyTzEv96oezyDYEqf',$,'BlenderBIM Demo',$,$,$,$,(#12,#16),#7);
-#2=IFCPROJECTLIBRARY('0D39k7hbT5ce$jWaCd2niG',$,'BlenderBIM Demo Library',$,$,$,$,$,$);
-#3=IFCRELDECLARES('2RWVohyP57PBHT9zCs4H2O',$,$,$,#1,(#2));
+#1=IFCPROJECT('0TszJmTqLCyxcP10DtK_MP',$,'BlenderBIM Demo',$,$,$,$,(#12,#16),#7);
+#2=IFCPROJECTLIBRARY('0Y_CJXSsbCgBlSGFw0mbLa',$,'BlenderBIM Demo Library',$,$,$,$,$,$);
+#3=IFCRELDECLARES('3IxQaOPH5Fx90CGmGm1gtQ',$,$,$,#1,(#2));
 #4=IFCSIUNIT(*,.LENGTHUNIT.,$,.METRE.);
 #5=IFCSIUNIT(*,.AREAUNIT.,$,.SQUARE_METRE.);
 #6=IFCSIUNIT(*,.VOLUMEUNIT.,$,.CUBIC_METRE.);
@@ -23,84 +23,84 @@ DATA;
 #16=IFCGEOMETRICREPRESENTATIONCONTEXT($,'Plan',2,1.E-05,#15,$);
 #17=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Model',*,*,*,*,#12,$,.MODEL_VIEW.,$);
 #18=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Body','Plan',*,*,*,*,#16,$,.PLAN_VIEW.,$);
-#19=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Model',*,*,*,*,#16,$,.MODEL_VIEW.,$);
+#19=IFCGEOMETRICREPRESENTATIONSUBCONTEXT('Annotation','Plan',*,*,*,*,#16,$,.PLAN_VIEW.,$);
 #20=IFCMATERIAL('Unknown',$,$);
-#21=IFCWALLTYPE('2F1k78lI53fwS0rg3rqrRb',$,'WAL50',$,$,$,$,$,$,.NOTDEFINED.);
+#21=IFCWALLTYPE('3U0gAUglf9WBlcfpB15EK0',$,'WAL50',$,$,$,$,$,$,.NOTDEFINED.);
 #22=IFCMATERIALLAYERSET((#24),$,$);
-#23=IFCRELASSOCIATESMATERIAL('0khP_Smdj12f2JrOTRbRKj',$,$,$,(#21),#22);
+#23=IFCRELASSOCIATESMATERIAL('3J36H22Gz1ovVzdiKgApaM',$,$,$,(#21),#22);
 #24=IFCMATERIALLAYER(#20,0.05,$,$,$,$,$);
-#25=IFCRELDECLARES('31JriXdev6BP2sC9lcxdC1',$,$,$,#2,(#26,#48,#72,#59,#92,#30,#96,#63,#21,#54,#87,#210,#153,#34,#67,#38,#82,#77,#42));
-#26=IFCWALLTYPE('3R5onkTtX1IxdCMPoThRaw',$,'WAL100',$,$,$,$,$,$,.NOTDEFINED.);
+#25=IFCRELDECLARES('28ApgMJzH10h$Ng$fmCpYf',$,$,$,#2,(#63,#21,#54,#87,#153,#34,#67,#210,#38,#82,#77,#42,#26,#48,#72,#59,#92,#30,#96));
+#26=IFCWALLTYPE('1wGfdUdC10TuASJo4jnO99',$,'WAL100',$,$,$,$,$,$,.NOTDEFINED.);
 #27=IFCMATERIALLAYERSET((#29),$,$);
-#28=IFCRELASSOCIATESMATERIAL('0$mXRPCT16nP6Q70XFNvZv',$,$,$,(#26),#27);
+#28=IFCRELASSOCIATESMATERIAL('0NRoxSQPzCgQHfsu5ru91z',$,$,$,(#26),#27);
 #29=IFCMATERIALLAYER(#20,0.1,$,$,$,$,$);
-#30=IFCWALLTYPE('1juanculbDJPqvqT2FCm8m',$,'WAL200',$,$,$,$,$,$,.NOTDEFINED.);
+#30=IFCWALLTYPE('1lt5MuGLLDfwmZd0tNruF7',$,'WAL200',$,$,$,$,$,$,.NOTDEFINED.);
 #31=IFCMATERIALLAYERSET((#33),$,$);
-#32=IFCRELASSOCIATESMATERIAL('0FsB2A$frFn9AZW2IG38ny',$,$,$,(#30),#31);
+#32=IFCRELASSOCIATESMATERIAL('21rGVxPODC$xmWYFaDy1T6',$,$,$,(#30),#31);
 #33=IFCMATERIALLAYER(#20,0.2,$,$,$,$,$);
-#34=IFCWALLTYPE('05UYduR9r1vRxZZgP64Rdw',$,'WAL300',$,$,$,$,$,$,.NOTDEFINED.);
+#34=IFCWALLTYPE('0NZm1D8h12xAxyW7fL5nc1',$,'WAL300',$,$,$,$,$,$,.NOTDEFINED.);
 #35=IFCMATERIALLAYERSET((#37),$,$);
-#36=IFCRELASSOCIATESMATERIAL('2FYhYrvmv4SBoZHVWDTTte',$,$,$,(#34),#35);
+#36=IFCRELASSOCIATESMATERIAL('2yvmN42crCJevtirp5cMeV',$,$,$,(#34),#35);
 #37=IFCMATERIALLAYER(#20,0.3,$,$,$,$,$);
-#38=IFCCOVERINGTYPE('0iLxgfHB9F2hRH2vMcw7Yv',$,'COV10',$,$,$,$,$,$,.NOTDEFINED.);
+#38=IFCCOVERINGTYPE('1eb4wZ_5n6xRGrs3rlKMiM',$,'COV10',$,$,$,$,$,$,.NOTDEFINED.);
 #39=IFCMATERIALLAYERSET((#41),$,$);
-#40=IFCRELASSOCIATESMATERIAL('0yvFX0zgb9uvJ3ARnf4mfe',$,$,$,(#38),#39);
+#40=IFCRELASSOCIATESMATERIAL('3HKIKf06T6xRqM6Lp69$OM',$,$,$,(#38),#39);
 #41=IFCMATERIALLAYER(#20,0.01,$,$,$,$,$);
-#42=IFCCOVERINGTYPE('15Riw2WTrAUPwvfLyKXJ2g',$,'COV20',$,$,(#46),$,$,$,.NOTDEFINED.);
+#42=IFCCOVERINGTYPE('2E89aYmtrEfxhX_jsNqviN',$,'COV20',$,$,(#46),$,$,$,.NOTDEFINED.);
 #43=IFCMATERIALLAYERSET((#45),$,$);
-#44=IFCRELASSOCIATESMATERIAL('1iAOG6NK9FBxitFtzN9qP5',$,$,$,(#42),#43);
+#44=IFCRELASSOCIATESMATERIAL('2115lEhhP4Z9G1Yhd_DqSC',$,$,$,(#42),#43);
 #45=IFCMATERIALLAYER(#20,0.02,$,$,$,$,$);
-#46=IFCPROPERTYSET('18ICCZ0fjDG9UXMyzrsFBA',$,'EPset_Parametric',$,(#47));
+#46=IFCPROPERTYSET('0vtU63YmjAgg8DeHlTgNx7',$,'EPset_Parametric',$,(#47));
 #47=IFCPROPERTYSINGLEVALUE('LayerSetDirection',$,IFCLABEL('AXIS2'),$);
-#48=IFCCOVERINGTYPE('0gEOtYULD0F9KD9zPoA6cJ',$,'COV30',$,$,(#52),$,$,$,.NOTDEFINED.);
+#48=IFCCOVERINGTYPE('0XiSBI57L9Uf8f2NaQ_ksi',$,'COV30',$,$,(#52),$,$,$,.NOTDEFINED.);
 #49=IFCMATERIALLAYERSET((#51),$,$);
-#50=IFCRELASSOCIATESMATERIAL('0xd6dsjf13JA98q9fnAMpQ',$,$,$,(#48),#49);
+#50=IFCRELASSOCIATESMATERIAL('3U3JdGAmbABA4mB$Fgpq1l',$,$,$,(#48),#49);
 #51=IFCMATERIALLAYER(#20,0.03,$,$,$,$,$);
-#52=IFCPROPERTYSET('3qCbs1tuDCvuOXam5RrA$a',$,'EPset_Parametric',$,(#53));
+#52=IFCPROPERTYSET('17nhQ5I4b9ZvhDu4gRJLKO',$,'EPset_Parametric',$,(#53));
 #53=IFCPROPERTYSINGLEVALUE('LayerSetDirection',$,IFCLABEL('AXIS3'),$);
-#54=IFCRAMPTYPE('2yW1ePlyb8cOR6HdEntpRh',$,'RAM200',$,$,$,$,$,$,.NOTDEFINED.);
+#54=IFCRAMPTYPE('1BTHjVDP19tgb3MDCSkWCJ',$,'RAM200',$,$,$,$,$,$,.NOTDEFINED.);
 #55=IFCMATERIALLAYERSET((#57),$,$);
-#56=IFCRELASSOCIATESMATERIAL('1x9ZyVim19AQtJhfEE06XR',$,$,$,(#54),#55);
+#56=IFCRELASSOCIATESMATERIAL('3HN21bHtL16vvHA2GnnxH1',$,$,$,(#54),#55);
 #57=IFCMATERIALLAYER(#20,0.2,$,$,$,$,$);
 #58=IFCCIRCLEPROFILEDEF(.AREA.,$,$,0.3);
-#59=IFCPILETYPE('25MTkMtaH5QeCf$gFbvSSw',$,'P1',$,$,$,$,$,$,.NOTDEFINED.);
+#59=IFCPILETYPE('04_2WZSqH8TgT7ET6DCCpd',$,'P1',$,$,$,$,$,$,.NOTDEFINED.);
 #60=IFCMATERIALPROFILESET($,$,(#62),$);
-#61=IFCRELASSOCIATESMATERIAL('09FXUZCnrFEffxBrtg16gx',$,$,$,(#59),#60);
+#61=IFCRELASSOCIATESMATERIAL('1qTZZRXsPF9hmYwT$tgFgp',$,$,$,(#59),#60);
 #62=IFCMATERIALPROFILE($,$,#20,#58,$,$);
-#63=IFCSLABTYPE('1Akbal7tP5DAPW0ti$Qp30',$,'FLR150',$,$,$,$,$,$,.NOTDEFINED.);
+#63=IFCSLABTYPE('3_OV9$Sd52KRhIW2TWIxbW',$,'FLR150',$,$,$,$,$,$,.NOTDEFINED.);
 #64=IFCMATERIALLAYERSET((#66),$,$);
-#65=IFCRELASSOCIATESMATERIAL('0jzkXlkBL4HhmQ_FTWW6Cj',$,$,$,(#63),#64);
+#65=IFCRELASSOCIATESMATERIAL('1agyf45$X1NhR127pUL0Iw',$,$,$,(#63),#64);
 #66=IFCMATERIALLAYER(#20,0.2,$,$,$,$,$);
-#67=IFCSLABTYPE('0$gpYNi3T08BrxaR67CxgI',$,'FLR250',$,$,$,$,$,$,.NOTDEFINED.);
+#67=IFCSLABTYPE('0LvmpIGf9AVPcG$Kt06TEk',$,'FLR250',$,$,$,$,$,$,.NOTDEFINED.);
 #68=IFCMATERIALLAYERSET((#70),$,$);
-#69=IFCRELASSOCIATESMATERIAL('3a6kjEM29DleYTlSkA8_DK',$,$,$,(#67),#68);
+#69=IFCRELASSOCIATESMATERIAL('0EKQPSL656secN86SgeutH',$,$,$,(#67),#68);
 #70=IFCMATERIALLAYER(#20,0.3,$,$,$,$,$);
 #71=IFCRECTANGLEPROFILEDEF(.AREA.,'500x600',$,0.5,0.6);
-#72=IFCCOLUMNTYPE('278sjptdDDzgOZseERj390',$,'C1',$,$,$,$,$,$,.NOTDEFINED.);
+#72=IFCCOLUMNTYPE('1SI8m9m813tAXfSnM1fCbm',$,'C1',$,$,$,$,$,$,.NOTDEFINED.);
 #73=IFCMATERIALPROFILESET($,$,(#75),$);
-#74=IFCRELASSOCIATESMATERIAL('1ppYXw39v6kBwi3rrIm4ZE',$,$,$,(#72),#73);
+#74=IFCRELASSOCIATESMATERIAL('1EhwSTRtPBQgBt2x6dhuT$',$,$,$,(#72),#73);
 #75=IFCMATERIALPROFILE($,$,#20,#71,$,$);
 #76=IFCCIRCLEHOLLOWPROFILEDEF(.AREA.,'500.0x5.0 CHS',$,0.25,0.005);
-#77=IFCCOLUMNTYPE('3aSZOvGmr7jggSNwsq5PJE',$,'C2',$,$,$,$,$,$,.NOTDEFINED.);
+#77=IFCCOLUMNTYPE('25GZwy2zLFcgi57r5S8iY3',$,'C2',$,$,$,$,$,$,.NOTDEFINED.);
 #78=IFCMATERIALPROFILESET($,$,(#80),$);
-#79=IFCRELASSOCIATESMATERIAL('1AtNJPaD14DgINbAjXvbU4',$,$,$,(#77),#78);
+#79=IFCRELASSOCIATESMATERIAL('2VURAOhz93ZQqT9YJUA1DO',$,$,$,(#77),#78);
 #80=IFCMATERIALPROFILE($,$,#20,#76,$,$);
 #81=IFCRECTANGLEHOLLOWPROFILEDEF(.AREA.,'150x75x2.0 RHS',$,0.075,0.15,0.002,0.005,0.005);
-#82=IFCCOLUMNTYPE('28iv3Kru12yQ7R7RRwNjvD',$,'C3',$,$,$,$,$,$,.NOTDEFINED.);
+#82=IFCCOLUMNTYPE('1Wg$I84s9BTh$iDuZnmSkH',$,'C3',$,$,$,$,$,$,.NOTDEFINED.);
 #83=IFCMATERIALPROFILESET($,$,(#85),$);
-#84=IFCRELASSOCIATESMATERIAL('2M_oL$n3j6rBRnOW5RSk87',$,$,$,(#82),#83);
+#84=IFCRELASSOCIATESMATERIAL('3fIIwEe7DAle7x_zISvMUD',$,$,$,(#82),#83);
 #85=IFCMATERIALPROFILE($,$,#20,#81,$,$);
 #86=IFCISHAPEPROFILEDEF(.AREA.,'DEMO-I',$,0.1,0.2,0.005,0.01,0.005,$,$);
-#87=IFCBEAMTYPE('2E$V5l4b54dxuToJ1A6IHp',$,'B1',$,$,$,$,$,$,.NOTDEFINED.);
+#87=IFCBEAMTYPE('2yg2Irs7L26gFsD_AvvFUu',$,'B1',$,$,$,$,$,$,.NOTDEFINED.);
 #88=IFCMATERIALPROFILESET($,$,(#90),$);
-#89=IFCRELASSOCIATESMATERIAL('3PUNnY7cj8LhyXbHKVqZnf',$,$,$,(#87),#88);
+#89=IFCRELASSOCIATESMATERIAL('1PU_gbkifF9hYpi9DvXTAU',$,$,$,(#87),#88);
 #90=IFCMATERIALPROFILE($,$,#20,#86,$,$);
 #91=IFCCSHAPEPROFILEDEF(.AREA.,'DEMO-C',$,0.2,0.1,0.0015,0.03,0.005);
-#92=IFCBEAMTYPE('3qutoZTvP0lvLWNXyjPhPm',$,'B2',$,$,$,$,$,$,.NOTDEFINED.);
+#92=IFCBEAMTYPE('2Nf2L5qpz8K8KhUNFBg_fT',$,'B2',$,$,$,$,$,$,.NOTDEFINED.);
 #93=IFCMATERIALPROFILESET($,$,(#95),$);
-#94=IFCRELASSOCIATESMATERIAL('3dGyQf42H2ahch2bSYPPHP',$,$,$,(#92),#93);
+#94=IFCRELASSOCIATESMATERIAL('1SgarGNCzEQQpfs29NMq0y',$,$,$,(#92),#93);
 #95=IFCMATERIALPROFILE($,$,#20,#91,$,$);
-#96=IFCWINDOWTYPE('0bK3c4PWL3eOMNwkPN$rlg',$,'WT01',$,$,$,(#135,#152),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
+#96=IFCWINDOWTYPE('2zRUFP8Ef81xDOR2iJx1zK',$,'WT01',$,$,$,(#135,#152),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
 #97=IFCINDEXEDPOLYGONALFACE((13,17,18,14));
 #98=IFCINDEXEDPOLYGONALFACE((5,6,3,4));
 #99=IFCINDEXEDPOLYGONALFACE((7,8,2,1));
@@ -157,7 +157,7 @@ DATA;
 #150=IFCDIRECTION((0.,0.,1.));
 #151=IFCAXIS2PLACEMENT3D(#148,#150,#149);
 #152=IFCREPRESENTATIONMAP(#151,#147);
-#153=IFCDOORTYPE('2j0vIBgkH0ERnBCP0cpcCz',$,'DT01',$,$,$,(#196,#209),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
+#153=IFCDOORTYPE('0oekOIA$z8lxWiQs9_tFWU',$,'DT01',$,$,$,(#196,#209),$,$,.NOTDEFINED.,.NOTDEFINED.,$,$);
 #154=IFCINDEXEDPOLYGONALFACE((17,16,15,14));
 #155=IFCINDEXEDPOLYGONALFACE((2,3,29,28));
 #156=IFCINDEXEDPOLYGONALFACE((27,28,29,30,32,31));
@@ -214,7 +214,7 @@ DATA;
 #207=IFCDIRECTION((0.,0.,1.));
 #208=IFCAXIS2PLACEMENT3D(#205,#207,#206);
 #209=IFCREPRESENTATIONMAP(#208,#204);
-#210=IFCFURNITURETYPE('02XxQ_3oT0SPrmFPATrt7o',$,'BUN01',$,$,$,(#931,#952),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#210=IFCFURNITURETYPE('0I2mc$m3T60hLXZYg9Y1wu',$,'BUN01',$,$,$,(#931,#952),$,$,.NOTDEFINED.,.NOTDEFINED.);
 #211=IFCINDEXEDPOLYGONALFACE((187,278,44));
 #212=IFCINDEXEDPOLYGONALFACE((21,52,60));
 #213=IFCINDEXEDPOLYGONALFACE((91,100,31));
@@ -957,161 +957,131 @@ DATA;
 #950=IFCDIRECTION((0.,0.,1.));
 #951=IFCAXIS2PLACEMENT3D(#948,#950,#949);
 #952=IFCREPRESENTATIONMAP(#951,#947);
-#953=IFCTYPEPRODUCT('0UrP0fLdD5OwzwD41aRKao',$,'SETOUT-POINT',$,'IfcAnnotation/SYMBOL',(#954),$,$);
-#954=IFCPROPERTYSET('27lmSbeAXC08EWkEq8XdUG',$,'EPset_Annotation',$,(#955));
-#955=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('setout-point'),$);
-#956=IFCTYPEPRODUCT('3IQrQOSFP0WfkuLk0ak7_0',$,'CONTROL-POINT',$,'IfcAnnotation/SYMBOL',(#957),$,$);
-#957=IFCPROPERTYSET('23aN9DsdjFcfWq8KGSIVoN',$,'EPset_Annotation',$,(#958));
-#958=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('control-point'),$);
-#959=IFCTYPEPRODUCT('3wvbaiaIz8agQgDRzt01vz',$,'TRAVERSE-POINT',$,'IfcAnnotation/SYMBOL',(#960),$,$);
-#960=IFCPROPERTYSET('1j7aFM1Rb9BRuKgUEn1U10',$,'EPset_Annotation',$,(#961));
-#961=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('traverse-point'),$);
-#962=IFCTYPEPRODUCT('0p5ZTfTnX9ZOywroa7Ffql',$,'DASHED',$,'IfcAnnotation/LINEWORK',(#963),$,$);
-#963=IFCPROPERTYSET('27smSHyiv39vhBRSwfDVCD',$,'EPset_Annotation',$,(#964));
-#964=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('dashed'),$);
-#965=IFCTYPEPRODUCT('2EvrG9Vuf6t9etgMeWFuJ2',$,'FINE',$,'IfcAnnotation/LINEWORK',(#966),$,$);
-#966=IFCPROPERTYSET('0gVTuDcZ5ByRdR3sZnEZUR',$,'EPset_Annotation',$,(#967));
-#967=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('fine'),$);
-#968=IFCTYPEPRODUCT('0IeM1ywXn1qhR_6NhB6N4s',$,'THIN',$,'IfcAnnotation/LINEWORK',(#969),$,$);
-#969=IFCPROPERTYSET('0t6c$uCeT9092GYkbm8hDS',$,'EPset_Annotation',$,(#970));
-#970=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('thin'),$);
-#971=IFCTYPEPRODUCT('1jZVbCwrTCGhZdKbH4uqTP',$,'MEDIUM',$,'IfcAnnotation/LINEWORK',(#972),$,$);
-#972=IFCPROPERTYSET('2uTJ11lF98GeN8pPIf340N',$,'EPset_Annotation',$,(#973));
-#973=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('medium'),$);
-#974=IFCTYPEPRODUCT('38zW9E1uH2ae$zat9KrieS',$,'THICK',$,'IfcAnnotation/LINEWORK',(#975),$,$);
-#975=IFCPROPERTYSET('2XQxgO16v9vxjvuIJpaPpG',$,'EPset_Annotation',$,(#976));
-#976=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('thick'),$);
-#977=IFCTYPEPRODUCT('3G2s7ZLzfDJh5J$2iIzHw9',$,'STRONG',$,'IfcAnnotation/LINEWORK',(#978),$,$);
-#978=IFCPROPERTYSET('0TcB8Gal96vebTrLWa5CEw',$,'EPset_Annotation',$,(#979));
-#979=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('strong'),$);
-#980=IFCTYPEPRODUCT('3pq2B$0k52ZOv2bFuRYkxO',$,'SETOUT-TAG',$,'IfcAnnotation/TEXT',(#981),(#1000),$);
-#981=IFCPROPERTYSET('39$oNFI052cBhtpZCVVLfj',$,'EPset_Annotation',$,(#982));
-#982=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('setout-tag'),$);
-#983=IFCCARTESIANPOINT((0.,0.,0.));
-#984=IFCDIRECTION((0.,0.,1.));
-#985=IFCDIRECTION((1.,0.,0.));
-#986=IFCAXIS2PLACEMENT3D(#983,#984,#985);
-#987=IFCPLANAREXTENT(1000.,1000.);
-#988=IFCTEXTLITERALWITHEXTENT('E ``round({{easting}}, 0.001)``',#986,.RIGHT.,#987,'center');
-#989=IFCCARTESIANPOINT((0.,0.,0.));
-#990=IFCDIRECTION((0.,0.,1.));
-#991=IFCDIRECTION((1.,0.,0.));
-#992=IFCAXIS2PLACEMENT3D(#989,#990,#991);
-#993=IFCPLANAREXTENT(1000.,1000.);
-#994=IFCTEXTLITERALWITHEXTENT('N ``round({{northing}}, 0.001)``',#992,.RIGHT.,#993,'center');
-#995=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#988,#994));
-#996=IFCCARTESIANPOINT((0.,0.,0.));
+#953=IFCTYPEPRODUCT('2be705eyD4DPBr6j4K7ZEx',$,'DASHED',$,'IfcAnnotation/LINEWORK',(#954),$,$);
+#954=IFCPROPERTYSET('0uEfutIxDDIxMIBUJOZpSM',$,'EPset_Annotation',$,(#955));
+#955=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('dashed'),$);
+#956=IFCTYPEPRODUCT('1M7mm9wUHFoxdM0MdAMyqM',$,'FINE',$,'IfcAnnotation/LINEWORK',(#957),$,$);
+#957=IFCPROPERTYSET('3AZ8m1Bdn1gfbvagzKr2c3',$,'EPset_Annotation',$,(#958));
+#958=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('fine'),$);
+#959=IFCTYPEPRODUCT('3LdrNIFOvAkBzrNnqWAZfA',$,'THIN',$,'IfcAnnotation/LINEWORK',(#960),$,$);
+#960=IFCPROPERTYSET('0$9iwgSID7xBul4Tb9r2du',$,'EPset_Annotation',$,(#961));
+#961=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('thin'),$);
+#962=IFCTYPEPRODUCT('3fFNO0t1TB$wYRaIkKwUCH',$,'MEDIUM',$,'IfcAnnotation/LINEWORK',(#963),$,$);
+#963=IFCPROPERTYSET('33Fm$9zgb1cgsCOy859RlR',$,'EPset_Annotation',$,(#964));
+#964=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('medium'),$);
+#965=IFCTYPEPRODUCT('1CpMBhemj5VQC43bU9J7zG',$,'THICK',$,'IfcAnnotation/LINEWORK',(#966),$,$);
+#966=IFCPROPERTYSET('1OLDsFSDz2TPz5ifkQvWo8',$,'EPset_Annotation',$,(#967));
+#967=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('thick'),$);
+#968=IFCTYPEPRODUCT('0NITtya3b16hoA3sh17SL4',$,'STRONG',$,'IfcAnnotation/LINEWORK',(#969),$,$);
+#969=IFCPROPERTYSET('1_kfqWVDn0puI29Ah6eitX',$,'EPset_Annotation',$,(#970));
+#970=IFCPROPERTYSINGLEVALUE('Classes',$,IFCLABEL('strong'),$);
+#971=IFCTYPEPRODUCT('0rRN9EsvL5AQ3PorxrZSKM',$,'DOOR-TAG',$,'IfcAnnotation/TEXT',(#972),(#991),$);
+#972=IFCPROPERTYSET('3lRZ$d2VH8cxZYh$mm45iq',$,'EPset_Annotation',$,(#973));
+#973=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('door-tag'),$);
+#974=IFCCARTESIANPOINT((0.,0.,0.));
+#975=IFCDIRECTION((0.,0.,1.));
+#976=IFCDIRECTION((1.,0.,0.));
+#977=IFCAXIS2PLACEMENT3D(#974,#975,#976);
+#978=IFCPLANAREXTENT(1000.,1000.);
+#979=IFCTEXTLITERALWITHEXTENT('{{type.Name}}',#977,.RIGHT.,#978,'center');
+#980=IFCCARTESIANPOINT((0.,0.,0.));
+#981=IFCDIRECTION((0.,0.,1.));
+#982=IFCDIRECTION((1.,0.,0.));
+#983=IFCAXIS2PLACEMENT3D(#980,#981,#982);
+#984=IFCPLANAREXTENT(1000.,1000.);
+#985=IFCTEXTLITERALWITHEXTENT('{{Name}}',#983,.RIGHT.,#984,'center');
+#986=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#979,#985));
+#987=IFCCARTESIANPOINT((0.,0.,0.));
+#988=IFCDIRECTION((1.,0.,0.));
+#989=IFCDIRECTION((0.,0.,1.));
+#990=IFCAXIS2PLACEMENT3D(#987,#989,#988);
+#991=IFCREPRESENTATIONMAP(#990,#986);
+#992=IFCTYPEPRODUCT('0bFZUWHjbA2e03hRHNinTt',$,'WINDOW-TAG',$,'IfcAnnotation/TEXT',(#993),(#1006),$);
+#993=IFCPROPERTYSET('3TJOWv5NDBXBNCshYFjsFV',$,'EPset_Annotation',$,(#994));
+#994=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('window-tag'),$);
+#995=IFCCARTESIANPOINT((0.,0.,0.));
+#996=IFCDIRECTION((0.,0.,1.));
 #997=IFCDIRECTION((1.,0.,0.));
-#998=IFCDIRECTION((0.,0.,1.));
-#999=IFCAXIS2PLACEMENT3D(#996,#998,#997);
-#1000=IFCREPRESENTATIONMAP(#999,#995);
-#1001=IFCTYPEPRODUCT('11M3ahhrr9NBdB29YEazzw',$,'DOOR-TAG',$,'IfcAnnotation/TEXT',(#1002),(#1021),$);
-#1002=IFCPROPERTYSET('3xUNoLKPT9kB4LMdoctm5k',$,'EPset_Annotation',$,(#1003));
-#1003=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('door-tag'),$);
-#1004=IFCCARTESIANPOINT((0.,0.,0.));
-#1005=IFCDIRECTION((0.,0.,1.));
-#1006=IFCDIRECTION((1.,0.,0.));
-#1007=IFCAXIS2PLACEMENT3D(#1004,#1005,#1006);
-#1008=IFCPLANAREXTENT(1000.,1000.);
-#1009=IFCTEXTLITERALWITHEXTENT('{{type.Name}}',#1007,.RIGHT.,#1008,'center');
+#998=IFCAXIS2PLACEMENT3D(#995,#996,#997);
+#999=IFCPLANAREXTENT(1000.,1000.);
+#1000=IFCTEXTLITERALWITHEXTENT('{{Name}}',#998,.RIGHT.,#999,'center');
+#1001=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1000));
+#1002=IFCCARTESIANPOINT((0.,0.,0.));
+#1003=IFCDIRECTION((1.,0.,0.));
+#1004=IFCDIRECTION((0.,0.,1.));
+#1005=IFCAXIS2PLACEMENT3D(#1002,#1004,#1003);
+#1006=IFCREPRESENTATIONMAP(#1005,#1001);
+#1007=IFCTYPEPRODUCT('2DlmDdasX05un_uMP4O23U',$,'SPACE-TAG',$,'IfcAnnotation/TEXT',(#1008),(#1033),$);
+#1008=IFCPROPERTYSET('1$OAHURHr3GON7ZzAJnv72',$,'EPset_Annotation',$,(#1009));
+#1009=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('space-tag'),$);
 #1010=IFCCARTESIANPOINT((0.,0.,0.));
 #1011=IFCDIRECTION((0.,0.,1.));
 #1012=IFCDIRECTION((1.,0.,0.));
 #1013=IFCAXIS2PLACEMENT3D(#1010,#1011,#1012);
 #1014=IFCPLANAREXTENT(1000.,1000.);
 #1015=IFCTEXTLITERALWITHEXTENT('{{Name}}',#1013,.RIGHT.,#1014,'center');
-#1016=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1009,#1015));
-#1017=IFCCARTESIANPOINT((0.,0.,0.));
+#1016=IFCCARTESIANPOINT((0.,0.,0.));
+#1017=IFCDIRECTION((0.,0.,1.));
 #1018=IFCDIRECTION((1.,0.,0.));
-#1019=IFCDIRECTION((0.,0.,1.));
-#1020=IFCAXIS2PLACEMENT3D(#1017,#1019,#1018);
-#1021=IFCREPRESENTATIONMAP(#1020,#1016);
-#1022=IFCTYPEPRODUCT('1eE8Y$BVDFDgG8Fj6d9wiV',$,'WINDOW-TAG',$,'IfcAnnotation/TEXT',(#1023),(#1036),$);
-#1023=IFCPROPERTYSET('2MqzSGkXDBcPSolaAQvYO4',$,'EPset_Annotation',$,(#1024));
-#1024=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('window-tag'),$);
-#1025=IFCCARTESIANPOINT((0.,0.,0.));
-#1026=IFCDIRECTION((0.,0.,1.));
-#1027=IFCDIRECTION((1.,0.,0.));
-#1028=IFCAXIS2PLACEMENT3D(#1025,#1026,#1027);
-#1029=IFCPLANAREXTENT(1000.,1000.);
-#1030=IFCTEXTLITERALWITHEXTENT('{{Name}}',#1028,.RIGHT.,#1029,'center');
-#1031=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1030));
-#1032=IFCCARTESIANPOINT((0.,0.,0.));
-#1033=IFCDIRECTION((1.,0.,0.));
-#1034=IFCDIRECTION((0.,0.,1.));
-#1035=IFCAXIS2PLACEMENT3D(#1032,#1034,#1033);
-#1036=IFCREPRESENTATIONMAP(#1035,#1031);
-#1037=IFCTYPEPRODUCT('0vvfHSiaPBxewA$32C4LdW',$,'SPACE-TAG',$,'IfcAnnotation/TEXT',(#1038),(#1063),$);
-#1038=IFCPROPERTYSET('2zKuFdTPj3DhNdQ0U2kd5u',$,'EPset_Annotation',$,(#1039));
-#1039=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('space-tag'),$);
-#1040=IFCCARTESIANPOINT((0.,0.,0.));
-#1041=IFCDIRECTION((0.,0.,1.));
-#1042=IFCDIRECTION((1.,0.,0.));
-#1043=IFCAXIS2PLACEMENT3D(#1040,#1041,#1042);
-#1044=IFCPLANAREXTENT(1000.,1000.);
-#1045=IFCTEXTLITERALWITHEXTENT('{{Name}}',#1043,.RIGHT.,#1044,'center');
-#1046=IFCCARTESIANPOINT((0.,0.,0.));
-#1047=IFCDIRECTION((0.,0.,1.));
-#1048=IFCDIRECTION((1.,0.,0.));
-#1049=IFCAXIS2PLACEMENT3D(#1046,#1047,#1048);
-#1050=IFCPLANAREXTENT(1000.,1000.);
-#1051=IFCTEXTLITERALWITHEXTENT('{{Description}}',#1049,.RIGHT.,#1050,'center');
+#1019=IFCAXIS2PLACEMENT3D(#1016,#1017,#1018);
+#1020=IFCPLANAREXTENT(1000.,1000.);
+#1021=IFCTEXTLITERALWITHEXTENT('{{Description}}',#1019,.RIGHT.,#1020,'center');
+#1022=IFCCARTESIANPOINT((0.,0.,0.));
+#1023=IFCDIRECTION((0.,0.,1.));
+#1024=IFCDIRECTION((1.,0.,0.));
+#1025=IFCAXIS2PLACEMENT3D(#1022,#1023,#1024);
+#1026=IFCPLANAREXTENT(1000.,1000.);
+#1027=IFCTEXTLITERALWITHEXTENT('``round({{Qto_SpaceBaseQuantities.NetFloorArea}} or 0., 2)``',#1025,.RIGHT.,#1026,'center');
+#1028=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1015,#1021,#1027));
+#1029=IFCCARTESIANPOINT((0.,0.,0.));
+#1030=IFCDIRECTION((1.,0.,0.));
+#1031=IFCDIRECTION((0.,0.,1.));
+#1032=IFCAXIS2PLACEMENT3D(#1029,#1031,#1030);
+#1033=IFCREPRESENTATIONMAP(#1032,#1028);
+#1034=IFCTYPEPRODUCT('2vNx3CIlrFs8bLFlmGvJF3',$,'MATERIAL-TAG',$,'IfcAnnotation/TEXT',(#1035),(#1048),$);
+#1035=IFCPROPERTYSET('1l$T4lUqnBb93zcgfbSPvx',$,'EPset_Annotation',$,(#1036));
+#1036=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('rectangle-tag'),$);
+#1037=IFCCARTESIANPOINT((0.,0.,0.));
+#1038=IFCDIRECTION((0.,0.,1.));
+#1039=IFCDIRECTION((1.,0.,0.));
+#1040=IFCAXIS2PLACEMENT3D(#1037,#1038,#1039);
+#1041=IFCPLANAREXTENT(1000.,1000.);
+#1042=IFCTEXTLITERALWITHEXTENT('{{material.Name}}',#1040,.RIGHT.,#1041,'center');
+#1043=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1042));
+#1044=IFCCARTESIANPOINT((0.,0.,0.));
+#1045=IFCDIRECTION((1.,0.,0.));
+#1046=IFCDIRECTION((0.,0.,1.));
+#1047=IFCAXIS2PLACEMENT3D(#1044,#1046,#1045);
+#1048=IFCREPRESENTATIONMAP(#1047,#1043);
+#1049=IFCTYPEPRODUCT('3hqzFtbSb56RjhAZNaB4Vh',$,'TYPE-TAG',$,'IfcAnnotation/TEXT',(#1050),(#1063),$);
+#1050=IFCPROPERTYSET('3U7kaKt_nBUvD$U2ryif_H',$,'EPset_Annotation',$,(#1051));
+#1051=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('capsule-tag'),$);
 #1052=IFCCARTESIANPOINT((0.,0.,0.));
 #1053=IFCDIRECTION((0.,0.,1.));
 #1054=IFCDIRECTION((1.,0.,0.));
 #1055=IFCAXIS2PLACEMENT3D(#1052,#1053,#1054);
 #1056=IFCPLANAREXTENT(1000.,1000.);
-#1057=IFCTEXTLITERALWITHEXTENT('``round({{Qto_SpaceBaseQuantities.NetFloorArea}}, 0.01)``',#1055,.RIGHT.,#1056,'center');
-#1058=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1045,#1051,#1057));
+#1057=IFCTEXTLITERALWITHEXTENT('{{type.Name}}',#1055,.RIGHT.,#1056,'center');
+#1058=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1057));
 #1059=IFCCARTESIANPOINT((0.,0.,0.));
 #1060=IFCDIRECTION((1.,0.,0.));
 #1061=IFCDIRECTION((0.,0.,1.));
 #1062=IFCAXIS2PLACEMENT3D(#1059,#1061,#1060);
 #1063=IFCREPRESENTATIONMAP(#1062,#1058);
-#1064=IFCTYPEPRODUCT('36lTcd9yT8UBNDejQUNWrq',$,'MATERIAL-TAG',$,'IfcAnnotation/TEXT',(#1065),(#1078),$);
-#1065=IFCPROPERTYSET('1x86VNVk1Drwe5XOj$GZX3',$,'EPset_Annotation',$,(#1066));
-#1066=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('rectangle-tag'),$);
+#1064=IFCTYPEPRODUCT('2SnSxJPiD9sh$NDx92OCSS',$,'NAME-TAG',$,'IfcAnnotation/TEXT',(#1065),(#1078),$);
+#1065=IFCPROPERTYSET('3Lu86QVuv5nfjkuPLvdQSH',$,'EPset_Annotation',$,(#1066));
+#1066=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('capsule-tag'),$);
 #1067=IFCCARTESIANPOINT((0.,0.,0.));
 #1068=IFCDIRECTION((0.,0.,1.));
 #1069=IFCDIRECTION((1.,0.,0.));
 #1070=IFCAXIS2PLACEMENT3D(#1067,#1068,#1069);
 #1071=IFCPLANAREXTENT(1000.,1000.);
-#1072=IFCTEXTLITERALWITHEXTENT('{{material.Name}}',#1070,.RIGHT.,#1071,'center');
+#1072=IFCTEXTLITERALWITHEXTENT('{{Name}}',#1070,.RIGHT.,#1071,'center');
 #1073=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1072));
 #1074=IFCCARTESIANPOINT((0.,0.,0.));
 #1075=IFCDIRECTION((1.,0.,0.));
 #1076=IFCDIRECTION((0.,0.,1.));
 #1077=IFCAXIS2PLACEMENT3D(#1074,#1076,#1075);
 #1078=IFCREPRESENTATIONMAP(#1077,#1073);
-#1079=IFCTYPEPRODUCT('1rxhEX6I16oPqglXaGZ7Sw',$,'TYPE-TAG',$,'IfcAnnotation/TEXT',(#1080),(#1093),$);
-#1080=IFCPROPERTYSET('3BeqEbDzX0xORamqqSx_kZ',$,'EPset_Annotation',$,(#1081));
-#1081=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('capsule-tag'),$);
-#1082=IFCCARTESIANPOINT((0.,0.,0.));
-#1083=IFCDIRECTION((0.,0.,1.));
-#1084=IFCDIRECTION((1.,0.,0.));
-#1085=IFCAXIS2PLACEMENT3D(#1082,#1083,#1084);
-#1086=IFCPLANAREXTENT(1000.,1000.);
-#1087=IFCTEXTLITERALWITHEXTENT('{{type.Name}}',#1085,.RIGHT.,#1086,'center');
-#1088=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1087));
-#1089=IFCCARTESIANPOINT((0.,0.,0.));
-#1090=IFCDIRECTION((1.,0.,0.));
-#1091=IFCDIRECTION((0.,0.,1.));
-#1092=IFCAXIS2PLACEMENT3D(#1089,#1091,#1090);
-#1093=IFCREPRESENTATIONMAP(#1092,#1088);
-#1094=IFCTYPEPRODUCT('0sws1hxNb2Og1etXqyoEh1',$,'NAME-TAG',$,'IfcAnnotation/TEXT',(#1095),(#1108),$);
-#1095=IFCPROPERTYSET('11L$PtdnX8LfYigzRZ$g0a',$,'EPset_Annotation',$,(#1096));
-#1096=IFCPROPERTYSINGLEVALUE('Symbol',$,IFCLABEL('capsule-tag'),$);
-#1097=IFCCARTESIANPOINT((0.,0.,0.));
-#1098=IFCDIRECTION((0.,0.,1.));
-#1099=IFCDIRECTION((1.,0.,0.));
-#1100=IFCAXIS2PLACEMENT3D(#1097,#1098,#1099);
-#1101=IFCPLANAREXTENT(1000.,1000.);
-#1102=IFCTEXTLITERALWITHEXTENT('{{Name}}',#1100,.RIGHT.,#1101,'center');
-#1103=IFCSHAPEREPRESENTATION(#19,'Annotation','Annotation2D',(#1102));
-#1104=IFCCARTESIANPOINT((0.,0.,0.));
-#1105=IFCDIRECTION((1.,0.,0.));
-#1106=IFCDIRECTION((0.,0.,1.));
-#1107=IFCAXIS2PLACEMENT3D(#1104,#1106,#1105);
-#1108=IFCREPRESENTATIONMAP(#1107,#1103);
 ENDSEC;
 END-ISO-10303-21;

src/blenderbim/blenderbim/bim/data/pset/EPset_Drawing.ifc

@@ -5,28 +5,27 @@ FILE_NAME('EPset_Drawing.ifc','2020-01-01T00:00:00',(),(),'EPset_Drawing','EPset
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19,#20,#21,#22,#23));
+#1=IFCPROPERTYSETTEMPLATE('2JhNIvqZrFnAgxfhK0XVQX',$,'EPset_Drawing','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4,#5,#6,#7,#8,#9,#10,#11,#12,#13,#14,#15,#16,#17,#18,#19,#20,#21));
 #2=IFCSIMPLEPROPERTYTEMPLATE('23JavTMk98ZxXhrUEnjAcf',$,'TargetView','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1yVWUt5H9DAOuu0OaMMLpe',$,'Scale','The scale of this drawing represented as a numerator and denominator, such as 1/100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #4=IFCSIMPLEPROPERTYTEMPLATE('3gsuPBtU93b8f0gg1pjkq6',$,'HumanScale','The scale of this drawing in human readable format, such as 1:100',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#5=IFCSIMPLEPROPERTYTEMPLATE('2T$a4OFsv2LeD5JeBKEV4f',$,'IsNTS','Whether or not the scale is intended to be significant',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#6=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#7=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#8=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#9=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#10=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#13=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#14=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#15=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#16=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#17=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#18=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#19=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
-#20=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#21=IFCSIMPLEPROPERTYTEMPLATE('0nYMT3OSj5gArVniCWZRtv',$,'ShadingStyles','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#22=IFCSIMPLEPROPERTYTEMPLATE('3VWG22eZXBdQwdKlzMeVQH',$,'CurrentShadingStyle','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#23=IFCSIMPLEPROPERTYTEMPLATE('28mJ$GDxb7kBbKFH_rACMQ',$,'AngleDecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('2T$a4OFsv2LeD5JeBKEV4f',$,'IsNTS','Whether or not the scale is intended to be significant',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#5=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#6=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#7=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#8=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#9=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#10=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#13=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#14=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#15=IFCSIMPLEPROPERTYTEMPLATE('2sHDBuW7P4TROy$hL2w7ct',$,'Patterns','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#16=IFCSIMPLEPROPERTYTEMPLATE('1$xfo9EVb26QLqmPll2_RK',$,'MetricPrecision','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+#17=IFCSIMPLEPROPERTYTEMPLATE('38uAtrp9nD_901NO42zd$7',$,'ImperialPrecision','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#18=IFCSIMPLEPROPERTYTEMPLATE('1MX0uffTL6TOvtvEJpxFmk',$,'DecimalPlaces','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
+#19=IFCSIMPLEPROPERTYTEMPLATE('0joEq0Rd10cxweEh0NeHT6',$,'JoinCriteria','Comma separated selection keys which determine what cut objects are to be joined.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#20=IFCSIMPLEPROPERTYTEMPLATE('0nYMT3OSj5gArVniCWZRtv',$,'ShadingStyles','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#21=IFCSIMPLEPROPERTYTEMPLATE('3VWG22eZXBdQwdKlzMeVQH',$,'CurrentShadingStyle','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;

src/blenderbim/blenderbim/bim/data/pset/EPset_Status.ifc

@@ -1,13 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION((),'2;1');
-FILE_NAME('EPset_Status.ifc','2020-01-01T00:00:00',(),(),'EPset_Status','EPset_Status',$);
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('3JoyTt$cz4fhYuQvJeTMhs',$,'EPset_Status','',.PSET_TYPEDRIVENOVERRIDE.,'IfcProduct',(#2,#4));
-#2= IFCSIMPLEPROPERTYTEMPLATE('2HBOdOfz5E3hZ7IBLCq$$D',$,'Status','Status of the element, predominately used in renovation or retrofitting projects. The status can be assigned to as "New" - element designed as new addition, "Existing" - element exists and remains, "Demolish" - element existed but is to be demolished,  "Temporary" - element will exists only temporary (like a temporary support structure).',.P_ENUMERATEDVALUE.,'IfcLabel',$,#3,$,$,$,.READWRITE.);
-#3= IFCPROPERTYENUMERATION('EPEnum_ElementStatus',(IFCLABEL('NEW'),IFCLABEL('EXISTING'),IFCLABEL('DEMOLISH'),IFCLABEL('TEMPORARY'),IFCLABEL('OTHER'),IFCLABEL('NOTKNOWN'),IFCLABEL('UNSET')),$);
-#4=IFCSIMPLEPROPERTYTEMPLATE('3ttXxqmlz62BlxjzEPpqvH',$,'UserDefinedStatus','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-ENDSEC;
-END-ISO-10303-21;

src/blenderbim/blenderbim/bim/data/pset/ePSet_Georeferencing.ifc

@@ -1,23 +0,0 @@
-ISO-10303-21;
-HEADER;
-FILE_DESCRIPTION(('ViewDefinition [CoordinationView]'),'2;1');
-FILE_NAME('','2023-09-28T23:00:50',(),(),'IfcOpenShell v0.7.0-fbd8ea1ed','IfcOpenShell v0.7.0-fbd8ea1ed','');
-FILE_SCHEMA(('IFC4'));
-ENDSEC;
-DATA;
-#1=IFCPROPERTYSETTEMPLATE('1TLQmgUKf0I8Zi07bm9Jqn',$,'ePSet_ProjectedCRS','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#2,#3,#4,#5,#6,#7));
-#2=IFCSIMPLEPROPERTYTEMPLATE('2cH53PtVT3v88uf_uGFblG',$,'Name','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#3=IFCSIMPLEPROPERTYTEMPLATE('3JsReA6vXDqR7aNC$haRYW',$,'Description','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('0u0uEsT5HFtuX5GvozO9ba',$,'GeodeticDatum','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#5=IFCSIMPLEPROPERTYTEMPLATE('1JgEX9Fsf0$ggxYltdkqiY',$,'VerticalDatum','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#6=IFCSIMPLEPROPERTYTEMPLATE('3ahTZjYrD0MAOo5IH6QuGH',$,'MapProjection','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#7=IFCSIMPLEPROPERTYTEMPLATE('3hqJR2ghD0GAti7q4sXKj7',$,'MapZone','',.P_SINGLEVALUE.,'IfcIdentifier',$,$,$,$,$,.READWRITE.);
-#8=IFCPROPERTYSETTEMPLATE('1jGHTycOj0vA8xHfRl4TNs',$,'ePSet_MapConversion','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#9,#10,#11,#12,#13,#15));
-#9=IFCSIMPLEPROPERTYTEMPLATE('0nxsULXo17JRrAvNteYtNR',$,'Eastings','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#10=IFCSIMPLEPROPERTYTEMPLATE('26RfaGJs5CqemN0Xin12XL',$,'Northings','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('0ziCn3nZv3m850VEUwWH42',$,'OrthogonalHeight','',.P_SINGLEVALUE.,'IfcLengthMeasure',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('3d4BOt4In8WR119ms1SaAe',$,'XAxisAbscissa','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#13=IFCSIMPLEPROPERTYTEMPLATE('1Q4Voqj2j84RQRI8l67m28',$,'XAxisOrdinate','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-#15=IFCSIMPLEPROPERTYTEMPLATE('0O1Hc0$XnDNOG_jPBmbW5r',$,'Scale','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
-ENDSEC;
-END-ISO-10303-21;

src/blenderbim/blenderbim/bim/export_ifc.py

@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import annotations
 import os
 import bpy
 import json
@@ -28,7 +27,6 @@ import addon_utils
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.placement
-import ifcopenshell.util.unit
 import blenderbim.tool as tool
 import blenderbim.core.geometry
 import blenderbim.core.aggregate
@@ -36,8 +34,6 @@ import blenderbim.core.spatial
 import blenderbim.core.style
 from blenderbim.bim.ifc import IfcStore
 from mathutils import Vector
-from typing import Union
-from logging import Logger
 
 
 class IfcExporter:
@@ -86,34 +82,30 @@ class IfcExporter:
         )
         self.file.wrapped_data.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
         self.file.wrapped_data.header.file_name.originating_system = "{} {}".format(
-            self.get_application_name(), tool.Blender.get_blenderbim_version()
+            self.get_application_name(), self.get_application_version()
         )
 
-    def sync_all_objects(self, skip_unlinking=False) -> list[ifcopenshell.entity_instance]:
-        results: list[ifcopenshell.entity_instance] = []
+    def sync_all_objects(self):
+        results = []
         self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
         for ifc_definition_id in list(IfcStore.id_map.keys()):
             obj = IfcStore.id_map[ifc_definition_id]
             try:
                 if isinstance(obj, bpy.types.Material):
                     continue
-                if obj.library:
-                    continue
-                tool.Collector.sync(obj, skip_unlinking)
+                tool.Collector.sync(obj)
                 result = self.sync_object_placement(obj)
                 if result:
                     results.append(result)
                 result = self.sync_object_material(obj)
-                # TODO: sync_object_material always returns None
-                # so it's never really appended
                 if result:
                     results.append(result)
             except ReferenceError:
                 pass  # The object is likely deleted
         return results
 
-    def sync_edited_objects(self) -> list[ifcopenshell.entity_instance]:
-        results: list[ifcopenshell.entity_instance] = []
+    def sync_edited_objects(self):
+        results = []
         for obj in IfcStore.edited_objs.copy():
             if not obj:
                 continue
@@ -131,7 +123,7 @@ class IfcExporter:
         IfcStore.edited_objs.clear()
         return results
 
-    def sync_object_material(self, obj: bpy.types.Object) -> None:
+    def sync_object_material(self, obj):
         if not obj.data or not isinstance(obj.data, bpy.types.Mesh):
             return
         if not self.has_changed_materials(obj):
@@ -142,10 +134,11 @@ class IfcExporter:
         checksum = obj.data.BIMMeshProperties.material_checksum
         return checksum != str([s.id() for s in tool.Geometry.get_styles(obj) if s])
 
-    def sync_object_placement(self, obj: bpy.types.Object) -> Union[ifcopenshell.entity_instance, None]:
+    def sync_object_placement(self, obj):
         element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
         if not tool.Ifc.is_moved(obj):
             return
+        blender_matrix = np.array(obj.matrix_world)
         if (obj.scale - Vector((1.0, 1.0, 1.0))).length > 1e-4:
             bpy.ops.bim.update_representation(obj=obj.name)
             return element
@@ -156,7 +149,7 @@ class IfcExporter:
         blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
         return element
 
-    def sync_grid_axis_object_placement(self, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
+    def sync_grid_axis_object_placement(self, obj, element):
         grid = (element.PartOfU or element.PartOfV or element.PartOfW)[0]
         grid_obj = tool.Ifc.get_object(grid)
         if grid_obj:
@@ -165,11 +158,11 @@ class IfcExporter:
                 bpy.ops.bim.update_representation(obj=obj.name)
         tool.Geometry.record_object_position(obj)
 
-    def get_application_name(self) -> str:
+    def get_application_name(self):
         return "BlenderBIM"
 
-    def get_application_version(self) -> str:
-        version = ".".join(
+    def get_application_version(self):
+        return ".".join(
             [
                 str(x)
                 for x in [
@@ -179,20 +172,15 @@ class IfcExporter:
                 ][0]
             ]
         )
-        if blenderbim.bim.last_commit_hash != "8888888":
-            version += f"-{blenderbim.bim.last_commit_hash[:7]}"
-        return version
 
 
 class IfcExportSettings:
     def __init__(self):
-        self.logger: Logger = None
-        self.output_file: str = None
-        self.json_version: str = None
-        self.json_compact: bool = None
+        self.logger = None
+        self.output_file = None
 
     @staticmethod
-    def factory(context: bpy.types.Context, output_file: str, logger: Logger) -> IfcExportSettings:
+    def factory(context, output_file, logger):
         settings = IfcExportSettings()
         settings.output_file = output_file
         settings.logger = logger

src/blenderbim/blenderbim/bim/handler.py

@@ -21,23 +21,38 @@ import bpy
 import json
 import addon_utils
 import ifcopenshell.api.owner.settings
-import blenderbim.bim
 import blenderbim.tool as tool
 import blenderbim.core.owner as core_owner
 from bpy.app.handlers import persistent
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP
 from mathutils import Vector
 from math import cos, degrees
-from typing import Union
 
 
 cwd = os.path.dirname(os.path.realpath(__file__))
 global_subscription_owner = object()
 
 
+def mode_callback(obj, data):
+    objects = bpy.context.selected_objects
+    if bpy.context.active_object:
+        objects += [bpy.context.active_object]
+    for obj in objects:
+        if (
+            obj.mode != "EDIT"
+            or not obj.data
+            or not isinstance(obj.data, (bpy.types.Mesh, bpy.types.Curve, bpy.types.TextCurve))
+            or not obj.BIMObjectProperties.ifc_definition_id
+        ):
+            continue
+        if obj.data.BIMMeshProperties.ifc_definition_id:
+            tool.Ifc.edit(obj)
+        elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
+            tool.Ifc.edit(obj)
+
+
 def name_callback(obj, data):
     try:
         obj.name
@@ -58,31 +73,17 @@ def name_callback(obj, data):
         refresh_ui_data()
         return
 
-    if not obj.BIMObjectProperties.ifc_definition_id:
+    if not obj.BIMObjectProperties.ifc_definition_id or "/" not in obj.name:
         return
-
-    if obj.BIMObjectProperties.is_renaming:
-        obj.BIMObjectProperties.is_renaming = False
-        return
-
     element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
-    if "/" in obj.name:
-        object_name = obj.name
-        element_name = obj.name.split("/", 1)[1]
-    else:
-        element_name = obj.name
-        object_name = element.is_a() + f"/{element_name}"
-        obj.name = object_name  # NOTE: doesn't trigger infinite recursion
-
     if element.is_a("IfcGridAxis"):
-        element.AxisTag = object_name.split("/")[1]
+        element.AxisTag = obj.name.split("/")[1]
         refresh_ui_data()
-
     if not element.is_a("IfcRoot"):
         return
-    element.Name = element_name
     if obj.BIMObjectProperties.collection:
-        obj.BIMObjectProperties.collection.name = object_name
+        obj.BIMObjectProperties.collection.name = obj.name
+    element.Name = "/".join(obj.name.split("/")[1:])
     refresh_ui_data()
 
 
@@ -105,7 +106,7 @@ 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 != "bim.bim_tool":
         return
     element = tool.Ifc.get_entity(obj)
     if not element:
@@ -113,16 +114,6 @@ def update_bim_tool_props():
     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
@@ -133,6 +124,7 @@ def update_bim_tool_props():
         return x_angle
 
     si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+    props = bpy.context.scene.BIMModelProperties
     if not AuthoringData.is_loaded:
         AuthoringData.load()
 
@@ -183,22 +175,30 @@ def refresh_ui_data():
         except AttributeError:
             pass
 
-        # TODO: deprecate prop purge functions and refactor into data classes.
+    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
+        tool.Ifc.get().clear_cache()
+
+
+def purge_module_data():
+    from blenderbim.bim import modules
+
+    refresh_ui_data()
+    for name, value in modules.items():
+        try:
+            getattr(getattr(getattr(ifcopenshell.api, name), "data"), "Data").purge()
+        except AttributeError:
+            pass
+
         try:
             getattr(value, "prop").purge()
         except AttributeError:
             pass
 
-    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
-
 
 @persistent
 def loadIfcStore(scene):
     IfcStore.purge()
-    refresh_ui_data()
+    purge_module_data()
     if not IfcStore.get_file():
         return
     IfcStore.get_schema()
@@ -210,7 +210,7 @@ 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)
-        refresh_ui_data()
+        purge_module_data()
     tool.Ifc.rebuild_element_maps()
 
 
@@ -219,11 +219,11 @@ 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)
-        refresh_ui_data()
+        purge_module_data()
     tool.Ifc.rebuild_element_maps()
 
 
-def get_application(ifc: ifcopenshell.file) -> ifcopenshell.entity_instance:
+def get_application(ifc):
     # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
     version = get_application_version()
     for element in ifc.by_type("IfcApplication"):
@@ -238,20 +238,7 @@ def get_application(ifc: ifcopenshell.file) -> ifcopenshell.entity_instance:
     )
 
 
-def get_user(ifc: ifcopenshell.file) -> Union[ifcopenshell.entity_instance, None]:
-    # TODO: cache this for even faster application retrieval. It honestly makes a difference on long scripts.
-    if pao := next(iter(ifc.by_type("IfcPersonAndOrganization")), None):
-        return pao
-    elif ifc.schema == "IFC2X3":
-        if (person := next(iter(ifc.by_type("IfcPerson")), None)) is None:
-            person = tool.Ifc.run("owner.add_person")
-        if (organization := next(iter(ifc.by_type("IfcOrganization")), None)) is None:
-            organization = tool.Ifc.run("owner.add_organisation")
-        pao = tool.Ifc.run("owner.add_person_and_organisation", person=person, organisation=organization)
-        return pao
-
-
-def get_application_version() -> str:
+def get_application_version():
     return ".".join(
         [
             str(x)
@@ -270,6 +257,76 @@ def viewport_shading_changed_callback(area):
         bpy.context.scene.BIMStylesProperties.active_style_type = "External"
 
 
+if getattr(bpy.types, "SCENE_PT_scene"):
+
+    class Override_SCENE_PT_scene(bpy.types.SCENE_PT_scene):
+        bl_idname = "SCENE_PT_scene_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_unit"):
+
+    class Override_SCENE_PT_unit(bpy.types.SCENE_PT_unit):
+        bl_idname = "SCENE_PT_unit_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_physics"):
+
+    class Override_SCENE_PT_physics(bpy.types.SCENE_PT_physics):
+        bl_idname = "SCENE_PT_physics_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_rigid_body_world"):
+
+    class Override_SCENE_PT_rigid_body_world(bpy.types.SCENE_PT_rigid_body_world):
+        bl_idname = "SCENE_PT_rigid_body_world_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_audio"):
+
+    class Override_SCENE_PT_audio(bpy.types.SCENE_PT_audio):
+        bl_idname = "SCENE_PT_audio_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_keying_sets"):
+
+    class Override_SCENE_PT_keying_sets(bpy.types.SCENE_PT_keying_sets):
+        bl_idname = "SCENE_PT_keying_sets_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_custom_props"):
+
+    class Override_SCENE_PT_custom_props(bpy.types.SCENE_PT_custom_props):
+        bl_idname = "SCENE_PT_custom_props_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
 @persistent
 def load_post(scene):
     global global_subscription_owner
@@ -292,24 +349,39 @@ def load_post(scene):
                 key=key, owner=global_subscription_owner, args=(area,), notify=viewport_shading_changed_callback
             )
 
-    ifcopenshell.api.owner.settings.get_user = get_user
+    ifcopenshell.api.owner.settings.get_user = lambda ifc: core_owner.get_user(tool.Owner)
     ifcopenshell.api.owner.settings.get_application = get_application
     AuthoringData.type_thumbnails = {}
 
-    if not bpy.context.preferences.addons["blenderbim"].preferences.should_setup_toolbar:
-        tool.Blender.unregister_toolbar()
-
     if bpy.context.preferences.addons["blenderbim"].preferences.should_setup_workspace:
         if "BIM" in bpy.data.workspaces:
             bpy.context.window.workspace = bpy.data.workspaces["BIM"]
         else:
             bpy.ops.workspace.append_activate(idname="BIM", filepath=os.path.join(cwd, "data", "workspace.blend"))
 
-    # To improve usability for new users, we hijack the scene properties
-    # tab. We override default scene properties panels with our own poll
-    # to hide them unless the user has chosen to view Blender properties.
-    for panel in tool.Blender.get_scene_panels_list():
-        if panel in blenderbim.bim.original_scene_panels_polls:
+        # To improve usability for new users, we hijack the scene properties
+        # tab. We override default scene properties panels with our own poll
+        # to hide them unless the user has chosen to view Blender properties.
+        for panel in [
+            "SCENE_PT_scene",
+            "SCENE_PT_unit",
+            "SCENE_PT_physics",
+            "SCENE_PT_rigid_body_world",
+            "SCENE_PT_audio",
+            "SCENE_PT_keying_sets",
+            "SCENE_PT_custom_props",
+        ]:
+            if getattr(bpy.types, panel, None):
+                try:
+                    bpy.utils.register_class(globals()[f"Override_{panel}"])
+                    bpy.utils.unregister_class(getattr(bpy.types, panel))
+                except:
+                    pass
+
+    # https://blender.stackexchange.com/questions/140644/how-can-make-the-state-of-a-boolean-property-relative-to-the-3d-view-area
+    for screen in bpy.data.screens:
+        if len(screen.BIMAreaProperties) == 20:
             continue
-        tool.Blender.override_scene_panel(panel)
-    tool.Blender.setup_tabs()
+        screen.BIMAreaProperties.clear()
+        for i in range(20):  # 20 is an arbitrary value of split areas
+            screen.BIMAreaProperties.add()

src/blenderbim/blenderbim/bim/helper.py

@@ -29,7 +29,6 @@ from mathutils import geometry
 from mathutils import Vector
 import blenderbim.tool as tool
 from blenderbim.bim.ifc import IfcStore
-from typing import Optional, Callable, Any
 
 
 def draw_attributes(props, layout, copy_operator=None, popup_active_attribute=None):
@@ -76,10 +75,6 @@ def draw_attribute(attribute, layout, copy_operator=None):
         op.data_path = attribute.path_from_id("string_value")
     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:
         op = layout.operator(f"{copy_operator}", text="", icon="COPYDOWN")
         op.name = attribute.name
@@ -92,15 +87,8 @@ def import_attributes(ifc_class, props, data, callback=None):
 
 # A more elegant attribute importer signature, intended to supersede import_attributes
 def import_attributes2(element, props, callback=None):
-    if isinstance(element, str):
-        attributes = tool.Ifc.schema().declaration_by_name(element).as_entity().all_attributes()
-        info = {a.name(): None for a in attributes}
-        info["type"] = element
-    else:
-        attributes = element.wrapped_data.declaration().as_entity().all_attributes()
-        info = element.get_info()
-    for attribute in attributes:
-        import_attribute(attribute, props, info, callback=callback)
+    for attribute in element.wrapped_data.declaration().as_entity().all_attributes():
+        import_attribute(attribute, props, element.get_info(), callback=callback)
 
 
 def import_attribute(attribute, props, data, callback=None):
@@ -121,7 +109,7 @@ def import_attribute(attribute, props, data, callback=None):
     elif is_handled_by_callback is False:
         props.remove(len(props) - 1)
     elif data_type == "string":
-        new.string_value = "" if new.is_null else str(data[attribute.name()]).replace("\n", "\\n")
+        new.string_value = "" if new.is_null else str(data[attribute.name()])
         if attribute.type_of_attribute().declared_type().name() == "IfcURIReference":
             new.is_uri = True
     elif data_type == "boolean":
@@ -183,7 +171,7 @@ def add_attribute_description(attribute_blender, attribute_ifc=None):
         attribute_blender.description = description
 
 
-def export_attributes(props, callback: Optional[Callable] = None) -> dict[str, Any]:
+def export_attributes(props, callback=None):
     attributes = {}
     for prop in props:
         is_handled_by_callback = callback(attributes, prop) if callback else False
@@ -221,6 +209,37 @@ def get_enum_items(data, prop_name, context=None):
     return items
 
 
+def get_obj_ifc_definition_id(context, obj, obj_type):
+    if obj_type == "Object":
+        return bpy.data.objects.get(obj).BIMObjectProperties.ifc_definition_id
+    elif obj_type == "Material":
+        return bpy.data.materials.get(obj).BIMObjectProperties.ifc_definition_id
+    elif obj_type == "MaterialSet":
+        return ifcopenshell.util.element.get_material(
+            tool.Ifc.get_entity(bpy.data.objects.get(obj)), should_skip_usage=True
+        ).id()
+    elif obj_type == "MaterialSetItem":
+        return bpy.data.objects.get(obj).BIMObjectMaterialProperties.active_material_set_item_id
+    elif obj_type == "Task":
+        return context.scene.BIMTaskTreeProperties.tasks[
+            context.scene.BIMWorkScheduleProperties.active_task_index
+        ].ifc_definition_id
+    elif obj_type == "Cost":
+        return context.scene.BIMCostProperties.cost_items[
+            context.scene.BIMCostProperties.active_cost_item_index
+        ].ifc_definition_id
+    elif obj_type == "Resource":
+        return context.scene.BIMResourceTreeProperties.resources[
+            context.scene.BIMResourceProperties.active_resource_index
+        ].ifc_definition_id
+    elif obj_type == "Profile":
+        return context.scene.BIMProfileProperties.profiles[
+            context.scene.BIMProfileProperties.active_profile_index
+        ].ifc_definition_id
+    elif obj_type == "WorkSchedule":
+        return context.scene.BIMWorkScheduleProperties.active_work_schedule_id
+
+
 # hack to close popup
 # https://blender.stackexchange.com/a/202576/130742
 def close_operator_panel(event):
@@ -241,7 +260,12 @@ def convert_property_group_from_si(property_group, skip_props=()):
     for prop_name in property_group.bl_rna.properties.keys():
         if prop_name in skip_props:
             continue
-        prop_value = tool.Blender.get_blender_prop_default_value(property_group, prop_name)
+        prop_bl_rna = property_group.bl_rna.properties[prop_name]
+        if prop_bl_rna.array_length > 0:
+            prop_value = prop_bl_rna.default_array
+        else:
+            prop_value = prop_bl_rna.default
+
         if type(prop_value) is float:
             prop_value = prop_value * conversion_k
         elif type(prop_value) is bpy.types.bpy_prop_array:
@@ -249,83 +273,6 @@ def convert_property_group_from_si(property_group, skip_props=()):
         setattr(property_group, prop_name, prop_value)
 
 
-def draw_filter(layout, filter_groups, data, module):
-    if not data.is_loaded:
-        data.load()
-
-    sprops = bpy.context.scene.BIMSearchProperties
-
-    if tool.Ifc.get():
-        row = layout.row(align=True)
-        row.label(text=f"{len(data.data['saved_searches'])} Saved Searches")
-
-        if data.data["saved_searches"]:
-            row.operator("bim.load_search", text="", icon="IMPORT").module = module
-        row.operator("bim.save_search", text="", icon="EXPORT").module = module
-
-    row = layout.row(align=True)
-    row.operator("bim.add_filter_group", text="Add Search Group", icon="ADD").module = module
-    row.operator("bim.edit_filter_query", text="", icon="FILTER").module = module
-
-    for i, filter_group in enumerate(filter_groups):
-        box = layout.box()
-
-        row = box.row(align=True)
-        row.prop(sprops, "facet", text="")
-        op = row.operator("bim.add_filter", text="Add Filter", icon="ADD")
-        op.type = sprops.facet
-        op.index = i
-        op.module = module
-        op = row.operator("bim.remove_filter_group", text="", icon="X")
-        op.index = i
-        op.module = module
-
-        for j, ifc_filter in enumerate(filter_group.filters):
-            if ifc_filter.type == "entity":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="FILE_3D")
-            elif ifc_filter.type == "attribute":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "name", text="", icon="COPY_ID")
-                row.prop(ifc_filter, "value", text="")
-            elif ifc_filter.type == "type":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="FILE_VOLUME")
-            elif ifc_filter.type == "material":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="MATERIAL")
-            elif ifc_filter.type == "property":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "pset", text="", icon="PROPERTIES")
-                row.prop(ifc_filter, "name", text="")
-                row.prop(ifc_filter, "comparison", text="")
-                row.prop(ifc_filter, "value", text="")
-            elif ifc_filter.type == "classification":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="OUTLINER")
-            elif ifc_filter.type == "location":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="PACKAGE")
-            elif ifc_filter.type == "group":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="OUTLINER_COLLECTION")
-            elif ifc_filter.type == "query":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "name", text="", icon="POINTCLOUD_DATA")
-                row.prop(ifc_filter, "value", text="")
-            elif ifc_filter.type == "instance":
-                row = box.row(align=True)
-                row.prop(ifc_filter, "value", text="", icon="GRIP")
-                op = row.operator("bim.select_filter_elements", text="", icon="EYEDROPPER")
-                op.group_index = i
-                op.index = j
-                op.module = module
-            op = row.operator("bim.remove_filter", text="", icon="X")
-            op.group_index = i
-            op.index = j
-            op.module = module
-
-
 # TODO this should move into ifcopenshell.util
 
 

src/blenderbim/blenderbim/bim/ifc.py

@@ -23,39 +23,33 @@ import hashlib
 import zipfile
 import tempfile
 import ifcopenshell
-import ifcopenshell.geom
-import ifcopenshell.ifcopenshell_wrapper
 import blenderbim.bim.handler
 import blenderbim.tool as tool
 from pathlib import Path
 from blenderbim.tool.brick import BrickStore
-from typing import Set, Union, Optional
-
-
-IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]
 
 
 class IfcStore:
-    path: str = ""
-    file: ifcopenshell.file = None
-    schema: ifcopenshell.ifcopenshell_wrapper.schema_definition = None
-    cache: ifcopenshell.ifcopenshell_wrapper.HdfSerializer = None
-    cache_path: str = None
-    id_map: dict[int, IFC_CONNECTED_TYPE] = {}
-    guid_map: dict[str, IFC_CONNECTED_TYPE] = {}
-    edited_objs: Set[bpy.types.Object] = set()
-    pset_template_path: str = ""
-    pset_template_file: ifcopenshell.file = None
-    classification_path: str = ""
-    classification_file: ifcopenshell.file = None
-    library_path: str = ""
-    library_file: ifcopenshell.file = None
+    path = ""
+    file = None
+    schema = None
+    cache = None
+    cache_path = None
+    id_map = {}
+    guid_map = {}
+    edited_objs = set()
+    pset_template_path = ""
+    pset_template_file = None
+    classification_path = ""
+    classification_file = None
+    library_path = ""
+    library_file = None
     current_transaction = ""
     last_transaction = ""
     history = []
     future = []
     schema_identifiers = ["IFC4", "IFC2X3", "IFC4X3"]
-    session_files: dict[str, ifcopenshell.file] = {}
+    session_files = {}
 
     @staticmethod
     def purge():
@@ -86,8 +80,8 @@ class IfcStore:
             if IfcStore.path:
                 try:
                     IfcStore.load_file(IfcStore.path)
-                except Exception as e:
-                    print(f"Failed to load file {IfcStore.path}. Error details: {e}")
+                except:
+                    pass
         return IfcStore.file
 
     @staticmethod
@@ -123,7 +117,7 @@ class IfcStore:
         IfcStore.get_cache()
 
     @staticmethod
-    def load_file(path) -> None:
+    def load_file(path):
         if not os.path.isfile(path):
             return
         extension = path.split(".")[-1]
@@ -152,7 +146,7 @@ class IfcStore:
         return IfcStore.schema
 
     @staticmethod
-    def get_element(id_or_guid: Union[int, str]) -> IFC_CONNECTED_TYPE:
+    def get_element(id_or_guid):
         if isinstance(id_or_guid, int):
             map_object = IfcStore.id_map
         else:
@@ -165,20 +159,16 @@ class IfcStore:
         return obj
 
     @staticmethod
-    def relink_all_objects() -> None:
+    def relink_all_objects():
         if not IfcStore.get_file():
             return
         for obj in bpy.data.objects:
-            if obj.library:
-                continue
             IfcStore.relink_object(obj)
         for obj in bpy.data.materials:
-            if obj.library:
-                continue
             IfcStore.relink_object(obj)
 
     @staticmethod
-    def relink_object(obj: IFC_CONNECTED_TYPE) -> None:
+    def relink_object(obj):
         if not obj:
             return
         if obj.BIMObjectProperties.ifc_definition_id:
@@ -199,7 +189,7 @@ class IfcStore:
             IfcStore.commit_link_element(data)
 
     @staticmethod
-    def link_element(element: ifcopenshell.entity_instance, obj: IFC_CONNECTED_TYPE) -> None:
+    def link_element(element, obj):
         # Please use tool.Ifc.link() instead of this method. We want to
         # refactor this class and deprecate usage of IfcStore in favour of
         # tools.
@@ -230,9 +220,8 @@ class IfcStore:
         if isinstance(obj, bpy.types.Material):
             blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
         elif isinstance(obj, bpy.types.Object):
-            blenderbim.bim.handler.subscribe_to(
-                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
-            )
+            blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
+            blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)
 
         if IfcStore.history:
             data = {"id": element.id(), "guid": getattr(element, "GlobalId", None), "obj": obj.name}
@@ -258,14 +247,13 @@ class IfcStore:
         if isinstance(obj, bpy.types.Material):
             blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
         elif isinstance(obj, bpy.types.Object):
-            blenderbim.bim.handler.subscribe_to(
-                obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback
-            )
+            blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
+            blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)
         # TODO Listeners are not re-registered. Does this cause nasty problems to debug later on?
         # TODO We're handling id_map and guid_map, but what about edited_objs? This might cause big problems.
 
     @staticmethod
-    def rollback_unlink_element(data) -> None:
+    def rollback_unlink_element(data):
         if "id" not in data or "obj" not in data:
             return
         obj = bpy.data.objects.get(data["obj"])
@@ -274,15 +262,13 @@ class IfcStore:
             IfcStore.guid_map[data["guid"]] = obj
 
     @staticmethod
-    def commit_unlink_element(data) -> None:
+    def commit_unlink_element(data):
         del IfcStore.id_map[data["id"]]
         if data["guid"]:
             del IfcStore.guid_map[data["guid"]]
 
     @staticmethod
-    def unlink_element(
-        element: Optional[ifcopenshell.entity_instance] = None, obj: Optional[IFC_CONNECTED_TYPE] = None
-    ) -> None:
+    def unlink_element(element=None, obj=None):
         if element is None:
             try:
                 element = tool.Ifc.get_entity(obj)
@@ -328,15 +314,14 @@ class IfcStore:
             )
 
     @staticmethod
-    def execute_ifc_operator(operator: bpy.types.Operator, context: bpy.types.Context, is_invoke=False):
-        bpy.context.scene.BIMProperties.is_dirty = True
+    def execute_ifc_operator(operator, context, is_invoke=False):
         is_top_level_operator = not bool(IfcStore.current_transaction)
 
         if is_top_level_operator:
             IfcStore.begin_transaction(operator)
             if tool.Ifc.get():
                 tool.Ifc.get().begin_transaction()
-            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
+            if BrickStore.graph:
                 BrickStore.begin_transaction()
             # This empty transaction ensures that each operator has at least one transaction
             IfcStore.add_transaction_operation(operator, rollback=lambda data: True, commit=lambda data: True)
@@ -354,7 +339,7 @@ class IfcStore:
                 IfcStore.add_transaction_operation(
                     operator, rollback=lambda d: tool.Ifc.get().undo(), commit=lambda d: tool.Ifc.get().redo()
                 )
-            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
+            if BrickStore.graph:
                 BrickStore.end_transaction()
             IfcStore.end_transaction(operator)
             blenderbim.bim.handler.refresh_ui_data()
@@ -362,17 +347,17 @@ class IfcStore:
         return result
 
     @staticmethod
-    def begin_transaction(operator: bpy.types.Operator) -> None:
+    def begin_transaction(operator):
         IfcStore.current_transaction = str(uuid.uuid4())
         operator.transaction_key = IfcStore.current_transaction
 
     @staticmethod
-    def end_transaction(operator: bpy.types.Operator) -> None:
+    def end_transaction(operator):
         IfcStore.current_transaction = ""
         operator.transaction_key = ""
 
     @staticmethod
-    def add_transaction_operation(operator: bpy.types.Operator, rollback=None, commit=None) -> None:
+    def add_transaction_operation(operator, rollback=None, commit=None):
         key = getattr(operator, "transaction_key", None)
         data = getattr(operator, "transaction_data", None)
         bpy.context.scene.BIMProperties.last_transaction = key
@@ -388,7 +373,7 @@ class IfcStore:
         IfcStore.future = []
 
     @staticmethod
-    def undo(until_key=None) -> None:
+    def undo(until_key=None):
         BrickStore.undo()
         if not IfcStore.history:
             return
@@ -403,7 +388,7 @@ class IfcStore:
             IfcStore.future.append(event)
 
     @staticmethod
-    def redo(until_key=None) -> None:
+    def redo(until_key=None):
         BrickStore.redo()
 
         if not IfcStore.future:

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

@@ -20,19 +20,16 @@ import bpy
 from . import ui, prop, operator
 
 classes = (
-    operator.BIM_OT_add_aggregate,
-    operator.BIM_OT_add_part_to_object,
-    operator.BIM_OT_aggregate_assign_object,
-    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_assign_object,
+    operator.BIM_OT_unassign_object,
     operator.BIM_OT_enable_editing_aggregate,
-    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_add_aggregate,
     operator.BIM_OT_select_parts,
-    operator.BIM_OT_aggregate_unassign_object,
-    operator.BIM_OT_break_link_to_other_aggregates,
-    operator.BIM_OT_select_linked_aggregates,
+    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_add_part_to_object,
     prop.BIMObjectAggregateProperties,
     ui.BIM_PT_aggregate,
-    ui.BIM_PT_linked_aggregate,
 )
 
 

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

@@ -35,9 +35,8 @@ class AggregateData:
             "has_relating_object": cls.has_relating_object(),
             "relating_object_label": cls.get_relating_object_label(),
             "has_related_objects": cls.has_related_objects(),
-            "total_parts": cls.total_parts(),
+            "related_objects_amount": cls.get_related_objects_amount(),
             "ifc_class": cls.ifc_class(),
-            "total_linked_aggregate": cls.total_linked_aggregate(),
         }
         cls.is_loaded = True
 
@@ -60,7 +59,7 @@ class AggregateData:
         return ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(bpy.context.active_object))
 
     @classmethod
-    def total_parts(cls):
+    def get_related_objects_amount(cls):
         parts = cls.get_related_objects()
         return len(parts) if parts else 0
 
@@ -73,26 +72,3 @@ class AggregateData:
         element = tool.Ifc.get_entity(bpy.context.active_object)
         if element:
             return element.is_a()
-
-    @classmethod
-    def total_linked_aggregate(cls):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        aggregate = ifcopenshell.util.element.get_aggregate(element)
-        if not aggregate:
-            return []
-        if not element:
-            return []
-        
-        product_linked_agg_group = [
-            r
-            for r in getattr(aggregate, "HasAssignments", []) or []
-            if r.is_a("IfcRelAssignsToGroup")
-            if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
-        ]
-
-        if not product_linked_agg_group:
-            return []
-        
-        total = len(product_linked_agg_group[0].RelatedObjects)
-        return total
-        

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

@@ -33,23 +33,18 @@ class Operator:
         return {"FINISHED"}
 
 
-class BIM_OT_aggregate_assign_object(bpy.types.Operator, Operator):
+class BIM_OT_assign_object(bpy.types.Operator, Operator):
     """Create aggregation relationship between two ifc elements"""
 
-    bl_idname = "bim.aggregate_assign_object"
-    bl_label = "Assign Object To Aggregation"
+    bl_idname = "bim.assign_object"
+    bl_label = "Assign Object"
     bl_options = {"REGISTER", "UNDO"}
     relating_object: bpy.props.IntProperty()
 
     def _execute(self, context):
         relating_obj = None
         if self.relating_object:
-            element = tool.Ifc.get().by_id(self.relating_object)
-            if element.IsDecomposedBy:
-                relating_obj = tool.Ifc.get_object(element)
-            else:
-                assembly = element.Decomposes[0].RelatingObject
-                relating_obj = tool.Ifc.get_object(assembly)
+            relating_obj = tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object))
         elif context.active_object:
             relating_obj = context.active_object
         if not relating_obj:
@@ -72,11 +67,11 @@ class BIM_OT_aggregate_assign_object(bpy.types.Operator, Operator):
                 self.report({"ERROR"}, f" Cannot aggregate {obj.name} to {relating_obj.name}")
 
 
-class BIM_OT_aggregate_unassign_object(bpy.types.Operator, Operator):
+class BIM_OT_unassign_object(bpy.types.Operator, Operator):
     """Remove aggregation relationship between two ifc elements"""
 
-    bl_idname = "bim.aggregate_unassign_object"
-    bl_label = "Unassign Object From Aggregation"
+    bl_idname = "bim.unassign_object"
+    bl_label = "Unassign Object"
     bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
@@ -95,14 +90,7 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, Operator):
                 related_obj=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')
-                if pset:
-                    pset = tool.Ifc.get().by_id(pset["id"])
-                    ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
 
-              
 class BIM_OT_enable_editing_aggregate(bpy.types.Operator, Operator):
     """Enable editing aggregation relationship"""
 
@@ -133,7 +121,6 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
     bl_options = {"REGISTER", "UNDO"}
     obj: bpy.props.StringProperty()
     ifc_class: bpy.props.StringProperty(name="IFC Class", default="IfcElementAssembly")
-    aggregate_name: bpy.props.StringProperty(name="Name", default="Default_Name")
 
     def invoke(self, context, event):
         return context.window_manager.invoke_props_dialog(self)
@@ -141,15 +128,13 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
     def draw(self, context):
         row = self.layout
         row.prop(self, "ifc_class")
-        row = self.layout
-        row.prop(self, "aggregate_name")
 
     def _execute(self, context):
         try:
             ifc_class = tool.Ifc.schema().declaration_by_name(self.ifc_class).name()
         except:
             return
-        aggregate = self.create_aggregate(context, ifc_class, self.aggregate_name)
+        aggregate = self.create_aggregate(context, ifc_class)
 
         for obj in context.selected_objects:
             element = tool.Ifc.get_entity(obj)
@@ -177,9 +162,8 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
                 )
             core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
 
-    def create_aggregate(self, context, ifc_class, aggregate_name):
-        aggregate = bpy.data.objects.new(aggregate_name, None)
-        aggregate.location = context.scene.cursor.location
+    def create_aggregate(self, context, ifc_class):
+        aggregate = bpy.data.objects.new("Assembly", None)
         bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class=ifc_class)
         return aggregate
 
@@ -194,17 +178,12 @@ class BIM_OT_select_parts(bpy.types.Operator):
 
     def execute(self, context):
         self.file = IfcStore.get_file()
-        # obj = bpy.data.objects.get(self.obj) or context.active_object
-
-        for obj in context.selected_objects:
-            parts = ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(obj))
-            if parts:
-                parts_objs = set(tool.Ifc.get_object(part) for part in parts)
-                selectable_parts_objs = set(context.selectable_objects).intersection(parts_objs)
-                for selectable_part_obj in selectable_parts_objs:
-                    selectable_part_obj.select_set(True)
-            else:
-                obj.select_set(False)
+        obj = bpy.data.objects.get(self.obj) or context.active_object
+        parts = ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(obj))
+        parts_objs = set(tool.Ifc.get_object(part) for part in parts)
+        selectable_parts_objs = set(context.selectable_objects).intersection(parts_objs)
+        for selectable_part_obj in selectable_parts_objs:
+            selectable_part_obj.select_set(True)
         return {"FINISHED"}
 
 
@@ -215,54 +194,14 @@ class BIM_OT_select_aggregate(bpy.types.Operator):
     bl_label = "Select Aggregate"
     bl_options = {"REGISTER", "UNDO"}
     obj: bpy.props.StringProperty()
-    select_parts: bpy.props.BoolProperty(default=False)
-
-    @classmethod
-    def description(cls, context, properties):
-        if properties.select_parts:
-            return "Select Aggregate and Parts"
-        else:
-            return "Select Aggregate"
 
     def execute(self, context):
         self.file = IfcStore.get_file()
-
-        # obj = bpy.data.objects.get(self.obj) or context.active_object
-        # aggregate = ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(obj))
-        # aggregate_obj = tool.Ifc.get_object(aggregate)
-        
-        all_parts = []
-        for obj in context.selected_objects:
-            element = tool.Ifc.get_entity(obj)
-            if element:
-                aggregate = ifcopenshell.util.element.get_aggregate(element)
-                if aggregate:
-                    all_parts.append(aggregate)
-                    obj.select_set(False)
-                else:
-                    pass
-            if not element:
-                obj.select_set(False)
-        
-        if self.select_parts:
-            all_objs = []
-            for part in all_parts:
-                if part.IsDecomposedBy:
-                    for subpart in part.IsDecomposedBy[0].RelatedObjects:
-                        all_parts.append(subpart)
-                all_objs.append(part)
-
-            for element in all_objs:
-                obj = tool.Ifc.get_object(element)
-                if obj:
-                    obj.select_set(True)
-
-        else:
-            for aggregate_element in all_parts:
-                aggregate_obj = tool.Ifc.get_object(aggregate_element)
-                aggregate_obj.select_set(True)
-                bpy.context.view_layer.objects.active = aggregate_obj      
-
+        obj = bpy.data.objects.get(self.obj) or context.active_object
+        aggregate = ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(obj))
+        aggregate_obj = tool.Ifc.get_object(aggregate)
+        if aggregate_obj in context.selectable_objects:
+            aggregate_obj.select_set(True)
         return {"FINISHED"}
 
 
@@ -289,88 +228,3 @@ class BIM_OT_add_part_to_object(bpy.types.Operator, Operator):
             part_class=self.part_class,
             part_name=self.part_name,
         )
-
-
-class BIM_OT_break_link_to_other_aggregates(bpy.types.Operator, Operator):
-    bl_idname = "bim.break_link_to_other_aggregates"
-    bl_label = "Break link to other aggregates"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        aggregate = ifcopenshell.util.element.get_aggregate(element)
-        if not aggregate:
-            return []
-        if not element:
-            return []
-
-        parts = ifcopenshell.util.element.get_parts(aggregate)
-
-        for part in parts:
-            pset = ifcopenshell.util.element.get_pset(part, "BBIM_Linked_Aggregate")
-            pset = tool.Ifc.get().by_id(pset["id"])
-            ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-
-        linked_aggregate_group = [
-            r.RelatingGroup
-            for r in getattr(aggregate, "HasAssignments", []) or []
-            if r.is_a("IfcRelAssignsToGroup")
-            if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
-        ]
-        tool.Ifc.run("group.unassign_group", group=linked_aggregate_group[0], products=[aggregate])
-
-        return {"FINISHED"}
-
-
-class BIM_OT_select_linked_aggregates(bpy.types.Operator, Operator):
-    bl_idname = "bim.select_linked_aggregates"
-    bl_label = "Select linked aggregates"
-    bl_options = {"REGISTER", "UNDO"}
-    select_parts: bpy.props.BoolProperty(default=False)
-
-    @classmethod
-    def description(cls, context, properties):
-        if properties.select_parts:
-            return "Select all aggregates, subaggregates and all their parts"
-        else:
-            return "Select all aggregates"
-
-    def _execute(self, context):
-        
-        for obj in context.selected_objects:
-            obj.select_set(False)
-            element = tool.Ifc.get_entity(obj)
-            aggregate = ifcopenshell.util.element.get_aggregate(element)
-            if not aggregate:
-                continue
-            if not element:
-                continue
-
-            linked_aggregate_group = [
-                r.RelatingGroup
-                for r in getattr(aggregate, "HasAssignments", []) or []
-                if r.is_a("IfcRelAssignsToGroup")
-                if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
-            ]
-
-            group_rel = linked_aggregate_group[0].IsGroupedBy or []
-            for group_link in group_rel:
-                parts = list(group_link.RelatedObjects)
-                if self.select_parts:
-                    parts_objs = []
-                    for part in parts:
-                        if part.IsDecomposedBy:
-                            for subpart in part.IsDecomposedBy[0].RelatedObjects:
-                                parts.append(subpart)
-                        parts_objs.append(part)
-
-                    for element in parts_objs:
-                        obj = tool.Ifc.get_object(element)
-                        if obj:
-                            obj.select_set(True)
-                else:
-                    for element in parts:
-                        obj = tool.Ifc.get_object(element)
-                        obj.select_set(True)
-
-        return {"FINISHED"}

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

@@ -18,9 +18,7 @@
 
 from bpy.types import Panel
 from blenderbim.bim.module.aggregate.data import AggregateData
-from blenderbim.bim.module.group.data import GroupsData, ObjectGroupsData
 from blenderbim.bim.ifc import IfcStore
-import blenderbim.tool as tool
 
 
 class BIM_PT_aggregate(Panel):
@@ -56,36 +54,26 @@ class BIM_PT_aggregate(Panel):
             row = layout.row(align=True)
             row.prop(props, "relating_object", text="")
             if props.relating_object:
-                op = row.operator("bim.aggregate_assign_object", icon="CHECKMARK", text="")
+                op = row.operator("bim.assign_object", icon="CHECKMARK", text="")
                 op.relating_object = props.relating_object.BIMObjectProperties.ifc_definition_id
             row.operator("bim.disable_editing_aggregate", icon="CANCEL", text="")
         else:
             row = layout.row(align=True)
             if AggregateData.data["has_relating_object"]:
                 row.label(text=AggregateData.data["relating_object_label"], icon="TRIA_UP")
-                op = row.operator("bim.select_aggregate", icon="OBJECT_DATA", text="")
-                op.obj = context.active_object.name
-                op.select_parts = False
                 op = row.operator("bim.select_aggregate", icon="RESTRICT_SELECT_OFF", text="")
                 op.obj = context.active_object.name
-                op.select_parts = True
                 row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                 row.operator("bim.add_aggregate", icon="ADD", text="")
-                op = row.operator("bim.aggregate_unassign_object", icon="X", text="")
+                op = row.operator("bim.unassign_object", icon="X", text="")
             else:
                 row.label(text="No Aggregate", icon="TRIA_UP")
                 row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
                 row.operator("bim.add_aggregate", icon="ADD", text="")
 
         row = layout.row(align=True)
-        total_parts = AggregateData.data["total_parts"]
-        if total_parts == 0:
-            row.label(text="No Parts", icon="TRIA_DOWN")
-        elif total_parts == 1:
-            row.label(text="1 Part", icon="TRIA_DOWN")
-        else:
-            row.label(text=f"{total_parts} Parts", icon="TRIA_DOWN")
-
+        parts = AggregateData.data["related_objects_amount"]
+        row.label(text=f"{parts or 'No'} Part{'s' if parts > 1 else ''}", icon="TRIA_DOWN")
         if AggregateData.data["has_related_objects"]:
             op = row.operator("bim.select_parts", icon="RESTRICT_SELECT_OFF", text="")
             op.obj = context.active_object.name
@@ -102,59 +90,3 @@ class BIM_PT_aggregate(Panel):
             op = layout.operator("bim.add_part_to_object", text="Add " + part_class.lstrip("Ifc"))
             op.part_class = part_class
             op.obj = context.active_object.name
-            
-            
-class BIM_PT_linked_aggregate(Panel):
-    bl_label = "Linked Aggregates"
-    bl_idname = "BIM_PT_linked_aggregate"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "object"
-    bl_order = 2
-    bl_parent_id = "BIM_PT_aggregate"
-
-    @classmethod
-    def poll(cls, context):
-        if not context.active_object:
-            return False
-        props = context.active_object.BIMObjectProperties
-        if not props.ifc_definition_id:
-            return False
-        if not IfcStore.get_element(props.ifc_definition_id):
-            return False
-        if not IfcStore.get_file().by_id(props.ifc_definition_id).is_a("IfcObjectDefinition"):
-            return False
-        return True
-
-    def draw(self, context):
-        layout = self.layout
-        if not AggregateData.is_loaded:
-            AggregateData.load()
-
-        obj = context.active_object
-        element = tool.Ifc.get_entity(obj)
-        props = obj.BIMObjectAggregateProperties
-        row = layout.row(align=True)
-
-
-        if element.Decomposes:
-            Number_Linked_Aggregates = AggregateData.data['total_linked_aggregate']
-            if not Number_Linked_Aggregates:
-                row.label(text="Not a Linked Aggregate")
-            else:
-                row.label(text=f"{Number_Linked_Aggregates} Linked Aggregates")
-            op = row.operator("bim.object_duplicate_move_linked_aggregate", text="", icon="DUPLICATE")
-            if type(Number_Linked_Aggregates) is int:
-                if Number_Linked_Aggregates > 0:
-                    op = row.operator("bim.select_linked_aggregates", text="", icon="OUTLINER_DATA_POINTCLOUD")
-                    op.select_parts = False
-                    op = row.operator("bim.select_linked_aggregates", text="", icon="OUTLINER_OB_POINTCLOUD")
-                    op.select_parts = True
-                    row.operator("bim.refresh_linked_aggregate", text="", icon="FILE_REFRESH")
-                    op = row.operator("bim.break_link_to_other_aggregates", text="", icon="X")
-        else:
-            row.label(text="Not an Aggregate")
-            
-        
-

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

@@ -47,18 +47,10 @@ class EnableEditingAttributes(bpy.types.Operator):
             obj = bpy.data.objects.get(self.obj)
         elif self.obj_type == "Material":
             obj = bpy.data.materials.get(self.obj)
+        oprops = obj.BIMObjectProperties
         props = obj.BIMAttributeProperties
         props.attributes.clear()
 
-        element = tool.Ifc.get_entity(obj)
-        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
-            has_inherited_predefined_type = ifcopenshell.util.element.get_predefined_type(element_type) not in (
-                "NOTDEFINED",
-                None,
-            )
-
         def callback(name, prop, data):
             if name in ("RefLatitude", "RefLongitude"):
                 new = props.attributes.add()
@@ -70,11 +62,10 @@ class EnableEditingAttributes(bpy.types.Operator):
                 new.string_value = "" if new.is_null else json.dumps(data[name])
                 blenderbim.bim.helper.add_attribute_description(new)
                 new.description += " The degrees, minutes and seconds should follow this format : [12,34,56]"
-            if name in ("PredefinedType", "ObjectType") and has_inherited_predefined_type:
-                props.attributes.remove(len(props.attributes) - 1)
-                return True
 
-        blenderbim.bim.helper.import_attributes2(element, props.attributes, callback=callback)
+        blenderbim.bim.helper.import_attributes2(
+            tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes, callback=callback
+        )
         props.is_editing_attributes = True
         return {"FINISHED"}
 
@@ -129,46 +120,20 @@ class EditAttributes(bpy.types.Operator, Operator):
         return {"FINISHED"}
 
 
-class GenerateGlobalId(bpy.types.Operator, Operator):
+class GenerateGlobalId(bpy.types.Operator):
     bl_idname = "bim.generate_global_id"
     bl_label = "Regenerate GlobalId"
-    bl_description = "Regenerate GlobalId\n\nSHIFT+CLICK to regenerate GlobalIds for all selected objects"
     bl_options = {"REGISTER", "UNDO"}
 
-    use_selected: bpy.props.BoolProperty(name="Use All Selected Objects", default=False, options={"SKIP_SAVE"})
-
-    def invoke(self, context, event):
-        # using all selected objects on shift+click
-        # make sure to use SKIP_SAVE on property, otherwise it might get stuck
-        if event.type == "LEFTMOUSE" and event.shift:
-            self.use_selected = True
-        return self.execute(context)
-
-    def _execute(self, context):
-        if self.use_selected:
-            for obj in context.selected_objects:
-                element = tool.Ifc.get_entity(obj)
-                if not element or not element.is_a("IfcRoot"):
-                    continue
-                element.GlobalId = ifcopenshell.guid.new()
-
-        obj = context.active_object
-        if not obj or not obj.BIMAttributeProperties.is_editing_attributes:
-            return {"FINISHED"}
-
-        props = obj.BIMAttributeProperties
-        element = tool.Ifc.get_entity(obj)
-
-        if not element.is_a("IfcRoot"):
-            return {"FINISHED"}
-
-        if self.use_selected and obj in context.selected_objects:
-            # guid value was already regenerated, just update the ui prop
-            guid_value = element.GlobalId
+    def execute(self, context):
+        index = context.active_object.BIMAttributeProperties.attributes.find("GlobalId")
+        if index >= 0:
+            global_id = context.active_object.BIMAttributeProperties.attributes[index]
         else:
-            guid_value = ifcopenshell.guid.new()
-
-        props.attributes["GlobalId"].string_value = guid_value
+            global_id = context.active_object.BIMAttributeProperties.attributes.add()
+        global_id.name = "GlobalId"
+        global_id.data_type = "string"
+        global_id.string_value = ifcopenshell.guid.new()
         return {"FINISHED"}
 
 

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

@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import bpy
 import bcf
 import bcf.v2.bcfxml
 
@@ -25,31 +23,12 @@ import bcf.v2.bcfxml
 class BcfStore:
     bcfxml = None
 
-    @classmethod
-    def get_bcfxml(cls):
-        if not cls.bcfxml:
-            bcf_filepath = bpy.context.scene.BCFProperties.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:
-                try:
-                    cls.bcfxml = bcf.bcfxml.load(bcf_filepath)
-                except:
-                    # there will be a plenty of "Permission denied" errors
-                    # as many poll() methods will try to access the bcfxml simultaneously
-                    # the first time it's loaded
-                    pass
-        return cls.bcfxml
+    @staticmethod
+    def get_bcfxml():
+        if not BcfStore.bcfxml:
+            BcfStore.bcfxml = bcf.v2.bcfxml.BcfXml()
+        return BcfStore.bcfxml
 
     @classmethod
-    def set(cls, bcfxml, filepath):
+    def set(cls, bcfxml):
         cls.bcfxml = bcfxml
-        bpy.context.scene.BCFProperties.bcf_file = filepath
-
-    @classmethod
-    def set_by_filepath(cls, filepath):
-        cls.set(None, filepath)
-
-    @classmethod
-    def unload_bcfxml(cls):
-        cls.set(None, "")

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

@@ -42,9 +42,11 @@ class NewBcfProject(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
+        context.scene.BCFProperties.is_loaded = False
         bcfxml = bcf.v2.bcfxml.BcfXml.create_new("New Project")
-        bcfstore.BcfStore.set(bcfxml, "")
+        bcfstore.BcfStore.set(bcfxml)
         bpy.ops.bim.load_bcf_project()
+        context.scene.BCFProperties.is_loaded = True
         return {"FINISHED"}
 
 
@@ -57,10 +59,11 @@ class LoadBcfProject(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            bcfstore.BcfStore.set_by_filepath(self.filepath)
+            bcfstore.BcfStore.bcfxml = bcf.bcfxml.load(self.filepath)
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         context.scene.BCFProperties.name = bcfxml.project.name
         bpy.ops.bim.load_bcf_topics()
+        context.scene.BCFProperties.is_loaded = True
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -74,7 +77,8 @@ class UnloadBcfProject(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        bcfstore.BcfStore.unload_bcfxml()
+        bcfstore.BcfStore.set(None)
+        context.scene.BCFProperties.is_loaded = False
         return {"FINISHED"}
 
 
@@ -263,7 +267,6 @@ class SaveBcfProject(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         bcfxml.save(self.filepath)
-        bcfstore.BcfStore.set(bcfxml, self.filepath)
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -961,8 +964,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                 context_override = {}
                 context_override["object"] = context_override["active_object"] = objs[0]
                 context_override["selected_objects"] = context_override["selected_editable_objects"] = objs
-                with context.temp_override(**context_override):
-                    bpy.ops.object.hide_view_set(unselected=True)
+                bpy.ops.object.hide_view_set(context_override, unselected=True)
                 context.area.type = old
 
         if viewpoint.visualization_info.components.view_setup_hints:
@@ -976,16 +978,14 @@ class ActivateBcfViewpoint(bpy.types.Operator):
             self.hide_spaces(context)
             self.set_openings_visibility(False, context)
 
-        # set selection at the end not to conflict with .hide_spaces
         self.set_selection(viewpoint)
         self.set_colours(viewpoint)
 
     def hide_spaces(self, context):
         old = context.area.type
         context.area.type = "VIEW_3D"
-        bpy.ops.object.select_all(action="DESELECT")
         bpy.ops.object.select_pattern(pattern="IfcSpace/*")
-        bpy.ops.object.hide_view_set()
+        bpy.ops.object.hide_view_set({})
         context.area.type = old
 
     def set_openings_visibility(self, is_visible, context):

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

@@ -41,37 +41,37 @@ def purge():
 
 
 def updateBcfReferenceLink(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if context.scene.BCFProperties.is_loaded:
         bpy.ops.bim.edit_bcf_reference_links()
 
 
 def updateBcfLabel(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if context.scene.BCFProperties.is_loaded:
         bpy.ops.bim.edit_bcf_labels()
 
 
 def updateBcfProjectName(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if self.is_loaded:
         bpy.ops.bim.edit_bcf_project_name()
 
 
 def updateBcfAuthor(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if self.is_loaded:
         bpy.ops.bim.edit_bcf_author()
 
 
 def updateBcfTopicName(self, context):
-    if bcfstore.BcfStore.get_bcfxml():
+    if context.scene.BCFProperties.is_loaded:
         bpy.ops.bim.edit_bcf_topic_name()
 
 
 def updateBcfTopicIsEditable(self, context):
-    if bcfstore.BcfStore.get_bcfxml() and not self.is_editable:
+    if context.scene.BCFProperties.is_loaded and not self.is_editable:
         bpy.ops.bim.edit_bcf_topic()
 
 
 def updateBcfCommentIsEditable(self, context):
-    if bcfstore.BcfStore.get_bcfxml() and not self.is_editable:
+    if context.scene.BCFProperties.is_loaded and not self.is_editable:
         bpy.ops.bim.edit_bcf_comment(comment_guid=self.name)
 
 
@@ -151,7 +151,7 @@ class BcfTopic(PropertyGroup):
 
 
 class BCFProperties(PropertyGroup):
-    bcf_file: StringProperty(name="BCF File")
+    is_loaded: BoolProperty(name="Is Loaded", default=False)
     comment_text_width: IntProperty(name="Comment Text Width", default=40)
     name: StringProperty(default="", name="Project Name", update=updateBcfProjectName)
     author: StringProperty(default="john@doe.com", name="Author Email", update=updateBcfAuthor)

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

@@ -39,7 +39,8 @@ class BIM_PT_bcf(Panel):
         scene = context.scene
         props = scene.BCFProperties
 
-        if not bcfstore.BcfStore.get_bcfxml():
+
+        if not props.is_loaded:
             row = layout.row(align=True)
             row.operator("bim.new_bcf_project", text="New Project")
             row.operator("bim.load_bcf_project", text="Load Project")

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

@@ -22,7 +22,6 @@ from . import ui, operator, prop
 classes = (
     operator.AddBoundary,
     operator.ColourByRelatedBuildingElement,
-    operator.DecorateBoundaries,
     operator.DisableEditingBoundary,
     operator.DisableEditingBoundaryGeometry,
     operator.EditBoundaryAttributes,

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

@@ -62,14 +62,14 @@ class BoundaryDecorator:
         gpu.state.point_size_set(6)
         gpu.state.blend_set("ALPHA")
 
-        self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
+        self.line_shader = gpu.shader.from_builtin("3D_POLYLINE_UNIFORM_COLOR")
         self.line_shader.bind()  # required to be able to change uniforms of the shader
         # POLYLINE_UNIFORM_COLOR specific uniforms
         self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
         self.line_shader.uniform_float("lineWidth", 2.0)
 
         # general shader
-        self.shader = gpu.shader.from_builtin("UNIFORM_COLOR")
+        self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")
 
         selected_vertices = []
         selected_edges = []

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

@@ -20,12 +20,9 @@ import bpy
 import bmesh
 import logging
 import shapely
-import shapely.ops
 import mathutils
 import numpy as np
-import multiprocessing
 import ifcopenshell.api
-import ifcopenshell.geom
 import ifcopenshell.util.unit
 import ifcopenshell.util.shape
 import ifcopenshell.util.element
@@ -33,13 +30,12 @@ import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import blenderbim.tool as tool
 import blenderbim.bim.import_ifc as import_ifc
-from math import pi, inf, degrees, acos, radians
+from math import pi, inf
 from mathutils import Vector, Matrix
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.model.decorator import ProfileDecorator
 from blenderbim.bim.module.boundary.decorator import BoundaryDecorator
 import blenderbim.core
-import blenderbim.core.geometry
 
 
 def get_boundaries_collection(blender_space):
@@ -67,8 +63,7 @@ def disable_editing_boundary_geometry(context):
 
 
 class Loader:
-    def __init__(self, operator=None):
-        self.operator = operator
+    def __init__(self):
         self.ifc_file = None
         self.logger = None
         self.ifc_importer = None
@@ -90,33 +85,14 @@ class Loader:
             tool.Loader.link_mesh(shape, mesh)
         except RuntimeError:
             # Fallback solution for invalid geometry provided by Revit. (InnerBoundaries cuting OuterBoundary)
-            self.operator.report(
-                {"WARNING"},
-                (
-                    f"IfcRelSpaceBoundary {boundary.id()} mesh creation failed. Geometry might be invalid. Using fallback solution"
-                ),
-            )
-            try:
-                shape = ifcopenshell.geom.create_shape(self.fallback_settings, surface.OuterBoundary)
-            except RuntimeError:
-                self.operator.report(
-                    {"WARNING"},
-                    f"Skipping IfcRelSpaceBoundary {boundary.id()}. Fallback solution failed. Geometry might be invalid",
-                )
-                return None
+            print(f"Failed to create mesh from IfcRelSpaceBoundary with ID {boundary.id()}. Geometry might be invalid")
+            shape = ifcopenshell.geom.create_shape(self.fallback_settings, surface.OuterBoundary)
             mesh = bpy.data.meshes.new(str(surface.id()))
             bm = bmesh.new()
             verts = [bm.verts.new(shape.verts[i : i + 3]) for i in range(0, len(shape.verts), 3)]
             bm.faces.new(verts)
             for inner_boundary in surface.InnerBoundaries:
-                try:
-                    shape = ifcopenshell.geom.create_shape(self.fallback_settings, inner_boundary)
-                except RuntimeError:
-                    self.operator.report(
-                        {"WARNING"},
-                        f"Skipping an inner boundary for IfcRelSpaceBoundary with ID {boundary.id()}. Geometry might be invalid",
-                    )
-                    return None
+                shape = ifcopenshell.geom.create_shape(self.fallback_settings, inner_boundary)
                 verts = [bm.verts.new(shape.verts[i : i + 3]) for i in range(0, len(shape.verts), 3)]
                 for i in range(len(verts) - 1):
                     bm.edges.new(verts[i : i + 2])
@@ -127,7 +103,7 @@ class Loader:
             unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
             matrix = mathutils.Matrix(
                 ifcopenshell.util.placement.get_axis2placement(surface.BasisSurface.Position).tolist()
-            )
+            )            
             matrix.translation *= unit_scale
             mesh.transform(matrix)
         return mesh
@@ -150,17 +126,7 @@ class Loader:
         self.ifc_importer = import_ifc.IfcImporter(ifc_import_settings)
         self.ifc_importer.file = self.ifc_file
 
-    def load_boundary(
-        self, boundary: ifcopenshell.entity_instance, blender_space: bpy.types.Object = None
-    ) -> bpy.types.Object:
-        if not blender_space:
-            if not boundary.RelatingSpace:
-                self.operator.report(
-                    {"WARNING"},
-                    f"Skipping IfcRelSpaceBoundary {boundary.id()} which have no relating space. Invalid boundary.",
-                )
-                return
-            blender_space = tool.Ifc.get_object(boundary.RelatingSpace)
+    def load_boundary(self, boundary, blender_space):
         obj = tool.Ifc.get_object(boundary)
         if obj:
             return obj
@@ -179,9 +145,9 @@ class LoadProjectSpaceBoundaries(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        loader = Loader(self)
+        loader = Loader()
         for rel in tool.Ifc.get().by_type("IfcRelSpaceBoundary"):
-            loader.load_boundary(rel)
+            loader.load_boundary(rel, tool.Ifc.get_object(rel.RelatingSpace))
         return {"FINISHED"}
 
 
@@ -192,7 +158,7 @@ class LoadBoundary(bpy.types.Operator):
     boundary_id: bpy.props.IntProperty()
 
     def execute(self, context):
-        loader = Loader(self)
+        loader = Loader()
         for obj in context.visible_objects:
             obj.select_set(False)
         obj = loader.load_boundary(tool.Ifc.get().by_id(self.boundary_id), context.active_object)
@@ -207,7 +173,7 @@ class LoadSpaceBoundaries(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
-        loader = Loader(self)
+        loader = Loader()
         element = tool.Ifc.get_entity(context.active_object)
         for rel in element.BoundedBy or []:
             loader.load_boundary(rel, context.active_object)
@@ -455,7 +421,7 @@ class EnableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
         bpy.ops.object.mode_set(mode="EDIT")
         ProfileDecorator.install(context, exit_edit_mode_callback=lambda: disable_editing_boundary_geometry(context))
         if not bpy.app.background:
-            tool.Blender.set_viewport_tool("bim.cad_tool")
+            bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
         return {"FINISHED"}
 
 
@@ -493,7 +459,7 @@ class EditBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
             ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_surface)
 
             old_mesh = obj.data
-            loader = Loader(self)
+            loader = Loader()
             obj.data = loader.create_mesh(element)
             tool.Geometry.delete_data(old_mesh)
 
@@ -514,11 +480,11 @@ class DisableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
 class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.show_boundaries"
     bl_label = "Show Boundaries"
-    bl_description = "Load selected objects boundaries if they are not loaded"
     bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
-        loader = Loader(self)
+        props = bpy.context.scene.BIMBoundaryProperties
+        loader = Loader()
         for obj in context.selected_objects:
             element = tool.Ifc.get_entity(obj)
             if not element or not getattr(element, "BoundedBy", None):
@@ -529,7 +495,7 @@ class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
             for rel in element.BoundedBy or []:
                 boundary_obj = loader.load_boundary(rel, obj)
                 tool.Boundary.decorate_boundary(boundary_obj)
-        BoundaryDecorator.install(context)
+        BoundaryDecorator.install(bpy.context)
         return {"FINISHED"}
 
 
@@ -562,36 +528,6 @@ class HideBoundaries(bpy.types.Operator, tool.Ifc.Operator):
         return {"FINISHED"}
 
 
-class DecorateBoundaries(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.decorate_boundaries"
-    bl_label = "Toggle Boundaries Decorations"
-    bl_description = "Add special decorations for all boundaries in the scene or hide them if they are already added"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        props = context.scene.BIMBoundaryProperties
-        # filter not decorated boundaries and add decorations for them
-        decorated_boundaries = set([i.obj for i in props.boundaries])
-        active_boundaries = set()
-        for element in tool.Ifc.get().by_type("IfcRelSpaceBoundary"):
-            obj = tool.Ifc.get_object(element)
-            if obj is not None:
-                active_boundaries.add(obj)
-
-        boundaries_to_decorate = active_boundaries - decorated_boundaries
-        if boundaries_to_decorate:
-            for obj in boundaries_to_decorate:
-                tool.Boundary.decorate_boundary(obj)
-            BoundaryDecorator.install(context)
-        else:
-            for obj in decorated_boundaries:
-                tool.Boundary.undecorate_boundary(obj)
-            props.boundaries.clear()
-            BoundaryDecorator.uninstall()
-            tool.Blender.update_viewport()
-        return {"FINISHED"}
-
-
 class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.add_boundary"
     bl_label = "Add Boundary"
@@ -602,7 +538,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
         related_building_element = None
         relating_space_obj = None
         related_building_element_obj = None
-        parent_boundaries = []
 
         objs = context.selected_objects
         if len(objs) == 2:
@@ -617,19 +552,8 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                 else:
                     related_building_element = element
                     related_building_element_obj = obj
-            parent_boundary = self.create_element_boundary(
-                context, relating_space, relating_space_obj, related_building_element, related_building_element_obj
-            )
-            if parent_boundary:
-                parent_boundaries.append(parent_boundary)
-        elif len(objs) == 1:
-            # New prototype, old code not yet removed. Still testing.
-            space = tool.Ifc.get_entity(objs[0])
-            if space.is_a("IfcSpace"):
-                self.auto_generate_boundaries(space, objs[0])
         elif len(objs) == 1:
             # Optionally the user may select just the space, and the building element shall be auto-detected
-            # TODO : refactor to be able to generate all boundaries for selected space automatically or with an option
 
             def msg(self, context):
                 self.layout.label(text="NO ACTIVE STOREY")
@@ -639,6 +563,8 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                 relating_space = element
                 relating_space_obj = objs[0]
 
+            target = bpy.context.scene.cursor.location
+
             collection = context.view_layer.active_layer_collection.collection
             collection_obj = bpy.data.objects.get(collection.name)
             if not collection_obj:
@@ -650,258 +576,19 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                 return
 
             for subelement in ifcopenshell.util.element.get_decomposition(spatial_element):
-                if not (
-                    subelement.is_a("IfcWall") or subelement.is_a("IfcSlab") or subelement.is_a("IfcVirtualElement")
-                ):
+                if not (subelement.is_a("IfcWall") or subelement.is_a("IfcSlab")):
                     continue
                 obj = tool.Ifc.get_object(subelement)
                 if obj:
-                    related_building_element = subelement
-                    related_building_element_obj = obj
-                    parent_boundary = self.create_element_boundary(
-                        context,
-                        relating_space,
-                        relating_space_obj,
-                        related_building_element,
-                        related_building_element_obj,
-                    )
-                    if parent_boundary:
-                        parent_boundaries.append(parent_boundary)
+                    raycast = obj.closest_point_on_mesh(obj.matrix_world.inverted() @ target, distance=0.1)
+                    if raycast[0]:
+                        related_building_element = subelement
+                        related_building_element_obj = obj
+                        break
 
-        bpy.ops.bim.show_boundaries()
-        for parent_boundary in parent_boundaries:
-            obj = tool.Ifc.get_object(parent_boundary)
-            obj.select_set(True)
-
-    def auto_generate_boundaries(self, space, space_obj):
-        # Identify all potential building elements
-        # TODO: don't select everything, use AABB culling in Blender
-        building_elements = (
-            tool.Ifc.get().by_type("IfcWall")
-            + tool.Ifc.get().by_type("IfcSlab")
-            + tool.Ifc.get().by_type("IfcVirtualElement")
-        )
-
-        # Don't generate boundaries of building elements that we've already got bounaries for.
-        for boundary in space.BoundedBy:
-            if boundary.RelatedBuildingElement in building_elements:
-                building_elements.remove(boundary.RelatedBuildingElement)
-
-        # Create tree of gross shapes of all potential related building elements
-        include = building_elements + [space]
-        tree = ifcopenshell.geom.tree()
-        shapes = {}
-        settings = ifcopenshell.geom.settings()
-        settings.set(settings.STRICT_TOLERANCE, True)
-        settings.set(settings.DISABLE_OPENING_SUBTRACTIONS, True)
-        iterator = ifcopenshell.geom.iterator(settings, tool.Ifc.get(), multiprocessing.cpu_count(), include=include)
-        if iterator.initialize():
-            while True:
-                tree.add_element(iterator.get_native())
-                shape = iterator.get()
-                shapes[shape.id] = shape
-                if not iterator.next():
-                    break
-
-        # Spatially query all potential boundary elements via a 100mm extension of the space
-        building_elements = [e for e in tree.select(space, extend=0.1) if e != space]
-
-        if not building_elements:
-            return
-
-        # Create a dissolved bmesh for the space
-        space_bm = bmesh.new()
-        space_bm.from_mesh(space_obj.data)
-        bmesh.ops.dissolve_limit(space_bm, angle_limit=pi * 2 / 360, verts=space_bm.verts, edges=space_bm.edges)
-
-        # Create dissolved bmeshes for all boundary elements
-        building_element_bms = {}
-        for building_element in building_elements:
-            bm = bmesh.new()
-            shape = shapes[building_element.id()]
-
-            verts = ifcopenshell.util.shape.get_vertices(shape.geometry)
-            for vert in verts:
-                bm.verts.new(Vector(vert))
-            bm.verts.ensure_lookup_table()
-
-            faces = ifcopenshell.util.shape.get_faces(shape.geometry)
-            for face in faces:
-                bm.faces.new([bm.verts[i] for i in face])
-            bm.verts.ensure_lookup_table()
-            bm.faces.ensure_lookup_table()
-            bm.normal_update()  # Needed so that dissolve_limit will work.
-            bmesh.ops.dissolve_limit(bm, angle_limit=radians(1), verts=bm.verts[:], edges=bm.edges[:])
-            bm.verts.ensure_lookup_table()
-            bm.faces.ensure_lookup_table()
-            building_element_bms[building_element.id()] = bm
-
-        # Compare space faces and building element faces to see if they relate to one another
-        for space_face in space_bm.faces:
-            space_face_normal = space_obj.matrix_world.to_3x3() @ space_face.normal
-            space_face_vert = space_obj.matrix_world @ space_face.verts[0].co
-            for building_element in building_elements:
-                for face in building_element_bms[building_element.id()].faces:
-                    building_obj = tool.Ifc.get_object(building_element)
-                    face_normal = building_obj.matrix_world.to_3x3() @ face.normal
-                    angle = degrees(acos(max(min(space_face_normal.dot(face_normal), 1), -1)))
-                    if tool.Cad.is_x(angle, 180, tolerance=2):
-                        pass  # Faces need to be parallel and have opposite normals to be related.
-                    elif building_element.is_a("IfcVirtualElement") and tool.Cad.is_x(angle, 0, tolerance=2):
-                        pass  # Virtual elements only need to be parallel to be related, since they are planes.
-                    else:
-                        continue
-
-                    # Both faces should be close to one another. Say within 50mm.
-                    space_vert = building_obj.matrix_world.inverted() @ space_face_vert
-                    dist = mathutils.geometry.distance_point_to_plane(space_vert, face.verts[0].co, face.normal)
-                    if abs(dist) > 0.05:
-                        continue
-
-                    # Project the building element face onto the space face
-                    space_face_verts = [v.co.copy() for v in space_face.verts]
-                    space_face_matrix = self.get_face_matrix(*[v.copy() for v in space_face_verts[0:3]])
-                    space_face_matrix_i = space_face_matrix.inverted()
-
-                    space_face_polygon = shapely.Polygon(
-                        [tuple((space_face_matrix_i @ v).xy) for v in space_face_verts]
-                    )
-
-                    space_matrix_world_i = space_obj.matrix_world.inverted()
-                    face_verts = [space_matrix_world_i @ building_obj.matrix_world @ v.co.copy() for v in face.verts]
-                    face_polygon = shapely.Polygon([tuple((space_face_matrix_i @ v).xy) for v in face_verts])
-
-                    gross_boundary_polygon = space_face_polygon.intersection(face_polygon)
-
-                    if type(gross_boundary_polygon) == shapely.GeometryCollection:
-                        for geom in gross_boundary_polygon.geoms:
-                            if type(geom) == shapely.Polygon:
-                                gross_boundary_polygon = geom
-                                break
-
-                    if (
-                        not (isinstance(gross_boundary_polygon, shapely.Polygon) and gross_boundary_polygon.is_valid)
-                        or gross_boundary_polygon.is_empty
-                    ):
-                        continue
-
-                    # The gross boundary polygon may not be a true gross boundary since it
-                    # may have openings already removed, such as in IFC4 Reference View. So
-                    # we cheat by using the exterior boundary to mean "gross".
-                    exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)
-
-                    parent_boundary = tool.Ifc.run(
-                        "root.create_entity", ifc_class=bpy.context.scene.BIMModelProperties.boundary_class
-                    )
-                    if building_element.is_a("IfcVirtualElement"):
-                        parent_boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
-                    else:
-                        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-                    parent_boundary.InternalOrExternalBoundary = "NOTDEFINED"
-                    if building_element.is_a("IfcWall"):
-                        is_external = ifcopenshell.util.element.get_pset(
-                            building_element, "Pset_WallCommon", "IsExternal"
-                        )
-                        if is_external is True:
-                            parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
-                        elif is_external is False:
-                            parent_boundary.InternalOrExternalBoundary = "INTERNAL"
-                    elif building_element.is_a("IfcSlab"):
-                        predefined_type = ifcopenshell.util.element.get_predefined_type(building_element)
-                        if predefined_type == "BASESLAB":
-                            parent_boundary.InternalOrExternalBoundary = "EXTERNAL_EARTH"
-                        else:
-                            is_external = ifcopenshell.util.element.get_pset(
-                                building_element, "Pset_SlabCommon", "IsExternal"
-                            )
-                            if is_external is True:
-                                parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
-                            elif is_external is False:
-                                parent_boundary.InternalOrExternalBoundary = "INTERNAL"
-                    parent_boundary.RelatingSpace = space
-                    parent_boundary.RelatedBuildingElement = building_element
-                    parent_boundary.ConnectionGeometry = self.create_connection_geometry_from_polygon(
-                        exterior_boundary_polygon, space_face_matrix
-                    )
-                    self.set_boundary_name(parent_boundary)
-
-                    for rel in getattr(building_element, "HasOpenings", []):
-                        opening = rel.RelatedOpeningElement
-                        filling = opening.HasFillings[0].RelatedBuildingElement if opening.HasFillings else None
-
-                        # Create shape of opening as a dissolved BMesh
-                        settings = ifcopenshell.geom.settings()
-                        settings.set(settings.STRICT_TOLERANCE, True)
-                        shape = ifcopenshell.geom.create_shape(settings, opening)
-                        m = shape.transformation.matrix.data
-                        mat = Matrix(
-                            (
-                                [m[0], m[3], m[6], m[9]],
-                                [m[1], m[4], m[7], m[10]],
-                                [m[2], m[5], m[8], m[11]],
-                                [0, 0, 0, 1],
-                            )
-                        )
-                        opening_bm = bmesh.new()
-                        verts = ifcopenshell.util.shape.get_vertices(shape.geometry)
-                        for vert in verts:
-                            opening_bm.verts.new(Vector(vert))
-                        opening_bm.verts.ensure_lookup_table()
-                        faces = ifcopenshell.util.shape.get_faces(shape.geometry)
-                        for face in faces:
-                            opening_bm.faces.new([opening_bm.verts[i] for i in face])
-                        opening_bm.verts.ensure_lookup_table()
-                        opening_bm.faces.ensure_lookup_table()
-                        opening_bm.normal_update()  # Needed so that dissolve_limit will work.
-                        bmesh.ops.dissolve_limit(
-                            opening_bm, angle_limit=radians(1), verts=opening_bm.verts[:], edges=opening_bm.edges[:]
-                        )
-                        opening_bm.verts.ensure_lookup_table()
-                        opening_bm.faces.ensure_lookup_table()
-
-                        # Get relevant faces of BMesh that can turn into boundaries
-                        opening_polygons = []
-                        for opening_face in opening_bm.faces:
-                            opening_face_normal = mat.to_3x3() @ opening_face.normal
-                            angle = degrees(acos(max(min(opening_face_normal.dot(face_normal), 1), -1)))
-                            if not tool.Cad.is_x(angle, 180, tolerance=2):
-                                continue  # Any non-parallel faces are not relevant
-                            opening_face_verts = [space_matrix_world_i @ mat @ v.co.copy() for v in opening_face.verts]
-                            polygon = shapely.Polygon([tuple((space_face_matrix_i @ v).xy) for v in opening_face_verts])
-                            opening_polygons.append(polygon)
-
-                        # Merge them all into a single opening polygon for our boundary
-                        opening_polygon = shapely.ops.unary_union(opening_polygons)
-
-                        # Only openings that are projected onto our exterior boundary are relevant.
-                        if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
-                            continue
-
-                        boundary = tool.Ifc.run(
-                            "root.create_entity", ifc_class=bpy.context.scene.BIMModelProperties.boundary_class
-                        )
-                        boundary.RelatingSpace = space
-                        boundary.RelatedBuildingElement = filling or opening
-                        boundary.ConnectionGeometry = self.create_connection_geometry_from_polygon(
-                            opening_polygon, space_face_matrix
-                        )
-                        if filling:
-                            boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-                        else:
-                            boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
-                        boundary.InternalOrExternalBoundary = parent_boundary.InternalOrExternalBoundary
-                        if boundary.is_a() != "IfcRelSpaceBoundary":
-                            boundary.ParentBoundary = parent_boundary
-                        self.set_boundary_name(boundary)
-
-    def create_element_boundary(
-        self, context, relating_space, relating_space_obj, related_building_element, related_building_element_obj
-    ):
         if not relating_space or not related_building_element:
             return
 
-        # Find which face on space should be bounded to related building element
-        # TODO: Handle round wall where multiple faces need to be bound to the same related building element
         bm = bmesh.new()
         bm.from_mesh(relating_space_obj.data)
         bmesh.ops.dissolve_limit(bm, angle_limit=pi * 2 / 360, verts=bm.verts, edges=bm.edges)
@@ -922,6 +609,8 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
         if not target_face:
             return
 
+        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
+
         # Is this right? Or should I use loop?
         target_face_verts = [v.co.copy() for v in target_face.verts]
         target_face_matrix = self.get_face_matrix(*[v.copy() for v in target_face_verts[0:3]])
@@ -941,18 +630,6 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                     gross_boundary_polygon = geom
                     break
 
-        if (
-            not (isinstance(gross_boundary_polygon, shapely.Polygon) and gross_boundary_polygon.is_valid)
-            or gross_boundary_polygon.is_empty
-        ):
-            return
-
-        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
-        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-        # Set to EXTERNAL by default and turn later to internal if there is a corresponding boundary relating to an
-        # internal space
-        parent_boundary.InternalOrExternalBoundary = "EXTERNAL"
-
         # The gross boundary polygon may not be a true gross boundary since it
         # may have openings already removed, such as in IFC4 Reference View. So
         # we cheat by using the exterior boundary to mean "gross". Later, we
@@ -960,25 +637,19 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
         # space.
         exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)
 
+        net_boundary_polygon = shapely.Polygon(gross_boundary_polygon)
+
         inner_boundaries = []
 
         for rel in getattr(related_building_element, "HasOpenings", []):
             opening = rel.RelatedOpeningElement
-            if not opening.HasFillings:
-                continue
-            # TODO: HasFilling is a zero to many relationship. How to handle many ?
-            filling = opening.HasFillings[0].RelatedBuildingElement
+            filling = None
+            if opening.HasFillings:
+                filling = opening.HasFillings[0].RelatedBuildingElement
 
             opening_polygon = self.get_flattened_polygon(opening, relating_space_obj, target_face_matrix_i)
 
-            # An inner boundary is supposed to overlap its parent boundary according to IFC4 documentation
-            # so we extend our exterior boundary with all opening which has a filling
-            # Also see Implementation aggreement SB 1.1 for IFC 2x3 TC1 Space Boundary Addon View
-            # https://standards.buildingsmart.org/MVD/RELEASE/IFC2x3/TC1/SB1_1/IFC%20Space%20Boundary%20Implementation%20Agreement%20Addendum%202010-03-22.pdf
-            unionised_object = exterior_boundary_polygon.union(opening_polygon)
-            if isinstance(unionised_object, shapely.Polygon):
-                exterior_boundary_polygon = unionised_object
-
+            net_boundary_polygon = net_boundary_polygon.difference(opening_polygon)
             # Only openings that are projected onto our exterior boundary are relevant.
             if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
                 continue
@@ -986,25 +657,24 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
             connection_geometry = self.create_connection_geometry_from_polygon(opening_polygon, target_face_matrix)
             boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
             boundary.RelatingSpace = relating_space
-            boundary.RelatedBuildingElement = filling
+            boundary.RelatedBuildingElement = filling or related_building_element
             boundary.ConnectionGeometry = connection_geometry
-            if related_building_element.is_a("IfcVirtualElement"):
-                boundary.PhysicalOrVirtualBoundary = "VIRTUAL"
-            else:
-                boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
-            boundary.InternalOrExternalBoundary = parent_boundary.InternalOrExternalBoundary
-            self.set_boundary_name(boundary)
+            boundary.PhysicalOrVirtualBoundary = "PHYSICAL" if filling else "VIRTUAL"
+            boundary.InternalOrExternalBoundary = "INTERNAL"
+
             if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
                 boundary.ParentBoundary = parent_boundary
 
-        connection_geometry = self.create_connection_geometry_from_polygon(
-            exterior_boundary_polygon, target_face_matrix
-        )
+        connection_geometry = self.create_connection_geometry_from_polygon(net_boundary_polygon, target_face_matrix)
         parent_boundary.RelatingSpace = relating_space
         parent_boundary.RelatedBuildingElement = related_building_element
         parent_boundary.ConnectionGeometry = connection_geometry
-        self.set_boundary_name(parent_boundary)
-        return parent_boundary
+        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
+        parent_boundary.InternalOrExternalBoundary = "INTERNAL"
+
+        bpy.ops.bim.show_boundaries()
+        obj = tool.Ifc.get_object(parent_boundary)
+        obj.select_set(True)
 
     def get_face_matrix(self, p1, p2, p3):
         edge1 = p2 - p1
@@ -1059,13 +729,11 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
         tool.Model.unit_scale = self.unit_scale
 
         surface = tool.Ifc.get().createIfcCurveBoundedPlane()
-        surface.BasisSurface = tool.Ifc.get().createIfcPlane(
-            tool.Ifc.get().createIfcAxis2Placement3D(
-                tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
-                tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
-                tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
-            )
-        )
+        surface.BasisSurface = tool.Ifc.get().createIfcPlane(tool.Ifc.get().createIfcAxis2Placement3D(
+            tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
+            tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
+            tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
+        ))
 
         if tool.Ifc.get().schema != "IFC2X3":
             points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
@@ -1078,24 +746,9 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
                 point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
                 inner_boundaries.append(tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False))
         else:
-            pass  # TODO
+            pass # TODO
 
         surface.OuterBoundary = outer_boundary
         surface.InnerBoundaries = inner_boundaries
 
         return surface
-
-    def set_boundary_name(self, boundary):
-        """
-        By convention 1stLevel and 2ndLevel boundary have specific name and description
-        See https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRelSpaceBoundary.htm
-        Warning: IfcRelSpaceBoundary2ndLevel is a subclass of IfcRelSpaceBoundary1stLevel test order matter
-        """
-        if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
-            boundary.Name = "2ndLevel"
-            if boundary.CorrespondingBoundary:
-                boundary.Description = "2a"
-            else:
-                boundary.Description = "2b"
-        elif boundary.is_a("IfcRelSpaceBoundary1stLevel"):
-            boundary.Name = "1stLevel"

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

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

src/blenderbim/blenderbim/bim/module/brick/__init__.py

@@ -35,16 +35,13 @@ classes = (
     operator.ViewBrickItem,
     operator.SerializeBrick,
     operator.AddBrickNamespace,
+    operator.SetBrickListRoot,
     operator.RemoveBrickRelation,
     prop.Brick,
     prop.BIMBrickProperties,
     ui.BIM_PT_brickschema,
-    ui.BIM_PT_brickschema_project_info,
-    ui.BIM_PT_brickschema_namespaces,
-    ui.BIM_PT_brickschema_create_entity,
-    ui.BIM_PT_brickschema_viewport,
-    ui.BIM_UL_bricks,
     ui.BIM_PT_ifc_brickschema_references,
+    ui.BIM_UL_bricks,
 )
 
 

src/blenderbim/blenderbim/bim/module/brick/data.py

@@ -46,7 +46,7 @@ class BrickschemaData:
 
     @classmethod
     def get_is_loaded(cls):
-        return BrickStore.graph is not None  # `if BrickStore.graph` by itself takes ages.
+        return BrickStore.graph is not None
 
     @classmethod
     def active_relations(cls):
@@ -67,63 +67,45 @@ class BrickschemaData:
             PREFIX brick: <https://brickschema.org/schema/Brick#>
             PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-            SELECT DISTINCT ?predicate ?object ?label ?sp ?sv  WHERE {
-                <{uri}> ?predicate ?object .
-                OPTIONAL {
-                    ?object rdfs:label ?label . 
-                }
-                OPTIONAL {
-                    { ?predicate rdfs:range brick:TimeseriesReference . }
-                    UNION
-                    { ?predicate a brick:EntityProperty . }
-                    ?object ?sp ?sv .
-                }
+            SELECT DISTINCT ?predicate ?object ?sp ?sv WHERE {
+               <{uri}> ?predicate ?object .
+               OPTIONAL {
+               { ?predicate rdfs:range brick:TimeseriesReference . }
+                UNION
+               { ?predicate a brick:EntityProperty . }
+                ?object ?sp ?sv }
             }
-            GROUP BY ?object
         """.replace(
                 "{uri}", uri
             )
         )
         for row in query:
-            predicate_uri = row.get("predicate")
-            predicate_name = predicate_uri.toPython().split("#")[-1]
-            object_uri = row.get("object")
-            object_name = row.get("label")
-            if not object_name:
-                if isinstance(object_uri, BNode):
-                    object_name = "[]"
-                else:
-                    try:
-                        object_name = object_uri.toPython().split("#")[-1]
-                    except:
-                        object_name = str(object_uri)
+            predicate = row.get("predicate")
+            predicate_name = predicate.toPython().split("#")[-1]
+            object = row.get("object")
+            object_name = object.toPython().split("#")[-1]
             results.append(
                 {
-                    "predicate_uri": predicate_uri,
+                    "predicate": predicate,
                     "predicate_name": predicate_name,
-                    "object_uri": object_uri,
+                    "object": object,
                     "object_name": object_name,
-                    "is_uri": isinstance(object_uri, URIRef),
-                    "is_globalid": predicate_name == "ifcGlobalID",
+                    "is_uri": isinstance(object, URIRef),
+                    "object_uri": object.toPython(),
+                    "is_globalid": predicate == "globalID",
                 }
             )
-            if isinstance(object_uri, BNode):
-                for subject2, predicate2, object2 in BrickStore.graph.triples((object_uri, None, None)):
-                    predicate2_name = predicate2.toPython().split("#")[-1]
-                    try:
-                        object2_name = object2.toPython().split("#")[-1]
-                    except:
-                        object2_name = str(object2)
-                    results.append(
-                        {
-                            "predicate_uri": None,
-                            "predicate_name": predicate_name + ":" + predicate2_name,
-                            "object_uri": object2,
-                            "object_name": object2_name,
-                            "is_uri": isinstance(object2, URIRef),
-                            "is_globalid": predicate2_name == "ifcGlobalID",
-                        }
-                    )
+            # if isinstance(row.get("object"), BNode):
+            #     for s, p, o in BrickStore.graph.triples((object, None, None)):
+            #         results.append(
+            #             {
+            #                 "predicate": predicate + ":" + p.toPython().split("#")[-1],
+            #                 "object": o.toPython().split("#")[-1],
+            #                 "is_uri": isinstance(o, URIRef),
+            #                 "object_uri": o.toPython(),
+            #                 "is_globalid": p.toPython().split("#")[-1] == "globalID",
+            #             }
+            #         )
         return results
 
 
@@ -149,7 +131,7 @@ class BrickschemaReferencesData:
         for library in ifc.by_type("IfcLibraryInformation"):
             if tool.Ifc.get_schema() == "IFC2X3":
                 results.append((str(library.id()), library.Name or "Unnamed", ""))
-            elif library.Location and ".ttl" in library.Location:
+            elif ".ttl" in library.Location:
                 results.append((str(library.id()), library.Name or "Unnamed", ""))
         return results
 

src/blenderbim/blenderbim/bim/module/brick/operator.py

@@ -37,7 +37,6 @@ class LoadBrickProject(bpy.types.Operator, Operator):
     bl_idname = "bim.load_brick_project"
     bl_label = "Load Brickschema Project"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Load in a Brick project from a file"
     filepath: bpy.props.StringProperty(subtype="FILE_PATH")
     filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})
 
@@ -57,7 +56,6 @@ class ViewBrickClass(bpy.types.Operator, Operator):
     bl_idname = "bim.view_brick_class"
     bl_label = "View Brick Class"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Inspect the subclasses of this class"
     brick_class: bpy.props.StringProperty(name="Brick Class")
     split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})
 
@@ -69,22 +67,17 @@ class ViewBrickItem(bpy.types.Operator, Operator):
     bl_idname = "bim.view_brick_item"
     bl_label = "View Brick Item"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Inspect this entity in the viewer"
     item: bpy.props.StringProperty(name="Brick Item")
     split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})
 
     def _execute(self, context):
-        try:
-            core.view_brick_item(tool.Brick, item=self.item, split_screen=self.split_screen)
-        except:
-            self.report({'ERROR'}, f'Could not find {self.item}')
+        core.view_brick_item(tool.Brick, item=self.item, split_screen=self.split_screen)
 
 
 class RewindBrickClass(bpy.types.Operator, Operator):
     bl_idname = "bim.rewind_brick_class"
     bl_label = "Rewind Brick Class"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Go back to the previous list view"
     split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})
 
     def _execute(self, context):
@@ -95,7 +88,6 @@ class CloseBrickProject(bpy.types.Operator, Operator):
     bl_idname = "bim.close_brick_project"
     bl_label = "Close Brick Project"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Close the Brick project"
 
     def _execute(self, context):
         core.close_brick_project(tool.Brick)
@@ -105,7 +97,6 @@ class ConvertBrickProject(bpy.types.Operator, Operator):
     bl_idname = "bim.convert_brick_project"
     bl_label = "Convert Brick Project"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create an Ifc library for this Brick project"
 
     def _execute(self, context):
         core.convert_brick_project(tool.Ifc, tool.Brick)
@@ -115,18 +106,9 @@ class AssignBrickReference(bpy.types.Operator, Operator):
     bl_idname = "bim.assign_brick_reference"
     bl_label = "Assign Brick Reference"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Assign the selected Ifc entity to the selected Brick entity"
 
     def _execute(self, context):
-        if not context.active_object:
-            self.report({'ERROR'}, f'No Ifc selected')
-            return
         props = context.scene.BIMBrickProperties
-        try:
-            props.bricks[props.active_brick_index]
-        except:
-            self.report({'ERROR'}, f'No Brick selected')
-            return
         core.assign_brick_reference(
             tool.Ifc,
             tool.Brick,
@@ -140,17 +122,19 @@ class AddBrick(bpy.types.Operator, Operator):
     bl_idname = "bim.add_brick"
     bl_label = "Add Brick"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create the Brick entity"
 
     def _execute(self, context):
         props = context.scene.BIMBrickProperties
+        library = None
+        if props.libraries:
+            library = tool.Ifc.get().by_id(int(props.libraries))
         core.add_brick(
             tool.Ifc,
             tool.Brick,
             element=tool.Ifc.get_entity(context.active_object) if context.selected_objects else None,
             namespace=props.namespace,
             brick_class=props.brick_entity_class,
-            library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
+            library=library,
             label=props.new_brick_label,
         )
 
@@ -159,7 +143,6 @@ class AddBrickRelation(bpy.types.Operator, Operator):
     bl_idname = "bim.add_brick_relation"
     bl_label = "Add Brick Relation"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create the Brick relationship"
 
     def _execute(self, context):
         props = context.scene.BIMBrickProperties
@@ -169,7 +152,7 @@ class AddBrickRelation(bpy.types.Operator, Operator):
         elif props.split_screen_toggled:
             object = props.split_screen_bricks[props.split_screen_active_brick_index].uri
         else:
-            object = props.namespace + props.new_brick_relation_object
+            object = props.new_brick_relation_namespace + props.new_brick_relation_object
         core.add_brick_relation(
             tool.Brick,
             brick_uri=brick.uri,
@@ -182,7 +165,6 @@ class ConvertIfcToBrick(bpy.types.Operator, Operator):
     bl_idname = "bim.convert_ifc_to_brick"
     bl_label = "Convert IFC To Brick"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Convert Ifc entities and relations to Brick entities and relations"
 
     def _execute(self, context):
         props = context.scene.BIMBrickProperties
@@ -196,7 +178,6 @@ class NewBrickFile(bpy.types.Operator):
     bl_idname = "bim.new_brick_file"
     bl_label = "New Brick File"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Create a Brick project from scratch"
 
     def execute(self, context):
         IfcStore.begin_transaction(self)
@@ -229,17 +210,16 @@ class RefreshBrickViewer(bpy.types.Operator, Operator):
     bl_idname = "bim.refresh_brick_viewer"
     bl_label = "Refresh Brick Viewer"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Refresh the list view"
+    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})
 
     def _execute(self, context):
-        core.refresh_brick_viewer(tool.Brick)
+        core.refresh_brick_viewer(tool.Brick, split_screen=self.split_screen)
 
 
 class RemoveBrick(bpy.types.Operator, Operator):
     bl_idname = "bim.remove_brick"
     bl_label = "Remove Brick"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Delete this entity"
 
     def _execute(self, context):
         props = context.scene.BIMBrickProperties
@@ -282,20 +262,32 @@ class SerializeBrick(bpy.types.Operator):
 class AddBrickNamespace(bpy.types.Operator, Operator):
     bl_idname = "bim.add_brick_namespace"
     bl_label = "Add Brick Namespace"
-    bl_description = "Bind a new namespace to the Brick project"
 
     def _execute(self, context):
         props = context.scene.BIMBrickProperties
         alias = props.new_brick_namespace_alias
         uri = props.new_brick_namespace_uri
-        core.add_brick_namespace(tool.Brick, alias=alias, uri=uri)
+        core.add_namespace(tool.Brick, alias=alias, uri=uri)
+
+
+class SetBrickListRoot(bpy.types.Operator, Operator):
+    bl_idname = "bim.set_brick_list_root"
+    bl_label = "Set Brick View Type"
+    bl_options = {"REGISTER", "UNDO"}
+    split_screen: bpy.props.BoolProperty(name="Split Screen", default=False, options={"HIDDEN"})
+
+    def _execute(self, context):
+        if self.split_screen:
+            root = context.scene.BIMBrickProperties.split_screen_brick_list_root
+        else:
+            root = context.scene.BIMBrickProperties.brick_list_root
+        core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=self.split_screen)
 
 
 class RemoveBrickRelation(bpy.types.Operator, Operator):
     bl_idname = "bim.remove_brick_relation"
     bl_label = "Remove Relation"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Delete this relationship"
     predicate: bpy.props.StringProperty(name="Relation")
     object: bpy.props.StringProperty(name="Object")
 

src/blenderbim/blenderbim/bim/module/brick/prop.py

@@ -30,8 +30,6 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-import blenderbim.core.brick as core
-import blenderbim.tool.brick as tool
 from blenderbim.tool.brick import BrickStore
 
 def update_active_brick_index(self, context):
@@ -45,12 +43,12 @@ def get_libraries(self, context):
 
 
 def get_namespaces(self, context):
-    return [(uri, f"{alias}: {uri}", "") for alias, uri in BrickStore.namespaces]
+    return BrickStore.namespaces
 
 
 def get_brick_entity_classes(self, context):
     entity = self.brick_entity_create_type
-    return [(uri, uri.split("#")[-1], "") for uri in BrickStore.entity_classes[entity]]
+    return BrickStore.entity_classes[entity]
 
 
 def get_brick_roots(self, context): 
@@ -58,22 +56,13 @@ def get_brick_roots(self, context):
 
 
 def get_brick_relations(self, context):
-    relations = [(uri, uri.split("#")[-1], "") for uri in BrickStore.relationships]
-    for relation in BrickschemaData.data["active_relations"]:
-        if relation["predicate_name"] == "label":
-            return relations
-    relations.append(("http://www.w3.org/2000/01/rdf-schema#label", "label", ""))
-    return relations
-    
-
-
-def update_view(self, context):
-    root = context.scene.BIMBrickProperties.brick_list_root
-    core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=False)
-
-def split_screen_update_view(self, context):
-    root = context.scene.BIMBrickProperties.split_screen_brick_list_root
-    core.set_brick_list_root(tool.Brick, brick_root=root, split_screen=True)
+    def is_label(relation):
+        return relation["predicate_name"] == "label"
+    if not list(filter(is_label, BrickschemaData.data["active_relations"])):
+        new_relations = BrickStore.relationships.copy()
+        new_relations.append(("http://www.w3.org/2000/01/rdf-schema#label", "label", ""))
+        return new_relations
+    return BrickStore.relationships
 
 
 class Brick(PropertyGroup):
@@ -90,9 +79,10 @@ class BIMBrickProperties(PropertyGroup):
     active_brick_index: IntProperty(name="Active Brick Index", update=update_active_brick_index)
     libraries: EnumProperty(name="Libraries", items=get_libraries)
     set_list_root_toggled: BoolProperty(name="Set List Root Toggled", default=False)
-    brick_list_root: EnumProperty(name="Brick List Root", items=get_brick_roots, update=update_view)
+    brick_list_root: EnumProperty(name="Brick List Root", items=get_brick_roots)
     # namespace manager
     namespace: EnumProperty(name="Namespace", items=get_namespaces)
+    brick_settings_toggled: BoolProperty(name="Brick Settings Toggled", default=False)
     new_brick_namespace_alias: StringProperty(name="New Brick Namespace Alias")
     new_brick_namespace_uri: StringProperty(name="New Brick Namespace URI")
     # create brick entity
@@ -103,12 +93,13 @@ class BIMBrickProperties(PropertyGroup):
     brick_create_relations_toggled: BoolProperty(name="Brick Create Relations Toggled", default=False)
     brick_edit_relations_toggled: BoolProperty(name="Brick Edit Relations Toggled", default=False)
     new_brick_relation_type: EnumProperty(name="New Brick Relation Type", items=get_brick_relations)
+    new_brick_relation_namespace: EnumProperty(name="New Brick Relation Namespace", items=get_namespaces)
     new_brick_relation_object: StringProperty(name="New Brick Relation Object")
-    add_brick_relation_failed: BoolProperty(name="Add Relation Failed", default=False)
+    add_relation_failed: BoolProperty(name="Add Relation Failed", default=False)
     # create relations split screen
     split_screen_toggled: BoolProperty(name="Split Screen Toggled", default=False)
     split_screen_bricks: CollectionProperty(name="Split Screen Bricks", type=Brick)
     split_screen_active_brick_index: IntProperty(name="Split Screen Active Brick Index", update=update_active_brick_index)
     split_screen_active_brick_class: StringProperty(name="Split Screen Active Brick Class")
     split_screen_brick_breadcrumbs: CollectionProperty(name="Split Screen Brick Breadcrumbs", type=StrProperty)
-    split_screen_brick_list_root: EnumProperty(name="Split Screen Brick List Root", items=get_brick_roots, update=split_screen_update_view)
+    split_screen_brick_list_root: EnumProperty(name="Split Screen Brick List Root", items=get_brick_roots)

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

@@ -34,36 +34,17 @@ class BIM_PT_brickschema(Panel):
     def draw(self, context):
         if not BrickschemaData.is_loaded:
             BrickschemaData.load()
-
-
-class BIM_PT_brickschema_project_info(Panel):
-    bl_label = "Project Info"
-    bl_idname = "BIM_PT_brickschema_project_info"
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    def draw(self, context):
         self.props = context.scene.BIMBrickProperties
-        
+
         if not BrickschemaData.data["is_loaded"]:
             row = self.layout.row(align=True)
             row.operator("bim.new_brick_file", text="Create Project")
             row.operator("bim.load_brick_project", text="Load Project")
             return
 
-        row = self.layout.row(align=True)
         if BrickStore.path:
+            row = self.layout.row(align=True)
             row.label(text=BrickStore.path, icon="FILEBROWSER")
-        else:
-            row.label(text="No file", icon="FILEBROWSER")
-        
-        row = self.layout.row(align=True)
-        if BrickStore.last_saved:
-            row.label(text=BrickStore.last_saved, icon="TIME")
-        else:
-            row.label(text="Not saved", icon="TIME")
 
         row = self.layout.row(align=True)
         op = row.operator("bim.serialize_brick", icon="EXPORT", text="Save")
@@ -72,173 +53,134 @@ class BIM_PT_brickschema_project_info(Panel):
         op.should_save_as = True
         row.operator("bim.close_brick_project", text="", icon="CANCEL")
 
-
-class BIM_PT_brickschema_namespaces(Panel):
-    bl_label = "Namespaces"
-    bl_idname = "BIM_PT_brickschema_namespaces"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    @classmethod
-    def poll(cls, context):
-        return BrickStore.graph != None
-
-    def draw(self, context):
-        self.props = context.scene.BIMBrickProperties
-
         row = self.layout.row(align=True)
-        row.label(text="Active Namespace:")
-
-        row = self.layout.row(align=True)
-        prop_with_search(row, self.props, "namespace", text="")
-
-        row = self.layout.row(align=True)
-        row.label(text="Bind New Namespace:")
-
-        row = self.layout.row(align=True)
-        row.prop(data=self.props, property="new_brick_namespace_alias", text="")
-        col = row.column()
-        col.alignment = "CENTER"
-        col.scale_x = 1.1
-        col.label(text=":")
-        row.prop(data=self.props, property="new_brick_namespace_uri", text="")
-        row.operator("bim.add_brick_namespace", text="", icon="ADD")
-
-
-class BIM_PT_brickschema_create_entity(Panel):
-    bl_label = "Create Entity"
-    bl_idname = "BIM_PT_brickschema_create_entity"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    @classmethod
-    def poll(cls, context):
-        return BrickStore.graph != None
-
-    def draw(self, context):
-        self.props = context.scene.BIMBrickProperties
-        # TO DO: hide this if selected entity already has a reference, or something similar
-
-        row = self.layout.row(align=True)
-        row.prop(data=self.props, property="brick_entity_create_type", text="Class")
-
-        row = self.layout.row(align=True)
-        prop_with_search(row, self.props, "brick_entity_class", text="Type")
+        row.prop(data=self.props, property="brick_settings_toggled", text="", icon="PREFERENCES")
         
-        row = self.layout.row(align=True)
-        active = tool.Ifc.get_entity(context.active_object)
-        if active and context.selected_objects:
-            row.label(text="Label:")
-            row.label(text=active.Name if active.Name else "Unnamed")
-        else:
-            row.prop(data=self.props, property="new_brick_label", text="Label")
+        if self.props.brick_settings_toggled:
+            box = self.layout.box()
+            row = box.row(align=True)
+            row.label(text="Active Namespace:")
+
+            row = box.row(align=True)
+            prop_with_search(row, self.props, "namespace", text="")
+
+            row = box.row(align=True)
+            row.label(text="Bind New Namespace:")
+
+            row = box.row(align=True)
+            row.prop(data=self.props, property="new_brick_namespace_alias", text="")
+            col = row.column()
+            col.alignment = "CENTER"
+            col.scale_x = 1.1
+            col.label(text=":")
+            row.prop(data=self.props, property="new_brick_namespace_uri", text="")
+            row.operator("bim.add_brick_namespace", text="", icon="ADD")
 
         row = self.layout.row(align=True)
-        row.operator("bim.add_brick", text="Create Entity")
-     
-
-class BIM_PT_brickschema_viewport(Panel):
-    bl_label = "Viewport"
-    bl_idname = "BIM_PT_brickschema_viewport"
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_brickschema"
-
-    @classmethod
-    def poll(cls, context):
-        return BrickStore.graph != None
-
-    def draw(self, context):
-        self.props = context.scene.BIMBrickProperties
+        row.label(text="Create Entity:")
 
         row = self.layout.row(align=True)
-        row.column().alignment = "RIGHT"
-        row.prop(data=self.props, property="set_list_root_toggled", text="", icon="OUTLINER")
+        row.prop(data=self.props, property="brick_entity_create_type", text="")
+
+        row = self.layout.row(align=True)
+        row.prop(data=self.props, property="new_brick_label", text="")
+        prop_with_search(row, self.props, "brick_entity_class", text="")
+        row.operator("bim.add_brick", text="", icon="ADD")
+        # row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
+
+        row = self.layout.row(align=True)
+        col = row.column()
+        col.alignment = "RIGHT"
         row.prop(data=self.props, property="split_screen_toggled", text="", icon="WINDOW")
-        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
 
         grid = self.layout.grid_flow(even_columns=True)
-        grid_left = grid.column(align=True)
-        row = grid_left.row(align=True)
+        grid1 = grid.column(align=True)
+        row = grid1.row(align=True)
         if len(self.props.brick_breadcrumbs):
             op = row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
             op.split_screen = False
+        row.prop(data=self.props, property="set_list_root_toggled", text="", icon="OUTLINER")
         row.label(text=self.props.active_brick_class)
 
         if self.props.set_list_root_toggled:
-            row = grid_left.row(align=True)
+            row = grid1.row(align=True)
+            op = row.operator("bim.set_brick_list_root", text="Set View")
+            op.split_screen = False
             row.prop(data=self.props, property="brick_list_root", text="")
 
-        row = grid_left.row()
+        row = grid1.row()
         BIM_UL_bricks.split_screen = False
         row.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")
 
         if self.props.split_screen_toggled:
-            grid_right = grid.column(align=True)
-            row = grid_right.row(align=True)
+            grid2 = grid.column(align=True)
+            row = grid2.row(align=True)
             if len(self.props.split_screen_brick_breadcrumbs):
                 op = row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
                 op.split_screen = True
             row.label(text=self.props.split_screen_active_brick_class)
 
             if self.props.set_list_root_toggled:
-                row = grid_right.row(align=True)
+                row = grid2.row(align=True)
+                op = row.operator("bim.set_brick_list_root", text="Set View")
+                op.split_screen = True
                 row.prop(data=self.props, property="split_screen_brick_list_root", text="")
 
-            row = grid_right.row()
+            row = grid2.row()
             BIM_UL_bricks.split_screen = True
             row.template_list("BIM_UL_bricks", "", self.props, "split_screen_bricks", self.props, "split_screen_active_brick_index")
 
         if BrickschemaData.data["active_relations"]:
             row = self.layout.row(align=True)
-            row.column().alignment = "RIGHT"
+            col = row.column()
+            col.alignment = "RIGHT"
             row.prop(data=self.props, property="brick_create_relations_toggled", text="", icon="PLUGIN")
             row.prop(data=self.props, property="brick_edit_relations_toggled", text="", icon="TOOL_SETTINGS")
             row.operator("bim.remove_brick", text="", icon="X")
 
-            if self.props.brick_create_relations_toggled and self.props.split_screen_toggled:
+            row = self.layout.row(align=True)
+            row.label(text="Create Relation:")
+
+            if self.props.brick_create_relations_toggled and self.props.new_brick_relation_type == "http://www.w3.org/2000/01/rdf-schema#label":
                 row = self.layout.row(align=True)
-                try:
-                    split_screen_selection = self.props.split_screen_bricks[self.props.split_screen_active_brick_index]
-                except:
-                    split_screen_selection = None
-                if not split_screen_selection or split_screen_selection.total_items:
+                prop_with_search(row, self.props, "new_brick_relation_type", text="")
+                row.prop(data=self.props, property="new_brick_relation_object", text="")
+                row.operator("bim.add_brick_relation", text="", icon="ADD")
+
+            elif self.props.brick_create_relations_toggled and self.props.split_screen_toggled:
+                row = self.layout.row(align=True)
+                split_screen_selection = self.props.split_screen_bricks[self.props.split_screen_active_brick_index]
+                if split_screen_selection.total_items:
                     row.label(text="No selection", icon="INFO")
                 else:
                     prop_with_search(row, self.props, "new_brick_relation_type", text="")
                     row.label(text=split_screen_selection.label if split_screen_selection.label else split_screen_selection.name)
                     row.operator("bim.add_brick_relation", text="", icon="ADD")
 
-            elif self.props.brick_create_relations_toggled:
+            elif self.props.brick_create_relations_toggled: 
+                row = self.layout.row(align=True)
+                prop_with_search(row, self.props, "new_brick_relation_namespace", text="")
+
                 row = self.layout.row(align=True)
                 prop_with_search(row, self.props, "new_brick_relation_type", text="")
                 row.prop(data=self.props, property="new_brick_relation_object", text="")
                 row.operator("bim.add_brick_relation", text="", icon="ADD")
+            
 
-            if self.props.brick_create_relations_toggled and self.props.add_brick_relation_failed:
+            if self.props.brick_create_relations_toggled and self.props.add_relation_failed:
                 row = self.layout.row(align=True)
                 row.label(text="Failed to find this entity!", icon="ERROR")
+                
 
         for relation in BrickschemaData.data["active_relations"]:
-            split = self.layout.split(factor=0.85, align=True)
-            row = split.row(align=True)
+            row = self.layout.row(align=True)
             row.label(text=relation["predicate_name"])
-            row.separator()
             row.label(text=relation["object_name"])
-            row = split.row(align=True)
-            row.column().alignment = "RIGHT"
-            if self.props.brick_edit_relations_toggled and relation["predicate_uri"] and relation["predicate_name"] != "type":
+            if self.props.brick_edit_relations_toggled and relation["predicate_name"] != "type":
                 op = row.operator("bim.remove_brick_relation", text="", icon="UNLINKED")
-                op.predicate = relation["predicate_uri"]
-                op.object = relation["object_uri"]
-            if relation["is_uri"] and relation["object_uri"].toPython().split("#")[-1] != self.props.active_brick_class:
+                op.predicate = relation["predicate"]
+                op.object = relation["object"]
+            if relation["is_uri"] and relation["predicate_name"] != "type":
                 op = row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT")
                 op.item = relation["object_uri"]
             if relation["is_globalid"]:
@@ -246,23 +188,6 @@ class BIM_PT_brickschema_viewport(Panel):
                 op.global_id = relation["object_name"]
 
 
-class BIM_UL_bricks(UIList):
-    split_screen = False
-
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            split = layout.split(factor=0.85, align=True)
-            row = split.row()
-            label = item.label if item.label else item.name
-            if item.total_items:
-                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
-                op.brick_class = item.name
-                op.split_screen = self.split_screen
-            row.label(text=label)
-            if item.total_items:
-                row = split.row()
-                row.label(text=str(item.total_items))
-
 class BIM_PT_ifc_brickschema_references(Panel):
     bl_label = "Brickschema References"
     bl_idname = "BIM_PT_ifc_brickschema_references"
@@ -286,24 +211,15 @@ class BIM_PT_ifc_brickschema_references(Panel):
             row.label(text="No Brickschema Project Loaded")
             return
 
-        if not BrickschemaReferencesData.data["libraries"] and BrickStore.path:
+        if not BrickschemaReferencesData.data["libraries"]:
             row = self.layout.row(align=True)
             row.label(text="No IFC Libraries")
             row.operator("bim.convert_brick_project", text="", icon="ADD")
             return
-        
-        elif not BrickschemaReferencesData.data["libraries"]:
-            row = self.layout.row(align=True)
-            row.label(text="No IFC Libraries: save the Brick project to create a new library", icon="ERROR")
-
-            row = self.layout.row(align=True)
-            row.label(text="Libraries must have location pointing to a \".ttl\" file", icon="INFO")
-            return
 
         row = self.layout.row(align=True)
         prop_with_search(row, self.props, "libraries")
-        if BrickStore.path:
-            row.operator("bim.convert_brick_project", text="", icon="ADD")
+        row.operator("bim.convert_brick_project", text="", icon="ADD")
 
         row = self.layout.row(align=True)
         row.operator("bim.assign_brick_reference", icon="ADD")
@@ -318,4 +234,19 @@ class BIM_PT_ifc_brickschema_references(Panel):
             row.label(text=reference["identification"], icon="ASSET_MANAGER")
             row.label(text=reference["name"])
             row.operator("bim.unassign_library_reference", text="", icon="X").reference = reference["id"]
-            row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT").item = reference["identification"]
+            row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT").item = reference["identification"]
+
+
+class BIM_UL_bricks(UIList):
+    split_screen = False
+
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            label = item.label if item.label else item.name
+            if item.total_items:
+                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
+                op.brick_class = item.name
+                op.split_screen = self.split_screen
+                label = label + " (" + str(item.total_items) + ")" 
+            row.label(text=label)

src/blenderbim/blenderbim/bim/module/bsdd/__init__.py

@@ -1,42 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-from . import ui, prop, operator
-
-classes = (
-    operator.GetBSDDClassificationProperties,
-    operator.LoadBSDDDomains,
-    operator.SearchBSDDClass,
-    operator.SetActiveBSDDDictionary,
-    prop.BSDDDomain,
-    prop.BSDDClassification,
-    prop.BSDDPset,
-    prop.BIMBSDDProperties,
-    ui.BIM_UL_bsdd_domains,
-    ui.BIM_UL_bsdd_classifications,
-    ui.BIM_PT_bsdd,
-)
-
-
-def register():
-    bpy.types.Scene.BIMBSDDProperties = bpy.props.PointerProperty(type=prop.BIMBSDDProperties)
-
-
-def unregister():
-    del bpy.types.Scene.BIMBSDDProperties

src/blenderbim/blenderbim/bim/module/bsdd/operator.py

@@ -1,65 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-import bsdd
-import blenderbim.tool as tool
-from blenderbim.core import bsdd as core
-
-
-class LoadBSDDDomains(bpy.types.Operator):
-    bl_idname = "bim.load_bsdd_domains"
-    bl_label = "Load bSDD Dictionaries"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        core.load_bsdd(bsdd.Client(), tool.Bsdd)
-        return {"FINISHED"}
-
-
-class SetActiveBSDDDictionary(bpy.types.Operator):
-    bl_idname = "bim.set_active_bsdd_domain"
-    bl_label = "Load bSDD Dictionary"
-    bl_options = {"REGISTER", "UNDO"}
-    name: bpy.props.StringProperty()
-    uri: bpy.props.StringProperty()
-
-    def execute(self, context):
-        core.set_active_bsdd_dictionary(self.name, self.uri, tool.Bsdd)
-        return {"FINISHED"}
-
-
-class SearchBSDDClass(bpy.types.Operator):
-    bl_idname = "bim.search_bsdd_classifications"
-    bl_label = "Search bSDD Class"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        keyword = context.scene.BIMBSDDProperties.keyword
-        core.search_class(keyword, bsdd.Client(), tool.Bsdd)
-        return {"FINISHED"}
-
-
-class GetBSDDClassificationProperties(bpy.types.Operator):
-    bl_idname = "bim.get_bsdd_classification_properties"
-    bl_label = "Search bSDD Classifications"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        core.get_class_properties(bsdd.Client(), tool.Bsdd)
-        return {"FINISHED"}

src/blenderbim/blenderbim/bim/module/bsdd/prop.py

@@ -1,67 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-from bpy.types import PropertyGroup
-from blenderbim.bim.prop import Attribute, StrProperty
-from bpy.props import (
-    PointerProperty,
-    StringProperty,
-    EnumProperty,
-    BoolProperty,
-    IntProperty,
-    FloatProperty,
-    FloatVectorProperty,
-    CollectionProperty,
-)
-
-
-class BSDDDomain(PropertyGroup):
-    name: StringProperty(name="Name")
-    uri: StringProperty(name="URI")
-    default_language_code: StringProperty(name="Language")
-    organization_name_owner: StringProperty(name="Organization")
-    status: StringProperty(name="Status")
-    version: StringProperty(name="Version")
-
-
-class BSDDClassification(PropertyGroup):
-    name: StringProperty(name="Name")
-    reference_code: StringProperty(name="Reference Code")
-    description: StringProperty(name="Description")
-    uri: StringProperty(name="Namespace URI")
-    domain_name: StringProperty(name="Domain Name")
-    domain_namespace_uri: StringProperty(name="Domain Namespace URI")
-
-
-class BSDDPset(PropertyGroup):
-    name: StringProperty(name="Name")
-    properties: CollectionProperty(name="Properties", type=Attribute)
-
-
-class BIMBSDDProperties(PropertyGroup):
-    active_domain: StringProperty(name="Active Domain")
-    active_uri: StringProperty(name="Active URI")
-    domains: CollectionProperty(name="Domains", type=BSDDDomain)
-    active_domain_index: IntProperty(name="Active Domain Index")
-    classifications: CollectionProperty(name="Classifications", type=BSDDClassification)
-    active_classification_index: IntProperty(name="Active Classification Index")
-    keyword: StringProperty(name="Keyword")
-    should_filter_ifc_class: BoolProperty(name="Filter Active IFC Class", default=True)
-    load_preview_domains: BoolProperty(name="Load Preview Domains", default=False)
-    classification_psets: CollectionProperty(name="Classification Psets", type=BSDDPset)

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

@@ -1,79 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import blenderbim.tool as tool
-from bpy.types import Panel, UIList
-from blenderbim.bim.ifc import IfcStore
-
-
-class BIM_PT_bsdd(Panel):
-    bl_label = "buildingSMART Data Dictionary"
-    bl_idname = "BIM_PT_bsdd"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_project_setup"
-
-    def draw(self, context):
-        props = context.scene.BIMBSDDProperties
-        row = self.layout.row(align=True)
-        row.prop(props, "load_preview_domains")
-        if len(props.domains):
-            row.operator("bim.load_bsdd_domains", text="", icon="FILE_REFRESH")
-
-        if props.active_domain:
-            row = self.layout.row()
-            row.label(text="Active: " + props.active_domain, icon="URL")
-        else:
-            row = self.layout.row()
-            row.label(text="No Active bSDD Domain", icon="ERROR")
-
-        if len(props.domains):
-            self.layout.template_list(
-                "BIM_UL_bsdd_domains",
-                "",
-                props,
-                "domains",
-                props,
-                "active_domain_index",
-            )
-        else:
-            row = self.layout.row()
-            row.operator("bim.load_bsdd_domains")
-
-
-class BIM_UL_bsdd_domains(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            if item.status != "Active":
-                row.label(text=f"{item.name} ({item.organization_name_owner}) - {item.status}", icon="ERROR")
-            else:
-                row.label(text=f"{item.name} ({item.organization_name_owner})")
-            op = row.operator("bim.set_active_bsdd_domain", text="", icon="RESTRICT_SELECT_OFF")
-            op.name = item.name
-            op.uri = item.uri
-
-
-class BIM_UL_bsdd_classifications(UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            row.label(text=item.reference_code)
-            row.label(text=item.name)

src/blenderbim/blenderbim/bim/module/cad/__init__.py

@@ -37,7 +37,7 @@ classes = (
 
 def register():
     if not bpy.app.background:
-        bpy.utils.register_tool(workspace.CadTool, after={"builtin.transform"}, separator=True, group=False)
+        bpy.utils.register_tool(workspace.CadTool, after={"builtin.transform"}, separator=True, group=True)
     bpy.types.Scene.BIMCadProperties = bpy.props.PointerProperty(type=prop.BIMCadProperties)
 
 

src/blenderbim/blenderbim/bim/module/cad/operator.py

@@ -24,8 +24,6 @@ import bpy_extras
 import blenderbim.tool as tool
 from mathutils import Vector, Matrix
 from math import pi, radians, sin, cos, sqrt
-import ifcopenshell.util.unit
-
 
 messages = {
     "SHARED_VERTEX": "Shared Vertex, no intersection possible",
@@ -142,9 +140,6 @@ class CadFillet(bpy.types.Operator):
             layout.prop(self, prop)
 
     def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.radius = self.radius * si_conversion
-        
         bpy.ops.object.mode_set(mode="OBJECT")
         bpy.ops.object.mode_set(mode="EDIT")
 
@@ -366,10 +361,6 @@ class CadOffset(bpy.types.Operator):
         # dialog that Mesh Tools has. Sverchok is 2D based, but has a weird side
         # effect of converting an unclosed loop into a closed loop which is also
         # not what users expect.
-
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.distance = self.distance * si_conversion
-        
         bpy.ops.object.mode_set(mode="OBJECT")
         bpy.ops.object.mode_set(mode="EDIT")
 
@@ -507,8 +498,6 @@ class CadOffset(bpy.types.Operator):
                     local_direction = (rotation_i @ direction).normalized()
                     normals.append(local_direction)
 
-
-
                 if len(normals) == 2:
                     # https://stackoverflow.com/a/54042831/9627415
                     new_normal = (normals[0].lerp(normals[1], 0.5)).normalized()
@@ -542,7 +531,7 @@ class CadOffset(bpy.types.Operator):
 class AddIfcCircle(bpy.types.Operator):
     bl_idname = "bim.add_ifccircle"
     bl_label = "Add IfcCircle"
-    radius: bpy.props.FloatProperty(name="Radius", default=0.5)
+    radius: bpy.props.FloatProperty(name="Radius", default=0.1)
 
     @classmethod
     def poll(cls, context):
@@ -550,9 +539,6 @@ class AddIfcCircle(bpy.types.Operator):
         return bool(obj) and obj.type == "MESH"
 
     def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.radius = self.radius * si_conversion
-
         if self.has_selected_existing_circle(context):
             self.change_radius(context)
         else:
@@ -636,9 +622,6 @@ class AddIfcArcIndexFillet(bpy.types.Operator):
             layout.prop(self, prop)
 
     def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.radius = self.radius * si_conversion
-        
         if self.has_selected_existing_arc(context):
             self.change_radius(context)
         else:
@@ -803,8 +786,8 @@ class AlignViewToProfile(bpy.types.Operator):
 class AddRectangle(bpy.types.Operator):
     bl_idname = "bim.add_rectangle"
     bl_label = "Add Rectangle"
-    x: bpy.props.FloatProperty(name="X", default=1)
-    y: bpy.props.FloatProperty(name="Y", default=1)
+    x: bpy.props.FloatProperty(name="X", default=0.1)
+    y: bpy.props.FloatProperty(name="Y", default=0.1)
 
     @classmethod
     def poll(cls, context):
@@ -812,10 +795,6 @@ class AddRectangle(bpy.types.Operator):
         return bool(obj) and obj.type == "MESH"
 
     def execute(self, context):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        self.x = self.x * si_conversion
-        self.y = self.y * si_conversion        
-        
         obj = context.active_object
         bm = bmesh.from_edit_mesh(obj.data)
         cursor = obj.matrix_world.inverted() @ context.scene.cursor.location

src/blenderbim/blenderbim/bim/module/cad/prop.py

@@ -24,10 +24,10 @@ from math import pi
 
 class BIMCadProperties(PropertyGroup):
     resolution: bpy.props.IntProperty(name="Arc Resolution", min=1, default=1)
-    radius: bpy.props.FloatProperty(name="Radius", default=0.1, subtype="DISTANCE")
-    distance: bpy.props.FloatProperty(name="Distance", default=0.1, subtype="DISTANCE")
-    x: bpy.props.FloatProperty(name="X", default=0.2, subtype="DISTANCE")
-    y: bpy.props.FloatProperty(name="Y", default=0.1, subtype="DISTANCE")
+    radius: bpy.props.FloatProperty(name="Radius", default=0.1)
+    distance: bpy.props.FloatProperty(name="Distance", default=0.1)
+    x: bpy.props.FloatProperty(name="X", default=0.2)
+    y: bpy.props.FloatProperty(name="Y", default=0.1)
     gable_roof_edge_angle: bpy.props.FloatProperty(
         name="Gable Roof Edge Angle", default=pi / 2, soft_min=0, soft_max=pi / 2, subtype="ANGLE"
     )

src/blenderbim/blenderbim/bim/module/cad/workspace.py

@@ -20,7 +20,6 @@ import os
 import bpy
 import blenderbim.tool as tool
 import blenderbim.bim.module.type.prop as type_prop
-import ifcopenshell.util.unit
 from bpy.types import WorkSpaceTool
 from blenderbim.bim.module.model.data import AuthoringData, RailingData, RoofData
 
@@ -240,9 +239,8 @@ class CadHotkey(bpy.types.Operator):
                 row.prop(props, "resolution")
 
     def hotkey_S_C(self):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
         if self.is_profile():
-            bpy.ops.bim.add_ifccircle(radius=self.props.radius / si_conversion)
+            bpy.ops.bim.add_ifccircle(radius=self.props.radius)
         else:
             bpy.ops.bim.cad_arc_from_2_points()
 
@@ -250,15 +248,13 @@ class CadHotkey(bpy.types.Operator):
         bpy.ops.bim.cad_trim_extend()
 
     def hotkey_S_F(self):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
         if self.is_profile():
-            bpy.ops.bim.add_ifcarcindex_fillet(radius=self.props.radius / si_conversion)
+            bpy.ops.bim.add_ifcarcindex_fillet(radius=self.props.radius)
         else:
-            bpy.ops.bim.cad_fillet(resolution=self.props.resolution, radius=self.props.radius / si_conversion)
+            bpy.ops.bim.cad_fillet(resolution=self.props.resolution, radius=self.props.radius)
 
     def hotkey_S_O(self):
-        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        bpy.ops.bim.cad_offset(distance=self.props.distance / si_conversion)
+        bpy.ops.bim.cad_offset(distance=self.props.distance)
 
     def hotkey_S_Q(self):
         element = tool.Ifc.get_entity(bpy.context.active_object)
@@ -274,8 +270,7 @@ class CadHotkey(bpy.types.Operator):
 
     def hotkey_S_R(self):
         if self.is_profile():
-            si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-            bpy.ops.bim.add_rectangle(x=self.props.x / si_conversion, y=self.props.y / si_conversion)
+            bpy.ops.bim.add_rectangle(x=self.props.x, y=self.props.y)
         elif (
             (RoofData.is_loaded or not RoofData.load())
             and RoofData.data["pset_data"]

src/blenderbim/blenderbim/bim/module/clash/__init__.py

@@ -20,29 +20,26 @@ import bpy
 from . import ui, prop, operator
 
 classes = (
-    operator.AddClashSet,
-    operator.AddClashSource,
-    operator.ExecuteIfcClash,
     operator.ExportClashSets,
     operator.ImportClashSets,
-    operator.LoadSmartGroupsForActiveClashSet,
+    operator.AddClashSet,
     operator.RemoveClashSet,
+    operator.AddClashSource,
     operator.RemoveClashSource,
-    operator.SelectClash,
-    operator.SelectClashResults,
     operator.SelectClashSource,
-    operator.SelectSmartGroup,
+    operator.ExecuteIfcClash,
+    operator.SelectIfcClashResults,
+    operator.SelectClashResults,
     operator.SelectSmartGroupedClashesPath,
     operator.SmartClashGroup,
-    prop.Clash,
+    operator.SelectSmartGroup,
+    operator.LoadSmartGroupsForActiveClashSet,
     prop.ClashSource,
     prop.ClashSet,
     prop.SmartClashGroup,
     prop.BIMClashProperties,
     ui.BIM_PT_ifcclash,
     ui.BIM_PT_clash_manager,
-    ui.BIM_PT_smart_clash_manager,
-    ui.BIM_UL_clashes,
     ui.BIM_UL_clash_sets,
     ui.BIM_UL_smart_groups,
 )

src/blenderbim/blenderbim/bim/module/clash/data.py

@@ -1,52 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2024 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import bpy
-import json
-import ifcopenshell.util.element
-import blenderbim.tool as tool
-
-
-def refresh():
-    ClashData.is_loaded = False
-
-
-class ClashData:
-    data = {}
-    is_loaded = False
-
-    @classmethod
-    def load(cls):
-        cls.is_loaded = True
-        cls.data = {}
-        cls.data["saved_searches"] = cls.saved_searches()
-
-    @classmethod
-    def saved_searches(cls):
-        if not tool.Ifc.get():
-            return []
-        groups = tool.Ifc.get().by_type("IfcGroup")
-        results = []
-        for group in groups:
-            try:
-                data = json.loads(group.Description)
-                if isinstance(data, dict) and data.get("type", None) == "BBIM_Search" and data.get("query", None):
-                    results.append(group)
-            except:
-                pass
-        return [(str(g.id()), g.Name or "Unnamed", "") for g in sorted(results, key=lambda x: x.Name or "Unnamed")]

src/blenderbim/blenderbim/bim/module/clash/decorator.py

@@ -1,102 +0,0 @@
-# BlenderBIM Add-on - OpenBIM Blender Add-on
-# Copyright (C) 2024 Dion Moult <dion@thinkmoult.com>
-#
-# This file is part of BlenderBIM Add-on.
-#
-# BlenderBIM Add-on is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# BlenderBIM Add-on is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
-
-import blf
-import gpu
-import bmesh
-import blenderbim.tool as tool
-from bpy.types import SpaceView3D
-from mathutils import Vector
-from gpu_extras.batch import batch_for_shader
-from bpy_extras.view3d_utils import location_3d_to_region_2d
-
-
-class ClashDecorator:
-    is_installed = False
-    handlers = []
-
-    @classmethod
-    def install(cls, context):
-        if cls.is_installed:
-            cls.uninstall()
-        handler = cls()
-        cls.handlers.append(SpaceView3D.draw_handler_add(handler.draw_text, (context,), "WINDOW", "POST_PIXEL"))
-        cls.handlers.append(SpaceView3D.draw_handler_add(handler.draw_geometry, (context,), "WINDOW", "POST_VIEW"))
-        cls.is_installed = True
-
-    @classmethod
-    def uninstall(cls):
-        for handler in cls.handlers:
-            try:
-                SpaceView3D.draw_handler_remove(handler, "WINDOW")
-            except ValueError:
-                pass
-        cls.is_installed = False
-
-    def draw_batch(self, shader_type, content_pos, color, indices=None):
-        shader = self.line_shader if shader_type == "LINES" else self.shader
-        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
-        shader.uniform_float("color", color)
-        batch.draw(shader)
-
-    def draw_text(self, context):
-        self.addon_prefs = context.preferences.addons["blenderbim"].preferences
-        selected_elements_color = self.addon_prefs.decorator_color_selected
-        unselected_elements_color = self.addon_prefs.decorator_color_unselected
-        special_elements_color = self.addon_prefs.decorator_color_special
-
-        text = context.scene.BIMClashProperties.active_clash_text
-        p = context.scene.BIMClashProperties.p1.lerp(context.scene.BIMClashProperties.p2, 0.5)
-
-        font_id = 0
-        blf.size(font_id, 12)
-        coords_2d = location_3d_to_region_2d(context.region, context.region_data, p)
-        color = self.addon_prefs.decorations_colour
-        blf.color(font_id, *color)
-        if coords_2d:
-            w, h = blf.dimensions(font_id, text)
-            coords_2d -= Vector((w * .5, 0))
-            blf.position(font_id, coords_2d[0], coords_2d[1], 0)
-            blf.draw(font_id, text)  # Set your text here
-
-    def draw_geometry(self, context):
-        self.addon_prefs = context.preferences.addons["blenderbim"].preferences
-        selected_elements_color = self.addon_prefs.decorator_color_selected
-        unselected_elements_color = self.addon_prefs.decorator_color_unselected
-        special_elements_color = self.addon_prefs.decorator_color_special
-
-        gpu.state.point_size_set(6)
-        gpu.state.blend_set("ALPHA")
-
-        self.line_shader = gpu.shader.from_builtin("POLYLINE_UNIFORM_COLOR")
-        self.line_shader.bind()  # required to be able to change uniforms of the shader
-        # POLYLINE_UNIFORM_COLOR specific uniforms
-        self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
-        self.line_shader.uniform_float("lineWidth", 2.0)
-
-        # general shader
-        self.shader = gpu.shader.from_builtin("UNIFORM_COLOR")
-
-        selected_vertices = [context.scene.BIMClashProperties.p1, context.scene.BIMClashProperties.p2]
-        selected_edges = []
-        if selected_vertices[0] != selected_vertices[1]:
-            selected_edges = [[0, 1]]
-
-        self.draw_batch("POINTS", selected_vertices, special_elements_color)
-        if selected_edges:
-            self.draw_batch("LINES", selected_vertices, special_elements_color, selected_edges)

src/blenderbim/blenderbim/bim/module/clash/operator.py

@@ -23,11 +23,9 @@ import bmesh
 import logging
 import numpy as np
 import ifcopenshell
-import blenderbim.tool as tool
-from math import radians
 from mathutils import Matrix, Vector
+from math import radians
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.clash.decorator import ClashDecorator
 
 
 class ExportClashSets(bpy.types.Operator):
@@ -46,7 +44,18 @@ class ExportClashSets(bpy.types.Operator):
 
     def execute(self, context):
         self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
-        clash_sets = tool.Clash.export_clash_sets()
+        clash_sets = []
+        for clash_set in context.scene.BIMClashProperties.clash_sets:
+            self.a = []
+            self.b = []
+            for ab in ["a", "b"]:
+                for data in getattr(clash_set, ab):
+                    clash_source = {"file": data.name}
+                    if data.selector:
+                        clash_source["selector"] = data.selector
+                        clash_source["mode"] = data.mode
+                    getattr(self, ab).append(clash_source)
+            clash_sets.append({"name": clash_set.name, "tolerance": clash_set.tolerance, "a": self.a, "b": self.b})
         with open(self.filepath, "w") as destination:
             destination.write(json.dumps(clash_sets, indent=4))
         return {"FINISHED"}
@@ -68,34 +77,25 @@ class ImportClashSets(bpy.types.Operator):
         return {"RUNNING_MODAL"}
 
     def execute(self, context):
-        tool.Clash.load_clash_sets(self.filepath)
-        context.scene.BIMClashProperties.clash_sets.clear()
-        for clash_set in tool.Clash.get_clash_sets():
+        with open(self.filepath) as f:
+            clash_sets = json.load(f)
+        for clash_set in clash_sets:
             new = context.scene.BIMClashProperties.clash_sets.add()
             new.name = clash_set["name"]
-            new.mode = clash_set["mode"]
-            if new.mode == "intersection":
-                new.tolerance = clash_set["tolerance"]
-                new.check_all = clash_set["check_all"]
-            elif new.mode == "collision":
-                new.allow_touching = clash_set["allow_touching"]
-            elif new.mode == "clearance":
-                new.clearance = clash_set["clearance"]
-                new.check_all = clash_set["check_all"]
+            new.tolerance = clash_set["tolerance"]
             for clash_source in clash_set["a"]:
                 new_source = new.a.add()
                 new_source.name = clash_source["file"]
                 if "selector" in clash_source:
-                    tool.Search.import_filter_query(clash_source["selector"], new_source.filter_groups)
+                    new_source.selector = clash_source["selector"]
                     new_source.mode = clash_source["mode"]
-            if "b" in clash_set and clash_set["b"]:
+            if clash_set["b"]:
                 for clash_source in clash_set["b"]:
                     new_source = new.b.add()
                     new_source.name = clash_source["file"]
                     if "selector" in clash_source:
-                        tool.Search.import_filter_query(clash_source["selector"], new_source.filter_groups)
+                        new_source.selector = clash_source["selector"]
                         new_source.mode = clash_source["mode"]
-        tool.Clash.import_active_clashes()
         return {"FINISHED"}
 
 
@@ -108,6 +108,7 @@ class AddClashSet(bpy.types.Operator):
     def execute(self, context):
         new = context.scene.BIMClashProperties.clash_sets.add()
         new.name = "New Clash Set"
+        new.tolerance = 0.01
         return {"FINISHED"}
 
 
@@ -209,11 +210,8 @@ class ExecuteIfcClash(bpy.types.Operator):
 
     def invoke(self, context, event):
         _, extension = os.path.splitext(self.filepath)
-        if extension != ".bcf":
-            self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".json")
-        # TODO Temporarily until BCF support comes back
-        # if extension != ".json":
-        #     self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".bcf")
+        if extension != ".json":
+            self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".bcf")
         WindowManager = context.window_manager
         WindowManager.fileselect_add(self)
         return {"RUNNING_MODAL"}
@@ -221,12 +219,7 @@ class ExecuteIfcClash(bpy.types.Operator):
     def execute(self, context):
         from ifcclash import ifcclash
 
-        self.props = context.scene.BIMClashProperties
-
         _, extension = os.path.splitext(self.filepath)
-        if extension != ".bcf":
-            self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
-        # TODO Temporarily until BCF support comes back
         if extension != ".json":
             self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf")
 
@@ -236,7 +229,7 @@ class ExecuteIfcClash(bpy.types.Operator):
         settings.logger.setLevel(logging.DEBUG)
         clasher = ifcclash.Clasher(settings)
 
-        if self.props.should_create_clash_snapshots:
+        if context.scene.BIMClashProperties.should_create_clash_snapshots:
 
             def get_viewpoint_snapshot(viewpoint):
                 camera = bpy.data.objects.get("IFC Clash Camera")
@@ -252,14 +245,12 @@ class ExecuteIfcClash(bpy.types.Operator):
                 y = Vector([y.x, y.y, y.z])
                 x = y.cross(z)
 
-                mat = Matrix(
-                    [
-                        [x[0], y[0], z[0], p.x],
-                        [x[1], y[1], z[1], p.y],
-                        [x[2], y[2], z[2], p.z],
-                        [0, 0, 0, 0],
-                    ]
-                )
+                mat = Matrix([
+                    [x[0], y[0], z[0], p.x],
+                    [x[1], y[1], z[1], p.y],
+                    [x[2], y[2], z[2], p.z],
+                    [0, 0, 0, 0],
+                ])
 
                 camera.matrix_world = mat
                 context.scene.camera = camera
@@ -277,13 +268,23 @@ class ExecuteIfcClash(bpy.types.Operator):
 
             clasher.get_viewpoint_snapshot = get_viewpoint_snapshot
 
-        clasher.clash_sets = tool.Clash.export_clash_sets()
+        clasher.clash_sets = []
+        for clash_set in context.scene.BIMClashProperties.clash_sets:
+            self.a = []
+            self.b = []
+            for ab in ["a", "b"]:
+                for data in getattr(clash_set, ab):
+                    clash_source = {"file": data.name}
+                    if data.selector:
+                        clash_source["selector"] = data.selector
+                        clash_source["mode"] = data.mode
+                    getattr(self, ab).append(clash_source)
+            clash_set_data = {"name": clash_set.name, "tolerance": clash_set.tolerance, "a": self.a}
+            if self.b:
+                clash_set_data["b"] = self.b
+            clasher.clash_sets.append(clash_set_data)
         clasher.clash()
         clasher.export()
-
-        if extension == ".json":
-            tool.Clash.load_clash_sets(self.filepath)
-            tool.Clash.import_active_clashes()
         return {"FINISHED"}
 
 
@@ -302,7 +303,6 @@ class SelectIfcClashResults(bpy.types.Operator):
         return {"RUNNING_MODAL"}
 
     def execute(self, context):
-        # TODO refactor into new clash results system
         self.file = IfcStore.get_file()
         self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
         with open(self.filepath) as f:
@@ -336,53 +336,12 @@ class SelectIfcClashResults(bpy.types.Operator):
             else:
                 element_file = self.file
 
-            try:
-                element = element_file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-            except:
-                continue
-
-            global_id = getattr(element, "GlobalId", None)
-            if not global_id:
-                continue
-            if global_id in global_ids:
+            element = element_file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            if element.GlobalId in global_ids:
                 obj.select_set(True)
         return {"FINISHED"}
 
 
-class SelectClash(bpy.types.Operator):
-    bl_idname = "bim.select_clash"
-    bl_label = "Select Clash"
-    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Select the clashing IFC geometry stored in a file"
-    index: bpy.props.IntProperty()
-
-    def execute(self, context):
-        self.props = context.scene.BIMClashProperties
-        clash_set = tool.Clash.get_clash_set(self.props.active_clash_set.name)
-        active_clash = self.props.active_clash
-        clash = tool.Clash.get_clash(clash_set, active_clash.a_global_id, active_clash.b_global_id)
-
-        if not clash:
-            return {"FINISHED"}
-
-        products = []
-
-        for global_id in (clash["a_global_id"], clash["b_global_id"]):
-            try:
-                products.append(tool.Ifc.get().by_guid(global_id))
-            except:
-                pass
-
-        tool.Spatial.select_products(products, unhide=True)
-        ClashDecorator.install(bpy.context)
-        target = Vector(clash["p1"])
-        tool.Clash.look_at(target, target + Vector((5, 5, 5)))
-        self.props.p1 = clash["p1"]
-        self.props.p2 = clash["p2"]
-        self.props.active_clash_text = clash["type"].title() + " " + str(round(clash["distance"] * 1000)) + "mm"
-        return {"FINISHED"}
-
-
 class SmartClashGroup(bpy.types.Operator):
     bl_idname = "bim.smart_clash_group"
     bl_label = "Smart Group Clashes"
@@ -467,9 +426,9 @@ class LoadSmartGroupsForActiveClashSet(bpy.types.Operator):
                     new_group = context.scene.BIMClashProperties.smart_clash_groups.add()
                     new_group.number = f"{smart_group}"
                     for pair in global_id_pairs:
-                        for guid in pair:
+                        for id in pair:
                             new_global_id = new_group.global_ids.add()
-                            new_global_id.guid = guid
+                            new_global_id.name = id
 
         return {"FINISHED"}
 
@@ -484,16 +443,20 @@ class SelectSmartGroup(bpy.types.Operator):
         return IfcStore.get_file() and context.visible_objects and context.scene.BIMClashProperties.active_smart_group
 
     def execute(self, context):
+        self.file = IfcStore.get_file()
+        # Select smart group in view
         selected_smart_group = context.scene.BIMClashProperties.active_smart_group
-        products = []
-        for global_id in selected_smart_group.global_ids:
-            try:
-                products.append(tool.Ifc.get().by_guid(global_id.guid))
-            except:
-                continue
-        tool.Spatial.select_products(products, unhide=True)
-        context_override = tool.Blender.get_viewport_context()
-        with bpy.context.temp_override(**context_override):
-            bpy.ops.view3d.view_selected()
-        return {"FINISHED"}
+        # print(selected_smart_group.number)
 
+        for obj in context.visible_objects:
+            if not obj.BIMObjectProperties.ifc_definition_id:
+                continue
+            element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            for id in selected_smart_group.global_ids:
+                # print("Id: ", id)
+                # print("Global id: ", element.GlobalId)
+                if element.GlobalId in id.name:
+                    # print("object match: ", global_id)
+                    obj.select_set(True)
+
+        return {"FINISHED"}

src/blenderbim/blenderbim/bim/module/clash/prop.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from blenderbim.bim.prop import StrProperty, Attribute, BIMFilterGroup
+from blenderbim.bim.prop import StrProperty, Attribute
 from bpy.types import PropertyGroup
 from bpy.props import (
     PointerProperty,
@@ -33,48 +33,21 @@ from bpy.props import (
 
 class ClashSource(PropertyGroup):
     name: StringProperty(name="File")
-    filter_groups: CollectionProperty(type=BIMFilterGroup, name="Filter Groups")
+    selector: StringProperty(name="Selector")
     mode: EnumProperty(
         items=[
-            ("a", "All Elements", "All elements will be used for clashing"),
-            ("i", "Include", "Only the selected elements are included for clashing"),
-            ("e", "Exclude", "All elements except the selected elements are included for clashing"),
+            ("i", "Include", "Only the selected objects are included for clashing"),
+            ("e", "Exclude", "All objects except the selected objects are included for clashing"),
         ],
         name="Mode",
     )
 
 
-class Clash(PropertyGroup):
-    a_global_id: StringProperty(name="A")
-    b_global_id: StringProperty(name="B")
-    a_name: StringProperty(name="A Name")
-    b_name: StringProperty(name="B Name")
-    status: BoolProperty(name="Status", default=False)
-
-
 class ClashSet(PropertyGroup):
     name: StringProperty(name="Name")
-    mode: EnumProperty(
-        items=[
-            (
-                "intersection",
-                "Intersection",
-                "Detect objects that protrude or pierce another object",
-                "PIVOT_MEDIAN",
-                1,
-            ),
-            ("collision", "Collision", "Detect touching objects with any surface collision", "PIVOT_INDIVIDUAL", 2),
-            ("clearance", "Clearance", "Detect objects within a proximity threshold", "PIVOT_ACTIVE", 3),
-        ],
-        name="Mode",
-    )
-    tolerance: FloatProperty(name="Tolerance", default=0.002)
-    clearance: FloatProperty(name="Clearance", default=0.01)
-    allow_touching: BoolProperty(name="Allow Touching", default=False)
-    check_all: BoolProperty(name="Check All", default=False)
+    tolerance: FloatProperty(name="Tolerance")
     a: CollectionProperty(name="Group A", type=ClashSource)
     b: CollectionProperty(name="Group B", type=ClashSource)
-    clashes: CollectionProperty(name="Clashes", type=Clash)
 
 
 class SmartClashGroup(PropertyGroup):
@@ -90,27 +63,20 @@ class BIMClashProperties(PropertyGroup):
     clash_results_path: StringProperty(name="Clash Results Path")
     smart_grouped_clashes_path: StringProperty(name="Smart Grouped Clashes Path")
     active_clash_set_index: IntProperty(name="Active Clash Set Index")
-    active_clash_index: IntProperty(name="Active Clash Index")
     smart_clash_groups: CollectionProperty(name="Smart Clash Groups", type=SmartClashGroup)
     active_smart_group_index: IntProperty(name="Active Smart Group Index")
     smart_clash_grouping_max_distance: IntProperty(
         name="Smart Clash Grouping Max Distance", default=3, soft_min=1, soft_max=10
     )
-    p1: FloatVectorProperty(name="P1", default=(0.0, 0.0, 0.0), subtype="XYZ")
-    p2: FloatVectorProperty(name="P2", default=(0.0, 0.0, 0.0), subtype="XYZ")
-    active_clash_text: StringProperty(name="Active Clash Text")
 
     @property
     def active_clash_set(self):
-        if self.active_clash_set_index < len(self.clash_sets):
-            return self.clash_sets[self.active_clash_set_index]
+        if not self.clash_sets:
+            return None
+        return self.clash_sets[self.active_clash_set_index]
 
     @property
     def active_smart_group(self):
-        if self.active_smart_group_index < len(self.smart_clash_groups):
-            return self.smart_clash_groups[self.active_smart_group_index]
-
-    @property
-    def active_clash(self):
-        if self.active_clash_index < len(self.active_clash_set.clashes):
-            return self.active_clash_set.clashes[self.active_clash_index]
+        if not self.smart_clash_groups:
+            return None
+        return self.smart_clash_groups[self.active_smart_group_index]

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

@@ -17,9 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.bim.helper
 from bpy.types import Panel
-from blenderbim.bim.module.clash.data import ClashData
 
 
 class BIM_PT_ifcclash(Panel):
@@ -29,12 +27,9 @@ class BIM_PT_ifcclash(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_clash_detection"
+    bl_parent_id = "BIM_PT_tab_quality_control"
 
     def draw(self, context):
-        if not ClashData.is_loaded:
-            ClashData.load()
-
         layout = self.layout
 
         scene = context.scene
@@ -50,106 +45,66 @@ class BIM_PT_ifcclash(Panel):
 
         layout.template_list("BIM_UL_clash_sets", "", props, "clash_sets", props, "active_clash_set_index")
 
-        if not props.active_clash_set:
-            return
+        if props.active_clash_set_index < len(props.clash_sets):
+            clash_set = props.active_clash_set
 
-        clash_set = props.active_clash_set
+            row = layout.row(align=True)
+            row.prop(clash_set, "name")
+            row.operator("bim.remove_clash_set", icon="X", text="").index = props.active_clash_set_index
 
-        row = layout.row(align=True)
-        row.prop(clash_set, "name")
-        row.operator("bim.remove_clash_set", icon="X", text="").index = props.active_clash_set_index
-
-        row = layout.row()
-        row.prop(clash_set, "mode")
-
-        if clash_set.mode == "intersection":
-            row = layout.row()
+            row = layout.row(align=True)
             row.prop(clash_set, "tolerance")
-            row = layout.row()
-            row.prop(clash_set, "check_all")
-        elif clash_set.mode == "collision":
-            row = layout.row()
-            row.prop(clash_set, "allow_touching")
-        elif clash_set.mode == "clearance":
-            row = layout.row()
-            row.prop(clash_set, "clearance")
-            row = layout.row()
-            row.prop(clash_set, "check_all")
 
-        row = layout.row(align=True)
-        row.label(text="Group A:", icon="OUTLINER_OB_POINTCLOUD")
-        row.operator("bim.add_clash_source", icon="ADD", text="").group = "a"
+            layout.label(text="Group A:")
+            row = layout.row()
+            row.operator("bim.add_clash_source").group = "a"
 
-        for index, source in enumerate(clash_set.a):
+            for index, source in enumerate(clash_set.a):
+                row = layout.row(align=True)
+                row.prop(source, "name", text="")
+                op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
+                op.index = index
+                op.group = "a"
+                op = row.operator("bim.remove_clash_source", icon="X", text="")
+                op.index = index
+                op.group = "a"
+
+                row = layout.row(align=True)
+                row.prop(source, "mode", text="")
+                row.prop(source, "selector", text="")
+
+            layout.label(text="Group B:")
+            row = layout.row()
+            row.operator("bim.add_clash_source").group = "b"
+
+            for index, source in enumerate(clash_set.b):
+                row = layout.row(align=True)
+                row.prop(source, "name", text="")
+                op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
+                op.index = index
+                op.group = "b"
+                op = row.operator("bim.remove_clash_source", icon="X", text="")
+                op.index = index
+                op.group = "b"
+
+                row = layout.row(align=True)
+                row.prop(source, "mode", text="")
+                row.prop(source, "selector", text="")
+
+            row = layout.row()
+            row.prop(props, "should_create_clash_snapshots")
             row = layout.row(align=True)
-            row.prop(source, "name", text="")
-            row.prop(source, "mode", text="")
-            op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
-            op.index = index
-            op.group = "a"
-            op = row.operator("bim.remove_clash_source", icon="X", text="")
-            op.index = index
-            op.group = "a"
-
-            if source.mode != "a":
-                blenderbim.bim.helper.draw_filter(
-                    layout, source.filter_groups, ClashData, f"clash_{props.active_clash_set_index}_a_{index}"
-                )
-
-        row = layout.row(align=True)
-        row.label(text="Group B:", icon="OUTLINER_OB_POINTCLOUD")
-        row.operator("bim.add_clash_source", icon="ADD", text="").group = "b"
-
-        for index, source in enumerate(clash_set.b):
-            row = layout.row(align=True)
-            row.prop(source, "name", text="")
-            row.prop(source, "mode", text="")
-            op = row.operator("bim.select_clash_source", icon="FILE_FOLDER", text="")
-            op.index = index
-            op.group = "b"
-            op = row.operator("bim.remove_clash_source", icon="X", text="")
-            op.index = index
-            op.group = "b"
-
-            if source.mode != "a":
-                blenderbim.bim.helper.draw_filter(
-                    layout, source.filter_groups, ClashData, f"clash_{props.active_clash_set_index}_b_{index}"
-                )
-
-        row = layout.row()
-        row.prop(props, "should_create_clash_snapshots")
-        row = layout.row()
-        row.operator("bim.execute_ifc_clash")
-
-        row = layout.row()
-        row.label(text=f"{len(clash_set.clashes)} Clashes Found", icon="PIVOT_CURSOR")
-
-        layout.template_list("BIM_UL_clashes", "", props.active_clash_set, "clashes", props, "active_clash_index")
-        row = layout.row()
-        row.operator("bim.select_clash")
+            row.operator("bim.execute_ifc_clash")
+            row.operator("bim.select_ifc_clash_results")
 
 
 class BIM_PT_clash_manager(Panel):
     bl_idname = "BIM_PT_clash_manager"
     bl_label = "Clash Manager"
     bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_clash_detection"
-
-    def draw(self, context):
-        pass
-
-
-class BIM_PT_smart_clash_manager(Panel):
-    bl_idname = "BIM_PT_smart_clash_manager"
-    bl_label = "Smart Clash Manager"
-    bl_options = {"DEFAULT_CLOSED"}
-    bl_space_type = "PROPERTIES"
-    bl_region_type = "WINDOW"
-    bl_context = "scene"
-    bl_parent_id = "BIM_PT_clash_manager"
+    bl_space_type = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_category = "BlenderBIM"
 
     def draw(self, context):
         layout = self.layout
@@ -200,14 +155,3 @@ class BIM_UL_smart_groups(bpy.types.UIList):
             layout.label(text=str(item.number), translate=False, icon="NONE", icon_value=0)
         else:
             layout.label(text="", translate=False)
-
-
-class BIM_UL_clashes(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            row.label(text=str(item.a_name), translate=False, icon="NONE", icon_value=0)
-            row.label(text=str(item.b_name), translate=False, icon="NONE", icon_value=0)
-            row.prop(item, "status", text="")
-        else:
-            layout.label(text="", translate=False)

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

@@ -21,21 +21,13 @@ from . import ui, prop, operator
 
 classes = (
     operator.AddClassification,
-    operator.AddClassificationFromBSDD,
     operator.AddClassificationReference,
-    operator.AddClassificationReferenceFromBSDD,
-    operator.AddManualClassification,
-    operator.AddManualClassificationReference,
     operator.ChangeClassificationLevel,
-    operator.DisableAddingManualClassification,
-    operator.DisableAddingManualClassificationReference,
     operator.DisableEditingClassification,
     operator.DisableEditingClassificationReference,
     operator.DisableEditingClassificationReferences,
     operator.EditClassification,
     operator.EditClassificationReference,
-    operator.EnableAddingManualClassification,
-    operator.EnableAddingManualClassificationReference,
     operator.EnableEditingClassification,
     operator.EnableEditingClassificationReference,
     operator.LoadClassificationLibrary,

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

@@ -73,10 +73,6 @@ class ReferencesData:
         if name in [e.Name for e in tool.Ifc.get().by_type("IfcClassification")]:
             return name
 
-    @classmethod
-    def classifications(cls):
-        return [(str(e.id()), e.Name, "") for e in tool.Ifc.get().by_type("IfcClassification")]
-
 
 class ClassificationReferencesData(ReferencesData):
     data = {}
@@ -87,8 +83,6 @@ class ClassificationReferencesData(ReferencesData):
         cls.is_loaded = True
         cls.data["references"] = cls.references()
         cls.data["active_classification_library"] = cls.active_classification_library()
-        cls.data["classifications"] = cls.classifications()
-        cls.data["object_type"] = "OBJECT"
 
     @classmethod
     def references(cls):
@@ -111,8 +105,6 @@ class MaterialClassificationsData(ReferencesData):
         cls.is_loaded = True
         cls.data["references"] = cls.references()
         cls.data["active_classification_library"] = cls.active_classification_library()
-        cls.data["classifications"] = cls.classifications()
-        cls.data["object_type"] = "MATERIAL"
 
     @classmethod
     def references(cls):
@@ -135,8 +127,6 @@ class CostClassificationsData(ReferencesData):
         cls.is_loaded = True
         cls.data["references"] = cls.references()
         cls.data["active_classification_library"] = cls.active_classification_library()
-        cls.data["classifications"] = cls.classifications()
-        cls.data["object_type"] = "COST"
 
     @classmethod
     def references(cls):

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

@@ -20,8 +20,6 @@ import bpy
 import json
 import ifcopenshell
 import ifcopenshell.api
-import ifcopenshell.util.classification
-import ifcopenshell.util.element
 import blenderbim.tool as tool
 import blenderbim.bim.helper
 from blenderbim.bim.ifc import IfcStore
@@ -56,120 +54,6 @@ class AddClassification(bpy.types.Operator, tool.Ifc.Operator):
         )
 
 
-class AddManualClassification(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_manual_classification"
-    bl_label = "Add Manual Classification"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        props = context.scene.BIMClassificationProperties
-        attributes = blenderbim.bim.helper.export_attributes(props.classification_attributes)
-        classification = ifcopenshell.api.run(
-            "classification.add_classification", tool.Ifc.get(), classification="Unnamed"
-        )
-        ifcopenshell.api.run(
-            "classification.edit_classification", tool.Ifc.get(), classification=classification, attributes=attributes
-        )
-        props.is_adding = False
-
-
-class AddManualClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_manual_classification_reference"
-    bl_label = "Add Manual Classification Reference"
-    bl_options = {"REGISTER", "UNDO"}
-    obj_type: bpy.props.StringProperty()
-
-    def _execute(self, context):
-        obj = context.active_object
-        props = obj.BIMClassificationReferenceProperties
-        attributes = blenderbim.bim.helper.export_attributes(props.reference_attributes)
-        product = tool.Ifc.get_entity(obj)
-        # TODO: refactor and support material and cost item classifications
-        classification = tool.Ifc.get().by_id(int(props.classifications))
-        reference = ifcopenshell.api.run(
-            "classification.add_reference",
-            tool.Ifc.get(),
-            products=[product],
-            classification=classification,
-            identification="X",
-            name="Unnamed",
-        )
-        ifcopenshell.api.run(
-            "classification.edit_reference", tool.Ifc.get(), reference=reference, attributes=attributes
-        )
-        props.is_adding = False
-
-
-class AddClassificationFromBSDD(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_classification_from_bsdd"
-    bl_label = "Add Classification From bSDD"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def _execute(self, context):
-        props = context.scene.BIMBSDDProperties
-        domain = [d for d in props.domains if d.name == props.active_domain][0]
-        for element in tool.Ifc.get().by_type("IfcClassification"):
-            if element.Name == props.active_domain or element.Location == domain.uri:
-                return
-        classification = ifcopenshell.api.run(
-            "classification.add_classification", tool.Ifc.get(), classification=props.active_domain
-        )
-        classification.Source = domain.organization_name_owner
-        classification.Location = domain.uri
-        classification.Edition = domain.version
-
-
-class EnableAddingManualClassification(bpy.types.Operator):
-    bl_idname = "bim.enable_adding_manual_classification"
-    bl_label = "Enable Adding Manual Classification"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        props = context.scene.BIMClassificationProperties
-        props.is_adding = True
-        props.active_classification_id = 0
-        props.classification_attributes.clear()
-        blenderbim.bim.helper.import_attributes2("IfcClassification", props.classification_attributes)
-        return {"FINISHED"}
-
-
-class DisableAddingManualClassification(bpy.types.Operator):
-    bl_idname = "bim.disable_adding_manual_classification"
-    bl_label = "Disable Adding Manual Classification"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        props = context.scene.BIMClassificationProperties
-        props.is_adding = False
-        return {"FINISHED"}
-
-
-class EnableAddingManualClassificationReference(bpy.types.Operator):
-    bl_idname = "bim.enable_adding_manual_classification_reference"
-    bl_label = "Enable Adding Manual Classification Reference"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        obj = context.active_object
-        props = obj.BIMClassificationReferenceProperties
-        props.is_adding = True
-        props.reference_attributes.clear()
-        blenderbim.bim.helper.import_attributes2("IfcClassificationReference", props.reference_attributes)
-        return {"FINISHED"}
-
-
-class DisableAddingManualClassificationReference(bpy.types.Operator):
-    bl_idname = "bim.disable_adding_manual_classification_reference"
-    bl_label = "Disable Adding Manual Classification Reference"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        obj = context.active_object
-        props = obj.BIMClassificationReferenceProperties
-        props.is_adding = False
-        return {"FINISHED"}
-
-
 class EnableEditingClassification(bpy.types.Operator):
     bl_idname = "bim.enable_editing_classification"
     bl_label = "Enable Editing Classification"
@@ -209,10 +93,6 @@ class DisableEditingClassification(bpy.types.Operator):
 class RemoveClassification(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.remove_classification"
     bl_label = "Remove Classification"
-    bl_description = (
-        "The classification and all of its relationships, children references, "
-        "and relationships between objects and child references will be completely removed from a project"
-    )
     bl_options = {"REGISTER", "UNDO"}
     classification: bpy.props.IntProperty()
 
@@ -295,28 +175,21 @@ class RemoveClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
         else:
             objects = [self.obj]
 
-        active_reference = tool.Ifc.get().by_id(self.reference)
-        identification = active_reference[1]
+        identification = tool.Ifc.get().by_id(self.reference)[0]
 
-        elements_by_references: dict[ifcopenshell.entity_instance, list[ifcopenshell.entity_instance]] = {}
         for obj in objects:
-            ifc_definition_id = tool.Blender.get_obj_ifc_definition_id(obj, self.obj_type, context)
+            ifc_definition_id = blenderbim.bim.helper.get_obj_ifc_definition_id(context, obj, self.obj_type)
             element = tool.Ifc.get().by_id(ifc_definition_id)
             references = ifcopenshell.util.classification.get_references(element, should_inherit=False)
             for reference in references:
-                if (identification and reference[1] == identification) or (
-                    not identification and reference == active_reference
-                ):
-                    elements_by_references.setdefault(reference, []).append(element)
-
-        if elements_by_references:
-            for reference, products in elements_by_references.items():
-                ifcopenshell.api.run(
-                    "classification.remove_reference",
-                    tool.Ifc.get(),
-                    reference=reference,
-                    products=products,
-                )
+                if reference[0] == identification:
+                    ifcopenshell.api.run(
+                        "classification.remove_reference",
+                        tool.Ifc.get(),
+                        reference=reference,
+                        product=element,
+                    )
+                    break
 
 
 class EditClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
@@ -368,101 +241,19 @@ class AddClassificationReference(bpy.types.Operator, tool.Ifc.Operator):
                 classification = element
                 break
 
-        ifc_file = tool.Ifc.get()
-        products = [
-            ifc_file.by_id(ifc_definition_id)
-            for obj in objects
-            if (ifc_definition_id := tool.Blender.get_obj_ifc_definition_id(obj, self.obj_type, context))
-        ]
-        if products:
+        for obj in objects:
+            ifc_definition_id = blenderbim.bim.helper.get_obj_ifc_definition_id(context, obj, self.obj_type)
+            if not ifc_definition_id:
+                continue
             ifcopenshell.api.run(
                 "classification.add_reference",
                 tool.Ifc.get(),
                 reference=IfcStore.classification_file.by_id(self.reference),
-                products=products,
+                product=tool.Ifc.get().by_id(ifc_definition_id),
                 classification=classification,
             )
 
 
-class AddClassificationReferenceFromBSDD(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.add_classification_reference_from_bsdd"
-    bl_label = "Add Classification Reference From bSDD"
-    bl_options = {"REGISTER", "UNDO"}
-    obj: bpy.props.StringProperty()
-    obj_type: bpy.props.StringProperty()
-
-    def _execute(self, context):
-        if self.obj_type == "Object":
-            if context.selected_objects:
-                objects = [o.name for o in context.selected_objects]
-            else:
-                objects = [context.active_object.name]
-        else:
-            objects = [self.obj]
-        props = context.scene.BIMClassificationProperties
-        bprops = context.scene.BIMBSDDProperties
-
-        bsdd_classification = bprops.classifications[bprops.active_classification_index]
-
-        classification = None
-        for element in tool.Ifc.get().by_type("IfcClassification"):
-            if (
-                element.Name == bsdd_classification.domain_name
-                or element.Location == bsdd_classification.domain_namespace_uri
-            ):
-                classification = element
-                break
-
-        if not classification:
-            classification = ifcopenshell.api.run(
-                "classification.add_classification", tool.Ifc.get(), classification=bsdd_classification.domain_name
-            )
-            classification.Location = bsdd_classification.domain_namespace_uri
-
-        for obj in objects:
-            ifc_definition_id = tool.Blender.get_obj_ifc_definition_id(obj, self.obj_type, context)
-            if not ifc_definition_id:
-                continue
-            element = tool.Ifc.get().by_id(ifc_definition_id)
-            reference = ifcopenshell.api.run(
-                "classification.add_reference",
-                tool.Ifc.get(),
-                products=[element],
-                classification=classification,
-                identification=bsdd_classification.reference_code,
-                name=bsdd_classification.name,
-            )
-            reference.Location = bsdd_classification.uri
-
-            for classification_pset in bprops.classification_psets:
-                is_pset = not classification_pset.name.startswith("Qto_")
-
-                if is_pset:
-                    pset = ifcopenshell.util.element.get_pset(element, classification_pset.name, psets_only=True)
-                else:
-                    pset = ifcopenshell.util.element.get_pset(element, classification_pset.name, qtos_only=True)
-
-                if pset:
-                    pset = tool.Ifc.get().by_id(pset["id"])
-                elif is_pset:
-                    pset = ifcopenshell.api.run(
-                        "pset.add_pset", tool.Ifc.get(), product=element, name=classification_pset.name
-                    )
-                else:
-                    pset = ifcopenshell.api.run(
-                        "pset.add_qto", tool.Ifc.get(), product=element, name=classification_pset.name
-                    )
-
-                properties = {}
-                for prop in classification_pset.properties:
-                    properties[prop.name] = prop.get_value()
-
-                if is_pset:
-                    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties=properties)
-                else:
-                    ifcopenshell.api.run("pset.edit_qto", tool.Ifc.get(), qto=pset, properties=properties)
-
-
 class ChangeClassificationLevel(bpy.types.Operator):
     bl_idname = "bim.change_classification_level"
     bl_label = "Change Classification Level"

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

@@ -17,10 +17,9 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.bim.helper
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.prop import StrProperty, Attribute
-from blenderbim.bim.module.classification.data import ClassificationsData, ClassificationReferencesData
+from blenderbim.bim.module.classification.data import ClassificationsData
 from bpy.types import PropertyGroup
 from bpy.props import (
     PointerProperty,
@@ -40,12 +39,6 @@ def get_available_classifications(self, context):
     return ClassificationsData.data["available_classifications"]
 
 
-def get_classifications(self, context):
-    if not ClassificationReferencesData.is_loaded:
-        ClassificationReferencesData.load()
-    return ClassificationReferencesData.data["classifications"]
-
-
 class ClassificationReference(PropertyGroup):
     name: StringProperty(name="Name")
     identification: StringProperty(name="Identification")
@@ -55,16 +48,6 @@ class ClassificationReference(PropertyGroup):
 
 
 class BIMClassificationProperties(PropertyGroup):
-    is_adding: BoolProperty(name="Is Adding", default=False)
-    classification_source: EnumProperty(
-        items=[
-            ("FILE", "IFC File", ""),
-            ("BSDD", "buildingSMART Data Dictionary", ""),
-            ("MANUAL", "Manual Entry", ""),
-        ],
-        name="Classification Source",
-        default="FILE",
-    )
     available_classifications: EnumProperty(items=get_available_classifications, name="Available Classifications")
     classification_attributes: CollectionProperty(name="Classification Attributes", type=Attribute)
     active_classification_id: IntProperty(name="Active Classification Id")
@@ -74,7 +57,5 @@ class BIMClassificationProperties(PropertyGroup):
 
 
 class BIMClassificationReferenceProperties(PropertyGroup):
-    is_adding: BoolProperty(name="Is Adding", default=False)
-    classifications: EnumProperty(items=get_classifications, name="Classifications")
     reference_attributes: CollectionProperty(name="Reference Attributes", type=Attribute)
     active_reference_id: IntProperty(name="Active Reference Id")

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

@@ -36,7 +36,7 @@ class BIM_PT_classifications(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
-    bl_parent_id = "BIM_PT_tab_project_setup"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):
@@ -48,48 +48,6 @@ class BIM_PT_classifications(Panel):
 
         self.props = context.scene.BIMClassificationProperties
 
-        row = self.layout.row(align=True)
-        row.label(text="Source", icon="OUTLINER")
-        row.prop(self.props, "classification_source", text="")
-
-        if self.props.classification_source == "FILE":
-            self.draw_add_file_ui(context)
-        elif self.props.classification_source == "BSDD":
-            self.draw_add_bsdd_ui(context)
-        elif self.props.classification_source == "MANUAL":
-            self.draw_add_manual_ui(context)
-
-        for classification in ClassificationsData.data["classifications"]:
-            if self.props.active_classification_id == classification["id"]:
-                self.draw_editable_ui()
-            else:
-                self.draw_ui(classification)
-
-    def draw_add_manual_ui(self, context):
-        if self.props.is_adding:
-            blenderbim.bim.helper.draw_attributes(self.props.classification_attributes, self.layout)
-            row = self.layout.row(align=True)
-            row.operator("bim.add_manual_classification", text="Save", icon="CHECKMARK")
-            row.operator("bim.disable_adding_manual_classification", text="", icon="CANCEL")
-        else:
-            row = self.layout.row()
-            row.operator("bim.enable_adding_manual_classification", text="Add Classification", icon="ADD")
-
-    def draw_add_bsdd_ui(self, context):
-        self.bprops = context.scene.BIMBSDDProperties
-
-        if not self.bprops.active_domain:
-            row = self.layout.row()
-            row.label(text="No Active bSDD Domain", icon="ERROR")
-            return
-
-        row = self.layout.row()
-        row.label(text="Active: " + self.bprops.active_domain, icon="URL")
-
-        row = self.layout.row()
-        row.operator("bim.add_classification_from_bsdd", icon="ADD")
-
-    def draw_add_file_ui(self, context):
         if ClassificationsData.data["has_classification_file"]:
             row = self.layout.row(align=True)
             row.prop(self.props, "available_classifications", text="")
@@ -100,6 +58,12 @@ class BIM_PT_classifications(Panel):
             row.label(text="No Active Classification Library")
             row.operator("bim.load_classification_library", text="", icon="IMPORT")
 
+        for classification in ClassificationsData.data["classifications"]:
+            if self.props.active_classification_id == classification["id"]:
+                self.draw_editable_ui()
+            else:
+                self.draw_ui(classification)
+
     def draw_editable_ui(self):
         row = self.layout.row(align=True)
         row.operator("bim.edit_classification", text="Save changes", icon="CHECKMARK")
@@ -120,7 +84,6 @@ class ReferenceUI:
         obj = context.active_object
         self.oprops = obj.BIMObjectProperties
         self.sprops = context.scene.BIMClassificationProperties
-        self.bprops = context.scene.BIMBSDDProperties
         self.props = obj.BIMClassificationReferenceProperties
         self.file = IfcStore.get_file()
 
@@ -137,85 +100,14 @@ class ReferenceUI:
                 self.draw_reference_ui(reference)
 
     def draw_add_ui(self, context):
-        row = self.layout.row(align=True)
-        row.label(text="Source", icon="OUTLINER")
-        row.prop(self.sprops, "classification_source", text="")
-
-        if self.sprops.classification_source == "FILE":
-            self.draw_add_file_ui(context)
-        elif self.sprops.classification_source == "BSDD":
-            self.draw_add_bsdd_ui(context)
-        elif self.sprops.classification_source == "MANUAL":
-            self.draw_add_manual_ui(context)
-
-    def draw_add_manual_ui(self, context):
-        row = self.layout.row()
-        row.prop(self.props, "classifications", text="")
-        if self.props.is_adding:
-            blenderbim.bim.helper.draw_attributes(self.props.reference_attributes, self.layout)
-            row = self.layout.row(align=True)
-            op = row.operator("bim.add_manual_classification_reference", text="Save", icon="CHECKMARK")
-            op.type = self.data.data["object_type"]
-            row.operator("bim.disable_adding_manual_classification_reference", text="", icon="CANCEL")
-        else:
-            row = self.layout.row()
-            row.operator("bim.enable_adding_manual_classification_reference", text="Add Reference", icon="ADD")
-
-    def draw_add_bsdd_ui(self, context):
-        if not self.bprops.active_domain:
-            row = self.layout.row()
-            row.label(text="No Active bSDD Domain", icon="ERROR")
-            return
-
-        row = self.layout.row()
-        row.label(text="Active: " + self.bprops.active_domain, icon="URL")
-
-        row = self.layout.row(align=True)
-        row.prop(self.bprops, "keyword", text="")
-        row.operator("bim.search_bsdd_classifications", text="", icon="VIEWZOOM")
-
-        row = self.layout.row()
-        row.prop(self.bprops, "should_filter_ifc_class")
-
-        if len(self.bprops.classifications):
-            self.layout.template_list(
-                "BIM_UL_bsdd_classifications",
-                "",
-                self.bprops,
-                "classifications",
-                self.bprops,
-                "active_classification_index",
-            )
-        else:
-            row = self.layout.row()
-            row.label(text="No Search Results")
-
-        if self.bprops.active_classification_index < len(self.bprops.classifications):
-            row = self.layout.row(align=True)
-            op = row.operator(
-                "bim.add_classification_reference_from_bsdd", text="Add Classification Reference", icon="ADD"
-            )
-            op.obj = self.obj
-            op.obj_type = self.obj_type
-            row.operator("bim.get_bsdd_classification_properties", text="", icon="COPY_ID")
-
-            if len(self.bprops.classification_psets):
-                for pset in self.bprops.classification_psets:
-                    box = self.layout.box()
-                    row = box.row()
-                    row.label(text=pset.name, icon="COPY_ID")
-                    blenderbim.bim.helper.draw_attributes(pset.properties, box)
-
-    def draw_add_file_ui(self, context):
         if not self.data.data["active_classification_library"]:
             row = self.layout.row(align=True)
-            row.label(text="No Active Classification Library", icon="ERROR")
+            row.label(text="No Active Classification Library")
             row.operator("bim.load_classification_library", text="", icon="IMPORT")
             return
-
         row = self.layout.row(align=True)
         row.label(text=f"Active Classification Library: {self.data.data['active_classification_library']}")
-        # row.prop(self.sprops, "available_classifications", text="")
+        #row.prop(self.sprops, "available_classifications", text="")
         if not self.sprops.available_library_references:
             op = row.operator("bim.change_classification_level", text="", icon="GREASEPENCIL")
             op.parent_id = int(self.sprops.available_classifications)
@@ -254,8 +146,6 @@ class ReferenceUI:
             name = reference["Identification"] or "No Identification"
         row.label(text=name, icon="ASSET_MANAGER")
         row.label(text=reference["Name"] or "")
-        if reference["Location"]:
-            row.operator("bim.open_uri", icon="URL", text="").uri = reference["Location"]
         if not self.props.active_reference_id:
             op = row.operator("bim.enable_editing_classification_reference", text="", icon="GREASEPENCIL")
             op.reference = reference["id"]