Fix bug where false geolocation offsets did not take into account rotation.

* Tool to add storey to specific building

* Operator to add new storey to building

* Add new storey to building button in aggregates panel

* Minor fix

* add method to data class to retrieve ifc class name

* Extract aggregate creation logic

* Prevent aggregating non-ifc elements + display popup info

* Add tooltips + rename operators

* Rename function to get relating object

* Rename relating object data variable to be able to have access to related objects

* Add utilities to get related objects

* Add utility function to get related objects from element

* display related object in Aggregates panel in object properties

* Revert "Rename function to get relating object"

This reverts commit 5248627a41.

* Update method names

* Add Operator to select parts of an element

* Ditch box layout and only display number of parts

* Add operator to select aggregate of an element

* Display operator to select aggregate of element

* Move logic to aggregate module

* Add utility methods to Blender tool

* Add buttons to create Ifcsite and IfcBuilding from object panel

.github/workflows/cd.yml

@@ -0,0 +1,116 @@
+name: CD
+
+on: 
+  push:
+
+
+jobs:
+
+  activate:
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'IfcOpenShell/IfcOpenShell' &&
+      !startsWith(github.event.head_commit.message, 'Release ') &&
+      !contains(github.event.head_commit.message, 'ci skip')
+    steps:
+    - run: echo ok go
+
+  build:
+    runs-on: ubuntu-20.04
+    needs: activate
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt-get install --no-install-recommends \
+        git cmake gcc g++ libboost-all-dev python3-all-dev swig libpcre3-dev libxml2-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
+
+    - 
+      name: Build ifcopenshell
+      run: |
+        mkdir build && cd build
+        cmake \
+         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+         -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
+         -DCMAKE_BUILD_TYPE=Release \
+         -DCMAKE_PREFIX_PATH=/usr \
+         -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
+         -DBUILD_PACKAGE=On \
+         -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 \
+         -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
+         -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
+         -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
+        make -j $(nproc)
+        make install
+    - 
+      name: Package
+      run: |
+        make package
+      working-directory: build
+    - name: Upload 
+      uses: actions/upload-artifact@v2
+      with:
+        # Artifact name
+        name: ifcos-artifacts
+        # Directory containing files to upload
+        path: build/assets/Ifc*
+
+  deliver:
+    runs-on: ubuntu-20.04
+    needs: build
+    name: Docker Build, Tag, Push
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        lfs: true
+    
+    - name: Download 
+      uses: actions/download-artifact@v2
+      with:
+        # Artifact name
+        name: ifcos-artifacts
+        path: artifacts/
+    -
+      name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    -
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1        
+    - 
+      name: Login to Dockerhub
+      uses: docker/login-action@v1 
+      with:
+        username: aecgeeks
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+    - 
+      name: Build container image
+      uses: docker/build-push-action@v2
+      with: 
+        context: artifacts
+        repository: aecgeeks/ifcopenshell
+        tags: aecgeeks/ifcopenshell:latest
+        file: ./Dockerfile
+        push: true

.github/workflows/ci-bcf.yml

@@ -0,0 +1,38 @@
+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.x'
+      - name: Build package
+        run: |
+          cd src/bcf
+          pip install build
+          python -m build
+      - 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

@@ -5,6 +5,8 @@ on:
     paths:
       - 'src/blenderbim/**'
       - '.github/workflows/ci-blenderbim-matrix.yml'
+    branches:
+      - v0.7.0
 
 env:
   major: 0
@@ -21,6 +23,7 @@ jobs:
       run: echo ok go
 
   build:
+    needs: activate
     name: ${{ matrix.config.name }}-${{ matrix.pyver }}
     runs-on: ubuntu-latest
     strategy:

.github/workflows/ci.yml

@@ -1,107 +1,92 @@
-name: CI
+name: ci
 
-on: 
+on:
   push:
-
+    paths:
+      - 'src/**'
+      - 'test/**'
+      - 'conda/**'
+      - 'cmake/**'
+      - '.github/workflows/ci.yml'
+  pull_request:
 
 jobs:
-
   activate:
     runs-on: ubuntu-latest
     if: |
       github.repository == 'IfcOpenShell/IfcOpenShell' &&
-      !startsWith(github.event.head_commit.message, 'Release ') &&
-      !contains(github.event.head_commit.message, 'ci skip')
+      !contains(github.event.head_commit.message, 'skip ci')
     steps:
-    - run: echo ok go
+      - run: echo ok go
 
   build:
     runs-on: ubuntu-20.04
     needs: activate
     steps:
-    - uses: actions/checkout@v2
+      - 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
 
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt-get install --no-install-recommends \
-        git cmake gcc g++ libboost1.67-all-dev python3-all-dev swig libpcre3-dev libxml2-dev \
-        liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev
+      - name: Build ifcopenshell
+        run: |
+          mkdir build && cd build
+          cmake \
+               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+               -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" \
+               -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: ccache
-      uses: hendrikmuhs/ccache-action@v1
+      - name: Install Python dependencies
+        run: |
+          sudo /usr/bin/python -m pip install -U pip
+          sudo /usr/bin/python -m pip install xmlschema numpy lxml
+          sudo /usr/bin/python -m pip install src/bcf
+          sudo /usr/bin/python -m pip install pytest
+          sudo /usr/bin/python -m pip install isodate
 
-    - 
-      name: Build ifcopenshell
-      run: |
-        mkdir build && cd build
-        cmake \
-         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-         -DCMAKE_INSTALL_PREFIX=$PWD/install/ \
-         -DCMAKE_BUILD_TYPE=Release \
-         -DCMAKE_PREFIX_PATH=/usr \
-         -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
-         -DBUILD_PACKAGE=On \
-         -DOCC_INCLUDE_DIR=/usr/include/oce \
-         -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 \
-         -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
-         -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
-         ../cmake
-        make -j $(nproc)
-        make install
-    - 
-      name: Package
-      run: |
-        make package
-      working-directory: build
-    - name: Upload 
-      uses: actions/upload-artifact@v2
-      with:
-        # Artifact name
-        name: ifcos-artifacts
-        # Directory containing files to upload
-        path: build/assets/Ifc*
-
-  deliver:
-    runs-on: ubuntu-20.04
-    needs: build
-    name: Docker Build, Tag, Push
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        lfs: true
-    
-    - name: Download 
-      uses: actions/download-artifact@v2
-      with:
-        # Artifact name
-        name: ifcos-artifacts
-        path: artifacts/
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-    -
-      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1        
-    - 
-      name: Login to Dockerhub
-      uses: docker/login-action@v1 
-      with:
-        username: aecgeeks
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-    - 
-      name: Build container image
-      uses: docker/build-push-action@v2
-      with: 
-        context: artifacts
-        repository: aecgeeks/ifcopenshell
-        tags: aecgeeks/ifcopenshell:latest
-        file: ./Dockerfile
-        push: true
+      - 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/release.yml

@@ -24,7 +24,9 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get install git cmake gcc g++ libboost1.67-all-dev python3-all-dev swig libpcre3-dev libxml2-dev
-          sudo apt-get install liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev
+          sudo apt-get install libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev libocct-data-exchange-dev \
+          libhdf5-dev
+          
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -37,7 +39,7 @@ jobs:
            -DCMAKE_PREFIX_PATH=/usr \
            -DCMAKE_SYSTEM_PREFIX_PATH=/usr \
            -DBUILD_PACKAGE=On \
-           -DOCC_INCLUDE_DIR=/usr/include/oce \
+           -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 \
@@ -45,6 +47,7 @@ jobs:
            -DCOLLADA_SUPPORT=Off \
            -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
            -DLIBXML2_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxml2.so \
+           -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
            ../cmake
           make -j $(nproc)
           make install

.gitignore

@@ -1,14 +1,10 @@
 # Dependency and build folders created by the build scripts
-/_build-vs2015-x64/
-/_deps-vs2015-x64-installed/
-/_build-vs2017-x64/
-/_deps-vs2017-x64-installed/
-/_build-vs2019-x64/
-/_deps-vs2019-x64-installed/
 /_deps/
-/deps*/
-/build*/
-/install*/
+/_build-vs*-x*/
+/_deps-vs*-x*-installed/
+/_installed-vs*-x*/
+/build/
+
 /win/BuildDepsCache*.txt
 # IfcExpressParser residue
 /src/ifcexpressparser/express_parser.py
@@ -32,8 +28,10 @@ Pipfile.lock
 
 # gettext binary translation files
 *.mo
+
 # Vim
 *.swp
+*.swo
 
 # Flask
 instance/*
@@ -53,3 +51,9 @@ Pipfile.lock
 # Database
 *.db
 
+# PyTest
+htmlcov
+.coverage
+
+# Blender
+*.blend1

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "src/ifcopenshell-python/ifcopenshell/mvd"]
 	path = src/ifcopenshell-python/ifcopenshell/mvd
 	url = https://github.com/opensourceBIM/python-mvdxml/
+[submodule "src/svgfill"]
+	path = src/svgfill
+	url = https://github.com/IfcOpenShell/svgfill

.travis.yml

@@ -24,6 +24,7 @@ addons:
     - python3-all-dev
     - python3-pip
     - swig
+    - libhdf5-dev
 
 before_script:
   - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -z; fi
@@ -47,6 +48,7 @@ script:
     "-DSCHEMA_VERSIONS=2x3;4" \
     -DGLTF_SUPPORT=On \
     -DJSON_INCLUDE_DIR=/usr/include \
+    -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
     ../cmake
 
   # TODO: Drop sudo

README.md

@@ -1,7 +1,9 @@
 IfcOpenShell 
 ============
 IfcOpenShell is an open source ([LGPL]) software library for working with the Industry Foundation Classes ([IFC]) 
-file format. Currently supported IFC releases are [IFC2x3 TC1] and [IFC4 Add2 TC1].
+file format. Extensive geometric support is implemented for the IFC releases [IFC2x3 TC1] and [IFC4 Add2 TC1].
+Support for parsing is provided for IFC4x1, IFC4x2, and the IFC4x3 release candidates. Extending with support for
+arbitrary IFC schemas is possible at compile-time when using C++ and at run-time when using Python.
 
 For more information, see
 * [http://ifcopenshell.org](http://ifcopenshell.org)  
@@ -13,7 +15,7 @@ Prerequisites
 -------------
 * Git
 * CMake (2.6 or newer)
-* Windows: [Visual Studio] 2008 or newer with C++ toolset (or [Visual C++ Build Tools]) or [MSYS2] + MinGW
+* Windows: [Visual Studio] 2008 to 2019 (2022 not yet supported by dependency CMake) with C++ toolset (or [Visual C++ Build Tools]) or [MSYS2] + MinGW
 * *nix: GCC 4.7 or newer, or Clang (any version)
 
 Dependencies
@@ -33,7 +35,11 @@ Dependencies
 Building IfcOpenShell
 ---------------------
 
-**Note:** The path where the source code is cloned to can contain spaces but non-ASCII characters are very likely to cause problems with the build.
+Note 1: The path where the source code is cloned to can contain spaces but non-ASCII characters are very likely to cause problems with the build.
+
+Note 2: If you had not used `git clone --recursive https://github.com/IfcOpenShell/IfcOpenshell.git`, update the submodules by running `git submodule init & git submodule update`.
+
+Note 3: Be careful with special characters is the path when using the nix or win build scripts, because the OpenCASCADE build will fail on paths containing ++ and likely other situations.
 
 ### Compiling on Windows
 The preferred way to fetch and build this project's dependencies is to use the build scripts
@@ -81,17 +87,26 @@ The following instructions are for Ubuntu, modify as required for other operatin
 can be experimented with and studied for pointers for other operating systems, but note that this script is not currently
 meant to be used for a typical IfcOpenShell workspace setup.
 
-Note: where `make -j` is written, add a number roughly equal to the amount of CPU cores + 1.
+Note 1: It is recommeded to use OCCT for IfcOpenShell. You could use OCE as well, but sometimes it may lag behind OCCT and 
+therefore not compile with the latest IfcOpenShell.
+
+Note 2: where `make -j` is written, add a number roughly equal to the amount of CPU cores + 1.
 
 **1)** Install most of the prerequisites and dependencies:
 
-    $ sudo apt-get install git cmake gcc g++ libboost-all-dev
+    $ sudo apt-get install git cmake gcc g++ libboost-all-dev libcgal-dev
 
-**2a)** Either use an OCE package from your operating system's software repository
+**2a)** Either use an OCCT package from your operating system's software repository
+
+    $ sudo apt-get install libocct-data-exchange-dev libocct-draw-dev libocct-foundation-dev libocct-modeling-algorithms-dev libocct-modeling-data-dev libocct-ocaf-dev libocct-visualization-dev
+
+**2b)** or, if OCCT is not available or the latest code is wanted, obtain and compile OCCT from https://dev.opencascade.org/release
+
+**2c)** or, if you'd like to try using OCE, use the package from your operating system's software repository
 
     $ sudo apt-get install liboce-foundation-dev liboce-modeling-dev liboce-ocaf-dev liboce-visualization-dev liboce-ocaf-lite-dev
 
-**2b)** or (if not available, or the latest code is wanted) compile OCE yourself (note that the build takes a long time):
+**2d)** or if OCE is not available, or the latest code is wanted, compile OCE yourself (note that the build takes a long time)
 
     $ sudo apt-get install libftgl-dev libtbb2 libtbb-dev libgl1-mesa-dev libfreetype6-dev
     $ git clone https://github.com/tpaviot/oce.git
@@ -101,8 +116,6 @@ Note: where `make -j` is written, add a number roughly equal to the amount of CP
     $ make -j
     $ sudo make install
 
-**2c)** or obtain and compile OCCT from https://dev.opencascade.org/release
-
 **3)** For building IfcConvert with COLLADA (.dae) support (on by default), OpenCOLLADA is needed:
 
     $ sudo apt-get install libpcre3-dev libxml2-dev
@@ -128,7 +141,13 @@ dependencies' paths. `OCC_INCLUDE_DIR` might be needed to set also. `OPENCOLLADA
     $ cmake ../cmake -DOCC_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/ \
           -DOPENCOLLADA_INCLUDE_DIR="/usr/local/include/opencollada" \
           -DOPENCOLLADA_LIBRARY_DIR="/usr/local/lib/opencollada"  \
-          -DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/
+          -DPCRE_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu/ \
+          -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_SUPPORT=Off
     $ make -j
 
 If all worked out correctly you can now use IfcOpenShell. See the examples below.
@@ -136,6 +155,34 @@ If all worked out correctly you can now use IfcOpenShell. See the examples below
 **6)** Install the project if wanted:
 
     $ sudo make install
+    
+### Installing on MacOS Using Homebrew
+
+**1)** Install all dependencies using [Homebrew](https://brew.sh/)
+
+```{shell}
+$ brew install boost swig cmake ftgl cgal gmp libaec opencascade
+```
+
+**2)** Clone the git repo and its submodules
+```{shell}
+$ git clone --recurse-submodules https://github.com/IfcOpenShell/IfcOpenShell.git 
+```
+**3)** Build IfcOpenShell with flags for Homebrew dependencies (```/usr/local/```)
+```{shell}
+$ cd /path/to/IfcOpenShell
+$ mkdir build && cd build
+$ cmake ../cmake -DOCC_LIBRARY_DIR=/usr/local/lib/ \
+      -DOCC_INCLUDE_DIR=/usr/local/include/opencascade/ \
+      -DCOLLADA_SUPPORT=0 \
+      -DCGAL_INCLUDE_DIR=/usr/local/include/ \
+      -DGMP_LIBRARY_DIR=/usr/local/lib/ \
+      -DMPFR_LIBRARY_DIR=/usr/local/lib/
+      
+$ make -j -lboost_options
+```
+
+Note: Make sure to compile using XCode, rather than a ```brew``` installed C/C++ compiler.
 
 Installing IfcOpenShell with Conda
 ----------------------------------
@@ -151,14 +198,14 @@ Usage examples
 
 **Invoking IfcConvert from the command line**
 
-    $ wget ftp://ftp.dds.no/pub/ifc/Munkerud/Munkerud_hus6_BE.zip
-    $ unzip Munkerud_hus6_BE.zip
-    $ ./IfcConvert Munkerud_hus6_BE.ifc
-    $ less Munkerud_hus6_BE.obj
+    $ wget -O duplex.zip https://portal.nibs.org/files/wl/\?id=4DsTgHFQAcOXzFetxbpRCECPbbfUqpgo
+    $ unzip duplex.zip
+    $ ./IfcConvert Duplex_A_20110907_optimized.ifc
+    $ less Duplex_A_20110907_optimized.obj
 
 **Using the IfcOpenShell Python interface**
 
-    $ wget -O duplex.zip https://portal.nibs.org/files/wl/?id=4DsTgHFQAcOXzFetxbpRCECPbbfUqpgo
+    $ wget -O duplex.zip https://portal.nibs.org/files/wl/\?id=4DsTgHFQAcOXzFetxbpRCECPbbfUqpgo
     $ unzip duplex.zip
     $ python
     >>> import ifcopenshell

cmake/CMakeLists.txt

@@ -18,10 +18,15 @@
 ################################################################################
 
 cmake_minimum_required(VERSION 3.1.3)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)  # not necessary, but encouraged
 
-project (IfcOpenShell VERSION 0.6.0)
+project (IfcOpenShell VERSION 0.7.0)
+
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0078 OLD)
+cmake_policy(SET CMP0086 NEW)
 
 # use extra version to make pre-release using eg semver
 set( EXTRA_VERSION "-alpha.3")
@@ -37,7 +42,6 @@ endforeach()
 OPTION(COLLADA_SUPPORT "Build IfcConvert with COLLADA support (requires OpenCOLLADA)." ON)
 OPTION(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." ON)
 OPTION(ENABLE_BUILD_OPTIMIZATIONS "Enable certain compiler and linker optimizations on RelWithDebInfo and Release builds." OFF)
-OPTION(IFCCONVERT_DOUBLE_PRECISION "IfcConvert: Use double precision floating-point numbers." ON)
 OPTION(BUILD_PACKAGE "" OFF)
 OPTION(BUILD_IFCGEOM "Build IfcGeom." ON)
 OPTION(BUILD_DOCUMENTATION "Build IfcOpenShell Documentation." OFF)
@@ -45,16 +49,18 @@ OPTION(BUILD_IFCPYTHON "Build IfcPython." ON)
 OPTION(BUILD_EXAMPLES "Build example applications." ON)
 OPTION(BUILD_GEOMSERVER "Build IfcGeomServer executable." ON)
 OPTION(BUILD_CONVERT "Build IfcConvert executable." ON)
+OPTION(HDF5_SUPPORT "Enable HDF5 support (requires HDF5, zlib)" ON)
 OPTION(USE_VLD "Use Visual Leak Detector for debugging memory leaks, MSVC-only." OFF)
 OPTION(USE_MMAP "Adds a command line options to parse IFC files from memory mapped files using Boost.Iostreams" OFF)
 OPTION(BUILD_SHARED_LIBS "Build IfcParse and IfcGeom as shared libs (SO/DLL)." OFF)
 if (${HAS_MAX})
-OPTION(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." ON)
+OPTION(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 endif()
 if (${BUILD_CONVERT})
 OPTION(GLTF_SUPPORT "Build IfcConvert with glTF support (requires json.hpp)." OFF)
 endif()
 OPTION(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
+OPTION(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)
 
 # TODO QtViewer is deprecated ATM as it uses the 0.4 API
 # OPTION(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer (requires Qt 4 framework)." OFF)
@@ -117,6 +123,18 @@ UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES)
 UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(PYTHON_EXECUTABLE)
+UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
+UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
+UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARIES)
+UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
+UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
+
+UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
+UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
+UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
+UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
+UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
+UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
 
 if (GLTF_SUPPORT AND BUILD_CONVERT)
 UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
@@ -127,6 +145,7 @@ ELSE()
 	MESSAGE(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
 ENDIF()
 add_definitions(-DWITH_GLTF)
+set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()
 
 # Set INSTALL_RPATH for target
@@ -146,7 +165,7 @@ ENDMACRO()
 # runtime, when doing running conda-build we pick what conda prepared for us.
 IF(WIN32 AND ("$ENV{CONDA_BUILD}" STREQUAL ""))
 	SET(Boost_USE_STATIC_LIBS ON)
-	SET(Boost_USE_STATIC_RUNTIME ON)
+	SET(Boost_USE_STATIC_RUNTIME OFF)
 	SET(Boost_USE_MULTITHREADED ON)
     # Disable Boost's autolinking as the libraries to be linked to are supplied
     # already by CMake, and wrong libraries would be asked for when code is
@@ -178,15 +197,19 @@ if(USE_MMAP)
     add_definitions(-DUSE_MMAP)
 endif()
 
+# libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
+find_package(LibXml2 REQUIRED)
+
 if (IFCXML_SUPPORT)
-    find_package(LibXml2 REQUIRED)
     add_definitions(-DWITH_IFCXML)
+	set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_IFCXML)
 endif()
 
 FIND_PACKAGE(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 MESSAGE(STATUS "Boost include files found in ${Boost_INCLUDE_DIRS}")
 MESSAGE(STATUS "Boost libraries found in ${Boost_LIBRARY_DIRS}")
 
+
 # Usage:
 # set(SOME_LIRARIES foo bar)
 # add_debug_variants(SOME_LIRARIES "${SOME_LIRARIES}" d)
@@ -250,6 +273,9 @@ ENDIF()
 SET(OPENCASCADE_LIBRARY_NAMES
     TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO
     TKFillet TKSTEP TKSTEPBase TKSTEPAttr TKXSBase TKSTEP209 TKIGES TKOffset TKHLR
+    
+    # @todo investigate the exact conditions when this is necessary
+    TKBin
 )
 
 IF("${OCC_LIBRARY_DIR}" STREQUAL "")
@@ -316,7 +342,7 @@ endif()
 
 endif(BUILD_IFCGEOM)
 
-IF(COLLADA_SUPPORT AND BUILD_CONVERT)
+IF(COLLADA_SUPPORT)
 	# Find OpenCOLLADA
 	IF("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
 		MESSAGE(STATUS "No OpenCOLLADA include directory specified")
@@ -348,6 +374,8 @@ IF(COLLADA_SUPPORT AND BUILD_CONVERT)
 	IF(COLLADASWStreamWriter_h)
 		MESSAGE(STATUS "OpenCOLLADA header files found")
 		ADD_DEFINITIONS(-DWITH_OPENCOLLADA)
+		set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
+
 		SET(OPENCOLLADA_LIBRARY_NAMES
 			GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader
 			OpenCOLLADAStreamWriter UTF buffer ftoa
@@ -394,6 +422,54 @@ IF(COLLADA_SUPPORT AND BUILD_CONVERT)
 	ENDIF()
 ENDIF()
 
+if(HDF5_SUPPORT)
+    IF("${HDF5_INCLUDE_DIR}" STREQUAL "")
+		MESSAGE(STATUS "No HDF5 include directory specified")
+	ElSE()
+		SET(HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" CACHE FILEPATH "HDF5 header files")
+	ENDIF()
+	
+    IF("${HDF5_LIBRARY_DIR}" STREQUAL "")
+		MESSAGE(STATUS "No HDF5 library directory specified")
+	ElSE()
+		SET(HDF5_LIBRARY_DIR "${HDF5_LIBRARY_DIR}" CACHE FILEPATH "HDF5 library files")
+	ENDIF()
+
+    if (HDF5_LIBRARY_DIR)
+    	# result of the HDF5 ctest package
+    	
+        if (WIN32)
+        	set(zlib_post lib)
+        	set(lib_ext lib)
+        else()
+        	set(lib_ext a)
+        endif()
+        
+        SET(HDF5_LIBRARIES 
+            "${HDF5_LIBRARY_DIR}/libhdf5_cpp.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libhdf5.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libz${zlib_post}.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libsz.${lib_ext}"
+            "${HDF5_LIBRARY_DIR}/libaec.${lib_ext}"
+        )
+    endif()
+    
+    if (NOT HDF5_LIBRARIES)
+    	# debian default
+    	
+        SET(HDF5_LIBRARIES
+            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
+            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
+            /usr/lib/x86_64-linux-gnu/libsz.so
+            /usr/lib/x86_64-linux-gnu/libaec.so
+            z dl
+        )
+    endif()
+    
+    add_definitions(-DWITH_HDF5)
+	set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5)
+endif()
+
 IF(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE "Release")
 ENDIF()
@@ -422,6 +498,14 @@ if(ENABLE_BUILD_OPTIMIZATIONS)
 endif()
 
 IF(MSVC)
+	# warning due to virtual inheritance
+	ADD_DEFINITIONS(-wd4250)
+	# warning due to select definitions in the schema being redundant
+	ADD_DEFINITIONS(-wd4584)
+	
+	# didn't work well on ifcopenbot, @todo make configurable
+	# add_definitions(/MP)
+
     # Enable solution folders (free VS versions prior to 2012 don't support solution folders)
     if (MSVC_VERSION GREATER 1600)
         set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -447,18 +531,18 @@ IF(MSVC)
     endif()
 	# Link against the static VC runtime
     # TODO Make this configurable
-	IF("$ENV{CONDA_BUILD}" STREQUAL "")
-	FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
-			CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-			CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-		IF(${flag} MATCHES "/MD")
-			STRING(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
-		ENDIF()
-		IF(${flag} MATCHES "/MDd")
-			STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
-		ENDIF()
-	ENDFOREACH()
-	ENDIF()
+	# IF("$ENV{CONDA_BUILD}" STREQUAL "")
+	# FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
+			# CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+			# CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+		# IF(${flag} MATCHES "/MD")
+			# STRING(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
+		# ENDIF()
+		# IF(${flag} MATCHES "/MDd")
+			# STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
+		# ENDIF()
+	# ENDFOREACH()
+	# ENDIF()
 ElSE()
     add_definitions(-Wall -Wextra)
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -476,12 +560,8 @@ ElSE()
     endif()
 ENDIF()
 
-if (IFCCONVERT_DOUBLE_PRECISION)
-    SET(CONVERT_PRECISION "-DIFCCONVERT_DOUBLE_PRECISION")
-endif()
-
 INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
-	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR}
+	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
 )
 
 function(files_for_ifc_version IFC_VERSION RESULT_NAME)
@@ -618,7 +698,7 @@ TARGET_LINK_LIBRARIES(IfcParse ${Boost_LIBRARIES} ${BCRYPT_LIBRARIES} ${LIBXML2_
 if (BUILD_IFCGEOM)
 
 # IfcGeom
-file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h)
+file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h ../src/ifcgeom/*.i)
 file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp)
 set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
 
@@ -657,13 +737,13 @@ set(SERIALIZERS_S_FILES ${SERIALIZERS_S_H_FILES} ${SERIALIZERS_S_CPP_FILES})
 foreach(s ${SCHEMA_VERSIONS})
 	add_library(Serializers_ifc${s} STATIC ${SERIALIZERS_S_FILES})
 	set_target_properties(Serializers_ifc${s} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${s} ${CONVERT_PRECISION}")
-	TARGET_LINK_LIBRARIES(Serializers_ifc${s} IfcGeom ${OPENCASCADE_LIBRARIES})
+	TARGET_LINK_LIBRARIES(Serializers_ifc${s} IfcGeom ${OPENCASCADE_LIBRARIES} ${HDF5_LIBRARIES})
 endforeach()
 
 add_library(Serializers ${SERIALIZERS_FILES})
 set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS ${CONVERT_PRECISION}" VERSION "0.6.0" SOVERSION "0.6")
 
-TARGET_LINK_LIBRARIES(Serializers ${SERIALIZER_SCHEMA_LIBRARIES})
+TARGET_LINK_LIBRARIES(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES})
 
 # IfcConvert
 file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)
@@ -672,7 +752,7 @@ set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
 ADD_EXECUTABLE(IfcConvert ${IFCCONVERT_FILES})
 set_target_properties(IfcConvert PROPERTIES COMPILE_FLAGS "${CONVERT_PRECISION}")
 
-TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${OPENCOLLADA_LIBRARIES})
+TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES})
 
 if ((NOT WIN32) AND BUILD_SHARED_LIBS)
     # Only set RPATHs when building shared libraries (i.e. IfcParse and
@@ -710,6 +790,34 @@ INSTALL(TARGETS IfcGeomServer
 
 endif()
 
+if (ADD_COMMIT_SHA)
+find_package (Git)
+if (GIT_FOUND)
+	message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
+	execute_process(
+		COMMAND ${GIT_EXECUTABLE} branch --contains HEAD
+		OUTPUT_VARIABLE git_branches
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	string(REPLACE "\n" ";" git_branch_list "${git_branches}")
+	foreach(git_branch_candidate IN ITEMS ${git_branch_list})
+		string(STRIP "${git_branch_candidate}" git_branch_candidate_2)
+		if (NOT git_branch_candidate_2 MATCHES "^HEAD$")
+			set(git_branch ${git_branch_candidate_2})
+		endif()
+	endforeach()
+	execute_process(
+		COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+		OUTPUT_VARIABLE git_sha
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+	message(STATUS "IfcOpenShell branch: \"${git_branch}\"")
+	message(STATUS "IfcOpenShell commit: \"${git_sha}\"")
+	add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
+	add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
+endif()
+endif()
+
 # Documentation
 IF(BUILD_DOCUMENTATION)
 	set(CMAKE_MODULE_PATH "../docs/cmake")
@@ -728,6 +836,8 @@ IF(BUILD_IFCMAX)
 	ADD_SUBDIRECTORY(../src/ifcmax ifcmax)
 ENDIF()
 
+ADD_SUBDIRECTORY(../src/svgfill svgfill)
+
 # CMake installation targets
 INSTALL(FILES ${IFCPARSE_H_FILES}
 	DESTINATION ${INCLUDEDIR}/ifcparse

nix/build-all.py

@@ -49,27 +49,17 @@
 #          $ brew install git bison autoconf automake freetype libffi cmake   #
 #                                                                             #
 ###############################################################################
-
-from __future__ import print_function
-
 import logging
 import os
 import sys
 import subprocess as sp
 import shutil
-import time
 import tarfile
 import multiprocessing
+import platform
+import sysconfig
 
-PYTHON_MAJOR = sys.version_info[0]
-
-if PYTHON_MAJOR >= 3:
-    from urllib.request import urlretrieve
-else:
-    # Not Python 3 - today, it is most likely to be Python 2
-    # But note that this might need an update when Python 4
-    # might be around one day
-    from urllib import urlretrieve
+from urllib.request import urlretrieve
 
 
 logger = logging.getLogger(__name__)
@@ -78,164 +68,130 @@ ch = logging.StreamHandler()
 ch.setLevel(logging.INFO)
 logger.addHandler(ch)
 
-PROJECT_NAME="IfcOpenShell"
-PYTHON_VERSIONS=["2.7.16", "3.2.6", "3.3.6", "3.4.6", "3.5.3", "3.6.2", "3.7.3", "3.8.6", "3.9.1"]
-JSON_VERSION="v3.6.1"
-OCE_VERSION="0.18"
-# OCCT_VERSION="7.1.0"
-# OCCT_HASH="89aebde"
-# OCCT_VERSION="7.2.0"
-# OCCT_HASH="88af392"
-OCCT_VERSION="7.3.0p3"
-BOOST_VERSION="1.71.0"
-#PCRE_VERSION="8.39"
-PCRE_VERSION="8.41"
-#LIBXML2_VERSION="2.9.3"
-LIBXML2_VERSION="2.9.9"
-SWIG_VERSION="3.0.12"
-#SWIG_VERSION="4.0.0"
-#OPENCOLLADA_VERSION="v1.6.63"
-OPENCOLLADA_VERSION="v1.6.68"
+PROJECT_NAME = "IfcOpenShell"
+USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION")
+ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA")
 
+PYTHON_VERSIONS = ["3.6.14", "3.7.12", "3.8.12", "3.9.7", "3.10.0"]
+JSON_VERSION = "v3.6.1"
+OCE_VERSION = "0.18.3"
+OCCT_VERSION = "7.5.3"
+BOOST_VERSION = "1.71.0"
+PCRE_VERSION = "8.41"
+LIBXML2_VERSION = "2.9.11"
+SWIG_VERSION = "4.0.2"
+OPENCOLLADA_VERSION = "v1.6.68"
+HDF5_VERSION = "1.12.1"
 
+GMP_VERSION = "6.1.2"
+MPFR_VERSION = "3.1.5" # latest is 4.1.0
+CGAL_VERSION = "5.3"
 
 # binaries
-cp="cp"
-bash="bash"
-uname="uname"
-git="git"
-bunzip2="bunzip2"
-tar="tar"
-cc="cc"
-cplusplus="c++"
-autoconf="autoconf"
-automake="automake"
-yacc="yacc"
-make="make"
+cp = "cp"
+bash = "bash"
+git = "git"
+bunzip2 = "bunzip2"
+tar = "tar"
+cc = "cc"
+cplusplus = "c++"
+autoconf = "autoconf"
+automake = "automake"
+yacc = "yacc"
+make = "make"
 date = "date"
-curl="curl"
-wget="wget"
-strip="strip"
+curl = "curl"
+wget = "wget"
+strip = "strip"
 
 # Helper function for coloured printing
 
-NO_COLOR="\033[0m" # <ref>http://stackoverflow.com/questions/5947742/how-to-change-the-output-color-of-echo-in-linux</ref>
-BLACK_ON_WHITE="\033[0;30;107m"
-RED="\033[31m"
-GREEN="\033[32m"
-YELLOW="\033[33m"
-MAGENTA="\033[35m"
+NO_COLOR = "\033[0m" # <ref>http://stackoverflow.com/questions/5947742/how-to-change-the-output-color-of-echo-in-linux</ref>
+BLACK_ON_WHITE = "\033[0;30;107m"
+RED = "\033[31m"
+GREEN = "\033[32m"
+YELLOW = "\033[33m"
+MAGENTA = "\033[35m"
 
 def cecho(message, color=NO_COLOR):
     """Logs message `message` in color `color`."""
-    logger.info("%s%s\033[0m" % (color, message))
+    logger.info(f"{color}{message}\033[0m")
 
 def which(cmd):
-    for path in os.environ["PATH"].split(":"):
+    for path in os.getenv("PATH").split(":"):
         if os.path.exists(path) and cmd in os.listdir(path):
             return cmd
     return None
 
-def get_os():
-    ret_value = sp.check_output([uname, "-s"]).strip()
-    return ret_value
-
-def to_pystring(x):
-    """ Python 2 & 3 compatibility function for strings handling 
-    (to solve TypeError "Can't mix strings and bytes in path components" for Python 3).
-    Reference https://github.com/hugsy/gef/issues/382 """
-    res = str(x, encoding="utf-8") if PYTHON_MAJOR == 3 else x
-    substs = [("\n","\\n"), ("\r","\\r"), ("\t","\\t"), ("\v","\\v"), ("\b","\\b"), ]
-    for x,y in substs: res = res.replace(x,y)
-    return res
 
 # Set defaults for missing empty environment variables
 
 USE_OCCT = os.environ.get("USE_OCCT", "true").lower() == "true"
 
 TOOLSET = None
-if get_os() == "Darwin":
+if platform.system() == "Darwin":
     # C++11 features used in OCCT 7+ need a more recent stdlib
     TOOLSET = "10.9" if USE_OCCT else "10.6"
 
-# python 3.4 doesn't seem to build anymore on recent versions of clang
-if get_os() == "Darwin":
-    try:
-        PYTHON_VERSIONS.remove("3.4.6")
-    except ValueError as e:
-        pass
-   
-try:
-    IFCOS_NUM_BUILD_PROCS = os.environ["IFCOS_NUM_BUILD_PROCS"]
-except KeyError:
-    IFCOS_NUM_BUILD_PROCS=multiprocessing.cpu_count() + 1
 
-try:
-    TARGET_ARCH = os.environ["TARGET_ARCH"]
-except KeyError:
-    TARGET_ARCH = sp.check_output([uname, "-m"]).strip()
+IFCOS_NUM_BUILD_PROCS = os.getenv("IFCOS_NUM_BUILD_PROCS", multiprocessing.cpu_count() + 1)
 
-CMAKE_DIR=os.path.realpath(os.path.join("..", "cmake"))
+CMAKE_DIR = os.path.realpath(os.path.join("..", "cmake"))
 
-try:
-    DEPS_DIR = os.environ["DEPS_DIR"]
-except KeyError:
-    path = [b"..", b"build", sp.check_output(uname).strip(), TARGET_ARCH]
-    if TOOLSET:
-        path.append(TOOLSET)
-        
-    DEPS_DIR = to_pystring(os.path.realpath(os.path.join(*path)))
+path = ["..", "build", platform.system(), platform.machine()]
+if TOOLSET:
+    path.append(TOOLSET)
+DEFAULT_DEPS_DIR = os.path.realpath(os.path.join(*path))
+
+DEPS_DIR = os.getenv("DEPS_DIR", DEFAULT_DEPS_DIR)
 
 if not os.path.exists(DEPS_DIR):
     os.makedirs(DEPS_DIR)
 
-try:
-    BUILD_CFG=os.environ["BUILD_CFG"]
-except KeyError:
-    BUILD_CFG="RelWithDebInfo"
+BUILD_CFG = os.getenv("BUILD_CFG", "RelWithDebInfo")
 
 
 # Print build configuration information
 
-cecho ("""This script fetches and builds %s and its dependencies
-""" % (PROJECT_NAME,), BLACK_ON_WHITE)
+cecho (f"""This script fetches and builds {PROJECT_NAME} and its dependencies
+""", BLACK_ON_WHITE)
 cecho("""Script configuration:
 
 """, GREEN)
-cecho("""* Target Architecture    = %s""" % (TARGET_ARCH,), MAGENTA)
-cecho(" - Whether 32-bit (i686) or 64-bit (x86_64) will be built.")
-cecho("""* USE_OCCT               = %r""" % (USE_OCCT,), MAGENTA)
+cecho(f"""* USE_OCCT               = {USE_OCCT}""", MAGENTA)
 if USE_OCCT:
     cecho(" - Compiling against official Open Cascade")
 else:
     cecho(" - Compiling against Open Cascade Community Edition")
-cecho("* Dependency Directory   = %s" % (DEPS_DIR,), MAGENTA)
-cecho(" - The directory where %s dependencies are installed." % (PROJECT_NAME,))
-cecho("* Build Config Type      = %s" % (BUILD_CFG,), MAGENTA)
+cecho(f"* Dependency Directory   = {DEPS_DIR}", MAGENTA)
+cecho(f" - The directory where {PROJECT_NAME} dependencies are installed.")
+cecho(f"* Build Config Type      = {BUILD_CFG}", MAGENTA)
 cecho(""" - The used build configuration type for the dependencies.
    Defaults to RelWithDebInfo if not specified.""")
 
 if BUILD_CFG == "MinSizeRel":
     cecho("     WARNING: MinSizeRel build can suffer from a significant performance loss.", RED)
 
-cecho("* IFCOS_NUM_BUILD_PROCS  = %s" % (IFCOS_NUM_BUILD_PROCS,), MAGENTA)
+cecho(f"* IFCOS_NUM_BUILD_PROCS  = {IFCOS_NUM_BUILD_PROCS}", MAGENTA)
 cecho(""" - How many compiler processes may be run in parallel.
 """)
 
 dependency_tree = {
-    'IfcParse': ('boost',  'libxml2'),
-    'IfcGeom': ('IfcParse',  'occ'),
-    'IfcConvert': ('IfcGeom',  'OpenCOLLADA', 'json'),
-    'OpenCOLLADA': ('libxml2',  'pcre'),
+    'IfcParse': ('boost', 'libxml2', 'hdf5'),
+    'IfcGeom': ('IfcParse', 'occ', 'json', 'cgal'),
+    'IfcConvert': ('IfcGeom',),
+    'OpenCOLLADA': ('libxml2', 'pcre'),
     'IfcGeomServer': ('IfcGeom',),
-    'IfcOpenShell-Python': ('python',  'swig',  'IfcGeom'),
+    'IfcOpenShell-Python': ('python', 'swig', 'IfcGeom'),
     'swig': ('pcre',),
     'boost': (),
     'libxml2': (),
     'python': (),
     'occ': (),
     'pcre': (),
-    'json': ()
+    'json': (),
+    'hdf5': (),
+    'cgal': ()
 }
 
 def v(dep):
@@ -266,7 +222,7 @@ print("Building:", *sorted(targets, key=lambda t: len(list(v(t)))))
 
 for cmd in [git, bunzip2, tar, cc, cplusplus, autoconf, automake, yacc, make, "patch", "cmake"]:
     if which(cmd) is None:
-        raise ValueError("Required tool '%s' not installed or not added to PATH" % (cmd,))
+        raise ValueError(f"Required tool '{cmd}' not installed or not added to PATH")
 
 # identifiers for the download tool (could be less memory consuming as ints, but are more verbose as strings)
 download_tool_default = download_tool_py = "py"
@@ -277,10 +233,10 @@ download_tool_git = "git"
 log_dir = os.path.join(DEPS_DIR, "logs")
 if not os.path.exists(log_dir):
     os.makedirs(log_dir)
-LOG_FILE="%s.log" % (os.path.join(log_dir, to_pystring(sp.check_output([date, "+%Y%m%d"]).strip())),)
+LOG_FILE = os.path.join(log_dir, sp.check_output([date, "+%Y%m%d"], encoding="utf-8").strip()) + ".log"
 if not os.path.exists(LOG_FILE):
     open(LOG_FILE, "w").close()
-logger.info("using command log file '%s'" % (LOG_FILE,))
+logger.info(f"using command log file '{LOG_FILE}'")
 
 def run(cmds, cwd=None):
 
@@ -290,43 +246,47 @@ def run(cmds, cwd=None):
     with leading and trailing whitespace removed.
     """
 
-    logger.debug("running command %r in directory %r" % (" ".join(cmds), cwd))
-    log_file_handle = open(LOG_FILE, "ab")
-    proc = sp.Popen(cmds, cwd=cwd, stdout=sp.PIPE, stderr=sp.PIPE)
+    logger.debug(f"running command {' '.join(cmds)} in directory {cwd}")
+    log_file_handle = open(LOG_FILE, "a")
+    proc = sp.Popen(cmds, cwd=cwd, stdout=sp.PIPE, stderr=sp.PIPE, encoding="utf-8")
     stdout, stderr = proc.communicate()
     log_file_handle.write(stdout)
     log_file_handle.write(stderr)
     log_file_handle.close()
-    logger.debug("command returned %r" % proc.returncode)
+    logger.debug(f"command returned {proc.returncode}")
 
     if proc.returncode != 0:
         print("-" * 70)
         print(stderr)
         print("-" * 70)
-        raise Exception("Command `%s` returned exit code %d" % (" ".join(cmds), proc.returncode))
+        raise RuntimeError(f"Command `{' '.join(cmds)}` returned exit code {proc.returncode}")
 
     return stdout.strip()
 
-BOOST_VERSION_UNDERSCORE=BOOST_VERSION.replace(".", "_")
+BOOST_VERSION_UNDERSCORE = BOOST_VERSION.replace(".", "_")
 
-OCE_LOCATION="https://github.com/tpaviot/oce/archive/OCE-%s.tar.gz" % (OCE_VERSION,)
-BOOST_LOCATION="https://boostorg.jfrog.io/artifactory/main/release/%s/source/" % (BOOST_VERSION,)
+OCE_LOCATION = f"https://github.com/tpaviot/oce/archive/OCE-{OCE_VERSION}.tar.gz"
+BOOST_LOCATION = f"https://boostorg.jfrog.io/artifactory/main/release/{BOOST_VERSION}/source/"
 
 # Helper functions
 
+
 def run_autoconf(arg1, configure_args, cwd):
     configure_path = os.path.realpath(os.path.join(cwd, "..", "configure"))
     if not os.path.exists(configure_path):
         run([bash, "./autogen.sh"], cwd=os.path.realpath(os.path.join(cwd, ".."))) # only run autogen.sh in the directory it is located and use cwd to achieve that in order to not mess up things
     # Using `sh` over `bash` fixes issues with building swig 
-    run(["/bin/sh", "../configure"]+configure_args+["--prefix=%s" % (os.path.realpath("%s/install/%s" % (DEPS_DIR, arg1)),)], cwd=cwd)
+    prefix = os.path.realpath(f"{DEPS_DIR}/install/{arg1}")
+    run(["/bin/sh", "../configure"] + configure_args + [f"--prefix={prefix}"], cwd=cwd)
+
 
 def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
     if cmake_dir is None:
-        P=".."
+        P = ".."
     else:
-        P=cmake_dir
-    run(["cmake", P]+cmake_args+["-DCMAKE_BUILD_TYPE=%s" % (BUILD_CFG,)], cwd=cwd)
+        P = cmake_dir
+    run(["cmake", P] + cmake_args + [f"-DCMAKE_BUILD_TYPE={BUILD_CFG}"], cwd=cwd)
+
 
 def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
     """Lazily clones the `git` repository denoted by `clone_url` into
@@ -335,10 +295,10 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
     `revision` after cloning or in the existing clone if `revision` is not
     `None`."""
     if not os.path.exists(target_dir):
-        logger.info("cloning '%s' into '%s'" % (clone_url, target_dir))
+        logger.info(f"cloning '{clone_url}' into '{target_dir}'")
         run([git, "clone", "--recursive", clone_url, target_dir])
     else:
-        logger.info("directory '%s' already cloned. Pulling latest changes." % (target_dir,))
+        logger.info(f"directory '{target_dir}' already cloned. Pulling latest changes.")
 
     # detect whether we are on a branch and pull
     if run([git, "rev-parse", "--abbrev-ref", "HEAD"], cwd=target_dir) != "HEAD":
@@ -348,20 +308,20 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
         run([git, "checkout", revision], cwd=target_dir)
 
 
-def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False):
+def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False, **kwargs):
     """Handles building of dependencies with different tools (which are
     distinguished with the `mode` argument. `build_tool_args` is expected to be
     a list which is necessary in order to not mess up quoting of compiler and
     linker flags."""
     check_dir = os.path.join(DEPS_DIR, "install", name)
     if os.path.exists(check_dir):
-        logger.info( "Found existing %s, skipping" % (name,))
+        logger.info(f"Found existing {name}, skipping")
         return
     build_dir = os.path.join(DEPS_DIR, "build")
     if not os.path.exists(build_dir):
         os.makedirs(build_dir)
         
-    logger.info("\rFetching %s...   " % (name,))
+    logger.info(f"\rFetching {name}...   ")
     
     if download_tool == download_tool_py:
         if no_append_name:
@@ -373,16 +333,16 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
         if not os.path.exists(download_path):
             urlretrieve(url, os.path.join(build_dir, download_path))
         else:
-            logger.info("Download '%s' already exists, assuming it's an undamaged download and that it has been extracted if possible, skipping" % (download_path,))
+            logger.info(f"Download '{download_path}' already exists, assuming it's an undamaged download and that it has been extracted if possible, skipping")
     elif download_tool == download_tool_git:
-        logger.info("\rChecking %s...   " % (name,))
+        logger.info(f"\rChecking {name}...   ")
         git_clone_or_pull_repository(download_url, target_dir=os.path.join(build_dir, download_name), revision=revision)
     else:
-        raise ValueError("download tool '%s' is not supported" % (download_tool,))
+        raise ValueError(f"download tool '{download_tool}' is not supported")
     download_dir = os.path.join(build_dir, download_name)
     
     if os.path.isdir(download_dir):
-        extract_dir_name=download_name
+        extract_dir_name = download_name
         extract_dir = os.path.join(build_dir, extract_dir_name)
     else:
         download_tarfile_path = os.path.join(build_dir, download_name)
@@ -392,11 +352,12 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
             compr = "bz2"
         else:
             raise RuntimeError("fix source for new download type")
-        download_tarfile = tarfile.open(name=download_tarfile_path, mode="r:%s" % (compr,))
-        extract_dir_name= os.path.commonprefix(download_tarfile.getnames()) # tarfile seriously doesn't have a function to retrieve the root directory more easily
+        download_tarfile = tarfile.open(name=download_tarfile_path, mode=f"r:{compr}")
+        # tarfile seriously doesn't have a function to retrieve the root directory more easily
+        extract_dir_name = os.path.commonprefix([x for x in download_tarfile.getnames() if x != "."])
         #run([tar, "--exclude=\"*/*\"", "-tf", download_name], cwd=build_dir).strip() no longer works
         if extract_dir_name is None:
-            extract_dir_name= run([bash, "-c", "tar -tf %s 2> /dev/null | head -n 1 | cut -f1 -d /" % (download_name,)], cwd=build_dir)
+            extract_dir_name = run([bash, "-c", f"tar -tf {download_name} 2> /dev/null | head -n 1 | cut -f1 -d /"], cwd=build_dir)
         extract_dir = os.path.join(build_dir, extract_dir_name)
         if not os.path.exists(extract_dir):
             run([tar, "-xf", download_name], cwd=build_dir)
@@ -412,78 +373,80 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
             except Exception as e:
                 # Assert that the patch has already been applied
                 run(["patch", "-p1", "--batch", "--reverse", "--dry-run", "-i", patch_abs], cwd=extract_dir)
-            
-    if mode != "bjam":
+    
+    if mode == "ctest":
+        run(["ctest", "-S", "HDF5config.cmake,BUILD_GENERATOR=Unix", "-C", BUILD_CFG, "-V", "-O", "hdf5.log"], cwd=extract_dir)
+        run([tar, "-xf", kwargs["ctest_result"] + ".tar.gz"], cwd=os.path.join(extract_dir, 'build'))
+        shutil.copytree(
+            os.path.join(extract_dir, "build", kwargs["ctest_result"], kwargs["ctest_result_path"]),
+            os.path.join(DEPS_DIR, "install", name)
+        )
+    elif mode != "bjam":
         extract_build_dir = os.path.join(extract_dir, "build")
         if os.path.exists(extract_build_dir):
             shutil.rmtree(extract_build_dir)
         os.makedirs(extract_build_dir)
 
-        logger.info("\rConfiguring %s..." % (name,))
+        logger.info(f"\rConfiguring {name}...")
         if mode == "autoconf":
             run_autoconf(name, build_tool_args, cwd=extract_build_dir)
         elif mode == "cmake":
             run_cmake(name, build_tool_args, cwd=extract_build_dir)
         else:
             raise ValueError()
-        logger.info("\rBuilding %s...   " % (name,))
-        run([make, "-j%s" % (IFCOS_NUM_BUILD_PROCS,), "VERBOSE=1"], cwd=extract_build_dir)
-        logger.info( "\rInstalling %s... " % (name,))
+        logger.info(f"\rBuilding {name}...   ")
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "VERBOSE=1"], cwd=extract_build_dir)
+        logger.info(f"\rInstalling {name}... ")
         run([make, "install"], cwd=extract_build_dir)
-        logger.info( "\rInstalled %s     \n" % (name,))
+        logger.info(f"\rInstalled {name}     \n")
     else:
-        logger.info( "\rConfiguring %s..." % (name,))
+        logger.info(f"\rConfiguring {name}...")
         run([bash, "./bootstrap.sh"], cwd=extract_dir)
-        logger.info("\rBuilding %s...   " % (name,))
-        run(["./b2", "-j%s" % (IFCOS_NUM_BUILD_PROCS,)]+build_tool_args, cwd=extract_dir)
-        logger.info("\rInstalling %s... " % (name,))
-        shutil.copytree(os.path.join(extract_dir, "boost"), os.path.join(DEPS_DIR, "install", "boost-%s" % BOOST_VERSION, "boost"))
-        logger.info("\rInstalled %s     \n" % (name,))
+        logger.info(f"\rBuilding {name}...   ")
+        run(["./b2", f"-j{IFCOS_NUM_BUILD_PROCS}"] + build_tool_args, cwd=extract_dir)
+        logger.info(f"\rInstalling {name}... ")
+        shutil.copytree(os.path.join(extract_dir, "boost"), os.path.join(DEPS_DIR, "install", f"boost-{BOOST_VERSION}", "boost"))
+        logger.info(f"\rInstalled {name}     \n")
 
 cecho("Collecting dependencies:", GREEN)
 
 # Set compiler flags for 32bit builds on 64bit system
 # TODO: This is untested
 
-ADDITIONAL_ARGS=[]
-BOOST_ADDRESS_MODEL=[]
-if TARGET_ARCH == "i686" and run([uname, "-m"]).strip() == "x86_64":
-    if get_os() == "Darwin":
-        ADDITIONAL_ARGS=["-m32", "-arch i386"]
-    else:
-        ADDITIONAL_ARGS=["-m32"]
-    BOOST_ADDRESS_MODEL=["architecture=x86", "address-model=32"]
+ADDITIONAL_ARGS = []
+BOOST_ADDRESS_MODEL = []
 
-if get_os() == "Darwin":
-    ADDITIONAL_ARGS=["-mmacosx-version-min=%s" % TOOLSET]+ADDITIONAL_ARGS
+if platform.system() == "Darwin":
+    ADDITIONAL_ARGS = [f"-mmacosx-version-min={TOOLSET}"] + ADDITIONAL_ARGS
 
 # If the linker supports GC sections, set it up to reduce binary file size
 # -fPIC is required for the shared libraries to work
 
-CXXFLAGS=os.environ.get("CXXFLAGS", "")
-CFLAGS=os.environ.get("CFLAGS", "")
-LDFLAGS=os.environ.get("LDFLAGS", "")
+CXXFLAGS = os.environ.get("CXXFLAGS", "")
+CFLAGS = os.environ.get("CFLAGS", "")
+LDFLAGS = os.environ.get("LDFLAGS", "")
 
+ADDITIONAL_ARGS_STR = " ".join(ADDITIONAL_ARGS)
 if sp.call([bash, "-c", "ld --gc-sections 2>&1 | grep -- --gc-sections &> /dev/null"]) != 0:
-    CXXFLAGS_MINIMAL="%s %s %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
-    CFLAGS_MINIMAL="%s %s %s" % (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    CXXFLAGS_MINIMAL = f"{CXXFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
+    CFLAGS_MINIMAL = f"{CFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
     if BUILD_STATIC:
-        CXXFLAGS="%s %s -fdata-sections -ffunction-sections -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
-        CFLAGS="%s   %s -fdata-sections -ffunction-sections -fvisibility=hidden %s"% (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+        CXXFLAGS = f"{CXXFLAGS} {PIC} -fdata-sections -ffunction-sections -fvisibility=hidden -fvisibility-inlines-hidden {ADDITIONAL_ARGS_STR}"
+        CFLAGS = f"{CFLAGS}   {PIC} -fdata-sections -ffunction-sections -fvisibility=hidden {ADDITIONAL_ARGS_STR}"
     else:
-        CXXFLAGS=CXXFLAGS_MINIMAL
-        CFLAGS=CFLAGS_MINIMAL
-    LDFLAGS="%s  -Wl,--gc-sections %s" % (LDFLAGS, str.join(" ", ADDITIONAL_ARGS))
+        CXXFLAGS = CXXFLAGS_MINIMAL
+        CFLAGS = CFLAGS_MINIMAL
+    LDFLAGS = f"{LDFLAGS}  -Wl,--gc-sections {ADDITIONAL_ARGS_STR}"
 else:
-    CXXFLAGS_MINIMAL="%s %s %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
-    CFLAGS_MINIMAL="%s   %s %s" % (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+    CXXFLAGS_MINIMAL = f"{CXXFLAGS} {PIC} {ADDITIONAL_ARGS_STR}"
+    CFLAGS_MINIMAL = f"{CFLAGS}   {PIC} {ADDITIONAL_ARGS_STR}"
     if BUILD_STATIC:
-        CXXFLAGS="%s %s -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CXXFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
-        CFLAGS="%s   %s -fvisibility=hidden -fvisibility-inlines-hidden %s" % (CFLAGS, PIC, str.join(" ", ADDITIONAL_ARGS))
+        CXXFLAGS = f"{CXXFLAGS} {PIC} -fvisibility=hidden -fvisibility-inlines-hidden {ADDITIONAL_ARGS_STR}"
+        CFLAGS = f"{CFLAGS}   {PIC} -fvisibility=hidden -fvisibility-inlines-hidden {ADDITIONAL_ARGS_STR}"
     else:
         CXXFLAGS=CXXFLAGS_MINIMAL
         CFLAGS=CFLAGS_MINIMAL
-    LDFLAGS="%s %s" % (LDFLAGS, str.join(" ", ADDITIONAL_ARGS))
+    LDFLAGS = f"{LDFLAGS} {ADDITIONAL_ARGS_STR}"
     
 os.environ["CXXFLAGS"] = CXXFLAGS
 os.environ["CFLAGS"] = CFLAGS
@@ -493,9 +456,21 @@ os.environ["LDFLAGS"] = LDFLAGS
 # @tfk: this is no longer needed
 # build_dependency(name="cmake-%s" % (CMAKE_VERSION,), mode="autoconf", build_tool_args=[], download_url="https://cmake.org/files/v%s" % (CMAKE_VERSION_2,), download_name="cmake-%s.tar.gz" % (CMAKE_VERSION,))
 
+if 'hdf5' in targets:
+    HDF5_MAJOR = ".".join(HDF5_VERSION.split(".")[:-1])
+    build_dependency(
+        name=f"hdf5-{HDF5_VERSION}",
+        mode="ctest",
+        build_tool_args=[],
+        download_url=f"https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{HDF5_MAJOR}/hdf5-{HDF5_VERSION}/src/",
+        download_name=f"CMake-hdf5-{HDF5_VERSION}.tar.gz",
+        ctest_result=f"HDF5-{HDF5_VERSION}-{platform.system()}",
+        ctest_result_path=f"HDF_Group/HDF5/{HDF5_VERSION}"
+    )
+
 if "json" in targets:
-    json_url = "https://github.com/nlohmann/json/releases/download/{JSON_VERSION}/json.hpp".format(**locals())
-    json_install_path = "{DEPS_DIR}/install/json/nlohmann/json.hpp".format(**locals())
+    json_url = f"https://github.com/nlohmann/json/releases/download/{JSON_VERSION}/json.hpp"
+    json_install_path = f"{DEPS_DIR}/install/json/nlohmann/json.hpp"
     if not os.path.exists(os.path.dirname(json_install_path)):
         os.makedirs(os.path.dirname(json_install_path))
     if not os.path.exists(json_install_path):
@@ -503,11 +478,11 @@ if "json" in targets:
 
 if "pcre" in targets:
     build_dependency(
-        name="pcre-{PCRE_VERSION}".format(**locals()),
+        name=f"pcre-{PCRE_VERSION}",
         mode="autoconf",
         build_tool_args=[DISABLE_FLAG],
-        download_url="https://downloads.sourceforge.net/project/pcre/pcre/{PCRE_VERSION}/".format(**locals()),
-        download_name="pcre-{PCRE_VERSION}.tar.bz2".format(**locals())
+        download_url=f"https://downloads.sourceforge.net/project/pcre/pcre/{PCRE_VERSION}/",
+        download_name=f"pcre-{PCRE_VERSION}.tar.bz2"
     )
 
 # An issue exists with swig-1.3 and python >= 3.2
@@ -516,20 +491,20 @@ if "swig" in targets:
     build_dependency(
         name="swig",
         mode="autoconf",
-        build_tool_args=["--disable-ccache", "--with-pcre-prefix={DEPS_DIR}/install/pcre-{PCRE_VERSION}".format(**locals())],
+        build_tool_args=["--disable-ccache", f"--with-pcre-prefix={DEPS_DIR}/install/pcre-{PCRE_VERSION}"],
         download_url="https://github.com/swig/swig.git",
         download_name="swig",
         download_tool=download_tool_git,
-        revision="rel-{SWIG_VERSION}".format(**locals())
+        revision=f"rel-{SWIG_VERSION}"
     )
 
 if USE_OCCT and "occ" in targets:
     build_dependency(
-        name="occt-{OCCT_VERSION}".format(**locals()),
+        name=f"occt-{OCCT_VERSION}",
         mode="cmake",
         build_tool_args=[
-            "-DINSTALL_DIR={DEPS_DIR}/install/occt-{OCCT_VERSION}".format(**locals()),
-            "-DBUILD_LIBRARY_TYPE={LINK_TYPE_UCFIRST}".format(**locals()),
+            f"-DINSTALL_DIR={DEPS_DIR}/install/occt-{OCCT_VERSION}",
+            f"-DBUILD_LIBRARY_TYPE={LINK_TYPE_UCFIRST}",
             "-DBUILD_MODULE_Draw=0",
             "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off"
         ],
@@ -541,7 +516,7 @@ if USE_OCCT and "occ" in targets:
     )
 elif "occ" in targets:
     build_dependency(
-        name="oce-{OCE_VERSION}".format(**locals()),
+        name=f"oce-{OCE_VERSION}",
         mode="cmake",
         build_tool_args=[
             "-DOCE_DISABLE_TKSERVICE_FONT=ON",
@@ -550,15 +525,15 @@ elif "occ" in targets:
             "-DOCE_DISABLE_X11=ON",
             "-DOCE_VISUALISATION=OFF",
             "-DOCE_OCAF=OFF",
-            "-DOCE_INSTALL_PREFIX={DEPS_DIR}/install/oce-{OCE_VERSION}".format(**locals())
+            f"-DOCE_INSTALL_PREFIX={DEPS_DIR}/install/oce-{OCE_VERSION}"
         ],
         download_url="https://github.com/tpaviot/oce/archive/",
-        download_name="OCE-{OCE_VERSION}.tar.gz".format(**locals())
+        download_name=f"OCE-{OCE_VERSION}.tar.gz"
     )
         
 if "libxml2" in targets:
     build_dependency(
-        "libxml2-{LIBXML2_VERSION}".format(**locals()),
+        f"libxml2-{LIBXML2_VERSION}",
         "autoconf",
         build_tool_args=[
             "--without-python",
@@ -569,7 +544,7 @@ if "libxml2" in targets:
             "--without-lzma"
         ],
         download_url="ftp://xmlsoft.org/libxml2/",
-        download_name="libxml2-{LIBXML2_VERSION}.tar.gz".format(**locals())
+        download_name=f"libxml2-{LIBXML2_VERSION}.tar.gz"
     )
     
 if "OpenCOLLADA" in targets:
@@ -577,12 +552,12 @@ if "OpenCOLLADA" in targets:
         "OpenCOLLADA",
         "cmake",
         build_tool_args=[
-            "-DLIBXML2_INCLUDE_DIR={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2".format(**locals()),
-            "-DLIBXML2_LIBRARIES={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}".format(**locals()),
-            "-DPCRE_INCLUDE_DIR={DEPS_DIR}/install/pcre-{PCRE_VERSION}/include".format(**locals()),
-            "-DPCRE_PCREPOSIX_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcreposix.{LIBRARY_EXT}".format(**locals()),
-            "-DPCRE_PCRE_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcre.{LIBRARY_EXT}".format(**locals()),
-            "-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/OpenCOLLADA/".format(**locals())
+            f"-DLIBXML2_INCLUDE_DIR={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2",
+            f"-DLIBXML2_LIBRARIES={DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}",
+            f"-DPCRE_INCLUDE_DIR={DEPS_DIR}/install/pcre-{PCRE_VERSION}/include",
+            f"-DPCRE_PCREPOSIX_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcreposix.{LIBRARY_EXT}",
+            f"-DPCRE_PCRE_LIBRARY={DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib/libpcre.{LIBRARY_EXT}",
+            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/OpenCOLLADA/"
         ],
         download_url="https://github.com/KhronosGroup/OpenCOLLADA.git",
         download_name="OpenCOLLADA",
@@ -591,110 +566,155 @@ if "OpenCOLLADA" in targets:
         revision=OPENCOLLADA_VERSION
     )
 
-if "python" in targets:
+if "python" in targets and not USE_CURRENT_PYTHON_VERSION:
     # Python should not be built with -fvisibility=hidden, from experience that introduces segfaults
-    OLD_CXX_FLAGS=os.environ["CXXFLAGS"]
-    OLD_C_FLAGS=os.environ["CFLAGS"]
-    os.environ["CXXFLAGS"]=CXXFLAGS_MINIMAL
-    os.environ["CFLAGS"]=CFLAGS_MINIMAL
+    OLD_CXX_FLAGS = os.environ["CXXFLAGS"]
+    OLD_C_FLAGS = os.environ["CFLAGS"]
+    os.environ["CXXFLAGS"] = CXXFLAGS_MINIMAL
+    os.environ["CFLAGS"] = CFLAGS_MINIMAL
 
     # On OSX a dynamic python library is built or it would not be compatible
     # with the system python because of some threading initialization
-    PYTHON_CONFIGURE_ARGS=[]
-    if get_os() == "Darwin":
-        PYTHON_CONFIGURE_ARGS=["--disable-static", "--enable-shared"]
+    PYTHON_CONFIGURE_ARGS = []
+    if platform.system() == "Darwin":
+        PYTHON_CONFIGURE_ARGS = ["--disable-static", "--enable-shared"]
 
-    def get_python_unicode_confs(py_ver):
-        if py_ver < "3.3":
-            return [("--enable-unicode=ucs2",""), ("--enable-unicode=ucs4","u")]
-        else: return [("","")]
-
-    def PYTHON_VERSION_CONFS():
-        for v in PYTHON_VERSIONS:
-            for unicode_conf, abi_tag in get_python_unicode_confs(v):
-                yield v, unicode_conf, abi_tag
-
-    for PYTHON_VERSION, unicode_conf, abi_tag in PYTHON_VERSION_CONFS():
+    for PYTHON_VERSION in PYTHON_VERSIONS:
         try:
             build_dependency(
-                "python-{PYTHON_VERSION}{abi_tag}".format(**locals()),
+                f"python-{PYTHON_VERSION}",
                 "autoconf",
-                PYTHON_CONFIGURE_ARGS + [unicode_conf],
-                "http://www.python.org/ftp/python/{PYTHON_VERSION}/".format(**locals()),
-                "Python-{PYTHON_VERSION}.tgz".format(**locals())
+                PYTHON_CONFIGURE_ARGS,
+                f"http://www.python.org/ftp/python/{PYTHON_VERSION}/",
+                f"Python-{PYTHON_VERSION}.tgz"
             )
-        except Exception as e:
-            pyver2 = PYTHON_VERSION[:PYTHON_VERSION.rfind('.')]
-            if os.path.exists("{DEPS_DIR}/install/python-{PYTHON_VERSION}{abi_tag}/bin/python{pyver2}".format(**locals())):
-                print("Installation partially failed")
-            else: raise e
+        except RuntimeError as e:
+            # Sometimes setting up modules such as pip/lzma can cause
+            # the python installer script to return a non zero exit
+            # code where actually the headers and dynamic libraries
+            # are installed correctly. This is all we need so we catch
+            # the exception and only reraise if a partially successful
+            # install is not detected.
+            if not os.path.exists(
+                os.path.join(DEPS_DIR, "install", f"python-{PYTHON_VERSION}")
+            ):
+                raise e
 
-    os.environ["CXXFLAGS"]=OLD_CXX_FLAGS
-    os.environ["CFLAGS"]=OLD_C_FLAGS
+    os.environ["CXXFLAGS"] = OLD_CXX_FLAGS
+    os.environ["CFLAGS"] = OLD_C_FLAGS
 
 if "boost" in targets:
     str_concat = lambda prefix: lambda postfix: "" if postfix.strip() == "" else "=".join((prefix, postfix.strip()))
     build_dependency(
-        "boost-{BOOST_VERSION}".format(**locals()),
+        f"boost-{BOOST_VERSION}",
         mode="bjam",
         build_tool_args=[
-            "--stagedir={DEPS_DIR}/install/boost-{BOOST_VERSION}".format(**locals()),
+            f"--stagedir={DEPS_DIR}/install/boost-{BOOST_VERSION}",
             "--with-system",
             "--with-program_options",
             "--with-regex",
             "--with-thread",
             "--with-date_time",
             "--with-iostreams",
-            "link={LINK_TYPE}".format(**locals())
+            f"link={LINK_TYPE}"
                                                                          ] + \
             BOOST_ADDRESS_MODEL                                            + \
             list(map(str_concat("cxxflags"), CXXFLAGS.strip().split(' '))) + \
             list(map(str_concat("linkflags"), LDFLAGS.strip().split(' '))) + \
             ["stage", "-s", "NO_BZIP2=1"],
         download_url=BOOST_LOCATION,
-        download_name="boost_{BOOST_VERSION_UNDERSCORE}.tar.bz2".format(**locals())
+        download_name=f"boost_{BOOST_VERSION_UNDERSCORE}.tar.bz2"
+    )
+    
+if "cgal" in targets:
+    build_dependency(
+        name=f"gmp-{GMP_VERSION}",
+        mode="autoconf",
+        build_tool_args=["--disable-shared", "--with-pic"],
+        download_url="https://ftp.gnu.org/gnu/gmp/",
+        download_name=f"gmp-{GMP_VERSION}.tar.bz2"
+    )
+    
+    build_dependency(
+        name=f"mpfr-{MPFR_VERSION}",
+        mode="autoconf",
+        build_tool_args=["--disable-shared", f"--with-gmp={DEPS_DIR}/install/gmp-{GMP_VERSION}"],
+        download_url=f"http://www.mpfr.org/mpfr-{MPFR_VERSION}/",
+        download_name=f"mpfr-{MPFR_VERSION}.tar.bz2"
+    )
+    
+    build_dependency(
+        name=f"cgal-{CGAL_VERSION}",
+        mode="cmake",
+        build_tool_args=[
+            f"-DGMP_LIBRARIES={DEPS_DIR}/install/gmp-{GMP_VERSION}/lib/libgmp.a",
+            f"-DGMP_INCLUDE_DIR={DEPS_DIR}/install/gmp-{GMP_VERSION}/include",
+            f"-DMPFR_LIBRARIES={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib/libmpfr.a" ,
+            f"-DMPFR_INCLUDE_DIR={DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include",
+            f"-DBoost_INCLUDE_DIR={DEPS_DIR}/install/boost-{BOOST_VERSION}",
+            f"-DCMAKE_INSTALL_PREFIX={DEPS_DIR}/install/cgal-{CGAL_VERSION}/",
+            "-DCGAL_HEADER_ONLY=On",            
+            "-DBUILD_SHARED_LIBS=Off"
+        ],
+        download_url="https://github.com/CGAL/cgal.git",
+        download_name="cgal",
+        download_tool=download_tool_git,
+        revision=f"v{CGAL_VERSION}"
     )
     
 cecho("Building IfcOpenShell:", GREEN)
 
-IFCOS_DIR=os.path.join(DEPS_DIR, "build", "ifcopenshell")
-if os.path.exists(IFCOS_DIR):
-    shutil.rmtree(IFCOS_DIR)
-os.makedirs(IFCOS_DIR)
-
+IFCOS_DIR = os.path.join(DEPS_DIR, "build", "ifcopenshell")
+if os.environ.get("NO_CLEAN", "").lower() not in {"1", "on", "true"}:
+    if os.path.exists(IFCOS_DIR):
+        shutil.rmtree(IFCOS_DIR)
+os.makedirs(IFCOS_DIR, exist_ok=True)
 executables_dir = os.path.join(IFCOS_DIR, "executables")
-if not os.path.exists(executables_dir):
-    os.makedirs(executables_dir)
+os.makedirs(executables_dir, exist_ok=True)
 
 logger.info("\rConfiguring executables...")
 
 OFF_ON = ["OFF", "ON"]
 
-cmake_args=[
-    "-DUSE_MMAP="                      "OFF",
-    "-DBUILD_EXAMPLES="                "OFF",
+exec_args = [
+    "-DBUILD_IFCGEOM="                 +OFF_ON["IfcGeom" in targets],
+    "-DBUILD_GEOMSERVER="              +OFF_ON["IfcGeomServer" in targets],
+    "-DBUILD_CONVERT="                 +OFF_ON["IfcConvert" in targets],
     "-DBUILD_IFCPYTHON="               "OFF",
-    "-DBUILD_SHARED_LIBS="            +OFF_ON[not BUILD_STATIC],
-    "-DBUILD_IFCGEOM="                +OFF_ON["IfcGeom" in targets],
-    "-DBUILD_GEOMSERVER="             +OFF_ON["IfcGeomServer" in targets],
-    "-DBUILD_CONVERT="                +OFF_ON["IfcConvert" in targets],
-    "-DCMAKE_INSTALL_PREFIX="          "{DEPS_DIR}/install/ifcopenshell".format(**locals()),
-    "-DBOOST_ROOT="                    "{DEPS_DIR}/install/boost-{BOOST_VERSION}".format(**locals()),
-    "-DGLTF_SUPPORT="                  "ON",
-    "-DJSON_INCLUDE_DIR="              "{DEPS_DIR}/install/json".format(**locals()),
-    "-DBoost_NO_BOOST_CMAKE="          "On"
+    "-DCMAKE_INSTALL_PREFIX="          f"{DEPS_DIR}/install/ifcopenshell",
 ]
 
+cmake_args = [
+    "-DUSE_MMAP="                      "OFF",
+    "-DBUILD_EXAMPLES="                "OFF",
+    "-DBUILD_SHARED_LIBS="             +OFF_ON[not BUILD_STATIC],
+    "-DBOOST_ROOT="                    f"{DEPS_DIR}/install/boost-{BOOST_VERSION}",
+    "-DGLTF_SUPPORT="                  "ON",
+    "-DJSON_INCLUDE_DIR="              f"{DEPS_DIR}/install/json",
+    "-DBoost_NO_BOOST_CMAKE="          "On",
+    "-DADD_COMMIT_SHA="              +("On" if ADD_COMMIT_SHA else "Off")
+]
+
+if "cgal" in targets:
+    cmake_args.extend([
+        "-DCGAL_INCLUDE_DIR="          f"{DEPS_DIR}/install/cgal-{CGAL_VERSION}/include",
+        "-DGMP_INCLUDE_DIR="           f"{DEPS_DIR}/install/gmp-{GMP_VERSION}/include",
+        "-DGMP_LIBRARY_DIR="           f"{DEPS_DIR}/install/gmp-{GMP_VERSION}/lib",
+        "-DMPFR_INCLUDE_DIR="          f"{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/include",
+        "-DMPFR_LIBRARY_DIR="          f"{DEPS_DIR}/install/mpfr-{MPFR_VERSION}/lib",
+    ])
+
 if "occ" in targets and USE_OCCT:
-    occ_include_dir =                  "{DEPS_DIR}/install/occt-{OCCT_VERSION}/include/opencascade".format(**locals())
-    occ_library_dir =                  "{DEPS_DIR}/install/occt-{OCCT_VERSION}/lib".format(**locals())
+    occ_include_dir =                  f"{DEPS_DIR}/install/occt-{OCCT_VERSION}/include/opencascade"
+    occ_library_dir =                  f"{DEPS_DIR}/install/occt-{OCCT_VERSION}/lib"
     cmake_args.extend([
         "-DOCC_INCLUDE_DIR="           +occ_include_dir,
         "-DOCC_LIBRARY_DIR="           +occ_library_dir
     ])
+
 elif "occ" in targets:
-    occ_include_dir =                  "{DEPS_DIR}/install/oce-{OCE_VERSION}/include/oce".format(**locals())
-    occ_library_dir =                  "{DEPS_DIR}/install/oce-{OCE_VERSION}/lib"
+    occ_include_dir =                  f"{DEPS_DIR}/install/oce-{OCE_VERSION}/include/oce"
+    occ_library_dir =                  f"{DEPS_DIR}/install/oce-{OCE_VERSION}/lib"
     cmake_args.extend([
         "-DOCC_INCLUDE_DIR="           +occ_include_dir,
         "-DOCC_LIBRARY_DIR="           +occ_library_dir
@@ -702,83 +722,98 @@ elif "occ" in targets:
 
 if "OpenCOLLADA" in targets:
     cmake_args.extend([
-        "-DOPENCOLLADA_INCLUDE_DIR="   "{DEPS_DIR}/install/OpenCOLLADA/include/opencollada".format(**locals()),
-        "-DOPENCOLLADA_LIBRARY_DIR="   "{DEPS_DIR}/install/OpenCOLLADA/lib/opencollada".format(**locals())
+        "-DOPENCOLLADA_INCLUDE_DIR="   f"{DEPS_DIR}/install/OpenCOLLADA/include/opencollada",
+        "-DOPENCOLLADA_LIBRARY_DIR="   f"{DEPS_DIR}/install/OpenCOLLADA/lib/opencollada"
+    ])
+else:
+    cmake_args.extend([
+        "-DCOLLADA_SUPPORT="           "Off",
     ])
 
 if "pcre" in targets:
     cmake_args.append(
-        "-DPCRE_LIBRARY_DIR="          "{DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib".format(**locals())
+        "-DPCRE_LIBRARY_DIR="          f"{DEPS_DIR}/install/pcre-{PCRE_VERSION}/lib"
     )
 
 if "libxml2" in targets:
     cmake_args.extend([
-        "-DLIBXML2_INCLUDE_DIR="       "{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2".format(**locals()),
-        "-DLIBXML2_LIBRARIES="         "{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}".format(**locals())
+        "-DLIBXML2_INCLUDE_DIR="       f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2",
+        "-DLIBXML2_LIBRARIES="         f"{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}"
     ])
 
-run_cmake("", cmake_args, cmake_dir=CMAKE_DIR, cwd=executables_dir)
+if "hdf5" in targets:
+    cmake_args.extend([
+        "-DHDF5_INCLUDE_DIR="          f"{DEPS_DIR}/install/hdf5-{HDF5_VERSION}/include",
+        "-DHDF5_LIBRARY_DIR="          f"{DEPS_DIR}/install/hdf5-{HDF5_VERSION}/lib"
+    ])
+
+run_cmake("", exec_args + cmake_args, cmake_dir=CMAKE_DIR, cwd=executables_dir)
 
 logger.info("\rBuilding executables...   ")
 
-run([make, "-j{IFCOS_NUM_BUILD_PROCS}".format(**locals())], cwd=executables_dir)
+run([make, f"-j{IFCOS_NUM_BUILD_PROCS}"], cwd=executables_dir)
 run([make, "install/strip" if BUILD_CFG == "Release" else "install"], cwd=executables_dir)
 
 if "IfcOpenShell-Python" in targets:
-
     # On OSX the actual Python library is not linked against.
-    ADDITIONAL_ARGS=""
-    if get_os() == "Darwin":
-        ADDITIONAL_ARGS="-Wl,-flat_namespace,-undefined,suppress"
+    ADDITIONAL_ARGS = ""
+    if platform.system() == "Darwin":
+        ADDITIONAL_ARGS = "-Wl,-flat_namespace,-undefined,suppress"
 
-    os.environ["CXXFLAGS"]="%s %s" % (CXXFLAGS_MINIMAL, ADDITIONAL_ARGS)
-    os.environ["CFLAGS"]="%s %s" % (CFLAGS_MINIMAL, ADDITIONAL_ARGS)
-    os.environ["LDFLAGS"]="%s %s" % (LDFLAGS, ADDITIONAL_ARGS)
+    os.environ["CXXFLAGS"] = f"{CXXFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
+    os.environ["CFLAGS"] = f"{CFLAGS_MINIMAL} {ADDITIONAL_ARGS}"
+    os.environ["LDFLAGS"] = f"{LDFLAGS} {ADDITIONAL_ARGS}"
 
-    for PYTHON_VERSION, _, TAG in PYTHON_VERSION_CONFS():
-        logger.info("\rConfiguring python {PYTHON_VERSION}{TAG} wrapper...".format(**locals()))
+    python_dir = os.path.join(IFCOS_DIR, "pythonwrapper")
+    os.makedirs(python_dir, exist_ok=True)
 
-        # python_dir = os.path.join(IFCOS_DIR, "python-{PYTHON_VERSION}{TAG}".format(**locals()))
-        python_dir = os.path.join(IFCOS_DIR, "pythonwrapper")
-        if not os.path.exists(python_dir):
-            os.makedirs(python_dir)
+    def compile_python_wrapper(python_version, python_library, python_include, python_executable):
+        logger.info(f"\rConfiguring python {python_version} wrapper...")
 
         cache_path = os.path.join(python_dir, "CMakeCache.txt")
         if os.path.exists(cache_path):
-            os.unlink(cache_path)
+            os.remove(cache_path)
 
-        PYTHON_LIBRARY=run([bash, "-c", "ls    {DEPS_DIR}/install/python-{PYTHON_VERSION}{TAG}/lib/libpython*.*".format(**locals())])
-        PYTHON_INCLUDE=run([bash, "-c", "ls -d {DEPS_DIR}/install/python-{PYTHON_VERSION}{TAG}/include/python*".format(**locals())])
-        PYTHON_EXECUTABLE=os.path.join(DEPS_DIR, "install", "python-{PYTHON_VERSION}{TAG}".format(**locals()), "bin", "python{PYTHON_VERSION[0]}".format(**locals()))
-        os.environ["PYTHON_LIBRARY_BASENAME"]=os.path.basename(PYTHON_LIBRARY)
+        os.environ["PYTHON_LIBRARY_BASENAME"] = os.path.basename(python_library)
 
         run_cmake("",
-            cmake_args=[
-                "-DBUILD_SHARED_LIBS="       "OFF" if BUILD_STATIC else "ON",
-                "-DBOOST_ROOT="              "{DEPS_DIR}/install/boost-{BOOST_VERSION}".format(**locals()),
-                "-DOCC_INCLUDE_DIR="         +occ_include_dir,
-                "-DOCC_LIBRARY_DIR="         +occ_library_dir,
-                "-DPYTHON_LIBRARY="          +PYTHON_LIBRARY,
-                "-DPYTHON_EXECUTABLE="       +PYTHON_EXECUTABLE,
-                "-DPYTHON_INCLUDE_DIR="      +PYTHON_INCLUDE,
-                "-DSWIG_EXECUTABLE="         "{DEPS_DIR}/install/swig/bin/swig".format(**locals()),
-                "-DCMAKE_INSTALL_PREFIX="    "{DEPS_DIR}/install/ifcopenshell/tmp".format(**locals()),
-                "-DLIBXML2_INCLUDE_DIR="     "{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/include/libxml2".format(**locals()),
-                "-DLIBXML2_LIBRARIES="       "{DEPS_DIR}/install/libxml2-{LIBXML2_VERSION}/lib/libxml2.{LIBRARY_EXT}".format(**locals()),
-                "-DCOLLADA_SUPPORT=OFF"
+            cmake_args + [
+                "-DPYTHON_LIBRARY="          +python_library,
+                "-DPYTHON_EXECUTABLE="       +python_executable,
+                "-DPYTHON_INCLUDE_DIR="      +python_include,
+                "-DSWIG_EXECUTABLE="         f"{DEPS_DIR}/install/swig/bin/swig",
+                "-DCMAKE_INSTALL_PREFIX="    f"{DEPS_DIR}/install/ifcopenshell/tmp",
+                "-DUSERSPACE_PYTHON_PREFIX=" +["Off", "On"][os.environ.get("PYTHON_USER_SITE", "").lower() in {"1", "on", "true"}]
             ], cmake_dir=CMAKE_DIR, cwd=python_dir)
-        
-        logger.info("\rBuilding python %s%s wrapper...   " % (PYTHON_VERSION, TAG))
 
-        run([make, "-j%s" % (IFCOS_NUM_BUILD_PROCS,), "_ifcopenshell_wrapper"], cwd=python_dir)
+        logger.info(f"\rBuilding python {python_version} wrapper...   ")
+
+        run([make, f"-j{IFCOS_NUM_BUILD_PROCS}", "_ifcopenshell_wrapper"], cwd=python_dir)
         run([make, "install/local"], cwd=os.path.join(python_dir, "ifcwrap"))
 
-        module_dir = os.path.dirname(run([PYTHON_EXECUTABLE, "-c", "from __future__ import print_function; import inspect, ifcopenshell; print(inspect.getfile(ifcopenshell))"]))
+        module_dir = os.path.dirname(run([python_executable, "-c", "import inspect, ifcopenshell; print(inspect.getfile(ifcopenshell))"]))
 
-        if get_os() != "Darwin":
+        if platform.system() != "Darwin":
             # 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
 
-        run([cp, "-R", module_dir, os.path.join(DEPS_DIR, "install", "ifcopenshell", "python-%s%s" % (PYTHON_VERSION, TAG))])
+
+    if USE_CURRENT_PYTHON_VERSION:
+        python_info = sysconfig.get_paths()
+        python_lib = os.path.join(
+            sysconfig.get_config_var('LIBDIR'), 
+            sysconfig.get_config_var('multiarchsubdir').replace("/", ""), 
+            sysconfig.get_config_var("INSTSONAME")
+        )
+        compile_python_wrapper(platform.python_version(), python_lib, python_info["include"], sys.executable)
+    else:
+        for python_version in PYTHON_VERSIONS:
+            python_library = run([bash, "-c", f"ls    {DEPS_DIR}/install/python-{python_version}/lib/libpython*.*"])
+            python_include = run([bash, "-c", f"ls -d {DEPS_DIR}/install/python-{python_version}/include/python*"])
+            python_executable = os.path.join(DEPS_DIR, "install", f"python-{python_version}", "bin", f"python{python_version[0]}")
+
+            module_dir = compile_python_wrapper(python_version, python_library, python_include, python_executable)
+            run([cp, "-R", module_dir, os.path.join(DEPS_DIR, "install", "ifcopenshell", f"python-{python_version}")])
 
 logger.info("\rBuilt IfcOpenShell...\n\n")

src/bcf/MANIFEST.in

@@ -0,0 +1,2 @@
+include src/bcf/v2/xsd/*.xsd
+include src/bcf/v3/xsd/*.xsd

src/bcf/pyproject.toml

@@ -0,0 +1,12 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 120
+
+[tool.isort]
+profile = "black"

src/bcf/setup.cfg

@@ -0,0 +1,37 @@
+[metadata]
+name=bcf-client
+version=0.0.1
+author = Ifcopenshell
+description = A simple Python implementation of BCF
+url = https://github.com/IfcOpenShell/IfcOpenShell
+project_urls =
+    Code=https://github.com/IfcOpenShell/IfcOpenShell
+    Issues=https://github.com/IfcOpenShell/IfcOpenShell/issues
+long_description = file: README.md
+long_description_content_type = text/markdown
+classifiers =
+    License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+    Operating System :: OS Independent
+    Programming Language :: Python :: 3
+    Topic :: Scientific/Engineering
+    Topic :: Utilities
+keywords =
+    Python
+    file formats
+    engineering
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3
+install_requires=
+    xmlschema
+include_package_data = True
+
+[options.packages.find]
+where = src
+
+[flake8]
+max-line-length = 120
+ignore = E24, E121, E123, E126, E203, E226, E704, E741, W503, W504

src/bcf/src/bcf/__init__.py

@@ -0,0 +1,17 @@
+# BCF - BCF Python library
+# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.

src/bcf/src/bcf/bcfxml.py

@@ -1,3 +1,22 @@
+# BCF - BCF Python library
+# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+
+
 import os.path
 import zipfile
 import tempfile

src/bcf/src/bcf/v2/__init__.py

@@ -0,0 +1,19 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+

src/bcf/src/bcf/v2/bcfxml.py

@@ -1,3 +1,22 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+
 import os
 import uuid
 import shutil

src/bcf/src/bcf/v2/data.py

@@ -1,3 +1,22 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2020, 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+
 class Project:
     def __init__(self):
         self.project_id = ""

src/bcf/src/bcf/v3/__init__.py

@@ -0,0 +1,19 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+

src/bcf/src/bcf/v3/bcfapi.py

@@ -1,3 +1,22 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+
 import uuid
 import time
 import json
@@ -6,7 +25,8 @@ import requests
 import webbrowser
 import http.server
 import base64
-
+import tempfile
+import os
 
 client_id, client_secret = "", ""
 
@@ -133,6 +153,7 @@ class BcfClient:
         self.foundation_client = foundation_client
         self.version_id = None
         self.baseurl = None
+        self.filepath = tempfile.mkdtemp()
 
     def set_version(self, version):
         self.version_id = version["version_id"]
@@ -141,42 +162,67 @@ class BcfClient:
     def get(self, endpoint, params=None, is_auth_required=False):
         # TODO: handle error http status codes and raise exception. Follow error.json standard.
         headers = {"Authorization": "Bearer " + self.foundation_client.get_access_token()}
-        return requests.get(f"{self.baseurl}{endpoint}", headers=headers, params=params or None).json()
+        response = requests.get(f"{self.baseurl}{endpoint}", headers=headers, params=params or None)
+        try:
+            response = requests.get(f"{self.baseurl}{endpoint}", headers=headers, params=params or None)
+            if response.status_code == 200:
+                return response.json()
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as e:
+            print(f"message: {response.reason}'   '{response.status_code}'   '{ e }")
 
     def post(self, endpoint, data=None, params=None):
         headers = {
             "Authorization": "Bearer " + self.foundation_client.get_access_token(),
             "Content-type": "application/json",
         }
-        resp = requests.post(
-            f"{self.baseurl}{endpoint}",
-            headers=headers,
-            params=params or None,
-            data=data or None,
-        )
-        return resp.status_code, resp.text
+        try:
+            response = requests.post(
+                f"{self.baseurl}{endpoint}",
+                headers=headers,
+                params=params or None,
+                data=data or None,
+            )
+            if response.status_code == 201:
+                return response.status_code, response.text
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as errh:
+            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
 
     def put(self, endpoint, data=None, params=None):
         headers = {
             "Authorization": "Bearer " + self.foundation_client.get_access_token(),
             "Content-type": "application/json",
         }
-        resp = requests.put(
-            f"{self.baseurl}{endpoint}",
-            headers=headers,
-            params=params or None,
-            data=data or None,
-        )
-        return resp.status_code, resp.text
+        try:
+            response = requests.put(
+                f"{self.baseurl}{endpoint}",
+                headers=headers,
+                params=params or None,
+                data=data or None,
+            )
+            if response.status_code == 200:
+                return response.status_code, response.text
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as errh:
+            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
 
     def delete(self, endpoint, params=None):
-        headers = {"Authorization": "Bearer " + self.foundation_client.get_access_token()}
-        resp = requests.put(
-            f"{self.baseurl}{endpoint}",
-            headers=headers,
-            params=params or None,
-        )
-        return resp.status_code
+        headers = {
+            "Authorization": "Bearer " + self.foundation_client.get_access_token(),
+            "Content-type": "application/json",
+        }
+        try:
+            response = requests.delete(
+                f"{self.baseurl}{endpoint}",
+                headers=headers,
+                params=params or None,
+            )
+            if response.status_code == 200:
+                return response.status_code, response.text
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as errh:
+            print(f"message: {response.reason}'  '{response.status_code}, {errh}")
 
     def get_projects(self) -> list:
         return self.get(
@@ -246,16 +292,30 @@ class BcfClient:
         return self.delete(f"/projects/{project_id}/topics/{topic_id}")
 
     def get_snippet(self, project_id="", topic_id="") -> str:
-        return self.get(
-            f"/projects/{project_id}/topics/{topic_id}/snippet",
-            {
-                "project_id": project_id,
-                "topic_id": topic_id,
-            },
+        headers = {
+            "Authorization": "Bearer " + self.foundation_client.get_access_token(),
+            "Content-type": "application/octet-stream",
+        }
+        response = requests.get(
+            f"{self.baseurl}/projects/{project_id}/topics/{topic_id}/snippet",
+            headers=headers,
         )
+        # TODO: write to tmpdir
+        with open(os.path.join(self.filepath, f"{project_id}_{topic_id}_snippet.txt"), "wb") as f:
+            f.write(response.content.decode("utf-8"))
+        return response.status_code, response.content
 
-    def update_snippet(self, project_id="", topic_id="", data=None):
-        return self.put(f"/projects/{project_id}/topics", data=data)
+    def update_snippet(self, project_id="", topic_id="", files=None, data=None):
+        headers = {
+            "Authorization": "Bearer " + self.foundation_client.get_access_token(),
+            "Content-type": "application/octet-stream",
+        }
+        response = requests.put(
+            f"{self.baseurl}/projects/{project_id}/topics/{topic_id}/snippet",
+            headers=headers,
+            files=files,
+        )
+        return response.status_code
 
     def get_files_information(self, project_id="") -> list:
         return self.get(
@@ -478,6 +538,7 @@ class BcfClient:
         project_id="",
         topic_id="",
         guid=None,
+        files=None,
         data=None,
     ):
         headers = {
@@ -488,18 +549,23 @@ class BcfClient:
             f"/projects/{project_id}/topics/{topic_id}/documents",
             data=data,
             params={guid},
+            files=files,
             headers=headers,
         )
+        return response.status_code
 
     def get_document(self, project_id="", topic_id="", document_id="") -> str:
-        return self.get(
-            f"/projects/{project_id}/topics/{topic_id}/documents/{document_id}",
-            {
-                "project_id": project_id,
-                "topic_id": topic_id,
-                "document_id": document_id,
-            },
+        headers = {
+            "Authorization": "Bearer " + self.foundation_client.get_access_token(),
+            "Content-type": "application/octet-stream",
+        }
+        response = requests.get(
+            f"{self.baseurl}/projects/{project_id}/topics/documents/{document_id}",
+            headers=headers,
         )
+        with open(os.path.join(self.filepath, f"{project_id}_{topic_id}_{document_id}_document.txt"), "wb") as f:
+            f.write(response.content.decode("utf-8"))
+        return response.status_code, response.content
 
     def get_topics_events(self, project_id="") -> list:
         return self.get(

src/bcf/src/bcf/v3/bcfxml.py

@@ -1,3 +1,22 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+
 import os
 import uuid
 import shutil
@@ -626,9 +645,10 @@ class BcfXml:
 
     def get_comments(self, guid):
         comments = {}
+        data = self._read_xml(os.path.join(guid, "markup.bcf"), "markup.xsd")
         if "Comments" not in data["Topics"]:
             return comments
-        data = self._read_xml(os.path.join(guid, "markup.bcf"), "markup.xsd")
+
         for item in data["Topic"]["Comments"].get("Comment", []):
             comment = bcf.v3.data.Comment()
             mandatory_keys = {
@@ -656,9 +676,9 @@ class BcfXml:
 
     def get_viewpoints(self, guid):
         viewpoints = {}
+        data = self._read_xml(os.path.join(guid, "markup.bcf"), "markup.xsd")
         if "Viewpoints" not in data["Topic"]:
             return viewpoints
-        data = self._read_xml(os.path.join(guid, "markup.bcf"), "markup.xsd")
         for item in data["Topic"]["Viewpoints"]:
             viewpoint = self.get_viewpoint(item, guid)
             viewpoints[viewpoint.guid] = viewpoint

src/bcf/src/bcf/v3/data.py

@@ -1,3 +1,22 @@
+
+# BCF - BCF Python library
+# Copyright (C) 2021 Prabhat Singh <singh01prabhat@gmail.com>
+#
+# This file is part of BCF.
+#
+# BCF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BCF 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BCF.  If not, see <http://www.gnu.org/licenses/>.
+
 class Project:
     def __init__(self):
         self.project_id = ""
@@ -27,7 +46,7 @@ class RelatedTopic:
 
 class HeaderFile:
     def __init__(self):
-        self.file_name = ""
+        self.filename = ""
         self.date = None
         self.reference = ""
         self.ifc_project = None

src/blenderbim/Makefile

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.
+
 VERSION:=`date '+%y%m%d'`
 PYVERSION:=py37
 
@@ -15,11 +33,13 @@ ifeq ($(PYVERSION), py37)
 HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/linux-64/hpp-fcl-1.7.5-py37h5f1835d_0.tar.bz2
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/eigenpy-2.6.5-py37h95e2c48_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py37h0379df6_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/30/c0/d0526314971fc661b083ab135747dc68446a3022686da8c16d25fcf6ef07/lxml-4.6.3-cp37-cp37m-manylinux2014_x86_64.whl
 endif
 ifeq ($(PYVERSION), py39)
 HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/linux-64/hpp-fcl-1.7.5-py39hbcdfc36_0.tar.bz2
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/linux-64/eigenpy-2.6.5-py39h5aed9d1_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py39h5472131_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_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.7/download/linux-64/octomap-1.9.7-h4bd325d_0.tar.bz2
@@ -31,11 +51,13 @@ ifeq ($(PYVERSION), py37)
 HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-fcl-1.7.5-py37h2d7f23a_0.tar.bz2
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py37h0695097_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py37hd79e0ac_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/1e/3e/f0abc15d5dac50939bccc589aae336d5ead4c72e7ad1039a2e0f3630ea92/lxml-4.6.3-cp37-cp37m-macosx_10_9_x86_64.whl
 endif
 ifeq ($(PYVERSION), py39)
 HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-64/hpp-fcl-1.7.5-py39h1e32b98_0.tar.bz2
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/osx-64/eigenpy-2.6.5-py39h5405915_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py39ha641261_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_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.7/download/osx-64/octomap-1.9.7-h940c156_0.tar.bz2
@@ -47,11 +69,13 @@ ifeq ($(PYVERSION), py37)
 HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/win-64/hpp-fcl-1.7.5-py37h839d6b1_0.tar.bz2
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eigenpy-2.6.5-py37h2c32e34_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py37h3b38789_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/9e/5e/171ee9d40a600f565fe691ec5bf7596247ec62cfb2edc00c91afe8ea837b/lxml-4.6.3-cp37-cp37m-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py39)
 HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/win-64/hpp-fcl-1.7.5-py39h2e7c763_0.tar.bz2
 EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.5/download/win-64/eigenpy-2.6.5-py39h3ce40e6_0.tar.bz2
 BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py39hefe7e4c_3.tar.bz2
+LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
 endif
 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.7/download/win-64/octomap-1.9.7-h5362a0b_0.tar.bz2
@@ -69,57 +93,48 @@ endif
 	cp -r blenderbim/* dist/blenderbim/
 
 	# Provides IfcOpenShell Python functionality
-	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcblender-python-$(PYNUMBER)-v0.6.0-0087fa8-$(PLATFORM)64.zip
+	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcblender-python-$(PYNUMBER)-v0.7.0-4c40fc1-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcblender*
 	cp -r dist/working/io_import_scene_ifc/ifcopenshell dist/blenderbim/libs/site/packages/
 
 	# See bug #812
-	cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/blenderbim/occ_utils.py
+	cd dist/working && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/blenderbim/occ_utils.py
 	cd dist/working && mv occ_utils.py ../blenderbim/libs/site/packages/ifcopenshell/geom/occ_utils.py
 	rm -rf dist/working
 
-	# Provides IfcConvert for construction documentation
-	mkdir dist/working
-	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/IfcConvert-v0.6.0-81ad689-$(PLATFORM)64.zip
-	cd dist/working && unzip IfcConvert*
-ifeq ($(PLATFORM), win)
-	cp -r dist/working/IfcConvert.exe dist/blenderbim/libs/
-else
-	cp -r dist/working/IfcConvert dist/blenderbim/libs/
-endif
-	rm -rf dist/working
-
 	# Provides dependencies that are part of IfcOpenShell
 	mkdir dist/working
-	cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/archive/v0.6.0.zip
-	cd dist/working && unzip v0.6.0.zip
+	cd dist/working && wget https://github.com/IfcOpenShell/IfcOpenShell/archive/v0.7.0.zip
+	cd dist/working && unzip v0.7.0.zip
 	# IfcOpenBot sometimes lags behind, so we hotfix the Python utilities
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/util/* dist/blenderbim/libs/site/packages/ifcopenshell/util/
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
-	cp dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/entity_instance.py dist/blenderbim/libs/site/packages/ifcopenshell/
-	cp dist/working/IfcOpenShell-0.6.0/src/ifcopenshell-python/ifcopenshell/file.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/util/* dist/blenderbim/libs/site/packages/ifcopenshell/util/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/api/* dist/blenderbim/libs/site/packages/ifcopenshell/api/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/entity_instance.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/file.py dist/blenderbim/libs/site/packages/ifcopenshell/
 	# Provides bcf functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/bcf/bcf dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
 	# Provides IFCClash functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcclash/ifcclash dist/blenderbim/libs/site/packages/
 	# Provides BIMTester functionality
 	cd dist/working && python -m venv env
 	cd dist/working && . env/bin/activate && pip install pybabel
 	cd dist/working && . env/bin/activate && pip install babel
-	cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.6.0/src/ifcbimtester/bimtester/locale/
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
+	cd dist/working && . env/bin/activate && ./env/bin/pybabel compile -d ./IfcOpenShell-0.7.0/src/ifcbimtester/bimtester/locale/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcbimtester/bimtester dist/blenderbim/libs/site/packages/
 	# Provides IFCCOBie functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccobie/* dist/blenderbim/libs/site/packages/
 	# Provides IFCDiff functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcdiff/* dist/blenderbim/libs/site/packages/
 	# Provides IFCCSV functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifccsv/* dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccsv/* dist/blenderbim/libs/site/packages/
 	# Provides IFCPatch functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifcpatch/ifcpatch dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifcpatch/ifcpatch dist/blenderbim/libs/site/packages/
 	# Provides IFC4D functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/
 	# Provides IFC5D functionality
-	cp -r dist/working/IfcOpenShell-0.6.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
+	# Provides IFCCityJSON functionality
+	cp -r dist/working/IfcOpenShell-0.7.0/src/ifccityjson dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
 	# Provides Mustache templating in construction documentation
@@ -227,6 +242,30 @@ endif
 	cp -r dist/working/lark-parser-0.8.5/lark dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Required by IFC4D
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/b0/bb/9c4dddd3ca173cb56241cfb2eddfae24690dc676d357ac4cab17d0a36d9d/PyP6Xer-1.13.0.tar.gz
+	cd dist/working && tar -xzvf PyP6Xer*
+	cp -r dist/working/PyP6Xer-1.13.0/xerparser dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by xerparser and IFC4D
+	# TODO: remove this dependency. It's only used to show a progress bar.
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/9f/7b/76c4e5ef1a1b528fcaada4133f972e77d33c252831676cf414119ca6093d/tqdm-4.50.0.tar.gz
+	cd dist/working && tar -xzvf tqdm*
+	cp -r dist/working/tqdm-4.50.0/tqdm dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by IFCCityJSON
+	mkdir dist/working
+	cd dist/working && python -m venv env
+	cd dist/working && mkdir site-packages
+	cd dist/working && . env/bin/activate && pip install cjio --target=./site-packages
+	cd dist/working/site-packages/ && rm -r *dist-info*
+	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)
@@ -326,12 +365,19 @@ endif
 	cd dist/working && tar -xzvf behave*
 	cd dist/working/behave-1.2.6/ && cp -r behave ../../blenderbim/libs/site/packages/
 	# See bug #1294
-	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/ifcbimtester/patch/model_core.patch
-	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.6.0/src/ifcbimtester/patch/runner_util.patch
+	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/model_core.patch
+	cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/runner_util.patch
 	cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/model_core.py < model_core.patch
 	cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/runner_util.py < runner_util.patch
 	rm -rf dist/working
 
+	# Required by ids - uh, not any more, but I'm trying it out in the drawing module
+	mkdir dist/working
+	cd dist/working && wget $(LXML_URL)
+	cd dist/working && cp *.whl lxml.zip && unzip lxml.zip
+	cp -r dist/working/lxml dist/blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	# Required by behave
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/f4/65/220bb4075fddb09d5b3ea2c1c1fa66c1c72be9361ec187aab50fa161e576/parse-1.15.0.tar.gz
@@ -402,10 +448,88 @@ endif
 	cp -r dist/working/IFC2JSON_python-master/file_converters/ifcjson dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Provides OpenLCA fucntionality
+	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 fucntionality
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/ca/37/8309da9a72407d2f5eb5489c197ac3cfe96ee3ccba1902d2a0ecc7843f92/brickschema-0.5.1.tar.gz
+	cd dist/working && tar -xzvf brickschema*
+	# This is an evil hack because we don't want to bundle flask
+	echo "" > dist/working/brickschema-0.5.1/brickschema/web.py
+	cd dist/working/brickschema-0.5.1/ && cp -r brickschema ../../blenderbim/libs/site/packages/
+	# For now lets bundle the latest nightly schema
+	cd dist/working && wget https://github.com/BrickSchema/Brick/releases/download/nightly/Brick.ttl
+	cd dist/working && cp Brick.ttl ../../blenderbim/bim/schema/Brick.ttl
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/c7/22/37bb938be8e5c20d443b0c9ba0a243573b671b01739efb0a19f81bc5b470/pyshacl-0.17.2.tar.gz
+	cd dist/working && tar -xzvf pyshacl*
+	cd dist/working/pyshacl-0.17.2/ && cp -r pyshacl ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/d2/a7/be8244688bfcee37c23733ab4fe8e6afa6d4403bd2674a3ae7bd2cecc77b/rdflib-6.0.2.tar.gz
+	cd dist/working && tar -xzvf rdflib*
+	cd dist/working/rdflib-6.0.2/ && cp -r rdflib ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
+	# Required by brickschema
+	mkdir dist/working
+	cd dist/working && wget https://files.pythonhosted.org/packages/7d/c7/208aece36279e4f1236e437119358786e39530ecc1719d4e1afeddba5288/owlrl-6.0.2.tar.gz
+	cd dist/working && tar -xzvf owlrl*
+	cd dist/working/owlrl-6.0.2/ && cp -r owlrl ../../blenderbim/libs/site/packages/
+	rm -rf dist/working
+
 	cd dist/blenderbim && sed -i "s/999999/$(VERSION)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim
 
+.PHONY: test
+test:
+	make test-core
+	make test-tool
+	make test-bim
+
+.PHONY: test-core
+test-core:
+	pytest -p no:pytest-blender test/core
+
+.PHONY: test-bim
+test-bim:
+	pytest test/bim
+
+.PHONY: test-tool
+test-tool:
+	pytest test/tool
+
+.PHONY: qa
+qa:
+	black .
+	pylint ./* --output-format=colorized --disable all --enable E --disable import-error
+
+.PHONY: coverage
+coverage:
+	coverage run --source blenderbim.core -m pytest -p no:pytest-blender test/core
+	coverage html
+	xdg-open htmlcov/index.html
+
+.PHONY: license
+license:
+	copyright-header --license GPL3 --copyright-holder "Dion Moult <dion@thinkmoult.com>" --copyright-year "2022" --copyright-software "BlenderBIM Add-on" --copyright-software-description "OpenBIM Blender Add-on" -a ./ -o ./
+
 .PHONY: clean
 clean:
 	rm -rf dist
+	rm -rf htmlcov
+
+.PHONY: dev
+dev:
+	blender -p setup_pytest.py

src/blenderbim/README.md

@@ -1,127 +1,5 @@
-# Blender BIM IFC
+# BlenderBIM Add-on
 
-_Under heavy development!_
+An add-on to Blender to allow BIM functionality.
 
-Let's use Blender to create BIM models, because why not?
-
-## Features
-
- - IFC4 is a first-class citizen. IFC4 has been an ISO standard since 2013, with
-   the latest published in 2018. It contains many more features than IFC2X3,
-   published back in 2005.
- - Available for Windows, Mac, and Linux!
- - Use open-source Blender 2.8 to do digital modeling! Used by NASA, Hollywood,
-   and Ubisoft, Blender allows real-time modeling in rendered view, animations,
-   file linking, proxy objects, Blender Cloud collaboration, lighting analysis,
-   CFD, energy modeling, and a huge ecosystem of add-ons with a thriving
-   community. No licensing, and with a strong Python API to integrate into your
-   custom workflow.
- - Create complex spatial structures with multiple sites, buildings, facilities,
-   bridges, and building parts. Sites can be broken down into sub-sites and
-   multiple buildings per site. You can categorise different floors to different
-   buildings.
- - Classify any geometry as any IFC type. Just because it is a wall doesn't
-   mean you should be limited to modeling it in a certain way. Easily change
-   from one type to another, switch relationships and aggregations, reuse or
-   even remove geometry altogether, without damaging your geometry or breaking
-   your BIM model.
- - Use collections to create element compositions and decompositions with full
-   control over the classifications of their parts. Most BIM programs don't give
-   this flexibility. Create collection instances to efficiently duplicate
-   composite objects.
- - Allow BIM objects to instance a shared geometric representations. This allows
-   you to place the same shape in multiple objects without drastically
-   increasing your filesize.
- - Provide a custom value to any simple IFC attribute of an IFC product.
- - Create product types that regular IFC products can inherit attributes from.
- - Define your own property sets with control over exactly how the data in the
-   property sets are stored using property set template definitions which you
-   can download or create yourself. Property sets can apply to both types and
-   objects, and object property sets can selectively override type property
-   sets.
- - Applies array modifiers to create instances.
- - Basic quantity take-off support for costing.
- - Settings to toggle export of quantities or geometric representations.
-   Exporting IFC data without geometric representations is much faster and a
-   fraction of the filesize.
- - Maintain `GlobalId` between exports, so that you can manipulate the IFC
-   reliably in other software while making changes.
- - Not all objects need full solid geometry. Create representations as 2D or 3D
-   curves / wireframes for rapid and lightweight BIM development.
- - Create map conversions and coordinate reference system definitions to link
-   BIM to GIS.
- - Export basic materials with surface and diffuse colours for representation.
-   You can also link materials to an externally defined file, such as a `.blend`
-   Cycles material, V-Ray material, or even Radiance material for lighting
-   simulation.
- - Switch between different types of metric units when modeling.
- - Model multiple representations for different purposes for a single BIM
-   object or type, such as footprints, axis, reference, or clearance geometry.
-   You can export just the type of representation required for your usecase, or
-   export multiple for the user to choose from.
- - Record qualitative objectives such as design intentions, health and safety
-   strategies, or code compliance, performance solutions, and more, in the BIM
-   model and directly associate them to objects or types.
- - Classify objects and types to different classification systems such as
-   Uniclass, Omniclass, or your custom system.
- - Associate external document files such as plans, brochures, specifications,
-   warranties, or anything to objects and types.
- - Specify swept solid geometries, allowing you to round-trip geometry
-   manipulation with other BIM software which have more limited geometric tools,
-   like Revit.
- - Create material layer sets, for objects which have materials in predefined
-   layers with thicknesses.
- - Create material constituent sets, for objects which are made up of
-   arbitrarily mixed ingredients.
- - Specify nested and hosted element relationships.
- - Specify predefined door attributes as defined in the IFC4 specification.
- - Specify predefined window attributes as defined in the IFC4 specification.
- - Specify surface styles either defined as part of a material or assigned
-   directly to an object's representation.
- - Colour coding by IFC class to visually spot mistakes
-
-Some more experimental features:
-
- - Cut sections for documentation with OpenCascade
- - Export gbXML files that are linked to your IFC file to do energy analysis
- - QA module to generate Gherkin unit tests to validate your BIM models
- - HTML formatter to generate reports from QA results
- - COBie spreadsheet extraction to import into CAFM systems
-
-## Demo
-
-[See demo video](https://www.youtube.com/watch?v=iD3v3eu2AjY)
-
-It's only just started, so everything can and will change. But if you want to
-check it out:
-
- 1. Install [Blender](https://www.blender.org/) 64-bit version.
- 2. Download the latest packaged version of Blender BIM from
-    [here](https://blenderbim.org/builds/).
- 3. Launch Blender. Go to `Edit->Preferences->Add-ons->Install...`. Browse to
-    the downloaded `.zip` file from step 2.
- 4. Enable the checkbox next to the Import-Export IFC Blender plugin which will
-    show up.
- 5. All done! You will find an import and export IFC option in the `File` menu.
-
-By default, Blender BIM will export whatever you have selected. The objects you
-have selected _must_ belong in an `IfcProject` and spatially contained, such as
-witihn an `IfcBuilding`. It must also follow the naming convention. Please see
-the screenshot below for an example scene.
-
-A naming convention of `IfcClass/IfcName` is enforced. If you name your object
-`IfcWall/Foo`, it will turn into an `IfcWall` with the name attribute set to
-`Foo`. You can override object attributes using Blender's `Custom Properties`.
-Your objects must live in a top level `Collection` defined as a context class,
-usually something like `IfcProject/Foo`. You can then nest spatial structures
-underneath to create a hierarchy.
-
-## Pictures
-
-![UI](https://aws1.discourse-cdn.com/business6/uploads/buildingsmart1/original/1X/ce820c3ee22adcffae59b40f98ff23379f7e3547.png)
-
-![Blender screenshot](blender-screenshot.png)
-
-... this Blender files creates this IFC file ...
-
-![IfcOpenShell screenshot](ifcopenshell-screenshot.png)
+More information on the [BlenderBIM Add-on website](https://blenderbim.org).

src/blenderbim/RenameObjects.py

@@ -1,119 +0,0 @@
-import bpy
-from bpy.types import Operator
-
-
-class Object_OT_RenameObjects(Operator):
-    bl_idname = "object.renameobjects"
-    bl_label = "Rename Object(s)"
-
-    # Multi Object rename UI
-    BNameCB: bpy.props.BoolProperty(name="Base Name:")
-    BaseName: bpy.props.StringProperty(name="")
-    PreFixCB: bpy.props.BoolProperty(name="Prefix:")
-    PreFix: bpy.props.StringProperty(name="")
-    RemFrst: bpy.props.BoolProperty(name="Remove First")
-    DgtFrst: bpy.props.IntProperty(name="Digits")
-    SuffixCB: bpy.props.BoolProperty(name="Suffix")
-    Suffix: bpy.props.StringProperty(name="")
-    RemLast: bpy.props.BoolProperty(name="Remove Last")
-    DgtLast: bpy.props.IntProperty(name="Digits")
-    NumbredCB: bpy.props.BoolProperty(name="Numbred")
-    BaseNum: bpy.props.IntProperty(name="Base Number")
-    Step: bpy.props.IntProperty(name="Step", default=1)
-    findCB: bpy.props.BoolProperty(name="Replace")
-    find: bpy.props.StringProperty(name="")
-    replace: bpy.props.StringProperty(name="")
-    # Single rename UI
-    Name: bpy.props.StringProperty(name="Name")
-
-    def draw(self, ctx):
-        SelCount = len(bpy.context.selected_objects)
-        if SelCount > 1:
-            box = self.layout.box()
-            row = box.row()
-            row.prop(self, "BNameCB")
-            row.prop(self, "BaseName")
-            row = box.row()
-            row.prop(self, "PreFixCB")
-            row.prop(self, "PreFix")
-            row = box.row()
-            row.prop(self, "RemFrst")
-            row.prop(self, "DgtFrst")
-            row = box.row()
-            row.prop(self, "SuffixCB")
-            row.prop(self, "Suffix")
-            row = box.row()
-            row.prop(self, "RemLast")
-            row.prop(self, "DgtLast")
-            row = box.row(align=True)
-            row.prop(self, "NumbredCB")
-            row.prop(self, "BaseNum")
-            row.prop(self, "Step")
-            row = box.row(align=True)
-            row.prop(self, "findCB")
-            row.prop(self, "find")
-            row.prop(self, "replace")
-        if SelCount == 1:
-            box = self.layout.box()
-            row = box.row()
-            row.prop(self, "Name")
-        if SelCount == 0:
-            box = self.layout.box()
-            row = box.row()
-            row.label("No Selected Object")
-
-    def __init__(self):
-        if len(bpy.context.selected_objects) == 1:
-            self.Name = bpy.context.selected_objects[0].name
-
-    def execute(self, context):
-        SelCount = len(bpy.context.selected_objects)
-        if SelCount > 1:
-            SelObj = bpy.context.selected_objects
-            Index = self.BaseNum
-            for i in range(0, SelCount):
-                # Get Object Original Name #
-                NewName = SelObj[i].name
-                # Set the Base name #
-                if self.BNameCB:
-                    NewName = self.BaseName
-                # Remove First characters #
-                if self.RemFrst:
-                    NewName = NewName[self.DgtFrst : self.DgtFrst + len(NewName)]
-                # Remove Last Characters #
-                if self.RemLast:
-                    NewName = NewName[1 : len(NewName) - self.DgtLast]
-                # Add Prefix to the new name #
-                if self.PreFixCB:
-                    NewName = self.PreFix + NewName
-                # Add Suffix to the new name #
-                if self.SuffixCB:
-                    NewName = NewName + self.Suffix
-                # Add Digits to end of new name #
-                if self.NumbredCB:
-                    NewName += str(Index)
-                    Index += self.Step
-                # Find and Replace #
-                if self.findCB:
-                    NewName = NewName.replace(self.find, self.replace)
-                # Set the new name to the object #
-                SelObj[i].name = NewName
-        elif SelCount == 1:
-            bpy.context.selected_objects[0].name = self.Name
-        return {"FINISHED"}
-
-    def invoke(self, context, event):
-        wm = context.window_manager
-        return wm.invoke_props_dialog(self)
-
-
-def register():
-    bpy.utils.register_class(Object_OT_RenameObjects)
-
-
-def unregister():
-    bpy.utils.unregister_class(Object_OT_RenameObjects)
-
-
-if __name__ == "__main__":
-    register()

src/blenderbim/blenderbim/__init__.py

@@ -1,7 +1,29 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
+import sys
+import site
+
 bl_info = {
     "name": "BlenderBIM",
-    "description": "Author, import, and export files in the " "Industry Foundation Classes (.ifc) file format",
-    "author": "Dion Moult, IfcOpenShell",
+    "description": "Author, import, and export data using the Industry Foundation Classes schema",
+    "author": "IfcOpenShell Contributors",
     "blender": (2, 80, 0),
     "version": (0, 0, 999999),
     "location": "File > Export, File > Import, Scene / Object / Material / Mesh Properties",
@@ -9,25 +31,15 @@ bl_info = {
     "category": "Import-Export",
 }
 
-import os
-import site
+if sys.modules.get("bpy", None):
+    # Process *.pth in /libs/site/packages to setup globally importable modules
+    # This is 3 levels deep as required by the static RPATH of ../../ from dependencies taken from Anaconda
+    site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
 
+    import blenderbim.bim
 
-# process *.pth in /libs/site/packages to setup globally importable modules
-# 3 levels deep required by occ static ../../ path
-# TODO: 3 levels deep is no longer required as we no longer bundle OCC
-cwd = os.path.dirname(os.path.realpath(__file__))
-site.addsitedir(os.path.join(cwd, "libs", "site", "packages"))
+    def register():
+        blenderbim.bim.register()
 
-
-# main import
-from .bim import *
-
-
-# Explicitely expose bim.xx when imported with from blenderbim import *
-# Other bim still are importable using explicit from blenderbim.bim import xxx
-__all__ = ["export_ifc", "import_ifc"]
-
-
-if __name__ == "__main__":
-    register()
+    def unregister():
+        blenderbim.bim.unregister()

src/blenderbim/blenderbim/bim/__init__.py

@@ -1,153 +1,177 @@
-# Check if we are running in Blender before loading, to allow for multiprocessing
-import sys
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.
 
-bpy = sys.modules.get("bpy")
+import bpy
+import importlib
+from . import handler, ui, prop, operator, helper
 
-if bpy is not None:
-    import bpy
-    import importlib
-    from . import handler, ui, prop, operator
+modules = {
+    "project": None,
+    "search": None,
+    "bcf": None,
+    "root": None,
+    "unit": None,
+    "model": None,
+    "georeference": None,
+    "context": None,
+    "drawing": None,
+    "misc": None,
+    "attribute": None,
+    "type": None,
+    "spatial": None,
+    "void": None,
+    "aggregate": None,
+    "geometry": None,
+    "cobie": None,
+    "resource": None,
+    "cost": None,
+    "sequence": None,
+    "group": None,
+    "system": None,
+    "brick": None,
+    "structural": None,
+    "boundary": None,
+    "profile": None,
+    "material": None,
+    "style": None,
+    "layer": None,
+    "owner": None,
+    "pset": None,
+    "qto": None,
+    "classification": None,
+    "library": None,
+    "constraint": None,
+    "document": None,
+    "pset_template": None,
+    "clash": None,
+    "lca": None,
+    "csv": None,
+    "bimtester": None,
+    "diff": None,
+    "patch": None,
+    "gis": None,
+    "covetool": None,
+    "augin": None,
+    "debug": 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,
+}
 
-    modules = {
-        "project": None,
-        "search": None,
-        "bcf": None,
-        "root": None,
-        "unit": None,
-        "model": None,
-        "georeference": None,
-        "context": None,
-        "drawing": None,
-        "attribute": None,
-        "type": None,
-        "spatial": None,
-        "void": None,
-        "aggregate": None,
-        "geometry": None,
-        "cobie": None,
-        "resource": None,
-        "cost": None,
-        "sequence": None,
-        "group": None,
-        "system": None,
-        "structural": None,
-        "boundary": None,
-        "profile": None,
-        "material": None,
-        "style": None,
-        "layer": None,
-        "owner": None,
-        "pset": None,
-        "qto": None,
-        "classification": None,
-        "constraint": None,
-        "document": None,
-        "pset_template": None,
-        "clash": None,
-        "csv": None,
-        "bimtester": None,
-        "diff": None,
-        "patch": None,
-        "covetool": None,
-        "augin": None,
-        "debug": None,
-    }
 
-    for name in modules.keys():
-        modules[name] = importlib.import_module(f"blenderbim.bim.module.{name}")
+for name in modules.keys():
+    modules[name] = importlib.import_module(f"blenderbim.bim.module.{name}")
 
-    classes = [
-        operator.OpenUri,
-        operator.SelectDataDir,
-        operator.SelectSchemaDir,
-        operator.SelectIfcFile,
-        operator.ExportIFC,
-        operator.ImportIFC,
-        operator.OpenUpstream,
-        operator.AddSectionPlane,
-        operator.RemoveSectionPlane,
-        operator.ReloadIfcFile,
-        operator.AddIfcFile,
-        operator.RemoveIfcFile,
-        operator.SetOverrideColour,
-        operator.SetViewportShadowFromSun,
-        operator.LinkIfc,
-        operator.SnapSpacesTogether,
-        prop.StrProperty,
-        prop.Attribute,
-        prop.BIMProperties,
-        prop.IfcParameter,
-        prop.PsetQto,
-        prop.GlobalId,
-        prop.BIMObjectProperties,
-        prop.BIMMaterialProperties,
-        prop.BIMMeshProperties,
-        ui.BIM_PT_section_plane,
-        ui.BIM_UL_generic,
-        ui.BIM_UL_topics,
-        ui.BIM_ADDON_preferences,
-    ]
 
-    for module in modules.values():
-        classes.extend(module.classes)
+classes = [
+    operator.OpenUri,
+    operator.SelectDataDir,
+    operator.SelectSchemaDir,
+    operator.SelectIfcFile,
+    operator.OpenUpstream,
+    operator.BIM_OT_add_section_plane,
+    operator.BIM_OT_remove_section_plane,
+    operator.ReloadIfcFile,
+    operator.AddIfcFile,
+    operator.RemoveIfcFile,
+    operator.ConfigureVisibility,
+    prop.StrProperty,
+    prop.ObjProperty,
+    prop.Attribute,
+    prop.ModuleVisibility,
+    prop.BIMProperties,
+    prop.IfcParameter,
+    prop.PsetQto,
+    prop.GlobalId,
+    prop.BIMObjectProperties,
+    prop.BIMMaterialProperties,
+    prop.BIMMeshProperties,
+    ui.BIM_PT_section_plane,
+    ui.BIM_UL_generic,
+    ui.BIM_UL_topics,
+    ui.BIM_ADDON_preferences,
+    # Scene panel groups
+    ui.BIM_PT_project_info,
+    ui.BIM_PT_project_setup,
+    ui.BIM_PT_collaboration,
+    ui.BIM_PT_geometry,
+    ui.BIM_PT_services,
+    ui.BIM_PT_structural,
+    ui.BIM_PT_4D5D,
+    ui.BIM_PT_quality_control,
+    ui.BIM_PT_integrations,
+    # Object panel groups
+    ui.BIM_PT_object_metadata,
+    ui.BIM_PT_geometry_object,
+    ui.BIM_PT_services_object,
+    ui.BIM_PT_utilities_object,
+    ui.BIM_PT_misc_object,
+]
 
-    def menu_func_export(self, context):
-        self.layout.operator(operator.ExportIFC.bl_idname, text="Industry Foundation Classes (.ifc/.ifczip/.ifcjson)")
+for mod in modules.values():
+    classes.extend(mod.classes)
 
-    def menu_func_import(self, context):
-        self.layout.operator(operator.ImportIFC.bl_idname, text="Industry Foundation Classes (.ifc/.ifczip/.ifcxml)")
 
-    def on_register(scene):
-        handler.setDefaultProperties(scene)
-        bpy.app.handlers.depsgraph_update_post.remove(on_register)
+def on_register(scene):
+    handler.setDefaultProperties(scene)
+    bpy.app.handlers.depsgraph_update_post.remove(on_register)
 
-    def register():
-        for cls in classes:
-            bpy.utils.register_class(cls)
-        bpy.app.handlers.depsgraph_update_post.append(on_register)
-        bpy.app.handlers.undo_pre.append(handler.undo_pre)
-        bpy.app.handlers.undo_post.append(handler.undo_post)
-        bpy.app.handlers.redo_pre.append(handler.redo_pre)
-        bpy.app.handlers.redo_post.append(handler.redo_post)
-        bpy.app.handlers.load_post.append(handler.setDefaultProperties)
-        bpy.app.handlers.load_post.append(handler.loadIfcStore)
-        bpy.app.handlers.save_pre.append(handler.ensureIfcExported)
-        bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
-        bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
-        bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
-        bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
-        bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
-        bpy.types.Collection.BIMObjectProperties = bpy.props.PointerProperty(
-            type=prop.BIMObjectProperties
-        )  # Check if we need this
-        bpy.types.Material.BIMMaterialProperties = bpy.props.PointerProperty(type=prop.BIMMaterialProperties)
-        bpy.types.Mesh.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
-        bpy.types.Curve.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
-        bpy.types.Camera.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
-        bpy.types.PointLight.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
-        bpy.types.SCENE_PT_unit.append(ui.ifc_units)
 
-        for module in modules.values():
-            module.register()
+def register():
+    for cls in classes:
+        bpy.utils.register_class(cls)
+    bpy.app.handlers.depsgraph_update_post.append(on_register)
+    bpy.app.handlers.undo_pre.append(handler.undo_pre)
+    bpy.app.handlers.undo_post.append(handler.undo_post)
+    bpy.app.handlers.redo_pre.append(handler.redo_pre)
+    bpy.app.handlers.redo_post.append(handler.redo_post)
+    bpy.app.handlers.load_post.append(handler.setDefaultProperties)
+    bpy.app.handlers.load_post.append(handler.loadIfcStore)
+    bpy.app.handlers.save_pre.append(handler.ensureIfcExported)
+    bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
+    bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
+    bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
+    bpy.types.Material.BIMMaterialProperties = bpy.props.PointerProperty(type=prop.BIMMaterialProperties)
+    bpy.types.Mesh.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
+    bpy.types.Curve.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
+    bpy.types.Camera.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
+    bpy.types.PointLight.BIMMeshProperties = bpy.props.PointerProperty(type=prop.BIMMeshProperties)
+    bpy.types.SCENE_PT_unit.append(ui.ifc_units)
 
-    def unregister():
-        for cls in reversed(classes):
-            bpy.utils.unregister_class(cls)
-        bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
-        bpy.app.handlers.load_post.remove(handler.loadIfcStore)
-        bpy.app.handlers.save_pre.remove(handler.ensureIfcExported)
-        bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
-        bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
-        del bpy.types.Scene.BIMProperties
-        del bpy.types.Object.BIMObjectProperties
-        del bpy.types.Material.BIMObjectProperties
-        del bpy.types.Collection.BIMObjectProperties  # Check if we need this
-        del bpy.types.Material.BIMMaterialProperties
-        del bpy.types.Mesh.BIMMeshProperties
-        del bpy.types.Curve.BIMMeshProperties
-        del bpy.types.Camera.BIMMeshProperties
-        del bpy.types.PointLight.BIMMeshProperties
-        bpy.types.SCENE_PT_unit.remove(ui.ifc_units)
+    for mod in modules.values():
+        mod.register()
 
-        for module in reversed(list(modules.values())):
-            module.unregister()
+
+def unregister():
+    for cls in reversed(classes):
+        bpy.utils.unregister_class(cls)
+    bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
+    bpy.app.handlers.load_post.remove(handler.loadIfcStore)
+    bpy.app.handlers.save_pre.remove(handler.ensureIfcExported)
+    del bpy.types.Scene.BIMProperties
+    del bpy.types.Object.BIMObjectProperties
+    del bpy.types.Material.BIMObjectProperties
+    del bpy.types.Material.BIMMaterialProperties
+    del bpy.types.Mesh.BIMMeshProperties
+    del bpy.types.Curve.BIMMeshProperties
+    del bpy.types.Camera.BIMMeshProperties
+    del bpy.types.PointLight.BIMMeshProperties
+    bpy.types.SCENE_PT_unit.remove(ui.ifc_units)
+
+    for mod in reversed(list(modules.values())):
+        mod.unregister()

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

@@ -1,5 +1,39 @@
 <link href="jsgantt.css" rel="stylesheet" type="text/css"/>
 <script src="jsgantt.js" type="text/javascript"></script>
+<style>
+.gtaskcellwkend,
+.gtaskcellcurrent,
+.gminorheadingwkend {
+  background-color: #e1e1e1;
+}
+
+.gitemhighlight td {
+  background-color: #ffdaaa;
+}
+
+.gtaskblue {
+  background: #4281A4;
+}
+
+.gtaskred {
+  background: #C1666B;
+}
+
+.gtaskgreen {
+  background: #48A9A6;
+}
+
+.gtaskyellow {
+  background: #D4B483;
+}
+
+.gmainleft {
+  overflow: visible;
+  flex: 0 1 auto;
+}
+
+</style>
+<a href="#print" id="print">Print Mode</a>
 <div style="position:relative" class="gantt" id="GanttChartDIV"></div>
 <script type="text/javascript">
 var g = new JSGantt.GanttChart(document.getElementById('GanttChartDIV'), 'day');
@@ -14,7 +48,14 @@ g.setOptions({
     vShowEndWeekDate: 0,  // Show/Hide the date for the last day of the week in header for daily
     vUseSingleCell: 10000, // Set the threshold cell per table row (Helps performance for large data.
     vFormatArr: ['Day', 'Week', 'Month', 'Quarter'], // Even with setUseSingleCell using Hour format on such a large chart can cause issues in some browsers,
-    vTotalHeight: 1000,
+    vShowRes: false, // Disable the resource column.
+    vShowComp: false, // Disable the completion column.
+    vUseToolTip: false, // Disable tooltips.
+    vTotalHeight: 900,
+});
+document.getElementById('print').addEventListener('click', function() {
+    g.setTotalHeight("");
+    g.Draw();
 });
 var json_data = `
 {{{json_data}}}

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

@@ -0,0 +1,13 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((),'2;1');
+FILE_NAME('EPset_Productivity.ifc','2020-01-01T00:00:00',(),(),'EPset_Productivity','EPset_Productivity',$);
+FILE_SCHEMA(('IFC4'));
+ENDSEC;
+DATA;
+#1=IFCPROPERTYSETTEMPLATE('24XxTA2ED4o83uiZBG59D_',$,'EPset_Productivity','',.PSET_TYPEDRIVENOVERRIDE.,'IfcConstructionEquipmentResource,IfcLaborResource',(#2,#3,#4));
+#2=IFCSIMPLEPROPERTYTEMPLATE('3mL27FQ4X4MQn5fiGqIt8x',$,'BaseQuantityConsumed','',.P_SINGLEVALUE.,'IfcDuration',$,$,$,$,$,.READWRITE.);
+#3=IFCSIMPLEPROPERTYTEMPLATE('1DdJt5_Ar2mR4UDpO$98Ws',$,'BaseQuantityProducedName','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('2OZPZ$Onb2gOvW20q7gacH',$,'BaseQuantityProducedValue','',.P_SINGLEVALUE.,'IfcReal',$,$,$,$,$,.READWRITE.);
+ENDSEC;
+END-ISO-10303-21;

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

@@ -1,5 +1,26 @@
+/*
+ * BlenderBIM Add-on - OpenBIM Blender Add-on
+ * Copyright (C) 2020, 2021 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/>.
+ */
+
 * { stroke-linecap: round; stroke-linejoin: round; }
-*[id] { fill: black; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; }
+text { fill: black; stroke: none; }
+.cut { fill: black; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; fill-rule: evenodd; }
 .projection { fill: white; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .hidden { stroke-dasharray: 3, 2; }

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

@@ -1,3 +1,23 @@
+/*
+ * BlenderBIM Add-on - OpenBIM Blender Add-on
+ * Copyright (C) 2020, 2021 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/>.
+ */
+
 .cut { fill: white; stroke: black; stroke-linecap: 'round'; stroke-width: 0.35; }
 .background { fill: white; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }

src/blenderbim/blenderbim/bim/data/ui/presets.py

@@ -0,0 +1,214 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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/>.
+
+presets = {
+    "Basic": ["project", "search", "bcf", "attribute", "spatial", "pset", "qto"],
+    "Admin": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "cobie",
+        "resource",
+        "cost",
+        "sequence",
+        "group",
+        "system",
+        "structural",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "constraint",
+        "document",
+        "pset_template",
+        "clash",
+        "lca",
+        "csv",
+        "bimtester",
+        "diff",
+        "patch",
+        "covetool",
+        "augin",
+        "debug",
+    ],
+    "BIM Coordination": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "georeference",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "owner",
+        "pset",
+        "qto",
+        "clash",
+        "csv",
+        "bimtester",
+        "diff",
+        "patch",
+        "debug",
+    ],
+    "Architecture": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "Structural Engineering": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "structural",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "MEP": [
+        "project",
+        "search",
+        "bcf",
+        "root",
+        "unit",
+        "model",
+        "georeference",
+        "context",
+        "drawing",
+        "misc",
+        "attribute",
+        "type",
+        "spatial",
+        "void",
+        "aggregate",
+        "geometry",
+        "group",
+        "system",
+        "boundary",
+        "profile",
+        "material",
+        "style",
+        "layer",
+        "owner",
+        "pset",
+        "qto",
+        "classification",
+        "pset_template",
+        "clash",
+        "csv",
+    ],
+    "Quantity Surveying": ["project", "search", "attribute", "spatial", "void", "pset", "qto", "classification", "csv"],
+    "Model Enrichment": [
+        "project",
+        "search",
+        "root",
+        "attribute",
+        "spatial",
+        "pset",
+        "qto",
+        "pset_template",
+        "csv",
+        "patch",
+    ],
+    "3D Visualisation": ["project", "search", "bcf", "attribute", "spatial", "pset", "qto"],
+    "4D Scheduling": ["project", "search", "attribute", "spatial", "resource", "cost", "sequence", "pset", "qto"],
+    "5D Cost Management": [
+        "project",
+        "search",
+        "attribute",
+        "spatial",
+        "resource",
+        "cost",
+        "sequence",
+        "pset",
+        "qto",
+        "lca",
+    ],
+    "Facility Management": ["project", "search", "attribute", "spatial", "cobie", "pset", "qto", "lca"],
+}

src/blenderbim/blenderbim/bim/export_ifc.py

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import bpy
 import json
@@ -9,7 +27,12 @@ import addon_utils
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.util.placement
+import blenderbim.tool as tool
+import blenderbim.core.aggregate
+import blenderbim.core.spatial
+import blenderbim.core.style
 from blenderbim.bim.ifc import IfcStore
+from mathutils import Vector
 
 
 class IfcExporter:
@@ -19,20 +42,22 @@ class IfcExporter:
     def export(self):
         self.file = IfcStore.get_file()
         self.set_header()
+        IfcStore.update_cache()
         if bpy.context.scene.BIMProjectProperties.is_authoring:
-            self.sync_object_placements_and_deletions()
+            self.sync_deletions()
+            self.sync_all_objects()
             self.sync_edited_objects()
         extension = self.ifc_export_settings.output_file.split(".")[-1]
         if extension == "ifczip":
             with tempfile.TemporaryDirectory() as unzipped_path:
                 filename, ext = os.path.splitext(os.path.basename(self.ifc_export_settings.output_file))
-                tmp_name = "{}.ifc".format(filename)
-                tmp_file = os.path.join(unzipped_path, tmp_name)
+                tmp_filename = f"{filename}.ifc"
+                tmp_file = os.path.join(unzipped_path, tmp_filename)
                 self.file.write(tmp_file)
                 with zipfile.ZipFile(
                     self.ifc_export_settings.output_file, mode="w", compression=zipfile.ZIP_DEFLATED, compresslevel=9
                 ) as zf:
-                    zf.write(tmp_file)
+                    zf.write(tmp_file, arcname=tmp_filename)
         elif extension == "ifc":
             self.file.write(self.ifc_export_settings.output_file)
         elif extension == "ifcjson":
@@ -61,103 +86,99 @@ class IfcExporter:
             self.get_application_name(), self.get_application_version()
         )
 
-    def sync_object_placements_and_deletions(self):
-        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
-        to_delete = []
+    def sync_deletions(self):
+        results = []
+        for ifc_definition_id in IfcStore.deleted_ids:
+            try:
+                product = self.file.by_id(ifc_definition_id)
+                if hasattr(product, "GlobalId"):
+                    results.append(product.GlobalId)
+            except:
+                continue
+            ifcopenshell.api.run("root.remove_product", self.file, **{"product": product})
+        return results
 
-        for ifc_definition_id, obj in IfcStore.id_map.items():
+    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
-                self.sync_object_placement(obj)
-                self.sync_object_container(ifc_definition_id, obj)
+                tool.Collector.sync(obj)
+                result = self.sync_object_placement(obj)
+                if result:
+                    results.append(result)
+                result = self.sync_object_material(obj)
+                if result:
+                    results.append(result)
             except ReferenceError:
                 pass  # The object is likely deleted
-            if self.should_delete(obj):
-                to_delete.append(ifc_definition_id)
-
-        for ifc_definition_id in to_delete:
-            product = self.file.by_id(ifc_definition_id)
-            IfcStore.unlink_element(product)
-            ifcopenshell.api.run("root.remove_product", self.file, **{"product": product})
+        return results
 
     def sync_edited_objects(self):
+        results = []
         for obj in IfcStore.edited_objs.copy():
             if not obj:
                 continue
             try:
                 if isinstance(obj, bpy.types.Material):
-                    bpy.ops.bim.update_style_colours(material=obj.name)
+                    blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
                 else:
+                    element = tool.Ifc.get_entity(obj)
+                    if element:
+                        results.append(element)
                     bpy.ops.bim.update_representation(obj=obj.name)
             except ReferenceError:
                 pass  # The object is likely deleted
         IfcStore.edited_objs.clear()
+        return results
+
+    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):
+            return
+        bpy.ops.bim.update_representation(obj=obj.name)
+
+    def has_changed_materials(self, obj):
+        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):
-        blender_matrix = np.matrix(obj.matrix_world)
+        if not self.has_object_moved(obj):
+            return
+        blender_matrix = np.array(obj.matrix_world)
         element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+        if (obj.scale - Vector((1.0, 1.0, 1.0))).length > 1e-4:
+            bpy.ops.bim.update_representation(obj=obj.name)
+            return element
+        if element.is_a("IfcGridAxis"):
+            return self.sync_grid_axis_object_placement(obj, element)
         if not hasattr(element, "ObjectPlacement"):
             return
-        ifc_matrix = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-        ifc_matrix[0][3] *= self.unit_scale
-        ifc_matrix[1][3] *= self.unit_scale
-        ifc_matrix[2][3] *= self.unit_scale
+        blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+        return element
 
-        props = bpy.context.scene.BIMGeoreferenceProperties
-        if props.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "OBJECT_PLACEMENT":
-            ifc_matrix = ifcopenshell.util.geolocation.global2local(
-                ifc_matrix,
-                float(props.blender_eastings) * self.unit_scale,
-                float(props.blender_northings) * self.unit_scale,
-                float(props.blender_orthogonal_height) * self.unit_scale,
-                float(props.blender_x_axis_abscissa),
-                float(props.blender_x_axis_ordinate),
-            )
-        if not np.allclose(ifc_matrix, blender_matrix, atol=0.0001):
-            bpy.ops.bim.edit_object_placement(obj=obj.name)
-
-    def sync_object_container(self, guid, obj):
-        element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-        element_collection = bpy.data.collections.get(obj.name)
-
-        if self.file.schema == "IFC2X3":
-            if element.is_a("IfcProject"):
-                return
-        elif element.is_a("IfcContext"):
-            return
-
-        if (
-            (element.is_a("IfcElement") and element_collection)
-            or element.is_a("IfcSpatialStructureElement")
-            or element.is_a("IfcGrid")
-        ):
-            try:
-                parent_collection = [c for c in bpy.data.collections if c.children.get(element_collection.name)][0]
-            except:
-                return  # Out of the spatial tree
-        else:
-            parent_collection = obj.users_collection[0]
-
-
-        parent_obj = bpy.data.objects.get(parent_collection.name)
-        if not parent_obj or not parent_obj.BIMObjectProperties.ifc_definition_id:
-            return
-        parent = self.file.by_id(parent_obj.BIMObjectProperties.ifc_definition_id)
-
-        if parent.is_a("IfcSpatialStructureElement") and not element.is_a("IfcSpatialStructureElement"):
-            if parent != ifcopenshell.util.element.get_container(element):
-                bpy.ops.bim.assign_container(relating_structure=parent.id(), related_element=obj.name)
-        elif parent != ifcopenshell.util.element.get_aggregate(element):
-            bpy.ops.bim.assign_object(relating_object=parent_obj.name, related_object=obj.name)
-
-    def should_delete(self, obj):
-        try:
-            # This will throw an exception if the Blender object no longer exists
-            foo = obj.name
+    def has_object_moved(self, obj):
+        if not obj.BIMObjectProperties.location_checksum:
+            return True  # Let's be conservative
+        loc_check = np.frombuffer(eval(obj.BIMObjectProperties.location_checksum))
+        rot_check = np.frombuffer(eval(obj.BIMObjectProperties.rotation_checksum))
+        loc_real = np.array(obj.matrix_world.translation).flatten()
+        rot_real = np.array(obj.matrix_world.to_3x3()).flatten()
+        if np.allclose(loc_check, loc_real, atol=1e-4) and np.allclose(rot_check, rot_real, atol=1e-2):
             return False
-        except:
-            return True
+        return True
+
+    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:
+            self.sync_object_placement(grid_obj)
+            if grid_obj.matrix_world != obj.matrix_world:
+                bpy.ops.bim.update_representation(obj=obj.name)
 
     def get_application_name(self):
         return "BlenderBIM"
@@ -182,7 +203,6 @@ class IfcExportSettings:
 
     @staticmethod
     def factory(context, output_file, logger):
-        scene_bim = context.scene.BIMProperties
         settings = IfcExportSettings()
         settings.output_file = output_file
         settings.logger = logger

src/blenderbim/blenderbim/bim/handler.py

@@ -1,10 +1,31 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 addon_utils
 import ifcopenshell.api.owner.settings
+import blenderbim.tool as tool
+import blenderbim.core.owner as core_owner
+from blenderbim.bim.module.drawing.prop import RasterStyleProperty
 from bpy.app.handlers import persistent
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.owner.prop import getPersons, getOrganisations
+from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation
 from ifcopenshell.api.attribute.data import Data as AttributeData
 from ifcopenshell.api.material.data import Data as MaterialData
 from ifcopenshell.api.style.data import Data as StyleData
@@ -29,9 +50,7 @@ def mode_callback(obj, data):
         ):
             continue
         if obj.data.BIMMeshProperties.ifc_definition_id:
-            representation = IfcStore.get_file().by_id(obj.data.BIMMeshProperties.ifc_definition_id)
-            if representation.RepresentationType in ["Tessellation", "Brep", "Annotation2D"]:
-                IfcStore.edited_objs.add(obj)
+            IfcStore.edited_objs.add(obj)
         elif IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id).is_a("IfcGridAxis"):
             IfcStore.edited_objs.add(obj)
 
@@ -86,13 +105,7 @@ def color_callback(obj, data):
 
 
 def active_object_callback():
-    obj = bpy.context.active_object
-    for obj in bpy.context.selected_objects:
-        if not obj.BIMObjectProperties.ifc_definition_id:
-            continue
-        stored_obj = IfcStore.get_element(obj.BIMObjectProperties.ifc_definition_id)
-        if stored_obj and stored_obj != obj:
-            bpy.ops.bim.copy_class(obj=obj.name)
+    refresh_ui_data()
 
 
 def subscribe_to(object, data_path, callback):
@@ -114,9 +127,20 @@ def subscribe_to(object, data_path, callback):
     )
 
 
+def refresh_ui_data():
+    from blenderbim.bim import modules
+
+    for name, value in modules.items():
+        try:
+            getattr(value, "data").refresh()
+        except AttributeError:
+            pass
+
+
 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()
@@ -133,8 +157,7 @@ def purge_module_data():
 def loadIfcStore(scene):
     IfcStore.purge()
     purge_module_data()
-    ifc_file = IfcStore.get_file()
-    if not ifc_file:
+    if not IfcStore.get_file():
         return
     IfcStore.get_schema()
     IfcStore.reload_linked_elements()
@@ -177,6 +200,7 @@ def ensureIfcExported(scene):
 
 
 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"):
         if element.ApplicationIdentifier == "BlenderBIM" and element.Version == version:
@@ -184,7 +208,7 @@ def get_application(ifc):
     return ifcopenshell.api.run(
         "owner.add_application",
         ifc,
-        version=get_application_version(),
+        version=version,
         application_full_name="BlenderBIM Add-on",
         application_identifier="BlenderBIM",
     )
@@ -210,47 +234,39 @@ def setDefaultProperties(scene):
     bpy.msgbus.subscribe_rna(
         key=active_object_key, owner=global_subscription_owner, args=(), notify=active_object_callback
     )
-    ifcopenshell.api.owner.settings.get_person = (
-        lambda ifc: ifc.by_id(int(bpy.context.scene.BIMOwnerProperties.user_person))
-        if getPersons(None, bpy.context) and bpy.context.scene.BIMOwnerProperties.user_person
-        else None
-    )
-    ifcopenshell.api.owner.settings.get_organisation = (
-        lambda ifc: ifc.by_id(int(bpy.context.scene.BIMOwnerProperties.user_organisation))
-        if getOrganisations(None, bpy.context) and bpy.context.scene.BIMOwnerProperties.user_organisation
-        else None
-    )
+    ifcopenshell.api.owner.settings.get_user = lambda ifc: core_owner.get_user(tool.Owner)
     ifcopenshell.api.owner.settings.get_application = get_application
+    # TODO: Move to drawing module
     if len(bpy.context.scene.DocProperties.drawing_styles) == 0:
         drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
         drawing_style.name = "Technical"
         drawing_style.render_type = "VIEWPORT"
         drawing_style.raster_style = json.dumps(
             {
-                "bpy.data.worlds[0].color": (1, 1, 1),
-                "bpy.context.scene.render.engine": "BLENDER_WORKBENCH",
-                "bpy.context.scene.render.film_transparent": False,
-                "bpy.context.scene.display.shading.show_object_outline": True,
-                "bpy.context.scene.display.shading.show_cavity": False,
-                "bpy.context.scene.display.shading.cavity_type": "BOTH",
-                "bpy.context.scene.display.shading.curvature_ridge_factor": 1,
-                "bpy.context.scene.display.shading.curvature_valley_factor": 1,
-                "bpy.context.scene.view_settings.view_transform": "Standard",
-                "bpy.context.scene.display.shading.light": "FLAT",
-                "bpy.context.scene.display.shading.color_type": "SINGLE",
-                "bpy.context.scene.display.shading.single_color": (1, 1, 1),
-                "bpy.context.scene.display.shading.show_shadows": False,
-                "bpy.context.scene.display.shading.shadow_intensity": 0.5,
-                "bpy.context.scene.display.light_direction": (0.5, 0.5, 0.5),
-                "bpy.context.scene.view_settings.use_curve_mapping": False,
-                "space.overlay.show_wireframes": True,
-                "space.overlay.wireframe_threshold": 0,
-                "space.overlay.show_floor": False,
-                "space.overlay.show_axis_x": False,
-                "space.overlay.show_axis_y": False,
-                "space.overlay.show_axis_z": False,
-                "space.overlay.show_object_origins": False,
-                "space.overlay.show_relationship_lines": False,
+                RasterStyleProperty.WORLD_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.RENDER_ENGINE.value: "BLENDER_WORKBENCH",
+                RasterStyleProperty.RENDER_TRANSPARENT.value: False,
+                RasterStyleProperty.SHADING_SHOW_OBJECT_OUTLINE.value: True,
+                RasterStyleProperty.SHADING_SHOW_CAVITY.value: False,
+                RasterStyleProperty.SHADING_CAVITY_TYPE.value: "BOTH",
+                RasterStyleProperty.SHADING_CURVATURE_RIDGE_FACTOR.value: 1,
+                RasterStyleProperty.SHADING_CURVATURE_VALLEY_FACTOR.value: 1,
+                RasterStyleProperty.VIEW_TRANSFORM.value: "Standard",
+                RasterStyleProperty.SHADING_LIGHT.value: "FLAT",
+                RasterStyleProperty.SHADING_COLOR_TYPE.value: "SINGLE",
+                RasterStyleProperty.SHADING_SINGLE_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.SHADING_SHOW_SHADOWS.value: False,
+                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
+                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
+                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: True,
+                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
+                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Y.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Z.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_OBJECT_ORIGINS.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
             }
         )
         drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()
@@ -258,30 +274,30 @@ def setDefaultProperties(scene):
         drawing_style.render_type = "VIEWPORT"
         drawing_style.raster_style = json.dumps(
             {
-                "bpy.data.worlds[0].color": (1, 1, 1),
-                "bpy.context.scene.render.engine": "BLENDER_WORKBENCH",
-                "bpy.context.scene.render.film_transparent": False,
-                "bpy.context.scene.display.shading.show_object_outline": True,
-                "bpy.context.scene.display.shading.show_cavity": True,
-                "bpy.context.scene.display.shading.cavity_type": "BOTH",
-                "bpy.context.scene.display.shading.curvature_ridge_factor": 1,
-                "bpy.context.scene.display.shading.curvature_valley_factor": 1,
-                "bpy.context.scene.view_settings.view_transform": "Standard",
-                "bpy.context.scene.display.shading.light": "STUDIO",
-                "bpy.context.scene.display.shading.color_type": "MATERIAL",
-                "bpy.context.scene.display.shading.single_color": (1, 1, 1),
-                "bpy.context.scene.display.shading.show_shadows": True,
-                "bpy.context.scene.display.shading.shadow_intensity": 0.5,
-                "bpy.context.scene.display.light_direction": (0.5, 0.5, 0.5),
-                "bpy.context.scene.view_settings.use_curve_mapping": False,
-                "space.overlay.show_wireframes": True,
-                "space.overlay.wireframe_threshold": 0,
-                "space.overlay.show_floor": False,
-                "space.overlay.show_axis_x": False,
-                "space.overlay.show_axis_y": False,
-                "space.overlay.show_axis_z": False,
-                "space.overlay.show_object_origins": False,
-                "space.overlay.show_relationship_lines": False,
+                RasterStyleProperty.WORLD_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.RENDER_ENGINE.value: "BLENDER_WORKBENCH",
+                RasterStyleProperty.RENDER_TRANSPARENT.value: False,
+                RasterStyleProperty.SHADING_SHOW_OBJECT_OUTLINE.value: True,
+                RasterStyleProperty.SHADING_SHOW_CAVITY.value: True,
+                RasterStyleProperty.SHADING_CAVITY_TYPE.value: "BOTH",
+                RasterStyleProperty.SHADING_CURVATURE_RIDGE_FACTOR.value: 1,
+                RasterStyleProperty.SHADING_CURVATURE_VALLEY_FACTOR.value: 1,
+                RasterStyleProperty.VIEW_TRANSFORM.value: "Standard",
+                RasterStyleProperty.SHADING_LIGHT.value: "STUDIO",
+                RasterStyleProperty.SHADING_COLOR_TYPE.value: "MATERIAL",
+                RasterStyleProperty.SHADING_SINGLE_COLOR.value: (1, 1, 1),
+                RasterStyleProperty.SHADING_SHOW_SHADOWS.value: True,
+                RasterStyleProperty.SHADING_SHADOW_INTENSITY.value: 0.5,
+                RasterStyleProperty.DISPLAY_LIGHT_DIRECTION.value: (0.5, 0.5, 0.5),
+                RasterStyleProperty.VIEW_USE_CURVE_MAPPING.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_WIREFRAMES.value: False,
+                RasterStyleProperty.OVERLAY_WIREFRAME_THRESHOLD.value: 0,
+                RasterStyleProperty.OVERLAY_SHOW_FLOOR.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_X.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Y.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_AXIS_Z.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_OBJECT_ORIGINS.value: False,
+                RasterStyleProperty.OVERLAY_SHOW_RELATIONSHIP_LINES.value: False,
             }
         )
         drawing_style = bpy.context.scene.DocProperties.drawing_styles.add()

src/blenderbim/blenderbim/bim/helper.py

@@ -1,6 +1,25 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 math
+import zipfile
 import ifcopenshell
 import ifcopenshell.util.attribute
 from mathutils import geometry
@@ -11,57 +30,64 @@ from blenderbim.bim.ifc import IfcStore
 def draw_attributes(props, layout, copy_operator=None):
     for attribute in props:
         row = layout.row(align=True)
-        value = None
-        if attribute.data_type == "string":
-            row.prop(attribute, "string_value", text=attribute.name)
-            value = attribute.string_value
-        elif attribute.data_type == "boolean":
-            row.prop(attribute, "bool_value", text=attribute.name)
-            value = attribute.bool_value
-        elif attribute.data_type == "integer":
-            row.prop(attribute, "int_value", text=attribute.name)
-            value = attribute.int_value
-        elif attribute.data_type == "float":
-            row.prop(attribute, "float_value", text=attribute.name)
-            value = attribute.float_value
-        elif attribute.data_type == "enum":
-            row.prop(attribute, "enum_value", text=attribute.name)
-            value = attribute.enum_value
-        if attribute.is_optional:
-            row.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
-        if copy_operator:
-            op = row.operator(f"{copy_operator}", text="", icon="COPYDOWN")
-            op.data = json.dumps({"name": attribute.name, "value": value, "is_null": attribute.is_null})
+        draw_attribute(attribute, row, copy_operator)
+
+
+def draw_attribute(attribute, layout, copy_operator=None):
+    value_name = attribute.get_value_name()
+    if not value_name:
+        layout.label(text=attribute.name)
+        return
+    layout.prop(
+        attribute,
+        value_name,
+        text=attribute.name,
+    )
+    if attribute.is_optional:
+        layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
+    if copy_operator:
+        op = layout.operator(f"{copy_operator}", text="", icon="COPYDOWN")
+        op.name = attribute.name
 
 
 def import_attributes(ifc_class, props, data, callback=None):
     for attribute in IfcStore.get_schema().declaration_by_name(ifc_class).all_attributes():
-        data_type = ifcopenshell.util.attribute.get_primitive_type(attribute)
-        if data_type == "entity" or (isinstance(data_type, tuple) and "entity" in ".".join(data_type)):
-            callback(attribute.name(), None, data) if callback else None
-            continue
-        new = props.add()
-        new.name = attribute.name()
-        new.is_null = data[attribute.name()] is None
-        new.is_optional = attribute.optional()
-        new.data_type = data_type if isinstance(data_type, str) else ""
-        is_handled_by_callback = callback(attribute.name(), new, data) if callback else None
-        if is_handled_by_callback:
-            pass  # Our job is done
-        elif is_handled_by_callback is False:
-            props.remove(len(props) - 1)
-        elif data_type == "string":
-            new.string_value = "" if new.is_null else data[attribute.name()]
-        elif data_type == "boolean":
-            new.bool_value = False if new.is_null else data[attribute.name()]
-        elif data_type == "integer":
-            new.int_value = 0 if new.is_null else data[attribute.name()]
-        elif data_type == "float":
-            new.float_value = 0.0 if new.is_null else data[attribute.name()]
-        elif data_type == "enum":
-            new.enum_items = json.dumps(ifcopenshell.util.attribute.get_enum_items(attribute))
-            if data[attribute.name()]:
-                new.enum_value = data[attribute.name()]
+        import_attribute(attribute, props, data, callback=callback)
+
+
+# A more elegant attribute importer signature, intended to supersede import_attributes
+def import_attributes2(element, props, callback=None):
+    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):
+    data_type = ifcopenshell.util.attribute.get_primitive_type(attribute)
+    if isinstance(data_type, tuple) or data_type == "entity":
+        callback(attribute.name(), None, data) if callback else None
+        return
+    new = props.add()
+    new.name = attribute.name()
+    new.is_null = data[attribute.name()] is None
+    new.is_optional = attribute.optional()
+    new.data_type = data_type if isinstance(data_type, str) else ""
+    is_handled_by_callback = callback(attribute.name(), new, data) if callback else None
+    if is_handled_by_callback:
+        pass  # Our job is done
+    elif is_handled_by_callback is False:
+        props.remove(len(props) - 1)
+    elif data_type == "string":
+        new.string_value = "" if new.is_null else data[attribute.name()]
+    elif data_type == "boolean":
+        new.bool_value = False if new.is_null else data[attribute.name()]
+    elif data_type == "integer":
+        new.int_value = 0 if new.is_null else data[attribute.name()]
+    elif data_type == "float":
+        new.float_value = 0.0 if new.is_null else data[attribute.name()]
+    elif data_type == "enum":
+        new.enum_items = json.dumps(ifcopenshell.util.attribute.get_enum_items(attribute))
+        if data[attribute.name()]:
+            new.enum_value = data[attribute.name()]
 
 
 def export_attributes(props, callback=None):
@@ -69,18 +95,48 @@ def export_attributes(props, callback=None):
     for prop in props:
         is_handled_by_callback = callback(attributes, prop) if callback else False
         if is_handled_by_callback:
-            continue # Our job is done
-
-        if prop.is_null:
-            attributes[prop.name] = None
-        elif prop.data_type == "string":
-            attributes[prop.name] = prop.string_value
-        elif prop.data_type == "boolean":
-            attributes[prop.name] = prop.bool_value
-        elif prop.data_type == "integer":
-            attributes[prop.name] = prop.int_value
-        elif prop.data_type == "float":
-            attributes[prop.name] = prop.float_value
-        elif prop.data_type == "enum":
-            attributes[prop.name] = prop.enum_value
+            continue  # Our job is done
+        attributes[prop.name] = prop.get_value()
     return attributes
+
+
+class IfcHeaderExtractor:
+    def __init__(self, filepath: str):
+        self.filepath = filepath
+
+    def extract(self):
+        extension = self.filepath.split(".")[-1]
+        if extension.lower() == "ifc":
+            with open(self.filepath) as ifc_file:
+                return self.extract_ifc_spf(ifc_file)
+        elif extension.lower() == "ifczip":
+            return self.extract_ifc_zip()
+
+    def extract_ifc_spf(self, ifc_file):
+        # https://www.steptools.com/stds/step/IS_final_p21e3.html#clause-8
+        data = {}
+        max_lines_to_parse = 50
+        for _ in range(max_lines_to_parse):
+            line = next(ifc_file)
+            if isinstance(line, bytes):
+                line = line.decode("utf-8")
+            if line.startswith("FILE_DESCRIPTION"):
+                for i, part in enumerate(line.split("'")):
+                    if i == 1:
+                        data["description"] = part
+                    elif i == 3:
+                        data["implementation_level"] = part
+            elif line.startswith("FILE_NAME"):
+                for i, part in enumerate(line.split("'")):
+                    if i == 1:
+                        data["name"] = part
+                    elif i == 3:
+                        data["time_stamp"] = part
+            elif line.startswith("FILE_SCHEMA"):
+                data["schema_name"] = line.split("'")[1]
+                break
+        return data
+
+    def extract_ifc_zip(self):
+        archive = zipfile.ZipFile(self.filepath, "r")
+        return self.extract_ifc_spf(archive.open(archive.filelist[0]))

src/blenderbim/blenderbim/bim/ifc.py

@@ -1,15 +1,41 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021, 2022 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 os
 import bpy
 import uuid
+import hashlib
+import zipfile
+import tempfile
 import ifcopenshell
 import blenderbim.bim.handler
+from pathlib import Path
 
 
 class IfcStore:
     path = ""
     file = None
     schema = None
+    cache = None
+    cache_path = None
     id_map = {}
     guid_map = {}
+    deleted_ids = set()
     edited_objs = set()
     pset_template_path = ""
     pset_template_file = None
@@ -21,35 +47,83 @@ class IfcStore:
     last_transaction = ""
     history = []
     future = []
+    schema_identifiers = ["IFC4", "IFC2X3"]
 
     @staticmethod
     def purge():
         IfcStore.path = ""
         IfcStore.file = None
         IfcStore.schema = None
+        IfcStore.cache = None
+        IfcStore.cache_path = None
         IfcStore.id_map = {}
         IfcStore.guid_map = {}
+        IfcStore.deleted_ids = set()
         IfcStore.edited_objs = set()
         IfcStore.pset_template_path = ""
         IfcStore.pset_template_file = None
         IfcStore.library_path = ""
         IfcStore.library_file = None
+        IfcStore.schema_identifiers = ["IFC4", "IFC2X3"]
 
     @staticmethod
     def get_file():
         if IfcStore.file is None:
             IfcStore.path = bpy.context.scene.BIMProperties.ifc_file
+            if not os.path.isabs(IfcStore.path):
+                IfcStore.path = os.path.abspath(os.path.join(bpy.path.abspath("//"), IfcStore.path))
             if IfcStore.path:
                 try:
-                    IfcStore.file = ifcopenshell.open(IfcStore.path)
+                    IfcStore.load_file(IfcStore.path)
                 except:
-                    IfcStore.file
+                    pass
         return IfcStore.file
 
+    @staticmethod
+    def get_cache():
+        if IfcStore.cache is None and IfcStore.path:
+            ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
+            ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+            IfcStore.cache_path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "cache", f"{ifc_hash}.h5")
+            cache_settings = ifcopenshell.geom.settings()
+            try:
+                IfcStore.cache = ifcopenshell.geom.serializers.hdf5(IfcStore.cache_path, cache_settings)
+            except:
+                return
+        return IfcStore.cache
+
+    @staticmethod
+    def update_cache():
+        if not IfcStore.cache:
+            return
+        ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
+        ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+        new_cache_path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "cache", f"{ifc_hash}.h5")
+        IfcStore.cache = None
+        os.replace(IfcStore.cache_path, new_cache_path)
+        IfcStore.get_cache()
+
+    @staticmethod
+    def load_file(path):
+        extension = path.split(".")[-1]
+        if extension.lower() == "ifczip":
+            with tempfile.TemporaryDirectory() as unzipped_path:
+                with zipfile.ZipFile(path, "r") as zip_ref:
+                    zip_ref.extractall(unzipped_path)
+                for filename in Path(unzipped_path).glob("**/*.ifc"):
+                    IfcStore.file = ifcopenshell.open(filename)
+                    return
+        elif extension.lower() == "ifcxml":
+            IfcStore.file = ifcopenshell.file(ifcopenshell.ifcopenshell_wrapper.parse_ifcxml(path))
+        elif extension.lower() == "ifc":
+            IfcStore.file = ifcopenshell.open(path)
+
     @staticmethod
     def get_schema():
         if IfcStore.file is None:
-            return
+            IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(
+                bpy.context.scene.BIMProjectProperties.export_schema
+            )
         elif IfcStore.schema is None:
             IfcStore.schema = ifcopenshell.ifcopenshell_wrapper.schema_by_name(IfcStore.file.schema)
         return IfcStore.schema
@@ -112,6 +186,23 @@ class IfcStore:
                 data["guid"] = element.GlobalId
             IfcStore.commit_link_element(data)
 
+    @staticmethod
+    def delete_element(element):
+        IfcStore.deleted_ids.add(element.id())
+        if IfcStore.history:
+            data = {"id": element.id()}
+            IfcStore.history[-1]["operations"].append(
+                {"rollback": IfcStore.rollback_delete_element, "commit": IfcStore.commit_delete_element, "data": data}
+            )
+
+    @staticmethod
+    def rollback_delete_element(data):
+        IfcStore.deleted_ids.remove(data["id"])
+
+    @staticmethod
+    def commit_delete_element(data):
+        IfcStore.deleted_ids.add(data["id"])
+
     @staticmethod
     def link_element(element, obj):
         IfcStore.id_map[element.id()] = obj
@@ -149,7 +240,7 @@ class IfcStore:
     def commit_link_element(data):
         obj = bpy.data.objects.get(data["obj"])
         IfcStore.id_map[data["id"]] = obj
-        if data["guid"]:
+        if "guid" in data:
             IfcStore.guid_map[data["guid"]] = obj
         blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
         blenderbim.bim.handler.subscribe_to(obj, "name", blenderbim.bim.handler.name_callback)
@@ -166,6 +257,14 @@ class IfcStore:
             except:
                 pass
 
+        if obj is None:
+            try:
+                potential_obj = IfcStore.id_map[element.id()]
+                potential_obj.name
+                obj = potential_obj
+            except:
+                pass
+
         try:
             if element:
                 del IfcStore.id_map[element.id()]
@@ -180,7 +279,9 @@ class IfcStore:
         except:
             pass
 
-        if obj:
+        if element and element.is_a("IfcSurfaceStyle"):
+            obj.BIMMaterialProperties.ifc_style_id = 0
+        elif obj:
             obj.BIMObjectProperties.ifc_definition_id = 0
 
     @staticmethod
@@ -203,6 +304,7 @@ class IfcStore:
                 operator, rollback=lambda d: IfcStore.get_file().undo(), commit=lambda d: IfcStore.get_file().redo()
             )
             IfcStore.end_transaction(operator)
+            blenderbim.bim.handler.refresh_ui_data()
 
         return result
 

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

@@ -0,0 +1,17 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.

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

@@ -1,18 +1,41 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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, operator
+from . import ui, prop, operator
 
 classes = (
-    operator.AssignObject,
-    operator.EnableEditingAggregate,
-    operator.DisableEditingAggregate,
-    operator.AddAggregate,
+    operator.BIM_OT_assign_object,
+    operator.BIM_OT_unassign_object,
+    operator.BIM_OT_enable_editing_aggregate,
+    operator.BIM_OT_disable_editing_aggregate,
+    operator.BIM_OT_add_aggregate,
+    operator.BIM_OT_select_parts,
+    operator.BIM_OT_select_aggregate,
+    operator.BIM_OT_add_part_to_object,
+    prop.BIMObjectAggregateProperties,
     ui.BIM_PT_aggregate,
 )
 
 
 def register():
-    pass
+    bpy.types.Object.BIMObjectAggregateProperties = bpy.props.PointerProperty(type=prop.BIMObjectAggregateProperties)
 
 
 def unregister():
-    pass
+    del bpy.types.Object.BIMObjectAggregateProperties

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

@@ -0,0 +1,81 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 blenderbim.tool as tool
+import ifcopenshell.util.element
+
+
+def refresh():
+    AggregateData.is_loaded = False
+
+
+class AggregateData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.data = {
+            "has_relating_object": cls.has_relating_object(),
+            "relating_object_label": cls.get_relating_object_label(),
+            "relating_object_id": cls.get_relating_object_id(),
+            "has_related_objects": cls.has_related_objects(),
+            "related_objects_amount": cls.get_related_objects_amount(),
+            "ifc_class": cls.ifc_class(),
+        }
+        cls.is_loaded = True
+
+    @classmethod
+    def get_relating_object(cls):
+        return ifcopenshell.util.element.get_aggregate(tool.Ifc.get_entity(bpy.context.active_object))
+
+    @classmethod
+    def has_relating_object(cls) -> bool:
+        return cls.get_relating_object() is not None
+
+    @classmethod
+    def get_relating_object_label(cls) -> str:
+        aggregate = cls.get_relating_object()
+        if aggregate:
+            return f"{aggregate.is_a()}/{aggregate.Name or ''}"
+
+    @classmethod
+    def get_relating_object_id(cls) -> int:
+        aggregate = cls.get_relating_object()
+        if aggregate:
+            return aggregate.id()
+
+    @classmethod
+    def get_related_objects(cls):
+        return ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(bpy.context.active_object))
+
+    @classmethod
+    def get_related_objects_amount(cls):
+        parts = cls.get_related_objects()
+        return len(parts) if parts else 0
+
+    @classmethod
+    def has_related_objects(cls) -> bool:
+        return bool(cls.get_related_objects())
+
+    @classmethod
+    def ifc_class(cls) -> str:
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if element:
+            return element.is_a()

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

@@ -1,90 +1,100 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 ifcopenshell.api
+import ifcopenshell
+import ifcopenshell.util.element
+import blenderbim.tool as tool
+import blenderbim.core.aggregate as core
+import blenderbim.core.spatial
+import blenderbim.bim.handler
 from blenderbim.bim.ifc import IfcStore
-from ifcopenshell.api.aggregate.data import Data
 
 
-class AssignObject(bpy.types.Operator):
+class Operator:
+    def execute(self, context):
+        IfcStore.execute_ifc_operator(self, context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
+class BIM_OT_assign_object(bpy.types.Operator, Operator):
+    """Create aggregation relationship between two ifc elements"""
+
     bl_idname = "bim.assign_object"
     bl_label = "Assign Object"
     bl_options = {"REGISTER", "UNDO"}
-    relating_object: bpy.props.StringProperty()
-    related_object: bpy.props.StringProperty()
-
-    def execute(self, context):
-        return IfcStore.execute_ifc_operator(self, context)
+    relating_object: bpy.props.IntProperty()
+    related_object: bpy.props.IntProperty()
 
     def _execute(self, context):
-        self.file = IfcStore.get_file()
-        related_objects = (
-            [bpy.data.objects.get(self.related_object)] if self.related_object else context.selected_objects
+        core.assign_object(
+            tool.Ifc,
+            tool.Aggregate,
+            tool.Collector,
+            relating_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object)),
+            related_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.related_object)),
         )
-        relating_object = bpy.data.objects.get(self.relating_object)
-        if not relating_object or not relating_object.BIMObjectProperties.ifc_definition_id:
-            return {"FINISHED"}
-        for related_object in related_objects:
-            oprops = related_object.BIMObjectProperties
-            product = self.file.by_id(oprops.ifc_definition_id)
-            ifcopenshell.api.run(
-                "aggregate.assign_object",
-                self.file,
-                **{
-                    "product": product,
-                    "relating_object": self.file.by_id(relating_object.BIMObjectProperties.ifc_definition_id),
-                },
-            )
-            bpy.ops.bim.edit_object_placement(obj=related_object.name)
-            Data.load(IfcStore.get_file(), oprops.ifc_definition_id)
-            bpy.ops.bim.disable_editing_aggregate(obj=related_object.name)
-
-            spatial_collection = bpy.data.collections.get(related_object.name)
-            relating_collection = bpy.data.collections.get(relating_object.name)
-            if spatial_collection:
-                self.remove_collection(context.scene.collection, spatial_collection)
-                for collection in bpy.data.collections:
-                    if collection == relating_collection:
-                        if not collection.children.get(spatial_collection.name):
-                            collection.children.link(spatial_collection)
-                        continue
-                    self.remove_collection(collection, spatial_collection)
-            else:
-                for collection in related_object.users_collection:
-                    if collection.name.startswith("Ifc"):
-                        collection.objects.unlink(related_object)
-                relating_collection.objects.link(related_object)
-        return {"FINISHED"}
-
-    def remove_collection(self, parent, child):
-        try:
-            parent.children.unlink(child)
-        except:
-            pass
 
 
-class EnableEditingAggregate(bpy.types.Operator):
+class BIM_OT_unassign_object(bpy.types.Operator, Operator):
+    """Remove aggregation relationship between two ifc elements"""
+
+    bl_idname = "bim.unassign_object"
+    bl_label = "Unassign Object"
+    bl_options = {"REGISTER", "UNDO"}
+    relating_object: bpy.props.IntProperty()
+    related_object: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        core.unassign_object(
+            tool.Ifc,
+            tool.Collector,
+            relating_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object)),
+            related_obj=tool.Ifc.get_object(tool.Ifc.get().by_id(self.related_object)),
+        )
+
+
+class BIM_OT_enable_editing_aggregate(bpy.types.Operator, Operator):
+    """Enable editing aggregation relationship"""
+
     bl_idname = "bim.enable_editing_aggregate"
     bl_label = "Enable Editing Aggregate"
     bl_options = {"REGISTER", "UNDO"}
 
-    def execute(self, context):
-        context.active_object.BIMObjectProperties.relating_object = None
-        context.active_object.BIMObjectProperties.is_editing_aggregate = True
-        return {"FINISHED"}
+    def _execute(self, context):
+        core.enable_editing_aggregate(tool.Aggregate, obj=context.active_object)
 
 
-class DisableEditingAggregate(bpy.types.Operator):
+class BIM_OT_disable_editing_aggregate(bpy.types.Operator, Operator):
+    """Disable editing aggregation relationship"""
+
     bl_idname = "bim.disable_editing_aggregate"
     bl_label = "Disable Editing Aggregate"
-    obj: bpy.props.StringProperty()
     bl_options = {"REGISTER", "UNDO"}
 
-    def execute(self, context):
-        obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
-        obj.BIMObjectProperties.is_editing_aggregate = False
-        return {"FINISHED"}
+    def _execute(self, context):
+        core.disable_editing_aggregate(tool.Aggregate, obj=context.active_object)
 
 
-class AddAggregate(bpy.types.Operator):
+class BIM_OT_add_aggregate(bpy.types.Operator):
+    """Add aggregate to IFC element"""
+
     bl_idname = "bim.add_aggregate"
     bl_label = "Add Aggregate"
     bl_options = {"REGISTER", "UNDO"}
@@ -95,10 +105,99 @@ class AddAggregate(bpy.types.Operator):
 
     def _execute(self, context):
         obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
+        element = tool.Ifc.get_entity(obj)
+        if not element:
+            return {"FINISHED"}
+
+        aggregate = self.create_aggregate(context)
+        tool.Collector.sync(obj)
+        current_aggregate = ifcopenshell.util.element.get_aggregate(element)
+        current_container = ifcopenshell.util.element.get_container(element)
+        if current_aggregate:
+            core.assign_object(
+                tool.Ifc,
+                tool.Aggregate,
+                tool.Collector,
+                relating_obj=tool.Ifc.get_object(current_aggregate),
+                related_obj=aggregate,
+            )
+        elif current_container:
+            blenderbim.core.spatial.assign_container(
+                tool.Ifc,
+                tool.Collector,
+                tool.Spatial,
+                structure_obj=tool.Ifc.get_object(current_container),
+                element_obj=aggregate,
+            )
+        core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
+        return {"FINISHED"}
+
+    def create_aggregate(self, context):
         aggregate_collection = bpy.data.collections.new("IfcElementAssembly/Assembly")
         context.scene.collection.children.link(aggregate_collection)
         aggregate = bpy.data.objects.new("Assembly", None)
         aggregate_collection.objects.link(aggregate)
         bpy.ops.bim.assign_class(obj=aggregate.name, ifc_class="IfcElementAssembly")
-        bpy.ops.bim.assign_object(related_object=obj.name, relating_object=aggregate.name)
+        return aggregate
+
+
+class BIM_OT_select_parts(bpy.types.Operator):
+    """Select Parts"""
+
+    bl_idname = "bim.select_parts"
+    bl_label = "Select Parts"
+    bl_options = {"REGISTER", "UNDO"}
+    obj: bpy.props.StringProperty()
+
+    def execute(self, context):
+        self.file = IfcStore.get_file()
+        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"}
+
+
+class BIM_OT_select_aggregate(bpy.types.Operator):
+    """Select Aggregate"""
+
+    bl_idname = "bim.select_aggregate"
+    bl_label = "Select Aggregate"
+    bl_options = {"REGISTER", "UNDO"}
+    obj: bpy.props.StringProperty()
+
+    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)
+        if aggregate_obj in context.selectable_objects:
+            aggregate_obj.select_set(True)
+        return {"FINISHED"}
+
+
+class BIM_OT_add_part_to_object(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_part_to_object"
+    bl_label = "Add Part to Object"
+    bl_options = {"REGISTER", "UNDO"}
+    part_class: bpy.props.StringProperty(name="Class", options={"HIDDEN"})
+    part_name: bpy.props.StringProperty(name="Name")
+    obj: bpy.props.StringProperty(options={"HIDDEN"})
+
+    def invoke(self, context, event):
+        self.part_name = "My " + self.part_class.lstrip("Ifc")
+        return context.window_manager.invoke_props_dialog(self)
+
+    def _execute(self, context):
+        obj = bpy.data.objects.get(self.obj) or context.active_object
+        core.add_part_to_object(
+            tool.Ifc,
+            tool.Aggregate,
+            tool.Collector,
+            tool.Blender,
+            obj=obj,
+            part_class=self.part_class,
+            part_name=self.part_name,
+        )

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

@@ -0,0 +1,48 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 blenderbim.bim.prop import StrProperty, Attribute
+from blenderbim.bim.module.spatial.data import SpatialData
+from bpy.types import PropertyGroup
+from bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+
+
+def update_relating_object(self, context):
+    def message(self, context):
+        self.layout.label(text="Please select a valid Ifc Element")
+
+    if self.relating_object is None:
+        return
+    if not self.relating_object.BIMObjectProperties.ifc_definition_id:
+        context.window_manager.popup_menu(message, title="Invalid Element Selected", icon="INFO")
+        self.relating_object = None
+
+
+class BIMObjectAggregateProperties(PropertyGroup):
+    is_editing: BoolProperty(name="Is Editing")
+    relating_object: PointerProperty(name="Aggregate", type=bpy.types.Object, update=update_relating_object)

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

@@ -1,5 +1,23 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.
+
 from bpy.types import Panel
-from ifcopenshell.api.aggregate.data import Data
+from blenderbim.bim.module.aggregate.data import AggregateData
 from blenderbim.bim.ifc import IfcStore
 
 
@@ -10,9 +28,12 @@ class BIM_PT_aggregate(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @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
@@ -20,32 +41,55 @@ class BIM_PT_aggregate(Panel):
             return False
         if not IfcStore.get_file().by_id(props.ifc_definition_id).is_a("IfcObjectDefinition"):
             return False
-        if props.ifc_definition_id not in Data.products:
-            Data.load(IfcStore.get_file(), props.ifc_definition_id)
-        if not Data.products[props.ifc_definition_id]:
-            return False
         return True
 
     def draw(self, context):
-        props = context.active_object.BIMObjectProperties
-        if not props.ifc_definition_id:
-            return
-        if props.ifc_definition_id not in Data.products:
-            Data.load(IfcStore.get_file(), props.ifc_definition_id)
+        layout = self.layout
+        if not AggregateData.is_loaded:
+            AggregateData.load()
 
-        if props.is_editing_aggregate:
-            row = self.layout.row(align=True)
+        props = context.active_object.BIMObjectAggregateProperties
+
+        if props.is_editing:
+            row = layout.row(align=True)
             row.prop(props, "relating_object", text="")
             if props.relating_object:
-                row.operator("bim.assign_object", icon="CHECKMARK", text="").relating_object = props.relating_object.name
-            row.operator("bim.disable_editing_aggregate", icon="X", text="")
+                op = row.operator("bim.assign_object", icon="CHECKMARK", text="")
+                op.relating_object = props.relating_object.BIMObjectProperties.ifc_definition_id
+                op.related_object = context.active_object.BIMObjectProperties.ifc_definition_id
+            row.operator("bim.disable_editing_aggregate", icon="CANCEL", text="")
         else:
-            row = self.layout.row(align=True)
-            name = "{}/{}".format(
-                Data.products[props.ifc_definition_id]["type"], Data.products[props.ifc_definition_id]["Name"]
-            )
-            if name == "None/None":
-                name = "No Aggregate Found"
-            row.label(text=name)
-            row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
-            row.operator("bim.add_aggregate", icon="ADD", text="")
+            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="RESTRICT_SELECT_OFF", text="")
+                op.obj = context.active_object.name
+                row.operator("bim.enable_editing_aggregate", icon="GREASEPENCIL", text="")
+                row.operator("bim.add_aggregate", icon="ADD", text="")
+                op = row.operator("bim.unassign_object", icon="X", text="")
+                op.relating_object = AggregateData.data["relating_object_id"]
+                op.related_object = context.active_object.BIMObjectProperties.ifc_definition_id
+            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)
+        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
+
+        ifc_class = AggregateData.data["ifc_class"]
+        part_class = ""
+        if ifc_class == "IfcBuilding":
+            part_class = "IfcBuildingStorey"
+        elif ifc_class == "IfcSite":
+            part_class = "IfcBuilding"
+        elif ifc_class == "IfcProject":
+            part_class = "IfcSite"
+        if part_class != "":
+            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

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 
@@ -6,6 +24,7 @@ classes = (
     operator.DisableEditingAttributes,
     operator.EditAttributes,
     operator.GenerateGlobalId,
+    operator.CopyAttributeToSelection,
     prop.BIMAttributeProperties,
     ui.BIM_PT_object_attributes,
     ui.BIM_PT_material_attributes,

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

@@ -0,0 +1,74 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 ifcopenshell
+import blenderbim.tool as tool
+
+
+def refresh():
+    AttributesData.is_loaded = False
+    MaterialAttributesData.is_loaded = False
+
+
+class AttributesData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.data = {"attributes": cls.attributes()}
+        cls.is_loaded = True
+
+    @classmethod
+    def attributes(cls):
+        results = []
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        data = element.get_info()
+        if hasattr(element, "GlobalId"):
+            excluded_keys = ["id", "type"]
+        else:
+            excluded_keys = ["type"]
+        for key, value in data.items():
+            if value is None or isinstance(value, ifcopenshell.entity_instance) or key in excluded_keys:
+                continue
+            if key == "id":
+                key = "STEP ID"
+            results.append({"name": key, "value": str(value)})
+        return results
+
+
+class MaterialAttributesData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.data = {"attributes": cls.attributes()}
+        cls.is_loaded = True
+
+    @classmethod
+    def attributes(cls):
+        results = []
+        element = tool.Ifc.get_entity(bpy.context.active_object.active_material)
+        data = element.get_info()
+        for key, value in data.items():
+            if value is None or isinstance(value, ifcopenshell.entity_instance) or key in ["id", "type"]:
+                continue
+            results.append({"name": key, "value": str(value)})
+        return results

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

@@ -1,11 +1,40 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 import ifcopenshell.api
+import blenderbim.bim.helper
+import blenderbim.bim.handler
+import blenderbim.tool as tool
+import blenderbim.core.attribute as core
 from blenderbim.bim.ifc import IfcStore
 from ifcopenshell.api.attribute.data import Data
 
 
+class Operator:
+    def execute(self, context):
+        IfcStore.execute_ifc_operator(self, context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
 class EnableEditingAttributes(bpy.types.Operator):
     bl_idname = "bim.enable_editing_attributes"
     bl_label = "Enable Editing Attributes"
@@ -21,24 +50,10 @@ class EnableEditingAttributes(bpy.types.Operator):
             obj = bpy.data.materials.get(self.obj)
         oprops = obj.BIMObjectProperties
         props = obj.BIMAttributeProperties
-        while len(props.attributes) > 0:
-            props.attributes.remove(0)
-        for attribute in Data.products[oprops.ifc_definition_id]:
-            new = props.attributes.add()
-            if attribute["type"] == "entity" or (attribute["type"] == "list" and attribute["list_type"] == "entity"):
-                continue
-            new.name = attribute["name"]
-            new.is_null = attribute["is_null"]
-            if attribute["type"] == "string" or attribute["type"] == "list":
-                new.string_value = attribute["value"] or ""
-            elif attribute["type"] == "integer":
-                new.int_value = attribute["value"] or 0
-            elif attribute["type"] == "float":
-                new.float_value = attribute["value"] or 0.0
-            elif attribute["type"] == "enum":
-                new.enum_items = json.dumps(attribute["enum_items"])
-                if attribute["value"]:
-                    new.enum_value = attribute["value"]
+        props.attributes.clear()
+        if oprops.ifc_definition_id not in Data.products:
+            Data.load(IfcStore.get_file(), oprops.ifc_definition_id)
+        blenderbim.bim.helper.import_attributes2(tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes)
         props.is_editing_attributes = True
         return {"FINISHED"}
 
@@ -60,16 +75,13 @@ class DisableEditingAttributes(bpy.types.Operator):
         return {"FINISHED"}
 
 
-class EditAttributes(bpy.types.Operator):
+class EditAttributes(bpy.types.Operator, Operator):
     bl_idname = "bim.edit_attributes"
     bl_label = "Edit Attributes"
     bl_options = {"REGISTER", "UNDO"}
     obj: bpy.props.StringProperty()
     obj_type: bpy.props.StringProperty()
 
-    def execute(self, context):
-        return IfcStore.execute_ifc_operator(self, context)
-
     def _execute(self, context):
         self.file = IfcStore.get_file()
         if self.obj_type == "Object":
@@ -101,9 +113,7 @@ class EditAttributes(bpy.types.Operator):
             elif attribute["type"] == "enum":
                 attributes[attribute["name"]] = blender_attribute.enum_value
         product = self.file.by_id(oprops.ifc_definition_id)
-        ifcopenshell.api.run(
-            "attribute.edit_attributes", self.file, **{"product": product, "attributes": attributes}
-        )
+        ifcopenshell.api.run("attribute.edit_attributes", self.file, **{"product": product, "attributes": attributes})
         Data.load(IfcStore.get_file(), oprops.ifc_definition_id)
         bpy.ops.bim.disable_editing_attributes(obj=obj.name, obj_type=self.obj_type)
         return {"FINISHED"}
@@ -124,3 +134,14 @@ class GenerateGlobalId(bpy.types.Operator):
         global_id.data_type = "string"
         global_id.string_value = ifcopenshell.guid.new()
         return {"FINISHED"}
+
+
+class CopyAttributeToSelection(bpy.types.Operator, Operator):
+    bl_idname = "bim.copy_attribute_to_selection"
+    bl_label = "Copy Attribute To Selection"
+    name: bpy.props.StringProperty()
+
+    def _execute(self, context):
+        value = context.active_object.BIMAttributeProperties.attributes.get(self.name).get_value()
+        for obj in context.selected_objects:
+            core.copy_attribute_to_selection(tool.Ifc, name=self.name, value=value, obj=obj)

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.prop import StrProperty, Attribute
@@ -13,6 +31,7 @@ from bpy.props import (
     CollectionProperty,
 )
 
+
 class BIMAttributeProperties(PropertyGroup):
     attributes: CollectionProperty(name="Attributes", type=Attribute)
     is_editing_attributes: BoolProperty(name="Is Editing Attributes")

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

@@ -1,14 +1,31 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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.bim.helper
 from bpy.types import Panel
 from blenderbim.bim.ifc import IfcStore
-from ifcopenshell.api.attribute.data import Data
+from blenderbim.bim.module.attribute.data import AttributesData, MaterialAttributesData
 
 
-def draw_ui(context, layout, obj_type):
+def draw_ui(context, layout, obj_type, attributes):
     obj = context.active_object if obj_type == "Object" else context.active_object.active_material
     oprops = obj.BIMObjectProperties
     props = obj.BIMAttributeProperties
-    if oprops.ifc_definition_id not in Data.products:
-        Data.load(IfcStore.get_file(), oprops.ifc_definition_id)
 
     if props.is_editing_attributes:
         row = layout.row(align=True)
@@ -19,46 +36,17 @@ def draw_ui(context, layout, obj_type):
         op.obj_type = obj_type
         op.obj = obj.name
 
-        for attribute in Data.products[oprops.ifc_definition_id]:
-            if attribute["type"] == "entity":
-                continue
-            row = layout.row(align=True)
-            blender_attribute = props.attributes.get(attribute["name"])
-            if attribute["type"] == "string" or attribute["type"] == "list":
-                row.prop(blender_attribute, "string_value", text=attribute["name"])
-            elif attribute["type"] == "integer":
-                row.prop(blender_attribute, "int_value", text=attribute["name"])
-            elif attribute["type"] == "float":
-                row.prop(blender_attribute, "float_value", text=attribute["name"])
-            elif attribute["type"] == "enum":
-                row.prop(blender_attribute, "enum_value", text=attribute["name"])
-
-            if attribute["name"] == "GlobalId":
-                row.operator("bim.generate_global_id", icon="FILE_REFRESH", text="")
-            if attribute["is_optional"]:
-                row.prop(
-                    blender_attribute,
-                    "is_null",
-                    icon="RADIOBUT_OFF" if blender_attribute.is_null else "RADIOBUT_ON",
-                    text="",
-                )
+        blenderbim.bim.helper.draw_attributes(props.attributes, layout, copy_operator="bim.copy_attribute_to_selection")
     else:
         row = layout.row()
         op = row.operator("bim.enable_editing_attributes", icon="GREASEPENCIL", text="Edit")
         op.obj_type = obj_type
         op.obj = obj.name
 
-        if "GlobalId" not in [a["name"] for a in Data.products[oprops.ifc_definition_id]]:
-            row = layout.row(align=True)
-            row.label(text="STEP ID")
-            row.label(text=str(oprops.ifc_definition_id))
-
-        for attribute in Data.products[oprops.ifc_definition_id]:
-            if attribute["value"] is None or attribute["type"] == "entity":
-                continue
+        for attribute in attributes:
             row = layout.row(align=True)
             row.label(text=attribute["name"])
-            row.label(text=str(attribute["value"]))
+            row.label(text=attribute["value"])
 
     # TODO: reimplement, see #1222
     # if "IfcSite/" in context.active_object.name or "IfcBuilding/" in context.active_object.name:
@@ -71,15 +59,20 @@ class BIM_PT_object_attributes(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):
+        if not context.active_object:
+            return False
         if not IfcStore.get_element(context.active_object.BIMObjectProperties.ifc_definition_id):
             return False
         return bool(context.active_object.BIMObjectProperties.ifc_definition_id)
 
     def draw(self, context):
-        draw_ui(context, self.layout, "Object")
+        if not AttributesData.is_loaded:
+            AttributesData.load()
+        draw_ui(context, self.layout, "Object", AttributesData.data["attributes"])
 
 
 class BIM_PT_material_attributes(Panel):
@@ -91,10 +84,14 @@ class BIM_PT_material_attributes(Panel):
 
     @classmethod
     def poll(cls, context):
+        if not IfcStore.get_file():
+            return False
         try:
             return bool(context.active_object.active_material.BIMObjectProperties.ifc_definition_id)
         except:
             return False
 
     def draw(self, context):
-        draw_ui(context, self.layout, "Material")
+        if not MaterialAttributesData.is_loaded:
+            MaterialAttributesData.load()
+        draw_ui(context, self.layout, "Material", MaterialAttributesData.data["attributes"])

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import bpy
 import json
@@ -49,6 +67,7 @@ class AuginCreateNewModel(bpy.types.Operator):
     def execute(self, context):
         import boto3
         from botocore.config import Config
+
         props = context.scene.AuginProperties
 
         # Create project
@@ -116,7 +135,6 @@ class AuginCreateNewModel(bpy.types.Operator):
         client.upload_file(context.scene.BIMProperties.ifc_file, result["s3_bucket"], result["model_path"])
         client.upload_file(thumb_path, result["s3_bucket"], result["thumb_path"])
 
-
         # Notify done
         url = "https://server.auge.pro.br/API/v3/augin_rest.php/files_uploaded"
         payload = {

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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.props
 import bpy.types
 

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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.types
 
 
@@ -8,6 +26,7 @@ class BIM_PT_augin(bpy.types.Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_integrations"
 
     def draw(self, context):
         layout = self.layout

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 
@@ -20,6 +38,7 @@ classes = (
     operator.AddBcfLabel,
     operator.AddBcfRelatedTopic,
     operator.ViewBcfTopic,
+    operator.RemoveBcfTopic,
     operator.RemoveBcfComment,
     operator.RemoveBcfBimSnippet,
     operator.RemoveBcfReferenceLink,

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

@@ -1,6 +1,25 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 bcf
 import bcf.v2.bcfxml
 
+
 class BcfStore:
     bcfxml = None
 

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import bpy
 import bcf
@@ -7,10 +25,12 @@ import numpy as np
 import ifcopenshell
 import ifcopenshell.util.unit
 from . import bcfstore
+import blenderbim.bim.module.bcf.prop as bcf_prop
 from blenderbim.bim.ifc import IfcStore
 from math import radians, degrees, atan, tan, cos, sin
 from mathutils import Vector, Matrix, Euler, geometry
 
+
 class NewBcfProject(bpy.types.Operator):
     bl_idname = "bim.new_bcf_project"
     bl_label = "New BCF Project"
@@ -56,13 +76,10 @@ class LoadBcfTopics(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         bcfxml.get_topics()
-        while len(context.scene.BCFProperties.topics) > 0:
-            context.scene.BCFProperties.topics.remove(0)
-        index = 0
-        for topic_guid in bcfxml.topics.keys():
+        context.scene.BCFProperties.topics.clear()
+        for index, topic_guid in enumerate(bcfxml.topics.keys()):
             new = context.scene.BCFProperties.topics.add()
-            bpy.ops.bim.load_bcf_topic(topic_guid = topic_guid, topic_index = index)
-            index += 1
+            bpy.ops.bim.load_bcf_topic(topic_guid=topic_guid, topic_index=index)
         return {"FINISHED"}
 
 
@@ -76,6 +93,7 @@ class LoadBcfTopic(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         topic = bcfxml.get_topic(self.topic_guid)
+        bcfxml.get_header(self.topic_guid)
         new = context.scene.BCFProperties.topics[self.topic_index]
         data_map = {
             "name": topic.guid,
@@ -90,50 +108,52 @@ class LoadBcfTopic(bpy.types.Operator):
             "modified_author": topic.modified_author,
             "assigned_to": topic.assigned_to,
             "due_date": topic.due_date,
-            "description": topic.description
+            "description": topic.description,
         }
         for key, value in data_map.items():
             if value is not None:
                 setattr(new, key, str(value))
-        while len(new.reference_links) > 0:
-            new.reference_links.remove(0)
+
+        new.reference_links.clear()
         for reference_link in topic.reference_links:
-            new2 = new.reference_links.add()
-            new2.name = reference_link
-        while len(new.labels) > 0:
-            new.labels.remove(0)
+            new_reference_link = new.reference_links.add()
+            new_reference_link.name = reference_link
+
+        new.labels.clear()
         for label in topic.labels:
-            new2 = new.labels.add()
-            new2.name = label
+            new_label = new.labels.add()
+            new_label.name = label
+
         if topic.bim_snippet:
             data_map = {
                 "type": topic.bim_snippet.snippet_type,
                 "is_external": topic.bim_snippet.is_external,
                 "reference": topic.bim_snippet.reference,
-                "schema": topic.bim_snippet.reference_schema
+                "schema": topic.bim_snippet.reference_schema,
             }
             for key, value in data_map.items():
                 if value is not None:
                     setattr(new.bim_snippet, key, value)
-        while len(new.document_references) > 0:
-            new.document_references.remove(0)
+
+        new.document_references.clear()
         for doc in topic.document_references:
-            new2 = new.document_references.add()
+            new_document_references = new.document_references.add()
             data_map = {
                 "reference": doc.referenced_document,
                 "description": doc.description,
                 "guid": doc.guid,
-                "is_external": doc.is_external
+                "is_external": doc.is_external,
             }
             for key, value in data_map.items():
                 if value is not None:
-                    setattr(new2, key, value)
-        while len(new.related_topics) > 0:
-            new.related_topics.remove(0)
+                    setattr(new_document_references, key, value)
+
+        new.related_topics.clear()
         for related_topic in topic.related_topics:
-            new2 = new.related_topics.add()
-            new2.name = related_topic.guid
-        bpy.ops.bim.load_bcf_comments(topic_guid = topic.guid)
+            new_related_topic = new.related_topics.add()
+            new_related_topic.name = related_topic.guid
+
+        bpy.ops.bim.load_bcf_comments(topic_guid=topic.guid)
         return {"FINISHED"}
 
 
@@ -147,8 +167,7 @@ class LoadBcfComments(bpy.types.Operator):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         bcfxml.get_comments(self.topic_guid)
         blender_topic = context.scene.BCFProperties.topics.get(self.topic_guid)
-        while len(blender_topic.comments) > 0:
-            blender_topic.comments.remove(0)
+        blender_topic.comments.clear()
         for comment in bcfxml.topics[self.topic_guid].comments.values():
             new = blender_topic.comments.add()
             data_map = {
@@ -196,7 +215,7 @@ class EditBcfTopicName(bpy.types.Operator):
 
     def execute(self, context):
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         topic = bcfxml.topics[blender_topic.name]
         topic.title = blender_topic.title
@@ -211,7 +230,7 @@ class EditBcfTopic(bpy.types.Operator):
 
     def execute(self, context):
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
 
         topic = bcfxml.topics[blender_topic.name]
@@ -225,7 +244,7 @@ class EditBcfTopic(bpy.types.Operator):
         topic.topic_type = blender_topic.type or None
 
         bcfxml.edit_topic(topic)
-        props.active_topic_index = props.active_topic_index # Refreshes the BCF Topic
+        props.refresh_topic(context)
         return {"FINISHED"}
 
 
@@ -234,6 +253,7 @@ class SaveBcfProject(bpy.types.Operator):
     bl_label = "Save BCF Project"
     bl_options = {"REGISTER", "UNDO"}
     filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    filter_glob: bpy.props.StringProperty(default="*.bcf;*.bcfzip", options={"HIDDEN"})
 
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
@@ -250,11 +270,13 @@ class AddBcfTopic(bpy.types.Operator):
     bl_label = "Add BCF Topic"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BCFProperties.author
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         bcfxml.add_topic()
-        new = context.scene.BCFProperties.topics.add()
-        new.name = "New Topic"
         bpy.ops.bim.load_bcf_topics()
         return {"FINISHED"}
 
@@ -264,17 +286,29 @@ class AddBcfBimSnippet(bpy.types.Operator):
     bl_label = "Add BCF BIM Snippet"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return all(
+            (
+                getattr(context.scene.BCFProperties, attr, False)
+                for attr in ("bim_snippet_reference", "bim_snippet_schema", "bim_snippet_type")
+            )
+        )
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         bim_snippet = bcf.v2.data.BimSnippet()
-        bim_snippet.reference = blender_topic.bim_snippet_reference
-        bim_snippet.reference_schema = blender_topic.bim_snippet_schema
-        bim_snippet.snippet_type = blender_topic.bim_snippet_type
+        bim_snippet.reference = props.bim_snippet_reference
+        bim_snippet.reference_schema = props.bim_snippet_schema
+        bim_snippet.snippet_type = props.bim_snippet_type
         bcfxml.add_bim_snippet(topic, bim_snippet)
-        bpy.ops.bim.load_bcf_topic(topic_guid = topic.guid, topic_index = props.active_topic_index)
+        bpy.ops.bim.load_bcf_topic(topic_guid=topic.guid, topic_index=props.active_topic_index)
+        bim_snippet.reference = ""
+        bim_snippet.reference_schema = ""
+        bim_snippet.snippet_type = ""
         return {"FINISHED"}
 
 
@@ -283,22 +317,40 @@ class AddBcfRelatedTopic(bpy.types.Operator):
     bl_label = "Add BCF Related Topic"
     bl_options = {"REGISTER", "UNDO"}
 
-    def execute(self, context):
+    @classmethod
+    def poll(cls, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
+        if not props.related_topic:
+            return False
+        if props.related_topic == blender_topic.title:
+            # Prevent adding self as related topic
+            return False
         related_topic = None
         for topic in bcfxml.topics.values():
-            if topic.title == blender_topic.related_topic:
+            if topic.title == props.related_topic:
                 related_topic = bcf.v2.data.RelatedTopic()
                 related_topic.guid = topic.guid
                 break
         if not related_topic:
-            return {"FINISHED"}
+            return False
+        if str(related_topic.guid) in [t.name for t in blender_topic.related_topics]:
+            # Prevent adding the same related topic more than once
+            return False
+        return True
+
+    def execute(self, context):
+        bcfxml = bcfstore.BcfStore.get_bcfxml()
+        props = context.scene.BCFProperties
+        blender_topic = props.active_topic
+        related_topic = bcf.v2.data.RelatedTopic()
+        related_topic.guid = next((t for t in bcfxml.topics.values() if t.title == props.related_topic)).guid
         topic = bcfxml.topics[blender_topic.name]
         topic.related_topics.append(related_topic)
         bcfxml.edit_topic(topic)
-        bpy.ops.bim.load_bcf_topic(topic_guid = topic.guid, topic_index = props.active_topic_index)
+        bpy.ops.bim.load_bcf_topic(topic_guid=topic.guid, topic_index=props.active_topic_index)
+        props.related_topic = ""
         return {"FINISHED"}
 
 
@@ -307,21 +359,25 @@ class AddBcfHeaderFile(bpy.types.Operator):
     bl_label = "Add BCF Header File"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BCFProperties.file_reference
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         header_file = bcf.v2.data.HeaderFile()
-        header_file.reference = blender_topic.file_reference
+        header_file.reference = props.file_reference
         if not os.path.exists(header_file.reference):
             header_file.filename = header_file.reference
-        if len(blender_topic.file_ifc_project) == 22:
-            header_file.ifc_project = blender_topic.file_ifc_project
-        if len(blender_topic.file_ifc_spatial_structure_element) == 22:
-            header_file.ifc_spatial_structure_element = blender_topic.file_ifc_spatial_structure_element
+        if len(props.file_ifc_project) == 22:
+            header_file.ifc_project = props.file_ifc_project
+        if len(props.file_ifc_spatial_structure_element) == 22:
+            header_file.ifc_spatial_structure_element = props.file_ifc_spatial_structure_element
         bcfxml.add_file(topic, header_file)
-        props.active_topic_index = props.active_topic_index # refreshes the BCF Topic
+        props.refresh_topic(context)
         return {"FINISHED"}
 
 
@@ -333,8 +389,9 @@ class ViewBcfTopic(bpy.types.Operator):
 
     def execute(self, context):
         for index, topic in enumerate(context.scene.BCFProperties.topics):
-            if topic.guid.lower() == self.topic_guid.lower():
+            if topic.name.lower() == self.topic_guid.lower():
                 context.scene.BCFProperties.active_topic_index = index
+                break
         return {"FINISHED"}
 
 
@@ -343,46 +400,50 @@ class AddBcfViewpoint(bpy.types.Operator):
     bl_label = "Add BCF Viewpoint"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.camera
+
     def execute(self, context):
-        if not context.scene.camera:
-            return {"FINISHED"}
         bcfxml = bcfstore.BcfStore.get_bcfxml()
+        blender_camera = context.scene.camera
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         viewpoint = bcf.v2.data.Viewpoint()
 
-        if context.scene.camera.data.type == "ORTHO":
+        if blender_camera.data.type == "ORTHO":
             camera = bcf.v2.data.OrthogonalCamera()
-            camera.view_to_world_scale = context.scene.camera.data.ortho_scale
+            camera.view_to_world_scale = blender_camera.data.ortho_scale
             viewpoint.orthogonal_camera = camera
-        elif context.scene.camera.data.type == "PERSP":
+        elif blender_camera.data.type == "PERSP":
             camera = bcf.v2.data.PerspectiveCamera()
-            camera.field_of_view = degrees(context.scene.camera.data.angle)
+            camera.field_of_view = degrees(blender_camera.data.angle)
             viewpoint.perspective_camera = camera
-        camera.camera_view_point.x = context.scene.camera.location.x
-        camera.camera_view_point.y = context.scene.camera.location.y
-        camera.camera_view_point.z = context.scene.camera.location.z
-        direction = context.scene.camera.matrix_world.to_quaternion() @ Vector((0.0, 0.0, -1.0))
+        camera.camera_view_point.x = blender_camera.location.x
+        camera.camera_view_point.y = blender_camera.location.y
+        camera.camera_view_point.z = blender_camera.location.z
+        direction = blender_camera.matrix_world.to_quaternion() @ Vector((0.0, 0.0, -1.0))
         camera.camera_direction.x = direction.x
         camera.camera_direction.y = direction.y
         camera.camera_direction.z = direction.z
-        up = context.scene.camera.matrix_world.to_quaternion() @ Vector((0.0, 1.0, 0.0))
+        up = blender_camera.matrix_world.to_quaternion() @ Vector((0.0, 1.0, 0.0))
         camera.camera_up_vector.x = up.x
         camera.camera_up_vector.y = up.y
         camera.camera_up_vector.z = up.z
 
-        old_file_format = context.scene.render.image_settings.file_format
-        context.scene.render.image_settings.file_format = "PNG"
-        old_filepath = context.scene.render.filepath
-        context.scene.render.filepath = os.path.join(context.scene.BIMProperties.data_dir, "snapshot.png")
+        blender_render = context.scene.render
+        old_file_format = blender_render.image_settings.file_format
+        blender_render.image_settings.file_format = "PNG"
+        old_filepath = blender_render.filepath
+        blender_render.filepath = os.path.join(context.scene.BIMProperties.data_dir, "snapshot.png")
         bpy.ops.render.opengl(write_still=True)
-        viewpoint.snapshot = context.scene.render.filepath
+        viewpoint.snapshot = blender_render.filepath
 
         bcfxml.add_viewpoint(topic, viewpoint)
-        context.scene.render.filepath = old_filepath
-        context.scene.render.image_settings.file_format = old_file_format
-        props.active_topic_index = props.active_topic_index # refreshes the BCF Topic
+        blender_render.filepath = old_filepath
+        blender_render.image_settings.file_format = old_file_format
+        props.refresh_topic(context)
         return {"FINISHED"}
 
 
@@ -391,14 +452,18 @@ class RemoveBcfViewpoint(bpy.types.Operator):
     bl_label = "Remove BCF Viewpoint"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return bcf_prop.getBcfViewpoints(None, context)
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         viewpoint_guid = blender_topic.viewpoints
         topic = bcfxml.topics[blender_topic.name]
         bcfxml.delete_viewpoint(viewpoint_guid, topic)
-        props.active_topic_index = props.active_topic_index # Refreshes the BCF Topic
+        props.refresh_topic(context)
         return {"FINISHED"}
 
 
@@ -411,10 +476,29 @@ class RemoveBcfFile(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         bcfxml.delete_file(topic, self.index)
-        props.active_topic_index = props.active_topic_index # Refreshes the BCF Topic
+        props.refresh_topic(context)
+        return {"FINISHED"}
+
+
+class RemoveBcfTopic(bpy.types.Operator):
+    bl_idname = "bim.remove_bcf_topic"
+    bl_label = "Remove BCF Topic"
+    bl_options = {"REGISTER", "UNDO"}
+    guid: bpy.props.StringProperty()
+
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BCFProperties.topics
+
+    def execute(self, context):
+        bcfxml = bcfstore.BcfStore.get_bcfxml()
+        props = context.scene.BCFProperties
+        topic_to_delete = props.active_topic
+        bcfxml.delete_topic(topic_to_delete.name)
+        bpy.ops.bim.load_bcf_topics()
         return {"FINISHED"}
 
 
@@ -423,17 +507,19 @@ class AddBcfReferenceLink(bpy.types.Operator):
     bl_label = "Add BCF Reference Link"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BCFProperties.reference_link
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
-        if not blender_topic.reference_link:
-            return {"FINISHED"}
-        topic.reference_links.append(blender_topic.reference_link)
+        topic.reference_links.append(props.reference_link)
         bcfxml.edit_topic(topic)
-        bpy.ops.bim.load_bcf_topic(topic_guid = topic.guid, topic_index = props.active_topic_index)
-        blender_topic.reference_link = ""
+        bpy.ops.bim.load_bcf_topic(topic_guid=topic.guid, topic_index=props.active_topic_index)
+        props.reference_link = ""
         return {"FINISHED"}
 
 
@@ -442,20 +528,22 @@ class AddBcfDocumentReference(bpy.types.Operator):
     bl_label = "Add BCF Document Reference"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BCFProperties.document_reference
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
-        if not blender_topic.document_reference:
-            return {"FINISHED"}
         document_reference = bcf.v2.data.DocumentReference()
-        document_reference.referenced_document = blender_topic.document_reference
-        document_reference.description = blender_topic.document_reference_description or None
+        document_reference.referenced_document = props.document_reference
+        document_reference.description = props.document_reference_description or None
         bcfxml.add_document_reference(topic, document_reference)
-        bpy.ops.bim.load_bcf_topic(topic_guid = topic.guid, topic_index = props.active_topic_index)
-        blender_topic.document_reference = ""
-        blender_topic.document_reference_description = ""
+        bpy.ops.bim.load_bcf_topic(topic_guid=topic.guid, topic_index=props.active_topic_index)
+        props.document_reference = ""
+        props.document_reference_description = ""
         return {"FINISHED"}
 
 
@@ -464,18 +552,20 @@ class AddBcfLabel(bpy.types.Operator):
     bl_label = "Add BCF Label"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BCFProperties.label
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
-        if not blender_topic.label:
-            return {"FINISHED"}
         new = blender_topic.labels.add()
-        new.name = blender_topic.label
-        topic.labels.append(blender_topic.label)
+        new.name = props.label
+        topic.labels.append(props.label)
         bcfxml.edit_topic(topic)
-        blender_topic.label = ""
+        props.label = ""
         return {"FINISHED"}
 
 
@@ -487,7 +577,7 @@ class EditBcfReferenceLinks(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         for index, reference_link in enumerate(topic.reference_links):
             if reference_link == blender_topic.reference_links[index].name:
@@ -505,9 +595,11 @@ class EditBcfLabels(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         for index, label in enumerate(blender_topic.labels):
+            if index >= len(topic.labels):
+                break
             if label.name == topic.labels[index]:
                 continue
             topic.labels[index] = blender_topic.labels[index].name
@@ -524,7 +616,7 @@ class RemoveBcfReferenceLink(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         del topic.reference_links[self.index]
         bcfxml.edit_topic(topic)
@@ -541,7 +633,7 @@ class RemoveBcfLabel(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         del topic.labels[self.index]
         bcfxml.edit_topic(topic)
@@ -557,7 +649,7 @@ class RemoveBcfBimSnippet(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         bcfxml.delete_bim_snippet(topic)
         blender_topic.bim_snippet.schema = ""
@@ -575,10 +667,10 @@ class RemoveBcfDocumentReference(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         bcfxml.delete_document_reference(topic, self.index)
-        bpy.ops.bim.load_bcf_topic(topic_guid = topic.guid, topic_index = props.active_topic_index)
+        bpy.ops.bim.load_bcf_topic(topic_guid=topic.guid, topic_index=props.active_topic_index)
         return {"FINISHED"}
 
 
@@ -591,11 +683,11 @@ class RemoveBcfRelatedTopic(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         del topic.related_topics[self.index]
         bcfxml.edit_topic(topic)
-        bpy.ops.bim.load_bcf_topic(topic_guid = topic.guid, topic_index = props.active_topic_index)
+        bpy.ops.bim.load_bcf_topic(topic_guid=topic.guid, topic_index=props.active_topic_index)
         return {"FINISHED"}
 
 
@@ -608,10 +700,10 @@ class RemoveBcfComment(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
         bcfxml.delete_comment(self.comment_guid, topic)
-        bpy.ops.bim.load_bcf_comments(topic_guid = topic.guid)
+        bpy.ops.bim.load_bcf_comments(topic_guid=topic.guid)
         return {"FINISHED"}
 
 
@@ -624,13 +716,13 @@ class EditBcfComment(bpy.types.Operator):
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         blender_comment = blender_topic.comments.get(self.comment_guid)
         topic = bcfxml.topics[blender_topic.name]
         comment = topic.comments[self.comment_guid]
         comment.comment = blender_comment.comment
         bcfxml.edit_comment(comment, topic)
-        bpy.ops.bim.load_bcf_comments(topic_guid = topic.guid)
+        bpy.ops.bim.load_bcf_comments(topic_guid=topic.guid)
         return {"FINISHED"}
 
 
@@ -640,20 +732,29 @@ class AddBcfComment(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
     comment_guid: bpy.props.StringProperty()
 
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.BCFProperties
+        if not props.comment:
+            return False
+        if props.has_related_viewpoint and not bcf_prop.getBcfViewpoints(None, context):
+            return False
+        return True
+
     def execute(self, context):
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
-        if not blender_topic.comment:
-            return {"FINISHED"}
         comment = bcf.v2.data.Comment()
-        comment.comment = blender_topic.comment
-        if blender_topic.has_related_viewpoint and blender_topic.viewpoints:
+        comment.comment = props.comment
+        if props.has_related_viewpoint:
             comment.viewpoint = bcf.v2.data.Viewpoint()
             comment.viewpoint.guid = blender_topic.viewpoints
         bcfxml.add_comment(topic, comment)
-        bpy.ops.bim.load_bcf_comments(topic_guid = topic.guid)
+        bpy.ops.bim.load_bcf_comments(topic_guid=topic.guid)
+        props.comment = ""
+        props.has_related_viewpoint = False
         return {"FINISHED"}
 
 
@@ -662,14 +763,20 @@ class ActivateBcfViewpoint(bpy.types.Operator):
     bl_label = "Activate BCF Viewpoint"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        bcfxml = bcfstore.BcfStore.get_bcfxml()
+        props = context.scene.BCFProperties
+        blender_topic = props.active_topic
+        topic = bcfxml.topics[blender_topic.name]
+        return topic.viewpoints
+
     def execute(self, context):
         self.file = IfcStore.get_file()
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         props = context.scene.BCFProperties
-        blender_topic = props.topics[props.active_topic_index]
+        blender_topic = props.active_topic
         topic = bcfxml.topics[blender_topic.name]
-        if not topic.viewpoints:
-            return {"FINISHED"}
 
         viewpoint_guid = blender_topic.viewpoints
         viewpoint = topic.viewpoints[viewpoint_guid]
@@ -685,12 +792,9 @@ class ActivateBcfViewpoint(bpy.types.Operator):
 
         if viewpoint.snapshot:
             obj.data.show_background_images = True
-            while len(obj.data.background_images) > 0:
-                obj.data.background_images.remove(obj.data.background_images[0])
+            obj.data.background_images.clear()
             background = obj.data.background_images.new()
-            background.image = bpy.data.images.load(
-                os.path.join(bcfxml.filepath, topic.guid, viewpoint.snapshot)
-            )
+            background.image = bpy.data.images.load(os.path.join(bcfxml.filepath, topic.guid, viewpoint.snapshot))
             src_width = background.image.size[0]
             src_height = background.image.size[1]
             src_aspect = src_width / src_height
@@ -704,7 +808,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         area.spaces[0].region_3d.view_perspective = "CAMERA"
 
         if self.file:
-            self.set_viewpoint_components(viewpoint)
+            self.set_viewpoint_components(viewpoint, context)
 
         gp = bpy.data.grease_pencils.get("BCF")
         if gp:
@@ -720,10 +824,10 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         if viewpoint.bitmaps:
             self.create_bitmaps(bcfxml, viewpoint, topic)
 
-        self.setup_camera(viewpoint, obj, cam_aspect)
+        self.setup_camera(viewpoint, obj, cam_aspect, context)
         return {"FINISHED"}
 
-    def setup_camera(self, viewpoint, obj, cam_aspect):
+    def setup_camera(self, viewpoint, obj, cam_aspect, context):
         if viewpoint.orthogonal_camera:
             camera = viewpoint.orthogonal_camera
             obj.data.type = "ORTHO"
@@ -735,20 +839,28 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                 obj.data.angle = radians(camera.field_of_view)
             else:
                 # https://blender.stackexchange.com/questions/23431/how-to-set-camera-horizontal-and-vertical-fov
-                obj.data.angle = 2 * atan((0.5 * cam_height) / (0.5 * cam_width / tan(radians(camera.field_of_view) / 2)))
+                obj.data.angle = 2 * atan(
+                    (0.5 * cam_height) / (0.5 * cam_width / tan(radians(camera.field_of_view) / 2))
+                )
+        else:
+            return
 
-        z_axis = Vector((-camera.camera_direction.x, -camera.camera_direction.y, -camera.camera_direction.z)).normalized()
+        z_axis = Vector(
+            (-camera.camera_direction.x, -camera.camera_direction.y, -camera.camera_direction.z)
+        ).normalized()
         y_axis = Vector((camera.camera_up_vector.x, camera.camera_up_vector.y, camera.camera_up_vector.z)).normalized()
         x_axis = y_axis.cross(z_axis).normalized()
         rotation = Matrix((x_axis, y_axis, z_axis))
         rotation.invert()
-        matrix = np.matrix((
-            [x_axis[0], y_axis[0], z_axis[0], camera.camera_view_point.x],
-            [x_axis[1], y_axis[1], z_axis[1], camera.camera_view_point.y],
-            [x_axis[2], y_axis[2], z_axis[2], camera.camera_view_point.z],
-            [0, 0, 0, 1],
-        ))
-        props = bpy.context.scene.BIMGeoreferenceProperties
+        matrix = np.matrix(
+            (
+                [x_axis[0], y_axis[0], z_axis[0], camera.camera_view_point.x],
+                [x_axis[1], y_axis[1], z_axis[1], camera.camera_view_point.y],
+                [x_axis[2], y_axis[2], z_axis[2], camera.camera_view_point.z],
+                [0, 0, 0, 1],
+            )
+        )
+        props = context.scene.BIMGeoreferenceProperties
         if props.has_blender_offset:
             unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
             matrix = ifcopenshell.util.geolocation.global2local(
@@ -761,7 +873,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
             )
         obj.matrix_world = Matrix(matrix.tolist())
 
-    def set_viewpoint_components(self, viewpoint):
+    def set_viewpoint_components(self, viewpoint, context):
         if not viewpoint.components:
             return
 
@@ -771,10 +883,10 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         exception_global_ids = [v.ifc_guid for v in viewpoint.components.visibility.exceptions]
 
         if viewpoint.components.visibility.default_visibility:
-            old = bpy.context.area.type
-            bpy.context.area.type = "VIEW_3D"
+            old = context.area.type
+            context.area.type = "VIEW_3D"
             bpy.ops.object.hide_view_clear()
-            bpy.context.area.type = old
+            context.area.type = old
             for global_id in exception_global_ids:
                 obj = IfcStore.get_element(global_id)
                 if obj:
@@ -786,35 +898,35 @@ class ActivateBcfViewpoint(bpy.types.Operator):
                 if obj:
                     objs.append(obj)
             if objs:
-                old = bpy.context.area.type
-                bpy.context.area.type = "VIEW_3D"
+                old = context.area.type
+                context.area.type = "VIEW_3D"
                 context_override = {}
                 context_override["object"] = context_override["active_object"] = objs[0]
                 context_override["selected_objects"] = context_override["selected_editable_objects"] = objs
                 bpy.ops.object.hide_view_set(context_override, unselected=True)
-                bpy.context.area.type = old
+                context.area.type = old
 
         if viewpoint.components.view_setup_hints:
             if not viewpoint.components.view_setup_hints.spaces_visible:
-                self.hide_spaces()
+                self.hide_spaces(context)
             if viewpoint.components.view_setup_hints.openings_visible is not None:
-                self.set_openings_visibility(viewpoint.components.view_setup_hints.openings_visible)
+                self.set_openings_visibility(viewpoint.components.view_setup_hints.openings_visible, context)
         else:
-            self.hide_spaces()
-            self.set_openings_visibility(False)
+            self.hide_spaces(context)
+            self.set_openings_visibility(False, context)
 
         self.set_selection(viewpoint)
         self.set_colours(viewpoint)
 
-    def hide_spaces(self):
-        old = bpy.context.area.type
-        bpy.context.area.type = "VIEW_3D"
+    def hide_spaces(self, context):
+        old = context.area.type
+        context.area.type = "VIEW_3D"
         bpy.ops.object.select_pattern(pattern="IfcSpace/*")
         bpy.ops.object.hide_view_set({})
-        bpy.context.area.type = old
+        context.area.type = old
 
-    def set_openings_visibility(self, is_visible):
-        for collection in self.get_opening_collections():
+    def set_openings_visibility(self, is_visible, context):
+        for collection in self.get_opening_collections(context):
             collection.hide_viewport = not is_visible
 
     def set_selection(self, viewpoint):
@@ -835,9 +947,9 @@ class ActivateBcfViewpoint(bpy.types.Operator):
             if obj:
                 obj.color = self.hex_to_rgb(color)
 
-    def get_opening_collections(self):
+    def get_opening_collections(self, context):
         collections = []
-        for collection in bpy.context.view_layer.layer_collection.children:
+        for collection in context.view_layer.layer_collection.children:
             opening_collection = collection.children.get("IfcOpeningElements")
             if opening_collection:
                 collections.append(opening_collection)
@@ -857,7 +969,9 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         stroke.points.add(len(viewpoint.lines) * 2)
         coords = []
         for l in viewpoint.lines:
-            coords.extend([l.start_point.x, l.start_point.y, l.start_point.z, l.end_point.x, l.end_point.y, l.end_point.z])
+            coords.extend(
+                [l.start_point.x, l.start_point.y, l.start_point.z, l.end_point.x, l.end_point.y, l.end_point.z]
+            )
         stroke.points.foreach_set("co", coords)
 
     def create_clipping_planes(self, viewpoint):
@@ -921,6 +1035,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
         t = tuple(int(value[i : i + lv // 3], 16) for i in range(0, lv, lv // 3))
         return [t[0] / 255.0, t[1] / 255.0, t[2] / 255.0, 1]
 
+
 class OpenBcfReferenceLink(bpy.types.Operator):
     bl_idname = "bim.open_bcf_reference_link"
     bl_label = "Open BCF Reference Link"
@@ -939,9 +1054,7 @@ class SelectBcfHeaderFile(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            props = context.scene.BCFProperties
-            topic = props.topics[props.active_topic_index]
-            topic.file_reference = self.filepath
+            context.scene.BCFProperties.file_reference = self.filepath
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -957,9 +1070,7 @@ class SelectBcfBimSnippetReference(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            props = context.scene.BCFProperties
-            topic = props.topics[props.active_topic_index]
-            topic.bim_snippet_reference = self.filepath
+            context.scene.BCFProperties.bim_snippet_reference = self.filepath
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -975,9 +1086,7 @@ class SelectBcfDocumentReference(bpy.types.Operator):
 
     def execute(self, context):
         if self.filepath:
-            props = context.scene.BCFProperties
-            topic = props.topics[props.active_topic_index]
-            topic.document_reference = self.filepath
+            context.scene.BCFProperties.document_reference = self.filepath
         return {"FINISHED"}
 
     def invoke(self, context, event):

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 bcfstore
 from blenderbim.bim.prop import StrProperty
@@ -33,12 +51,12 @@ def updateBcfLabel(self, context):
 
 
 def updateBcfProjectName(self, context):
-    if context.scene.BCFProperties.is_loaded:
+    if self.is_loaded:
         bpy.ops.bim.edit_bcf_project_name()
 
 
 def updateBcfAuthor(self, context):
-    if context.scene.BCFProperties.is_loaded:
+    if self.is_loaded:
         bpy.ops.bim.edit_bcf_author()
 
 
@@ -54,18 +72,12 @@ def updateBcfTopicIsEditable(self, context):
 
 def updateBcfCommentIsEditable(self, context):
     if context.scene.BCFProperties.is_loaded and not self.is_editable:
-        bpy.ops.bim.edit_bcf_comment(comment_guid = self.name)
+        bpy.ops.bim.edit_bcf_comment(comment_guid=self.name)
 
 
 def refreshBcfTopic(self, context):
-    global bcfviewpoints_enum
-    bcfviewpoints_enum = None
-
-    props = context.scene.BCFProperties
-    bcfxml = bcfstore.BcfStore.get_bcfxml()
-    topic = props.topics[props.active_topic_index]
-    header = bcfxml.get_header(topic.name)
-    getBcfViewpoints(self, context)
+    self.clear_input_fields()
+    getBcfViewpoints(None, context, force_update=True)
 
 
 class BcfReferenceLink(PropertyGroup):
@@ -76,13 +88,13 @@ class BcfLabel(PropertyGroup):
     name: StringProperty(name="Name", update=updateBcfLabel)
 
 
-def getBcfViewpoints(self, context):
+def getBcfViewpoints(self, context, force_update=False):
     global bcfviewpoints_enum
-    if bcfviewpoints_enum is None:
+    if bcfviewpoints_enum is None or force_update:  # Retrieving Viewpoints is slow. Make sure we only do when needed
         bcfviewpoints_enum = []
         props = context.scene.BCFProperties
         bcfxml = bcfstore.BcfStore.get_bcfxml()
-        topic = props.topics[props.active_topic_index]
+        topic = props.active_topic
         viewpoints = bcfxml.get_viewpoints(topic.name)
         bcfviewpoints_enum.extend([(v, f"Viewpoint {i+1}", "") for i, v in enumerate(viewpoints.keys())])
     return bcfviewpoints_enum
@@ -127,28 +139,15 @@ class BcfTopic(PropertyGroup):
     assigned_to: StringProperty(default="", name="Assigned To")
     due_date: StringProperty(default="", name="Due Date")
     description: StringProperty(default="", name="Description")
-    viewpoints: EnumProperty(items=getBcfViewpoints, name="BCF Viewpoints")
+    viewpoints: EnumProperty(items=lambda _, context: getBcfViewpoints(_, context), name="BCF Viewpoints")
     files: CollectionProperty(name="Files", type=StrProperty)
-    file_reference: StringProperty(default="", name="Reference")
-    file_ifc_project: StringProperty(default="", name="IFC Project")
-    file_ifc_spatial_structure_element: StringProperty(default="", name="IFC Spatial Structure Element")
     reference_links: CollectionProperty(name="Reference Links", type=BcfReferenceLink)
-    reference_link: StringProperty(default="", name="Reference Link")
     labels: CollectionProperty(name="Labels", type=BcfLabel)
-    label: StringProperty(default="", name="Label")
     bim_snippet: PointerProperty(type=BcfBimSnippet)
-    bim_snippet_type: StringProperty(default="", name="Type")
-    bim_snippet_reference: StringProperty(default="", name="Reference")
-    bim_snippet_schema: StringProperty(default="", name="Schema")
     document_references: CollectionProperty(name="Document References", type=BcfDocumentReference)
-    document_reference: StringProperty(default="", name="Referenced Document")
-    document_reference_description: StringProperty(default="", name="Description")
     related_topics: CollectionProperty(name="Related Topics", type=StrProperty)
-    related_topic: StringProperty(default="", name="Related Topic")
     comments: CollectionProperty(name="Comments", type=BcfComment)
     is_editable: BoolProperty(name="Is Editable", default=False, update=updateBcfTopicIsEditable)
-    comment: StringProperty(default="", name="Comment")
-    has_related_viewpoint: BoolProperty(name="Has Related Viewpoint", default=False)
 
 
 class BCFProperties(PropertyGroup):
@@ -158,3 +157,44 @@ class BCFProperties(PropertyGroup):
     author: StringProperty(default="john@doe.com", name="Author Email", update=updateBcfAuthor)
     topics: CollectionProperty(name="BCF Topics", type=BcfTopic)
     active_topic_index: IntProperty(name="Active BCF Topic Index", update=refreshBcfTopic)
+    file_reference: StringProperty(default="", name="Reference")
+    file_ifc_project: StringProperty(default="", name="IFC Project")
+    file_ifc_spatial_structure_element: StringProperty(default="", name="IFC Spatial Structure Element")
+    reference_link: StringProperty(default="", name="Reference Link")
+    label: StringProperty(default="", name="Label")
+    bim_snippet_reference: StringProperty(default="", name="Reference")
+    bim_snippet_type: StringProperty(default="", name="Type")
+    bim_snippet_schema: StringProperty(default="", name="Schema")
+    document_reference: StringProperty(default="", name="Referenced Document")
+    document_reference_description: StringProperty(default="", name="Description")
+    related_topic: StringProperty(name="Related Topic")
+    comment: StringProperty(default="", name="Comment")
+    has_related_viewpoint: BoolProperty(name="Has Related Viewpoint", default=False)
+
+    def clear_input_fields(self):
+        self.file_reference = ""
+        self.file_ifc_project = ""
+        self.file_ifc_spatial_structure_element = ""
+        self.reference_link = ""
+        self.label = ""
+        self.bim_snippet_reference = ""
+        self.bim_snippet_type = ""
+        self.bim_snippet_schema = ""
+        self.document_reference = ""
+        self.document_reference_description = ""
+        self.related_topic = ""
+        self.comment = ""
+        self.has_related_viewpoint = False
+
+    @property
+    def active_topic(self):
+        if len(self.topics) == 0:
+            return None
+        if self.active_topic_index < 0:
+            self.active_topic_index = 0
+        if self.active_topic_index >= len(self.topics):
+            self.active_topic_index = len(self.topics) - 1
+        return self.topics[self.active_topic_index]
+
+    def refresh_topic(self, context):
+        refreshBcfTopic(self, context)

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

@@ -1,8 +1,27 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import bpy
 from . import bcfstore
 from bpy.types import Panel
 
+
 class BIM_PT_bcf(Panel):
     bl_label = "BCF Project"
     bl_idname = "BIM_PT_bcf"
@@ -10,6 +29,7 @@ class BIM_PT_bcf(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_collaboration"
 
     def draw(self, context):
         layout = self.layout
@@ -39,12 +59,13 @@ class BIM_PT_bcf(Panel):
         row.template_list("BIM_UL_topics", "", props, "topics", props, "active_topic_index")
         col = row.column(align=True)
         col.operator("bim.add_bcf_topic", icon="ADD", text="")
+        col.operator("bim.remove_bcf_topic", icon="REMOVE", text="")
         if props.active_topic_index < len(props.topics):
-            topic = props.topics[props.active_topic_index]
+            topic = props.active_topic
             col.prop(topic, "is_editable", icon="CHECKMARK" if topic.is_editable else "GREASEPENCIL", icon_only=True)
 
         if props.active_topic_index < len(props.topics):
-            topic = props.topics[props.active_topic_index]
+            topic = props.active_topic
             row = layout.row()
             row.enabled = topic.is_editable
             row.prop(topic, "description", text="")
@@ -99,7 +120,7 @@ class BIM_PT_bcf_metadata(Panel):
             layout.label(text="No BCF project is loaded")
             return
 
-        topic = props.topics[props.active_topic_index]
+        topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
         bcf_topic = bcfxml.topics[topic.name]
 
@@ -132,12 +153,12 @@ class BIM_PT_bcf_metadata(Panel):
                     row.label(text=f.ifc_spatial_structure_element)
 
         row = layout.row(align=True)
-        row.prop(topic, "file_reference")
+        row.prop(props, "file_reference")
         row.operator("bim.select_bcf_header_file", icon="FILE_FOLDER", text="")
         row = layout.row()
-        row.prop(topic, "file_ifc_project")
+        row.prop(props, "file_ifc_project")
         row = layout.row()
-        row.prop(topic, "file_ifc_spatial_structure_element")
+        row.prop(props, "file_ifc_spatial_structure_element")
 
         row = layout.row()
         row.operator("bim.add_bcf_header_file")
@@ -149,7 +170,7 @@ class BIM_PT_bcf_metadata(Panel):
             row.operator("bim.open_uri", icon="URL", text="").uri = link.name
             row.operator("bim.remove_bcf_reference_link", icon="X", text="").index = index
         row = layout.row()
-        row.prop(topic, "reference_link")
+        row.prop(props, "reference_link")
         row = layout.row()
         row.operator("bim.add_bcf_reference_link")
 
@@ -159,7 +180,7 @@ class BIM_PT_bcf_metadata(Panel):
             row.prop(label, "name", text="")
             row.operator("bim.remove_bcf_label", icon="X", text="").index = index
         row = layout.row()
-        row.prop(topic, "label")
+        row.prop(props, "label")
         row = layout.row()
         row.operator("bim.add_bcf_label")
 
@@ -180,12 +201,12 @@ class BIM_PT_bcf_metadata(Panel):
             row.operator("bim.remove_bcf_bim_snippet", icon="X", text="")
         else:
             row = layout.row(align=True)
-            row.prop(topic, "bim_snippet_reference")
+            row.prop(props, "bim_snippet_reference")
             row.operator("bim.select_bcf_bim_snippet_reference", icon="FILE_FOLDER", text="")
             row = layout.row()
-            row.prop(topic, "bim_snippet_type")
+            row.prop(props, "bim_snippet_type")
             row = layout.row()
-            row.prop(topic, "bim_snippet_schema")
+            row.prop(props, "bim_snippet_schema")
             row = layout.row()
             row.operator("bim.add_bcf_bim_snippet")
 
@@ -203,20 +224,26 @@ class BIM_PT_bcf_metadata(Panel):
             row = box.row(align=True)
             row.prop(doc, "description")
         row = layout.row(align=True)
-        row.prop(topic, "document_reference")
+        row.prop(props, "document_reference")
         row.operator("bim.select_bcf_document_reference", icon="FILE_FOLDER", text="")
         row = layout.row()
-        row.prop(topic, "document_reference_description")
+        row.prop(props, "document_reference_description")
         row = layout.row()
         row.operator("bim.add_bcf_document_reference")
 
         layout.label(text="Related Topics:")
         for index, related_topic in enumerate(topic.related_topics):
-            row = layout.row(align=True)
-            row.operator("bim.view_bcf_topic", text=bcfxml.topics[related_topic.name.lower()].title).topic_guid = related_topic.name
-            row.operator("bim.remove_bcf_related_topic", icon="X", text="").index = index
+            try:
+                row = layout.row(align=True)
+                op = row.operator(
+                    "bim.view_bcf_topic", text=f"Select {bcfxml.topics[related_topic.name.lower()].title}"
+                )
+                op.topic_guid = related_topic.name
+                row.operator("bim.remove_bcf_related_topic", icon="X", text="").index = index
+            except KeyError:
+                pass
         row = layout.row()
-        row.prop(topic, "related_topic")
+        row.prop(props, "related_topic")
         row = layout.row()
         row.operator("bim.add_bcf_related_topic")
 
@@ -245,7 +272,7 @@ class BIM_PT_bcf_comments(Panel):
         row = layout.row()
         row.prop(props, "comment_text_width")
 
-        topic = props.topics[props.active_topic_index]
+        topic = props.active_topic
         for comment in topic.comments:
             box = self.layout.box()
 
@@ -276,8 +303,8 @@ class BIM_PT_bcf_comments(Panel):
                     col.label(text=" ".join(line_words))
 
         row = layout.row()
-        row.prop(topic, "comment")
+        row.prop(props, "comment")
         row = layout.row()
-        row.prop(topic, "has_related_viewpoint")
+        row.prop(props, "has_related_viewpoint")
         row = layout.row()
         row.operator("bim.add_bcf_comment")

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 

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

@@ -1,8 +1,25 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import bpy
 import tempfile
 import webbrowser
-import ifcopenshell
 
 try:
     import bimtester
@@ -12,7 +29,6 @@ except:
     print("Failed to load BIMTester. Try disabling other add-ons, in particular Blender-OSM. See bug #1318.")
 
 from pathlib import Path
-from itertools import cycle
 from blenderbim.bim.ifc import IfcStore
 
 
@@ -20,6 +36,11 @@ class ExecuteBIMTester(bpy.types.Operator):
     bl_idname = "bim.execute_bim_tester"
     bl_label = "Execute BIMTester"
 
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.BimTesterProperties
+        return (props.ifc_file or props.should_load_from_memory) and props.feature
+
     def execute(self, context):
         props = context.scene.BimTesterProperties
 
@@ -51,10 +72,6 @@ class BIMTesterPurge(bpy.types.Operator):
     bl_label = "Purge Tests"
 
     def execute(self, context):
-        filename = os.path.join(
-            context.scene.BimTesterProperties.features_dir,
-            context.scene.BimTesterProperties.features_file + ".feature",
-        )
         cwd = os.getcwd()
         os.chdir(context.scene.BimTesterProperties.features_dir)
         bimtester.clean.TestPurger().purge()
@@ -219,19 +236,3 @@ class QAHelper:
                         is_in_scenario = False
                     destination.write(source_line)
         os.remove(filename + "~")
-
-
-colour_list = [
-    (0.651, 0.81, 0.892, 1),
-    (0.121, 0.471, 0.706, 1),
-    (0.699, 0.876, 0.54, 1),
-    (0.199, 0.629, 0.174, 1),
-    (0.983, 0.605, 0.602, 1),
-    (0.89, 0.101, 0.112, 1),
-    (0.989, 0.751, 0.427, 1),
-    (0.986, 0.497, 0.1, 1),
-    (0.792, 0.699, 0.839, 1),
-    (0.414, 0.239, 0.603, 1),
-    (0.993, 0.999, 0.6, 1),
-    (0.693, 0.349, 0.157, 1),
-]

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 from pathlib import Path
 from blenderbim.bim.prop import StrProperty

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.
+
 from bpy.types import Panel
 from blenderbim.bim.ifc import IfcStore
 
@@ -9,6 +27,7 @@ class BIM_PT_qa(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_quality_control"
 
     def draw(self, context):
         self.layout.use_property_split = True

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

@@ -1,14 +1,44 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
+from . import ui, operator, prop
 
 classes = (
-    ui.BIM_PT_boundary,
+    operator.LoadProjectSpaceBoundaries,
+    operator.LoadSpaceBoundaries,
+    operator.LoadBoundary,
+    operator.SelectProjectBoundaries,
+    operator.ColourByRelatedBuildingElement,
+    operator.EnableEditingBoundary,
+    operator.DisableEditingBoundary,
+    operator.EditBoundaryAttributes,
+    operator.UpdateBoundaryGeometry,
+    ui.BIM_PT_Boundary,
+    ui.BIM_PT_SpaceBoundaries,
+    ui.BIM_PT_SceneBoundaries,
+    prop.BIMBoundaryProperties,
 )
 
 
 def register():
-    pass
+    bpy.types.Object.bim_boundary_properties = bpy.props.PointerProperty(type=prop.BIMBoundaryProperties)
 
 
 def unregister():
-    pass
+    del bpy.types.Object.bim_boundary_properties

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

@@ -0,0 +1,283 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021, 2022 Cyril Waechter <cyril@biminsight.ch>
+#
+# 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 logging
+import ifcopenshell.api
+import blenderbim.tool as tool
+from blenderbim.bim.ifc import IfcStore
+from ifcopenshell.api.boundary.data import Data
+import blenderbim.bim.import_ifc as import_ifc
+
+
+def get_boundaries_collection(blender_space):
+    space_collection = bpy.data.collections.get(blender_space.name)
+    collection_name = f"Boundaries/{blender_space.BIMObjectProperties.ifc_definition_id}"
+    boundaries_collection = space_collection.children.get(collection_name)
+    if not boundaries_collection:
+        boundaries_collection = bpy.data.collections.new(collection_name)
+        space_collection.children.link(boundaries_collection)
+    return boundaries_collection
+
+
+class Loader:
+    def __init__(self):
+        self.ifc_file = None
+        self.logger = None
+        self.ifc_importer = None
+        self.settings = None
+        self.load_settings()
+        self.load_importer()
+
+    def load_settings(self):
+        self.settings = ifcopenshell.geom.settings()
+        self.settings.set(self.settings.EXCLUDE_SOLIDS_AND_SURFACES, False)
+        self.settings.set(self.settings.USE_BREP_DATA, False)
+
+    def load_importer(self):
+        self.ifc_file = tool.Ifc.get()
+        self.logger = logging.getLogger("ImportIFC")
+        ifc_import_settings = import_ifc.IfcImportSettings.factory(bpy.context, IfcStore.path, self.logger)
+        self.ifc_importer = import_ifc.IfcImporter(ifc_import_settings)
+        self.ifc_importer.file = self.ifc_file
+
+    def load_boundary(self, boundary_id, blender_space):
+        boundary = self.ifc_file.by_id(boundary_id)
+        obj = tool.Ifc.get_object(boundary)
+        if obj:
+            return obj
+        surface = boundary.ConnectionGeometry.SurfaceOnRelatingElement
+        # workaround for unvalid geometry provided by Revit. See https://github.com/IfcOpenShell/IfcOpenShell/issues/635#issuecomment-770366838
+        if surface.is_a("IfcCurveBoundedPlane") and not getattr(surface, "InnerBoundaries", None):
+            surface.InnerBoundaries = ()
+        shape = ifcopenshell.geom.create_shape(self.settings, surface)
+        mesh = self.ifc_importer.create_mesh(None, shape)
+        self.ifc_importer.link_mesh(shape, mesh)
+        obj = bpy.data.objects.new(f"{boundary.is_a()}/{boundary.Name}", mesh)
+        obj.matrix_world = blender_space.matrix_world
+        boundaries_collection = get_boundaries_collection(blender_space)
+        boundaries_collection.objects.link(obj)
+        tool.Ifc.link(boundary, obj)
+        return obj
+
+
+class LoadProjectSpaceBoundaries(bpy.types.Operator):
+    bl_idname = "bim.load_project_space_boundaries"
+    bl_label = "Load all project space boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        loader = Loader()
+        if not Data.is_loaded:
+            Data.load(tool.Ifc.get())
+        for space_id, boundaries_id in Data.spaces.items():
+            blender_space = tool.Ifc.get_object(tool.Ifc.get().by_id(space_id))
+            for boundary_id in boundaries_id:
+                loader.load_boundary(boundary_id, blender_space)
+        return {"FINISHED"}
+
+
+class LoadBoundary(bpy.types.Operator):
+    bl_idname = "bim.load_boundary"
+    bl_label = "Load boundary"
+    bl_options = {"REGISTER", "UNDO"}
+    boundary_id: bpy.props.IntProperty()
+
+    def execute(self, context):
+        loader = Loader()
+        blender_space = context.active_object
+        for obj in context.visible_objects:
+            obj.select_set(False)
+        obj = loader.load_boundary(self.boundary_id, blender_space)
+        obj.select_set(True)
+        bpy.context.view_layer.objects.active = obj
+        return {"FINISHED"}
+
+
+class LoadSpaceBoundaries(bpy.types.Operator):
+    bl_idname = "bim.load_space_boundaries"
+    bl_label = "Load selected space boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        blender_space = context.active_object
+        oprops = context.active_object.BIMObjectProperties
+        loader = Loader()
+        if not Data.is_loaded:
+            Data.load(tool.Ifc.get())
+        for boundary_id in Data.spaces.get(oprops.ifc_definition_id, []):
+            loader.load_boundary(boundary_id, blender_space)
+        return {"FINISHED"}
+
+
+class SelectProjectBoundaries(bpy.types.Operator):
+    bl_idname = "bim.select_project_space_boundaries"
+    bl_label = "Select all project space boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        for obj in context.visible_objects:
+            obj.select_set(False)
+        ifc_file = tool.Ifc.get()
+        for boundary_id in Data.boundaries:
+            boundary = ifc_file.by_id(boundary_id)
+            obj = tool.Ifc.get_object(boundary)
+            if obj:
+                obj.select_set(True)
+        return {"FINISHED"}
+
+
+def get_colour(ifc_boundary):
+    """Return a color depending on IfcClass given"""
+    product_colors = {
+        "IfcWall": (0.7, 0.3, 0, 1),
+        "IfcWindow": (0, 0.7, 1, 1),
+        "IfcSlab": (0.7, 0.7, 0.5, 1),
+        "IfcRoof": (0, 0.3, 0, 1),
+        "IfcDoor": (1, 1, 1, 1),
+    }
+    if ifc_boundary.PhysicalOrVirtualBoundary == "VIRTUAL":
+        return (1, 0, 1, 1)
+
+    element = ifc_boundary.RelatedBuildingElement
+    if not element:
+        return (1, 0, 0, 1)
+    for product, colour in product_colors.items():
+        if element.is_a(product):
+            return colour
+    return (0, 0, 0, 1)
+
+
+class ColourByRelatedBuildingElement(bpy.types.Operator):
+    bl_idname = "bim.colour_by_related_building_element"
+    bl_label = "Apply colour based on related building elements"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        IfcStore.begin_transaction(self)
+        self.store_state(context)
+        result = self._execute(context)
+        IfcStore.add_transaction_operation(self)
+        IfcStore.end_transaction(self)
+        return result
+
+    def _execute(self, context):
+        self.file = tool.Ifc.get()
+        for obj in context.visible_objects:
+            if not obj.BIMObjectProperties.ifc_definition_id:
+                continue
+            element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
+            if not element.is_a("IfcRelSpaceBoundary"):
+                continue
+            obj.color = get_colour(element)
+        areas = [a for a in context.screen.areas if a.type == "VIEW_3D"]
+        if areas:
+            areas[0].spaces[0].shading.color_type = "OBJECT"
+        return {"FINISHED"}
+
+    def store_state(self, context):
+        areas = [a for a in context.screen.areas if a.type == "VIEW_3D"]
+        if areas:
+            self.transaction_data = {"area": areas[0], "color_type": areas[0].spaces[0].shading.color_type}
+
+    def rollback(self, data):
+        if data:
+            data["area"].spaces[0].shading.color_type = data["color_type"]
+
+    def commit(self, data):
+        if data:
+            data["area"].spaces[0].shading.color_type = "OBJECT"
+
+
+EDITABLE_ATTRIBUTES = {
+    "RelatingSpace": "relating_space",
+    "RelatedBuildingElement": "related_building_element",
+    "ParentBoundary": "parent_boundary",
+    "CorrespondingBoundary": "corresponding_boundary",
+}
+
+
+class EnableEditingBoundary(bpy.types.Operator):
+    bl_idname = "bim.enable_editing_boundary"
+    bl_label = "Edit boundary relations"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        bprops = context.active_object.bim_boundary_properties
+        bprops.is_editing = True
+        boundary = tool.Ifc.get_entity(context.active_object)
+        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
+            entity = getattr(boundary, ifc_attribute, None)
+            if not entity:
+                continue
+            obj = tool.Ifc.get_object(entity)
+            if entity and obj:
+                setattr(bprops, blender_property, obj)
+        return {"FINISHED"}
+
+
+class DisableEditingBoundary(bpy.types.Operator):
+    bl_idname = "bim.disable_editing_boundary"
+    bl_label = "Disable editing boundary relations"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        bprops = context.active_object.bim_boundary_properties
+        bprops.is_editing = False
+        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
+            setattr(bprops, blender_property, None)
+        return {"FINISHED"}
+
+
+class EditBoundaryAttributes(bpy.types.Operator):
+    bl_idname = "bim.edit_boundary_attributes"
+    bl_label = "Disable editing boundary relations"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        return IfcStore.execute_ifc_operator(self, context)
+
+    def _execute(self, context):
+        bprops = context.active_object.bim_boundary_properties
+        boundary = tool.Ifc.get_entity(context.active_object)
+        attributes = dict()
+        for ifc_attribute, blender_property in EDITABLE_ATTRIBUTES.items():
+            obj = getattr(bprops, blender_property, None)
+            entity = tool.Ifc.get_entity(obj)
+            attributes[blender_property] = entity
+        ifcopenshell.api.run("boundary.edit_attributes", tool.Ifc.get(), entity=boundary, **attributes)
+        bpy.ops.bim.disable_editing_boundary()
+        return {"FINISHED"}
+
+
+class UpdateBoundaryGeometry(bpy.types.Operator):
+    bl_idname = "bim.update_boundary_geometry"
+    bl_label = "Update boundary geometry"
+    bl_description = """
+    Update boundary connection geometry from mesh.
+    Mesh must lie on a single plane. It should look like a face or a face with holes.
+    """
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        return IfcStore.execute_ifc_operator(self, context)
+
+    def _execute(self, context):
+        settings = tool.Boundary.get_assign_connection_geometry_settings(context.active_object)
+        ifcopenshell.api.run("boundary.assign_connection_geometry", tool.Ifc.get(), **settings)
+        return {"FINISHED"}

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

@@ -0,0 +1,60 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+import blenderbim.tool as tool
+
+
+def space_filter(self, object):
+    entity = tool.Ifc.get_entity(object)
+    if entity:
+        return entity.is_a("IfcSpace") or entity.is_a("IfcExternalSpatialElement")
+    return False
+
+
+def boundary_filter(self, object):
+    entity = tool.Ifc.get_entity(object)
+    if entity:
+        return entity.is_a("IfcRelSpaceBoundary")
+    return False
+
+
+def element_filter(self, object):
+    entity = tool.Ifc.get_entity(object)
+    if entity:
+        return entity.is_a("IfcElement")
+    return False
+
+
+class BIMBoundaryProperties(PropertyGroup):
+    is_editing: BoolProperty(name="Is Editing")
+    relating_space: PointerProperty(name="RelatingSpace", type=bpy.types.Object, poll=space_filter)
+    related_building_element: PointerProperty(name="RelatedBuildingElement", type=bpy.types.Object, poll=element_filter)
+    parent_boundary: PointerProperty(name="ParentBoundary", type=bpy.types.Object, poll=boundary_filter)
+    corresponding_boundary: PointerProperty(name="CorrespondingBoundary", type=bpy.types.Object, poll=boundary_filter)

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

@@ -1,17 +1,56 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 blenderbim.bim.helper
 from bpy.types import Panel, UIList
 from blenderbim.bim.ifc import IfcStore
+import blenderbim.tool as tool
 from ifcopenshell.api.boundary.data import Data
 
 
-class BIM_PT_boundary(Panel):
+class BIM_PT_SceneBoundaries(Panel):
     bl_label = "IFC Space Boundaries"
-    bl_idname = "BIM_PT_boundary"
+    bl_id_name = "BIM_PT_scene_boundaries"
     bl_options = {"DEFAULT_CLOSED"}
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_geometry"
+
+    @classmethod
+    def poll(cls, context):
+        return IfcStore.get_file()
+
+    def draw(self, context):
+        row = self.layout.row(align=True)
+        row.operator("bim.load_project_space_boundaries")
+        row.operator("bim.select_project_space_boundaries", text="", icon="RESTRICT_SELECT_OFF")
+        row.operator("bim.colour_by_related_building_element", text="", icon="BRUSH_DATA")
+
+
+class BIM_PT_Boundary(Panel):
+    bl_label = "IFC Space Boundary"
+    bl_idname = "BIM_PT_Boundary"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
     bl_context = "object"
+    bl_parent_id = "BIM_PT_geometry_object"
 
     @classmethod
     def poll(cls, context):
@@ -22,15 +61,97 @@ class BIM_PT_boundary(Panel):
             return False
         if not IfcStore.get_element(props.ifc_definition_id):
             return False
-        if IfcStore.get_file().by_id(props.ifc_definition_id).is_a() not in ["IfcSpace", "IfcExternalSpatialElement"]:
-            return False
-        return True
+        entity = IfcStore.get_file().by_id(props.ifc_definition_id)
+        return entity.is_a("IfcRelSpaceBoundary")
 
     def draw(self, context):
-        self.oprops = context.active_object.BIMObjectProperties
-        if not Data.is_loaded:
-            Data.load(IfcStore.get_file())
-        for boundary_id in Data.spaces.get(self.oprops.ifc_definition_id, []):
-            boundary = Data.boundaries[boundary_id]
+        props = context.active_object.BIMObjectProperties
+        ifc_file = tool.Ifc.get()
+        element = ifc_file.by_id(props.ifc_definition_id)
+        boundary = ifc_file.by_id(props.ifc_definition_id)
+        self.bprops = context.active_object.bim_boundary_properties
+        if self.bprops.is_editing:
+            row = self.layout.row(align=True)
+            row.operator("bim.edit_boundary_attributes", icon="CHECKMARK", text="Save Attributes")
+            row.operator("bim.disable_editing_boundary", icon="CANCEL", text="")
+            self.draw_relation_editor(boundary, "RelatingSpace", "relating_space")
+            self.draw_relation_editor(boundary, "RelatedBuildingElement", "related_building_element")
+            self.draw_relation_editor(boundary, "ParentBoundary", "parent_boundary")
+            self.draw_relation_editor(boundary, "CorrespondingBoundary", "corresponding_boundary")
+        else:
             row = self.layout.row()
-            row.label(text=f"{boundary_id}", icon="GHOST_ENABLED")
+            row.operator("bim.enable_editing_boundary", icon="GREASEPENCIL", text="Edit")
+            self.draw_relation_data(boundary, "RelatingSpace")
+            self.draw_relation_data(boundary, "RelatedBuildingElement")
+            self.draw_relation_data(boundary, "ParentBoundary")
+            self.draw_relation_data(boundary, "CorrespondingBoundary")
+            if hasattr(boundary, "InnerBoundaries"):
+                for i, inner_boundary in enumerate(getattr(boundary, "InnerBoundaries", ())):
+                    row = self.layout.row(align=True)
+                    row.label(text="InnerBoundaries")
+                    row.label(text=f"[{i}]")
+                    row.label(text=f"{inner_boundary.is_a()}/{inner_boundary.Name}")
+        row = self.layout.row()
+        row.operator("bim.update_boundary_geometry")
+
+    def draw_relation_data(self, boundary, ifc_attribute: str):
+        row = self.layout.row(align=True)
+        if hasattr(boundary, ifc_attribute):
+            row.label(text=ifc_attribute)
+            entity = getattr(boundary, ifc_attribute)
+            if entity:
+                row.label(text=f"{entity.is_a()}/{entity.Name}")
+                op = row.operator("bim.select_global_id", text="", icon="TRACKER")
+                op.global_id = entity.GlobalId
+            else:
+                row.label(text="")
+
+    def draw_relation_editor(self, boundary, ifc_attribute: str, blender_property: str):
+        if hasattr(boundary, ifc_attribute):
+            row = self.layout.row(align=True)
+            row.prop(self.bprops, blender_property)
+
+
+class BIM_PT_SpaceBoundaries(Panel):
+    bl_label = "IFC Space Boundaries"
+    bl_idname = "BIM_PT_SpaceBoundaries"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "object"
+    bl_parent_id = "BIM_PT_geometry_object"
+
+    @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
+        valid_classes = ("IfcSpace", "IfcExternalSpatialElement")
+        entity = IfcStore.get_file().by_id(props.ifc_definition_id)
+        for ifc_class in valid_classes:
+            if entity.is_a(ifc_class):
+                return True
+        return False
+
+    def draw(self, context):
+        self.props = context.active_object.BIMObjectProperties
+        self.ifc_file = tool.Ifc.get()
+        row = self.layout.row()
+        row.operator("bim.load_space_boundaries")
+        if not Data.is_loaded:
+            Data.load(self.ifc_file)
+        for boundary_id in Data.spaces.get(self.props.ifc_definition_id, []):
+            boundary_data = Data.boundaries[boundary_id]
+            building_element = self.ifc_file.by_id(boundary_data["RelatedBuildingElement"])
+            row = self.layout.row()
+            if building_element:
+                bld_el_description = f"{building_element.is_a()}/{building_element.Name}"
+            else:
+                bld_el_description = None
+            row.label(text=f"{boundary_id} > {bld_el_description}", icon="GHOST_ENABLED")
+            op = row.operator("bim.load_boundary", text="", icon="RESTRICT_SELECT_OFF")
+            op.boundary_id = boundary_id

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

@@ -0,0 +1,49 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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.AddBrick,
+    operator.AddBrickFeed,
+    operator.AssignBrickReference,
+    operator.CloseBrickProject,
+    operator.ConvertBrickProject,
+    operator.ConvertIfcToBrick,
+    operator.LoadBrickProject,
+    operator.NewBrickFile,
+    operator.RefreshBrickViewer,
+    operator.RemoveBrick,
+    operator.RewindBrickClass,
+    operator.ViewBrickClass,
+    operator.ViewBrickItem,
+    prop.Brick,
+    prop.BIMBrickProperties,
+    ui.BIM_PT_brickschema,
+    ui.BIM_PT_ifc_brickschema_references,
+    ui.BIM_UL_bricks,
+)
+
+
+def register():
+    bpy.types.Scene.BIMBrickProperties = bpy.props.PointerProperty(type=prop.BIMBrickProperties)
+
+
+def unregister():
+    del bpy.types.Scene.BIMBrickProperties

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

@@ -0,0 +1,180 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 blenderbim.tool as tool
+from blenderbim.tool.brick import BrickStore
+
+try:
+    from rdflib import URIRef, BNode
+except:
+    # See #1860
+    print("Warning: brickschema not available.")
+
+
+def refresh():
+    BrickschemaData.is_loaded = False
+    BrickschemaReferencesData.is_loaded = False
+
+
+class BrickschemaData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {
+            "is_loaded": cls.get_is_loaded(),
+            "attributes": cls.attributes(),
+            "namespaces": cls.namespaces(),
+            "brick_equipment_classes": cls.brick_equipment_classes(),
+        }
+
+    @classmethod
+    def get_is_loaded(cls):
+        return BrickStore.graph is not None
+
+    @classmethod
+    def attributes(cls):
+        if BrickStore.graph is None:
+            return []
+        props = bpy.context.scene.BIMBrickProperties
+        try:
+            brick = props.bricks[props.active_brick_index]
+        except:
+            return []
+        results = []
+        uri = brick.uri
+        query = BrickStore.graph.query(
+            """
+            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 ?name ?value ?sp ?sv WHERE {
+               <{uri}> ?name ?value .
+               OPTIONAL {
+               { ?name rdfs:range brick:TimeseriesReference . }
+                UNION
+               { ?name a brick:EntityProperty . }
+                ?value ?sp ?sv }
+            }
+        """.replace(
+                "{uri}", uri
+            )
+        )
+
+        for row in query:
+            name = row.get("name").toPython().split("#")[-1]
+            value = row.get("value")
+            results.append(
+                {
+                    "name": name,
+                    "value": value.toPython().split("#")[-1],
+                    "is_uri": isinstance(value, URIRef),
+                    "value_uri": value.toPython(),
+                    "is_globalid": name == "globalID",
+                }
+            )
+            if isinstance(row.get("value"), BNode):
+                for s, p, o in BrickStore.graph.triples((value, None, None)):
+                    results.append(
+                        {
+                            "name": name + ":" + p.toPython().split("#")[-1],
+                            "value": o.toPython().split("#")[-1],
+                            "is_uri": isinstance(o, URIRef),
+                            "value_uri": o.toPython(),
+                            "is_globalid": p.toPython().split("#")[-1] == "globalID",
+                        }
+                    )
+        return results
+
+    @classmethod
+    def namespaces(cls):
+        if BrickStore.graph is None:
+            return []
+        results = []
+        for alias, uri in BrickStore.graph.namespaces():
+            results.append((uri, f"{alias}: {uri}", ""))
+        return results
+
+    @classmethod
+    def brick_equipment_classes(cls):
+        if BrickStore.graph is None:
+            return []
+        results = []
+        query = BrickStore.graph.query(
+            """
+            PREFIX brick: <https://brickschema.org/schema/Brick#>
+            PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+            SELECT ?class WHERE {
+                ?class rdfs:subClassOf* brick:Equipment .
+            }
+        """
+        )
+        for uri in sorted([x[0].toPython() for x in query]):
+            results.append((uri, uri.split("#")[-1], ""))
+        return results
+
+
+class BrickschemaReferencesData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {"is_loaded": cls.get_is_loaded(), "libraries": cls.libraries(), "references": cls.references()}
+
+    @classmethod
+    def get_is_loaded(cls):
+        return BrickStore.graph is not None
+
+    @classmethod
+    def libraries(cls):
+        results = []
+        ifc = tool.Ifc.get()
+        if not ifc:
+            return results
+        for library in ifc.by_type("IfcLibraryInformation"):
+            if tool.Ifc.get_schema() == "IFC2X3":
+                results.append((str(library.id()), library.Name or "Unnamed", ""))
+            elif ".ttl" in library.Location:
+                results.append((str(library.id()), library.Name or "Unnamed", ""))
+        return results
+
+    @classmethod
+    def references(cls):
+        results = []
+        for rel in getattr(tool.Ifc.get_entity(bpy.context.active_object), "HasAssociations", []):
+            if rel.is_a("IfcRelAssociatesLibrary"):
+                reference = rel.RelatingLibrary
+                if tool.Ifc.get_schema() == "IFC2X3" and "#" not in reference.ItemReference:
+                    continue
+                if tool.Ifc.get_schema() != "IFC2X3" and "#" not in reference.Identification:
+                    continue
+                results.append(
+                    {
+                        "id": reference.id(),
+                        "identification": reference.ItemReference
+                        if tool.Ifc.get_schema() == "IFC2X3"
+                        else reference.Identification,
+                        "name": reference.Name or "Unnamed",
+                    }
+                )
+        return results

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

@@ -0,0 +1,191 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 ifcopenshell.api
+import blenderbim.tool as tool
+import blenderbim.core.brick as core
+import blenderbim.bim.handler
+from blenderbim.bim.ifc import IfcStore
+
+
+class Operator:
+    def execute(self, context):
+        self._execute(context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
+class LoadBrickProject(bpy.types.Operator, Operator):
+    bl_idname = "bim.load_brick_project"
+    bl_label = "Load Brickschema Project"
+    bl_options = {"REGISTER", "UNDO"}
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})
+
+    def _execute(self, context):
+        core.load_brick_project(tool.Brick, filepath=self.filepath)
+
+    def invoke(self, context, event):
+        context.window_manager.fileselect_add(self)
+        return {"RUNNING_MODAL"}
+
+
+class ViewBrickClass(bpy.types.Operator, Operator):
+    bl_idname = "bim.view_brick_class"
+    bl_label = "View Brick Class"
+    bl_options = {"REGISTER", "UNDO"}
+    brick_class: bpy.props.StringProperty(name="Brick Class")
+
+    def _execute(self, context):
+        core.view_brick_class(tool.Brick, brick_class=self.brick_class)
+
+
+class ViewBrickItem(bpy.types.Operator, Operator):
+    bl_idname = "bim.view_brick_item"
+    bl_label = "View Brick Item"
+    bl_options = {"REGISTER", "UNDO"}
+    item: bpy.props.StringProperty(name="Brick Item")
+
+    def _execute(self, context):
+        core.view_brick_item(tool.Brick, item=self.item)
+
+
+class RewindBrickClass(bpy.types.Operator, Operator):
+    bl_idname = "bim.rewind_brick_class"
+    bl_label = "Rewind Brick Class"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.rewind_brick_class(tool.Brick)
+
+
+class CloseBrickProject(bpy.types.Operator, Operator):
+    bl_idname = "bim.close_brick_project"
+    bl_label = "Close Brick Project"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.close_brick_project(tool.Brick)
+
+
+class ConvertBrickProject(bpy.types.Operator, Operator):
+    bl_idname = "bim.convert_brick_project"
+    bl_label = "Convert Brick Project"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.convert_brick_project(tool.Ifc, tool.Brick)
+
+
+class AssignBrickReference(bpy.types.Operator, Operator):
+    bl_idname = "bim.assign_brick_reference"
+    bl_label = "Assign Brick Reference"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        core.assign_brick_reference(
+            tool.Ifc,
+            tool.Brick,
+            element=tool.Ifc.get_entity(context.active_object),
+            library=tool.Ifc.get().by_id(int(props.libraries)),
+            brick_uri=props.bricks[props.active_brick_index].uri,
+        )
+
+
+class AddBrick(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick"
+    bl_label = "Add Brick"
+    bl_options = {"REGISTER", "UNDO"}
+
+    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_equipment_class,
+            library=library,
+        )
+
+
+class AddBrickFeed(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick_feed"
+    bl_label = "Add Brick Feed"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        source = tool.Ifc.get_entity([o for o in context.selected_objects if o != context.active_object][0])
+        destination = tool.Ifc.get_entity(context.active_object)
+        core.add_brick_feed(
+            tool.Ifc,
+            tool.Brick,
+            source=source,
+            destination=destination,
+        )
+
+
+class ConvertIfcToBrick(bpy.types.Operator, Operator):
+    bl_idname = "bim.convert_ifc_to_brick"
+    bl_label = "Convert IFC To Brick"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        library = None
+        if props.libraries:
+            library = tool.Ifc.get().by_id(int(props.libraries))
+        core.convert_ifc_to_brick(tool.Brick, namespace=props.namespace, library=library)
+
+
+class NewBrickFile(bpy.types.Operator, Operator):
+    bl_idname = "bim.new_brick_file"
+    bl_label = "New Brick File"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.new_brick_file(tool.Brick)
+
+
+class RefreshBrickViewer(bpy.types.Operator, Operator):
+    bl_idname = "bim.refresh_brick_viewer"
+    bl_label = "Refresh Brick Viewer"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.refresh_brick_viewer(tool.Brick)
+
+
+class RemoveBrick(bpy.types.Operator, Operator):
+    bl_idname = "bim.remove_brick"
+    bl_label = "Remove Brick"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        core.remove_brick(
+            tool.Ifc,
+            tool.Brick,
+            library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
+            brick_uri=props.bricks[props.active_brick_index].uri,
+        )

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

@@ -0,0 +1,71 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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 blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
+from blenderbim.bim.prop import StrProperty, Attribute
+from bpy.types import PropertyGroup
+from bpy.props import (
+    PointerProperty,
+    StringProperty,
+    EnumProperty,
+    BoolProperty,
+    IntProperty,
+    FloatProperty,
+    FloatVectorProperty,
+    CollectionProperty,
+)
+
+
+def update_active_brick_index(self, context):
+    BrickschemaData.is_loaded = False
+
+
+def get_libraries(self, context):
+    if not BrickschemaReferencesData.is_loaded:
+        BrickschemaReferencesData.load()
+    return BrickschemaReferencesData.data["libraries"]
+
+
+def get_namespaces(self, context):
+    if not BrickschemaData.is_loaded:
+        BrickschemaData.load()
+    return BrickschemaData.data["namespaces"]
+
+
+def get_brick_equipment_classes(self, context):
+    if not BrickschemaData.is_loaded:
+        BrickschemaData.load()
+    return BrickschemaData.data["brick_equipment_classes"]
+
+
+class Brick(PropertyGroup):
+    name: StringProperty(name="Name")
+    label: StringProperty(name="Label")
+    uri: StringProperty(name="URI")
+    total_items: IntProperty(name="Total Items")
+
+
+class BIMBrickProperties(PropertyGroup):
+    active_brick_class: StringProperty(name="Active Brick Class")
+    brick_breadcrumbs: CollectionProperty(name="Brick Breadcrumbs", type=StrProperty)
+    bricks: CollectionProperty(name="Bricks", type=Brick)
+    active_brick_index: IntProperty(name="Active Brick Index", update=update_active_brick_index)
+    libraries: EnumProperty(name="Libraries", items=get_libraries)
+    namespace: EnumProperty(name="Namespace", items=get_namespaces)
+    brick_equipment_class: EnumProperty(name="Brick Equipment Class", items=get_brick_equipment_classes)

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

@@ -0,0 +1,132 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2021 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.module.brick.data import BrickschemaData, BrickschemaReferencesData
+
+
+class BIM_PT_brickschema(Panel):
+    bl_label = "Brickschema Project"
+    bl_idname = "BIM_PT_brickschema"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+
+    def draw(self, context):
+        if not BrickschemaData.is_loaded:
+            BrickschemaData.load()
+        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 len(self.props.brick_breadcrumbs):
+            row.operator("bim.rewind_brick_class", text="", icon="FRAME_PREV")
+        row.label(text=self.props.active_brick_class)
+        row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
+        row.operator("bim.close_brick_project", text="", icon="CANCEL")
+
+        row = self.layout.row(align=True)
+        row.prop(self.props, "namespace", text="")
+        row.prop(self.props, "brick_equipment_class", text="")
+        row.operator("bim.add_brick", text="", icon="ADD")
+
+        row = self.layout.row(align=True)
+        row.alignment = "RIGHT"
+        row.operator("bim.add_brick_feed", text="", icon="PLUGIN")
+        row.operator("bim.remove_brick", text="", icon="X")
+
+        self.layout.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")
+
+        for attribute in BrickschemaData.data["attributes"]:
+            row = self.layout.row(align=True)
+            row.label(text=attribute["name"])
+            row.label(text=attribute["value"])
+            if attribute["is_uri"]:
+                op = row.operator("bim.view_brick_item", text="", icon="DISCLOSURE_TRI_RIGHT")
+                op.item = attribute["value_uri"]
+            if attribute["is_globalid"]:
+                op = row.operator("bim.select_global_id", icon="RESTRICT_SELECT_OFF", text="")
+                op.global_id = attribute["value"]
+
+
+class BIM_PT_ifc_brickschema_references(Panel):
+    bl_label = "IFC Brickschema References"
+    bl_idname = "BIM_PT_ifc_brickschema_references"
+    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 tool.Ifc.get()
+
+    def draw(self, context):
+        if not BrickschemaReferencesData.is_loaded:
+            BrickschemaReferencesData.load()
+        self.props = context.scene.BIMBrickProperties
+
+        if not BrickschemaReferencesData.data["is_loaded"]:
+            row = self.layout.row()
+            row.label(text="No Brickschema Project Loaded")
+            return
+
+        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
+
+        row = self.layout.row(align=True)
+        row.prop(self.props, "libraries")
+        row.operator("bim.convert_brick_project", text="", icon="ADD")
+
+        row = self.layout.row(align=True)
+        row.operator("bim.assign_brick_reference", icon="ADD")
+        row.operator("bim.convert_ifc_to_brick", icon="IMPORT")
+
+        if not BrickschemaReferencesData.data["references"]:
+            row = self.layout.row()
+            row.label(text="No References")
+
+        for reference in BrickschemaReferencesData.data["references"]:
+            row = self.layout.row(align=True)
+            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"]
+
+
+class BIM_UL_bricks(UIList):
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+        if item:
+            row = layout.row(align=True)
+            if item.total_items:
+                op = row.operator("bim.view_brick_class", text="", icon="DISCLOSURE_TRI_RIGHT", emboss=False)
+                op.brick_class = item.name
+            row.label(text=item.label if item.label else item.name)
+            if item.total_items:
+                row.label(text=str(item.total_items))

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 
@@ -16,9 +34,6 @@ classes = (
     operator.SmartClashGroup,
     operator.SelectSmartGroup,
     operator.LoadSmartGroupsForActiveClashSet,
-    operator.SetBlenderClashSetA,
-    operator.SetBlenderClashSetB,
-    operator.ExecuteBlenderClash,
     prop.ClashSource,
     prop.ClashSet,
     prop.SmartClashGroup,

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import bpy
 import json
@@ -6,6 +24,7 @@ import logging
 import numpy as np
 from mathutils import Matrix
 from math import radians
+from blenderbim.bim.ifc import IfcStore
 
 
 class ExportClashSets(bpy.types.Operator):
@@ -105,7 +124,7 @@ class AddClashSource(bpy.types.Operator):
     group: bpy.props.StringProperty()
 
     def execute(self, context):
-        clash_set = context.scene.BIMClashProperties.clash_sets[context.scene.BIMClashProperties.active_clash_set_index]
+        clash_set = context.scene.BIMClashProperties.active_clash_set
         source = getattr(clash_set, self.group).add()
         return {"FINISHED"}
 
@@ -118,7 +137,7 @@ class RemoveClashSource(bpy.types.Operator):
     group: bpy.props.StringProperty()
 
     def execute(self, context):
-        clash_set = context.scene.BIMClashProperties.clash_sets[context.scene.BIMClashProperties.active_clash_set_index]
+        clash_set = context.scene.BIMClashProperties.active_clash_set
         getattr(clash_set, self.group).remove(self.index)
         return {"FINISHED"}
 
@@ -133,7 +152,7 @@ class SelectClashSource(bpy.types.Operator):
     group: bpy.props.StringProperty()
 
     def execute(self, context):
-        clash_set = context.scene.BIMClashProperties.clash_sets[context.scene.BIMClashProperties.active_clash_set_index]
+        clash_set = context.scene.BIMClashProperties.active_clash_set
         getattr(clash_set, self.group)[self.index].name = self.filepath
         return {"FINISHED"}
 
@@ -212,9 +231,7 @@ class ExecuteIfcClash(bpy.types.Operator):
                 context.scene.render.resolution_x = 480
                 context.scene.render.resolution_y = 270
                 context.scene.render.image_settings.file_format = "PNG"
-                context.scene.render.filepath = os.path.join(
-                    context.scene.BIMProperties.data_dir, "snapshot.png"
-                )
+                context.scene.render.filepath = os.path.join(context.scene.BIMProperties.data_dir, "snapshot.png")
                 bpy.ops.render.opengl(write_still=True)
                 return context.scene.render.filepath
 
@@ -257,9 +274,7 @@ class SelectIfcClashResults(bpy.types.Operator):
         self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
         with open(self.filepath) as f:
             clash_sets = json.load(f)
-        clash_set_name = context.scene.BIMClashProperties.clash_sets[
-            context.scene.BIMClashProperties.active_clash_set_index
-        ].name
+        clash_set_name = context.scene.BIMClashProperties.active_clash_set.name
         global_ids = []
         for clash_set in clash_sets:
             if clash_set["name"] != clash_set_name:
@@ -284,6 +299,10 @@ class SmartClashGroup(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
     filepath: bpy.props.StringProperty(subtype="FILE_PATH")
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BIMClashProperties.clash_results_path
+
     def execute(self, context):
         import ifcclash
 
@@ -307,9 +326,7 @@ class SmartClashGroup(bpy.types.Operator):
         with open(save_path, "w") as f:
             f.write(json.dumps(smart_grouped_clashes))
 
-        clash_set_name = context.scene.BIMClashProperties.clash_sets[
-            context.scene.BIMClashProperties.active_clash_set_index
-        ].name
+        clash_set_name = context.scene.BIMClashProperties.active_clash_set.name
 
         # Reset the list of smart_clash_groups for the UI
         context.scene.BIMClashProperties.smart_clash_groups.clear()
@@ -336,12 +353,14 @@ class LoadSmartGroupsForActiveClashSet(bpy.types.Operator):
     bl_label = "Load Smart Groups for Active Clash Set"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        return context.scene.BIMClashProperties.active_clash_set
+
     def execute(self, context):
         smart_groups_path = bpy.path.ensure_ext(context.scene.BIMClashProperties.smart_grouped_clashes_path, ".json")
 
-        clash_set_name = context.scene.BIMClashProperties.clash_sets[
-            context.scene.BIMClashProperties.active_clash_set_index
-        ].name
+        clash_set_name = context.scene.BIMClashProperties.active_clash_set.name
 
         with open(smart_groups_path) as f:
             smart_grouped_clashes = json.load(f)
@@ -370,11 +389,14 @@ class SelectSmartGroup(bpy.types.Operator):
     bl_label = "Select Smart Group"
     bl_options = {"REGISTER", "UNDO"}
 
+    @classmethod
+    def poll(cls, context):
+        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.smart_clash_groups[
-            context.scene.BIMCLashProperties.active_smart_group_index
-        ]
+        selected_smart_group = context.scene.BIMClashProperties.active_smart_group
         # print(selected_smart_group.number)
 
         for obj in context.visible_objects:
@@ -389,84 +411,3 @@ class SelectSmartGroup(bpy.types.Operator):
                     obj.select_set(True)
 
         return {"FINISHED"}
-
-
-class BlenderClasher:
-    def process_clash_set(self, context):
-        import collision
-
-        a_cm = collision.CollisionManager()
-        b_cm = collision.CollisionManager()
-        self.add_to_cm(a_cm, context.scene.BIMClashProperties.blender_clash_set_a, context)
-        self.add_to_cm(b_cm, context.scene.BIMClashProperties.blender_clash_set_b, context)
-        results = a_cm.in_collision_other(b_cm, return_data=True)
-        if not results[0]:
-            print("No clashes")
-            return
-        for contact in results[1]:
-            if contact.raw.penetration_depth < 0.01:
-                continue
-            print("-----")
-            print(contact.names)
-            print(contact.raw.normal)
-            print(contact.raw.pos)
-
-    def add_to_cm(self, cm, object_names, context):
-        import ifcclash
-
-        for object_name in object_names:
-            name = object_name.name
-            obj = bpy.data.objects[name]
-            triangulated_mesh = self.triangulate_mesh(obj, context)
-            mesh = ifcclash.Mesh()
-            mesh.vertices = np.array([tuple(obj.matrix_world @ v.co) for v in triangulated_mesh.vertices])
-            mesh.faces = np.array([tuple(p.vertices) for p in triangulated_mesh.polygons])
-            cm.add_object(name, mesh)
-
-    def triangulate_mesh(self, obj, context):
-        mesh = obj.evaluated_get(context.evaluated_depsgraph_get()).to_mesh()
-        bm = bmesh.new()
-        bm.from_mesh(mesh)
-        bmesh.ops.triangulate(bm, faces=bm.faces)
-        bm.to_mesh(mesh)
-        bm.free()
-        del bm
-        return mesh
-
-
-class SetBlenderClashSetA(bpy.types.Operator):
-    bl_idname = "bim.set_blender_clash_set_a"
-    bl_label = "Set Blender Clash Set A"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        while len(context.scene.BIMClashProperties.blender_clash_set_a) > 0:
-            context.scene.BIMClashProperties.blender_clash_set_a.remove(0)
-        for obj in context.selected_objects:
-            new = context.scene.BIMClashProperties.blender_clash_set_a.add()
-            new.name = obj.name
-        return {"FINISHED"}
-
-
-class SetBlenderClashSetB(bpy.types.Operator):
-    bl_idname = "bim.set_blender_clash_set_b"
-    bl_label = "Set Blender Clash Set B"
-    bl_options = {"REGISTER", "UNDO"}
-
-    def execute(self, context):
-        while len(context.scene.BIMClashProperties.blender_clash_set_b) > 0:
-            context.scene.BIMClashProperties.blender_clash_set_b.remove(0)
-        for obj in context.selected_objects:
-            new = context.scene.BIMClashProperties.blender_clash_set_b.add()
-            new.name = obj.name
-        return {"FINISHED"}
-
-
-class ExecuteBlenderClash(bpy.types.Operator):
-    bl_idname = "bim.execute_blender_clash"
-    bl_label = "Execute Blender Clash"
-
-    def execute(self, context):
-        blender_clasher = BlenderClasher()
-        blender_clasher.process_clash_set(context)
-        return {"FINISHED"}

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 blenderbim.bim.prop import StrProperty, Attribute
 from bpy.types import PropertyGroup
@@ -50,3 +68,15 @@ class BIMClashProperties(PropertyGroup):
     smart_clash_grouping_max_distance: IntProperty(
         name="Smart Clash Grouping Max Distance", default=3, soft_min=1, soft_max=10
     )
+
+    @property
+    def active_clash_set(self):
+        if not self.clash_sets:
+            return None
+        return self.clash_sets[self.active_clash_set_index]
+
+    @property
+    def active_smart_group(self):
+        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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 Panel
 
@@ -9,6 +27,7 @@ class BIM_PT_ifcclash(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_quality_control"
 
     def draw(self, context):
         layout = self.layout
@@ -16,17 +35,6 @@ class BIM_PT_ifcclash(Panel):
         scene = context.scene
         props = scene.BIMClashProperties
 
-        layout.label(text="Blender Clash:")
-
-        row = layout.row(align=True)
-        row.operator("bim.set_blender_clash_set_a")
-        row.operator("bim.set_blender_clash_set_b")
-
-        row = layout.row(align=True)
-        row.operator("bim.execute_blender_clash")
-
-        layout.label(text="IFC Clash:")
-
         row = layout.row(align=True)
         row.operator("bim.add_clash_set")
         row.operator("bim.import_clash_sets", text="", icon="IMPORT")
@@ -38,7 +46,7 @@ class BIM_PT_ifcclash(Panel):
         layout.template_list("BIM_UL_clash_sets", "", props, "clash_sets", props, "active_clash_set_index")
 
         if props.active_clash_set_index < len(props.clash_sets):
-            clash_set = props.clash_sets[props.active_clash_set_index]
+            clash_set = props.active_clash_set
 
             row = layout.row(align=True)
             row.prop(clash_set, "name")

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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.api
@@ -50,14 +68,14 @@ class EnableEditingClassification(bpy.types.Operator):
 
     def execute(self, context):
         props = context.scene.BIMClassificationProperties
-        while len(props.classification_attributes) > 0:
-            props.classification_attributes.remove(0)
+        props.classification_attributes.clear()
         classification_data = Data.classifications[self.classification]
         for attribute in IfcStore.get_schema().declaration_by_name("IfcClassification").all_attributes():
             new = props.classification_attributes.add()
             new.name = attribute.name()
             new.is_null = classification_data[attribute.name()] is None
             new.is_optional = attribute.optional()
+            new.data_type = "string"
             if attribute.name() == "ReferenceTokens":
                 new.string_value = "" if new.is_null else json.dumps(classification_data[attribute.name()])
             else:
@@ -135,8 +153,7 @@ class EnableEditingClassificationReference(bpy.types.Operator):
     def execute(self, context):
         obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
         props = obj.BIMClassificationReferenceProperties
-        while len(props.reference_attributes) > 0:
-            props.reference_attributes.remove(0)
+        props.reference_attributes.clear()
         reference_data = Data.references[self.reference]
         for attribute in IfcStore.get_schema().declaration_by_name("IfcClassificationReference").all_attributes():
             if attribute.name() == "ReferencedSource":
@@ -145,6 +162,7 @@ class EnableEditingClassificationReference(bpy.types.Operator):
             new.name = attribute.name()
             new.is_null = reference_data[attribute.name()] is None
             new.is_optional = attribute.optional()
+            new.data_type = "string"
             new.string_value = "" if new.is_null else reference_data[attribute.name()]
         props.active_reference_id = self.reference
         return {"FINISHED"}

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 blenderbim.bim.prop import StrProperty, Attribute
 from ifcopenshell.api.classification.data import Data
@@ -37,8 +55,7 @@ def updateClassification(self, context):
 
 def getReferences(self, context, parent_id=None):
     props = context.scene.BIMClassificationProperties
-    while len(props.available_library_references) > 0:
-        props.available_library_references.remove(0)
+    props.available_library_references.clear()
     for reference in Data.library_file.by_id(parent_id).HasReferences:
         new = props.available_library_references.add()
         new.identification = reference.Identification or ""

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

@@ -1,3 +1,22 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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.bim.module.classification.prop as classification_prop
 from bpy.types import Panel, UIList
 from blenderbim.bim.ifc import IfcStore
 from ifcopenshell.api.classification.data import Data
@@ -10,6 +29,7 @@ class BIM_PT_classifications(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):
@@ -67,9 +87,12 @@ class BIM_PT_classification_references(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
+    bl_parent_id = "BIM_PT_object_metadata"
 
     @classmethod
     def poll(cls, context):
+        if not context.active_object:
+            return False
         if not IfcStore.get_element(context.active_object.BIMObjectProperties.ifc_definition_id):
             return False
         return bool(context.active_object.BIMObjectProperties.ifc_definition_id)
@@ -85,7 +108,7 @@ class BIM_PT_classification_references(Panel):
         if self.oprops.ifc_definition_id not in Data.products:
             Data.load(IfcStore.get_file(), self.oprops.ifc_definition_id)
 
-        self.draw_add_ui()
+        self.draw_add_ui(context)
 
         reference_ids = Data.products[self.oprops.ifc_definition_id]
         if not reference_ids:
@@ -99,8 +122,8 @@ class BIM_PT_classification_references(Panel):
             else:
                 self.draw_ui(reference_id, reference)
 
-    def draw_add_ui(self):
-        if not self.sprops.available_classifications:
+    def draw_add_ui(self, context):
+        if not classification_prop.getClassifications(self.sprops, context):
             return
 
         name = Data.library_classifications[int(self.sprops.available_classifications)]
@@ -127,7 +150,7 @@ class BIM_PT_classification_references(Panel):
         row = self.layout.row(align=True)
         row.prop(self.props.reference_attributes.get("Name"), "string_value", text="", icon="ASSET_MANAGER")
         row.operator("bim.edit_classification_reference", text="", icon="CHECKMARK")
-        row.operator("bim.disable_editing_classification_reference", text="", icon="X")
+        row.operator("bim.disable_editing_classification_reference", text="", icon="CANCEL")
 
         for attribute in self.props.reference_attributes:
             if attribute.name == "Name":

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 os
 import logging
@@ -43,15 +61,21 @@ class ExecuteIfcCobie(bpy.types.Operator):
     bl_label = "Execute IFCCOBie"
     file_format: bpy.props.StringProperty()
 
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.COBieProperties
+        return props.should_load_from_memory or props.cobie_ifc_file
+
     def execute(self, context):
         from cobie import IfcCobieParser
+
         props = context.scene.COBieProperties
-        
-        output_dir = os.path.dirname(props.cobie_ifc_file)
-        
+
         if props.should_load_from_memory:
             output_dir = tempfile.gettempdir()
-        
+        else:
+            output_dir = os.path.dirname(props.cobie_ifc_file)
+
         output = os.path.join(output_dir, "output")
         logger = logging.getLogger("IFCtoCOBie")
         fh = logging.FileHandler(os.path.join(output_dir, "cobie.log"))
@@ -68,10 +92,10 @@ class ExecuteIfcCobie(bpy.types.Operator):
         parser = IfcCobieParser(logger, selector)
 
         ifc_file = IfcStore.get_file()
-        
+
         if not (ifc_file and props.should_load_from_memory):
             ifc_file = props.cobie_ifc_file
-        
+
         parser.parse(
             ifc_file,
             props.cobie_types,
@@ -98,4 +122,3 @@ class ExecuteIfcCobie(bpy.types.Operator):
             webbrowser.open("file://" + output_dir)
         webbrowser.open("file://" + output_dir + "/cobie.log")
         return {"FINISHED"}
-

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 bpy.props import (
@@ -18,4 +36,3 @@ class COBieProperties(PropertyGroup):
     cobie_components: StringProperty(default=".COBie", name="COBie Components")
     cobie_json_file: StringProperty(default="", name="COBie JSON File")
     should_load_from_memory: BoolProperty(default=False, name="Load from Memory")
-    

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.
+
 from bpy.types import Panel
 from blenderbim.bim.ifc import IfcStore
 
@@ -9,6 +27,7 @@ class BIM_PT_cobie(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_collaboration"
 
     def draw(self, context):
         layout = self.layout
@@ -17,11 +36,10 @@ class BIM_PT_cobie(Panel):
         scene = context.scene
         props = scene.COBieProperties
 
-
-        if IfcStore.get_file():       
+        if IfcStore.get_file():
             row = layout.row()
             row.prop(props, "should_load_from_memory")
-          
+
         if not IfcStore.get_file() or not props.should_load_from_memory:
             row = layout.row(align=True)
             row.prop(props, "cobie_ifc_file")

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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
 

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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.api
@@ -14,8 +32,7 @@ class LoadObjectives(bpy.types.Operator):
 
     def execute(self, context):
         props = context.scene.BIMConstraintProperties
-        while len(props.constraints) > 0:
-            props.constraints.remove(0)
+        props.constraints.clear()
         for constraint_id, constraint in Data.objectives.items():
             new = props.constraints.add()
             new.name = constraint["Name"] or "Unnamed"
@@ -44,8 +61,7 @@ class EnableEditingConstraint(bpy.types.Operator):
 
     def execute(self, context):
         props = context.scene.BIMConstraintProperties
-        while len(props.constraint_attributes) > 0:
-            props.constraint_attributes.remove(0)
+        props.constraint_attributes.clear()
 
         if props.is_editing == "IfcObjective":
             data = Data.objectives[self.constraint]
@@ -170,17 +186,21 @@ class AssignConstraint(bpy.types.Operator):
         return IfcStore.execute_ifc_operator(self, context)
 
     def _execute(self, context):
-        obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
         self.file = IfcStore.get_file()
-        ifcopenshell.api.run(
-            "constraint.assign_constraint",
-            self.file,
-            **{
-                "product": self.file.by_id(obj.BIMObjectProperties.ifc_definition_id),
-                "constraint": self.file.by_id(self.constraint),
-            }
-        )
-        Data.load(IfcStore.get_file(), obj.BIMObjectProperties.ifc_definition_id)
+        objs = [bpy.data.objects.get(self.obj)] if self.obj else context.selected_objects
+        for obj in objs:
+            obj_id = obj.BIMObjectProperties.ifc_definition_id
+            if not obj_id:
+                continue
+            ifcopenshell.api.run(
+                "constraint.assign_constraint",
+                self.file,
+                **{
+                    "product": self.file.by_id(obj_id),
+                    "constraint": self.file.by_id(self.constraint),
+                }
+            )
+            Data.load(self.file, obj_id)
         return {"FINISHED"}
 
 
@@ -195,15 +215,19 @@ class UnassignConstraint(bpy.types.Operator):
         return IfcStore.execute_ifc_operator(self, context)
 
     def _execute(self, context):
-        obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
         self.file = IfcStore.get_file()
-        ifcopenshell.api.run(
-            "constraint.unassign_constraint",
-            self.file,
-            **{
-                "product": self.file.by_id(obj.BIMObjectProperties.ifc_definition_id),
-                "constraint": self.file.by_id(self.constraint),
-            }
-        )
-        Data.load(IfcStore.get_file(), obj.BIMObjectProperties.ifc_definition_id)
+        objs = [bpy.data.objects.get(self.obj)] if self.obj else context.selected_objects
+        for obj in objs:
+            obj_id = obj.BIMObjectProperties.ifc_definition_id
+            if not obj_id:
+                continue
+            ifcopenshell.api.run(
+                "constraint.unassign_constraint",
+                self.file,
+                **{
+                    "product": self.file.by_id(obj_id),
+                    "constraint": self.file.by_id(self.constraint),
+                }
+            )
+            Data.load(self.file, obj_id)
         return {"FINISHED"}

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

@@ -1,3 +1,21 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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 blenderbim.bim.prop import StrProperty, Attribute
 from bpy.types import PropertyGroup

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

@@ -1,5 +1,24 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2020, 2021 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/>.
+
 from bpy.types import Panel, UIList
 from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.helper import draw_attributes
 from ifcopenshell.api.constraint.data import Data
 
 
@@ -10,6 +29,7 @@ class BIM_PT_constraints(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "scene"
+    bl_parent_id = "BIM_PT_project_setup"
 
     @classmethod
     def poll(cls, context):
@@ -44,14 +64,7 @@ class BIM_PT_constraints(Panel):
             self.draw_editable_ui(context)
 
     def draw_editable_ui(self, context):
-        for attribute in self.props.constraint_attributes:
-            row = self.layout.row(align=True)
-            if attribute.data_type == "string":
-                row.prop(attribute, "string_value", text=attribute.name)
-            elif attribute.data_type == "enum":
-                row.prop(attribute, "enum_value", text=attribute.name)
-            if attribute.is_optional:
-                row.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
+        draw_attributes(self.props.constraint_attributes, self.layout)
 
 
 class BIM_PT_object_constraints(Panel):
@@ -61,9 +74,12 @@ class BIM_PT_object_constraints(Panel):
     bl_space_type = "PROPERTIES"
     bl_region_type = "WINDOW"
     bl_context = "object"
+    bl_parent_id = "BIM_PT_misc_object"
 
     @classmethod
     def poll(cls, context):
+        if not context.active_object:
+            return False
         if not IfcStore.get_element(context.active_object.BIMObjectProperties.ifc_definition_id):
             return False
         return bool(context.active_object.BIMObjectProperties.ifc_definition_id)
@@ -92,7 +108,7 @@ class BIM_PT_object_constraints(Panel):
                 constraint = Data.objectives[constraint_id]
                 icon = "LIGHT"
             except:
-                pass # Metric not implemented
+                pass  # Metric not implemented
             row = self.layout.row(align=True)
             row.label(text=constraint.get("Name") or "Unnamed")
             row.operator("bim.unassign_constraint", text="", icon="X").constraint = constraint_id
@@ -102,7 +118,7 @@ class BIM_PT_object_constraints(Panel):
             row = self.layout.row(align=True)
             icon = "LIGHT" if self.props.is_adding == "IfcObjective" else "FILE_HIDDEN"
             row.label(text="Adding {}".format(self.props.is_adding), icon=icon)
-            row.operator("bim.disable_assigning_constraint", text="", icon="X")
+            row.operator("bim.disable_assigning_constraint", text="", icon="CANCEL")
             self.layout.template_list(
                 "BIM_UL_object_constraints",
                 "",
@@ -125,7 +141,7 @@ class BIM_UL_constraints(UIList):
             if context.scene.BIMConstraintProperties.active_constraint_id == item.ifc_definition_id:
                 if context.scene.BIMConstraintProperties.is_editing == "IfcObjective":
                     row.operator("bim.edit_objective", text="", icon="CHECKMARK")
-                row.operator("bim.disable_editing_constraint", text="", icon="X")
+                row.operator("bim.disable_editing_constraint", text="", icon="CANCEL")
             elif context.scene.BIMConstraintProperties.active_constraint_id:
                 row.operator("bim.remove_constraint", text="", icon="X").constraint = item.ifc_definition_id
             else: