New icon tabbed interface so you don't need to click twice to change tab.

In the past, we used undo_pre and redo_pre and a bunch of complex commit_link and rollback_link tracking to figure out what IDs and GUIDs were added / removed during transactions and how to handle invalidated objects in the id/guid maps.

I really don't know why I made it that complex.

Now we simply treat all data as bad and rebuild the either map. This means slower undos / redos for large projects, but in theory the maps will never invalidate.

This either fixes a lot of things or breaks a lot of things :) Watch out!

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

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py37, py39, py310]
+        pyver: [py39, py310]
         config:
           - {
             name: "Windows Build",

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

@@ -4,6 +4,7 @@ on:
   push:
       paths:
         - .github/workflows/ci-ifcopenshell-conda-daily.yml
+        - conda/**
   schedule:
   #         ┌───────────── minute (0 - 59)
   #         │  ┌───────────── hour (0 - 23)
@@ -53,11 +54,13 @@ jobs:
           sudo mv -v MacOSX10.13.sdk /opt/ && \
           ls /opt/
       - uses: seanmiddleditch/gha-setup-ninja@master
-      - uses: conda-incubator/setup-miniconda@v2  # https://github.com/conda-incubator/setup-miniconda
+      - uses: mamba-org/provision-with-micromamba@main # https://github.com/mamba-org/provision-with-micromamba
         with:
-          activate-environment: conda-build
-          python-version: ${{ matrix.pyver.distver }}
+          channels: conda-forge
+          channel-priority: strict
           environment-file: conda/environment.yml
+          extra-specs: |
+            python=${{ matrix.pyver.distver }}
       - name: build, test and upload ifcopenshell
         if: ${{ matrix.platform.upload == 'true' }}
         run: |

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

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

.gitignore

@@ -86,7 +86,15 @@ src/blenderbim/blenderbim/libs
 
 # blenderbim test temp files
 src/blenderbim/test/files/temp
+src/blenderbim/drawings
+src/blenderbim/layouts
 
 # ifcopenshell swig and compiled files
 src/ifcopenshell-python/ifcopenshell/_ifcopenshell_wrapper.so
 src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
+
+# apple
+.DS_Store
+
+# Brickschema
+src/blenderbim/blenderbim/bim/schema/Brick.ttl

README.md

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

aws/lambda/Dockerfile

@@ -0,0 +1,40 @@
+# Dockerfile for Running AWS Lambda Function with Python and IfcOpenShell
+
+# Base image: Python 3.9 from AWS's public container registry
+FROM public.ecr.aws/docker/library/python:3.9 AS build
+
+# Set the location of your Lambda function code
+ARG FUNCTION_DIR="/var/task"
+
+# Install necessary packages
+RUN apt-get -y update && apt-get -y install unzip curl
+
+# Install AWS Lambda runtime interface client
+RUN pip install --target ${FUNCTION_DIR} awslambdaric
+
+# Set the IfcOpenShell build version (check available builds at: https://blenderbim.org/docs-python/ifcopenshell-python/installation.html)
+ARG IFC_OPENSHELL_BUILD="39-v0.7.0-476ab50"
+
+# Download and extract IfcOpenShell
+RUN curl https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-${IFC_OPENSHELL_BUILD}-linux64.zip -O && \
+    unzip ifcopenshell-python-${IFC_OPENSHELL_BUILD}-linux64.zip && \
+    mv ifcopenshell ${FUNCTION_DIR} && \
+    rm ifcopenshell-python-${IFC_OPENSHELL_BUILD}-linux64.zip
+
+# Copy the requirements file and install dependencies
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+
+# Copy the Lambda function code
+COPY ./example_handler ${FUNCTION_DIR}/example_handler
+
+# Set the working directory
+WORKDIR ${FUNCTION_DIR}
+
+# Set the entrypoint for the Lambda function
+ENTRYPOINT [ "/usr/local/bin/python", "-m", "awslambdaric" ]
+
+# Set the Python import path to the Lambda function handler
+# This path is relative to the root of the Lambda function code (FUNCTION_DIR)
+# Lambda invocation will look for this path
+CMD ["example_handler.extract_wall_psets_handler"]

aws/lambda/example_handler/__init__.py

@@ -0,0 +1,27 @@
+import ifcopenshell
+import ifcopenshell.util.element
+import boto3
+
+s3 = boto3.client('s3')
+
+def extract_wall_psets_handler(event, context):
+    print("Hello from lambda")
+    print("Event: {}".format(event))
+    print("Context: {}".format(context))
+
+    filename = event['body']['filename']
+    
+    s3.download_file('my_ifc_files_bucket', filename, f'/tmp/{filename}')
+    ifc_file = ifcopenshell.open(f'/tmp/{filename}')
+    walls = ifc_file.by_type('IfcWall')
+    
+    psets = []
+    for wall in walls:
+        wall_data = ifcopenshell.util.element.get_psets(wall)
+        wall_data['id'] = wall.GlobalId
+        psets.append(wall_data)
+
+    return {
+        'statusCode': 200,
+        'body': psets
+    }

aws/lambda/requirements.txt

@@ -0,0 +1 @@
+boto3

cmake/CMakeLists.txt

@@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 3.1.3)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)  # not necessary, but encouraged
 
-project (IfcOpenShell VERSION 0.7.0)
+project(IfcOpenShell VERSION 0.7.0)
 
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
@@ -54,12 +54,14 @@ OPTION(USE_VLD "Use Visual Leak Detector for debugging memory leaks, MSVC-only."
 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)
 OPTION(MSVC_PARALLEL_BUILD "Multi-threaded compilation in Microsoft Visual Studio (/MP)" OFF)
+OPTION(NO_WARN "Disable all warnings" OFF)
 OPTION(WASM_BUILD OFF)
 if (${HAS_MAX})
 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)
+OPTION(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." 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)
@@ -72,6 +74,14 @@ if(MSVC AND MSVC_PARALLEL_BUILD)
 	add_definitions("/MP")
 endif()
 
+if(NO_WARN)
+    if(MSVC)
+        add_compile_options("/w")
+    else()
+        add_compile_options("-w")
+    endif()
+endif()
+
 # QtViewer requires Qt5
 OPTION(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF)
 include(GNUInstallDirs)
@@ -137,11 +147,6 @@ 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)
-endif()
-UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
-UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
-
-if (NOT MINIMAL_BUILD)
 UNIFY_ENVVARS_AND_CACHE(CGAL_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(CGAL_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(GMP_INCLUDE_DIR)
@@ -149,6 +154,8 @@ UNIFY_ENVVARS_AND_CACHE(GMP_LIBRARY_DIR)
 UNIFY_ENVVARS_AND_CACHE(MPFR_INCLUDE_DIR)
 UNIFY_ENVVARS_AND_CACHE(MPFR_LIBRARY_DIR)
 endif()
+UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
+UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
 
 if(WASM_BUILD)
     # when using the nix/build-all.py build script we should not
@@ -170,6 +177,54 @@ add_definitions(-DWITH_GLTF)
 set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()
 
+# Add USD support to serializers 
+if(NOT MINIMAL_BUILD AND USD_SUPPORT)
+    UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
+    UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
+
+    if("${USD_INCLUDE_DIR}" STREQUAL "")
+        find_path(USD_INCLUDE_DIR pxr.h
+            [PATHS
+                /usr/include/pxr
+                /usr/local/include/pxr
+            ]
+            REQUIRED
+        )
+        if(USD_INCLUDE_DIR)
+            message(STATUS "Found USD include files in: ${USD_INCLUDE_DIR}")
+        else()
+            message(FATAL_ERROR "Unable to find USD include directory, specify USD_INCLUDE_DIR manually.")
+        endif()
+    else()
+        set(USD_INCLUDE_DIR ${USD_INCLUDE_DIR} CACHE FILEPATH "USD header files")
+        message(STATUS "Looking for USD include files in: ${USD_INCLUDE_DIR}")
+    endif()
+
+    set(USD_LIBRARIES
+            usd_usd 
+            usd_usdGeom
+            usd_usdShade 
+            usd_usdLux 
+            usd_vt 
+            usd_sdf 
+            usd_tf 
+            usd_gf
+        )
+
+    find_library(USD_LIBRARY
+        NAMES ${USD_LIBRARIES}
+        PATHS ${USD_LIBRARY_DIR})
+    if(USD_LIBRARY)
+        message(STATUS "USD libraries ${USD_LIBRARIES} found in: ${USD_LIBRARY_DIR}")
+        link_directories(${USD_LIBRARY_DIR})
+    else()
+        message(FATAL_ERROR "Unable to find USD libraries in: ${USD_LIBRARY_DIR}")
+    endif()
+
+    add_definitions(-DWITH_USD)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
+endif()
+
 # Set INSTALL_RPATH for target
 MACRO(SET_INSTALL_RPATHS _target _paths)
     SET(${_target}_rpaths "")
@@ -633,6 +688,7 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
+    ${USD_INCLUDE_DIR}
 )
 
 function(files_for_ifc_version IFC_VERSION RESULT_NAME)
@@ -841,9 +897,9 @@ 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} ${OPENCOLLADA_LIBRARIES})
+TARGET_LINK_LIBRARIES(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES})
 
-endif(BUILD_CONVERT or BUILD_IFCPYTHON)
+endif(BUILD_CONVERT OR BUILD_IFCPYTHON)
 
 if (BUILD_CONVERT)
 
@@ -854,7 +910,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} ${HDF5_LIBRARIES})
+TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
 
 if ((NOT WIN32) AND BUILD_SHARED_LIBS)
     # Only set RPATHs when building shared libraries (i.e. IfcParse and
@@ -897,7 +953,7 @@ find_package (Git)
 if (GIT_FOUND)
 	message("git found: ${GIT_EXECUTABLE} with version ${GIT_VERSION_STRING}")
 	execute_process(
-		COMMAND ${GIT_EXECUTABLE} branch --contains HEAD
+		COMMAND ${GIT_EXECUTABLE} branch -a --contains HEAD
 		OUTPUT_VARIABLE git_branches
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
@@ -906,7 +962,8 @@ if (GIT_FOUND)
 		string(REPLACE "*" "" git_branch_candidate_temp "${git_branch_candidate}")
 		string(STRIP "${git_branch_candidate_temp}" git_branch_candidate_2)
 		if (NOT git_branch_candidate_2 MATCHES "^HEAD$")
-			set(git_branch ${git_branch_candidate_2})
+			string(REPLACE "/" ";" git_branch_candidate_2_list "${git_branch_candidate_2}")
+			list(GET git_branch_candidate_2_list -1 git_branch)
 		endif()
 	endforeach()
 	execute_process(

conda/build.sh

@@ -41,4 +41,4 @@ cmake -G Ninja \
 
 ninja
 
-ninja install -j 2
+ninja install -j 1

conda/environment.yml

@@ -10,5 +10,4 @@ dependencies:
   - ripgrep
   - pip
   - pip:
-      - --extra-index-url https://lief.s3-website.fr-par.scw.cloud/latest
-      - lief==0.13.0.dev0
+      - lief==0.13

conda/meta.yaml

@@ -24,7 +24,7 @@ requirements:
   host:
     - python
     - boost-cpp
-    - occt
+    - occt ==7.7.0
     - libxml2
     - cgal-cpp
     - hdf5
@@ -32,11 +32,12 @@ requirements:
     - gmp  # [unix]
     - mpir  # [win]
     - nlohmann_json
+    - zlib
 
   run:
     - python
     - boost-cpp
-    - occt
+    - occt ==7.7.0
     - libxml2
     - cgal-cpp
     - hdf5
@@ -44,6 +45,7 @@ requirements:
     - gmp  # [unix]
     - mpir  # [win]
     - nlohmann_json
+    - zlib
 
 test:
   imports:

nix/build-all.py

@@ -59,6 +59,10 @@ import multiprocessing
 import platform
 import sysconfig
 
+# @todo temporary for expired mpfr.org certificate on 2023-04-08
+import ssl
+ssl._create_default_https_context = ssl._create_unverified_context
+
 from urllib.request import urlretrieve
 
 

src/bcf/CITATION.cff

@@ -0,0 +1,20 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: bcf
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - name: "IfcOpenShell contributors"
+repository-code: >-
+  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/bcf
+abstract: >-
+  Library to read and write BCF-XML and query OpenCDE
+  BCF-API modules
+keywords:
+  - BCF
+  - IFC
+license: LGPL-3.0-or-later

src/bcf/pyproject.toml

@@ -11,7 +11,7 @@ name = "bcf-client"
 description = "BCF-XML file handler."
 readme = "README.md"
 requires-python = ">=3.8"
-keywords = ["IFC", "BCF", "BIM", "eingineering"]
+keywords = ["IFC", "BCF", "BIM"]
 dependencies = [
     "xsdata",
     "numpy",

src/bcf/src/bcf/v2/topic.py

@@ -275,6 +275,7 @@ class TopicHandler:
         """
         new_viewpoint = VisualizationInfoHandler.create_new(element, self._xml_handler)
         self.add_visinfo_handler(new_viewpoint)
+        return new_viewpoint
 
     def add_viewpoint_from_point_and_guids(self, position: NDArray[np.float_], *guids: str) -> None:
         """Add a viewpoint pointing at an XYZ point in space
@@ -287,6 +288,7 @@ class TopicHandler:
             position, *guids, xml_handler=self._xml_handler
         )
         self.add_visinfo_handler(vi_handler)
+        return vi_handler
 
     def add_visinfo_handler(self, new_viewpoint: VisualizationInfoHandler) -> None:
         self.viewpoints[new_viewpoint.guid + ".bcfv"] = new_viewpoint

src/blenderbim/CITATION.cff

@@ -0,0 +1,26 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: BlenderBIM Add-on
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - name: "IfcOpenShell contributors"
+repository-code: >-
+  https://github.com/IfcOpenShell/IfcOpenShell/tree/v0.7.0/src/blenderbim
+url: 'https://blenderbim.org/'
+repository-artifact: 'https://blenderbim.org/download.html'
+abstract: >-
+  Add-on to Blender providing a graphical native IFC
+  authoring platform
+keywords:
+  - IFC
+  - Blender
+  - NativeIFC
+license: GPL-3.0-or-later
+commit: 1fb6dac
+version: v0.0.230506
+date-released: '2023-05-23'

src/blenderbim/Makefile

@@ -36,12 +36,9 @@ endif
 endif
 
 VERSION:=`date '+%y%m%d'`
-PYVERSION:=py37
+LAST_COMMIT_HASH:=$(shell git rev-parse HEAD)
+PYVERSION:=py310
 
-ifeq ($(PYVERSION), py37)
-PYLIBDIR:=python3.7
-PYNUMBER:=37
-endif
 ifeq ($(PYVERSION), py39)
 PYLIBDIR:=python3.9
 PYNUMBER:=39
@@ -52,123 +49,100 @@ PYNUMBER:=310
 endif
 
 ifeq ($(PLATFORM), linux)
-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
-SHAPELY_URL:=https://files.pythonhosted.org/packages/1d/a4/931d0780f31f3ea8c4f9ef6464a2825137c5241e6707a5fb03bef760a7eb/shapely-2.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/ed/d5/c2e84e1e36ab8ebea033921d5886a056c77e18bab5ab1051fcc22de2e8a2/Pillow-9.2.0-cp37-cp37m-manylinux_2_28_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
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/linux-64/hpp-fcl-2.3.4-py39h40a70d0_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/linux-64/eigenpy-3.1.0-py39hdfdd6bb_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py39h7c9e3ff_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/19/d9/a69c6aff5673554df48120565a14a50eaa41d29ae03b02faa0b023666318/lxml-4.6.3-cp39-cp39-manylinux2014_x86_64.whl
 SHAPELY_URL:=https://files.pythonhosted.org/packages/2d/f2/8ec281d357e8bb7d08dc8d727f0e4c8ef3dae7d3fa75c69c8e452bb82d50/shapely-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/01/61/3ff85fb4bb596ce3d223c8fcf93c8df5c12bc8899dfb4fb3cb1c5b20dd5f/Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/linux-64/hpp-fcl-1.8.0-py310hdaf7e41_1.tar.bz2
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/linux-64/eigenpy-2.6.11-py310hf3e5c9c_0.tar.bz2
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/linux-64/boost-1.74.0-py310h7c3ba0c_5.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/linux-64/hpp-fcl-2.3.4-py310h995690b_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/linux-64/eigenpy-3.1.0-py310hf02b7e0_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/linux-64/boost-1.78.0-py310hc4a4660_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/linux-64/qhull-2020.2-h4bd325d_2.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/25/1e/19b46d8e8881fe0df2e20945d51919eeb1817836d62a90efa8506530e45c/lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl
 SHAPELY_URL:=https://files.pythonhosted.org/packages/a8/a5/403728b5614b28083f6424dfdefec5fcf58068495fb03bb08532671c642f/shapely-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/f6/51/320986ebd6d46a0e95c2240468ced73153b691ce07617078bcdf30c609ec/Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/linux-64/assimp-5.0.1-hedfc422_6.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/linux-64/octomap-1.9.7-h4bd325d_0.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/linux-64/octomap-1.9.8-h924138e_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/linux-64/boost-cpp-1.78.0-h6582d0a_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2
 endif
 
 ifeq ($(PLATFORM), macos)
-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
-SHAPELY_URL:=https://files.pythonhosted.org/packages/e6/7d/4923f27c340339e1c896c77cafc8ed672c8d381a025bbab6c6ddcba27e8f/shapely-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/88/49/c26fc3b5b0e82bdc9d8751d6b939da29327b0d98f7c3b95a575cbfed2743/Pillow-9.2.0-cp37-cp37m-macosx_10_10_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
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-64/hpp-fcl-2.3.4-py39hd85b194_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-64/eigenpy-3.1.0-py39hc4d6e28_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py39h953a6b8_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/b8/74/a71f7ad72e8db54ce899efab84507b801660750cbbfa6a39e6717557d36a/lxml-4.6.3-cp39-cp39-macosx_10_9_x86_64.whl
 SHAPELY_URL:=https://files.pythonhosted.org/packages/36/a4/7e542a209f862f967d7cb8e939eff155f4294a27d17e16441fb8bdd51a2c/shapely-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/88/7a/ddfe28b485b623361457d4783007c1f9ba83a87f93e7fec32f64793efb6c/Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-64/hpp-fcl-1.8.0-py310h651ac30_1.tar.bz2
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/osx-64/eigenpy-2.6.11-py310hc03097c_0.tar.bz2
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/osx-64/boost-1.74.0-py310h509978a_5.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-64/hpp-fcl-2.3.4-py310h1db6f5f_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-64/eigenpy-3.1.0-py310h43da829_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-64/boost-1.78.0-py310h3e792ce_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-64/qhull-2020.2-h940c156_2.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/a1/44/17b7dac7a18807d30e2fe10c3328c152808f5464565e230bfd0e77f178c6/lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl
 SHAPELY_URL:=https://files.pythonhosted.org/packages/1f/2a/dc3353c2431cf53e8d04bb8fba27e584410ca3435c9c85f76d71bf0c0e80/shapely-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/d8/60/b13c00d403f34110e96c1b5c0afa73ce461efe3fe960c3a7e3e7fe190d82/Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-64/assimp-5.0.1-h1224e73_6.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/osx-64/octomap-1.9.7-h940c156_0.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-64/octomap-1.9.8-hb8565cd_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-64/boost-cpp-1.78.0-hf5ba120_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-64/zlib-1.2.11-h7795811_1010.tar.bz2
 endif
 
 ifeq ($(PLATFORM), macosm1)
-ifeq ($(PYVERSION), py37)
-# Warning: py37 not supported on Apple M1
-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://anaconda.org/conda-forge/lxml/4.9.1/download/osx-64/lxml-4.9.1-py37h994c40b_0.tar.bz2
-SHAPELY_URL:=https://files.pythonhosted.org/packages/e6/7d/4923f27c340339e1c896c77cafc8ed672c8d381a025bbab6c6ddcba27e8f/shapely-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
-endif
 ifeq ($(PYVERSION), py39)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.7.5/download/osx-arm64/hpp-fcl-1.7.5-py39ha69f3c1_2.tar.bz2
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.7/download/osx-arm64/eigenpy-2.6.7-py39ha69f3c1_0.tar.bz2
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h2550fe3_0.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-arm64/hpp-fcl-2.3.4-py39hc34188a_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-arm64/eigenpy-3.1.0-py39h13cfc01_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py39h99de9ae_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
 LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py39h9eb174b_0.tar.bz2
 SHAPELY_URL:=https://files.pythonhosted.org/packages/ea/aa/45fbd031edf3149cb767d8b9f9db45d5faf0324d743c6b8fb0298cc022d0/shapely-2.0.1-cp39-cp39-macosx_11_0_arm64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/aa/bc/21097cd891dd2fa02f2b3d767e02e883e026482e59d29975d1bc30024aa3/Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/osx-arm64/hpp-fcl-1.8.0-py310h5699539_2.tar.bz2
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.9/download/osx-arm64/eigenpy-2.6.9-py310habfc766_1.tar.bz2
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h4566fd1_0.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/osx-arm64/hpp-fcl-2.3.4-py310h46fc4cd_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/osx-arm64/eigenpy-3.1.0-py310ha2643af_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/osx-arm64/boost-1.78.0-py310h629746b_4.tar.bz2
+QHULL_URL:=https://anaconda.org/conda-forge/qhull/2020.2/download/osx-arm64/qhull-2020.2-hc021e02_2.tar.bz2
 LXML_URL:=https://anaconda.org/conda-forge/lxml/4.9.1/download/osx-arm64/lxml-4.9.1-py310h02f21da_0.tar.bz2
 SHAPELY_URL:=https://files.pythonhosted.org/packages/ec/41/d59208743e737184e1b403e95a937aebb022b8459e99efbcd5208fc8be46/shapely-2.0.1-cp310-cp310-macosx_11_0_arm64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/0c/5f/117b653cad585f3aedfe0de996c292e67d4b020ed77f652e5a6c8c24f908/Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl
 endif
 ASSIMP_URL:=https://anaconda.org/conda-forge/assimp/5.0.1/download/osx-arm64/assimp-5.0.1-h0f81e16_7.tar.bz2
-OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.7/download/osx-arm64/octomap-1.9.7-hc021e02_0.tar.bz2
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/osx-arm64/octomap-1.9.8-hffc8910_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/osx-arm64/boost-cpp-1.78.0-h9ed8d21_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/osx-arm64/zlib-1.2.11-h90dfc92_1014.tar.bz2
 endif
 
 ifeq ($(PLATFORM), win)
-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
-SHAPELY_URL:=https://files.pythonhosted.org/packages/e2/87/b8b8d8d57b429b01aa56b7d723075c09f33c988b8091bb6f790c83436909/shapely-2.0.1-cp37-cp37m-win_amd64.whl
-PILLOW_URL:=https://files.pythonhosted.org/packages/69/f5/9e802159d78b2eaf26bf1f8b94648605993f5ca7247ac8870f065063fc40/Pillow-9.2.0-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
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/win-64/hpp-fcl-2.3.4-py39h39b25cb_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/win-64/eigenpy-3.1.0-py39hb6c915b_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py39hea4d8d1_4.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/72/d4/426ecb8849c47c3e370c87aa0ac05d85768df917ffea27fcd6686a5e6495/lxml-4.6.3-cp39-cp39-win_amd64.whl
 SHAPELY_URL:=https://files.pythonhosted.org/packages/a7/ae/eab645c4075093584b7a65ab71cb8ff4563a015bd935c9b55dba14b2c1eb/shapely-2.0.1-cp39-cp39-win_amd64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/19/3f/b4d4bcf05dbcbe07f2e9613a8f4180c297395e73a91d8ad22c32c6624f8c/Pillow-9.2.0-cp39-cp39-win_amd64.whl
 endif
 ifeq ($(PYVERSION), py310)
-HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/1.8.0/download/win-64/hpp-fcl-1.8.0-py310hc5a3c62_1.tar.bz2
-EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/2.6.11/download/win-64/eigenpy-2.6.11-py310hbd43d28_0.tar.bz2
-BOOST_URL:=https://anaconda.org/conda-forge/boost/1.74.0/download/win-64/boost-1.74.0-py310hc781a3c_5.tar.bz2
+HPPFCL_URL:=https://anaconda.org/conda-forge/hpp-fcl/2.3.4/download/win-64/hpp-fcl-2.3.4-py310heb59267_0.conda
+EIGENPY_URL:=https://anaconda.org/conda-forge/eigenpy/3.1.0/download/win-64/eigenpy-3.1.0-py310hd146abe_0.conda
+BOOST_URL:=https://anaconda.org/conda-forge/boost/1.78.0/download/win-64/boost-1.78.0-py310h220cb41_4.tar.bz2
 LXML_URL:=https://files.pythonhosted.org/packages/f6/71/65c80a4caa1617a4c6e8fe1500cebb179db96232e2f623bfe6a1f4294e39/lxml-4.8.0-cp310-cp310-win_amd64.whl
 SHAPELY_URL:=https://files.pythonhosted.org/packages/81/8a/7ac076a86b2632f1872284c5e60ed5f2fc26094875a85b35d9fa17b52504/shapely-2.0.1-cp310-cp310-win_amd64.whl
 PILLOW_URL:=https://files.pythonhosted.org/packages/02/55/67a3c17b9e7d972ed8c246f104da99ca4f3ea42fba566697e479011b84b6/Pillow-9.2.0-cp310-cp310-win_amd64.whl
 endif
 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
+OCTOMAP_URL:=https://anaconda.org/conda-forge/octomap/1.9.8/download/win-64/octomap-1.9.8-h91493d7_0.tar.bz2
+BOOSTCPP_URL:=https://anaconda.org/conda-forge/boost-cpp/1.78.0/download/win-64/boost-cpp-1.78.0-h9f4b32c_3.conda
 ZLIB_URL:=https://anaconda.org/conda-forge/zlib/1.2.11/download/win-64/zlib-1.2.11-h62dcd97_1010.tar.bz2
 endif
 
@@ -190,7 +164,7 @@ endif
 	cp -r blenderbim/* dist/blenderbim/
 
 	# Provides IfcOpenShell Python functionality
-	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-476ab50-$(PLATFORM)64.zip
+	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-fc50bdd-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcopenshell-python*
 	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/
 
@@ -206,9 +180,7 @@ endif
 	# IfcOpenBot sometimes lags behind, so we hotfix the Python utilities
 	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/
-	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/validate.py dist/blenderbim/libs/site/packages/ifcopenshell/
+	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/*.py dist/blenderbim/libs/site/packages/ifcopenshell/
 	cp dist/working/IfcOpenShell-0.7.0/src/ifcopenshell-python/ifcopenshell/express/rule_executor.py dist/blenderbim/libs/site/packages/ifcopenshell/express/
 	# Provides bcf functionality
 	cp -r dist/working/IfcOpenShell-0.7.0/src/bcf/src/bcf dist/blenderbim/libs/site/packages/
@@ -236,6 +208,11 @@ endif
 	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/
+	# Provides IfcGit functionality
+	cd dist/working && . env/bin/activate && $(PIP) install GitPython --target=./site-packages
+	cp -r dist/working/site-packages/smmap dist/blenderbim/libs/site/packages/
+	cp -r dist/working/site-packages/gitdb dist/blenderbim/libs/site/packages/
+	cp -r dist/working/site-packages/git dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
 	# Provides Mustache templating in construction documentation
@@ -403,14 +380,16 @@ endif
 	cd dist/working && . env/bin/activate && $(PIP) install cjio --target=./site-packages
 	# Provides express rule validation for ifcopenshell.validate
 	cd dist/working && . env/bin/activate && $(PIP) install pytest --target=./site-packages
-	cd dist/working/site-packages/ && rm -r *dist-info*
+	# Provides Brickschema functionality
+	cd dist/working && . env/bin/activate && $(PIP) install brickschema[persistence] --target=./site-packages
 	cp -r dist/working/site-packages/* dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
 	# Required by IFCClash
 	mkdir dist/working
 	cd dist/working && wget $(HPPFCL_URL)
-	cd dist/working && tar -xf hpp-fcl*
+	cd dist/working && unzip hpp-fcl*
+	cd dist/working && tar -I zstd -xvf pkg*
 ifeq ($(PLATFORM), linux)
 	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
 	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
@@ -419,6 +398,10 @@ ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Lib/site-packages/hppfcl dist/blenderbim/libs/site/packages/
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
@@ -435,21 +418,45 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
 	rm -rf dist/working
 
-	# Required by hpp-fcl
+	# Required by hpp-fcl except on Windows
+ifneq ($(PLATFORM), win)
 	mkdir dist/working
-	cd dist/working && wget $(EIGENPY_URL)
-	cd dist/working && tar -xf eigenpy*
+	cd dist/working && wget $(QHULL_URL)
+	cd dist/working && tar -xf qhull*
 ifeq ($(PLATFORM), linux)
 	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
 endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+	rm -rf dist/working
+endif
+
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(EIGENPY_URL)
+	cd dist/working && unzip eigenpy*
+	cd dist/working && tar -I zstd -xvf pkg*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/*.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
@@ -465,6 +472,9 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
 ifeq ($(PLATFORM), win)
 	# Uh, do nothing, apparently? No DLLs are shipped.
 endif
@@ -480,11 +490,33 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
 	rm -rf dist/working
 
+	# Required by hpp-fcl
+	mkdir dist/working
+	cd dist/working && wget $(BOOSTCPP_URL)
+	cd dist/working && unzip boost-cpp*
+	cd dist/working && tar -I zstd -xvf pkg*
+ifeq ($(PLATFORM), linux)
+	cp -r dist/working/lib/libboost_serialization.so* dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macos)
+	cp -r dist/working/lib/libboost_serialization.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/libboost_serialization.dylib dist/blenderbim/libs/
+endif
+ifeq ($(PLATFORM), win)
+	cp -r dist/working/Library/bin/boost_serialization.dll dist/blenderbim/libs/site/packages/hppfcl/
+endif
+	rm -rf dist/working
+
 	# Required by hpp-fcl
 	mkdir dist/working
 	cd dist/working && wget $(ZLIB_URL)
@@ -495,6 +527,9 @@ endif
 ifeq ($(PLATFORM), macos)
 	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
 endif
+ifeq ($(PLATFORM), macosm1)
+	cp -r dist/working/lib/*.dylib dist/blenderbim/libs/
+endif
 ifeq ($(PLATFORM), win)
 	cp -r dist/working/Library/bin/*.dll dist/blenderbim/libs/site/packages/hppfcl/
 endif
@@ -613,37 +648,11 @@ endif
 
 	# Provides Brickschema functionality
 	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
-
 	# Required by brickschema
 	# This is a bit of a dodgy one, it should be provided by setuptools which Blender doesn't ship.
 	mkdir dist/working
@@ -659,7 +668,15 @@ endif
 	cp -r dist/working/bpypolyskel-master/bpypolyskel dist/blenderbim/libs/site/packages/
 	rm -rf dist/working
 
+	# Required for Desktop icon and file association
+	cp -r blenderbim/libs/desktop dist/blenderbim/libs/
+
+	# Remove dependencies also bundled with Blender
+	rm -rf dist/blenderbim/libs/site/packages/numpy
+	rm -rf dist/blenderbim/libs/site/packages/numpy.libs
+
 	cd dist/blenderbim && $(SED) "s/999999/$(VERSION)/" __init__.py
+	cd dist/blenderbim/bim && $(SED) "s/8888888/$(LAST_COMMIT_HASH)/" __init__.py
 	cd dist && zip -r blenderbim-$(VERSION)-$(PYVERSION)-$(PLATFORM).zip ./*
 	rm -rf dist/blenderbim
 

src/blenderbim/blenderbim/__init__.py

@@ -34,7 +34,8 @@ bl_info = {
 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"))
+    # site.addsitedir(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "libs", "site", "packages"))
 
     import blenderbim.bim
 

src/blenderbim/blenderbim/bim/__init__.py

@@ -16,10 +16,16 @@
 # 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
 import bpy
+import bpy.utils.previews
+import blenderbim
 import importlib
 from . import handler, ui, prop, operator, helper
 
+cwd = os.path.dirname(os.path.realpath(__file__))
+
 modules = {
     "project": None,
     "search": None,
@@ -70,6 +76,7 @@ modules = {
     "covetool": None,
     "augin": None,
     "debug": None,
+    "ifcgit": 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,
@@ -87,12 +94,15 @@ classes = [
     operator.ConfigureVisibility,
     operator.OpenUpstream,
     operator.OpenUri,
+    operator.SwitchTab,
     operator.ReloadIfcFile,
     operator.RemoveIfcFile,
     operator.SelectDataDir,
     operator.SelectIfcFile,
     operator.ReloadSelectedIfcFile,
     operator.SelectSchemaDir,
+    operator.FileAssociate,
+    operator.FileUnassociate,
     operator.SelectURIAttribute,
     operator.EditBlenderCollection,
     operator.BIM_OT_open_webbrowser,
@@ -102,11 +112,13 @@ classes = [
     prop.ObjProperty,
     prop.Attribute,
     prop.ModuleVisibility,
+    prop.BIMAreaProperties,
     prop.BIMProperties,
     prop.IfcParameter,
     prop.PsetQto,
     prop.GlobalId,
     prop.BIMObjectProperties,
+    prop.BIMCollectionProperties,
     prop.BIMMaterialProperties,
     prop.BIMMeshProperties,
     ui.BIM_PT_section_plane,
@@ -114,6 +126,7 @@ classes = [
     ui.BIM_UL_topics,
     ui.BIM_ADDON_preferences,
     # Scene panel groups
+    ui.BIM_PT_root,
     ui.BIM_PT_project_info,
     ui.BIM_PT_project_setup,
     ui.BIM_PT_collaboration,
@@ -135,25 +148,35 @@ classes = [
 for mod in modules.values():
     classes.extend(mod.classes)
 
+addon_keymaps = []
+icons = None
+is_registering = False
+last_commit_hash = "8888888"
+
 
 def on_register(scene):
-    handler.setDefaultProperties(scene)
+    global is_registering
+
+    if is_registering:
+        return
+    is_registering = True
+    handler.load_post(scene)
     if not bpy.app.background:
         bpy.app.handlers.depsgraph_update_post.remove(on_register)
+    is_registering = False
 
 
 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.load_post)
     bpy.app.handlers.load_post.append(handler.loadIfcStore)
-    bpy.app.handlers.save_post.append(handler.ensureIfcExported)
     bpy.types.Scene.BIMProperties = bpy.props.PointerProperty(type=prop.BIMProperties)
+    bpy.types.Screen.BIMAreaProperties = bpy.props.CollectionProperty(type=prop.BIMAreaProperties)
+    bpy.types.Collection.BIMCollectionProperties = bpy.props.PointerProperty(type=prop.BIMCollectionProperties)
     bpy.types.Object.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
     bpy.types.Material.BIMObjectProperties = bpy.props.PointerProperty(type=prop.BIMObjectProperties)
     bpy.types.Material.BIMMaterialProperties = bpy.props.PointerProperty(type=prop.BIMMaterialProperties)
@@ -161,21 +184,55 @@ def register():
     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)
     if hasattr(bpy.types, "UI_MT_button_context_menu"):
         bpy.types.UI_MT_button_context_menu.append(ui.draw_custom_context_menu)
+    bpy.types.STATUSBAR_HT_header.append(ui.draw_statusbar)
 
     for mod in modules.values():
         mod.register()
 
+    wm = bpy.context.window_manager
+    if wm.keyconfigs.addon:
+        km = wm.keyconfigs.addon.keymaps.new(name='Window', space_type='EMPTY')
+        kmi = km.keymap_items.new('bim.switch_tab', 'TAB', 'PRESS', ctrl=True)
+        addon_keymaps.append((km, kmi))
+
+    global icons
+
+    icons_dir = os.path.join(cwd, "data", "icons")
+    icon_preview = bpy.utils.previews.new()
+    for filename in os.listdir(icons_dir):
+        if filename.endswith(".png"):
+            icon_name = os.path.splitext(filename)[0]
+            icon_path = os.path.join(icons_dir, filename)
+            icon_preview.load(icon_name, icon_path, "IMAGE")
+
+    icons = icon_preview
+
+    global last_commit_hash
+    try:
+        import git
+        path = Path(__file__).resolve().parent
+        repo = git.Repo(str(path), search_parent_directories=True)
+        last_commit_hash = repo.head.object.hexsha
+    except:
+        pass
 
 def unregister():
+    global icons
+
+    bpy.utils.previews.remove(icons)
+
     for cls in reversed(classes):
-        bpy.utils.unregister_class(cls)
-    bpy.app.handlers.load_post.remove(handler.setDefaultProperties)
+        if getattr(cls, "is_registered", None) is None:
+            bpy.utils.unregister_class(cls)
+        elif cls.is_registered:
+            bpy.utils.unregister_class(cls)
+
+    bpy.app.handlers.load_post.remove(handler.load_post)
     bpy.app.handlers.load_post.remove(handler.loadIfcStore)
-    bpy.app.handlers.save_post.remove(handler.ensureIfcExported)
     del bpy.types.Scene.BIMProperties
+    del bpy.types.Collection.BIMCollectionProperties
     del bpy.types.Object.BIMObjectProperties
     del bpy.types.Material.BIMObjectProperties
     del bpy.types.Material.BIMMaterialProperties
@@ -183,9 +240,30 @@ def unregister():
     del bpy.types.Curve.BIMMeshProperties
     del bpy.types.Camera.BIMMeshProperties
     del bpy.types.PointLight.BIMMeshProperties
-    bpy.types.SCENE_PT_unit.remove(ui.ifc_units)
     if hasattr(bpy.types, "UI_MT_button_context_menu"):
         bpy.types.UI_MT_button_context_menu.remove(ui.draw_custom_context_menu)
+    bpy.types.STATUSBAR_HT_header.remove(ui.draw_statusbar)
 
     for mod in reversed(list(modules.values())):
         mod.unregister()
+
+    wm = bpy.context.window_manager
+    kc = wm.keyconfigs.addon
+    if kc:
+        for km, kmi in addon_keymaps:
+            km.keymap_items.remove(kmi)
+    addon_keymaps.clear()
+
+    for panel in [
+        "SCENE_PT_scene",
+        "SCENE_PT_unit",
+        "SCENE_PT_physics",
+        "SCENE_PT_rigid_body_world",
+        "SCENE_PT_audio",
+        "SCENE_PT_keying_sets",
+        "SCENE_PT_custom_props",
+    ]:
+        try:
+            bpy.utils.unregister_class(getattr(handler, f"Override_{panel}"))
+        except:
+            pass

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

@@ -22,6 +22,7 @@
 text, tspan { /* 2.5mm */ fill: black; stroke: none; font-family: 'OpenGost Type B TT', 'DejaVu Sans Condensed', 'Liberation Sans', 'Arial Narrow', 'Arial'; font-size: 4.13px; }
 .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; }
+.surface { stroke: none; fill: #fff; fill-rule: evenodd; }
 .annotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .IfcAnnotation { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 0.25; }
 .IfcGeographicElement { fill: none; stroke: black; stroke-linecap: 'round'; stroke-width: 1; }

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

@@ -75,7 +75,7 @@
     <marker id="stair-marker-end" markerHeight="42" markerWidth="21" orient="auto" refX="21" refY="21">
         <path d="M 0 0 L 21 21 L 0 42" class="annotation stair" style="stroke-width:2; marker-start: none; marker-end: none;" />
     </marker>
-    <marker id="plan-level-marker" markerHeight="30" markerWidth="30" refX="15" refY="15">
+    <marker id="plan-level-marker" markerHeight="30" markerWidth="30" refX="15" refY="15" orient="auto">
         <g>
             <path d="M 15 0 L 15 30" class="annotation" style="stroke-width:1;" />
             <path d="M 0 15 L 30 15" class="annotation" style="stroke-width:1;" />
@@ -84,7 +84,7 @@
             <path d="M 15 15 L 22.5 15 A 7.5 7.5 0 0 1 15 22.5 Z" fill="black"/>
         </g>
     </marker>
-    <marker id="section-level-marker" markerHeight="11" markerWidth="90" refX="20" refY="10">
+    <marker id="section-level-marker" markerHeight="11" markerWidth="90" refX="20" refY="10" orient="auto-start-reverse">
         <g>
             <path d="M 0 1 L 20 1 L 10 11 Z" fill="black" />
             <path d="M 0 1 L 90 1" class="annotation" style="stroke-width:1;" />
@@ -96,4 +96,12 @@
             <path d="M 7.5 10 L 10 0 L 15 10" class="annotation" style="stroke-width:1; fill: white;" />
         </g>
     </marker>
+    <filter x="0" y="0" width="1" height="1" id="fill-background">
+      <feFlood flood-color="white" result="bg" />
+      <feMerge>
+        <feMergeNode in="bg"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+
 </svg>

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

@@ -17,16 +17,49 @@
     <line x1="0" y1="0" x2="0" y2="3" style="stroke:black; stroke-width:0.25" />
 </pattern>
 <pattern id="square1" width="1" height="1" patternUnits="userSpaceOnUse">
-    <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />
-    <line x1="0" y1="0" x2="1" y2="0" style="stroke:black; stroke-width:0.25" />
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 1 0 1 1" />
 </pattern>
 <pattern id="square2" width="2" height="2" patternUnits="userSpaceOnUse">
-    <line x1="0" y1="0" x2="0" y2="2" style="stroke:black; stroke-width:0.25" />
-    <line x1="0" y1="0" x2="2" y2="0" style="stroke:black; stroke-width:0.25" />
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 2" />
 </pattern>
 <pattern id="square3" width="3" height="3" patternUnits="userSpaceOnUse">
-    <line x1="0" y1="0" x2="0" y2="3" style="stroke:black; stroke-width:0.25" />
-    <line x1="0" y1="0" x2="3" y2="0" style="stroke:black; stroke-width:0.25" />
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 3 0 3 3" />
+</pattern>
+<pattern id="recth1" width="2" height="1" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 1" />
+</pattern>
+<pattern id="recth2" width="4" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 4 0 4 2" />
+</pattern>
+<pattern id="recth3" width="6" height="3" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 6 0 6 3" />
+</pattern>
+<pattern id="rectv1" width="1" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 1 0 1 2" />
+</pattern>
+<pattern id="rectv2" width="2" height="4" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 2 0 2 4" />
+</pattern>
+<pattern id="rectv3" width="3" height="6" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.25; fill: none;" d="M 0 0 3 0 3 6" />
+</pattern>
+<pattern id="tile1" width="2" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 2 0 2 1 0 1 M 1 1 1 2" />
+</pattern>
+<pattern id="tile2" width="4" height="4" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 4 0 4 2 0 2 M 2 2 2 4" />
+</pattern>
+<pattern id="tile3" width="6" height="6" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 6 0 6 3 0 3 M 3 3 3 6" />
+</pattern>
+<pattern id="board1" width="4" height="2" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 4 0 4 1 0 1 M 2 1 2 2" />
+</pattern>
+<pattern id="board2" width="8" height="4" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 8 0 8 2 0 2 M 4 2 4 4" />
+</pattern>
+<pattern id="board3" width="12" height="6" patternUnits="userSpaceOnUse">
+    <path style="stroke: black; stroke-width: 0.15; fill: none;" d="M 0 0 12 0 12 3 0 3 M 6 3 6 6" />
 </pattern>
 <pattern id="crosshatch1" width="1" height="1" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse">
     <line x1="0" y1="0" x2="0" y2="1" style="stroke:black; stroke-width:0.25" />

src/blenderbim/blenderbim/bim/data/assets/shading_styles.json

@@ -0,0 +1,755 @@
+{
+    "Technical": {
+        "render_type": "VIEWPORT",
+        "raster_style": {
+            "bpy.data.worlds[0].color": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "scene.render.bake_bias": 0.0010000000474974513,
+            "scene.render.bake_margin": 16,
+            "scene.render.bake_margin_type": "ADJACENT_FACES",
+            "scene.render.bake_samples": 256,
+            "scene.render.bake_type": "NORMALS",
+            "scene.render.bake_user_scale": 0.0,
+            "scene.render.border_max_x": 1.0,
+            "scene.render.border_max_y": 1.0,
+            "scene.render.border_min_x": 0.0,
+            "scene.render.border_min_y": 0.0,
+            "scene.render.dither_intensity": 1.0,
+            "scene.render.engine": "BLENDER_WORKBENCH",
+            "scene.render.film_transparent": false,
+            "scene.render.filter_size": 1.5,
+            "scene.render.fps": 24,
+            "scene.render.fps_base": 1.0,
+            "scene.render.frame_map_new": 100,
+            "scene.render.frame_map_old": 100,
+            "scene.render.hair_subdiv": 0,
+            "scene.render.hair_type": "STRAND",
+            "scene.render.line_thickness": 1.0,
+            "scene.render.line_thickness_mode": "ABSOLUTE",
+            "scene.render.metadata_input": "SCENE",
+            "scene.render.motion_blur_shutter": 0.5,
+            "scene.render.pixel_aspect_x": 1.0,
+            "scene.render.pixel_aspect_y": 1.0,
+            "scene.render.preview_pixel_size": "AUTO",
+            "scene.render.resolution_percentage": 100,
+            "scene.render.resolution_x": 1000,
+            "scene.render.resolution_y": 1000,
+            "scene.render.sequencer_gl_preview": "SOLID",
+            "scene.render.simplify_child_particles": 1.0,
+            "scene.render.simplify_child_particles_render": 1.0,
+            "scene.render.simplify_gpencil": false,
+            "scene.render.simplify_gpencil_antialiasing": true,
+            "scene.render.simplify_gpencil_modifier": true,
+            "scene.render.simplify_gpencil_onplay": false,
+            "scene.render.simplify_gpencil_shader_fx": true,
+            "scene.render.simplify_gpencil_tint": true,
+            "scene.render.simplify_gpencil_view_fill": true,
+            "scene.render.simplify_shadows": 1.0,
+            "scene.render.simplify_shadows_render": 1.0,
+            "scene.render.simplify_subdivision": 6,
+            "scene.render.simplify_subdivision_render": 6,
+            "scene.render.simplify_volumes": 1.0,
+            "scene.render.stamp_font_size": 12,
+            "scene.render.stamp_note_text": "",
+            "scene.render.threads": 20,
+            "scene.render.threads_mode": "AUTO",
+            "scene.render.use_bake_clear": true,
+            "scene.render.use_bake_lores_mesh": false,
+            "scene.render.use_bake_multires": false,
+            "scene.render.use_bake_selected_to_active": false,
+            "scene.render.use_bake_user_scale": false,
+            "scene.render.use_border": false,
+            "scene.render.use_compositing": true,
+            "scene.render.use_crop_to_border": false,
+            "scene.render.use_file_extension": true,
+            "scene.render.use_freestyle": false,
+            "scene.render.use_high_quality_normals": false,
+            "scene.render.use_lock_interface": false,
+            "scene.render.use_motion_blur": false,
+            "scene.render.use_multiview": false,
+            "scene.render.use_overwrite": true,
+            "scene.render.use_persistent_data": false,
+            "scene.render.use_placeholder": false,
+            "scene.render.use_render_cache": false,
+            "scene.render.use_sequencer": true,
+            "scene.render.use_sequencer_override_scene_strip": false,
+            "scene.render.use_simplify": false,
+            "scene.render.use_single_layer": false,
+            "scene.render.use_stamp": false,
+            "scene.render.use_stamp_camera": true,
+            "scene.render.use_stamp_date": true,
+            "scene.render.use_stamp_filename": true,
+            "scene.render.use_stamp_frame": true,
+            "scene.render.use_stamp_frame_range": false,
+            "scene.render.use_stamp_hostname": false,
+            "scene.render.use_stamp_labels": true,
+            "scene.render.use_stamp_lens": false,
+            "scene.render.use_stamp_marker": false,
+            "scene.render.use_stamp_memory": false,
+            "scene.render.use_stamp_note": false,
+            "scene.render.use_stamp_render_time": true,
+            "scene.render.use_stamp_scene": true,
+            "scene.render.use_stamp_sequencer_strip": false,
+            "scene.render.use_stamp_time": true,
+            "scene.render.views_format": "STEREO_3D",
+            "scene.view_settings.exposure": 0.0,
+            "scene.view_settings.gamma": 1.0,
+            "scene.view_settings.look": "None",
+            "scene.view_settings.use_curve_mapping": false,
+            "scene.view_settings.view_transform": "Standard",
+            "scene.display.shading.aov_name": "",
+            "scene.display.shading.background_color": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "scene.display.shading.background_type": "THEME",
+            "scene.display.shading.cavity_ridge_factor": 1.0,
+            "scene.display.shading.cavity_type": "BOTH",
+            "scene.display.shading.cavity_valley_factor": 1.0,
+            "scene.display.shading.color_type": "SINGLE",
+            "scene.display.shading.curvature_ridge_factor": 1.0,
+            "scene.display.shading.curvature_valley_factor": 1.0,
+            "scene.display.shading.light": "FLAT",
+            "scene.display.shading.object_outline_color": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "scene.display.shading.render_pass": "COMBINED",
+            "scene.display.shading.shadow_intensity": 0.5,
+            "scene.display.shading.show_backface_culling": false,
+            "scene.display.shading.show_cavity": false,
+            "scene.display.shading.show_object_outline": true,
+            "scene.display.shading.show_shadows": false,
+            "scene.display.shading.show_specular_highlight": true,
+            "scene.display.shading.show_xray": false,
+            "scene.display.shading.show_xray_wireframe": false,
+            "scene.display.shading.single_color": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "scene.display.shading.studio_light": "Default",
+            "scene.display.shading.studiolight_background_alpha": 0.0,
+            "scene.display.shading.studiolight_background_blur": 0.0,
+            "scene.display.shading.studiolight_intensity": 0.0,
+            "scene.display.shading.studiolight_rotate_z": 0.0,
+            "scene.display.shading.type": "SOLID",
+            "scene.display.shading.use_compositor": "DISABLED",
+            "scene.display.shading.use_dof": false,
+            "scene.display.shading.use_scene_lights": false,
+            "scene.display.shading.use_scene_lights_render": false,
+            "scene.display.shading.use_scene_world": false,
+            "scene.display.shading.use_scene_world_render": false,
+            "scene.display.shading.use_studiolight_view_rotation": true,
+            "scene.display.shading.use_world_space_lighting": false,
+            "scene.display.shading.wireframe_color_type": "MATERIAL",
+            "scene.display.shading.xray_alpha": 0.5,
+            "scene.display.shading.xray_alpha_wireframe": 0.0,
+            "scene.display.light_direction": [
+                0.5,
+                0.5,
+                0.5
+            ],
+            "scene.display.matcap_ssao_attenuation": 1.0,
+            "scene.display.matcap_ssao_distance": 0.20000000298023224,
+            "scene.display.matcap_ssao_samples": 16,
+            "scene.display.render_aa": "8",
+            "scene.display.shadow_focus": 0.0,
+            "scene.display.shadow_shift": 0.10000000149011612,
+            "scene.display.viewport_aa": "FXAA",
+            "space.overlay.backwire_opacity": 0.5,
+            "space.overlay.bone_wire_alpha": 1.0,
+            "space.overlay.display_handle": "SELECTED",
+            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
+            "space.overlay.gpencil_fade_layer": 0.5,
+            "space.overlay.gpencil_fade_objects": 0.5,
+            "space.overlay.gpencil_grid_opacity": 0.5,
+            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
+            "space.overlay.grid_lines": 16,
+            "space.overlay.grid_scale": 1.0,
+            "space.overlay.grid_subdivisions": 10,
+            "space.overlay.normals_constant_screen_size": 7.0,
+            "space.overlay.normals_length": 0.10000000149011612,
+            "space.overlay.sculpt_curves_cage_opacity": 0.5,
+            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
+            "space.overlay.sculpt_mode_mask_opacity": 0.75,
+            "space.overlay.show_annotation": true,
+            "space.overlay.show_axis_x": false,
+            "space.overlay.show_axis_y": false,
+            "space.overlay.show_axis_z": false,
+            "space.overlay.show_bones": true,
+            "space.overlay.show_cursor": true,
+            "space.overlay.show_curve_normals": false,
+            "space.overlay.show_edge_bevel_weight": true,
+            "space.overlay.show_edge_crease": true,
+            "space.overlay.show_edge_seams": true,
+            "space.overlay.show_edge_sharp": true,
+            "space.overlay.show_edges": false,
+            "space.overlay.show_extra_edge_angle": false,
+            "space.overlay.show_extra_edge_length": false,
+            "space.overlay.show_extra_face_angle": false,
+            "space.overlay.show_extra_face_area": false,
+            "space.overlay.show_extra_indices": false,
+            "space.overlay.show_extras": true,
+            "space.overlay.show_face_center": false,
+            "space.overlay.show_face_normals": false,
+            "space.overlay.show_face_orientation": false,
+            "space.overlay.show_faces": true,
+            "space.overlay.show_fade_inactive": false,
+            "space.overlay.show_floor": false,
+            "space.overlay.show_freestyle_edge_marks": true,
+            "space.overlay.show_freestyle_face_marks": true,
+            "space.overlay.show_look_dev": false,
+            "space.overlay.show_motion_paths": true,
+            "space.overlay.show_object_origins": false,
+            "space.overlay.show_object_origins_all": false,
+            "space.overlay.show_occlude_wire": false,
+            "space.overlay.show_onion_skins": false,
+            "space.overlay.show_ortho_grid": true,
+            "space.overlay.show_outline_selected": true,
+            "space.overlay.show_overlays": true,
+            "space.overlay.show_paint_wire": false,
+            "space.overlay.show_relationship_lines": false,
+            "space.overlay.show_sculpt_curves_cage": true,
+            "space.overlay.show_sculpt_face_sets": true,
+            "space.overlay.show_sculpt_mask": true,
+            "space.overlay.show_split_normals": false,
+            "space.overlay.show_stats": false,
+            "space.overlay.show_statvis": false,
+            "space.overlay.show_text": true,
+            "space.overlay.show_vertex_normals": false,
+            "space.overlay.show_viewer_attribute": true,
+            "space.overlay.show_weight": false,
+            "space.overlay.show_wireframes": true,
+            "space.overlay.show_wpaint_contours": false,
+            "space.overlay.show_xray_bone": false,
+            "space.overlay.texture_paint_mode_opacity": 1.0,
+            "space.overlay.use_debug_freeze_view_culling": false,
+            "space.overlay.use_gpencil_canvas_xray": false,
+            "space.overlay.use_gpencil_edit_lines": true,
+            "space.overlay.use_gpencil_fade_gp_objects": false,
+            "space.overlay.use_gpencil_fade_layers": false,
+            "space.overlay.use_gpencil_fade_objects": false,
+            "space.overlay.use_gpencil_grid": false,
+            "space.overlay.use_gpencil_multiedit_line_only": false,
+            "space.overlay.use_gpencil_onion_skin": false,
+            "space.overlay.use_gpencil_show_directions": false,
+            "space.overlay.use_gpencil_show_material_name": false,
+            "space.overlay.use_normals_constant_screen_size": false,
+            "space.overlay.vertex_opacity": 1.0,
+            "space.overlay.vertex_paint_mode_opacity": 1.0,
+            "space.overlay.viewer_attribute_opacity": 1.0,
+            "space.overlay.weight_paint_mode_opacity": 1.0,
+            "space.overlay.wireframe_opacity": 1.0,
+            "space.overlay.wireframe_threshold": 0.0,
+            "space.overlay.xray_alpha_bone": 0.0
+        }
+    },
+    "Shaded": {
+        "render_type": "VIEWPORT",
+        "raster_style": {
+            "bpy.data.worlds[0].color": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "scene.render.bake_bias": 0.0010000000474974513,
+            "scene.render.bake_margin": 16,
+            "scene.render.bake_margin_type": "ADJACENT_FACES",
+            "scene.render.bake_samples": 256,
+            "scene.render.bake_type": "NORMALS",
+            "scene.render.bake_user_scale": 0.0,
+            "scene.render.border_max_x": 1.0,
+            "scene.render.border_max_y": 1.0,
+            "scene.render.border_min_x": 0.0,
+            "scene.render.border_min_y": 0.0,
+            "scene.render.dither_intensity": 1.0,
+            "scene.render.engine": "BLENDER_WORKBENCH",
+            "scene.render.film_transparent": false,
+            "scene.render.filter_size": 1.5,
+            "scene.render.fps": 24,
+            "scene.render.fps_base": 1.0,
+            "scene.render.frame_map_new": 100,
+            "scene.render.frame_map_old": 100,
+            "scene.render.hair_subdiv": 0,
+            "scene.render.hair_type": "STRAND",
+            "scene.render.line_thickness": 1.0,
+            "scene.render.line_thickness_mode": "ABSOLUTE",
+            "scene.render.metadata_input": "SCENE",
+            "scene.render.motion_blur_shutter": 0.5,
+            "scene.render.pixel_aspect_x": 1.0,
+            "scene.render.pixel_aspect_y": 1.0,
+            "scene.render.preview_pixel_size": "AUTO",
+            "scene.render.resolution_percentage": 100,
+            "scene.render.resolution_x": 1000,
+            "scene.render.resolution_y": 1000,
+            "scene.render.sequencer_gl_preview": "SOLID",
+            "scene.render.simplify_child_particles": 1.0,
+            "scene.render.simplify_child_particles_render": 1.0,
+            "scene.render.simplify_gpencil": false,
+            "scene.render.simplify_gpencil_antialiasing": true,
+            "scene.render.simplify_gpencil_modifier": true,
+            "scene.render.simplify_gpencil_onplay": false,
+            "scene.render.simplify_gpencil_shader_fx": true,
+            "scene.render.simplify_gpencil_tint": true,
+            "scene.render.simplify_gpencil_view_fill": true,
+            "scene.render.simplify_shadows": 1.0,
+            "scene.render.simplify_shadows_render": 1.0,
+            "scene.render.simplify_subdivision": 6,
+            "scene.render.simplify_subdivision_render": 6,
+            "scene.render.simplify_volumes": 1.0,
+            "scene.render.stamp_font_size": 12,
+            "scene.render.stamp_note_text": "",
+            "scene.render.threads": 20,
+            "scene.render.threads_mode": "AUTO",
+            "scene.render.use_bake_clear": true,
+            "scene.render.use_bake_lores_mesh": false,
+            "scene.render.use_bake_multires": false,
+            "scene.render.use_bake_selected_to_active": false,
+            "scene.render.use_bake_user_scale": false,
+            "scene.render.use_border": false,
+            "scene.render.use_compositing": true,
+            "scene.render.use_crop_to_border": false,
+            "scene.render.use_file_extension": true,
+            "scene.render.use_freestyle": false,
+            "scene.render.use_high_quality_normals": false,
+            "scene.render.use_lock_interface": false,
+            "scene.render.use_motion_blur": false,
+            "scene.render.use_multiview": false,
+            "scene.render.use_overwrite": true,
+            "scene.render.use_persistent_data": false,
+            "scene.render.use_placeholder": false,
+            "scene.render.use_render_cache": false,
+            "scene.render.use_sequencer": true,
+            "scene.render.use_sequencer_override_scene_strip": false,
+            "scene.render.use_simplify": false,
+            "scene.render.use_single_layer": false,
+            "scene.render.use_stamp": false,
+            "scene.render.use_stamp_camera": true,
+            "scene.render.use_stamp_date": true,
+            "scene.render.use_stamp_filename": true,
+            "scene.render.use_stamp_frame": true,
+            "scene.render.use_stamp_frame_range": false,
+            "scene.render.use_stamp_hostname": false,
+            "scene.render.use_stamp_labels": true,
+            "scene.render.use_stamp_lens": false,
+            "scene.render.use_stamp_marker": false,
+            "scene.render.use_stamp_memory": false,
+            "scene.render.use_stamp_note": false,
+            "scene.render.use_stamp_render_time": true,
+            "scene.render.use_stamp_scene": true,
+            "scene.render.use_stamp_sequencer_strip": false,
+            "scene.render.use_stamp_time": true,
+            "scene.render.views_format": "STEREO_3D",
+            "scene.view_settings.exposure": 0.0,
+            "scene.view_settings.gamma": 1.0,
+            "scene.view_settings.look": "None",
+            "scene.view_settings.use_curve_mapping": false,
+            "scene.view_settings.view_transform": "Standard",
+            "scene.display.shading.aov_name": "",
+            "scene.display.shading.background_color": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "scene.display.shading.background_type": "THEME",
+            "scene.display.shading.cavity_ridge_factor": 1.0,
+            "scene.display.shading.cavity_type": "BOTH",
+            "scene.display.shading.cavity_valley_factor": 1.0,
+            "scene.display.shading.color_type": "MATERIAL",
+            "scene.display.shading.curvature_ridge_factor": 1.0,
+            "scene.display.shading.curvature_valley_factor": 1.0,
+            "scene.display.shading.light": "STUDIO",
+            "scene.display.shading.object_outline_color": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "scene.display.shading.render_pass": "COMBINED",
+            "scene.display.shading.shadow_intensity": 0.5,
+            "scene.display.shading.show_backface_culling": false,
+            "scene.display.shading.show_cavity": true,
+            "scene.display.shading.show_object_outline": true,
+            "scene.display.shading.show_shadows": true,
+            "scene.display.shading.show_specular_highlight": true,
+            "scene.display.shading.show_xray": false,
+            "scene.display.shading.show_xray_wireframe": false,
+            "scene.display.shading.single_color": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "scene.display.shading.studio_light": "Default",
+            "scene.display.shading.studiolight_background_alpha": 0.0,
+            "scene.display.shading.studiolight_background_blur": 0.0,
+            "scene.display.shading.studiolight_intensity": 0.0,
+            "scene.display.shading.studiolight_rotate_z": 0.0,
+            "scene.display.shading.type": "RENDERED",
+            "scene.display.shading.use_compositor": "DISABLED",
+            "scene.display.shading.use_dof": false,
+            "scene.display.shading.use_scene_lights": false,
+            "scene.display.shading.use_scene_lights_render": false,
+            "scene.display.shading.use_scene_world": false,
+            "scene.display.shading.use_scene_world_render": false,
+            "scene.display.shading.use_studiolight_view_rotation": true,
+            "scene.display.shading.use_world_space_lighting": false,
+            "scene.display.shading.wireframe_color_type": "MATERIAL",
+            "scene.display.shading.xray_alpha": 0.5,
+            "scene.display.shading.xray_alpha_wireframe": 0.0,
+            "scene.display.light_direction": [
+                0.5,
+                0.5,
+                0.5
+            ],
+            "scene.display.matcap_ssao_attenuation": 1.0,
+            "scene.display.matcap_ssao_distance": 0.20000000298023224,
+            "scene.display.matcap_ssao_samples": 16,
+            "scene.display.render_aa": "8",
+            "scene.display.shadow_focus": 0.0,
+            "scene.display.shadow_shift": 0.10000000149011612,
+            "scene.display.viewport_aa": "FXAA",
+            "space.overlay.backwire_opacity": 0.5,
+            "space.overlay.bone_wire_alpha": 1.0,
+            "space.overlay.display_handle": "SELECTED",
+            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
+            "space.overlay.gpencil_fade_layer": 0.5,
+            "space.overlay.gpencil_fade_objects": 0.5,
+            "space.overlay.gpencil_grid_opacity": 0.5,
+            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
+            "space.overlay.grid_lines": 16,
+            "space.overlay.grid_scale": 1.0,
+            "space.overlay.grid_subdivisions": 10,
+            "space.overlay.normals_constant_screen_size": 7.0,
+            "space.overlay.normals_length": 0.10000000149011612,
+            "space.overlay.sculpt_curves_cage_opacity": 0.5,
+            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
+            "space.overlay.sculpt_mode_mask_opacity": 0.75,
+            "space.overlay.show_annotation": true,
+            "space.overlay.show_axis_x": false,
+            "space.overlay.show_axis_y": false,
+            "space.overlay.show_axis_z": false,
+            "space.overlay.show_bones": true,
+            "space.overlay.show_cursor": true,
+            "space.overlay.show_curve_normals": false,
+            "space.overlay.show_edge_bevel_weight": true,
+            "space.overlay.show_edge_crease": true,
+            "space.overlay.show_edge_seams": true,
+            "space.overlay.show_edge_sharp": true,
+            "space.overlay.show_edges": false,
+            "space.overlay.show_extra_edge_angle": false,
+            "space.overlay.show_extra_edge_length": false,
+            "space.overlay.show_extra_face_angle": false,
+            "space.overlay.show_extra_face_area": false,
+            "space.overlay.show_extra_indices": false,
+            "space.overlay.show_extras": true,
+            "space.overlay.show_face_center": false,
+            "space.overlay.show_face_normals": false,
+            "space.overlay.show_face_orientation": false,
+            "space.overlay.show_faces": true,
+            "space.overlay.show_fade_inactive": false,
+            "space.overlay.show_floor": false,
+            "space.overlay.show_freestyle_edge_marks": true,
+            "space.overlay.show_freestyle_face_marks": true,
+            "space.overlay.show_look_dev": false,
+            "space.overlay.show_motion_paths": true,
+            "space.overlay.show_object_origins": false,
+            "space.overlay.show_object_origins_all": false,
+            "space.overlay.show_occlude_wire": false,
+            "space.overlay.show_onion_skins": false,
+            "space.overlay.show_ortho_grid": true,
+            "space.overlay.show_outline_selected": true,
+            "space.overlay.show_overlays": true,
+            "space.overlay.show_paint_wire": false,
+            "space.overlay.show_relationship_lines": false,
+            "space.overlay.show_sculpt_curves_cage": true,
+            "space.overlay.show_sculpt_face_sets": true,
+            "space.overlay.show_sculpt_mask": true,
+            "space.overlay.show_split_normals": false,
+            "space.overlay.show_stats": false,
+            "space.overlay.show_statvis": false,
+            "space.overlay.show_text": true,
+            "space.overlay.show_vertex_normals": false,
+            "space.overlay.show_viewer_attribute": true,
+            "space.overlay.show_weight": false,
+            "space.overlay.show_wireframes": false,
+            "space.overlay.show_wpaint_contours": false,
+            "space.overlay.show_xray_bone": false,
+            "space.overlay.texture_paint_mode_opacity": 1.0,
+            "space.overlay.use_debug_freeze_view_culling": false,
+            "space.overlay.use_gpencil_canvas_xray": false,
+            "space.overlay.use_gpencil_edit_lines": true,
+            "space.overlay.use_gpencil_fade_gp_objects": false,
+            "space.overlay.use_gpencil_fade_layers": false,
+            "space.overlay.use_gpencil_fade_objects": false,
+            "space.overlay.use_gpencil_grid": false,
+            "space.overlay.use_gpencil_multiedit_line_only": false,
+            "space.overlay.use_gpencil_onion_skin": false,
+            "space.overlay.use_gpencil_show_directions": false,
+            "space.overlay.use_gpencil_show_material_name": false,
+            "space.overlay.use_normals_constant_screen_size": false,
+            "space.overlay.vertex_opacity": 1.0,
+            "space.overlay.vertex_paint_mode_opacity": 1.0,
+            "space.overlay.viewer_attribute_opacity": 1.0,
+            "space.overlay.weight_paint_mode_opacity": 1.0,
+            "space.overlay.wireframe_opacity": 1.0,
+            "space.overlay.wireframe_threshold": 0.0,
+            "space.overlay.xray_alpha_bone": 0.0
+        }
+    },
+    "Blender Default": {
+        "render_type": "VIEWPORT",
+        "raster_style": {
+            "bpy.data.worlds[0].color": [
+                0.05087608844041824,
+                0.05087608844041824,
+                0.05087608844041824
+            ],
+            "scene.render.bake_bias": 0.0010000000474974513,
+            "scene.render.bake_margin": 16,
+            "scene.render.bake_margin_type": "ADJACENT_FACES",
+            "scene.render.bake_samples": 256,
+            "scene.render.bake_type": "NORMALS",
+            "scene.render.bake_user_scale": 0.0,
+            "scene.render.border_max_x": 1.0,
+            "scene.render.border_max_y": 1.0,
+            "scene.render.border_min_x": 0.0,
+            "scene.render.border_min_y": 0.0,
+            "scene.render.dither_intensity": 1.0,
+            "scene.render.engine": "BLENDER_EEVEE",
+            "scene.render.film_transparent": false,
+            "scene.render.filter_size": 1.5,
+            "scene.render.fps": 24,
+            "scene.render.fps_base": 1.0,
+            "scene.render.frame_map_new": 100,
+            "scene.render.frame_map_old": 100,
+            "scene.render.hair_subdiv": 0,
+            "scene.render.hair_type": "STRAND",
+            "scene.render.line_thickness": 1.0,
+            "scene.render.line_thickness_mode": "ABSOLUTE",
+            "scene.render.metadata_input": "SCENE",
+            "scene.render.motion_blur_shutter": 0.5,
+            "scene.render.pixel_aspect_x": 1.0,
+            "scene.render.pixel_aspect_y": 1.0,
+            "scene.render.preview_pixel_size": "AUTO",
+            "scene.render.resolution_percentage": 100,
+            "scene.render.resolution_x": 1000,
+            "scene.render.resolution_y": 1000,
+            "scene.render.sequencer_gl_preview": "SOLID",
+            "scene.render.simplify_child_particles": 1.0,
+            "scene.render.simplify_child_particles_render": 1.0,
+            "scene.render.simplify_gpencil": false,
+            "scene.render.simplify_gpencil_antialiasing": true,
+            "scene.render.simplify_gpencil_modifier": true,
+            "scene.render.simplify_gpencil_onplay": false,
+            "scene.render.simplify_gpencil_shader_fx": true,
+            "scene.render.simplify_gpencil_tint": true,
+            "scene.render.simplify_gpencil_view_fill": true,
+            "scene.render.simplify_shadows": 1.0,
+            "scene.render.simplify_shadows_render": 1.0,
+            "scene.render.simplify_subdivision": 6,
+            "scene.render.simplify_subdivision_render": 6,
+            "scene.render.simplify_volumes": 1.0,
+            "scene.render.stamp_font_size": 12,
+            "scene.render.stamp_note_text": "",
+            "scene.render.threads": 20,
+            "scene.render.threads_mode": "AUTO",
+            "scene.render.use_bake_clear": true,
+            "scene.render.use_bake_lores_mesh": false,
+            "scene.render.use_bake_multires": false,
+            "scene.render.use_bake_selected_to_active": false,
+            "scene.render.use_bake_user_scale": false,
+            "scene.render.use_border": false,
+            "scene.render.use_compositing": true,
+            "scene.render.use_crop_to_border": false,
+            "scene.render.use_file_extension": true,
+            "scene.render.use_freestyle": false,
+            "scene.render.use_high_quality_normals": false,
+            "scene.render.use_lock_interface": false,
+            "scene.render.use_motion_blur": false,
+            "scene.render.use_multiview": false,
+            "scene.render.use_overwrite": true,
+            "scene.render.use_persistent_data": false,
+            "scene.render.use_placeholder": false,
+            "scene.render.use_render_cache": false,
+            "scene.render.use_sequencer": true,
+            "scene.render.use_sequencer_override_scene_strip": false,
+            "scene.render.use_simplify": false,
+            "scene.render.use_single_layer": false,
+            "scene.render.use_stamp": false,
+            "scene.render.use_stamp_camera": true,
+            "scene.render.use_stamp_date": true,
+            "scene.render.use_stamp_filename": true,
+            "scene.render.use_stamp_frame": true,
+            "scene.render.use_stamp_frame_range": false,
+            "scene.render.use_stamp_hostname": false,
+            "scene.render.use_stamp_labels": true,
+            "scene.render.use_stamp_lens": false,
+            "scene.render.use_stamp_marker": false,
+            "scene.render.use_stamp_memory": false,
+            "scene.render.use_stamp_note": false,
+            "scene.render.use_stamp_render_time": true,
+            "scene.render.use_stamp_scene": true,
+            "scene.render.use_stamp_sequencer_strip": false,
+            "scene.render.use_stamp_time": true,
+            "scene.render.views_format": "STEREO_3D",
+            "scene.view_settings.exposure": 0.0,
+            "scene.view_settings.gamma": 1.0,
+            "scene.view_settings.look": "None",
+            "scene.view_settings.use_curve_mapping": false,
+            "scene.view_settings.view_transform": "Filmic",
+            "scene.display.shading.aov_name": "",
+            "scene.display.shading.background_color": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "scene.display.shading.background_type": "THEME",
+            "scene.display.shading.cavity_ridge_factor": 1.0,
+            "scene.display.shading.cavity_type": "WORLD",
+            "scene.display.shading.cavity_valley_factor": 1.0,
+            "scene.display.shading.color_type": "MATERIAL",
+            "scene.display.shading.curvature_ridge_factor": 0.0,
+            "scene.display.shading.curvature_valley_factor": 0.0,
+            "scene.display.shading.light": "STUDIO",
+            "scene.display.shading.object_outline_color": [
+                0.0,
+                0.0,
+                0.0
+            ],
+            "scene.display.shading.render_pass": "COMBINED",
+            "scene.display.shading.shadow_intensity": 0.5,
+            "scene.display.shading.show_backface_culling": false,
+            "scene.display.shading.show_cavity": false,
+            "scene.display.shading.show_object_outline": false,
+            "scene.display.shading.show_shadows": false,
+            "scene.display.shading.show_specular_highlight": true,
+            "scene.display.shading.show_xray": false,
+            "scene.display.shading.show_xray_wireframe": false,
+            "scene.display.shading.single_color": [
+                0.800000011920929,
+                0.800000011920929,
+                0.800000011920929
+            ],
+            "scene.display.shading.studio_light": "Default",
+            "scene.display.shading.studiolight_background_alpha": 0.0,
+            "scene.display.shading.studiolight_background_blur": 0.0,
+            "scene.display.shading.studiolight_intensity": 0.0,
+            "scene.display.shading.studiolight_rotate_z": 0.0,
+            "scene.display.shading.type": "RENDERED",
+            "scene.display.shading.use_compositor": "DISABLED",
+            "scene.display.shading.use_dof": false,
+            "scene.display.shading.use_scene_lights": false,
+            "scene.display.shading.use_scene_lights_render": false,
+            "scene.display.shading.use_scene_world": false,
+            "scene.display.shading.use_scene_world_render": false,
+            "scene.display.shading.use_studiolight_view_rotation": true,
+            "scene.display.shading.use_world_space_lighting": false,
+            "scene.display.shading.wireframe_color_type": "MATERIAL",
+            "scene.display.shading.xray_alpha": 0.5,
+            "scene.display.shading.xray_alpha_wireframe": 0.0,
+            "scene.display.light_direction": [
+                0.5773502588272095,
+                0.5773502588272095,
+                0.5773502588272095
+            ],
+            "scene.display.matcap_ssao_attenuation": 1.0,
+            "scene.display.matcap_ssao_distance": 0.20000000298023224,
+            "scene.display.matcap_ssao_samples": 16,
+            "scene.display.render_aa": "8",
+            "scene.display.shadow_focus": 0.0,
+            "scene.display.shadow_shift": 0.10000000149011612,
+            "scene.display.viewport_aa": "FXAA",
+            "space.overlay.backwire_opacity": 0.5,
+            "space.overlay.bone_wire_alpha": 1.0,
+            "space.overlay.display_handle": "SELECTED",
+            "space.overlay.fade_inactive_alpha": 0.4000000059604645,
+            "space.overlay.gpencil_fade_layer": 0.5,
+            "space.overlay.gpencil_fade_objects": 0.5,
+            "space.overlay.gpencil_grid_opacity": 0.5,
+            "space.overlay.gpencil_vertex_paint_opacity": 1.0,
+            "space.overlay.grid_lines": 16,
+            "space.overlay.grid_scale": 1.0,
+            "space.overlay.grid_subdivisions": 10,
+            "space.overlay.normals_constant_screen_size": 7.0,
+            "space.overlay.normals_length": 0.10000000149011612,
+            "space.overlay.sculpt_curves_cage_opacity": 0.5,
+            "space.overlay.sculpt_mode_face_sets_opacity": 1.0,
+            "space.overlay.sculpt_mode_mask_opacity": 0.75,
+            "space.overlay.show_annotation": true,
+            "space.overlay.show_axis_x": true,
+            "space.overlay.show_axis_y": true,
+            "space.overlay.show_axis_z": false,
+            "space.overlay.show_bones": true,
+            "space.overlay.show_cursor": true,
+            "space.overlay.show_curve_normals": false,
+            "space.overlay.show_edge_bevel_weight": true,
+            "space.overlay.show_edge_crease": true,
+            "space.overlay.show_edge_seams": true,
+            "space.overlay.show_edge_sharp": true,
+            "space.overlay.show_edges": false,
+            "space.overlay.show_extra_edge_angle": false,
+            "space.overlay.show_extra_edge_length": false,
+            "space.overlay.show_extra_face_angle": false,
+            "space.overlay.show_extra_face_area": false,
+            "space.overlay.show_extra_indices": false,
+            "space.overlay.show_extras": true,
+            "space.overlay.show_face_center": false,
+            "space.overlay.show_face_normals": false,
+            "space.overlay.show_face_orientation": false,
+            "space.overlay.show_faces": true,
+            "space.overlay.show_fade_inactive": false,
+            "space.overlay.show_floor": true,
+            "space.overlay.show_freestyle_edge_marks": true,
+            "space.overlay.show_freestyle_face_marks": true,
+            "space.overlay.show_look_dev": false,
+            "space.overlay.show_motion_paths": true,
+            "space.overlay.show_object_origins": true,
+            "space.overlay.show_object_origins_all": false,
+            "space.overlay.show_occlude_wire": false,
+            "space.overlay.show_onion_skins": false,
+            "space.overlay.show_ortho_grid": true,
+            "space.overlay.show_outline_selected": true,
+            "space.overlay.show_overlays": true,
+            "space.overlay.show_paint_wire": false,
+            "space.overlay.show_relationship_lines": true,
+            "space.overlay.show_sculpt_curves_cage": true,
+            "space.overlay.show_sculpt_face_sets": true,
+            "space.overlay.show_sculpt_mask": true,
+            "space.overlay.show_split_normals": false,
+            "space.overlay.show_stats": false,
+            "space.overlay.show_statvis": false,
+            "space.overlay.show_text": true,
+            "space.overlay.show_vertex_normals": false,
+            "space.overlay.show_viewer_attribute": true,
+            "space.overlay.show_weight": false,
+            "space.overlay.show_wireframes": false,
+            "space.overlay.show_wpaint_contours": false,
+            "space.overlay.show_xray_bone": false,
+            "space.overlay.texture_paint_mode_opacity": 1.0,
+            "space.overlay.use_debug_freeze_view_culling": false,
+            "space.overlay.use_gpencil_canvas_xray": false,
+            "space.overlay.use_gpencil_edit_lines": true,
+            "space.overlay.use_gpencil_fade_gp_objects": false,
+            "space.overlay.use_gpencil_fade_layers": false,
+            "space.overlay.use_gpencil_fade_objects": false,
+            "space.overlay.use_gpencil_grid": false,
+            "space.overlay.use_gpencil_multiedit_line_only": false,
+            "space.overlay.use_gpencil_onion_skin": false,
+            "space.overlay.use_gpencil_show_directions": false,
+            "space.overlay.use_gpencil_show_material_name": false,
+            "space.overlay.use_normals_constant_screen_size": false,
+            "space.overlay.vertex_opacity": 1.0,
+            "space.overlay.vertex_paint_mode_opacity": 1.0,
+            "space.overlay.viewer_attribute_opacity": 1.0,
+            "space.overlay.weight_paint_mode_opacity": 1.0,
+            "space.overlay.wireframe_opacity": 1.0,
+            "space.overlay.wireframe_threshold": 1.0,
+            "space.overlay.xray_alpha_bone": 0.0
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="rectangle-tag">
+        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="triangle-tag">
+        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="M 3.1409425e-7,-7.1069207 5.7650623,2.8784603 l -11.5301246,-6e-7 z" />
+    </g>
+    <g id="hexagon-tag">
+        <path style="fill: white; stroke: black; stroke-width: 0.25;" d="m 0.0161133,-6.0583333 5.2339915,3.8366023 -2.031433,6.1633977 c 0,0 -6.4894866,-0.027414 -6.4894866,-0.027414 l -1.97929,-6.1803395 5.2662181,-3.7922467" />
+    </g>
+    <g id="capsule-tag">
+        <rect x="-6" y="-2.5" width="12" height="5" rx="2.5" ry="2.5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="circle-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+    </g>
+    <g id="door-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <text y="-1.75" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+        <line x1="-5" x2="5" style="stroke: black; stroke-width: 0.25;" />
+        <text y="2.5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+    </g>
+    <g id="space-tag">
+        <text y="-5" class="large" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <text class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+        <text y="5" class="regular" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
+    </g>
+    <g id="elevation-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="elevation-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+    <g id="section-arrow">
+        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
+    </g>
+    <g id="section-tag">
+        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
+        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
+    </g>
+</svg>

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

@@ -1,67 +1,55 @@
 <link href="jsgantt.css" rel="stylesheet" type="text/css"/>
+<link href="../../module/sequence/gantt/main.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');
-g.setOptions({
-    vCaptionType: 'Caption',  // Set to Show Caption : None,Caption,Resource,Duration,Complete,
-    vQuarterColWidth: 36,
-    vDateTaskDisplayFormat: 'day dd month yyyy', // Shown in tool tip box
-    vDayMajorDateDisplayFormat: 'mon yyyy - Week ww',// Set format to dates in the "Major" header of the "Day" view
-    vWeekMinorDateDisplayFormat: 'dd mon', // Set format to display dates in the "Minor" header of the "Week" view
-    vLang: 'en',
-    vShowTaskInfoLink: 1, // Show link in tool tip (0/1)
-    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,
-    vShowRes: false, // Disable the resource column.
-    vShowComp: false, // Disable the completion column.
-    vShowDur: false, // Disable the duration column, because jsgantt doesn't calculate durations the way we want.
-    vAdditionalHeaders: {ifcduration: {title: 'Duration'}},
-    vUseToolTip: false, // Disable tooltips.
-    vTotalHeight: 900,
-});
-document.getElementById('print').addEventListener('click', function() {
-    g.setTotalHeight("");
-    g.Draw();
-});
-var json_data = `
-{{{json_data}}}
-`;
-JSGantt.parseJSONString(json_data, g);
-g.Draw();
+<script type="text/javascript" src="../../module/sequence/gantt/index.js"></script>
+<script>
+var json_data = `{{{json_data}}}`;
 </script>
+
+<div id="options" class="no-print">
+  <h4>Choose a language:
+  <select id="lang" class="sweet_button" onchange="set_language(event)">
+    <option value='cn'>Chinese (cn)</option>
+    <option value='cs'>Czech (cs)</option>
+    <option value='nl'>Dutch (Standard)</option>
+    <option value='en' selected>English (en)</option>
+    <option value='fr'>French (fr)</option>
+    <option value='de'>German (de)</option>
+    <option value='hu'>Hungarian (hu)</option>
+    <option value='id'>Indonesian (id)</option>
+    <option value='it'>Italian (it)</option>
+    <option value='ja'>Japanese (ja)</option>
+    <option value='pt'>Portuguese (pt)</option>
+    <option value='ru'>Russian (ru)</option>
+    <option value='es'>Spanish (es)</option>
+    <option value='sv'>Swedish (sv)</option>
+    <option value='tr'>Turkish (tr)</option>
+  </select>
+  </h4>
+
+  <br>
+</div>
+<div class="top-right no-print" id="print_options">
+  <select class="sweet_button" id="print_page_size">
+    <option value="210,297">A4 Portrait</option>
+    <option value="297,210">A4 Landscape</option>
+    <option value="297,420">A3 Portrait</option>
+    <option value="420,297">A3 Landscape</option>
+    <option value="420,594">A2 Portrait</option>
+    <option value="594,420">A2 Landscape</option>
+    <option value="594,841">A1 Portrait</option>
+    <option value="841,594">A1 Landscape</option>
+    <option value="841,1189">A0 Portrait</option>
+    <option value="1189,841">A0 Landscape</option>
+  </select>
+</div>
+
+<div id="schedule-data" class="no-print"></div>
+<div id="schedule-header" style=""></div>
+<div style="position:relative" class="gantt" id="GanttChartDIV"></div>
+
+<script>
+var data = `{{{data}}}`;
+setupPage(data);
+create_gantt_chart(json_data)
+</script>

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

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

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

@@ -5,18 +5,34 @@ FILE_NAME('Psets_BBIM_Annotation.ifc','2020-01-01T00:00:00',(),(),'Psets_BBIM_An
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#2,#3,#4));
+#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#2,#3,#4));
 #2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','Classes separarated by spaces that end up in classes for this element in svg. Can be used to specify the text font size: small - 1.8mm; regular - 2.5mm; large - 3.5mm; header - 5mm; title - 7mm. By default regular size is used.',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'BBIM_Batting','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#6,#7));
+#5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'BBIM_Batting','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#6,#7));
 #6=IFCSIMPLEPROPERTYTEMPLATE('0t2LEesGT1QRQtrIZUAR8L',$,'Thickness','Batting thickness',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure',$,$,$,$,$,.READWRITE.);
 #7=IFCSIMPLEPROPERTYTEMPLATE('082PndS6v2kBOiJoSboMnh',$,'Reverse pattern direction','Reverse batting pattern (swap starting and ending points)',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#8=IFCPROPERTYSETTEMPLATE('1Dx2EiZnP67xotInXpwz90',$,'BBIM_Section','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation',(#9,#10,#11,#12,#13));
+#8=IFCPROPERTYSETTEMPLATE('1Dx2EiZnP67xotInXpwz90',$,'BBIM_Section','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#9,#10,#11,#12,#13));
 #9=IFCSIMPLEPROPERTYTEMPLATE('2a_9s8spHDc9dZHtgg71XL',$,'ShowStartArrow','Display start arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #10=IFCSIMPLEPROPERTYTEMPLATE('3i6SH_GbT7zhKea$wVE56A',$,'StartArrowSymbol','Custom symbol for the start of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #11=IFCSIMPLEPROPERTYTEMPLATE('1DtsPn5a9FG8$zXHDDMavY',$,'ShowEndArrow','Display end arrow.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #12=IFCSIMPLEPROPERTYTEMPLATE('2$6U0mLI9AiPRWeBabdY3u',$,'EndArrowSymbol','Custom symbol for the end of the section marker arrow. Need to make sure it''s present in "symbols.svg".',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #13=IFCSIMPLEPROPERTYTEMPLATE('1naFqntIL7igCY7hCaE7kq',$,'HasConnectedSectionLine','Connect or disconnect section markers with line (by default = True).',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#14=IFCPROPERTYSETTEMPLATE('3V8oZ8YRD3_O7uR5vcUleS',$,'BBIM_Documentation','',.PSET_OCCURRENCEDRIVEN.,'IfcProject',(#15,#16,#17,#18,#19,#20,#21,#22,#23));
+#15=IFCSIMPLEPROPERTYTEMPLATE('0ulAhgk3v9qfGlDILauR6J',$,'SheetsDir','Default sheets directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#16=IFCSIMPLEPROPERTYTEMPLATE('2yvlVKiQXASucfH40deCvu',$,'LayoutsDir','Default layouts directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#17=IFCSIMPLEPROPERTYTEMPLATE('2kXZqXicL3jRwsOnLM_0ho',$,'TitleblocksDir','Default titleblocks directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#18=IFCSIMPLEPROPERTYTEMPLATE('1lmOfo9Bf9beMBJkCZKf5Y',$,'DrawingsDir','Default drawings directory',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#19=IFCSIMPLEPROPERTYTEMPLATE('30cOKpb4D9CADKM04$N9X3',$,'StylesheetPath','Default stylesheet CSS',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#20=IFCSIMPLEPROPERTYTEMPLATE('23tejOrxj859R_eCRp1AFP',$,'MarkersPath','Default markers SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#21=IFCSIMPLEPROPERTYTEMPLATE('1UDakJ5_f7kBhggNSW4$h5',$,'SymbolsPath','Default symbols SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#22=IFCSIMPLEPROPERTYTEMPLATE('0d53LEtgLDQxnv__NfgH7i',$,'PatternsPath','Default patterns SVG',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#23=IFCSIMPLEPROPERTYTEMPLATE('26qFNMv7nCHgU6Jd7Anga5',$,'ShadingStylesPath','Default shading styles',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#24=IFCPROPERTYSETTEMPLATE('0I9merLinF5Ap$aZwaclgm',$,'BBIM_Dimension','',.PSET_OCCURRENCEDRIVEN.,'IfcAnnotation,IfcTypeProduct',(#25,#26,#27,#28));
+#25=IFCSIMPLEPROPERTYTEMPLATE('1rL2AbQsXD8RbpoWH5pYOV',$,'ShowDescriptionOnly','Hide the measurement values and show only annotation description',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#26=IFCSIMPLEPROPERTYTEMPLATE('0SVyOfB0rC2xNfdRYf3XvY',$,'SuppressZeroInches','Suppress 0 inch values in dimension annotation text (for example: 12'' - 0" -> 12'')',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#27=IFCSIMPLEPROPERTYTEMPLATE('2bUmj458PBqPAtUoI3MXsb',$,'TextPrefix','Text to add before annotation measurement value',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#28=IFCSIMPLEPROPERTYTEMPLATE('0bnzttUb9BPuN597uNTXOE',$,'TextSuffix','Text to add after annotation measurement value',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+
 ENDSEC;
 END-ISO-10303-21;

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<svg baseProfile="full" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g id="rectangle-tag">
-        <rect x="-6" y="-2.5" width="12" height="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-    </g>
-    <g id="door-tag">
-        <circle cy="1.75" r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <text text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
-        <line x1="-5" y1="1.75" x2="5" y2="1.75" style="stroke: black; stroke-width: 0.25;" />
-        <text y="5" text-anchor="middle" dominant-baseline="middle" data-type="text-template"></text>
-    </g>
-    <g id="elevation-arrow">
-        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
-    </g>
-    <g id="elevation-tag">
-        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
-    </g>
-    <g id="section-arrow">
-        <path style="fill: black;" d="M -7.07106 0 0 -7.07106 7.07106 0" />
-    </g>
-    <g id="section-tag">
-        <circle r="5" fill="white" stroke="black" style="stroke-width: 0.25;" />
-        <line x1="-5" y1="0" x2="5" y2="0" style="stroke: black; stroke-width: 0.25;" />
-    </g>
-</svg>

src/blenderbim/blenderbim/bim/data/window/typical/IfcWindowLiningProperties.csv

@@ -1,2 +0,0 @@
-Name,foo
-TransomThickness,500

src/blenderbim/blenderbim/bim/export_ifc.py

@@ -44,10 +44,8 @@ class IfcExporter:
         self.file = IfcStore.get_file()
         self.set_header()
         IfcStore.update_cache()
-        if bpy.context.scene.BIMProjectProperties.is_authoring:
-            self.sync_deletions()
-            self.sync_all_objects()
-            self.sync_edited_objects()
+        self.sync_all_objects()
+        self.sync_edited_objects()
         extension = self.ifc_export_settings.output_file.split(".")[-1].lower()
         if extension == "ifczip":
             with tempfile.TemporaryDirectory() as unzipped_path:
@@ -87,19 +85,6 @@ class IfcExporter:
             self.get_application_name(), self.get_application_version()
         )
 
-    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})
-        IfcStore.deleted_ids.clear()
-        return results
-
     def sync_all_objects(self):
         results = []
         self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
@@ -126,7 +111,7 @@ class IfcExporter:
                 continue
             try:
                 if isinstance(obj, bpy.types.Material):
-                    if self.has_changed_shading(obj):
+                    if tool.Ifc.has_changed_shading(obj):
                         blenderbim.core.style.update_style_colours(tool.Ifc, tool.Style, obj=obj)
                 else:
                     element = tool.Ifc.get_entity(obj)
@@ -149,10 +134,6 @@ class IfcExporter:
         checksum = obj.data.BIMMeshProperties.material_checksum
         return checksum != str([s.id() for s in tool.Geometry.get_styles(obj) if s])
 
-    def has_changed_shading(self, obj):
-        checksum = obj.BIMMaterialProperties.shading_checksum
-        return checksum != repr(np.array(obj.diffuse_color).tobytes())
-
     def sync_object_placement(self, obj):
         element = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
         if not tool.Ifc.is_moved(obj):

src/blenderbim/blenderbim/bim/handler.py

@@ -16,25 +16,26 @@
 # 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
 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 get_user_person, get_user_organisation
 from blenderbim.bim.module.model.data import AuthoringData
+from mathutils import Vector
+from math import cos, degrees
 
 
+cwd = os.path.dirname(os.path.realpath(__file__))
 global_subscription_owner = object()
 
 
 def mode_callback(obj, data):
-    if not bpy.context.scene.BIMProjectProperties.is_authoring:
-        return
     objects = bpy.context.selected_objects
     if bpy.context.active_object:
         objects += [bpy.context.active_object]
@@ -53,10 +54,12 @@ def mode_callback(obj, data):
 
 
 def name_callback(obj, data):
-    # TODO Do we still need this, now that we are monitoring the undo redo objects?
     try:
         obj.name
     except:
+        # The object is invalid but somehow still has a callback. Clear all
+        # msgbus subscriptions to prevent useless further triggers.
+        bpy.msgbus.clear_by_owner(obj)
         return  # In case the object RNA is gone during an undo / redo operation
     # Blender names are up to 63 UTF-8 bytes
     if len(bytes(obj.name, "utf-8")) >= 63:
@@ -73,21 +76,13 @@ def name_callback(obj, data):
     if not obj.BIMObjectProperties.ifc_definition_id or "/" not in obj.name:
         return
     element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
+    if element.is_a("IfcGridAxis"):
+        element.AxisTag = obj.name.split("/")[1]
+        refresh_ui_data()
     if not element.is_a("IfcRoot"):
         return
-    if element.is_a("IfcSpatialStructureElement") or (hasattr(element, "IsDecomposedBy") and element.IsDecomposedBy):
-        collection = obj.users_collection[0]
-        collection.name = obj.name
-    if element.is_a("IfcGrid"):
-        axis_obj = IfcStore.get_element(element.UAxes[0].id())
-        axis_collection = axis_obj.users_collection[0]
-        grid_collection = None
-        for collection in bpy.data.collections:
-            if axis_collection.name in collection.children.keys():
-                grid_collection = collection
-                break
-        if grid_collection:
-            grid_collection.name = obj.name
+    if obj.BIMObjectProperties.collection:
+        obj.BIMObjectProperties.collection.name = obj.name
     element.Name = "/".join(obj.name.split("/")[1:])
     refresh_ui_data()
 
@@ -99,22 +94,69 @@ def color_callback(obj, data):
 
 def active_object_callback():
     refresh_ui_data()
+    update_bim_tool_props()
+
+
+def update_bim_tool_props():
+    """update BIM Tools props (such as extrusion_depth, length and x_angle) when active object changes"""
+    obj = bpy.context.active_object
+
+    # bunch of checks to see if we're in a valid state
+    if not obj:
+        return
+    mode = bpy.context.mode
+    current_tool = bpy.context.workspace.tools.from_space_view3d_mode(mode)
+    if not current_tool or current_tool.idname != "bim.bim_tool":
+        return
+    element = tool.Ifc.get_entity(obj)
+    if not element:
+        return
+    representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+    if not representation:
+        return
+    extrusion = tool.Model.get_extrusion(representation)
+    if not extrusion:
+        return
+
+    def get_x_angle(extrusion):
+        x, y, z = extrusion.ExtrudedDirection.DirectionRatios
+        x_angle = Vector((0, 1)).angle_signed(Vector((y, z)))
+        return x_angle
+
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+    props = bpy.context.scene.BIMModelProperties
+    if not AuthoringData.is_loaded:
+        AuthoringData.load()
+
+    if AuthoringData.data["active_material_usage"] == "LAYER2":
+        x_angle = get_x_angle(extrusion)
+        axis = tool.Model.get_wall_axis(obj)["reference"]
+        props.extrusion_depth = extrusion.Depth * si_conversion * cos(x_angle)
+        props.length = (axis[1] - axis[0]).length
+        props.x_angle = x_angle
+
+    elif AuthoringData.data["active_material_usage"] == "LAYER3":
+        x_angle = get_x_angle(extrusion)
+        props.x_angle = x_angle
+
+    elif AuthoringData.data["active_material_usage"] == "PROFILE":
+        props.extrusion_depth = extrusion.Depth * si_conversion
 
 
 def active_material_index_callback(obj, data):
     refresh_ui_data()
 
 
-def subscribe_to(object, data_path, callback):
+def subscribe_to(obj, data_path, callback):
     try:
-        subscribe_to = object.path_resolve(data_path, False)
+        subscribe_to = obj.path_resolve(data_path, False)
     except:
         return
     bpy.msgbus.subscribe_rna(
         key=subscribe_to,
-        owner=object,
+        owner=obj,
         args=(
-            object,
+            obj,
             data_path,
         ),
         notify=callback,
@@ -133,6 +175,9 @@ def refresh_ui_data():
         except AttributeError:
             pass
 
+    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
+        tool.Ifc.get().clear_cache()
+
 
 def purge_module_data():
     from blenderbim.bim import modules
@@ -160,24 +205,13 @@ def loadIfcStore(scene):
     IfcStore.relink_all_objects()
 
 
-@persistent
-def undo_pre(scene):
-    IfcStore.track_undo_redo_stack_object_map()
-
-
 @persistent
 def undo_post(scene):
     if IfcStore.last_transaction != bpy.context.scene.BIMProperties.last_transaction:
         IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
         IfcStore.undo()
         purge_module_data()
-    IfcStore.track_undo_redo_stack_selected_objects()
-    IfcStore.reload_undo_redo_stack_objects()
-
-
-@persistent
-def redo_pre(scene):
-    IfcStore.track_undo_redo_stack_object_map()
+    tool.Ifc.rebuild_element_maps()
 
 
 @persistent
@@ -186,14 +220,7 @@ def redo_post(scene):
         IfcStore.last_transaction = bpy.context.scene.BIMProperties.last_transaction
         IfcStore.redo()
         purge_module_data()
-    IfcStore.track_undo_redo_stack_selected_objects()
-    IfcStore.reload_undo_redo_stack_objects()
-
-
-@persistent
-def ensureIfcExported(scene):
-    if IfcStore.get_file() and not bpy.context.scene.BIMProperties.ifc_file:
-        bpy.ops.export_ifc.bim("INVOKE_DEFAULT")
+    tool.Ifc.rebuild_element_maps()
 
 
 def get_application(ifc):
@@ -224,81 +251,137 @@ def get_application_version():
     )
 
 
+def viewport_shading_changed_callback(area):
+    shading = area.spaces.active.shading.type
+    if shading == "RENDERED":
+        bpy.context.scene.BIMStylesProperties.active_style_type = "External"
+
+
+if getattr(bpy.types, "SCENE_PT_scene"):
+
+    class Override_SCENE_PT_scene(bpy.types.SCENE_PT_scene):
+        bl_idname = "SCENE_PT_scene_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_unit"):
+
+    class Override_SCENE_PT_unit(bpy.types.SCENE_PT_unit):
+        bl_idname = "SCENE_PT_unit_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_physics"):
+
+    class Override_SCENE_PT_physics(bpy.types.SCENE_PT_physics):
+        bl_idname = "SCENE_PT_physics_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_rigid_body_world"):
+
+    class Override_SCENE_PT_rigid_body_world(bpy.types.SCENE_PT_rigid_body_world):
+        bl_idname = "SCENE_PT_rigid_body_world_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_audio"):
+
+    class Override_SCENE_PT_audio(bpy.types.SCENE_PT_audio):
+        bl_idname = "SCENE_PT_audio_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_keying_sets"):
+
+    class Override_SCENE_PT_keying_sets(bpy.types.SCENE_PT_keying_sets):
+        bl_idname = "SCENE_PT_keying_sets_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
+if getattr(bpy.types, "SCENE_PT_custom_props"):
+
+    class Override_SCENE_PT_custom_props(bpy.types.SCENE_PT_custom_props):
+        bl_idname = "SCENE_PT_custom_props_override"
+
+        @classmethod
+        def poll(cls, context):
+            return tool.Blender.is_tab(context, "BLENDER")
+
+
 @persistent
-def setDefaultProperties(scene):
+def load_post(scene):
     global global_subscription_owner
     active_object_key = bpy.types.LayerObjects, "active"
     bpy.msgbus.subscribe_rna(
         key=active_object_key, owner=global_subscription_owner, args=(), notify=active_object_callback
     )
+
+    # subscribe to changes in viewport shading mode
+    # NOTE: couldn't find a way to make it work for new areas too
+    # it starts working for them after blender restart though
+    for screen in bpy.data.screens:
+        for area in screen.areas:
+            if area.type != "VIEW_3D":
+                continue
+            shading = area.spaces.active.shading
+            key = shading.path_resolve("type", False)
+
+            bpy.msgbus.subscribe_rna(
+                key=key, owner=global_subscription_owner, args=(area,), notify=viewport_shading_changed_callback
+            )
+
     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(
-            {
-                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()
-        drawing_style.name = "Shaded"
-        drawing_style.render_type = "VIEWPORT"
-        drawing_style.raster_style = json.dumps(
-            {
-                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()
-        drawing_style.name = "Blender Default"
-        drawing_style.render_type = "DEFAULT"
-        bpy.ops.bim.save_drawing_style(index="2")
-        AuthoringData.type_thumbnails = {}
+    AuthoringData.type_thumbnails = {}
+
+    if bpy.context.preferences.addons["blenderbim"].preferences.should_setup_workspace:
+        if "BIM" in bpy.data.workspaces:
+            bpy.context.window.workspace = bpy.data.workspaces["BIM"]
+        else:
+            bpy.ops.workspace.append_activate(idname="BIM", filepath=os.path.join(cwd, "data", "workspace.blend"))
+
+        # To improve usability for new users, we hijack the scene properties
+        # tab. We override default scene properties panels with our own poll
+        # to hide them unless the user has chosen to view Blender properties.
+        for panel in [
+            "SCENE_PT_scene",
+            "SCENE_PT_unit",
+            "SCENE_PT_physics",
+            "SCENE_PT_rigid_body_world",
+            "SCENE_PT_audio",
+            "SCENE_PT_keying_sets",
+            "SCENE_PT_custom_props",
+        ]:
+            if getattr(bpy.types, panel, None):
+                try:
+                    bpy.utils.register_class(globals()[f"Override_{panel}"])
+                    bpy.utils.unregister_class(getattr(bpy.types, panel))
+                except:
+                    pass
+
+    # https://blender.stackexchange.com/questions/140644/how-can-make-the-state-of-a-boolean-property-relative-to-the-3d-view-area
+    for screen in bpy.data.screens:
+        if len(screen.BIMAreaProperties) == 20:
+            continue
+        screen.BIMAreaProperties.clear()
+        for i in range(20):  # 20 is an arbitrary value of split areas
+            screen.BIMAreaProperties.add()

src/blenderbim/blenderbim/bim/helper.py

@@ -273,6 +273,9 @@ def convert_property_group_from_si(property_group, skip_props=()):
         setattr(property_group, prop_name, prop_value)
 
 
+# TODO this should move into ifcopenshell.util
+
+
 class IfcHeaderExtractor:
     def __init__(self, filepath: str):
         self.filepath = filepath
@@ -284,6 +287,8 @@ class IfcHeaderExtractor:
                 return self.extract_ifc_spf(ifc_file)
         elif extension.lower() == "ifczip":
             return self.extract_ifc_zip()
+        elif extension.lower() == "ifcsqlite":
+            return {}  # TODO
 
     def extract_ifc_spf(self, ifc_file):
         # https://www.steptools.com/stds/step/IS_final_p21e3.html#clause-8

src/blenderbim/blenderbim/bim/ifc.py

@@ -24,7 +24,9 @@ import zipfile
 import tempfile
 import ifcopenshell
 import blenderbim.bim.handler
+import blenderbim.tool as tool
 from pathlib import Path
+from blenderbim.tool.brick import BrickStore
 
 
 class IfcStore:
@@ -35,7 +37,6 @@ class IfcStore:
     cache_path = None
     id_map = {}
     guid_map = {}
-    deleted_ids = set()
     edited_objs = set()
     pset_template_path = ""
     pset_template_file = None
@@ -43,9 +44,6 @@ class IfcStore:
     classification_file = None
     library_path = ""
     library_file = None
-    element_listeners = set()
-    undo_redo_stack_objects = set()
-    undo_redo_stack_object_names = {}
     current_transaction = ""
     last_transaction = ""
     history = []
@@ -62,7 +60,6 @@ class IfcStore:
         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
@@ -121,6 +118,8 @@ class IfcStore:
 
     @staticmethod
     def load_file(path):
+        if not os.path.isfile(path):
+            return
         extension = path.split(".")[-1]
         if extension.lower() == "ifczip":
             with tempfile.TemporaryDirectory() as unzipped_path:
@@ -131,7 +130,9 @@ class IfcStore:
                     return
         elif extension.lower() == "ifcxml":
             IfcStore.file = ifcopenshell.file(ifcopenshell.ifcopenshell_wrapper.parse_ifcxml(path))
-        elif extension.lower() == "ifc":
+        elif bpy.context.scene.BIMProjectProperties.should_stream:
+            IfcStore.file = ifcopenshell.open(path, should_stream=True)
+        else:
             IfcStore.file = ifcopenshell.open(path)
 
     @staticmethod
@@ -157,96 +158,6 @@ class IfcStore:
             return
         return obj
 
-    @staticmethod
-    def add_element_listener(callback):
-        IfcStore.element_listeners.add(callback)
-
-    @staticmethod
-    def track_undo_redo_stack_object_map():
-        """Keeps track of currently mapped object names, typically during undo and redo
-
-        When any Blender object is stored outside a Blender PointerProperty, such as
-        in a regular Python list, there is the likely probability that the object
-        will be invalidated when undo or redo occurs. Object invalidation seems to
-        occur whenever an object is affected during an operation.
-
-        For example, if an operator deletes a modifier on o1, then o1 will be invalidated.
-        """
-        for key, value in IfcStore.id_map.items():
-            try:
-                IfcStore.undo_redo_stack_object_names[key] = value.name
-            except:
-                continue
-
-    @staticmethod
-    def track_undo_redo_stack_selected_objects():
-        """Keeps track of selected object names, typically during undo and redo
-
-        When any Blender object is stored outside a Blender PointerProperty, such as
-        in a regular Python list, there is the likely probability that the object
-        will be invalidated when undo or redo occurs. Object invalidation seems to
-        occur for selected objects either pre/post undo/redo event, including
-        selected objects for consecutive undo/redos, and all children. This is
-        important because selected objects are often deleted from the scene.
-
-        So if I first select o1, then o2, then o3, then press undo, o3 will be
-        invalidated. If instead I press undo twice, o3 and o2 will be invalidated.
-        """
-        if bpy.context.active_object:
-            objects = set([o.name for o in bpy.context.selected_objects + [bpy.context.active_object]])
-            objects.update([o.name for o in bpy.context.active_object.children])
-        else:
-            objects = set([o.name for o in bpy.context.selected_objects])
-        for obj in bpy.context.selected_objects:
-            objects.update([o.name for o in obj.children])
-        IfcStore.undo_redo_stack_objects |= objects
-
-    @staticmethod
-    def reload_undo_redo_stack_objects():
-        """Reloads any invalidated objects after undo or redo
-
-        After an undo or redo operation, objects may have been invalidated in
-        our id_map and guid_map. Invalidated objects are typically those that
-        have been manipulated or deleted. This checks the cache of mapped and
-        selected objects prior to the operation and ensures that if the object
-        is invalidated, they are reloaded based on the object name that was
-        tracked prior to the undo / redo.
-        """
-        file = IfcStore.get_file()
-        if not file:
-            return
-
-        # First, reload objects that were selected or active
-        for name in IfcStore.undo_redo_stack_objects:
-            obj = bpy.data.objects.get(name)
-            if not obj:
-                continue
-            if not obj.BIMObjectProperties.ifc_definition_id:
-                continue
-            element = file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-            data = {"id": element.id(), "obj": obj.name}
-            if hasattr(element, "GlobalId"):
-                data["guid"] = element.GlobalId
-            IfcStore.commit_link_element(data)
-
-        # Scan for any straggling invalidated objects which were indirectly affected and reload them too.
-        for key, value in IfcStore.id_map.items():
-            try:
-                value.name
-            except:
-                # TODO not so sure about this obj_name check
-                obj_name = IfcStore.undo_redo_stack_object_names.get(key, None)
-                if not obj_name:
-                    continue
-                obj = bpy.data.objects.get(obj_name)
-                if not obj or not obj.BIMObjectProperties.ifc_definition_id:
-                    continue
-                element = file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-                data = {"id": element.id(), "obj": obj.name}
-                if hasattr(element, "GlobalId"):
-                    data["guid"] = element.GlobalId
-                IfcStore.commit_link_element(data)
-
     @staticmethod
     def relink_all_objects():
         if not IfcStore.get_file():
@@ -277,23 +188,6 @@ class IfcStore:
             data = {"id": element.id(), "obj": obj.name}
             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):
         existing_obj = IfcStore.id_map.get(element.id(), None)
@@ -322,9 +216,6 @@ class IfcStore:
             blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
             blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)
 
-        for listener in IfcStore.element_listeners:
-            listener(element, obj)
-
         if IfcStore.history:
             data = {"id": element.id(), "guid": getattr(element, "GlobalId", None), "obj": obj.name}
             IfcStore.history[-1]["operations"].append(
@@ -345,10 +236,12 @@ class IfcStore:
         IfcStore.id_map[data["id"]] = obj
         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)
         if isinstance(obj, bpy.types.Material):
             blenderbim.bim.handler.subscribe_to(obj, "diffuse_color", blenderbim.bim.handler.color_callback)
+        elif isinstance(obj, bpy.types.Object):
+            blenderbim.bim.handler.subscribe_to(obj, "mode", blenderbim.bim.handler.mode_callback)
+            blenderbim.bim.handler.subscribe_to(obj, "active_material_index", blenderbim.bim.handler.active_material_index_callback)
         # TODO Listeners are not re-registered. Does this cause nasty problems to debug later on?
         # TODO We're handling id_map and guid_map, but what about edited_objs? This might cause big problems.
 
@@ -371,7 +264,7 @@ class IfcStore:
     def unlink_element(element=None, obj=None):
         if element is None:
             try:
-                element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
+                element = tool.Ifc.get_entity(obj)
             except:
                 pass
 
@@ -414,24 +307,33 @@ class IfcStore:
             )
 
     @staticmethod
-    def execute_ifc_operator(operator, context):
+    def execute_ifc_operator(operator, context, is_invoke=False):
         is_top_level_operator = not bool(IfcStore.current_transaction)
 
         if is_top_level_operator:
             IfcStore.begin_transaction(operator)
-            IfcStore.get_file().begin_transaction()
+            if tool.Ifc.get():
+                tool.Ifc.get().begin_transaction()
+            if BrickStore.graph:
+                BrickStore.begin_transaction()
             # This empty transaction ensures that each operator has at least one transaction
             IfcStore.add_transaction_operation(operator, rollback=lambda data: True, commit=lambda data: True)
         else:
             operator.transaction_key = IfcStore.current_transaction
 
-        result = getattr(operator, "_execute")(context)
+        if is_invoke:
+            result = getattr(operator, "_invoke")(context, None)
+        else:
+            result = getattr(operator, "_execute")(context)
 
         if is_top_level_operator:
-            IfcStore.get_file().end_transaction()
-            IfcStore.add_transaction_operation(
-                operator, rollback=lambda d: IfcStore.get_file().undo(), commit=lambda d: IfcStore.get_file().redo()
-            )
+            if tool.Ifc.get():
+                tool.Ifc.get().end_transaction()
+                IfcStore.add_transaction_operation(
+                    operator, rollback=lambda d: tool.Ifc.get().undo(), commit=lambda d: tool.Ifc.get().redo()
+                )
+            if BrickStore.graph:
+                BrickStore.end_transaction()
             IfcStore.end_transaction(operator)
             blenderbim.bim.handler.refresh_ui_data()
 
@@ -439,8 +341,6 @@ class IfcStore:
 
     @staticmethod
     def begin_transaction(operator):
-        IfcStore.undo_redo_stack_objects = set()
-        IfcStore.undo_redo_stack_object_names = {}
         IfcStore.current_transaction = str(uuid.uuid4())
         operator.transaction_key = IfcStore.current_transaction
 
@@ -467,6 +367,7 @@ class IfcStore:
 
     @staticmethod
     def undo():
+        BrickStore.undo()
         if not IfcStore.history:
             return
         event = IfcStore.history.pop()
@@ -476,6 +377,7 @@ class IfcStore:
 
     @staticmethod
     def redo():
+        BrickStore.redo()
         if not IfcStore.future:
             return
         event = IfcStore.future.pop()

src/blenderbim/blenderbim/bim/import_ifc.py

@@ -36,7 +36,7 @@ import ifcopenshell.util.geolocation
 import blenderbim.tool as tool
 from itertools import chain, accumulate
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.drawing.prop import get_diagram_scales
+from blenderbim.bim.module.drawing.prop import ANNOTATION_TYPES_DATA
 
 
 class FileCopy(threading.Thread):
@@ -60,7 +60,6 @@ class MaterialCreator:
 
     def create(self, element, obj, mesh):
         self.mesh = mesh
-        self.obj = obj
         if (hasattr(element, "Representation") and not element.Representation) or (
             hasattr(element, "RepresentationMaps") and not element.RepresentationMaps
         ):
@@ -140,11 +139,11 @@ class MaterialCreator:
     def assign_material_slots_to_faces(self):
         if "ios_materials" not in self.mesh or not self.mesh["ios_materials"]:
             return
-        if len(self.obj.material_slots) == 1:
+        if len(self.mesh.materials) == 1:
             return
         material_to_slot = {}
         for i, material in enumerate(self.mesh["ios_materials"]):
-            slot_index = self.obj.material_slots.find(self.styles[material].name)
+            slot_index = self.mesh.materials.find(self.styles[material].name)
             material_to_slot[i] = slot_index
 
         if len(self.mesh.polygons) == len(self.mesh["ios_material_ids"]):
@@ -179,11 +178,16 @@ class IfcImporter:
         self.settings.set_deflection_tolerance(self.ifc_import_settings.deflection_tolerance)
         self.settings.set_angular_tolerance(self.ifc_import_settings.angular_tolerance)
         self.settings.set(self.settings.STRICT_TOLERANCE, True)
+        self.settings_curve = ifcopenshell.geom.settings()
+        self.settings_curve.set_deflection_tolerance(self.ifc_import_settings.deflection_tolerance)
+        self.settings_curve.set_angular_tolerance(self.ifc_import_settings.angular_tolerance)
+        self.settings_curve.set(self.settings_curve.STRICT_TOLERANCE, True)
+        self.settings_curve.set(self.settings_curve.INCLUDE_CURVES, True)
         self.settings_native = ifcopenshell.geom.settings()
         self.settings_native.set(self.settings_native.INCLUDE_CURVES, True)
         self.settings_2d = ifcopenshell.geom.settings()
         self.settings_2d.set(self.settings_2d.INCLUDE_CURVES, True)
-        self.settings_2d.set(self.settings.STRICT_TOLERANCE, True)
+        self.settings_2d.set(self.settings_2d.STRICT_TOLERANCE, True)
         self.project = None
         self.has_existing_project = False
         self.collections = {}
@@ -242,6 +246,8 @@ class IfcImporter:
         self.profile_code("Create native elements")
         self.create_elements()
         self.profile_code("Create elements")
+        self.create_generic_elements(self.annotations)
+        self.profile_code("Create annotations")
         self.create_grids()
         self.profile_code("Create grids")
         self.create_spatial_elements()
@@ -321,10 +327,19 @@ class IfcImporter:
             if isinstance(self.elements, set):
                 self.elements = list(self.elements)
             # TODO: enable filtering for annotations
-            self.annotations = set(self.file.by_type("IfcAnnotation"))
         else:
-            self.elements = self.file.by_type("IfcElement")
-            self.annotations = set(self.file.by_type("IfcAnnotation"))
+            if self.file.schema in ("IFC2X3", "IFC4"):
+                self.elements = self.file.by_type("IfcElement") + self.file.by_type("IfcProxy")
+            else:
+                self.elements = self.file.by_type("IfcElement")
+
+        drawing_groups = [g for g in self.file.by_type("IfcGroup") if g.ObjectType == "DRAWING"]
+        drawing_annotations = set()
+        for drawing_group in drawing_groups:
+            for rel in drawing_group.IsGroupedBy:
+                drawing_annotations.update(rel.RelatedObjects)
+        self.annotations = set([a for a in self.file.by_type("IfcAnnotation")])
+        self.annotations -= drawing_annotations
 
         self.elements = [e for e in self.elements if not e.is_a("IfcFeatureElement")]
         if self.ifc_import_settings.is_coordinating:
@@ -335,26 +350,11 @@ class IfcImporter:
         if self.ifc_import_settings.has_filter or offset or offset_limit < len(self.elements):
             self.element_types = set([ifcopenshell.util.element.get_type(e) for e in self.elements])
         else:
-            if self.file.schema == "IFC2X3":
-                self.element_types = set(
-                    self.file.by_type("IfcElementType")
-                    + self.file.by_type("IfcDoorStyle")
-                    + self.file.by_type("IfcWindowStyle")
-                )
-            elif self.file.schema == "IFC4":
-                self.element_types = set(
-                    self.file.by_type("IfcElementType")
-                    + self.file.by_type("IfcDoorStyle")
-                    + self.file.by_type("IfcWindowStyle")
-                    + self.file.by_type("IfcSpatialElementType")
-                )
-            else:
-                self.element_types = set(
-                    self.file.by_type("IfcElementType") + self.file.by_type("IfcSpatialElementType")
-                )
+            self.element_types = set(self.file.by_type("IfcTypeProduct"))
 
         if self.ifc_import_settings.has_filter and self.ifc_import_settings.should_filter_spatial_elements:
-            self.spatial_elements = self.get_spatial_elements_filtered_by_elements(self.elements)
+            filtered_elements = self.elements | set(self.file.by_type("IfcGrid"))
+            self.spatial_elements = self.get_spatial_elements_filtered_by_elements(filtered_elements)
         else:
             if self.file.schema == "IFC2X3":
                 self.spatial_elements = set(self.file.by_type("IfcSpatialStructureElement"))
@@ -368,11 +368,13 @@ class IfcImporter:
             while True:
                 results.add(spatial_element)
                 spatial_element = ifcopenshell.util.element.get_aggregate(spatial_element)
-                if not spatial_element or spatial_element.is_a("IfcContext"):
+                if not spatial_element or spatial_element.is_a() in ("IfcProject", "IfcProjectLibrary"):
                     break
         return results
 
     def parse_native_elements(self):
+        if not self.ifc_import_settings.should_load_geometry:
+            return
         for element in self.elements:
             if self.is_native(element):
                 self.native_elements.add(element)
@@ -388,7 +390,7 @@ class IfcImporter:
         representations = self.get_transformed_body_representations(element.Representation.Representations)
 
         # Single swept disk solids (e.g. rebar) are better natively represented as beveled curves
-        if self.is_native_swept_disk_solid(representations):
+        if self.is_native_swept_disk_solid(element, representations):
             self.native_data[element.GlobalId] = {
                 "representations": representations,
                 "representation": self.get_body_representation(element.Representation.Representations),
@@ -416,16 +418,20 @@ class IfcImporter:
             }
             return True
 
-    def is_native_swept_disk_solid(self, representations):
+    def is_native_swept_disk_solid(self, element, representations):
         for representation in representations:
             items = representation["raw"].Items or []  # Be forgiving of invalid IFCs because Revit :(
             if len(items) == 1 and items[0].is_a("IfcSweptDiskSolid"):
+                if tool.Pset.get_element_pset(element, "BBIM_Railing"):
+                    return False
                 return True
             elif len(items) and (  # See #2508 why we accommodate for invalid IFCs here
                 items[0].is_a("IfcSweptDiskSolid")
                 and len({i.is_a() for i in items}) == 1
                 and len({i.Radius for i in items}) == 1
             ):
+                if tool.Pset.get_element_pset(element, "BBIM_Railing"):
+                    return False
                 return True
         return False
 
@@ -580,6 +586,8 @@ class IfcImporter:
                     return result
 
     def create_grids(self):
+        if not self.ifc_import_settings.should_load_geometry:
+            return
         grids = self.file.by_type("IfcGrid")
         for grid in grids:
             shape = None
@@ -625,34 +633,37 @@ class IfcImporter:
 
     def create_element_type(self, element):
         self.ifc_import_settings.logger.info("Creating object %s", element)
-        representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-        if not representation:
-            representation = ifcopenshell.util.representation.get_representation(element, "Plan", "Annotation")
-        if not representation:
-            representation = ifcopenshell.util.representation.get_representation(element, "Model", "Annotation")
         mesh = None
-        if representation:
-            mesh_name = "{}/{}".format(representation.ContextOfItems.id(), representation.id())
-            mesh = self.meshes.get(mesh_name)
-            if mesh is None:
-                shape = None
-                try:
-                    shape = ifcopenshell.geom.create_shape(self.settings, representation)
-                except:
+        if self.ifc_import_settings.should_load_geometry:
+            representation = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+            if not representation:
+                representation = ifcopenshell.util.representation.get_representation(element, "Plan", "Annotation")
+            if not representation:
+                representation = ifcopenshell.util.representation.get_representation(element, "Model", "Annotation")
+            if representation:
+                mesh_name = "{}/{}".format(representation.ContextOfItems.id(), representation.id())
+                mesh = self.meshes.get(mesh_name)
+                if mesh is None:
+                    shape = None
                     try:
-                        shape = ifcopenshell.geom.create_shape(self.settings_2d, representation)
+                        shape = ifcopenshell.geom.create_shape(self.settings, representation)
                     except:
-                        self.ifc_import_settings.logger.error("Failed to generate shape for %s", element)
-                if shape:
-                    mesh = self.create_mesh(element, shape)
-                    tool.Loader.link_mesh(shape, mesh)
-                    self.meshes[mesh_name] = mesh
+                        try:
+                            shape = ifcopenshell.geom.create_shape(self.settings_2d, representation)
+                        except:
+                            self.ifc_import_settings.logger.error("Failed to generate shape for %s", element)
+                    if shape:
+                        mesh = self.create_mesh(element, shape)
+                        tool.Loader.link_mesh(shape, mesh)
+                        self.meshes[mesh_name] = mesh
         obj = bpy.data.objects.new(tool.Loader.get_name(element), mesh)
         self.link_element(element, obj)
         self.material_creator.create(element, obj, mesh)
         self.type_products[element.GlobalId] = obj
 
     def create_native_elements(self):
+        if not self.ifc_import_settings.should_load_geometry:
+            return
         progress = 0
         checkpoint = time.time()
         total = len(self.native_elements)
@@ -694,29 +705,87 @@ class IfcImporter:
         self.create_generic_elements(self.elements)
 
     def create_generic_elements(self, elements):
+        if isinstance(self.file, ifcopenshell.sqlite):
+            return self.create_generic_sqlite_elements(elements)
+
         # Based on my experience in viewing BIM models, representations are prioritised as follows:
-        # 1. 3D Body, 2. 2D Plans, 3. Point clouds, 4. No representation
-        # If an element has a representation that doesn't follow 1, 2, or 3, it will not show by default.
+        # 1. 3D Body, 2. 2D Body, 3. 2D Plans / annotations, 4. Point clouds, 5. No representation
+        # If an element has a representation that doesn't follow 1, 2, 3, or 4, it will not show by default.
         # The user can load them later if they want to view them.
-        products = self.create_products(elements)
-        elements -= products
-        products = self.create_curve_products(elements)
-        elements -= products
-        products = self.create_pointclouds(elements)
-        elements -= products
-        for element in elements:
+        if self.ifc_import_settings.should_load_geometry:
+            products = self.create_products(elements)
+            elements -= products
+            products = self.create_products(elements, settings=self.settings_curve)
+            elements -= products
+            products = self.create_products(elements, settings=self.settings_2d)
+            elements -= products
+            products = self.create_pointclouds(elements)
+            elements -= products
+
+        total = len(elements)
+        for i, element in enumerate(elements):
+            if i % 250 == 0:
+                print("{} / {} elements processed ...".format(i, total))
             self.create_product(element)
 
-    def create_products(self, products):
+    def create_generic_sqlite_elements(self, elements):
+        self.geometry_cache = self.file.get_geometry([e.id() for e in elements])
+        for geometry_id, geometry in self.geometry_cache["geometry"].items():
+            mesh_name = tool.Loader.get_mesh_name(type("Geometry", (), {"id": geometry_id}))
+            mesh = bpy.data.meshes.new(mesh_name)
+
+            verts = geometry["verts"]
+            mesh["has_cartesian_point_offset"] = False
+
+            if geometry["faces"]:
+                num_vertices = len(verts) // 3
+                total_faces = len(geometry["faces"])
+                loop_start = range(0, total_faces, 3)
+                num_loops = total_faces // 3
+                loop_total = [3] * num_loops
+                num_vertex_indices = len(geometry["faces"])
+
+                mesh.vertices.add(num_vertices)
+                mesh.vertices.foreach_set("co", verts)
+                mesh.loops.add(num_vertex_indices)
+                mesh.loops.foreach_set("vertex_index", geometry["faces"])
+                mesh.polygons.add(num_loops)
+                mesh.polygons.foreach_set("loop_start", loop_start)
+                mesh.polygons.foreach_set("loop_total", loop_total)
+                mesh.update()
+            else:
+                e = geometry["edges"]
+                v = verts
+                vertices = [[v[i], v[i + 1], v[i + 2]] for i in range(0, len(v), 3)]
+                edges = [[e[i], e[i + 1]] for i in range(0, len(e), 2)]
+                mesh.from_pydata(vertices, edges, [])
+
+            mesh["ios_materials"] = geometry["materials"]
+            mesh["ios_material_ids"] = geometry["material_ids"]
+            self.meshes[mesh_name] = mesh
+
+        total = len(elements)
+        for i, element in enumerate(elements):
+            if i % 250 == 0:
+                print("{} / {} elements processed ...".format(i, total))
+            mesh = None
+            geometry_id = self.geometry_cache["shapes"][element.id()]["geometry"]
+            if geometry_id:
+                mesh_name = tool.Loader.get_mesh_name(type("Geometry", (), {"id": geometry_id}))
+                mesh = self.meshes.get(mesh_name)
+            self.create_product(element, mesh=mesh)
+
+    def create_products(self, products, settings=None):
+        if settings is None:
+            settings = self.settings
+
         results = set()
         if not products:
             return results
         if self.ifc_import_settings.should_use_cpu_multiprocessing:
-            iterator = ifcopenshell.geom.iterator(
-                self.settings, self.file, multiprocessing.cpu_count(), include=products
-            )
+            iterator = ifcopenshell.geom.iterator(settings, self.file, multiprocessing.cpu_count(), include=products)
         else:
-            iterator = ifcopenshell.geom.iterator(self.settings, self.file, include=products)
+            iterator = ifcopenshell.geom.iterator(settings, self.file, include=products)
         if self.ifc_import_settings.should_cache:
             cache = IfcStore.get_cache()
             if cache:
@@ -783,10 +852,10 @@ class IfcImporter:
         self.structural_collection.children.link(self.structural_connection_collection)
         self.project["blender"].children.link(self.structural_collection)
 
-        self.create_curve_products(self.file.by_type("IfcStructuralCurveMember"))
-        self.create_curve_products(self.file.by_type("IfcStructuralCurveConnection"))
-        self.create_curve_products(self.file.by_type("IfcStructuralSurfaceMember"))
-        self.create_curve_products(self.file.by_type("IfcStructuralSurfaceConnection"))
+        self.create_products(self.file.by_type("IfcStructuralCurveMember"), settings=self.settings_2d)
+        self.create_products(self.file.by_type("IfcStructuralCurveConnection"), settings=self.settings_2d)
+        self.create_products(self.file.by_type("IfcStructuralSurfaceMember"), settings=self.settings_2d)
+        self.create_products(self.file.by_type("IfcStructuralSurfaceConnection"), settings=self.settings_2d)
         self.create_structural_point_connections()
 
     def create_structural_point_connections(self):
@@ -823,7 +892,7 @@ class IfcImporter:
             return None
 
         for representation in representations:
-            if representation.RepresentationType == "PointCloud":
+            if representation.RepresentationType in ("PointCloud", "Point"):
                 return representation
 
             elif self.file.schema == "IFC2X3" and representation.RepresentationType == "GeometricSet":
@@ -874,40 +943,6 @@ class IfcImporter:
         self.link_element(product, obj)
         return product
 
-    def create_curve_products(self, products):
-        results = set()
-        if not products:
-            return results
-        if self.ifc_import_settings.should_use_cpu_multiprocessing:
-            iterator = ifcopenshell.geom.iterator(
-                self.settings_2d, self.file, multiprocessing.cpu_count(), include=products
-            )
-        else:
-            iterator = ifcopenshell.geom.iterator(self.settings_2d, self.file, include=products)
-        if self.ifc_import_settings.should_cache:
-            cache = IfcStore.get_cache()
-            if cache:
-                iterator.set_cache(cache)
-        valid_file = iterator.initialize()
-        if not valid_file:
-            return results
-        checkpoint = time.time()
-        total = 0
-        while True:
-            total += 1
-            if total % 250 == 0:
-                print("{} elements processed in {:.2f}s ...".format(total, time.time() - checkpoint))
-                checkpoint = time.time()
-            shape = iterator.get()
-            if shape:
-                product = self.file.by_id(shape.id)
-                self.create_product(product, shape)
-                results.add(product)
-            if not iterator.next():
-                break
-        print("Done creating geometry")
-        return results
-
     def create_product(self, element, shape=None, mesh=None):
         if element is None:
             return
@@ -921,9 +956,6 @@ class IfcImporter:
 
         if mesh:
             pass
-        elif element.is_a("IfcAnnotation") and element.ObjectType == "DRAWING":
-            mesh = self.create_camera(element, shape)
-            tool.Loader.link_mesh(shape, mesh)
         elif element.is_a("IfcAnnotation") and self.is_curve_annotation(element) and shape:
             mesh = self.create_curve(element, shape)
             tool.Loader.link_mesh(shape, mesh)
@@ -1310,13 +1342,21 @@ class IfcImporter:
                 last_obj = obj
         if not last_obj:
             return
+
+        # temporarily unhide types collection to make sure all objects will be cleaned
+        project_collection = bpy.context.view_layer.layer_collection.children[self.project["blender"].name]
+        types_collection = project_collection.children[self.type_collection.name]
+        types_collection.hide_viewport = False
         bpy.context.view_layer.objects.active = last_obj
+
         context_override = {}
         bpy.ops.object.editmode_toggle(context_override)
-        bpy.ops.mesh.remove_doubles(context_override)
         bpy.ops.mesh.tris_convert_to_quads(context_override)
         bpy.ops.mesh.normals_make_consistent(context_override)
         bpy.ops.object.editmode_toggle(context_override)
+
+        types_collection.hide_viewport = True
+        bpy.context.view_layer.objects.active = last_obj
         IfcStore.edited_objs.clear()
 
     def load_file(self):
@@ -1348,39 +1388,43 @@ class IfcImporter:
                         bpy.context.scene.unit_settings.length_unit = "FEET"
             elif unit.is_a("IfcNamedUnit") and unit.UnitType == "AREAUNIT":
                 name = unit.Name if unit.is_a("IfcSIUnit") else unit.Name.lower()
-                bpy.context.scene.BIMProperties.area_unit = "{}{}".format(
-                    unit.Prefix + "/" if hasattr(unit, "Prefix") and unit.Prefix else "", name
-                )
+                try:
+                    bpy.context.scene.BIMProperties.area_unit = "{}{}".format(
+                        unit.Prefix + "/" if hasattr(unit, "Prefix") and unit.Prefix else "", name
+                    )
+                except:  # Probably an invalid unit.
+                    bpy.context.scene.BIMProperties.area_unit = "SQUARE_METRE"
             elif unit.is_a("IfcNamedUnit") and unit.UnitType == "VOLUMEUNIT":
                 name = unit.Name if unit.is_a("IfcSIUnit") else unit.Name.lower()
-                bpy.context.scene.BIMProperties.volume_unit = "{}{}".format(
-                    unit.Prefix + "/" if hasattr(unit, "Prefix") and unit.Prefix else "", name
-                )
+                try:
+                    bpy.context.scene.BIMProperties.volume_unit = "{}{}".format(
+                        unit.Prefix + "/" if hasattr(unit, "Prefix") and unit.Prefix else "", name
+                    )
+                except:  # Probably an invalid unit.
+                    bpy.context.scene.BIMProperties.volume_unit = "CUBIC_METRE"
 
     def create_project(self):
         project = self.file.by_type("IfcProject")[0]
         self.project = {"ifc": project}
         obj = tool.Ifc.get_object(project)
         if obj:
-            self.project["blender"] = obj.users_collection[0]
+            self.project["blender"] = obj.BIMObjectProperties.collection
             self.has_existing_project = True
             return
         self.project["blender"] = bpy.data.collections.new(
             "{}/{}".format(self.project["ifc"].is_a(), self.project["ifc"].Name)
         )
         obj = self.create_product(self.project["ifc"])
-        if obj:
-            self.project["blender"].objects.link(obj)
+        self.project["blender"].objects.link(obj)
+        self.project["blender"].BIMCollectionProperties.obj = obj
+        obj.BIMObjectProperties.collection = self.project["blender"]
 
     def create_collections(self):
-        if self.ifc_import_settings.collection_mode == "DECOMPOSITION":
-            self.create_decomposition_collections()
-        elif self.ifc_import_settings.collection_mode == "SPATIAL_DECOMPOSITION":
-            self.create_spatial_decomposition_collections()
-
-    def create_decomposition_collections(self):
         self.create_spatial_decomposition_collections()
-        self.create_aggregate_collections()
+        if self.ifc_import_settings.collection_mode == "DECOMPOSITION":
+            self.create_aggregate_collections()
+        elif self.ifc_import_settings.collection_mode == "SPATIAL_DECOMPOSITION":
+            pass
 
     def create_spatial_decomposition_collections(self):
         for rel_aggregate in self.project["ifc"].IsDecomposedBy or []:
@@ -1423,7 +1467,7 @@ class IfcImporter:
                 obj = tool.Ifc.get_object(element)
                 if obj:
                     is_existing = True
-                    collection = obj.users_collection[0]
+                    collection = obj.BIMObjectProperties.collection
                     self.collections[element.GlobalId] = collection
             if not is_existing:
                 collection = bpy.data.collections.new(tool.Loader.get_name(element))
@@ -1509,183 +1553,18 @@ class IfcImporter:
         if not blender_material:
             name = style.Name or str(style.id())
             blender_material = bpy.data.materials.new(name)
+            blender_material.use_fake_user = True
 
         self.link_element(style, blender_material)
 
         blender_material.BIMMaterialProperties.ifc_style_id = style.id()
         self.material_creator.styles[style.id()] = blender_material
 
-        rendering_style = None
-        texture_style = None
-
-        for surface_style in style.Styles:
-            if surface_style.is_a() == "IfcSurfaceStyleShading":
-                self.create_surface_style_shading(blender_material, surface_style)
-            elif surface_style.is_a("IfcSurfaceStyleRendering"):
-                rendering_style = surface_style
-                self.create_surface_style_rendering(blender_material, surface_style)
-            elif surface_style.is_a("IfcSurfaceStyleWithTextures"):
-                texture_style = surface_style
-
-        if rendering_style and texture_style:
-            self.create_surface_style_with_textures(blender_material, rendering_style, texture_style)
-
-        tool.Style.record_shading(blender_material)
-
-    def create_surface_style_shading(self, blender_material, surface_style):
-        alpha = 1.0
-        # Transparency was added in IFC4
-        if hasattr(surface_style, "Transparency") and surface_style.Transparency:
-            alpha = 1 - surface_style.Transparency
-        blender_material.diffuse_color = (
-            surface_style.SurfaceColour.Red,
-            surface_style.SurfaceColour.Green,
-            surface_style.SurfaceColour.Blue,
-            alpha,
-        )
-
-    def create_surface_style_rendering(self, blender_material, surface_style):
-        self.create_surface_style_shading(blender_material, surface_style)
-        if surface_style.ReflectanceMethod in ["PHYSICAL", "NOTDEFINED"]:
-            blender_material.use_nodes = True
-            bsdf = blender_material.node_tree.nodes["Principled BSDF"]
-            if surface_style.DiffuseColour:
-                if surface_style.DiffuseColour.is_a("IfcColourRgb"):
-                    bsdf.inputs["Base Color"].default_value = (
-                        surface_style.DiffuseColour.Red,
-                        surface_style.DiffuseColour.Green,
-                        surface_style.DiffuseColour.Blue,
-                        1,
-                    )
-                elif surface_style.DiffuseColour.is_a("IfcNormalisedRatioMeasure"):
-                    bsdf.inputs["Base Color"].default_value = (
-                        surface_style.SurfaceColour.Red * surface_style.DiffuseColour.wrappedValue,
-                        surface_style.SurfaceColour.Green * surface_style.DiffuseColour.wrappedValue,
-                        surface_style.SurfaceColour.Blue * surface_style.DiffuseColour.wrappedValue,
-                        1,
-                    )
-            if surface_style.SpecularColour and surface_style.SpecularColour.is_a("IfcNormalisedRatioMeasure"):
-                bsdf.inputs["Metallic"].default_value = surface_style.SpecularColour.wrappedValue
-            if surface_style.SpecularHighlight and surface_style.SpecularHighlight.is_a("IfcSpecularRoughness"):
-                bsdf.inputs["Roughness"].default_value = surface_style.SpecularHighlight.wrappedValue
-            if hasattr(surface_style, "Transparency") and surface_style.Transparency:
-                bsdf.inputs["Alpha"].default_value = 1 - surface_style.Transparency
-                blender_material.blend_method = "BLEND"
-        elif surface_style.ReflectanceMethod == "FLAT":
-            blender_material.use_nodes = True
-
-            output = {n.type: n for n in blender_material.node_tree.nodes}.get("OUTPUT_MATERIAL", None)
-            bsdf = blender_material.node_tree.nodes["Principled BSDF"]
-
-            mix = blender_material.node_tree.nodes.new(type="ShaderNodeMixShader")
-            mix.location = bsdf.location
-            blender_material.node_tree.links.new(mix.outputs[0], output.inputs["Surface"])
-
-            blender_material.node_tree.nodes.remove(bsdf)
-
-            lightpath = blender_material.node_tree.nodes.new(type="ShaderNodeLightPath")
-            lightpath.location = mix.location - mathutils.Vector((200, -200))
-            blender_material.node_tree.links.new(lightpath.outputs[0], mix.inputs[0])
-
-            bsdf = blender_material.node_tree.nodes.new(type="ShaderNodeBsdfTransparent")
-            bsdf.location = mix.location - mathutils.Vector((200, 0))
-            blender_material.node_tree.links.new(bsdf.outputs[0], mix.inputs[1])
-
-            rgb = blender_material.node_tree.nodes.new(type="ShaderNodeRGB")
-            rgb.location = mix.location - mathutils.Vector((200, 200))
-            blender_material.node_tree.links.new(rgb.outputs[0], mix.inputs[2])
-
-            if surface_style.DiffuseColour and surface_style.DiffuseColour.is_a("IfcColourRgb"):
-                rgb.outputs[0].default_value = (
-                    surface_style.DiffuseColour.Red,
-                    surface_style.DiffuseColour.Green,
-                    surface_style.DiffuseColour.Blue,
-                    1,
-                )
-
-    def create_surface_style_with_textures(self, blender_material, rendering_style, texture_style):
-        for texture in texture_style.Textures:
-            mode = getattr(texture, "Mode", None)
-            node = None
-
-            if texture.is_a("IfcImageTexture"):
-                image_url = texture.URLReference
-                if not os.path.abspath(texture.URLReference) and tool.Ifc.get_path():
-                    image_url = os.path.join(os.path.dirname(tool.Ifc.get_path()), texture.URLReference)
-
-            if rendering_style.ReflectanceMethod in ["PHYSICAL", "NOTDEFINED"]:
-                bsdf = blender_material.node_tree.nodes["Principled BSDF"]
-                if mode == "NORMAL":
-                    normalmap = blender_material.node_tree.nodes.new(type="ShaderNodeNormalMap")
-                    normalmap.location = bsdf.location - mathutils.Vector((200, 0))
-                    blender_material.node_tree.links.new(normalmap.outputs[0], bsdf.inputs["Normal"])
-
-                    node = blender_material.node_tree.nodes.new(type="ShaderNodeTexImage")
-                    node.location = normalmap.location - mathutils.Vector((200, 0))
-                    image = bpy.data.images.load(image_url)
-                    image.colorspace_settings.name = "Non-Color"
-                    node.image = image
-                    blender_material.node_tree.links.new(node.outputs[0], normalmap.inputs["Color"])
-                elif mode == "EMISSIVE":
-                    output = {n.type: n for n in blender_material.node_tree.nodes}.get("OUTPUT_MATERIAL", None)
-
-                    add = blender_material.node_tree.nodes.new(type="ShaderNodeAddShader")
-                    add.location = bsdf.location + mathutils.Vector((200, 0))
-                    blender_material.node_tree.links.new(bsdf.outputs[0], add.inputs[1])
-                    blender_material.node_tree.links.new(add.outputs[0], output.inputs[0])
-
-                    emission = blender_material.node_tree.nodes.new(type="ShaderNodeEmission")
-                    emission.location = add.location - mathutils.Vector((200, 0))
-                    blender_material.node_tree.links.new(emission.outputs[0], add.inputs[0])
-
-                    node = blender_material.node_tree.nodes.new(type="ShaderNodeTexImage")
-                    node.location = emission.location - mathutils.Vector((200, 0))
-                    image = bpy.data.images.load(image_url)
-                    node.image = image
-                    blender_material.node_tree.links.new(node.outputs[0], emission.inputs[0])
-                elif mode == "METALLICROUGHNESS":
-                    separate = blender_material.node_tree.nodes.new(type="ShaderNodeSeparateRGB")
-                    separate.location = bsdf.location - mathutils.Vector((200, 0))
-                    blender_material.node_tree.links.new(separate.outputs[1], bsdf.inputs["Roughness"])
-                    blender_material.node_tree.links.new(separate.outputs[2], bsdf.inputs["Metallic"])
-
-                    node = blender_material.node_tree.nodes.new(type="ShaderNodeTexImage")
-                    node.location = separate.location - mathutils.Vector((200, 0))
-                    image = bpy.data.images.load(image_url)
-                    image.colorspace_settings.name = "Non-Color"
-                    node.image = image
-                    blender_material.node_tree.links.new(node.outputs[0], separate.inputs[0])
-                elif mode == "OCCLUSION":
-                    # TODO work out how to implement glTF settings here
-                    # https://docs.blender.org/manual/en/dev/addons/import_export/scene_gltf2.html
-                    pass
-                elif mode == "DIFFUSE":
-                    node = blender_material.node_tree.nodes.new(type="ShaderNodeTexImage")
-                    node.location = bsdf.location - mathutils.Vector((400, 0))
-                    image = bpy.data.images.load(image_url)
-                    node.image = image
-                    blender_material.node_tree.links.new(node.outputs[0], bsdf.inputs["Base Color"])
-                    blender_material.node_tree.links.new(node.outputs[1], bsdf.inputs["Alpha"])
-                    blender_material.blend_method = "BLEND"
-            elif rendering_style.ReflectanceMethod == "FLAT":
-                bsdf = blender_material.node_tree.nodes["Mix Shader"]
-                if mode == "EMISSIVE":
-                    node = blender_material.node_tree.nodes.new(type="ShaderNodeTexImage")
-                    node.location = bsdf.location - mathutils.Vector((200, 0))
-                    image = bpy.data.images.load(image_url)
-                    node.image = image
-                    blender_material.node_tree.links.new(node.outputs[0], bsdf.inputs[2])
-
-            if node and getattr(texture, "IsMappedBy", None):
-                coordinates = texture.IsMappedBy[0]
-                coord = blender_material.node_tree.nodes.new(type="ShaderNodeTexCoord")
-                coord.location = node.location - mathutils.Vector((200, 0))
-                if coordinates.is_a("IfcTextureCoordinateGenerator") and coordinates.Mode == "COORD":
-                    blender_material.node_tree.links.new(coord.outputs["Generated"], node.inputs["Vector"])
-                elif coordinates.is_a("IfcTextureCoordinateGenerator") and coordinates.Mode == "COORD-EYE":
-                    blender_material.node_tree.links.new(coord.outputs["Camera"], node.inputs["Vector"])
-                else:
-                    blender_material.node_tree.links.new(coord.outputs["UV"], node.inputs["Vector"])
+        style_elements = tool.Style.get_style_elements(blender_material)
+        if tool.Style.has_blender_external_style(style_elements):
+            blender_material.BIMStyleProperties.active_style_type = "External"
+        else:
+            blender_material.BIMStyleProperties.active_style_type = "Shading"
 
     def place_objects_in_collections(self):
         for ifc_definition_id, obj in self.added_data.items():
@@ -1705,6 +1584,8 @@ class IfcImporter:
             return
         elif element.GlobalId in self.collections:
             collection = self.collections[element.GlobalId]
+            collection.BIMCollectionProperties.obj = obj
+            obj.BIMObjectProperties.collection = collection
             collection.name = obj.name
             return collection.objects.link(obj)
         elif getattr(element, "Decomposes", None):
@@ -1719,7 +1600,10 @@ class IfcImporter:
         elif element.is_a("IfcGridAxis"):
             return
         elif element.GlobalId in self.collections:
-            return self.collections[element.GlobalId].objects.link(obj)
+            collection = self.collections[element.GlobalId]
+            collection.BIMCollectionProperties.obj = obj
+            obj.BIMObjectProperties.collection = collection
+            return collection.objects.link(obj)
         elif element.is_a("IfcTypeObject"):
             return self.type_collection.objects.link(obj)
         elif element.is_a("IfcStructuralMember"):
@@ -1746,14 +1630,8 @@ class IfcImporter:
             bpy.context.scene.collection.objects.link(obj)
 
     def is_curve_annotation(self, element):
-        return element.ObjectType in [
-            "DIMENSION",
-            "EQUAL_DIMENSION",
-            "PLAN_LEVEL",
-            "SECTION_LEVEL",
-            "STAIR_ARROW",
-            "TEXT_LEADER",
-        ]
+        object_type = element.ObjectType
+        return object_type in ANNOTATION_TYPES_DATA and ANNOTATION_TYPES_DATA[object_type][3] == "curve"
 
     def get_drawing_group(self, element):
         for rel in element.HasAssignments or []:
@@ -1761,7 +1639,10 @@ class IfcImporter:
                 return rel.RelatingGroup
 
     def get_element_matrix(self, element):
-        result = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
+        if isinstance(element, ifcopenshell.sqlite_entity):
+            result = self.geometry_cache["shapes"][element.id()]["matrix"]
+        else:
+            result = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
         result[0][3] *= self.unit_scale
         result[1][3] *= self.unit_scale
         result[2][3] *= self.unit_scale
@@ -1834,54 +1715,6 @@ class IfcImporter:
             ):
                 return representation.Items[0].MappingTarget
 
-    def create_camera(self, element, shape):
-        if hasattr(shape, "geometry"):
-            geometry = shape.geometry
-        else:
-            geometry = shape
-
-        v = geometry.verts
-        x = [v[i] for i in range(0, len(v), 3)]
-        y = [v[i + 1] for i in range(0, len(v), 3)]
-        z = [v[i + 2] for i in range(0, len(v), 3)]
-        width = max(x) - min(x)
-        height = max(y) - min(y)
-        depth = max(z) - min(z)
-
-        camera = bpy.data.cameras.new(tool.Loader.get_mesh_name(geometry))
-        camera.type = "ORTHO"
-        camera.ortho_scale = width if width > height else height
-        camera.clip_end = depth
-
-        if width > height:
-            camera.BIMCameraProperties.raster_x = 1000
-            camera.BIMCameraProperties.raster_y = round(1000 * (height / width))
-        else:
-            camera.BIMCameraProperties.raster_x = round(1000 * (width / height))
-            camera.BIMCameraProperties.raster_y = 1000
-
-        psets = ifcopenshell.util.element.get_psets(element)
-        pset = psets.get("EPset_Drawing")
-        if pset:
-            if "TargetView" in pset:
-                camera.BIMCameraProperties.target_view = pset["TargetView"]
-            if "Scale" in pset:
-                valid_scales = [
-                    i[0] for i in get_diagram_scales(None, bpy.context) if pset["Scale"] == i[0].split("|")[-1]
-                ]
-                if valid_scales:
-                    camera.BIMCameraProperties.diagram_scale = valid_scales[0]
-                else:
-                    camera.BIMCameraProperties.diagram_scale = "CUSTOM"
-                    camera.BIMCameraProperties.custom_diagram_scale = pset["Scale"]
-            if "HasUnderlay" in pset:
-                camera.BIMCameraProperties.has_underlay = pset["HasUnderlay"]
-            if "HasLinework" in pset:
-                camera.BIMCameraProperties.has_linework = pset["HasLinework"]
-            if "HasAnnotation" in pset:
-                camera.BIMCameraProperties.has_annotation = pset["HasAnnotation"]
-        return camera
-
     def create_curve(self, element, shape):
         if hasattr(shape, "geometry"):
             geometry = shape.geometry
@@ -1966,6 +1799,7 @@ class IfcImporter:
                 mesh.polygons.add(num_loops)
                 mesh.polygons.foreach_set("loop_start", loop_start)
                 mesh.polygons.foreach_set("loop_total", loop_total)
+                mesh.polygons.foreach_set("use_smooth", [0] * total_faces)
                 mesh.update()
             else:
                 e = geometry.edges
@@ -2042,6 +1876,7 @@ class IfcImportSettings:
         self.should_use_cpu_multiprocessing = True
         self.merge_mode = None
         self.should_merge_materials_by_colour = False
+        self.should_load_geometry = True
         self.should_use_native_meshes = False
         self.should_clean_mesh = True
         self.should_cache = True
@@ -2071,6 +1906,7 @@ class IfcImportSettings:
         settings.should_use_cpu_multiprocessing = props.should_use_cpu_multiprocessing
         settings.merge_mode = props.merge_mode
         settings.should_merge_materials_by_colour = props.should_merge_materials_by_colour
+        settings.should_load_geometry = props.should_load_geometry
         settings.should_use_native_meshes = props.should_use_native_meshes
         settings.should_clean_mesh = props.should_clean_mesh
         settings.should_cache = props.should_cache

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

@@ -40,16 +40,31 @@ class BIM_OT_assign_object(bpy.types.Operator, Operator):
     bl_label = "Assign Object"
     bl_options = {"REGISTER", "UNDO"}
     relating_object: bpy.props.IntProperty()
-    related_object: bpy.props.IntProperty()
 
     def _execute(self, context):
-        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_obj = None
+        if self.relating_object:
+            relating_obj = tool.Ifc.get_object(tool.Ifc.get().by_id(self.relating_object))
+        elif context.active_object:
+            relating_obj = context.active_object
+        if not relating_obj:
+            return
+
+        for obj in bpy.context.selected_objects:
+            if obj == relating_obj:
+                continue
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue
+            result = core.assign_object(
+                tool.Ifc,
+                tool.Aggregate,
+                tool.Collector,
+                relating_obj=relating_obj,
+                related_obj=obj,
+            )
+            if not result:
+                self.report({"ERROR"}, f" Cannot aggregate {obj.name} to {relating_obj.name}")
 
 
 class BIM_OT_unassign_object(bpy.types.Operator, Operator):
@@ -148,10 +163,7 @@ class BIM_OT_add_aggregate(bpy.types.Operator, tool.Ifc.Operator):
             core.assign_object(tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=aggregate, related_obj=obj)
 
     def create_aggregate(self, context, ifc_class):
-        aggregate_collection = bpy.data.collections.new(f"{ifc_class}/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=ifc_class)
         return aggregate
 

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

@@ -56,7 +56,6 @@ class BIM_PT_aggregate(Panel):
             if props.relating_object:
                 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 = layout.row(align=True)

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

@@ -59,9 +59,13 @@ class MaterialAttributesData:
 
     @classmethod
     def load(cls):
-        cls.data = {"attributes": cls.attributes()}
+        cls.data = {"ifc_definition_id": cls.ifc_definition_id(), "attributes": cls.attributes()}
         cls.is_loaded = True
 
+    @classmethod
+    def ifc_definition_id(cls):
+        return bpy.context.active_object.active_material.BIMObjectProperties.ifc_definition_id
+
     @classmethod
     def attributes(cls):
         results = []

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

@@ -50,7 +50,22 @@ class EnableEditingAttributes(bpy.types.Operator):
         oprops = obj.BIMObjectProperties
         props = obj.BIMAttributeProperties
         props.attributes.clear()
-        blenderbim.bim.helper.import_attributes2(tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes)
+
+        def callback(name, prop, data):
+            if name in ("RefLatitude", "RefLongitude"):
+                new = props.attributes.add()
+                new.name = name
+                new.is_null = data[name] is None
+                new.is_optional = True
+                new.data_type = "string"
+                new.ifc_class = data["type"]
+                new.string_value = "" if new.is_null else json.dumps(data[name])
+                blenderbim.bim.helper.add_attribute_description(new)
+                new.description += " The degrees, minutes and seconds should follow this format : [12,34,56]"
+
+        blenderbim.bim.helper.import_attributes2(
+            tool.Ifc.get().by_id(oprops.ifc_definition_id), props.attributes, callback=callback
+        )
         props.is_editing_attributes = True
         return {"FINISHED"}
 
@@ -87,7 +102,19 @@ class EditAttributes(bpy.types.Operator, Operator):
             obj = bpy.data.materials.get(self.obj)
         props = obj.BIMAttributeProperties
         product = tool.Ifc.get_entity(obj)
-        attributes = blenderbim.bim.helper.export_attributes(props.attributes)
+
+        def callback(attributes, prop):
+            if prop.name in ("RefLatitude", "RefLongitude"):
+                if prop.is_null:
+                    attributes[prop.name] = None
+                else:
+                    try:
+                        attributes[prop.name] = json.loads(prop.string_value)
+                    except:
+                        attributes[prop.name] = None
+                return True
+
+        attributes = blenderbim.bim.helper.export_attributes(props.attributes, callback=callback)
         ifcopenshell.api.run("attribute.edit_attributes", self.file, product=product, attributes=attributes)
         bpy.ops.bim.disable_editing_attributes(obj=obj.name, obj_type=self.obj_type)
         return {"FINISHED"}

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

@@ -94,4 +94,10 @@ class BIM_PT_material_attributes(Panel):
     def draw(self, context):
         if not MaterialAttributesData.is_loaded:
             MaterialAttributesData.load()
+        elif (
+            context.active_object.active_material.BIMObjectProperties.ifc_definition_id
+            != MaterialAttributesData.data["ifc_definition_id"]
+        ):
+            MaterialAttributesData.load()
+
         draw_ui(context, self.layout, "Material", MaterialAttributesData.data["attributes"])

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

@@ -57,6 +57,7 @@ classes = (
     operator.SelectBcfBimSnippetReference,
     operator.SelectBcfDocumentReference,
     operator.SelectBcfHeaderFile,
+    operator.UnloadBcfProject,
     operator.ViewBcfTopic,
     prop.BcfReferenceLink,
     prop.BcfLabel,

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

@@ -58,7 +58,6 @@ class LoadBcfProject(bpy.types.Operator):
     filter_glob: bpy.props.StringProperty(default="*.bcf;*.bcfzip", options={"HIDDEN"})
 
     def execute(self, context):
-        context.scene.BCFProperties.is_loaded = False
         if self.filepath:
             bcfstore.BcfStore.bcfxml = bcf.bcfxml.load(self.filepath)
         bcfxml = bcfstore.BcfStore.get_bcfxml()
@@ -72,6 +71,17 @@ class LoadBcfProject(bpy.types.Operator):
         return {"RUNNING_MODAL"}
 
 
+class UnloadBcfProject(bpy.types.Operator):
+    bl_idname = "bim.unload_bcf_project"
+    bl_label = "Unload BCF Project"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def execute(self, context):
+        bcfstore.BcfStore.set(None)
+        context.scene.BCFProperties.is_loaded = False
+        return {"FINISHED"}
+
+
 class LoadBcfTopics(bpy.types.Operator):
     bl_idname = "bim.load_bcf_topics"
     bl_label = "Load BCF Topics"
@@ -218,7 +228,7 @@ class EditBcfTopicName(bpy.types.Operator):
         props = context.scene.BCFProperties
         blender_topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
-        topic = bcfxml.topics[blender_topic.name]
+        topic = bcfxml.topics[blender_topic.name].topic
         topic.title = blender_topic.title
         return {"FINISHED"}
 
@@ -233,7 +243,7 @@ class EditBcfTopic(bpy.types.Operator):
         blender_topic = props.active_topic
         bcfxml = bcfstore.BcfStore.get_bcfxml()
 
-        topic = bcfxml.topics[blender_topic.name]
+        topic = bcfxml.topics[blender_topic.name].topic
         topic.title = blender_topic.title or None
         topic.priority = blender_topic.priority or None
         topic.due_date = blender_topic.due_date or None
@@ -940,7 +950,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
             context.area.type = old
             for global_id in exception_global_ids:
                 obj = IfcStore.get_element(global_id)
-                if obj:
+                if obj and bpy.context.view_layer.objects.get(obj.name):
                     obj.hide_set(True)
         else:
             objs = []

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

@@ -39,14 +39,16 @@ class BIM_PT_bcf(Panel):
         scene = context.scene
         props = scene.BCFProperties
 
-        row = layout.row(align=True)
-        row.operator("bim.new_bcf_project", text="New Project")
-        row.operator("bim.load_bcf_project", text="Load Project")
 
         if not props.is_loaded:
+            row = layout.row(align=True)
+            row.operator("bim.new_bcf_project", text="New Project")
+            row.operator("bim.load_bcf_project", text="Load Project")
             return
 
-        row.operator("bim.save_bcf_project", text="Save Project")
+        row = layout.row(align=True)
+        row.operator("bim.save_bcf_project", icon="EXPORT", text="Save Project")
+        row.operator("bim.unload_bcf_project", text="", icon="CANCEL")
 
         row = layout.row()
         row.prop(props, "name")

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

@@ -20,28 +20,37 @@ import bpy
 from . import ui, operator, prop
 
 classes = (
+    operator.AddBoundary,
     operator.ColourByRelatedBuildingElement,
     operator.DisableEditingBoundary,
+    operator.DisableEditingBoundaryGeometry,
     operator.EditBoundaryAttributes,
+    operator.EditBoundaryGeometry,
     operator.EnableEditingBoundary,
+    operator.EnableEditingBoundaryGeometry,
+    operator.HideBoundaries,
+    operator.LoadBoundary,
     operator.LoadProjectSpaceBoundaries,
     operator.LoadSpaceBoundaries,
-    operator.LoadBoundary,
-    operator.SelectRelatedElementBoundaries,
     operator.SelectProjectBoundaries,
+    operator.SelectRelatedElementBoundaries,
     operator.SelectRelatedElementTypeBoundaries,
     operator.SelectSpaceBoundaries,
+    operator.ShowBoundaries,
     operator.UpdateBoundaryGeometry,
     ui.BIM_PT_Boundary,
     ui.BIM_PT_SceneBoundaries,
     ui.BIM_PT_SpaceBoundaries,
     prop.BIMBoundaryProperties,
+    prop.BIMObjectBoundaryProperties,
 )
 
 
 def register():
-    bpy.types.Object.bim_boundary_properties = bpy.props.PointerProperty(type=prop.BIMBoundaryProperties)
+    bpy.types.Scene.BIMBoundaryProperties = bpy.props.PointerProperty(type=prop.BIMBoundaryProperties)
+    bpy.types.Object.bim_boundary_properties = bpy.props.PointerProperty(type=prop.BIMObjectBoundaryProperties)
 
 
 def unregister():
+    del bpy.types.Scene.BIMBoundaryProperties
     del bpy.types.Object.bim_boundary_properties

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

@@ -0,0 +1,112 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of BlenderBIM Add-on.
+#
+# BlenderBIM Add-on is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BlenderBIM Add-on is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
+
+import gpu
+import bmesh
+import blenderbim.tool as tool
+from bpy.types import SpaceView3D
+from mathutils import Vector
+from gpu_extras.batch import batch_for_shader
+
+
+class BoundaryDecorator:
+    installed = None
+
+    @classmethod
+    def install(cls, context):
+        if cls.installed:
+            cls.uninstall()
+        handler = cls()
+        cls.installed = SpaceView3D.draw_handler_add(handler, (context,), "WINDOW", "POST_VIEW")
+
+    @classmethod
+    def uninstall(cls):
+        try:
+            SpaceView3D.draw_handler_remove(cls.installed, "WINDOW")
+        except ValueError:
+            pass
+        cls.installed = None
+
+    def draw_batch(self, shader_type, content_pos, color, indices=None):
+        shader = self.line_shader if shader_type == "LINES" else self.shader
+        batch = batch_for_shader(shader, shader_type, {"pos": content_pos}, indices=indices)
+        shader.uniform_float("color", color)
+        batch.draw(shader)
+
+    def __call__(self, context):
+        self.addon_prefs = context.preferences.addons["blenderbim"].preferences
+        selected_elements_color = self.addon_prefs.decorator_color_selected
+        unselected_elements_color = self.addon_prefs.decorator_color_unselected
+        special_elements_color = self.addon_prefs.decorator_color_special
+
+        def transparent_color(color, alpha=0.1):
+            color = [i for i in color]
+            color[3] = alpha
+            return color
+
+        gpu.state.point_size_set(6)
+        gpu.state.blend_set("ALPHA")
+
+        self.line_shader = gpu.shader.from_builtin("3D_POLYLINE_UNIFORM_COLOR")
+        self.line_shader.bind()  # required to be able to change uniforms of the shader
+        # POLYLINE_UNIFORM_COLOR specific uniforms
+        self.line_shader.uniform_float("viewportSize", (context.region.width, context.region.height))
+        self.line_shader.uniform_float("lineWidth", 2.0)
+
+        # general shader
+        self.shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")
+
+        selected_vertices = []
+        selected_edges = []
+        selected_tris = []
+        unselected_vertices = []
+        unselected_edges = []
+        unselected_tris = []
+
+        for boundary in context.scene.BIMBoundaryProperties.boundaries:
+            obj = boundary.obj
+            if not obj or not obj.data:  # A boundary may not have data if it has no connection geometry
+                continue
+
+            if obj.mode == "EDIT":
+                continue  # A profile decorator or something else is used here.
+            else:
+                bm = bmesh.new()
+                bm.from_mesh(obj.data)
+                obj.data.calc_loop_triangles()
+
+                if obj.select_get():
+                    offset = len(selected_vertices)
+                    selected_vertices.extend([tuple(obj.matrix_world @ v.co) for v in bm.verts])
+                    selected_edges.extend([tuple([v.index + offset for v in e.verts]) for e in bm.edges])
+                    selected_tris.extend([tuple([i + offset for i in t.vertices]) for t in obj.data.loop_triangles])
+                else:
+                    offset = len(unselected_vertices)
+                    unselected_vertices.extend([tuple(obj.matrix_world @ v.co) for v in bm.verts])
+                    unselected_edges.extend([tuple([v.index + offset for v in e.verts]) for e in bm.edges])
+                    unselected_tris.extend([tuple([i + offset for i in t.vertices]) for t in obj.data.loop_triangles])
+
+            if obj.mode != "EDIT":
+                bm.free()
+
+        if unselected_edges:
+            self.draw_batch("LINES", unselected_vertices, special_elements_color, unselected_edges)
+            self.draw_batch("TRIS", unselected_vertices, transparent_color(special_elements_color), unselected_tris)
+        if selected_edges:
+            self.draw_batch("LINES", selected_vertices, selected_elements_color, selected_edges)
+            self.draw_batch("TRIS", selected_vertices, transparent_color(selected_elements_color), selected_tris)

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

@@ -18,18 +18,28 @@
 
 import bpy
 import bmesh
-import mathutils
 import logging
+import shapely
+import mathutils
+import numpy as np
 import ifcopenshell.api
-import ifcopenshell.util.placement
 import ifcopenshell.util.unit
+import ifcopenshell.util.shape
+import ifcopenshell.util.element
+import ifcopenshell.util.placement
+import ifcopenshell.util.representation
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
 import blenderbim.bim.import_ifc as import_ifc
+from math import pi, inf
+from mathutils import Vector, Matrix
+from blenderbim.bim.ifc import IfcStore
+from blenderbim.bim.module.model.decorator import ProfileDecorator
+from blenderbim.bim.module.boundary.decorator import BoundaryDecorator
+import blenderbim.core
 
 
 def get_boundaries_collection(blender_space):
-    space_collection = bpy.data.collections.get(blender_space.name, blender_space.users_collection[0])
+    space_collection = blender_space.BIMObjectProperties.collection
     collection_name = f"Boundaries/{blender_space.BIMObjectProperties.ifc_definition_id}"
     boundaries_collection = space_collection.children.get(collection_name)
     if not boundaries_collection:
@@ -38,6 +48,20 @@ def get_boundaries_collection(blender_space):
     return boundaries_collection
 
 
+def disable_editing_boundary_geometry(context):
+    ProfileDecorator.uninstall()
+    bpy.ops.object.mode_set(mode="OBJECT")
+
+    obj = context.active_object
+    element = tool.Ifc.get_entity(obj)
+
+    old_mesh = obj.data
+    loader = Loader()
+    obj.data = loader.create_mesh(element)
+    tool.Geometry.delete_data(old_mesh)
+    return {"FINISHED"}
+
+
 class Loader:
     def __init__(self):
         self.ifc_file = None
@@ -119,7 +143,7 @@ class Loader:
 
 class LoadProjectSpaceBoundaries(bpy.types.Operator):
     bl_idname = "bim.load_project_space_boundaries"
-    bl_label = "Load all project space boundaries"
+    bl_label = "Load All Project Space Boundaries"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -131,7 +155,7 @@ class LoadProjectSpaceBoundaries(bpy.types.Operator):
 
 class LoadBoundary(bpy.types.Operator):
     bl_idname = "bim.load_boundary"
-    bl_label = "Load boundary"
+    bl_label = "Load Boundary"
     bl_options = {"REGISTER", "UNDO"}
     boundary_id: bpy.props.IntProperty()
 
@@ -147,7 +171,7 @@ class LoadBoundary(bpy.types.Operator):
 
 class LoadSpaceBoundaries(bpy.types.Operator):
     bl_idname = "bim.load_space_boundaries"
-    bl_label = "Load selected space boundaries"
+    bl_label = "Load Selected Space Boundaries"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -168,7 +192,7 @@ def get_element_boundaries(element):
 
 class SelectRelatedElementBoundaries(bpy.types.Operator):
     bl_idname = "bim.select_related_element_boundaries"
-    bl_label = "Select related element space boundaries"
+    bl_label = "Select Related Element Space Boundaries"
     bl_options = {"REGISTER", "UNDO"}
     related_element: bpy.props.IntProperty()
 
@@ -185,7 +209,7 @@ class SelectRelatedElementBoundaries(bpy.types.Operator):
 
 class SelectRelatedElementTypeBoundaries(bpy.types.Operator):
     bl_idname = "bim.select_related_element_type_boundaries"
-    bl_label = "Select related element type space boundaries"
+    bl_label = "Select Related Element Type Space Boundaries"
     bl_options = {"REGISTER", "UNDO"}
     related_element: bpy.props.IntProperty()
 
@@ -208,7 +232,7 @@ class SelectRelatedElementTypeBoundaries(bpy.types.Operator):
 
 class SelectSpaceBoundaries(bpy.types.Operator):
     bl_idname = "bim.select_space_boundaries"
-    bl_label = "Select all space boundaries"
+    bl_label = "Select All Space Boundaries"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -224,7 +248,7 @@ class SelectSpaceBoundaries(bpy.types.Operator):
 
 class SelectProjectBoundaries(bpy.types.Operator):
     bl_idname = "bim.select_project_space_boundaries"
-    bl_label = "Select all project space boundaries"
+    bl_label = "Select All Project Space Boundaries"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -260,7 +284,7 @@ def get_colour(ifc_boundary):
 
 class ColourByRelatedBuildingElement(bpy.types.Operator):
     bl_idname = "bim.colour_by_related_building_element"
-    bl_label = "Apply colour based on related building elements"
+    bl_label = "Apply Colour Based on Related Building Elements"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -308,7 +332,7 @@ EDITABLE_ATTRIBUTES = {
 
 class EnableEditingBoundary(bpy.types.Operator):
     bl_idname = "bim.enable_editing_boundary"
-    bl_label = "Edit boundary relations"
+    bl_label = "Edit Boundary Relations"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -327,7 +351,7 @@ class EnableEditingBoundary(bpy.types.Operator):
 
 class DisableEditingBoundary(bpy.types.Operator):
     bl_idname = "bim.disable_editing_boundary"
-    bl_label = "Disable editing boundary relations"
+    bl_label = "Disable Editing Boundary Relations"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -340,7 +364,7 @@ class DisableEditingBoundary(bpy.types.Operator):
 
 class EditBoundaryAttributes(bpy.types.Operator):
     bl_idname = "bim.edit_boundary_attributes"
-    bl_label = "Disable editing boundary relations"
+    bl_label = "Disable Editing Boundary Relations"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -361,7 +385,7 @@ class EditBoundaryAttributes(bpy.types.Operator):
 
 class UpdateBoundaryGeometry(bpy.types.Operator):
     bl_idname = "bim.update_boundary_geometry"
-    bl_label = "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.
@@ -376,3 +400,357 @@ class UpdateBoundaryGeometry(bpy.types.Operator):
         settings = tool.Boundary.get_assign_connection_geometry_settings(context.active_object)
         ifcopenshell.api.run("boundary.assign_connection_geometry", tool.Ifc.get(), **settings)
         return {"FINISHED"}
+
+
+class EnableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_boundary_geometry"
+    bl_label = "Enable Editing Boundary Geometry"
+    bl_options = {"REGISTER", "UNDO"}
+
+    @classmethod
+    def poll(cls, context):
+        return context.selected_objects
+
+    def _execute(self, context):
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+
+        if element.ConnectionGeometry.is_a("IfcConnectionSurfaceGeometry"):
+            surface = element.ConnectionGeometry.SurfaceOnRelatingElement
+            tool.Model.import_surface(surface, obj)
+
+        bpy.ops.object.mode_set(mode="EDIT")
+        ProfileDecorator.install(context, exit_edit_mode_callback=lambda: disable_editing_boundary_geometry(context))
+        if not bpy.app.background:
+            bpy.ops.wm.tool_set_by_id(tool.Blender.get_viewport_context(), name="bim.cad_tool")
+        return {"FINISHED"}
+
+
+class EditBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.edit_boundary_geometry"
+    bl_label = "Edit Boundary Geometry"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        ProfileDecorator.uninstall()
+        bpy.ops.object.mode_set(mode="OBJECT")
+
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+
+        if element.ConnectionGeometry.is_a("IfcConnectionSurfaceGeometry"):
+            surface = tool.Model.export_surface(obj)
+
+            if not surface:
+
+                def msg(self, context):
+                    self.layout.label(text="INVALID PROFILE")
+
+                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
+                ProfileDecorator.install(
+                    context, exit_edit_mode_callback=lambda: disable_editing_boundary_geometry(context)
+                )
+                bpy.ops.object.mode_set(mode="EDIT")
+                return
+
+            old_surface = element.ConnectionGeometry.SurfaceOnRelatingElement
+            for inverse in tool.Ifc.get().get_inverse(old_surface):
+                ifcopenshell.util.element.replace_attribute(inverse, old_surface, surface)
+            ifcopenshell.util.element.remove_deep2(tool.Ifc.get(), old_surface)
+
+            old_mesh = obj.data
+            loader = Loader()
+            obj.data = loader.create_mesh(element)
+            tool.Geometry.delete_data(old_mesh)
+
+
+class DisableEditingBoundaryGeometry(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.disable_editing_boundary_geometry"
+    bl_label = "Disable Editing Boundary Geometry"
+    bl_options = {"REGISTER", "UNDO"}
+
+    @classmethod
+    def poll(cls, context):
+        return context.selected_objects
+
+    def _execute(self, context):
+        return disable_editing_boundary_geometry(context)
+
+
+class ShowBoundaries(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.show_boundaries"
+    bl_label = "Show Boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        props = bpy.context.scene.BIMBoundaryProperties
+        loader = Loader()
+        for obj in context.selected_objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element or not getattr(element, "BoundedBy", None):
+                continue
+            if tool.Ifc.is_moved(obj):
+                blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+            element = tool.Ifc.get_entity(obj)
+            for rel in element.BoundedBy or []:
+                boundary_obj = loader.load_boundary(rel, obj)
+                tool.Boundary.decorate_boundary(boundary_obj)
+        BoundaryDecorator.install(bpy.context)
+        return {"FINISHED"}
+
+
+class HideBoundaries(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.hide_boundaries"
+    bl_label = "Hide Boundaries"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        to_delete = set()
+        spaces = set()
+        for obj in context.selected_objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue
+            if element.is_a("IfcSpace"):
+                spaces.add(element)
+            elif element.is_a("IfcRelSpaceBoundary"):
+                spaces.add(element.RelatingSpace)
+
+        for element in spaces:
+            for boundary in element.BoundedBy or []:
+                boundary_obj = tool.Ifc.get_object(boundary)
+                if boundary_obj:
+                    to_delete.add(boundary_obj)
+        for boundary_obj in to_delete:
+            tool.Ifc.unlink(obj=boundary_obj)
+            bpy.data.objects.remove(boundary_obj)
+        context.scene.BIMBoundaryProperties.boundaries.clear()
+        return {"FINISHED"}
+
+
+class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_boundary"
+    bl_label = "Add Boundary"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        relating_space = None
+        related_building_element = None
+        relating_space_obj = None
+        related_building_element_obj = None
+
+        objs = context.selected_objects
+        if len(objs) == 2:
+            # The user may select two objects, a space and its related building element
+            for obj in objs:
+                element = tool.Ifc.get_entity(obj)
+                if not element:
+                    continue
+                if element.is_a("IfcSpace"):
+                    relating_space = element
+                    relating_space_obj = obj
+                else:
+                    related_building_element = element
+                    related_building_element_obj = obj
+        elif len(objs) == 1:
+            # Optionally the user may select just the space, and the building element shall be auto-detected
+
+            def msg(self, context):
+                self.layout.label(text="NO ACTIVE STOREY")
+
+            element = tool.Ifc.get_entity(objs[0])
+            if element.is_a("IfcSpace"):
+                relating_space = element
+                relating_space_obj = objs[0]
+
+            target = bpy.context.scene.cursor.location
+
+            collection = context.view_layer.active_layer_collection.collection
+            collection_obj = bpy.data.objects.get(collection.name)
+            if not collection_obj:
+                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
+                return
+            spatial_element = tool.Ifc.get_entity(collection_obj)
+            if not spatial_element:
+                bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
+                return
+
+            for subelement in ifcopenshell.util.element.get_decomposition(spatial_element):
+                if not (subelement.is_a("IfcWall") or subelement.is_a("IfcSlab")):
+                    continue
+                obj = tool.Ifc.get_object(subelement)
+                if obj:
+                    raycast = obj.closest_point_on_mesh(obj.matrix_world.inverted() @ target, distance=0.1)
+                    if raycast[0]:
+                        related_building_element = subelement
+                        related_building_element_obj = obj
+                        break
+
+        if not relating_space or not related_building_element:
+            return
+
+        bm = bmesh.new()
+        bm.from_mesh(relating_space_obj.data)
+        bmesh.ops.dissolve_limit(bm, angle_limit=pi * 2 / 360, verts=bm.verts, edges=bm.edges)
+
+        target_distance = inf
+        target_face = None
+        for face in bm.faces:
+            centroid = relating_space_obj.matrix_world @ face.calc_center_median()
+            raycast = related_building_element_obj.closest_point_on_mesh(
+                related_building_element_obj.matrix_world.inverted() @ centroid, distance=1
+            )
+            if raycast[0]:
+                distance = (related_building_element_obj.matrix_world @ raycast[1] - centroid).length
+                if distance < target_distance:
+                    target_face = face
+                    target_distance = distance
+
+        if not target_face:
+            return
+
+        parent_boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
+
+        # Is this right? Or should I use loop?
+        target_face_verts = [v.co.copy() for v in target_face.verts]
+        target_face_matrix = self.get_face_matrix(*[v.copy() for v in target_face_verts[0:3]])
+        target_face_matrix_i = target_face_matrix.inverted()
+
+        target_face_polygon = shapely.Polygon([tuple((target_face_matrix_i @ v).xy) for v in target_face_verts])
+
+        related_building_element_polygon = self.get_flattened_polygon(
+            related_building_element, relating_space_obj, target_face_matrix_i
+        )
+
+        gross_boundary_polygon = target_face_polygon.intersection(related_building_element_polygon)
+
+        if type(gross_boundary_polygon) == shapely.GeometryCollection:
+            for geom in gross_boundary_polygon.geoms:
+                if type(geom) == shapely.Polygon:
+                    gross_boundary_polygon = geom
+                    break
+
+        # The gross boundary polygon may not be a true gross boundary since it
+        # may have openings already removed, such as in IFC4 Reference View. So
+        # we cheat by using the exterior boundary to mean "gross". Later, we
+        # can use this to check whether or not the opening is relevant to our
+        # space.
+        exterior_boundary_polygon = shapely.Polygon(gross_boundary_polygon.exterior.coords)
+
+        net_boundary_polygon = shapely.Polygon(gross_boundary_polygon)
+
+        inner_boundaries = []
+
+        for rel in getattr(related_building_element, "HasOpenings", []):
+            opening = rel.RelatedOpeningElement
+            filling = None
+            if opening.HasFillings:
+                filling = opening.HasFillings[0].RelatedBuildingElement
+
+            opening_polygon = self.get_flattened_polygon(opening, relating_space_obj, target_face_matrix_i)
+
+            net_boundary_polygon = net_boundary_polygon.difference(opening_polygon)
+            # Only openings that are projected onto our exterior boundary are relevant.
+            if opening_polygon.intersection(exterior_boundary_polygon).area == 0:
+                continue
+
+            connection_geometry = self.create_connection_geometry_from_polygon(opening_polygon, target_face_matrix)
+            boundary = tool.Ifc.run("root.create_entity", ifc_class=context.scene.BIMModelProperties.boundary_class)
+            boundary.RelatingSpace = relating_space
+            boundary.RelatedBuildingElement = filling or related_building_element
+            boundary.ConnectionGeometry = connection_geometry
+            boundary.PhysicalOrVirtualBoundary = "PHYSICAL" if filling else "VIRTUAL"
+            boundary.InternalOrExternalBoundary = "INTERNAL"
+
+            if boundary.is_a("IfcRelSpaceBoundary2ndLevel"):
+                boundary.ParentBoundary = parent_boundary
+
+        connection_geometry = self.create_connection_geometry_from_polygon(net_boundary_polygon, target_face_matrix)
+        parent_boundary.RelatingSpace = relating_space
+        parent_boundary.RelatedBuildingElement = related_building_element
+        parent_boundary.ConnectionGeometry = connection_geometry
+        parent_boundary.PhysicalOrVirtualBoundary = "PHYSICAL"
+        parent_boundary.InternalOrExternalBoundary = "INTERNAL"
+
+        bpy.ops.bim.show_boundaries()
+        obj = tool.Ifc.get_object(parent_boundary)
+        obj.select_set(True)
+
+    def get_face_matrix(self, p1, p2, p3):
+        edge1 = p2 - p1
+        edge2 = p3 - p1
+        normal = edge1.cross(edge2)
+        z_axis = normal.normalized()
+        x_axis = p2 - p1
+        x_axis.normalize()
+        y_axis = z_axis.cross(x_axis)
+
+        mat = Matrix()
+        mat.col[0][:3] = x_axis
+        mat.col[1][:3] = y_axis
+        mat.col[2][:3] = z_axis
+        mat.col[3][:3] = p1
+
+        return mat
+
+    def get_flattened_polygon(self, element, relating_space_obj, target_face_matrix_i):
+        obj = tool.Ifc.get_object(element)
+        if obj and tool.Ifc.is_moved(obj):
+            blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+
+        space_matrix_i = relating_space_obj.matrix_world.inverted()
+
+        settings = ifcopenshell.geom.settings()
+        if not element.is_a("IfcOpeningElement"):
+            settings.set(settings.DISABLE_OPENING_SUBTRACTIONS, True)
+        settings.set(settings.STRICT_TOLERANCE, True)
+        # geometry = ifcopenshell.geom.create_shape(settings, body)
+        shape = ifcopenshell.geom.create_shape(settings, element)
+        m = shape.transformation.matrix.data
+        mat = Matrix(([m[0], m[3], m[6], m[9]], [m[1], m[4], m[7], m[10]], [m[2], m[5], m[8], m[11]], [0, 0, 0, 1]))
+        verts = [space_matrix_i @ mat @ Vector(v) for v in ifcopenshell.util.shape.get_vertices(shape.geometry)]
+        faces = ifcopenshell.util.shape.get_faces(shape.geometry)
+        polygons = []
+        for face in faces:
+            polygon = shapely.Polygon([tuple((target_face_matrix_i @ verts[vi]).xy) for vi in face])
+            polygons.append(polygon)
+        return shapely.ops.unary_union(polygons)
+
+    def create_connection_geometry_from_polygon(self, polygon, target_face_matrix):
+        surface = self.export_surface(polygon, target_face_matrix)
+        return tool.Ifc.get().createIfcConnectionSurfaceGeometry(surface)
+
+    def export_surface(self, polygon, target_face_matrix):
+        x_axis = target_face_matrix.col[0][:3]
+        z_axis = target_face_matrix.col[2][:3]
+        p1 = target_face_matrix.col[3][:3]
+
+        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        tool.Model.unit_scale = self.unit_scale
+
+        surface = tool.Ifc.get().createIfcCurveBoundedPlane()
+        surface.BasisSurface = tool.Ifc.get().createIfcPlane(tool.Ifc.get().createIfcAxis2Placement3D(
+            tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
+            tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
+            tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
+        ))
+
+        if tool.Ifc.get().schema != "IFC2X3":
+            points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
+            point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
+            outer_boundary = tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False)
+
+            inner_boundaries = []
+            for interior in polygon.interiors:
+                points = [tool.Model.convert_si_to_unit(list(co)) for co in interior.coords]
+                point_list = tool.Ifc.get().createIfcCartesianPointList2D(points)
+                inner_boundaries.append(tool.Ifc.get().createIfcIndexedPolyCurve(point_list, None, False))
+        else:
+            pass # TODO
+
+        surface.OuterBoundary = outer_boundary
+        surface.InnerBoundaries = inner_boundaries
+
+        return surface

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

@@ -18,6 +18,7 @@
 
 import bpy
 from bpy.types import PropertyGroup
+from blenderbim.bim.prop import ObjProperty
 from bpy.props import (
     PointerProperty,
     StringProperty,
@@ -52,9 +53,13 @@ def element_filter(self, object):
     return False
 
 
-class BIMBoundaryProperties(PropertyGroup):
+class BIMObjectBoundaryProperties(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)
+
+
+class BIMBoundaryProperties(PropertyGroup):
+    boundaries: bpy.props.CollectionProperty(type=ObjProperty)

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

@@ -33,6 +33,8 @@ classes = (
     operator.RewindBrickClass,
     operator.ViewBrickClass,
     operator.ViewBrickItem,
+    operator.SerializeBrick,
+    operator.AddBrickNamespace,
     prop.Brick,
     prop.BIMBrickProperties,
     ui.BIM_PT_brickschema,

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

@@ -109,8 +109,10 @@ class BrickschemaData:
         if BrickStore.graph is None:
             return []
         results = []
+        filter = ["brick", "owl", "w3", "xml"]
         for alias, uri in BrickStore.graph.namespaces():
-            results.append((uri, f"{alias}: {uri}", ""))
+            if alias not in filter:
+                results.append((uri, f"{alias}: {uri}", ""))
         return results
 
     @classmethod

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

@@ -22,11 +22,12 @@ import blenderbim.tool as tool
 import blenderbim.core.brick as core
 import blenderbim.bim.handler
 from blenderbim.bim.ifc import IfcStore
+from blenderbim.tool.brick import BrickStore
 
 
 class Operator:
     def execute(self, context):
-        self._execute(context)
+        IfcStore.execute_ifc_operator(self, context)
         blenderbim.bim.handler.refresh_ui_data()
         return {"FINISHED"}
 
@@ -126,6 +127,7 @@ class AddBrick(bpy.types.Operator, Operator):
             namespace=props.namespace,
             brick_class=props.brick_equipment_class,
             library=library,
+            label=props.new_brick_label,
         )
 
 
@@ -158,14 +160,36 @@ class ConvertIfcToBrick(bpy.types.Operator, Operator):
         core.convert_ifc_to_brick(tool.Brick, namespace=props.namespace, library=library)
 
 
-class NewBrickFile(bpy.types.Operator, Operator):
+class NewBrickFile(bpy.types.Operator):
     bl_idname = "bim.new_brick_file"
     bl_label = "New Brick File"
     bl_options = {"REGISTER", "UNDO"}
 
+    def execute(self, context):
+        IfcStore.begin_transaction(self)
+        IfcStore.add_transaction_operation(self, rollback=self.rollback, commit=lambda data: True)
+        self._execute(context)
+        self.transaction_data = {
+            "schema": BrickStore.schema,
+            "path": BrickStore.path,
+            "graph": BrickStore.graph,
+        }
+        IfcStore.add_transaction_operation(self, rollback=lambda data: True, commit=self.commit)
+        IfcStore.end_transaction(self)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
     def _execute(self, context):
         core.new_brick_file(tool.Brick)
 
+    def rollback(self, data):
+        BrickStore.purge()
+
+    def commit(self, data):
+        BrickStore.schema = data["schema"]
+        BrickStore.path = data["path"]
+        BrickStore.graph = data["graph"]
+
 
 class RefreshBrickViewer(bpy.types.Operator, Operator):
     bl_idname = "bim.refresh_brick_viewer"
@@ -189,3 +213,42 @@ class RemoveBrick(bpy.types.Operator, Operator):
             library=tool.Ifc.get().by_id(int(props.libraries)) if props.libraries else None,
             brick_uri=props.bricks[props.active_brick_index].uri,
         )
+
+
+class SerializeBrick(bpy.types.Operator):
+    bl_idname = "bim.serialize_brick"
+    bl_label = "Serialize Brick"
+    filter_glob: bpy.props.StringProperty(default="*.ttl", options={"HIDDEN"})
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    should_save_as: bpy.props.BoolProperty(name="Should Save As", default=False, options={"HIDDEN"})
+
+    def invoke(self, context, event):
+        if self.should_save_as or not BrickStore.path:
+            WindowManager = context.window_manager
+            WindowManager.fileselect_add(self)
+            return {"RUNNING_MODAL"}
+        else:
+            return self.execute(context)
+
+    def execute(self, context):
+        if self.should_save_as or not BrickStore.path:
+            BrickStore.path = self.filepath
+        core.serialize_brick(tool.Brick)
+        return {"FINISHED"}
+
+    @classmethod
+    def description(cls, context, properties):
+        if properties.should_save_as:
+            return "Save Brick project to a selected file"
+        return "Save the Brick project"
+
+
+class AddBrickNamespace(bpy.types.Operator, Operator):
+    bl_idname = "bim.add_brick_namespace"
+    bl_label = "Add Brick Namespace"
+
+    def _execute(self, context):
+        props = context.scene.BIMBrickProperties
+        alias = props.new_brick_namespace_alias
+        uri = props.new_brick_namespace_uri
+        core.add_namespace(tool.Brick, alias=alias, uri=uri)

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

@@ -69,3 +69,7 @@ class BIMBrickProperties(PropertyGroup):
     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)
+    brick_settings_toggled: BoolProperty(name="Brick Settings Toggled", default=False)
+    new_brick_label: StringProperty(name="New Brick Label")
+    new_brick_namespace_alias: StringProperty(name="New Brick Namespace Alias")
+    new_brick_namespace_uri: StringProperty(name="New Brick Namespace URI")

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

@@ -20,6 +20,7 @@ import blenderbim.tool as tool
 from bpy.types import Panel, UIList
 from blenderbim.bim.helper import prop_with_search
 from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
+from blenderbim.tool.brick import BrickStore
 
 
 class BIM_PT_brickschema(Panel):
@@ -30,6 +31,10 @@ class BIM_PT_brickschema(Panel):
     bl_region_type = "WINDOW"
     bl_context = "scene"
 
+    @classmethod
+    def poll(cls, context):
+        return tool.Blender.is_tab(context, "OTHER")
+
     def draw(self, context):
         if not BrickschemaData.is_loaded:
             BrickschemaData.load()
@@ -41,15 +46,39 @@ class BIM_PT_brickschema(Panel):
             row.operator("bim.load_brick_project", text="Load Project")
             return
 
+        if BrickStore.path:
+            row = self.layout.row(align=True)
+            row.label(text=BrickStore.path, icon="FILEBROWSER")
+
         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.prop(data=self.props, property="brick_settings_toggled", text="", icon="PREFERENCES")
         row.operator("bim.refresh_brick_viewer", text="", icon="FILE_REFRESH")
         row.operator("bim.close_brick_project", text="", icon="CANCEL")
 
+        if self.props.brick_settings_toggled:
+            box = self.layout.box()
+            row = box.row(align=True)
+            row.label(text="Active Namespace:")
+            row = box.row(align=True)
+            prop_with_search(row, self.props, "namespace", text="")
+            row = box.row(align=True)
+            row.label(text="Bind New Namespace:")
+            row = box.row(align=True)
+            row.prop(data=self.props, property="new_brick_namespace_alias", text="")
+            col = row.column()
+            col.alignment = "CENTER"
+            col.scale_x = 1.1
+            col.label(text=":")
+            row.prop(data=self.props, property="new_brick_namespace_uri", text="")
+            row.operator("bim.add_brick_namespace", text="", icon="ADD")
+
         row = self.layout.row(align=True)
-        prop_with_search(row, self.props, "namespace", text="")
+        row.label(text="Create Entity:")
+        row = self.layout.row(align=True)
+        row.prop(data=self.props, property="new_brick_label", text="")
         prop_with_search(row, self.props, "brick_equipment_class", text="")
         row.operator("bim.add_brick", text="", icon="ADD")
 
@@ -58,6 +87,12 @@ class BIM_PT_brickschema(Panel):
         row.operator("bim.add_brick_feed", text="", icon="PLUGIN")
         row.operator("bim.remove_brick", text="", icon="X")
 
+        row = self.layout.row(align=True)
+        op = row.operator("bim.serialize_brick", icon="EXPORT", text="Save")
+        op.should_save_as = False
+        op = row.operator("bim.serialize_brick", icon="FILE_TICK", text="Save As")
+        op.should_save_as = True
+
         self.layout.template_list("BIM_UL_bricks", "", self.props, "bricks", self.props, "active_brick_index")
 
         for attribute in BrickschemaData.data["attributes"]:

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

@@ -18,7 +18,6 @@
 
 import bpy
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.root import ConstrTypeEntityNotFound
 from bpy.types import PropertyGroup
 from math import pi
 
@@ -32,3 +31,4 @@ class BIMCadProperties(PropertyGroup):
     gable_roof_edge_angle: bpy.props.FloatProperty(
         name="Gable Roof Edge Angle", default=pi / 2, soft_min=0, soft_max=pi / 2, subtype="ANGLE"
     )
+    gable_roof_separate_verts: bpy.props.BoolProperty(name="Separate Verts", default=True)

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

@@ -33,7 +33,6 @@ class CadTool(WorkSpaceTool):
     bl_description = "Gives you CAD authoring related superpowers"
     bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.cad")
     bl_widget = None
-    # https://docs.blender.org/api/current/bpy.types.KeyMapItems.html
     bl_keymap = tool.Blender.get_default_selection_keypmap() + (
         ("bim.cad_hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
         ("bim.cad_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
@@ -46,7 +45,7 @@ class CadTool(WorkSpaceTool):
         ("bim.cad_hotkey", {"type": "X", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_X")]}),
     )
 
-    def draw_settings(context, layout, tool):
+    def draw_settings(context, layout, workspace_tool):
         obj = context.active_object
         if not obj or not obj.data:
             return
@@ -54,14 +53,19 @@ class CadTool(WorkSpaceTool):
             row = layout.row(align=True)
             row.label(text="", icon="EVENT_SHIFT")
             row.label(text="", icon="EVENT_Q")
-            if obj.BIMObjectProperties.ifc_definition_id:
-                row.operator("bim.edit_extrusion_profile", text="Save Profile")
-                row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
-                row.operator("bim.disable_editing_extrusion_profile", text="", icon="CANCEL")
-            else:
-                row.operator("bim.edit_arbitrary_profile", text="Save Profile")
-                row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
-                row.operator("bim.disable_editing_arbitrary_profile", text="", icon="CANCEL")
+            element = tool.Ifc.get_entity(obj)
+            if element:
+                if element.is_a("IfcProfileDef"):
+                    row.operator("bim.edit_arbitrary_profile", text="Save Profile")
+                    row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
+                    row.operator("bim.disable_editing_arbitrary_profile", text="", icon="CANCEL")
+                elif element.is_a("IfcRelSpaceBoundary"):
+                    row.operator("bim.edit_boundary_geometry", text="Save Profile")
+                    row.operator("bim.disable_editing_boundary_geometry", text="", icon="CANCEL")
+                else:
+                    row.operator("bim.edit_extrusion_profile", text="Save Profile")
+                    row.operator("bim.align_view_to_profile", text="", icon="AXIS_FRONT")
+                    row.operator("bim.disable_editing_extrusion_profile", text="", icon="CANCEL")
 
             row = layout.row(align=True)
             row.label(text="", icon="EVENT_SHIFT")
@@ -133,30 +137,28 @@ class CadTool(WorkSpaceTool):
         else:
             if (
                 (RailingData.is_loaded or not RailingData.load())
-                and RailingData.data["parameters"]
+                and RailingData.data["pset_data"]
                 and context.active_object.BIMRailingProperties.is_editing_path
             ):
                 row = layout.row(align=True)
-                row.label(text="", icon="EVENT_SHIFT")
-                row.label(text="", icon="EVENT_Q")
-                row.operator("bim.cad_hotkey", text="Apply Railing Path").hotkey = "S_Q"
+                row.label(text="", icon=f"EVENT_TAB")
+                row.operator("bim.finish_editing_railing_path")
                 row.operator("bim.cancel_editing_railing_path", icon="CANCEL", text="")
 
             elif (
                 (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["parameters"]
+                and RoofData.data["pset_data"]
                 and context.active_object.BIMRoofProperties.is_editing_path
             ):
                 row = layout.row(align=True)
-                row.label(text="", icon="EVENT_SHIFT")
-                row.label(text="", icon="EVENT_Q")
-                row.operator("bim.cad_hotkey", text="Apply Roof Path").hotkey = "S_Q"
+                row.label(text="", icon=f"EVENT_TAB")
+                row.operator("bim.finish_editing_roof_path")
                 row.operator("bim.cancel_editing_roof_path", icon="CANCEL", text="")
 
                 row = layout.row(align=True)
                 row.label(text="", icon="EVENT_SHIFT")
                 row.label(text="", icon="EVENT_R")
-                row.operator("bim.hotkey", text="Set gable roof angle").hotkey = "S_R"
+                row.operator("bim.cad_hotkey", text="Set Gable Roof Angle").hotkey = "S_R"
 
             row = layout.row(align=True)
             row.label(text="", icon="EVENT_SHIFT")
@@ -225,10 +227,11 @@ class CadHotkey(bpy.types.Operator):
                 row.prop(props, "y")
             elif (
                 (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["parameters"]
+                and RoofData.data["pset_data"]
                 and bpy.context.active_object.BIMRoofProperties.is_editing_path
             ):
                 self.layout.row().prop(props, "gable_roof_edge_angle")
+                self.layout.row().prop(props, "gable_roof_separate_verts")
 
         elif self.hotkey == "S_V":
             if not self.is_profile():
@@ -254,38 +257,28 @@ class CadHotkey(bpy.types.Operator):
         bpy.ops.bim.cad_offset(distance=self.props.distance)
 
     def hotkey_S_Q(self):
-        if tool.Ifc.get_entity(bpy.context.active_object):
-            if bpy.context.active_object.data.BIMMeshProperties.subshape_type == "PROFILE":
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if bpy.context.active_object.data.BIMMeshProperties.subshape_type == "PROFILE":
+            if element.is_a("IfcProfileDef"):
+                bpy.ops.bim.edit_arbitrary_profile()
+            elif element.is_a("IfcRelSpaceBoundary"):
+                bpy.ops.bim.edit_boundary_geometry()
+            else:
                 bpy.ops.bim.edit_extrusion_profile()
-            elif bpy.context.active_object.data.BIMMeshProperties.subshape_type == "AXIS":
-                bpy.ops.bim.edit_extrusion_axis()
-
-            elif (
-                (RailingData.is_loaded or not RailingData.load())
-                and RailingData.data["parameters"]
-                and bpy.context.active_object.BIMRailingProperties.is_editing_path
-            ):
-                bpy.ops.bim.finish_editing_railing_path()
-
-            elif (
-                (RoofData.is_loaded or not RoofData.load())
-                and RoofData.data["parameters"]
-                and bpy.context.active_object.BIMRoofProperties.is_editing_path
-            ):
-                bpy.ops.bim.finish_editing_roof_path()
-
-        else:
-            bpy.ops.bim.edit_arbitrary_profile()
+        elif bpy.context.active_object.data.BIMMeshProperties.subshape_type == "AXIS":
+            bpy.ops.bim.edit_extrusion_axis()
 
     def hotkey_S_R(self):
         if self.is_profile():
             bpy.ops.bim.add_rectangle(x=self.props.x, y=self.props.y)
         elif (
             (RoofData.is_loaded or not RoofData.load())
-            and RoofData.data["parameters"]
+            and RoofData.data["pset_data"]
             and bpy.context.active_object.BIMRoofProperties.is_editing_path
         ):
-            bpy.ops.bim.set_gable_roof_edge_angle(angle=self.props.gable_roof_edge_angle)
+            bpy.ops.bim.set_gable_roof_edge_angle(
+                angle=self.props.gable_roof_edge_angle, separate_verts=self.props.gable_roof_separate_verts
+            )
 
     def hotkey_S_T(self):
         bpy.ops.bim.cad_mitre()

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

@@ -23,7 +23,7 @@ import bmesh
 import logging
 import numpy as np
 import ifcopenshell
-from mathutils import Matrix
+from mathutils import Matrix, Vector
 from math import radians
 from blenderbim.bim.ifc import IfcStore
 
@@ -222,6 +222,7 @@ class ExecuteIfcClash(bpy.types.Operator):
         _, extension = os.path.splitext(self.filepath)
         if extension != ".json":
             self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf")
+
         settings = ifcclash.ClashSettings()
         settings.output = self.filepath
         settings.logger = logging.getLogger("Clash")
@@ -230,12 +231,28 @@ class ExecuteIfcClash(bpy.types.Operator):
 
         if context.scene.BIMClashProperties.should_create_clash_snapshots:
 
-            def get_viewpoint_snapshot(viewpoint, mat):
+            def get_viewpoint_snapshot(viewpoint):
                 camera = bpy.data.objects.get("IFC Clash Camera")
                 if not camera:
                     camera = bpy.data.objects.new("IFC Clash Camera", bpy.data.cameras.new("IFC Clash Camera"))
                     context.scene.collection.objects.link(camera)
-                camera.matrix_world = Matrix(mat)
+
+                bcf_camera = viewpoint.visualization_info.perspective_camera
+                p = bcf_camera.camera_view_point
+                z = bcf_camera.camera_direction
+                z = Vector([z.x, z.y, z.z]) * -1
+                y = bcf_camera.camera_up_vector
+                y = Vector([y.x, y.y, y.z])
+                x = y.cross(z)
+
+                mat = Matrix([
+                    [x[0], y[0], z[0], p.x],
+                    [x[1], y[1], z[1], p.y],
+                    [x[2], y[2], z[2], p.z],
+                    [0, 0, 0, 0],
+                ])
+
+                camera.matrix_world = mat
                 context.scene.camera = camera
                 camera.data.angle = radians(60)
                 area = next(area for area in context.screen.areas if area.type == "VIEW_3D")
@@ -246,7 +263,8 @@ class ExecuteIfcClash(bpy.types.Operator):
                 context.scene.render.image_settings.file_format = "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
+                with open(context.scene.render.filepath, "rb") as f:
+                    return ("snapshot.png", f.read())
 
             clasher.get_viewpoint_snapshot = get_viewpoint_snapshot
 

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

@@ -76,6 +76,8 @@ classes = (
     operator.LoadCostItemTaskQuantities,
     operator.LoadCostItemResourceQuantities,
     operator.ChangeParentCostItem,
+    operator.CopyCostItem,
+    operator.AddCurrency,
     prop.CostItem,
     prop.CostItemQuantity,
     prop.CostItemType,

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

@@ -46,9 +46,16 @@ class CostSchedulesData:
             "cost_quantities": cls.cost_quantities(),
             "cost_values": cls.cost_values(),
             "quantity_types": cls.quantity_types(),
+            "currency": cls.currency(),
         }
         cls.is_loaded = True
 
+    @classmethod
+    def currency(cls):
+        unit = tool.Unit.get_project_currency_unit()
+        if unit:
+            return {"id": unit.id(), "name": unit.Currency}
+
     @classmethod
     def total_cost_schedules(cls):
         return len(tool.Ifc.get().by_type("IfcCostSchedule"))
@@ -62,6 +69,7 @@ class CostSchedulesData:
                 {
                     "id": schedule.id(),
                     "name": schedule.Name or "Unnamed",
+                    "predefined_type": ifcopenshell.util.element.get_predefined_type(schedule),
                 }
             )
         else:
@@ -70,6 +78,7 @@ class CostSchedulesData:
                     {
                         "id": schedule.id(),
                         "name": schedule.Name or "Unnamed",
+                        "predefined_type": ifcopenshell.util.element.get_predefined_type(schedule),
                     }
                 )
         return results
@@ -107,6 +116,7 @@ class CostSchedulesData:
         data["UnitBasisUnitSymbol"] = None
         data["TotalAppliedValue"] = 0.0
         data["TotalCost"] = 0.0
+        has_unit_basis = False
         if root_element.is_a("IfcCostItem"):
             values = root_element.CostValues
         elif root_element.is_a("IfcConstructionResource"):
@@ -119,10 +129,15 @@ class CostSchedulesData:
                 cost_value_data = cls._cost_values[cost_value.id()]
                 data["UnitBasisValueComponent"] = cost_value_data["UnitBasis"]["ValueComponent"]
                 data["UnitBasisUnitSymbol"] = cost_value_data["UnitBasis"]["UnitSymbol"]
-        if data["UnitBasisValueComponent"]:
-            data["TotalCost"] = data["TotalCostQuantity"] / data["UnitBasisValueComponent"] * data["TotalAppliedValue"]
+                has_unit_basis = True
+        if has_unit_basis:
+            data["TotalCost"] = data["TotalAppliedValue"] / data["UnitBasisValueComponent"]
         else:
-            data["TotalCost"] = data["TotalCostQuantity"] * data["TotalAppliedValue"]
+            if data["TotalCostQuantity"] is not None:
+                data["TotalCost"] = data["TotalAppliedValue"] * data["TotalCostQuantity"]
+            else:
+                data["TotalCost"] = data["TotalAppliedValue"]
+                data["TotalAppliedValue"] = None
 
     @classmethod
     def _load_cost_item_quantities(cls, cost_item, data):

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

@@ -97,10 +97,9 @@ class AddSummaryCostItem(bpy.types.Operator, tool.Ifc.Operator):
     bl_label = "Add Cost Item"
     bl_options = {"REGISTER", "UNDO"}
     bl_description = "Add a summary cost item"
-    cost_schedule: bpy.props.IntProperty()
 
     def _execute(self, context):
-        core.add_summary_cost_item(tool.Ifc, tool.Cost, cost_schedule=tool.Ifc.get().by_id(self.cost_schedule))
+        core.add_summary_cost_item(tool.Ifc, tool.Cost, cost_schedule=tool.Cost.get_active_cost_schedule())
 
 
 class AddCostItem(bpy.types.Operator, tool.Ifc.Operator):
@@ -114,6 +113,16 @@ class AddCostItem(bpy.types.Operator, tool.Ifc.Operator):
         core.add_cost_item(tool.Ifc, tool.Cost, cost_item=tool.Ifc.get().by_id(self.cost_item))
 
 
+class CopyCostItem(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.copy_cost_item"
+    bl_label = "Copy Cost Item"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Copy a cost item"
+
+    def _execute(self, context):
+        core.copy_cost_item(tool.Ifc, tool.Cost)
+
+
 class ExpandCostItem(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.expand_cost_item"
     bl_label = "Expand Cost Item"
@@ -149,12 +158,12 @@ class ContractCostItem(bpy.types.Operator, tool.Ifc.Operator):
 
 class RemoveCostItem(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.remove_cost_item"
-    bl_label = "Remove Cost item"
+    bl_label = "Remove Cost Item"
     bl_options = {"REGISTER", "UNDO"}
     cost_item: bpy.props.IntProperty()
 
     def _execute(self, context):
-        core.remove_cost_item(tool.Ifc, tool.Cost, cost_item=tool.Ifc.get().by_id(self.cost_item))
+        core.remove_cost_item(tool.Ifc, tool.Cost, cost_item_id=self.cost_item)
 
 
 class EnableEditingCostItem(bpy.types.Operator, tool.Ifc.Operator):
@@ -214,8 +223,9 @@ class UnassignCostItemType(bpy.types.Operator, tool.Ifc.Operator):
         core.unassign_cost_item_type(
             tool.Ifc,
             tool.Cost,
-            self.cost_item,
-            products=[tool.Ifc.get().by_id(self.related_object)] if self.related_object else [],
+            tool.Spatial,
+            cost_item=tool.Ifc.get().by_id(self.cost_item),
+            product_types=[tool.Ifc.get().by_id(self.related_object)] if self.related_object else [],
         )
         return {"FINISHED"}
 
@@ -491,7 +501,7 @@ class AddCostColumn(bpy.types.Operator):
     bl_options = {"REGISTER", "UNDO"}
     name: bpy.props.StringProperty()
 
-    def _execute(self, context):
+    def execute(self, context):
         core.add_cost_column(tool.Cost, self.name)
         return {"FINISHED"}
 
@@ -619,15 +629,21 @@ class ExportCostSchedules(bpy.types.Operator):
     bl_label = "Export Cost Schedule"
     bl_options = {"REGISTER", "UNDO"}
     bl_description = "Export a cost schedule to a CSV, XSLX OR ODS file"
+    cost_schedule: bpy.props.IntProperty()
     format: bpy.props.EnumProperty("Format", items=(("CSV", "CSV", ""), ("XLSX", "XLSX", ""), ("ODS", "ODS", "")))
+    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
 
     def execute(self, context):
-        core.export_cost_schedules(tool.Cost, format=self.format)
+        cost_schedule = tool.Ifc.get().by_id(self.cost_schedule) if self.cost_schedule else None
+        r = core.export_cost_schedules(tool.Cost, filepath=self.filepath, format=self.format, cost_schedule=cost_schedule)
+        if isinstance(r, str):
+            self.report({"ERROR"}, r)
         return {"FINISHED"}
 
     def invoke(self, context, event):
         wm = context.window_manager
-        return wm.invoke_props_dialog(self)
+        wm.fileselect_add(self)
+        return {"RUNNING_MODAL"}
 
     def draw(self, context):
         self.layout.label(text="Choose a format")
@@ -667,7 +683,9 @@ class LoadProductCostItems(bpy.types.Operator):
         return True
 
     def execute(self, context):
-        core.load_product_cost_items(tool.Cost, product=tool.Ifc.get().by_id(context.active_object.BIMObjectProperties.ifc_definition_id))
+        core.load_product_cost_items(
+            tool.Cost, product=tool.Ifc.get().by_id(context.active_object.BIMObjectProperties.ifc_definition_id)
+        )
         return {"FINISHED"}
 
 
@@ -724,3 +742,12 @@ class ChangeParentCostItem(bpy.types.Operator, tool.Ifc.Operator):
         if isinstance(r, str):
             self.report({"WARNING"}, r)
         return {"FINISHED"}
+
+
+class AddCurrency(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.add_currency"
+    bl_label = "Add Currency"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        core.add_currency(tool.Ifc, tool.Cost)

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

@@ -115,6 +115,27 @@ def get_schedule_predefined_types(self, context):
     return CostSchedulesData.data["predefined_types"]
 
 
+def get_currencies(self, context):
+    return [
+        ("USD", "USD", "Dollar"),
+        ("EUR", "EUR", "Euro"),
+        ("GBP", "GBP", "Pound"),
+        ("AUD", "AUD", "Australian Dollar"),
+        ("CAD", "CAD", "Canadian Dollar"),
+        ("CHF", "CHF", "Swiss Franc"),
+        ("CNY", "CNY", "Chinese Yuan"),
+        ("HKD", "HKD", "Hong Kong Dollar"),
+        ("JPY", "JPY", "Japanese Yen"),
+        ("NZD", "NZD", "New Zealand Dollar"),
+        ("SEK", "SEK", "Swedish Krona"),
+        ("KRW", "KRW", "South Korean Won"),
+        ("SGD", "SGD", "Singapore Dollar"),
+        ("NOK", "NOK", "Norwegian Krone"),
+        ("MAD", "MAD", "Moroccan Dirham"),
+        ("CUSTOM", "Custom currency", "Custom"),
+    ]
+
+
 class CostItem(PropertyGroup):
     name: StringProperty(name="Name", update=update_cost_item_name)
     identification: StringProperty(name="Identification", update=update_cost_item_identification)
@@ -128,6 +149,8 @@ class CostItemQuantity(PropertyGroup):
     name: StringProperty(name="Name")
     ifc_definition_id: IntProperty(name="IFC Definition ID")
     total_quantity: FloatProperty(name="Total Quantity")
+    unit_symbol: StringProperty(name="Unit Symbol")
+    total_cost_quantity: FloatProperty(name="Total Quantity")
 
 
 class CostItemType(PropertyGroup):
@@ -137,7 +160,7 @@ class CostItemType(PropertyGroup):
 
 def update_cost_item_parent(self, context):
     cost_item = tool.Cost.get_highlighted_cost_item()
-    tool.Cost.toggle_cost_item_parent(cost_item=cost_item)
+    tool.Cost.toggle_cost_item_parent_change(cost_item=cost_item)
 
 
 def update_active_cost_item_elements(self, context):
@@ -188,6 +211,7 @@ class BIMCostProperties(PropertyGroup):
     cost_value_formula: StringProperty(name="Cost Value Formula")
     cost_column: StringProperty(name="Cost Column")
     should_show_column_ui: BoolProperty(name="Should Show Column UI", default=False)
+    should_show_currency_ui: BoolProperty(name="Should Show Currency UI", default=False)
     columns: CollectionProperty(name="Columns", type=StrProperty)
     active_column_index: IntProperty(name="Active Column Index")
     cost_item_products: CollectionProperty(name="Cost Item Products", type=CostItemQuantity)
@@ -204,7 +228,7 @@ class BIMCostProperties(PropertyGroup):
     cost_item_rates: CollectionProperty(name="Cost Item Rates", type=CostItem)
     active_cost_item_rate_index: IntProperty(name="Active Cost Rate Index")
     contracted_cost_item_rates: StringProperty(name="Contracted Cost Item Rates", default="[]")
-    product_cost_items: CollectionProperty(name="Product Cost Items", type=CostItem)
+    product_cost_items: CollectionProperty(name="Product Cost Items", type=CostItemQuantity)
     active_product_cost_item_index: IntProperty(name="Active Product Cost Item Index")
     enable_reorder: BoolProperty(name="Enable Reorder", default=False)
     show_nested_elements: BoolProperty(name="Show Nested Tasks", default=False, update=update_active_cost_item_elements)
@@ -213,3 +237,8 @@ class BIMCostProperties(PropertyGroup):
         name="Show Nested Tasks", default=False, update=update_active_cost_item_resources
     )
     change_cost_item_parent: BoolProperty(name="Change Cost Item Parent", default=False, update=update_cost_item_parent)
+    show_cost_item_operators: BoolProperty(name="Show Cost Item Operators", default=False)
+    currency: EnumProperty(items=get_currencies, name="Currencies")
+    custom_currency: StringProperty(
+        name="Custom Currency", default="USD", description="Custom Currency in ISO 4217 format"
+    )

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

@@ -43,49 +43,68 @@ class BIM_PT_cost_schedules(Panel):
 
         self.props = context.scene.BIMCostProperties
         row = self.layout.row()
-        if CostSchedulesData.data["total_cost_schedules"]:
-            row.label(text=f"{CostSchedulesData.data['total_cost_schedules']} Cost Schedules Found", icon="TEXT")
-            row.operator("bim.export_cost_schedules", text="Export as spreadsheet", icon="EXPORT")
-        else:
-            row.label(text="No Cost Schedules Found found.", icon="COMMUNITY")
-
-        row = self.layout.row()
-        row.prop(self.props, "cost_schedule_predefined_types")
-        row.operator("bim.add_cost_schedule", icon="ADD", text="Add new")
+        if not self.props.active_cost_schedule_id:
+            if CostSchedulesData.data["total_cost_schedules"]:
+                row.label(text=f"{CostSchedulesData.data['total_cost_schedules']} Cost Schedules Found", icon="TEXT")
+                row.operator("bim.export_cost_schedules", text="Export as spreadsheet", icon="EXPORT")
+            else:
+                row.label(text="No Cost Schedules Found found.", icon="COMMUNITY")
+            row = self.layout.row()
+            row.prop(self.props, "cost_schedule_predefined_types")
+            row.operator("bim.add_cost_schedule", icon="ADD", text="Add")
 
         for schedule in CostSchedulesData.data["schedules"]:
             self.draw_cost_schedule_ui(schedule)
 
     def draw_cost_schedule_ui(self, cost_schedule):
         row = self.layout.row(align=True)
-        row.label(text=cost_schedule["name"], icon="LINENUMBERS_ON")
-
         if self.props.active_cost_schedule_id and self.props.active_cost_schedule_id == cost_schedule["id"]:
-            op = row.operator("bim.select_cost_schedule_products", icon="RESTRICT_SELECT_OFF", text="Assigned")
+            row.label(
+                text="Currently editing: {}[{}]".format(cost_schedule["name"], cost_schedule["predefined_type"]),
+                icon="LINENUMBERS_ON",
+            )
+            grid = self.layout.grid_flow(columns=2, even_columns=True)
+            col = grid.column()
+            row1 = col.row(align=True)
+            row1.alignment = "LEFT"
+            row1.label(text="Schedule tools")
+            row1 = col.row(align=True)
+            row1.alignment = "RIGHT"
+            row1.operator("bim.export_cost_schedules", text="Export", icon="EXPORT").cost_schedule = cost_schedule["id"]
+            row2 = col.row(align=True)
+            row2.alignment = "RIGHT"
+            op = row2.operator("bim.select_cost_schedule_products", icon="RESTRICT_SELECT_OFF", text="Assigned")
             op.cost_schedule = cost_schedule["id"]
-            row.operator("bim.select_unassigned_products", icon="RESTRICT_SELECT_OFF", text="Unassigned")
+            row2.operator("bim.select_unassigned_products", icon="RESTRICT_SELECT_OFF", text="Unassigned")
 
-            row.prop(self.props, "should_show_column_ui", text="", icon="SHORTDISPLAY")
+            col = grid.column()
+            row1 = col.row(align=True)
+            row1.alignment = "LEFT"
+            row1.label(text="Settings")
+            row1 = col.row(align=True)
+            row1.alignment = "RIGHT"
+            row1.prop(self.props, "should_show_currency_ui", text="Project Currency", icon="COPY_ID")
+            row1.prop(self.props, "should_show_column_ui", text="Schedule Columns", icon="SHORTDISPLAY")
             if self.props.is_editing == "COST_SCHEDULE_ATTRIBUTES":
                 row.operator("bim.edit_cost_schedule", text="", icon="CHECKMARK")
-            elif self.props.is_editing == "COST_ITEMS":
-                row.operator("bim.add_summary_cost_item", text="", icon="ADD").cost_schedule = cost_schedule["id"]
-            row.operator("bim.disable_editing_cost_schedule", text="", icon="CANCEL")
-        elif self.props.active_cost_schedule_id:
-            row.operator("bim.remove_cost_schedule", text="", icon="X").cost_schedule = cost_schedule["id"]
+            row.operator("bim.disable_editing_cost_schedule", text="Disable Editing", icon="CANCEL")
         else:
+            row.label(
+                text="{}[{}]".format(cost_schedule["name"], cost_schedule["predefined_type"]), icon="LINENUMBERS_ON"
+            )
             row.operator("bim.enable_editing_cost_items", text="", icon="OUTLINER").cost_schedule = cost_schedule["id"]
             row.operator(
                 "bim.enable_editing_cost_schedule_attributes", text="", icon="GREASEPENCIL"
             ).cost_schedule = cost_schedule["id"]
             row.operator("bim.remove_cost_schedule", text="", icon="X").cost_schedule = cost_schedule["id"]
-
         if self.props.active_cost_schedule_id == cost_schedule["id"]:
             if self.props.is_editing == "COST_SCHEDULE_ATTRIBUTES":
                 self.draw_editable_cost_schedule_ui()
             elif self.props.is_editing == "COST_ITEMS":
                 if self.props.should_show_column_ui:
                     self.draw_column_ui()
+                if self.props.should_show_currency_ui:
+                    self.draw_currency_ui()
                 self.draw_editable_cost_item_ui()
 
     def draw_column_ui(self):
@@ -94,6 +113,20 @@ class BIM_PT_cost_schedules(Panel):
         row.operator("bim.add_cost_column", text="", icon="ADD").name = self.props.cost_column
         self.layout.template_list("BIM_UL_cost_columns", "", self.props, "columns", self.props, "active_column_index")
 
+    def draw_currency_ui(self):
+        row = self.layout.row(align=True)
+        if CostSchedulesData.data["currency"]:
+            text = "Currency used: {}".format(CostSchedulesData.data["currency"]["name"])
+            row.label(text=text)
+            row.operator("bim.remove_unit", text="", icon="X").unit = CostSchedulesData.data["currency"]["id"]
+        else:
+            row.label(text="No currency set")
+            row.prop(self.props, "currency", text="")
+            if self.props.currency == "CUSTOM":
+                row.alignment = "RIGHT"
+                row.prop(self.props, "custom_currency", text="")
+            row.operator("bim.add_currency", text="", icon="ADD")
+
     def draw_editable_cost_schedule_ui(self):
         blenderbim.bim.helper.draw_attributes(self.props.cost_schedule_attributes, self.layout)
 
@@ -101,30 +134,39 @@ class BIM_PT_cost_schedules(Panel):
         row = self.layout.row(align=True)
         row.alignment = "RIGHT"
         ifc_definition_id = None
+        row = self.layout.row(align=True)
+        row.label(text="Cost Item Tools")
+        row = self.layout.row(align=True)
+        row.alignment = "RIGHT"
+        row.operator("bim.add_summary_cost_item", text="Add Summary Cost", icon="ADD")
+        row.operator("bim.expand_all_tasks", text="Expand All")
+        row.operator("bim.contract_all_tasks", text="Contract All")
+        row = self.layout.row(align=True)
+        row.alignment = "RIGHT"
         if self.props.cost_items and self.props.active_cost_item_index < len(self.props.cost_items):
             ifc_definition_id = self.props.cost_items[self.props.active_cost_item_index].ifc_definition_id
         if ifc_definition_id:
-            row.prop(self.props, "change_cost_item_parent", text="", icon="LINKED")
-            row.prop(self.props, "enable_reorder", text="", icon="SORTALPHA")
-            if not CostSchedulesData.data["is_editing_rates"]:
-                op = row.operator("bim.enable_editing_cost_item_quantities", text="", icon="PROPERTIES")
+            row.prop(self.props, "show_cost_item_operators", text="Edit", icon="DOWNARROW_HLT")
+            row.operator("bim.add_cost_item", text="Add", icon="ADD").cost_item = ifc_definition_id
+            row.operator("bim.copy_cost_item", text="Copy", icon="ADD")
+            row.operator("bim.remove_cost_item", text="Delete", icon="X").cost_item = ifc_definition_id
+            if self.props.show_cost_item_operators:
+                row = self.layout.row(align=True)
+                row.alignment = "RIGHT"
+                row.prop(self.props, "change_cost_item_parent", text="", icon="LINKED")
+                row.prop(self.props, "enable_reorder", text="", icon="SORTALPHA")
+                if not CostSchedulesData.data["is_editing_rates"]:
+                    op = row.operator("bim.enable_editing_cost_item_quantities", text="", icon="PROPERTIES")
+                    op.cost_item = ifc_definition_id
+                op = row.operator("bim.enable_editing_cost_item_values", text="", icon="DISC")
                 op.cost_item = ifc_definition_id
-
-            op = row.operator("bim.enable_editing_cost_item_values", text="", icon="DISC")
-            op.cost_item = ifc_definition_id
-
-            row.operator("bim.add_cost_item", text="", icon="ADD").cost_item = ifc_definition_id
-
-            if self.props.active_cost_item_id == ifc_definition_id:
-                if self.props.cost_item_editing_type == "ATTRIBUTES":
-                    row.operator("bim.edit_cost_item", text="", icon="CHECKMARK")
-                row.operator("bim.disable_editing_cost_item", text="", icon="CANCEL")
-            else:
-                op = row.operator("bim.enable_editing_cost_item_attributes", text="", icon="GREASEPENCIL")
-                op.cost_item = ifc_definition_id
-
-            row.operator("bim.remove_cost_item", text="", icon="X").cost_item = ifc_definition_id
-
+                if self.props.active_cost_item_id == ifc_definition_id:
+                    if self.props.cost_item_editing_type == "ATTRIBUTES":
+                        row.operator("bim.edit_cost_item", text="", icon="CHECKMARK")
+                    row.operator("bim.disable_editing_cost_item", text="", icon="CANCEL")
+                else:
+                    op = row.operator("bim.enable_editing_cost_item_attributes", text="", icon="GREASEPENCIL")
+                    op.cost_item = ifc_definition_id
         self.layout.template_list(
             "BIM_UL_cost_items",
             "",
@@ -579,7 +621,10 @@ class BIM_UL_cost_items_trait:
             row.label(text="", icon="DOT")
 
     def draw_total_cost_column(self, layout, cost_item):
-        layout.label(text="{0:.2f}".format(cost_item["TotalCost"]))
+        format_numbers = "{0:,.2f}".format(cost_item["TotalCost"]).replace(",", " ")
+        currency = CostSchedulesData.data["currency"]
+        text = "{} {}".format(format_numbers, currency["name"]) if currency else format_numbers
+        layout.label(text=text)
 
     def draw_quantity_column(self, layout, cost_item):
         if CostSchedulesData.data["is_editing_rates"]:
@@ -588,13 +633,18 @@ class BIM_UL_cost_items_trait:
             self.draw_total_quantity_column(layout, cost_item)
 
     def draw_value_column(self, layout, cost_item):
-        text = "{0:.2f}".format(cost_item["TotalAppliedValue"])
-        if cost_item["UnitBasisValueComponent"] not in [None, 1]:
-            text += " / {}".format(round(cost_item["UnitBasisValueComponent"], 2))
-        layout.label(text=text)
+        if cost_item["TotalAppliedValue"]:
+            text = "{0:,.2f}".format(cost_item["TotalAppliedValue"]).replace(",", " ")
+            if cost_item["UnitBasisValueComponent"] not in [None, 1]:
+                text = "{} / {}".format(text, round(cost_item["UnitBasisValueComponent"], 2))
+            currency = CostSchedulesData.data["currency"]
+            text = "{} {}".format(text, currency["name"]) if currency else text
+            layout.label(text=text)
+        else:
+            layout.label(text="-")
 
     def draw_uom_column(self, layout, cost_item):
-        layout.label(text=cost_item["UnitBasisUnitSymbol"] or "?" if cost_item["UnitBasisValueComponent"] else "-")
+        layout.label(text=cost_item["UnitBasisUnitSymbol"] or "-" if cost_item["UnitBasisValueComponent"] else "-")
 
     def draw_order_operator(self, row, ifc_definition_id, cost_item):
         if cost_item["NestingIndex"] is not None:
@@ -608,7 +658,18 @@ class BIM_UL_cost_items_trait:
                 op.new_index = cost_item["NestingIndex"] - 1
 
     def draw_total_quantity_column(self, layout, cost_item):
-        layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '?'}")
+        if cost_item["TotalCostQuantity"]:
+            label = "{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}"
+            layout.label(text=label)
+        else:
+            layout.label(text="-")
+        # if cost_item["DerivedTotalCostQuantity"] not in [None, 0]:
+        #     layout.label(text="{0:.2f}".format(cost_item["DerivedTotalCostQuantity"]) + f" {cost_item['DerivedUnitSymbol'] or '-'}")
+        # else:
+        #     if cost_item["TotalCostQuantity"] == 0:
+        #         layout.label(text="-")
+        #     else:
+        #         layout.label(text="{0:.2f}".format(cost_item["TotalCostQuantity"]) + f" {cost_item['UnitSymbol'] or '-'}")
 
 
 class BIM_UL_cost_items(BIM_UL_cost_items_trait, UIList):
@@ -658,14 +719,14 @@ class BIM_UL_cost_item_quantities(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
         props = context.scene.BIMCostProperties
         cost_item = props.cost_items[props.active_cost_item_index]
-
         if item:
             row = layout.row(align=True)
             op = row.operator("bim.select_product", text="", icon="RESTRICT_SELECT_OFF")
             op.product = item.ifc_definition_id
             row.split(factor=0.8)
             row.label(text=item.name)
-            row.label(text="{0:.2f}".format(item.total_quantity))
+            formatted_quantity = "{0:.2f}".format(item.total_quantity)
+            row.label(text="{}{}".format(formatted_quantity, item.unit_symbol))
             op = row.operator("bim.unassign_cost_item_quantity", text="", icon="X")
             op.cost_item = cost_item.ifc_definition_id
             op.related_object = item.ifc_definition_id
@@ -677,8 +738,11 @@ class BIM_UL_product_cost_items(UIList):
             row = layout.row(align=True)
             op = row.operator("bim.highlight_product_cost_item", text="", icon="STYLUS_PRESSURE")
             op.cost_item = item.ifc_definition_id
-            row.split(factor=0.8)
+            row.split(factor=0.5)
             row.label(text=item.name)
+            qty = "{0:.2f}".format(item.total_quantity)
+            formatted_total_quantity = "{0:.2f}".format(item.total_cost_quantity)
+            row.label(text="{}/{} {}".format(qty, formatted_total_quantity, item.unit_symbol))
 
 
 class BIM_PT_Costing_Tools(Panel):
@@ -691,9 +755,7 @@ class BIM_PT_Costing_Tools(Panel):
     def draw(self, context):
         self.props = context.scene.BIMCostProperties
         row = self.layout.row()
-        row.operator(
-            "bim.load_product_cost_items", icon="FILE_REFRESH"
-        )
+        row.operator("bim.load_product_cost_items", icon="FILE_REFRESH")
         row = self.layout.row()
         row.template_list(
             "BIM_UL_product_cost_items",

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

@@ -31,6 +31,7 @@ from blenderbim.bim.handler import purge_module_data
 class AddCsvAttribute(bpy.types.Operator):
     bl_idname = "bim.add_csv_attribute"
     bl_label = "Add CSV Attribute"
+    bl_description = "Add a new IFC Attribute to the CSV export"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -52,6 +53,7 @@ class RemoveCsvAttribute(bpy.types.Operator):
 class RemoveAllCsvAttributes(bpy.types.Operator):
     bl_idname = "bim.remove_all_csv_attributes"
     bl_label = "Remove all CSV Attributes"
+    bl_description = "Remove all IFC Attributes from the CSV export"
     bl_options = {"REGISTER", "UNDO"}
 
     def execute(self, context):
@@ -61,20 +63,25 @@ class RemoveAllCsvAttributes(bpy.types.Operator):
 
 class ImportCsvAttributes(bpy.types.Operator):
     bl_idname = "bim.import_csv_attributes"
-    bl_label = "Import CSV Attributes"
+    bl_label = "Import CSV Template"
+    bl_description = "Import a json template for CSV export"
     bl_options = {"REGISTER", "UNDO"}
     filter_glob: bpy.props.StringProperty(default="*.json", options={"HIDDEN"})
     filepath: bpy.props.StringProperty(subtype="FILE_PATH")
 
     def execute(self, context):
-        csv_attributes = context.scene.CsvProperties.csv_attributes
-        csv_attributes.clear()
+        csv_props = context.scene.CsvProperties
         csv_json = json.load(open(self.filepath))
-        i = 0
-        for attribute in csv_json:
-            csv_attributes.add()
-            csv_attributes[i].name = attribute
-            i += 1
+
+        expression = csv_json.get("expression", "")
+        if expression:
+            csv_props.ifc_selector = expression
+
+        attributes = csv_json.get("attributes", [])
+        if attributes:
+            csv_props.csv_attributes.clear()
+            for attribute in attributes:
+                csv_props.csv_attributes.add().name = attribute
 
         return {"FINISHED"}
 
@@ -85,19 +92,30 @@ class ImportCsvAttributes(bpy.types.Operator):
 
 class ExportCsvAttributes(bpy.types.Operator):
     bl_idname = "bim.export_csv_attributes"
-    bl_label = "Export CSV Attributes"
+    bl_label = "Export CSV Template"
     bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Save a json template for CSV export"
     filename_ext = ".json"
     filter_glob: bpy.props.StringProperty(default="*.json", options={"HIDDEN"})
     filepath: bpy.props.StringProperty(subtype="FILE_PATH")
 
     def execute(self, context):
-        csv_attributes = []
-        with open(self.filepath, "w") as outfile:
-            for attribute in context.scene.CsvProperties.csv_attributes:
-                csv_attributes.append(attribute.name)
+        csv_props = context.scene.CsvProperties
 
-            json.dump(csv_attributes, outfile)
+        csv_template = {}
+        expression = csv_props.ifc_selector
+        if expression:
+            csv_template["expression"] = expression
+
+        csv_attributes = []
+        for attribute in csv_props.csv_attributes:
+            attribute_name = attribute.name
+            csv_attributes.append(attribute_name)
+        if csv_attributes:
+            csv_template["attributes"] = csv_attributes
+
+        with open(self.filepath, "w") as outfile:
+            json.dump(csv_template, outfile)
 
         return {"FINISHED"}
 
@@ -110,12 +128,14 @@ class ExportCsvAttributes(bpy.types.Operator):
 
 class ExportIfcCsv(bpy.types.Operator):
     bl_idname = "bim.export_ifccsv"
-    bl_label = "Export IFC to CSV"
-    filename_ext = ".csv"
+    bl_label = "Export IFC"
+    #filename_ext = ".csv"
     filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    
 
     def invoke(self, context, event):
-        self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".csv")
+        props = context.scene.CsvProperties
+        self.filepath = bpy.path.ensure_ext(bpy.data.filepath, f".{props.format}")
         WindowManager = context.window_manager
         WindowManager.fileselect_add(self)
         return {"RUNNING_MODAL"}
@@ -124,7 +144,7 @@ class ExportIfcCsv(bpy.types.Operator):
         import ifccsv
 
         props = context.scene.CsvProperties
-        self.filepath = bpy.path.ensure_ext(self.filepath, ".csv")
+        self.filepath = bpy.path.ensure_ext(self.filepath, f".{props.format}")
         if props.should_load_from_memory:
             ifc_file = IfcStore.get_file()
         else:
@@ -132,14 +152,9 @@ class ExportIfcCsv(bpy.types.Operator):
         selector = ifcopenshell.util.selector.Selector()
         results = selector.parse(ifc_file, props.ifc_selector)
         ifc_csv = ifccsv.IfcCsv()
-        ifc_csv.output = self.filepath
-        ifc_csv.attributes = [a.name for a in props.csv_attributes]
-        ifc_csv.selector = selector
-        if props.csv_delimiter == "CUSTOM":
-            ifc_csv.delimiter = props.csv_custom_delimiter
-        else:
-            ifc_csv.delimiter = props.csv_delimiter
-        ifc_csv.export(ifc_file, results)
+        attributes = [a.name for a in props.csv_attributes]
+        sep = props.csv_custom_delimiter if props.csv_delimiter == "CUSTOM" else props.csv_delimiter
+        ifc_csv.export(ifc_file, results, attributes, output=self.filepath, format=props.format, delimiter=sep)
         return {"FINISHED"}
 
 
@@ -164,12 +179,8 @@ class ImportIfcCsv(bpy.types.Operator):
         else:
             ifc_file = ifcopenshell.open(props.csv_ifc_file)
         ifc_csv = ifccsv.IfcCsv()
-        ifc_csv.output = self.filepath
-        if props.csv_delimiter == "CUSTOM":
-            ifc_csv.delimiter = props.csv_custom_delimiter
-        else:
-            ifc_csv.delimiter = props.csv_delimiter
-        ifc_csv.Import(ifc_file)
+        sep = props.csv_custom_delimiter if props.csv_delimiter == "CUSTOM" else props.csv_delimiter
+        ifc_csv.Import(ifc_file, self.filepath, delimiter=sep)
         if not props.should_load_from_memory:
             ifc_file.write(props.csv_ifc_file)
         purge_module_data()

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

@@ -45,5 +45,14 @@ class CsvProperties(PropertyGroup):
         name="IFC CSV Delimiter",
         default=",",
     )
+    format: EnumProperty(
+        items=[
+            ("csv", "csv", ""),
+            ("xlsx", "xlsx", ""),
+            ("ods", "ods", ""),
+        ],
+        name="Output format",
+        default="csv",
+    )
     csv_custom_delimiter: StringProperty(default="", name="Custom Delimiter")
     should_load_from_memory: BoolProperty(default=False, name="Load from Memory")

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

@@ -49,37 +49,32 @@ class BIM_PT_ifccsv(Panel):
         row.operator("bim.eyedrop_ifccsv", icon="EYEDROPPER", text="")
         layout.separator()
 
-        row = layout.row()
-        split = row.split(factor=0.7)
-        c = split.column()
-        c.operator("bim.add_csv_attribute")
-        c = split.column()
-        c.operator("bim.import_csv_attributes", icon="IMPORT", text="Load Template")
+        row = layout.row(align=True)
+        row.operator("bim.add_csv_attribute", icon="ADD")
+        row.operator("bim.remove_all_csv_attributes", icon="CANCEL")
+        row = layout.row(align=True)
+        row.operator("bim.import_csv_attributes", icon="IMPORT")
+        row.operator("bim.export_csv_attributes", icon="EXPORT")
 
         for index, attribute in enumerate(props.csv_attributes):
             row = layout.row(align=True)
             row.prop(attribute, "name", text="")
             row.operator("bim.remove_csv_attribute", icon="X", text="").index = index
-
-        if props.csv_attributes:
-            row = layout.row()
-            row.label()
-            row.operator("bim.remove_all_csv_attributes", icon="CANCEL", text="")
-            row = layout.row()
-            row.operator("bim.export_csv_attributes", icon="EXPORT", text="Create Template")
-
-        layout.separator()
-
+        
         row = layout.row(align=True)
-        row.prop(props, "csv_delimiter")
+        row.prop(props, "format")
 
-        if props.csv_delimiter == "CUSTOM":
+        if props.format == 'csv':
             row = layout.row(align=True)
-            row.prop(props, "csv_custom_delimiter")
+            row.prop(props, "csv_delimiter")
+
+            if props.csv_delimiter == "CUSTOM":
+                row = layout.row(align=True)
+                row.prop(props, "csv_custom_delimiter")
 
         row = layout.row()
-        split = row.split(factor=0.7)
+        split = row.split(factor=0.5)
         c = split.column()
-        c.operator("bim.export_ifccsv", icon="EXPORT")
+        c.operator("bim.export_ifccsv", icon="EXPORT", text="Export IFC to " + props.format.upper())
         c = split.column()
         c.operator("bim.import_ifccsv", icon="IMPORT")

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

@@ -20,6 +20,7 @@ import bpy
 from . import ui, prop, operator
 
 classes = (
+    operator.CopyDebugInformation,
     operator.CreateAllShapes,
     operator.CreateShapeFromStepId,
     operator.InspectFromObject,

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

@@ -20,6 +20,9 @@ import os
 import bpy
 import time
 import logging
+import platform
+import subprocess
+import addon_utils
 import ifcopenshell
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
@@ -31,6 +34,58 @@ import blenderbim.tool as tool
 from blenderbim.bim.ifc import IfcStore
 
 
+class CopyDebugInformation(bpy.types.Operator):
+    bl_idname = "bim.copy_debug_information"
+    bl_label = "Copy Debug Information"
+    bl_description = "Copies debugging information to your clipboard for use in bugreports"
+
+    def execute(self, context):
+        version = ".".join(
+            [
+                str(x)
+                for x in [
+                    addon.bl_info.get("version", (-1, -1, -1))
+                    for addon in addon_utils.modules()
+                    if addon.bl_info["name"] == "BlenderBIM"
+                ][0]
+            ]
+        )
+        info = {
+            "os": platform.system(),
+            "os_version": platform.version(),
+            "python_version": platform.python_version(),
+            "architecture": platform.architecture(),
+            "machine": platform.machine(),
+            "processor": platform.processor(),
+            "blender_version": bpy.app.version_string,
+            "blenderbim_version": version,
+            "ifc": False,
+        }
+
+        if tool.Ifc.get():
+            info.update(
+                {
+                    "ifc": os.path.basename(tool.Ifc.get_path()) if os.path.isfile(tool.Ifc.get_path()) else "Unsaved",
+                    "schema": tool.Ifc.get().schema,
+                    "preprocessor_version": tool.Ifc.get().wrapped_data.header.file_name.preprocessor_version,
+                    "originating_system": tool.Ifc.get().wrapped_data.header.file_name.originating_system,
+                }
+            )
+
+        # Format it in a readable way
+        text = "\n".join(f"{k}: {v}" for k, v in info.items())
+        print(text)
+
+        if platform.system() == "Windows":
+            command = "echo | set /p nul=" + text.strip()
+        elif platform.system() == "Darwin":  # for MacOS
+            command = 'printf "' + text.strip().replace("\n", "\\n").replace('"', "") + '" | pbcopy'
+        else:  # Linux
+            command = 'printf "' + text.strip().replace("\n", "\\n").replace('"', "") + '" | xclip -selection clipboard'
+        subprocess.run(command, shell=True, check=True)
+        return {"FINISHED"}
+
+
 class PrintIfcFile(bpy.types.Operator):
     bl_idname = "bim.print_ifc_file"
     bl_label = "Print IFC File"
@@ -73,7 +128,7 @@ class ConvertToBlender(bpy.types.Operator):
 
     def execute(self, context):
         for o in bpy.data.objects:
-            if o.type in {'MESH', 'EMPTY'}:
+            if o.type in {"MESH", "EMPTY"}:
                 o.BIMObjectProperties.ifc_definition_id = 0
                 if o.data:
                     o.data.BIMMeshProperties.ifc_definition_id = 0
@@ -135,6 +190,8 @@ class CreateAllShapes(bpy.types.Operator):
 
         total = len(elements)
         settings = ifcopenshell.geom.settings()
+        settings_2d = ifcopenshell.geom.settings()
+        settings_2d.set(settings_2d.INCLUDE_CURVES, True)
         failures = []
         excludes = ()  # For the developer to debug with
         for i, element in enumerate(elements):
@@ -142,8 +199,16 @@ class CreateAllShapes(bpy.types.Operator):
                 continue
             print(f"{i}/{total}:", element)
             start = time.time()
+            shape = None
             try:
                 shape = ifcopenshell.geom.create_shape(settings, element)
+            except:
+                try:
+                    shape = ifcopenshell.geom.create_shape(settings_2d, element)
+                except:
+                    failures.append(element)
+                    print("***** FAILURE *****")
+            if shape:
                 print(
                     "Success",
                     time.time() - start,
@@ -151,9 +216,6 @@ class CreateAllShapes(bpy.types.Operator):
                     len(shape.geometry.edges),
                     len(shape.geometry.faces),
                 )
-            except:
-                failures.append(element)
-                print("***** FAILURE *****")
         print(f"Failures: {len(failures)}")
         for failure in failures:
             print(failure)

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

@@ -48,6 +48,9 @@ class BIM_PT_debug(Panel):
         row = layout.row()
         row.operator("bim.print_ifc_file")
 
+        row = layout.row()
+        row.operator("bim.copy_debug_information")
+
         row = layout.row()
         row.operator("bim.purge_hdf5_cache")
 

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

@@ -17,58 +17,73 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from . import ui, prop, operator, handler, gizmos
+from . import ui, prop, operator, handler, gizmos, workspace
 
 classes = (
+    operator.ActivateDrawing,
     operator.ActivateDrawingStyle,
-    operator.ActivateView,
+    operator.ActivateModel,
     operator.AddAnnotation,
+    operator.AddAnnotationType,
     operator.AddDrawing,
     operator.AddDrawingStyle,
     operator.AddDrawingStyleAttribute,
     operator.AddDrawingToSheet,
+    operator.AddReference,
+    operator.AddReferenceToSheet,
     operator.AddSchedule,
     operator.AddScheduleToSheet,
     operator.AddSheet,
+    operator.AddTextLiteral,
     operator.BuildSchedule,
     operator.CleanWireframes,
     operator.ContractSheet,
+    operator.ContractTargetView,
     operator.CreateDrawing,
     operator.CreateSheets,
+    operator.DisableAddAnnotationType,
     operator.DisableEditingAssignedProduct,
     operator.DisableEditingDrawings,
+    operator.DisableEditingReferences,
     operator.DisableEditingSchedules,
     operator.DisableEditingSheets,
     operator.DisableEditingText,
-    operator.AddTextLiteral,
-    operator.RemoveTextLiteral,
     operator.DuplicateDrawing,
     operator.EditAssignedProduct,
+    operator.EditSheet,
     operator.EditText,
     operator.EditTextPopup,
-    operator.EditVectorStyle,
+    operator.EnableAddAnnotationType,
     operator.EnableEditingAssignedProduct,
     operator.EnableEditingText,
     operator.ExpandSheet,
+    operator.ExpandTargetView,
     operator.LoadDrawings,
+    operator.LoadReferences,
     operator.LoadSchedules,
     operator.LoadSheets,
+    operator.OpenDrawing,
+    operator.OpenReference,
     operator.OpenSchedule,
     operator.OpenSheet,
-    operator.OpenView,
+    operator.ReloadDrawingStyles,
     operator.RemoveDrawing,
     operator.RemoveDrawingFromSheet,
     operator.RemoveDrawingStyle,
     operator.RemoveDrawingStyleAttribute,
+    operator.RemoveReference,
     operator.RemoveSchedule,
     operator.RemoveSheet,
+    operator.RemoveTextLiteral,
     operator.ResizeText,
     operator.SaveDrawingStyle,
-    operator.SelectDocIfcFile,
+    operator.SaveDrawingStylesData,
+    operator.SelectAllDrawings,
     operator.SelectAssignedProduct,
+    operator.SelectDocIfcFile,
     prop.Variable,
     prop.Drawing,
-    prop.Schedule,
+    prop.Document,
     prop.DrawingStyle,
     prop.Sheet,
     prop.DocProperties,
@@ -76,12 +91,13 @@ classes = (
     prop.Literal,
     prop.BIMTextProperties,
     prop.BIMAssignedProductProperties,
+    prop.BIMAnnotationProperties,
     ui.BIM_PT_camera,
     ui.BIM_PT_drawing_underlay,
-    ui.BIM_PT_annotation_utilities,
     ui.BIM_PT_sheets,
     ui.BIM_PT_drawings,
     ui.BIM_PT_schedules,
+    ui.BIM_PT_references,
     ui.BIM_PT_product_assignments,
     ui.BIM_PT_text,
     ui.BIM_UL_drawinglist,
@@ -91,11 +107,16 @@ classes = (
     gizmos.DimensionLabelGizmo,
     gizmos.ExtrusionGuidesGizmo,
     gizmos.ExtrusionWidget,
+    workspace.LaunchAnnotationTypeManager,
+    workspace.Hotkey,
 )
 
 
 def register():
+    if not bpy.app.background:
+        bpy.utils.register_tool(workspace.AnnotationTool, after={"bim.bim_tool"}, separator=False, group=True)
     bpy.types.Scene.DocProperties = bpy.props.PointerProperty(type=prop.DocProperties)
+    bpy.types.Scene.BIMAnnotationProperties = bpy.props.PointerProperty(type=prop.BIMAnnotationProperties)
     bpy.types.Camera.BIMCameraProperties = bpy.props.PointerProperty(type=prop.BIMCameraProperties)
     bpy.types.Object.BIMAssignedProductProperties = bpy.props.PointerProperty(type=prop.BIMAssignedProductProperties)
     bpy.types.Object.BIMTextProperties = bpy.props.PointerProperty(type=prop.BIMTextProperties)
@@ -105,7 +126,10 @@ def register():
 
 
 def unregister():
+    if not bpy.app.background:
+        bpy.utils.unregister_tool(workspace.AnnotationTool)
     del bpy.types.Scene.DocProperties
+    del bpy.types.Scene.BIMAnnotationProperties
     del bpy.types.Camera.BIMCameraProperties
     del bpy.types.Object.BIMAssignedProductProperties
     del bpy.types.Object.BIMTextProperties

src/blenderbim/blenderbim/bim/module/drawing/annotation.py

@@ -20,6 +20,7 @@ import bpy
 import os
 import blenderbim.tool as tool
 from mathutils import Vector
+import bmesh
 
 
 class Annotator:
@@ -44,7 +45,7 @@ class Annotator:
             font.name = "OpenGost Type B TT"
         obj.data.font = font
         obj.data.BIMTextProperties.font_size = "2.5"
-        collection = bpy.context.scene.camera.users_collection[0]
+        collection = bpy.context.scene.camera.BIMObjectProperties.collection
         collection.objects.link(obj)
         Annotator.resize_text(obj)
         return obj
@@ -52,9 +53,10 @@ class Annotator:
     @staticmethod
     def resize_text(text_obj):
         camera = None
-        for obj in text_obj.users_collection[0].objects:
-            if isinstance(obj.data, bpy.types.Camera):
-                camera = obj
+        group = tool.Drawing.get_drawing_group(tool.Ifc.get_entity(text_obj))
+        for element in tool.Drawing.get_drawing_elements(group):
+            if element.is_a("IfcAnnotation") and element.ObjectType == "DRAWING":
+                camera = tool.Ifc.get_object(element)
                 break
         if not camera:
             return
@@ -62,12 +64,7 @@ class Annotator:
         font_size = 1.6 / 1000
         font_size *= float(text_obj.data.BIMTextProperties.font_size)
 
-        if camera.data.BIMCameraProperties.diagram_scale == "CUSTOM":
-            human_scale, fraction = camera.data.BIMCameraProperties.custom_diagram_scale.split("|")
-        else:
-            human_scale, fraction = camera.data.BIMCameraProperties.diagram_scale.split("|")
-        numerator, denominator = fraction.split("/")
-        font_size /= float(numerator) / float(denominator)
+        font_size /= tool.Drawing.get_scale_ratio(tool.Drawing.get_diagram_scale(camera)["Scale"])
 
         text_obj.data.size = font_size
 
@@ -77,66 +74,37 @@ class Annotator:
             co1, co2, _, _ = Annotator.get_placeholder_coords()
         co1 = obj.matrix_world.inverted() @ co1
         co2 = obj.matrix_world.inverted() @ co2
+
         if isinstance(obj.data, bpy.types.Mesh):
             obj.data.vertices.add(2)
             obj.data.vertices[-2].co = co1
             obj.data.vertices[-1].co = co2
             obj.data.edges.add(1)
             obj.data.edges[-1].vertices = (obj.data.vertices[-2].index, obj.data.vertices[-1].index)
+
         if isinstance(obj.data, bpy.types.Curve):
             polyline = obj.data.splines.new("POLY")
             polyline.points.add(1)
             polyline.points[-2].co = list(co1) + [1]
             polyline.points[-1].co = list(co2) + [1]
+
         return obj
 
     @staticmethod
-    def add_plane_to_annotation(obj):
-        co1, co2, co3, co4 = Annotator.get_placeholder_coords()
-        co1 = obj.matrix_world.inverted() @ co1  # bot left
-        co2 = obj.matrix_world.inverted() @ co2  # top left
-        co3 = obj.matrix_world.inverted() @ co3  # bot right
-        co4 = obj.matrix_world.inverted() @ co4  # top right
+    def add_plane_to_annotation(obj, remove_face=False):
+        # default order = bot left, top left, bot right, top right
+        # therefore we redefine the order
+        face_verts = [0, 2, 3, 1]
 
-        obj.data.vertices.add(4)
-        v1 = obj.data.vertices[-4]
-        v2 = obj.data.vertices[-3]
-        v3 = obj.data.vertices[-2]
-        v4 = obj.data.vertices[-1]
-        v1.co = co4
-        v2.co = co2
-        v3.co = co1
-        v4.co = co3
+        verts_world_space = Annotator.get_placeholder_coords()
+        verts_local = [obj.matrix_world.inverted() @ v for v in verts_world_space]
+        bm = tool.Blender.get_bmesh_for_mesh(obj.data, clean=True)
+        new_verts = [bm.verts.new(v) for v in verts_local]
 
-        obj.data.edges.add(4)
-        e1 = obj.data.edges[-4]
-        e2 = obj.data.edges[-3]
-        e3 = obj.data.edges[-2]
-        e4 = obj.data.edges[-1]
-        e1.vertices = (v1.index, v2.index)
-        e2.vertices = (v2.index, v3.index)
-        e3.vertices = (v3.index, v4.index)
-        e4.vertices = (v4.index, v1.index)
-
-        obj.data.loops.add(4)
-        l1 = obj.data.loops[-4]
-        l2 = obj.data.loops[-3]
-        l3 = obj.data.loops[-2]
-        l4 = obj.data.loops[-1]
-        l1.vertex_index = v1.index
-        l1.edge_index = e1.index
-        l2.vertex_index = v2.index
-        l2.edge_index = e2.index
-        l3.vertex_index = v3.index
-        l3.edge_index = e3.index
-        l4.vertex_index = v4.index
-        l4.edge_index = e4.index
-
-        obj.data.polygons.add(1)
-        p1 = obj.data.polygons[-1]
-        p1.vertices = (v1.index, v2.index, v3.index, v4.index)
-        p1.loop_start = l1.index
-        p1.loop_total = 4
+        face = bm.faces.new([new_verts[i] for i in face_verts])
+        if remove_face:
+            bmesh.ops.delete(bm, geom=[face], context="FACES_ONLY")
+        tool.Blender.apply_bmesh(obj.data, bm, obj)
         return obj
 
     @staticmethod
@@ -144,15 +112,15 @@ class Annotator:
         camera = tool.Ifc.get_object(drawing)
         co1, _, _, _ = Annotator.get_placeholder_coords(camera)
         matrix_world = camera.matrix_world.copy()
-        matrix_world[0][3] = co1.x
-        matrix_world[1][3] = co1.y
-        matrix_world[2][3] = co1.z
-        collection = camera.users_collection[0]
+        matrix_world.translation = co1
+        collection = camera.BIMObjectProperties.collection
+
         if object_type == "TEXT":
             obj = bpy.data.objects.new(object_type, None)
             obj.matrix_world = matrix_world
             collection.objects.link(obj)
             return obj
+
         elif object_type in ("TEXT_LEADER", "SECTION_LEVEL"):
             data = bpy.data.curves.new(object_type, type="CURVE")
             data.dimensions = "3D"
@@ -161,17 +129,20 @@ class Annotator:
             obj.matrix_world = matrix_world
             collection.objects.link(obj)
             return obj
+
         if object_type != "ANGLE":
             for obj in collection.objects:
                 element = tool.Ifc.get_entity(obj)
                 if element and element.ObjectType == object_type and obj.type == object_type.upper():
                     return obj
+
         if data_type == "mesh":
             data = bpy.data.meshes.new(object_type)
         elif data_type == "curve":
             data = bpy.data.curves.new(object_type, type="CURVE")
             data.dimensions = "3D"
             data.resolution_u = 2
+
         obj = bpy.data.objects.new(object_type, data)
         obj.matrix_world = matrix_world
         collection.objects.link(obj)
@@ -182,14 +153,13 @@ class Annotator:
         if not camera:
             camera = bpy.context.scene.camera
         z_offset = camera.matrix_world.to_quaternion() @ Vector((0, 0, -1))
-        if bpy.context.scene.render.resolution_x > bpy.context.scene.render.resolution_y:
-            y = (
-                camera.data.ortho_scale
-                * (bpy.context.scene.render.resolution_y / bpy.context.scene.render.resolution_x)
-                / 4
-            )
-        else:
-            y = camera.data.ortho_scale / 4
+        y = camera.data.ortho_scale / 4
+
+        res_x = bpy.context.scene.render.resolution_x
+        res_y = bpy.context.scene.render.resolution_y
+        if res_x > res_y:
+            y *= res_y / res_x
+
         y_offset = camera.matrix_world.to_quaternion() @ Vector((0, y, 0))
         x_offset = camera.matrix_world.to_quaternion() @ Vector((y / 2, 0, 0))
         return (

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

@@ -16,18 +16,23 @@
 # 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 ifcopenshell.util.element
 import ifcopenshell.util.representation
 import blenderbim.tool as tool
+from pathlib import Path
 
 
 def refresh():
     ProductAssignmentsData.is_loaded = False
     SheetsData.is_loaded = False
-    SchedulesData.is_loaded = False
+    DocumentsData.is_loaded = False
     DrawingsData.is_loaded = False
+    AnnotationData.is_loaded = False
     DecoratorData.data = {}
+    DecoratorData.cut_cache = {}
+    DecoratorData.layerset_cache = {}
 
 
 class ProductAssignmentsData:
@@ -56,12 +61,36 @@ class SheetsData:
 
     @classmethod
     def load(cls):
-        cls.data = {"total_sheets": cls.total_sheets()}
+        cls.data = {
+            "has_saved_ifc": cls.has_saved_ifc(),
+            "total_sheets": cls.total_sheets(),
+            "titleblocks": cls.titleblocks(),
+        }
         cls.is_loaded = True
 
+    @classmethod
+    def has_saved_ifc(cls):
+        return os.path.isfile(tool.Ifc.get_path())
+
     @classmethod
     def total_sheets(cls):
-        return len([d for d in tool.Ifc.get().by_type("IfcDocumentInformation") if d.Scope == "DOCUMENTATION"])
+        return len([d for d in tool.Ifc.get().by_type("IfcDocumentInformation") if d.Scope == "SHEET"])
+
+    @classmethod
+    def titleblocks(cls):
+        files = Path(os.path.join(bpy.context.scene.BIMProperties.data_dir, "templates", "titleblocks")).glob("*.svg")
+        files = [str(f.stem) for f in files]
+
+        if tool.Ifc.get():
+            project = tool.Ifc.get().by_type("IfcProject")[0]
+            titleblocks_dir = ifcopenshell.util.element.get_pset(project, "BBIM_Documentation", "TitleblocksDir")
+            if not titleblocks_dir:
+                titleblocks_dir = bpy.context.scene.DocProperties.titleblocks_dir
+            titleblocks_dir = tool.Ifc.resolve_uri(titleblocks_dir)
+            if os.path.exists(titleblocks_dir):
+                files.extend([str(f.stem) for f in Path(titleblocks_dir).glob("*.svg")])
+
+        return [(f, f, "") for f in sorted(list(set(files)))]
 
 
 class DrawingsData:
@@ -70,9 +99,18 @@ class DrawingsData:
 
     @classmethod
     def load(cls):
-        cls.data = {"total_drawings": cls.total_drawings(), "location_hint": cls.location_hint()}
+        cls.data = {
+            "has_saved_ifc": cls.has_saved_ifc(),
+            "total_drawings": cls.total_drawings(),
+            "location_hint": cls.location_hint(),
+            "active_drawing_pset_data": cls.active_drawing_pset_data(),
+        }
         cls.is_loaded = True
 
+    @classmethod
+    def has_saved_ifc(cls):
+        return os.path.isfile(tool.Ifc.get_path())
+
     @classmethod
     def total_drawings(cls):
         return len([e for e in tool.Ifc.get().by_type("IfcAnnotation") if e.ObjectType == "DRAWING"])
@@ -87,19 +125,45 @@ class DrawingsData:
             return results
         return [(h.upper(), h, "") for h in ["North", "South", "East", "West"]]
 
+    @classmethod
+    def active_drawing_pset_data(cls):
+        ifc_file = tool.Ifc.get()
+        drawing_id = bpy.context.scene.DocProperties.active_drawing_id
+        if drawing_id == 0:
+            return {}
+        drawing = ifc_file.by_id(bpy.context.scene.DocProperties.active_drawing_id)
+        return ifcopenshell.util.element.get_pset(drawing, "EPset_Drawing")
 
-class SchedulesData:
+
+class DocumentsData:
     data = {}
     is_loaded = False
 
     @classmethod
     def load(cls):
-        cls.data = {"total_schedules": cls.total_schedules()}
+        documents = cls.count_documents()
+        cls.data = {
+            "has_saved_ifc": cls.has_saved_ifc(),
+            "total_schedules": documents["SCHEDULE"],
+            "total_references": documents["REFERENCE"],
+        }
         cls.is_loaded = True
 
     @classmethod
-    def total_schedules(cls):
-        return len([d for d in tool.Ifc.get().by_type("IfcDocumentInformation") if d.Scope == "SCHEDULE"])
+    def has_saved_ifc(cls):
+        return os.path.isfile(tool.Ifc.get_path())
+
+    @classmethod
+    def count_documents(cls):
+        documents = {
+            "SCHEDULE": 0,
+            "REFERENCE": 0,
+        }
+        for d in tool.Ifc.get().by_type("IfcDocumentInformation"):
+            scope = d.Scope
+            documents[scope] = documents.get(scope, 0) + 1
+
+        return documents
 
 
 FONT_SIZES = {
@@ -114,6 +178,8 @@ FONT_SIZES = {
 class DecoratorData:
     # stores 1 type of data per object
     data = {}
+    cut_cache = {}
+    layerset_cache = {}
 
     # used by Ifc Annotations with ObjectType = "BATTING"
     @classmethod
@@ -171,7 +237,7 @@ class DecoratorData:
         cls.data[obj.name] = display_data
         return display_data
 
-    # used by Ifc Annotations with ObjectType = "TEXT"
+    # used by Ifc Annotations with ObjectType = "TEXT" / "TEXT_LEADER"
     @classmethod
     def get_ifc_text_data(cls, obj):
         """returns font size in mm for current ifc text object"""
@@ -180,23 +246,26 @@ class DecoratorData:
             return result
 
         element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation") or element.ObjectType not in ["TEXT", "TEXT_LEADER"]:
+        if not element or not tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"]):
             return None
 
         props = obj.BIMTextProperties
         # getting font size
-        classes = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Classes")
+        pset_data = ifcopenshell.util.element.get_pset(element, "EPset_Annotation") or {}
         # use `regular` as default
-        if classes:
-            classes_split = classes.split()
-            # prioritize smaller font sizes just like in svg
-            font_size_type = next(
-                (font_size_type for font_size_type in FONT_SIZES if font_size_type in classes_split), "regular"
-            )
-        else:
-            font_size_type = "regular"
+
+        # get font size
+        classes = pset_data.get("Classes", None) or "regular"
+        classes_split = classes.split()
+        # prioritize smaller font sizes just like in svg
+        font_size_type = next(
+            (font_size_type for font_size_type in FONT_SIZES if font_size_type in classes_split), "regular"
+        )
         font_size = FONT_SIZES[font_size_type]
 
+        # get symbol
+        symbol = pset_data.get("Symbol", None)
+
         # other attributes
         props_literals = props.literals
         props_literals_n = len(props.literals)
@@ -214,25 +283,86 @@ class DecoratorData:
 
             literals_data.append(literal_data)
 
-        text_data = {"Literals": literals_data, "FontSize": font_size}
+        text_data = {"Literals": literals_data, "FontSize": font_size, "Symbol": symbol}
         cls.data[obj.name] = text_data
         return text_data
 
-    # used by Ifc Annotations with ObjectType = "DIMENSION"
     @classmethod
-    def get_dimension_style(cls, obj):
+    def get_dimension_data(cls, obj):
+        """used by Ifc Annotations with ObjectType:
+
+        DIMENSION / DIAMETER / SECTION_LEVEL / PLAN_LEVEL / RADIUS
+        """
         result = cls.data.get(obj.name, None)
         if result is not None:
             return result
 
         element = tool.Ifc.get_entity(obj)
-        if not element or not element.is_a("IfcAnnotation") or element.ObjectType != "DIMENSION":
+        supported_object_types = ("DIMENSION", "DIAMETER", "SECTION_LEVEL", "PLAN_LEVEL", "RADIUS")
+        if not element or not element.is_a("IfcAnnotation") or element.ObjectType not in supported_object_types:
             return None
 
         dimension_style = "arrow"
+        fill_bg = False
         classes = ifcopenshell.util.element.get_pset(element, "EPset_Annotation", "Classes")
-        if classes and "oblique" in classes.lower().split():
-            dimension_style = "oblique"
+        if classes:
+            classes_split = classes.lower().split()
+            if "oblique" in classes_split:
+                dimension_style = "oblique"
+            elif "fill-bg" in classes_split:
+                fill_bg = True
 
-        cls.data[obj.name] = dimension_style
-        return dimension_style
+        pset_data = ifcopenshell.util.element.get_pset(element, "BBIM_Dimension") or {}
+        show_description_only = pset_data.get("ShowDescriptionOnly", False)
+        suppress_zero_inches = pset_data.get("SuppressZeroInches", False)
+        text_prefix = pset_data.get("TextPrefix", None) or ""
+        text_suffix = pset_data.get("TextSuffix", None) or ""
+
+        dimension_data = {
+            "dimension_style": dimension_style,
+            "show_description_only": show_description_only,
+            "suppress_zero_inches": suppress_zero_inches,
+            "text_prefix": text_prefix,
+            "text_suffix": text_suffix,
+            "fill_bg": fill_bg,
+        }
+        cls.data[obj.name] = dimension_data
+        return dimension_data
+
+
+class AnnotationData:
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.props = bpy.context.scene.BIMAnnotationProperties
+        cls.data["relating_type_id"] = cls.relating_type_id()
+        cls.data["relating_types"] = cls.relating_types()
+
+    @classmethod
+    def relating_type_id(cls):
+        object_type = cls.props.object_type
+        relating_types = []
+        for relating_type in tool.Ifc.get().by_type("IfcTypeProduct"):
+            if tool.Drawing.is_annotation_object_type(relating_type, object_type):
+                relating_types.append(relating_type)
+
+        results = [("0", "Untyped", "")]
+        results.extend([(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in relating_types])
+        return results
+
+    @classmethod
+    def relating_types(cls):
+        object_type = cls.props.object_type
+        relating_types = []
+        for relating_type in tool.Ifc.get().by_type("IfcTypeProduct"):
+            if tool.Drawing.is_annotation_object_type(relating_type, object_type):
+                relating_types.append({
+                    "id": relating_type.id(),
+                    "name": relating_type.Name or "Unnamed",
+                    "description": relating_type.Description or "No Description",
+                })
+
+        return sorted(relating_types, key=lambda x: x["name"])

src/blenderbim/blenderbim/bim/module/drawing/gizmos.py

@@ -18,13 +18,12 @@
 
 import bpy
 import blf
-import math
-import gpu, bgl
+import gpu
 from bpy import types
-from mathutils import Vector, Matrix
+from mathutils import Vector
 from mathutils import geometry
 from bpy_extras import view3d_utils
-from blenderbim.bim.module.drawing.shaders import DotsGizmoShader, ExtrusionGuidesShader, BaseLinesShader
+from blenderbim.bim.module.drawing.shaders import DotsGizmoShader, ExtrusionGuidesShader
 from ifcopenshell.util.unit import si_conversions
 
 
@@ -252,11 +251,12 @@ X3DISC = (
 class CustomGizmo:
     # FIXME: highliting/selection doesnt work
     def draw_very_custom_shape(self, ctx, custom_shape, select_id=None):
-        # similar to draw_custom_shape
-        shape, batch, shader = custom_shape
+        # create shader and batch
+        shader_wrapper, batch = custom_shape
+        shader = shader_wrapper.get_shader()
 
+        # setup params
         shader.bind()
-
         if select_id is not None:
             gpu.select.load_id(select_id)
         else:
@@ -265,15 +265,19 @@ class CustomGizmo:
             else:
                 color = (*self.color, self.alpha)
             shader.uniform_float("color", color)
-            shape.glenable()
+            shader_wrapper.glenable()
+        shader_wrapper.uniform_region(ctx)
 
-        shape.uniform_region(ctx)
-        # shader.uniform_float('modelMatrix', self.matrix_world)
+        # using `with` block to make sure matrix multiplication
+        # won't affect other shaders
         with gpu.matrix.push_pop():
-            gpu.matrix.multiply_matrix(self.matrix_world)
-            batch.draw()
+            # using matrix_world seems to be unaffected by matrix_offset
+            # therefore we use basis @ offset
+            matrix = self.matrix_basis @ self.matrix_offset
+            gpu.matrix.multiply_matrix(matrix)
+            batch.draw(shader)
 
-        bgl.glDisable(bgl.GL_BLEND)
+        gpu.state.blend_set("NONE")
 
 
 class OffsetHandle:
@@ -361,6 +365,7 @@ class UglyDotGizmo(OffsetHandle, types.Gizmo):
         self.draw_custom_shape(self.custom_shape, select_id=select_id)
 
 
+# TODO: dead code?
 class DotGizmo(CustomGizmo, OffsetHandle, types.Gizmo):
     """Single dot viewport-aligned"""
 
@@ -390,10 +395,6 @@ class DotGizmo(CustomGizmo, OffsetHandle, types.Gizmo):
         self.refresh()
         self.draw_very_custom_shape(ctx, self.custom_shape, select_id=select_id)
 
-    # doesn't get called
-    # def test_select(self, ctx, location):
-    #     pass
-
 
 class ExtrusionGuidesGizmo(CustomGizmo, types.Gizmo):
     """Extrusion guides
@@ -408,19 +409,25 @@ class ExtrusionGuidesGizmo(CustomGizmo, types.Gizmo):
     __slots__ = ("scale_value", "custom_shape")
 
     def setup(self):
-        shader = ExtrusionGuidesShader()
-        self.custom_shape = shader, shader.batch(pos=((0, 0, 0), (0, 0, 1))), shader.prog
-        self.use_draw_scale = False
-
-    def refresh(self):
-        depth = self.target_get_value("depth") / self.scale_value
-        self.matrix_offset.col[2][2] = depth  # z-scaled
+        """setup `custom_shape`"""
+        shader_wrapper = ExtrusionGuidesShader()
+        verts = [Vector((0, 0, 0)), Vector((0, 0, 1))]
+        verts, edges = shader_wrapper.process_geometry(verts)
+        self.custom_shape = shader_wrapper, shader_wrapper.batch(
+            pos=verts,
+            indices=edges,
+        )
 
     def draw(self, ctx):
         self.refresh()
         self.draw_very_custom_shape(ctx, self.custom_shape)
 
+    def refresh(self):
+        depth = self.target_get_value("depth") / self.scale_value
+        self.matrix_offset.col[2][2] = depth  # z-scaled
 
+
+# TODO: dead code?
 class DimensionLabelGizmo(types.Gizmo):
     """Text label for a dimension"""
 
@@ -487,6 +494,7 @@ class ExtrusionWidget(types.GizmoGroup):
         theme = ctx.preferences.themes[0].user_interface
         scale_value = self.get_scale_value(ctx.scene.unit_settings.system, ctx.scene.unit_settings.length_unit)
 
+        # setup handle
         gz = self.handle = self.gizmos.new("BIM_GT_uglydot_3d")
         gz.matrix_basis = basis
         gz.scale_basis = 0.1
@@ -497,10 +505,11 @@ class ExtrusionWidget(types.GizmoGroup):
         gz.target_set_prop("offset", prop, "value")
         gz.scale_value = scale_value
 
+        # setup guides
         gz = self.guides = self.gizmos.new("BIM_GT_extrusion_guides")
         gz.matrix_basis = basis
         gz.color = gz.color_highlight = tuple(theme.gizmo_secondary)
-        gz.alpha = gz.alpha_highlight = 0.5
+        gz.alpha = gz.alpha_highlight = 0.75
         gz.use_draw_modal = True
         gz.target_set_prop("depth", prop, "value")
         gz.scale_value = scale_value

src/blenderbim/blenderbim/bim/module/drawing/handler.py

@@ -23,8 +23,7 @@ from bpy.app.handlers import persistent
 
 @persistent
 def toggleDecorationsOnLoad(*args):
-    toggle = bpy.context.scene.DocProperties.should_draw_decorations
-    if toggle:
+    if bpy.context.scene.DocProperties.should_draw_decorations:
         decoration.DecorationsHandler.install(bpy.context)
     else:
         decoration.DecorationsHandler.uninstall()

src/blenderbim/blenderbim/bim/module/drawing/helper.py

@@ -120,9 +120,9 @@ class BoundingBox:
 
 # This function stolen from https://github.com/kevancress/MeasureIt_ARCH/blob/dcf607ce0896aa2284463c6b4ae9cd023fc54cbe/measureit_arch_baseclass.py
 # MeasureIt-ARCH is GPL-v3
-# In the future I will need to rewrite this to allow the user to have custom
-# settings for each annotation object, not read from Blender.
-def format_distance(value, isArea=False, hide_units=True):
+def format_distance(
+    value, isArea=False, hide_units=True, precision=None, decimal_places=None, suppress_zero_inches=False
+):
     s_code = "\u00b2"  # Superscript two THIS IS LEGACY (but being kept for when Area Measurements are re-implimented)
 
     # Get Scene Unit Settings
@@ -131,7 +131,7 @@ def format_distance(value, isArea=False, hide_units=True):
     unit_length = bpy.context.scene.unit_settings.length_unit
 
     toInches = 39.3700787401574887
-    inPerFoot = 11.999
+    inPerFoot = 11.9999
 
     if isArea:
         toInches = 1550
@@ -141,8 +141,7 @@ def format_distance(value, isArea=False, hide_units=True):
 
     # Imperial Formatting
     if unit_system == "IMPERIAL":
-        precision = bpy.context.scene.BIMProperties.imperial_precision
-        if precision == "NONE":
+        if not precision:
             precision = 256
         elif precision == "1":
             precision = 1
@@ -155,13 +154,14 @@ def format_distance(value, isArea=False, hide_units=True):
         # Separate ft and inches
         # Unless Inches are the specified Length Unit
         if unit_length != "INCHES":
-            feet = math.floor(decInches / inPerFoot)
+            feet = int(decInches / inPerFoot)  # remove decimal
             decInches -= feet * inPerFoot
         else:
             feet = 0
 
         # Separate Fractional Inches
-        inches = math.floor(decInches)
+        decInches = abs(decInches)  # ignore the sign for inches
+        inches = math.floor(decInches)  # remove decimal
         if inches != 0:
             frac = round(base * (decInches - inches))
         else:
@@ -186,44 +186,50 @@ def format_distance(value, isArea=False, hide_units=True):
             inches = 0
 
         if not isArea:
+            add_inches = bool(inches) or not suppress_zero_inches
             tx_dist = ""
             if feet:
                 tx_dist += str(feet) + "'"
-            if feet and inches:
+            if feet and add_inches:
                 tx_dist += " - "
-            if inches:
+            if add_inches:
                 tx_dist += str(inches)
-            if inches and frac:
+            if add_inches and frac:
                 tx_dist += " "
             if frac:
                 tx_dist += str(frac) + "/" + str(base)
-            if inches or frac:
+            if add_inches or frac:
                 tx_dist += '"'
         else:
             tx_dist = str("%1.3f" % (value * toInches / inPerFoot)) + " sq. ft."
 
     # METRIC FORMATTING
     elif unit_system == "METRIC":
-        precision = bpy.context.scene.BIMProperties.metric_precision
-        if precision != 0:
+        if precision:
             value = precision * round(float(value) / precision)
 
+        if decimal_places is not None:
+            fmt = "%1." + str(decimal_places) + "f"
+
         # Meters
         if unit_length == "METERS":
-            fmt = "%1.3f"
+            if decimal_places is None:
+                fmt = "%1.3f"
             if hide_units is False:
                 fmt += " m"
             tx_dist = fmt % value
         # Centimeters
         elif unit_length == "CENTIMETERS":
-            fmt = "%1.1f"
+            if decimal_places is None:
+                fmt = "%1.1f"
             if hide_units is False:
                 fmt += " cm"
             d_cm = value * (100)
             tx_dist = fmt % d_cm
         # Millimeters
         elif unit_length == "MILLIMETERS":
-            fmt = "%1.0f"
+            if decimal_places is None:
+                fmt = "%1.0f"
             if hide_units is False:
                 fmt += " mm"
             d_mm = value * (1000)
@@ -231,20 +237,21 @@ def format_distance(value, isArea=False, hide_units=True):
 
         # Otherwise Use Adaptive Units
         else:
-            if round(value, 2) >= 1.0:
+            if round(value, 2) >= 1.0 and decimal_places is None:
                 fmt = "%1.3f"
                 if hide_units is False:
                     fmt += " m"
                 tx_dist = fmt % value
             else:
-                if round(value, 2) >= 0.01:
+                if round(value, 2) >= 0.01 and decimal_places is None:
                     fmt = "%1.1f"
                     if hide_units is False:
                         fmt += " cm"
                     d_cm = value * (100)
                     tx_dist = fmt % d_cm
                 else:
-                    fmt = "%1.0f"
+                    if decimal_places is None:
+                        fmt = "%1.0f"
                     if hide_units is False:
                         fmt += " mm"
                     d_mm = value * (1000)
@@ -262,7 +269,7 @@ def get_active_drawing(scene):
     props = scene.DocProperties
     try:
         camera = tool.Ifc.get_object(tool.Ifc.get().by_id(props.active_drawing_id))
-        return camera.users_collection[0], camera
+        return camera.BIMObjectProperties.collection, camera
     except:
         return None, None
 

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

@@ -25,7 +25,7 @@ import blenderbim.tool as tool
 import blenderbim.core.drawing as core
 import blenderbim.bim.module.drawing.annotation as annotation
 import blenderbim.bim.module.drawing.decoration as decoration
-from blenderbim.bim.module.drawing.data import DrawingsData, DecoratorData
+from blenderbim.bim.module.drawing.data import DrawingsData, DecoratorData, SheetsData, AnnotationData
 from blenderbim.bim.module.drawing.data import refresh as refresh_drawing_data
 from pathlib import Path
 from blenderbim.bim.prop import Attribute, StrProperty
@@ -44,20 +44,14 @@ from bpy.props import (
 
 
 diagram_scales_enum = []
-titleblocks_enum = []
 sheets_enum = []
-vector_styles_enum = []
 
 
 def purge():
     global diagram_scales_enum
-    global titleblocks_enum
     global sheets_enum
-    global vector_styles_enum
     diagram_scales_enum = []
-    titleblocks_enum = []
     sheets_enum = []
-    vector_styles_enum = []
 
 
 def update_target_view(self, context):
@@ -71,12 +65,6 @@ def get_location_hint(self, context):
 
 
 def update_diagram_scale(self, context):
-    scale = self.diagram_scale
-    if scale == "CUSTOM":
-        scale = self.custom_diagram_scale
-    if "|" not in scale:
-        return
-    human_scale, scale = scale.split("|")
     try:
         element = (
             tool.Ifc.get()
@@ -86,14 +74,33 @@ def update_diagram_scale(self, context):
         )
     except:
         return
-    pset = ifcopenshell.util.element.get_psets(element).get("EPset_Drawing")
+    diagram_scale = tool.Drawing.get_diagram_scale(tool.Ifc.get_object(element))
+    if not diagram_scale:
+        return
+    pset = ifcopenshell.util.element.get_pset(element, "EPset_Drawing")
     if pset:
         pset = tool.Ifc.get().by_id(pset["id"])
     else:
         pset = ifcopenshell.api.run("pset.add_pset", tool.Ifc.get(), product=element, name="EPset_Drawing")
-    ifcopenshell.api.run(
-        "pset.edit_pset", tool.Ifc.get(), pset=pset, properties={"Scale": scale, "HumanScale": human_scale}
-    )
+    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties=diagram_scale)
+
+
+def update_is_nts(self, context):
+    try:
+        element = (
+            tool.Ifc.get()
+            .by_id(self.id_data.BIMMeshProperties.ifc_definition_id)
+            .OfProductRepresentation[0]
+            .ShapeOfProduct[0]
+        )
+    except:
+        return
+    pset = ifcopenshell.util.element.get_pset(element, "EPset_Drawing")
+    if pset:
+        pset = tool.Ifc.get().by_id(pset["id"])
+    else:
+        pset = ifcopenshell.api.run("pset.add_pset", tool.Ifc.get(), product=element, name="EPset_Drawing")
+    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={"IsNTS": self.is_nts})
 
 
 def get_diagram_scales(self, context):
@@ -158,17 +165,37 @@ def get_diagram_scales(self, context):
 
 
 def update_drawing_name(self, context):
-    drawing = tool.Ifc.get().by_id(self.ifc_definition_id)
-    core.update_drawing_name(tool.Ifc, tool.Drawing, drawing=drawing, name=self.name)
+    if self.ifc_definition_id:
+        drawing = tool.Ifc.get().by_id(self.ifc_definition_id)
+        core.update_drawing_name(tool.Ifc, tool.Drawing, drawing=drawing, name=self.name)
 
 
-def update_schedule_name(self, context):
-    schedule = tool.Ifc.get().by_id(self.ifc_definition_id)
-    core.update_schedule_name(tool.Ifc, tool.Drawing, schedule=schedule, name=self.name)
+def get_drawing_style_name(self):
+    """needed to make `set_drawing_style_name` work"""
+    return self.get("name", "")
+
+
+def set_drawing_style_name(self, new_value):
+    """ensure the name is unique"""
+    scene = bpy.context.scene
+    drawing_styles = [s.name for s in scene.DocProperties.drawing_styles if s.name != self.name]
+    new_value = tool.Blender.ensure_unique_name(new_value, drawing_styles)
+    old_value = self.name
+    self["name"] = new_value
+    bpy.ops.bim.save_drawing_styles_data(rename_style=True, rename_style_from=old_value, rename_style_to=new_value)
+
+
+def update_document_name(self, context):
+    document = tool.Ifc.get().by_id(self.ifc_definition_id)
+    core.update_document_name(tool.Ifc, tool.Drawing, document=document, name=self.name)
 
 
 def update_has_underlay(self, context):
     update_layer(self, context, "HasUnderlay", self.has_underlay)
+    # making sure that camera is active
+    if self.has_underlay and (context.active_object and context.active_object.data == self.id_data):
+        bpy.ops.bim.reload_drawing_styles()
+        bpy.ops.bim.activate_drawing_style()
 
 
 def update_has_linework(self, context):
@@ -191,28 +218,25 @@ def update_layer(self, context, name, value):
     ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties={name: value})
 
 
-def getTitleblocks(self, context):
-    global titleblocks_enum
-    if len(titleblocks_enum) < 1:
-        titleblocks_enum.clear()
-        files = Path(os.path.join(context.scene.BIMProperties.data_dir, "templates", "titleblocks")).glob("*.svg")
-        files = sorted([str(f.stem) for f in files])
-        titleblocks_enum.extend([(f, f, "") for f in files])
-    return titleblocks_enum
+def get_titleblocks(self, context):
+    if not SheetsData.is_loaded:
+        SheetsData.load()
+    return SheetsData.data["titleblocks"]
 
 
-def refreshTitleblocks(self, context):
-    global titleblocks_enum
-    titleblocks_enum.clear()
-    getTitleblocks(self, context)
+def update_titleblocks(self, context):
+    SheetsData.data["titleblocks"] = SheetsData.titleblocks()
 
 
 def toggleDecorations(self, context):
     toggle = self.should_draw_decorations
     if toggle:
         # TODO: design a proper text variable templating renderer
-        collection = context.scene.camera.users_collection[0]
+        collection = context.scene.camera.BIMObjectProperties.collection
         for obj in collection.objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element or not tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"]):
+                continue
             tool.Drawing.update_text_value(obj)
         refresh_drawing_data()
         decoration.DecorationsHandler.install(context)
@@ -220,16 +244,6 @@ def toggleDecorations(self, context):
         decoration.DecorationsHandler.uninstall()
 
 
-def getVectorStyles(self, context):
-    global vector_styles_enum
-    if len(vector_styles_enum) < 1:
-        sheets_enum.clear()
-        for filename in Path(os.path.join(context.scene.BIMProperties.data_dir, "styles")).glob("*.css"):
-            f = str(filename.stem)
-            vector_styles_enum.append((f, f, ""))
-    return vector_styles_enum
-
-
 class Variable(PropertyGroup):
     name: StringProperty(name="Name")
     prop_key: StringProperty(name="Property Key")
@@ -239,36 +253,29 @@ class Drawing(PropertyGroup):
     ifc_definition_id: IntProperty(name="IFC Definition ID")
     name: StringProperty(name="Name", update=update_drawing_name)
     target_view: StringProperty(name="Target View")
+    is_selected: BoolProperty(name="Is Selected", default=True)
+    is_drawing: BoolProperty(name="Is Drawing", default=False)
+    is_expanded: BoolProperty(name="Is Expanded", default=True)
 
 
-class Schedule(PropertyGroup):
+class Document(PropertyGroup):
     ifc_definition_id: IntProperty(name="IFC Definition ID")
-    name: StringProperty(name="Name", update=update_schedule_name)
+    name: StringProperty(name="Name", update=update_document_name)
     identification: StringProperty(name="Identification")
 
 
 class Sheet(PropertyGroup):
-    def set_name(self, new):
-        old = self.get("name")
-        path = os.path.join(bpy.context.scene.BIMProperties.data_dir, "sheets")
-        if old and os.path.isfile(os.path.join(path, old + ".svg")):
-            os.rename(os.path.join(path, old + ".svg"), os.path.join(path, new + ".svg"))
-        self["name"] = new
-
-    def get_name(self):
-        return self.get("name")
-
     ifc_definition_id: IntProperty(name="IFC Definition ID")
     identification: StringProperty(name="Identification")
-    name: StringProperty(name="Name", get=get_name, set=set_name)
+    name: StringProperty(name="Name")
     is_sheet: BoolProperty(name="Is Sheet", default=False)
     reference_type: StringProperty(name="Reference Type")
     is_expanded: BoolProperty(name="Is Expanded", default=False)
 
 
 class DrawingStyle(PropertyGroup):
-    name: StringProperty(name="Name")
-    raster_style: StringProperty(name="Raster Style")
+    name: StringProperty(name="Name", get=get_drawing_style_name, set=set_drawing_style_name)
+    raster_style: StringProperty(name="Raster Style", default="{}")
     render_type: EnumProperty(
         items=[
             ("NONE", "None", ""),
@@ -278,37 +285,27 @@ class DrawingStyle(PropertyGroup):
         name="Render Type",
         default="VIEWPORT",
     )
-    vector_style: EnumProperty(items=getVectorStyles, name="Vector Style")
     include_query: StringProperty(name="Include Query")
     exclude_query: StringProperty(name="Exclude Query")
     attributes: CollectionProperty(name="Attributes", type=StrProperty)
 
 
 class RasterStyleProperty(enum.Enum):
-    WORLD_COLOR = "bpy.data.worlds[0].color"
-    RENDER_ENGINE = "scene.render.engine"
-    RENDER_TRANSPARENT = "scene.render.film_transparent"
-    VIEW_TRANSFORM = "scene.view_settings.view_transform"
-    SHADING_SHOW_OBJECT_OUTLINE = "scene.display.shading.show_object_outline"
-    SHADING_SHOW_CAVITY = "scene.display.shading.show_cavity"
-    SHADING_CAVITY_TYPE = "scene.display.shading.cavity_type"
-    SHADING_CURVATURE_RIDGE_FACTOR = "scene.display.shading.curvature_ridge_factor"
-    SHADING_CURVATURE_VALLEY_FACTOR = "scene.display.shading.curvature_valley_factor"
-    SHADING_LIGHT = "scene.display.shading.light"
-    SHADING_COLOR_TYPE = "scene.display.shading.color_type"
-    SHADING_SINGLE_COLOR = "scene.display.shading.single_color"
-    SHADING_SHOW_SHADOWS = "scene.display.shading.show_shadows"
-    SHADING_SHADOW_INTENSITY = "scene.display.shading.shadow_intensity"
-    DISPLAY_LIGHT_DIRECTION = "scene.display.light_direction"
-    VIEW_USE_CURVE_MAPPING = "scene.view_settings.use_curve_mapping"
-    OVERLAY_SHOW_WIREFRAMES = "space.overlay.show_wireframes"
-    OVERLAY_WIREFRAME_THRESHOLD = "space.overlay.wireframe_threshold"
-    OVERLAY_SHOW_FLOOR = "space.overlay.show_floor"
-    OVERLAY_SHOW_AXIS_X = "space.overlay.show_axis_x"
-    OVERLAY_SHOW_AXIS_Y = "space.overlay.show_axis_y"
-    OVERLAY_SHOW_AXIS_Z = "space.overlay.show_axis_z"
-    OVERLAY_SHOW_OBJECT_ORIGINS = "space.overlay.show_object_origins"
-    OVERLAY_SHOW_RELATIONSHIP_LINES = "space.overlay.show_relationship_lines"
+    # EVAL_PROP_ props will be evaluated explicitly
+    EVAL_PROP_WORLD_COLOR = "bpy.data.worlds[0].color"
+
+    # those props attributes used as a source for shading style properties
+    RENDER = "scene.render"
+    VIEW_SETTINGS = "scene.view_settings"
+    SHADING = "scene.display.shading"
+    DISPLAY = "scene.display"
+    OVERLAY = "space.overlay"
+    SPACE_SHADING = "space.shading"
+
+
+RASTER_STYLE_PROPERTIES_EXCLUDE = (
+    "scene.render.filepath",
+)
 
 
 class DocProperties(PropertyGroup):
@@ -318,6 +315,7 @@ class DocProperties(PropertyGroup):
     should_extract: BoolProperty(name="Should Extract", default=True)
     is_editing_drawings: BoolProperty(name="Is Editing Drawings", default=False)
     is_editing_schedules: BoolProperty(name="Is Editing Schedules", default=False)
+    is_editing_references: BoolProperty(name="Is Editing References", default=False)
     target_view: EnumProperty(
         items=[
             ("PLAN_VIEW", "Plan", ""),
@@ -335,31 +333,49 @@ class DocProperties(PropertyGroup):
     active_drawing_id: IntProperty(name="Active Drawing Id")
     active_drawing_index: IntProperty(name="Active Drawing Index")
     current_drawing_index: IntProperty(name="Current Drawing Index")
-    schedules: CollectionProperty(name="Schedules", type=Schedule)
+    schedules: CollectionProperty(name="Schedules", type=Document)
     active_schedule_index: IntProperty(name="Active Schedule Index")
-    titleblock: EnumProperty(items=getTitleblocks, name="Titleblock", update=refreshTitleblocks)
+    references: CollectionProperty(name="References", type=Document)
+    active_reference_index: IntProperty(name="Active Reference Index")
+    titleblock: EnumProperty(items=get_titleblocks, name="Titleblock", update=update_titleblocks)
     is_editing_sheets: BoolProperty(name="Is Editing Sheets", default=False)
     sheets: CollectionProperty(name="Sheets", type=Sheet)
     active_sheet_index: IntProperty(name="Active Sheet Index")
     ifc_files: CollectionProperty(name="IFCs", type=StrProperty)
     drawing_styles: CollectionProperty(name="Drawing Styles", type=DrawingStyle)
     should_draw_decorations: BoolProperty(name="Should Draw Decorations", update=toggleDecorations)
-    decorations_colour: FloatVectorProperty(
-        name="Decorations Colour", subtype="COLOR", default=(1, 1, 1, 1), min=0.0, max=1.0, size=4
+    sheets_dir: StringProperty(default=os.path.join("sheets") + os.path.sep, name="Default Sheets Directory")
+    layouts_dir: StringProperty(default=os.path.join("layouts") + os.path.sep, name="Default Layouts Directory")
+    titleblocks_dir: StringProperty(
+        default=os.path.join("layouts", "titleblocks") + os.path.sep, name="Default Titleblocks Directory"
     )
+    drawings_dir: StringProperty(default=os.path.join("drawings") + os.path.sep, name="Default Drawings Directory")
+    stylesheet_path: StringProperty(
+        default=os.path.join("drawings", "assets", "default.css"), name="Default Stylesheet"
+    )
+    markers_path: StringProperty(default=os.path.join("drawings", "assets", "markers.svg"), name="Default Markers")
+    symbols_path: StringProperty(default=os.path.join("drawings", "assets", "symbols.svg"), name="Default Symbols")
+    patterns_path: StringProperty(default=os.path.join("drawings", "assets", "patterns.svg"), name="Default Patterns")
+    shadingstyles_path: StringProperty(
+        default=os.path.join("drawings", "assets", "shading_styles.json"), name="Default Shading Styles"
+    )
+    shadingstyle_default: StringProperty(default="Blender Default", name="Default Shading Style")
 
 
 class BIMCameraProperties(PropertyGroup):
+    calculate_shapely_surfaces: BoolProperty(name="Calculate Shapely Surfaces", default=False)
+    calculate_svgfill_surfaces: BoolProperty(name="Calculate SVGFill Surfaces", default=False)
     has_underlay: BoolProperty(name="Underlay", default=False, update=update_has_underlay)
     has_linework: BoolProperty(name="Linework", default=True, update=update_has_linework)
     has_annotation: BoolProperty(name="Annotation", default=True, update=update_has_annotation)
     representation: StringProperty(name="Representation")
     view_name: StringProperty(name="View Name")
     diagram_scale: EnumProperty(items=get_diagram_scales, name="Drawing Scale", update=update_diagram_scale)
-    custom_diagram_scale: StringProperty(name="Custom Scale", update=update_diagram_scale)
+    custom_scale_numerator: bpy.props.StringProperty(default="1", update=update_diagram_scale)
+    custom_scale_denominator: bpy.props.StringProperty(default="100", update=update_diagram_scale)
     raster_x: IntProperty(name="Raster X", default=1000)
     raster_y: IntProperty(name="Raster Y", default=1000)
-    is_nts: BoolProperty(name="Is NTS")
+    is_nts: BoolProperty(name="Is NTS", update=update_is_nts)
     active_drawing_style_index: IntProperty(name="Active Drawing Style Index")
 
     # For now, this JSON dump are all the parameters that determine a camera's "Block representation"
@@ -471,3 +487,59 @@ class BIMTextProperties(PropertyGroup):
 class BIMAssignedProductProperties(PropertyGroup):
     is_editing_product: BoolProperty(name="Is Editing Product", default=False)
     relating_product: PointerProperty(name="Relating Product", type=bpy.types.Object)
+
+
+# ObjectType: annotation_name, description, icon, data_type
+# fmt: off
+ANNOTATION_TYPES_DATA = {
+    "DIMENSION":     ("Dimension",        "Add dimensions annotation.\nMeasurement values can be hidden through ShowDescriptionOnly property\nof BBIM_Dimension property set", "FIXED_SIZE", "curve"),
+    "ANGLE":         ("Angle",            "", "DRIVER_ROTATIONAL_DIFFERENCE", "curve"),
+    "RADIUS":        ("Radius",           "", "FORWARD", "curve"),
+    "DIAMETER":      ("Diameter",         "Add diameter annotation.\nMeasurement values can be hidden through ShowDescriptionOnly property\nof BBIM_Dimension property set", "ARROW_LEFTRIGHT", "curve"),
+    "TEXT":          ("Text",             "", "SMALL_CAPS", "empty"),
+    "TEXT_LEADER":   ("Leader",           "", "TRACKING_BACKWARDS", "curve"),
+    "STAIR_ARROW":   ("Stair Arrow",      "Add stair arrow annotation.\nIf you have IfcStairFlight object selected, it will be used as a reference for the annotation", "SCREEN_BACK", "curve"),
+    "HIDDEN_LINE":   ("Hidden",           "", "CON_TRACKTO", "mesh"),
+    "PLAN_LEVEL":    ("Level (Plan)",     "", "SORTBYEXT", "curve"),
+    "SECTION_LEVEL": ("Level (Section)",  "", "TRIA_DOWN", "curve"),
+    "BREAKLINE":     ("Breakline",        "", "FCURVE", "mesh"),
+    "LINEWORK":      ("Line",             "", "SNAP_MIDPOINT", "mesh"),
+    "BATTING":       ("Batting",          "Add batting annotation.\nThickness could be changed through Thickness property of BBIM_Batting property set", "FORCE_FORCE", "mesh"),
+    "REVISION_CLOUD":("Revision Cloud",   "Add revision cloud", "VOLUME_DATA", "mesh"),
+    "FILL_AREA":     ("Fill Area",        "", "NODE_TEXTURE", "mesh"),
+    "FALL":          ("Fall",             "", "SORT_ASC", "curve"),
+}
+# fmt: on
+
+annotation_classes = [(x, *ANNOTATION_TYPES_DATA[x][:3], i) for i, x in enumerate(ANNOTATION_TYPES_DATA)]
+
+
+def get_relating_type_id(self, context):
+    if not AnnotationData.is_loaded:
+        AnnotationData.load()
+    return AnnotationData.data["relating_type_id"]
+
+
+def update_annotation_object_type(self, context):
+    self.relating_type_id = "0"
+    # changing enum doesn't trigger refresh by itself
+    AnnotationData.is_loaded = False
+
+
+def update_sheet_data(self, context):
+    SheetsData.is_loaded = False
+
+
+class BIMAnnotationProperties(PropertyGroup):
+    object_type: bpy.props.EnumProperty(
+        name="Annotation Object Type", items=annotation_classes, default="TEXT", update=update_annotation_object_type
+    )
+    relating_type_id: bpy.props.EnumProperty(name="Relating Annotation Type", items=get_relating_type_id)
+    create_representation_for_type: bpy.props.BoolProperty(
+        name="Create Representation For Type",
+        default=False,
+        description='Whether "Add type" should define a representation for the type \n'
+        "or allow occurences to have their own",
+    )
+    is_adding_type: bpy.props.BoolProperty(default=False)
+    type_name: bpy.props.StringProperty(name="Name", default="TYPEX")

src/blenderbim/blenderbim/bim/module/drawing/scheduler.py

@@ -16,12 +16,41 @@
 # 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 blenderbim.bim.module.drawing.svgwriter import SvgWriter
 import svgwrite
 
-from odf.opendocument import load
+from odf.opendocument import load as load_ods
 from odf.table import Table, TableRow, TableColumn, TableCell
 from odf.text import P
 from odf.style import Style
+from textwrap import wrap
+from pathlib import Path
+import string
+
+FONT_SIZE = 4.13
+FONT_WIDTH = lambda size: size * 0.45
+FONT_SIZE_PT = 12
+FONT_FAMILY = "OpenGost Type B TT"
+DEBUG = False
+
+
+def col2num(col):
+    """convert letter column index to number:
+    `"A" -> 1`, `"AA" -> 27``
+    """
+    num = 0
+    for c in col:
+        if c in string.ascii_letters:
+            num = num * 26 + (ord(c.upper()) - ord("A")) + 1
+    return num
+
+
+def a1_to_rc(cell):
+    """convert cell index from A1 format to RC: `"A1" -> (0,0)`"""
+    column_letter = cell.strip(string.digits)
+    col_number = col2num(column_letter) - 1
+    row_number = int(cell[len(column_letter) :]) - 1
+    return row_number, col_number
 
 
 class Scheduler:
@@ -33,69 +62,334 @@ class Scheduler:
         )
         self.padding = 1
         self.margin = 1
-        doc = load(infile)
+        doc = load_ods(infile)
+
+        # useful for debugging ods
+        if DEBUG:
+            import xml.dom.minidom
+
+            path = Path(infile)
+            dom = xml.dom.minidom.parseString(doc.xml())
+            pretty_xml = dom.toprettyxml()
+
+            with open(path.with_suffix(".xml"), "w") as fo:
+                fo.write(pretty_xml)
+
         styles = {}
-        for style in doc.getElementsByType(Style):
-            name = style.getAttribute("name")
-            if not style.firstChild:
+        for cell_style in doc.getElementsByType(Style):
+            name = cell_style.getAttribute("name")
+            styles[name] = {}
+
+            # NOTE: there are also styles that inherit from parent styles that we do not process atm
+            if not cell_style.firstChild:
                 continue
-            styles[name] = {key[1]: value for key, value in style.firstChild.attributes.items()}
+
+            if cell_style.firstChild.tagName in ["style:table-column-properties", "style:table-row-properties"]:
+                style_children = [cell_style.firstChild]
+            else:
+                # for style:table-cell-properties we need to collect also text and paragraph properties
+                style_children = cell_style.childNodes
+
+            for child in style_children:
+                child_params = {key[1]: value for key, value in child.attributes.items()}
+                styles[name].update(child_params)
 
         table = doc.getElementsByType(Table)[0]
+
+        # related styles stored as a list of tuples:
+        # [(child, parent), ...]
+        related_styles = []
+
+        # collect columns width
         column_widths = []
+        column_styles = []
         for col in table.getElementsByType(TableColumn):
             style_name = col.getAttribute("stylename")
-            repeat = col.getAttribute("numbercolumnsrepeated")
-            repeat = int(repeat) if repeat else 1
-            for i in range(0, repeat):
+            col_repeat = col.getAttribute("numbercolumnsrepeated")
+            col_repeat = int(col_repeat) if col_repeat else 1
+            for i in range(col_repeat):
                 if not style_name or "column-width" not in styles[style_name]:
-                    column_widths.append(50)
+                    column_width = 50
                 else:
-                    column_widths.append(self.convert_to_mm(styles[style_name]["column-width"]))
+                    column_width = self.convert_to_mm(styles[style_name]["column-width"])
+                column_styles.append(style_name)
+                column_widths.append(column_width)
+            cell_style = col.getAttribute("defaultcellstylename")
+            if cell_style:
+                related_styles.append((style_name, cell_style))
 
+        # collect rows height
+        row_heights = []
+        # TODO: never used yet because unsure about priority for row styles
+        # over column styles or vice versa
+        row_styles = []
+
+        for col in table.getElementsByType(TableRow):
+            style_name = col.getAttribute("stylename")
+            row_repeat = col.getAttribute("numberrowsrepeated")
+            row_repeat = int(row_repeat) if row_repeat else 1
+            for i in range(row_repeat):
+                if not style_name or "row-height" not in styles[style_name]:
+                    row_height = 6
+                else:
+                    row_height = self.convert_to_mm(styles[style_name]["row-height"])
+                row_styles.append(style_name)
+                row_heights.append(row_height)
+            cell_style = col.getAttribute("defaultcellstylename")
+            if cell_style:
+                related_styles.append((style_name, cell_style))
+
+        while len(related_styles) > 0:
+            # unzip related styles to children and parents
+            children, parents = zip(*related_styles)
+            independent_styles = set(parents) - set(children)
+            for relation in related_styles[:]:
+                child, parent = relation
+                if parent in independent_styles:
+                    child_style = styles[child]
+                    styles[child] = styles[parent] | child_style
+                    related_styles.remove(relation)
+
+        # TODO: multiple print ranges? 😔
+        print_range = table.getAttribute("printranges")
+        if print_range:
+            min_rc, max_rc = [a1_to_rc(cell.rsplit(".", 1)[1]) for cell in print_range.split(":")]
+        else:
+            # fallback if print range is not defined
+            n_rows = len(row_heights)
+            n_cols = len(column_widths)
+            n_cells = len(row_heights) * len(column_widths)
+            cells_limit = 10000
+            if n_cells >= cells_limit:
+                raise Exception(
+                    f"You were about to build a very big table with number of cells more than {cells_limit}.\n"
+                    f"In fact it is {n_rows} rows x {n_cols} cols = {n_cells} cells \n"
+                    "and the operation was stopped to prevent system freeze.\n"
+                    "Please define print range in .ods file to proceede\n"
+                    "(needed to make sure printed table will have reasonable size)."
+                )
+
+            min_rc, max_rc = (0, 0), (1048576, 16384)
+        min_row, min_col = min_rc
+        max_row, max_col = max_rc
+
+        # draw table
         y = self.margin
-        for tri, tr in enumerate(table.getElementsByType(TableRow)):
-            x = self.margin
-            height = 6
-            tdi = 0
-            for td in tr.getElementsByType(TableCell):
-                repeat = td.getAttribute("numbercolumnsrepeated")
-                repeat = int(repeat) if repeat else 1
-                for i in range(0, repeat):
-                    width = column_widths[tdi]
-                    self.svg.add(
-                        self.svg.rect(
-                            insert=(x, y),
-                            size=(width, height),
-                            style="fill: #ffffff; stroke-width:.125; stroke: #000000;",
+        tri = 0
+        stop_iterating_over_rows = False
+        # TODO: row spans support?
+        for tr in table.getElementsByType(TableRow):
+            if stop_iterating_over_rows:
+                break
+
+            row_repeat = tr.getAttribute("numberrowsrepeated")
+            row_repeat = int(row_repeat) if row_repeat else 1
+
+            for i_row_repeat in range(row_repeat):
+                if tri < min_row:
+                    tri += 1
+                    continue
+                elif tri > max_row:
+                    stop_iterating_over_rows = True
+                    break
+
+                x = self.margin
+                height = row_heights[tri]
+                tdi = 0
+                stop_iterating_over_columns = False
+
+                for td in tr.getElementsByType(TableCell):
+                    if stop_iterating_over_columns:
+                        break
+
+                    column_span = td.getAttribute("numbercolumnsspanned")
+                    column_span = int(column_span) if column_span else 1
+
+                    col_repeat = td.getAttribute("numbercolumnsrepeated")
+                    col_repeat = int(col_repeat) if col_repeat else 1
+
+                    # figuring text alignment
+                    cell_style = self.get_style(td.getAttribute("stylename"), styles)
+
+                    # drawing cells and text
+                    for i_col_repeat in range(col_repeat):
+                        start_tdi = tdi
+                        end_tdi = tdi + int(column_span) - 1
+                        # if the entire span is beyond print range => continue
+                        # if only part then keeping that part
+                        if start_tdi < min_col:
+                            if end_tdi < min_col:
+                                tdi += column_span
+                                continue
+                            else:
+                                start_tdi = min_col
+
+                        # stop if start column is beyond print range
+                        if start_tdi > max_col:
+                            stop_iterating_over_columns = True
+                            break
+
+                        # making sure last column won't go beyond the print range
+                        if end_tdi > max_col:
+                            end_tdi = max_col
+
+                        width = sum(column_widths[start_tdi : end_tdi + 1])
+                        col_style = self.get_style(column_styles[tdi], styles)
+                        final_cell_style = cell_style or col_style
+                        background_color = final_cell_style.get("background-color", "#ffffff")
+
+                        self.svg.add(
+                            self.svg.rect(
+                                insert=(x, y),
+                                size=(width, height),
+                                style=f"fill: {background_color}; stroke-width:.125; stroke: #000000;",
+                            )
                         )
-                    )
-                    value = td.getElementsByType(P)
-                    if value:
-                        self.add_text(value[0], x + self.padding, y + self.padding)
-                    x += width
-                    tdi += 1
-            y += height
-        total_width = sum(column_widths) + (self.margin * 2)
+
+                        p_tags = td.getElementsByType(P)
+                        text_color = final_cell_style.get("color", None)
+                        box_alignment = self.get_box_alignment(final_cell_style)
+                        wrap_text = final_cell_style.get("wrap-option", None) == "wrap"
+                        bold_text = final_cell_style.get("font-weight", None) == "bold"
+                        italic_text = final_cell_style.get("font-style", None) == "italic"
+                        # NOTE: very naive since we're scaling text proportionally
+                        font_size = (
+                            float(final_cell_style.get("font-size", f"{FONT_SIZE_PT}pt")[:-2])
+                            / FONT_SIZE_PT
+                            * FONT_SIZE
+                        )
+
+                        if p_tags:
+                            # figuring text position based on alignment
+                            text_position = [0.0, 0.0]
+                            if box_alignment.endswith("left"):
+                                text_position[0] = x + self.padding
+                            elif box_alignment.endswith("middle") or box_alignment == "center":
+                                text_position[0] = x + width / 2
+                            elif box_alignment.endswith("right"):
+                                text_position[0] = x + width - self.padding
+
+                            if box_alignment.startswith("top"):
+                                text_position[1] = y + self.padding
+                            elif box_alignment.startswith("middle") or box_alignment == "center":
+                                text_position[1] = y + height / 2
+                            elif box_alignment.startswith("bottom"):
+                                text_position[1] = y + height - self.padding
+
+                            self.add_text(
+                                p_tags,
+                                *text_position,
+                                font_size=font_size,
+                                box_alignment=box_alignment,
+                                wrap_text=wrap_text,
+                                cell_width=width,
+                                bold=bold_text,
+                                italic=italic_text,
+                                text_color=text_color,
+                            )
+                        x += width
+                        tdi += column_span
+
+                tri += 1
+                y += height
+
+        total_width = x + self.margin
+        total_height = y + self.margin
         self.svg["width"] = "{}mm".format(total_width)
-        self.svg["height"] = "{}mm".format(y)
-        self.svg["viewBox"] = "0 0 {} {}".format(total_width, y)
+        self.svg["height"] = "{}mm".format(total_height)
+        self.svg["viewBox"] = "0 0 {} {}".format(total_width, total_height)
         self.svg.save(pretty=True)
 
-    def add_text(self, text, x, y):
-        self.svg.add(
-            self.svg.text(
-                str(text).upper(),
-                insert=tuple((x, y)),
-                **{
-                    "font-size": 4.13,
-                    "font-family": "OpenGost Type B TT",
-                    "text-anchor": "start",
-                    "alignment-baseline": "baseline",
-                    "dominant-baseline": "hanging",
-                }
-            )
-        )
+    def get_style(self, style_name, styles):
+        style = styles[style_name] if style_name else {}
+        return style
+
+    def get_box_alignment(self, style):
+        if style and "vertical-align" in style and style["vertical-align"] != "automatic":
+            vertical_align = style["vertical-align"]
+        else:
+            vertical_align = "bottom"
+
+        alignment_translation = {
+            "center": "middle",
+            "end": "right",
+            "start": "left",
+        }
+
+        if style and "text-align" in style and style["text-align"] != "automatic":
+            horizontal_align = style["text-align"]
+            horizontal_align = alignment_translation.get(horizontal_align, horizontal_align)
+        else:
+            horizontal_align = "left"
+
+        if vertical_align == "middle" and horizontal_align == "middle":
+            box_alignment = "center"
+        else:
+            box_alignment = f"{vertical_align}-{horizontal_align}"
+
+        return box_alignment
+
+    def add_text(
+        self,
+        p_tags,
+        x,
+        y,
+        font_size,
+        box_alignment="bottom-left",
+        wrap_text=False,
+        cell_width=100,
+        bold=False,
+        italic=False,
+        text_color=None,
+    ):
+        """
+        Adds text to svg.
+
+        Args:
+            p_tags: list of cell's P tags from odt file
+            box_alignment: alignment of text in box
+            wrap_text: if True, text will be wrapped to fit in cell
+            cell_width: width of cell, used for wrapping text
+        """
+        text_lines = [str(p).upper() for p in p_tags]
+        box_alignment_params = SvgWriter.get_box_alignment_parameters(box_alignment)
+        text_params = {
+            "font-size": font_size,
+            "font-family": FONT_FAMILY,
+        }
+        if bold:
+            text_params["font-weight"] = "bold"
+        if italic:
+            text_params["font-style"] = "italic"
+        if text_color:
+            text_params["fill"] = text_color
+
+        if len(text_lines) == 1 and not wrap_text:
+            text_params.update(box_alignment_params)
+            text_tag = self.svg.text(text_lines[0], insert=(x, y), **(text_params))
+            self.svg.add(text_tag)
+            return
+
+        text_tag = self.svg.text("", **(text_params | {"font-size": "0"} | box_alignment_params))
+
+        # TODO: should be done in less naive way
+        # without using magic number for FONT_WIDTH
+        # currently it might not work for all fonts and font sizes
+        if wrap_text:
+            wrapped_lines = []
+            for line in text_lines:
+                wrapped_line = wrap(line, width=int(cell_width // FONT_WIDTH(font_size)), break_long_words=False)
+                wrapped_lines.extend(wrapped_line)
+        else:
+            wrapped_lines = text_lines
+
+        for line_number, text_line in enumerate(wrapped_lines[::-1]):
+            # position has to be inserted at tspan to avoid x offset between tspans
+            tspan = self.svg.tspan(text_line, insert=(x, y), **text_params)
+            # doing it here and not in tspan constructor because constructor adds unnecessary spaces
+            tspan.update({"dy": f"-{line_number}em"})
+            text_tag.add(tspan)
+        self.svg.add(text_tag)
 
     def convert_to_mm(self, value):
         # XSL is what defines the units of measurements in ODF

src/blenderbim/blenderbim/bim/module/drawing/shaders.py

@@ -16,10 +16,200 @@
 # 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 bgl
-from mathutils import Matrix
-from gpu.types import GPUShader
 from gpu_extras.batch import batch_for_shader
+import gpu
+from mathutils import Vector
+
+
+# NOTES:
+# Since Metal doesn't support geometry shaders we stick to builtin shaders
+# and generate all geometry data in python before passing it to the shader.
+# This way was considered to be the most reliable atm.
+# More: https://blender.stackexchange.com/questions/291674/migrating-geometry-shaders-to-metal
+#
+# BGL deprecation:
+# since `bgl` is deprecated, creating smoothing lines became tricky
+# Notes for creating shaders with smoothed lines:
+# in geom shader - use triangle_strip, DEFAULT_SETUP, do_edge_verts or do_vertex to emit vertices
+# in frag shader - use lineWidth uniform, smoothline flaot in, smoothing shader code from base shader
+# mind the vertex limit since emitting vertices for smoothed lines produces twice as much vertices
+
+
+BASE_DEF_GLSL = """
+#define PI 3.141592653589793
+#define MAX_POINTS 64
+#define CIRCLE_SEGS 12
+#define SMOOTH_WIDTH 1.0
+#define lineSmooth true
+"""
+
+BASE_LIB_GLSL = """
+// TODO: redefine as macor instead
+uniform vec2 winsize;
+uniform float lineWidth;
+#define half_winsize (winsize / 2)
+// convert camera to window
+#define C2W(v) vec4(v.x * half_winsize.x / v.w, v.y * half_winsize.y / v.w, v.z / v.w, 1)
+// convert window to camera
+#define W2C(v) vec4(v.x * v.w / half_winsize.x, v.y * v.w / half_winsize.y, v.z * v.w, 1)
+
+void emitSegment(vec4 p0, vec4 p1) {
+    gl_Position = p0;
+    EmitVertex();
+    gl_Position = p1;
+    EmitVertex();
+    EndPrimitive();
+}
+
+void emitTriangle(vec4 p1, vec4 p2, vec4 p3) {
+    gl_Position = p1;
+    EmitVertex();
+    gl_Position = p2;
+    EmitVertex();
+    gl_Position = p3;
+    EmitVertex();
+    EndPrimitive();
+}
+
+#define matCLIP2WIN() vec4(winsize.x/2, winsize.y/2, 1, 1)
+#define CLIP2WIN(v) (clip2win * (v) / (v).w)
+#define matWIN2CLIP() vec4(2/winsize.x, 2/winsize.y, 1, 1)
+#define WIN2CLIP(v) (win2clip * (v) * (v).w)
+#define DEFAULT_SETUP() vec4 clip2win = matCLIP2WIN(), win2clip = matWIN2CLIP(); vec2 EDGE_DIR
+
+out float smoothline;
+
+void arrow_head(in vec4 dir, in float size, in float angle, out vec4 head[3]) {
+    vec4 nose = dir * size;
+    float c = cos(angle), s = sin(angle);
+    head[0] = nose;
+    head[1] = vec4(mat2(c, -s, +s, c) * nose.xy, 0, 0);
+    head[2] = vec4(mat2(c, +s, -s, c) * nose.xy, 0, 0);
+}
+
+void circle_head(in float size, out vec4 head[CIRCLE_SEGS]) {
+    float angle_d = PI * 2 / CIRCLE_SEGS;
+    for(int i = 0; i<CIRCLE_SEGS; i++) {
+        float angle = angle_d * i;
+        head[i] = vec4(cos(angle), sin(angle), 0, 0) * size;
+    }
+}
+
+bool check_counterclockwise(in vec4 A, in vec4 B, in vec4 C) {
+    return (C.y-A.y) * (B.x-A.x) > (B.y-A.y) * (C.x-A.x);
+}
+
+void angle_circle_head(
+    in vec4 circle_start, in float circle_angle,
+    in bool counterclockwise,
+    out vec4 head[CIRCLE_SEGS+1], out float angle_segs) {
+    
+    // 1 added to CIRCLE_SEGS because we're number of vertices
+    // for n segments is n+1
+    
+    float angle_d;
+    angle_d = PI * 2 / CIRCLE_SEGS; // 30d
+    // need to bottom clamp it to 1, otherwise it causes Blender crash at extruding the curve
+    angle_segs = max(1, ceil(circle_angle / angle_d));
+    angle_d = circle_angle / angle_segs;
+    
+    for(int i = 0; i < (angle_segs + 1); i++) {
+        float angle = angle_d * i;
+        if (counterclockwise) {
+            head[i] = vec4(
+                circle_start.x *  cos(-angle) + circle_start.y * sin(-angle),
+                circle_start.x * -sin(-angle) + circle_start.y * cos(-angle),
+                0, 0
+            );
+        } else {
+                head[i] = vec4(
+                circle_start.x *  cos(angle) + circle_start.y * sin(angle),
+                circle_start.x * -sin(angle) + circle_start.y * cos(angle),
+                0, 0
+            );
+        }
+    }
+}
+
+void cross_head(in vec4 dir, in float size, out vec4 head[3]) {
+    vec4 nose = dir * size;
+    float c = cos(PI/2), s = sin(PI/2);
+    head[0] = nose;
+    head[1] = vec4(mat2(c, -s, +s, c) * nose.xy, 0, 0);
+    head[2] = vec4(mat2(c, +s, -s, c) * nose.xy, 0, 0);
+}
+
+// do_vertex_util is custom EmitVertex method to support line smoothing
+// `e`   - edge xy direction in win/clip space (directions are invariant in both spaces)
+#define do_vertex(pos, e) (do_vertex_util(pos, vec2(-(e).y, (e).x) / winsize.xy))
+#define do_vertex_win(pos, e) ( do_vertex( WIN2CLIP( pos ), e ) )
+
+// if vertex is shared by two segments of the line still need to emit it twice 
+// to avoid smoothing artifacts
+// don't forget to initialize `vec2 EDGE_DIR` for macro to work
+// `pos0` / `pos1` - vertex position in clip space
+#define do_edge_verts(pos0, pos1) ( EDGE_DIR = normalize( ( (pos1) - (pos0) ).xy ), do_vertex( pos0, EDGE_DIR ), do_vertex( pos1, EDGE_DIR) )
+#define do_edge_verts_win(pos0, pos1) ( do_edge_verts( WIN2CLIP(pos0), WIN2CLIP(pos1) ) )
+void do_vertex_util(vec4 pos, vec2 ofs)
+{
+    float final_line_width = lineWidth + SMOOTH_WIDTH * float(lineSmooth);
+    ofs *= final_line_width;
+
+    smoothline = final_line_width * 0.5;
+    gl_Position = pos;
+    gl_Position.xy += ofs * pos.w;
+    EmitVertex();
+
+    smoothline = -final_line_width * 0.5;
+    gl_Position = pos;
+    gl_Position.xy -= ofs * pos.w;
+    EmitVertex();
+}
+
+// geometry utils
+void triangle_head(in vec4 side, in vec4 dir, in float length, in float width, in float radius, out vec4 head[5]) {
+    // TODO: radius is unnecessary?
+    head[0] = side * -radius;
+    head[1] = side * length * -.5;
+    head[2] = dir * width;
+    head[3] = side * length * .5;
+    head[4] = side * radius;
+}
+
+void do_triangle_head(vec4 pos_w, vec4 head[5]) {
+    DEFAULT_SETUP();
+    do_edge_verts_win(pos_w + head[0], pos_w + head[1]);
+    do_edge_verts_win(pos_w + head[1], pos_w + head[2]);
+    do_edge_verts_win(pos_w + head[2], pos_w + head[3]);
+    do_edge_verts_win(pos_w + head[3], pos_w + head[4]);
+}
+
+void do_circle_head(vec4 pos_w, vec4 head[CIRCLE_SEGS]) {
+    DEFAULT_SETUP();
+    for(int i=0; i<CIRCLE_SEGS-1; i++) {
+        do_edge_verts_win(pos_w + head[i], pos_w + head[i+1]);
+        EmitVertex();
+    }
+    do_edge_verts_win( pos_w + head[CIRCLE_SEGS-1], pos_w + head[0] );
+}
+
+"""
+
+
+def add_verts_sequence(verts, start_i, output_verts, output_edges, closed=False):
+    """Add sequence of verts to output lists, returns next vertex index"""
+    for i, v in enumerate(verts[:-1], start_i):
+        output_verts.append(v)
+        output_edges.append((i, i + 1))
+    output_verts.append(verts[-1])
+    if closed:
+        output_edges.append((i + 1, start_i))
+    return i + 2
+
+
+def add_offsets(v, offsets):
+    """returns list of verts with offsets added"""
+    return [v + offset for offset in offsets]
 
 
 class BaseShader:
@@ -28,7 +218,7 @@ class BaseShader:
 
     The Geometry shader works in clipping coords (aftre projecting before division and window scaling).
     To make window-scale geometry, vectors should be calculated in window space and than back-projected to clipping spae.
-    Provide `winSize` uniform vector with halfsize of window, and use W2C and C2W macros.
+    Provide `half_winsize` uniform vector with halfsize of window, and use W2C and C2W macros.
 
     Replace glsl code in derived classes.
     Beware of unused attributes and uniforms: glsl compiler will optimize them out and blender fail with an exception.
@@ -43,9 +233,7 @@ class BaseShader:
 
     TYPE = None  # should be LINES|POINTS|etc
 
-    DEF_GLSL = """
-    #define PI 3.141592653589793
-    """
+    DEF_GLSL = BASE_DEF_GLSL
 
     VERT_GLSL = """
     uniform mat4 viewMatrix;
@@ -63,84 +251,86 @@ class BaseShader:
     """
 
     # prepended to geom_glsl
-    LIB_GLSL = """
-    uniform vec2 winSize;
-    // convert camera to window
-    #define C2W(v) vec4(v.x * winSize.x / v.w, v.y * winSize.y / v.w, v.z / v.w, 1)
-    // convert window to camera
-    #define W2C(v) vec4(v.x * v.w / winSize.x, v.y * v.w / winSize.y, v.z * v.w, 1)
-
-    void emitSegment(vec4 p0, vec4 p1) {
-        gl_Position = p0;
-        EmitVertex();
-        gl_Position = p1;
-        EmitVertex();
-        EndPrimitive();
-    }
-
-    void emitTriangle(vec4 p1, vec4 p2, vec4 p3) {
-        gl_Position = p1;
-        EmitVertex();
-        gl_Position = p2;
-        EmitVertex();
-        gl_Position = p3;
-        EmitVertex();
-        EndPrimitive();
-    }
-    """
+    LIB_GLSL = BASE_LIB_GLSL
 
     GEOM_GLSL = """
+    uniform float viewportDrawingScale;
+
+    layout(lines) in;
+    layout(triangle_strip, max_vertices = 4) out;
+
+    void main() {
+        // default setup for macro to work
+        vec4 clip2win = matCLIP2WIN();
+        vec4 win2clip = matWIN2CLIP();
+        vec2 EDGE_DIR;
+
+        vec4 p0 = gl_in[0].gl_Position, p1 = gl_in[1].gl_Position;
+        do_edge_verts(p0, p1);
+        EndPrimitive();
+    }
     """
 
     FRAG_GLSL = """
     uniform vec4 color;
+    uniform float lineWidth;
+    
+    in float smoothline;
     out vec4 fragColor;
-
     void main() {
+        vec2 co = gl_FragCoord.xy;
+
         fragColor = color;
+        if (lineSmooth) {
+            fragColor.a *= clamp((lineWidth + SMOOTH_WIDTH) * 0.5 - abs(smoothline), 0.0, 1.0);
+        }
     }
     """
 
     def __init__(self):
-        # NB: libcode arg doesn't work
-        self.prog = GPUShader(
-            vertexcode=self.VERT_GLSL,
-            fragcode=self.FRAG_GLSL,
-            geocode=self.LIB_GLSL + self.GEOM_GLSL,
-            defines=self.DEF_GLSL,
-        )
+        # 3D_POLYLINE_UNIFORM_COLOR is good for smoothed lines since `bgl.enable(GL_LINE_SMOOTH)` is deprecated
+        self.line_shader = gpu.shader.from_builtin("3D_POLYLINE_UNIFORM_COLOR")
+        self.base_shader = gpu.shader.from_builtin("3D_UNIFORM_COLOR")
+
+    def get_shader(self):
+        """Returns shader for this type"""
+        return self.line_shader if self.TYPE == "LINES" else self.base_shader
 
     def batch(self, indices=None, **data):
         """Returns automatic GPUBatch filled with provided parameters"""
-        batch = batch_for_shader(self.prog, self.TYPE, data, indices=indices)
-        batch.program_set(self.prog)
+        shader = self.get_shader()
+        batch = batch_for_shader(shader, self.TYPE, data, indices=indices)
         return batch
 
     def bind(self):
-        self.prog.bind()
+        """need to bind shader before changing it's uniforms"""
+        shader = self.get_shader()
+        shader.bind()
+        return shader
 
     def glenable(self):
-        bgl.glEnable(bgl.GL_BLEND)
-        bgl.glBlendFunc(bgl.GL_SRC_ALPHA, bgl.GL_ONE_MINUS_SRC_ALPHA)
-        bgl.glBlendEquation(bgl.GL_FUNC_ADD)
-
-        # bgl.glEnable(bgl.GL_DEPTH_TEST)
-        # bgl.glDepthFunc(bgl.GL_LEQUAL)
-        # bgl.glDepthMask(True)
+        gpu.state.blend_set("ALPHA")
+        gpu.state.depth_test_set("LESS_EQUAL")
 
     def uniform_region(self, ctx):
+        shader = self.bind()
+
         region = ctx.region
         region3d = ctx.region_data
-        try:
-            self.prog.uniform_float("viewMatrix", region3d.perspective_matrix)
-        except ValueError:  # unused uniform
-            pass
-        try:
-            self.prog.uniform_float("winSize", (region.width / 2, region.height / 2))
-        except ValueError:  # unused uniform
-            pass
+
+        uniform_floats = {
+            "ModelViewProjectionMatrix": region3d.perspective_matrix,
+            # POLYLINE_UNIFORM_COLOR specific uniforms
+            "viewportSize": (region.width, region.height),
+            "lineWidth": 2.5,
+        }
+
+        for name, value in uniform_floats.items():
+            shader.uniform_float(name, value)
 
 
+# TODO: add smoothing if this shader is going to be used
+# TODO: dead code?
 class BaseLinesShader(BaseShader):
     """Draws line segments with gaps around vertices at endpoints"""
 
@@ -185,7 +375,6 @@ class BaseLinesShader(BaseShader):
 
     def glenable(self):
         super().glenable()
-        bgl.glEnable(bgl.GL_LINE_SMOOTH)
 
 
 class GizmoShader(BaseShader):
@@ -207,6 +396,7 @@ class GizmoShader(BaseShader):
     """
 
 
+# TODO: add smoothing if this shader is going to be used
 class DotsGizmoShader(GizmoShader):
     """Draws circles of radius 1 around points"""
 
@@ -263,35 +453,24 @@ class ExtrusionGuidesShader(GizmoShader):
 
     TYPE = "LINES"
 
-    DEF_GLSL = (
-        BaseShader.DEF_GLSL
-        + """
-    #define CROSS_SIZE .5
-    """
-    )
+    def process_geometry(self, verts):
+        CROSS_SIZE = 0.5
 
-    GEOM_GLSL = """
-    uniform mat4 ModelViewProjectionMatrix;
+        p0, p1 = verts
+        bx = Vector((1, 0, 0)) * CROSS_SIZE
+        by = Vector((0, 1, 0)) * CROSS_SIZE
 
-    layout(lines) in;
-    layout(line_strip, max_vertices=10) out;
+        output_verts = []
+        output_edges = []
+        out_kwargs = {
+            "output_verts": output_verts,
+            "output_edges": output_edges,
+        }
 
-    void main() {
-        vec4 p0 = gl_in[0].gl_Position, p1 = gl_in[1].gl_Position;
-        vec4 p0w = C2W(p0), p1w = C2W(p1);
+        start_i = 0
+        start_i = add_verts_sequence(add_offsets(p0, [-bx, bx]), start_i, **out_kwargs)
+        start_i = add_verts_sequence(add_offsets(p0, [-by, by]), start_i, **out_kwargs)
+        start_i = add_verts_sequence(add_offsets(p1, [-bx, bx]), start_i, **out_kwargs)
+        start_i = add_verts_sequence(add_offsets(p1, [-by, by]), start_i, **out_kwargs)
 
-        emitSegment(p0, p1);
-
-        vec4 bx = ModelViewProjectionMatrix[0] * CROSS_SIZE;
-        vec4 by = ModelViewProjectionMatrix[1] * CROSS_SIZE;
-
-        emitSegment(p0 - bx, p0 + bx);
-        emitSegment(p0 - by, p0 + by);
-        emitSegment(p1 - bx, p1 + bx);
-        emitSegment(p1 - by, p1 + by);
-    }
-    """
-
-    def glenable(self):
-        super().glenable()
-        bgl.glEnable(bgl.GL_LINE_SMOOTH)
+        return output_verts, output_edges

src/blenderbim/blenderbim/bim/module/drawing/sheeter.py

@@ -17,15 +17,23 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import bpy
 import uuid
+import shutil
 import ntpath
 import pystache
 import urllib.parse
 import xml.etree.ElementTree as ET
 import blenderbim.tool as tool
 import ifcopenshell.util.geolocation
-from shutil import copy
 from xml.dom import minidom
+from mathutils import Vector
+import re
+
+VIEW_TITLE_OFFSET_Y = 5
+DEFAULT_POSITION = Vector((30, 30))
+SVG = "{http://www.w3.org/2000/svg}"
+XLINK = "{http://www.w3.org/1999/xlink}"
 
 
 class SheetBuilder:
@@ -33,22 +41,29 @@ class SheetBuilder:
         self.data_dir = None
         self.scale = "NTS"
 
-    def create(self, sheet_path, titleblock_name):
+    def create(self, layout_path, titleblock_name):
         root = ET.Element("svg")
         root.attrib["xmlns"] = "http://www.w3.org/2000/svg"
         root.attrib["xmlns:xlink"] = "http://www.w3.org/1999/xlink"
         root.attrib["id"] = "root"
         root.attrib["version"] = "1.1"
 
-        view_root = ET.parse(
-            os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
-        ).getroot()
+        sheet_dir = os.path.dirname(layout_path)
+        ootb_titleblock_path = os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
+        titleblock_path = tool.Ifc.resolve_uri(tool.Drawing.get_default_titleblock_path(titleblock_name))
+
+        os.makedirs(sheet_dir, exist_ok=True)
+        os.makedirs(os.path.dirname(titleblock_path), exist_ok=True)
+        if not os.path.exists(titleblock_path):
+            shutil.copy(ootb_titleblock_path, titleblock_path)
+
+        view_root = ET.parse(titleblock_path).getroot()
         view_width = self.convert_to_mm(view_root.attrib.get("width"))
         view_height = self.convert_to_mm(view_root.attrib.get("height"))
         view = ET.SubElement(root, "g")
         view.attrib["data-type"] = "titleblock"
         titleblock = ET.SubElement(view, "image")
-        titleblock.attrib["xlink:href"] = "../templates/titleblocks/" + titleblock_name + ".svg"
+        titleblock.attrib["xlink:href"] = os.path.relpath(titleblock_path, sheet_dir)
         titleblock.attrib["x"] = "0"
         titleblock.attrib["y"] = "0"
         titleblock.attrib["width"] = str(view_width)
@@ -58,26 +73,25 @@ class SheetBuilder:
         root.attrib["height"] = "{}mm".format(view_height)
         root.attrib["viewBox"] = "0 0 {} {}".format(view_width, view_height)
 
-        with open(sheet_path, "w") as f:
+        with open(layout_path, "w") as f:
             f.write(minidom.parseString(ET.tostring(root)).toprettyxml(indent="    "))
 
     def add_drawing(self, reference, drawing, sheet):
         filename = drawing.Name
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
-        sheet_dir = os.path.join(self.data_dir, "sheets")
-        drawing_dir = os.path.join(self.data_dir, "diagrams")
-        sheet_path = os.path.join(sheet_dir, sheet_name + ".svg")
-        drawing_path = os.path.join(drawing_dir, filename + ".svg")
-        underlay_path = os.path.join(drawing_dir, filename + "-underlay.png")
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_dir = os.path.dirname(layout_path)
 
-        if not os.path.isfile(sheet_path):
+        drawing_path = tool.Drawing.get_document_uri(tool.Drawing.get_drawing_reference(drawing))
+        underlay_path = os.path.splitext(drawing_path)[0] + "-underlay.png"
+
+        if not os.path.exists(layout_path) or not os.path.exists(drawing_path):
             raise FileNotFoundError
 
         ET.register_namespace("", "http://www.w3.org/2000/svg")
         ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")
 
-        sheet_tree = ET.parse(sheet_path)
-        sheet_root = sheet_tree.getroot()
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()
 
         view_tree = ET.parse(drawing_path)
         view_root = view_tree.getroot()
@@ -85,103 +99,160 @@ class SheetBuilder:
         # The view is placed into a group with a background image element.
         # Although the foreground SVG already has a background, it is duplicated
         # here to accommodate browsers which do not nest images.
-        view = ET.SubElement(sheet_root, "g")
+        view = ET.SubElement(layout_root, "g")
         view.attrib["data-type"] = "drawing"
         view.attrib["data-id"] = str(reference.id())
         view.attrib["data-drawing"] = drawing.GlobalId
         view_width = self.convert_to_mm(view_root.attrib.get("width"))
         view_height = self.convert_to_mm(view_root.attrib.get("height"))
 
+        # add background
         if os.path.isfile(underlay_path):
             background = ET.SubElement(view, "image")
             background.attrib["data-type"] = "background"
-            background.attrib["xlink:href"] = os.path.relpath(underlay_path, sheet_dir)
-            background.attrib["x"] = "30"
-            background.attrib["y"] = "30"
+            background.attrib["xlink:href"] = os.path.relpath(underlay_path, layout_dir)
+            background.attrib["x"] = str(DEFAULT_POSITION.x)
+            background.attrib["y"] = str(DEFAULT_POSITION.y)
             background.attrib["width"] = str(view_width)
             background.attrib["height"] = str(view_height)
 
+        # add foreground
         if os.path.isfile(drawing_path):
             foreground = ET.SubElement(view, "image")
             foreground.attrib["data-type"] = "foreground"
-            foreground.attrib["xlink:href"] = os.path.relpath(drawing_path, sheet_dir)
-            foreground.attrib["x"] = "30"
-            foreground.attrib["y"] = "30"
+            foreground.attrib["xlink:href"] = os.path.relpath(drawing_path, layout_dir)
+            foreground.attrib["x"] = str(DEFAULT_POSITION.x)
+            foreground.attrib["y"] = str(DEFAULT_POSITION.y)
             foreground.attrib["width"] = str(view_width)
             foreground.attrib["height"] = str(view_height)
 
-        self.add_view_title(30, view_height + 35, view)
-        sheet_tree.write(sheet_path)
+        self.add_view_title(
+            DEFAULT_POSITION.x, view_height + DEFAULT_POSITION.y + VIEW_TITLE_OFFSET_Y, view, layout_dir
+        )
+        layout_tree.write(layout_path)
+
+    def update_sheet_drawing_sizes(self, sheet):
+        ET.register_namespace("", "http://www.w3.org/2000/svg")
+
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()
+        ifc_file = tool.Ifc.get()
+
+        # iterate over all drawings in the sheet
+        drawings_views = layout_root.findall(f'{SVG}g[@data-type="drawing"]')
+
+        for drawing_view in drawings_views:
+            # find drawing in ifc file to get the drawing dimensions
+            drawing = ifc_file.by_guid(drawing_view.attrib.get("data-drawing"))
+            drawing_path = tool.Drawing.get_document_uri(tool.Drawing.get_drawing_reference(drawing))
+            drawing_tree = ET.parse(drawing_path)
+            drawing_root = drawing_tree.getroot()
+            view_width = self.convert_to_mm(drawing_root.attrib.get("width"))
+            view_height = self.convert_to_mm(drawing_root.attrib.get("height"))
+
+            foreground = drawing_view.find(f'.//{SVG}image[@data-type="foreground"]')
+            height = float(foreground.attrib["height"])
+            width = float(foreground.attrib["width"])
+            readjust = Vector((width - view_width, height - view_height)) / 2
+
+            for image in drawing_view.findall(f"{SVG}image"):
+                x = float(image.attrib["x"])
+                y = float(image.attrib["y"])
+                if image.attrib["data-type"] == "view-title":
+                    image.attrib["x"] = str(x - readjust.x)
+                    image.attrib["y"] = str(y - readjust.y)
+                else:
+                    image.attrib["x"] = str(x + readjust.x)
+                    image.attrib["y"] = str(y + readjust.y)
+                    image.attrib["width"] = str(view_width)
+                    image.attrib["height"] = str(view_height)
+
+        layout_tree.write(layout_path)
 
     def remove_drawing(self, reference, sheet):
         ET.register_namespace("", "http://www.w3.org/2000/svg")
 
-        sheet_path = tool.Drawing.get_document_uri(sheet)
-        sheet_tree = ET.parse(sheet_path)
-        sheet_root = sheet_tree.getroot()
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()
 
-        for g in sheet_root.findall("{http://www.w3.org/2000/svg}g"):
+        for g in layout_root.findall("{http://www.w3.org/2000/svg}g"):
             if g.attrib.get("data-id") == str(reference.id()):
-                sheet_root.remove(g)
+                layout_root.remove(g)
                 break
 
-        sheet_tree.write(sheet_path)
+        layout_tree.write(layout_path)
 
-    def add_schedule(self, reference, schedule, sheet):
-        view_path = tool.Drawing.get_document_uri(schedule)
+    def add_document(self, reference, schedule, sheet):
+        view_path = tool.Drawing.get_path_with_ext(tool.Drawing.get_document_uri(schedule), "svg")
         if not os.path.exists(view_path):
             tool.Drawing.create_svg_schedule(schedule)
         schedule_name = os.path.splitext(os.path.basename(view_path))[0]
-        sheet_path = tool.Drawing.get_document_uri(sheet)
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_dir = os.path.dirname(layout_path)
 
         ET.register_namespace("", "http://www.w3.org/2000/svg")
         ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")
 
-        sheet_tree = ET.parse(sheet_path)
-        sheet_root = sheet_tree.getroot()
+        layout_tree = ET.parse(layout_path)
+        layout_root = layout_tree.getroot()
 
         view_tree = ET.parse(view_path)
         view_root = view_tree.getroot()
         view_width = self.convert_to_mm(view_root.attrib.get("width"))
         view_height = self.convert_to_mm(view_root.attrib.get("height"))
 
-        view = ET.SubElement(sheet_root, "g")
+        view = ET.SubElement(layout_root, "g")
         view.attrib["data-type"] = "schedule"
         view.attrib["data-id"] = str(reference.id())
         view.attrib["data-schedule"] = str(schedule.id())
 
         foreground = ET.SubElement(view, "image")
         foreground.attrib["data-type"] = "table"
-        foreground.attrib["xlink:href"] = "../schedules/{}.svg".format(schedule_name)
-        foreground.attrib["x"] = "30"
-        foreground.attrib["y"] = "30"
+        foreground.attrib["xlink:href"] = os.path.relpath(view_path, layout_dir)
+        foreground.attrib["x"] = str(DEFAULT_POSITION.x)
+        foreground.attrib["y"] = str(DEFAULT_POSITION.y)
         foreground.attrib["width"] = str(view_width)
         foreground.attrib["height"] = str(view_height)
 
-        self.add_view_title(30, view_height + 35, view)
-        sheet_tree.write(sheet_path)
+        self.add_view_title(
+            DEFAULT_POSITION.x, view_height + DEFAULT_POSITION.y + VIEW_TITLE_OFFSET_Y, view, layout_dir
+        )
+        layout_tree.write(layout_path)
 
-    def add_view_title(self, x, y, parent):
-        title_tree = ET.parse(os.path.join(self.data_dir, "templates", "view-title.svg"))
+    def add_view_title(self, x, y, parent, layout_dir):
+        title_path = os.path.join(layout_dir, "assets", "view-title.svg")
+        os.makedirs(os.path.dirname(title_path), exist_ok=True)
+        if not os.path.exists(title_path):
+            ootb_title = os.path.join(bpy.context.scene.BIMProperties.data_dir, "assets", "view-title.svg")
+            shutil.copy(ootb_title, title_path)
+
+        title_tree = ET.parse(title_path)
         title_root = title_tree.getroot()
         title = ET.SubElement(parent, "image")
         title.attrib["data-type"] = "view-title"
-        title.attrib["xlink:href"] = "../templates/view-title.svg"
+        title.attrib["xlink:href"] = os.path.relpath(title_path, layout_dir)
         title.attrib["x"] = str(x)
         title.attrib["y"] = str(y)
         title.attrib["width"] = str(self.convert_to_mm(title_root.attrib.get("width")))
         title.attrib["height"] = str(self.convert_to_mm(title_root.attrib.get("height")))
 
     def build(self, sheet):
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
-        os.makedirs(os.path.join(self.data_dir, "build", sheet_name), exist_ok=True)
+        self.references = {"SHEET": None, "RASTER": []}
 
-        sheet_path = os.path.join(self.data_dir, "sheets", f"{sheet_name}.svg")
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        self.layout_dir = os.path.dirname(layout_path)
+
+        sheet_path = tool.Ifc.resolve_uri(tool.Drawing.get_default_sheet_path(sheet[0], sheet.Name))
+        self.sheets_dir = os.path.dirname(sheet_path)
+
+        os.makedirs(self.sheets_dir, exist_ok=True)
 
         ET.register_namespace("", "http://www.w3.org/2000/svg")
         ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")
 
-        tree = ET.parse(sheet_path)
+        tree = ET.parse(layout_path)
         root = tree.getroot()
 
         self.defs = ET.Element("defs")
@@ -189,11 +260,15 @@ class SheetBuilder:
 
         self.build_titleblock(root, sheet)
         self.build_drawings(root, sheet)
-        self.build_schedules(root)
+        self.build_schedules(root, sheet)
 
-        with open(os.path.join(self.data_dir, "build", sheet_name, f"{sheet_name}.svg"), "wb") as output:
+        with open(sheet_path, "wb") as output:
             tree.write(output)
 
+        self.references["SHEET"] = sheet_path
+
+        return self.references
+
     def build_titleblock(self, root, sheet):
         titleblock = root.findall('{http://www.w3.org/2000/svg}g[@data-type="titleblock"]')[0]
         image = titleblock.findall("{http://www.w3.org/2000/svg}image")[0]
@@ -207,10 +282,67 @@ class SheetBuilder:
         titleblock.append(g)
         titleblock.remove(image)
 
-    def build_drawings(self, root, sheet):
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
+    def ensure_drawing_unique_styles(self, svg, drawing_id):
+        """ensures all drawing's classes and ids will be unique for the whole sheet
+        by adding `drawing_id` based prefix
+        """
+        prefix = f"d{drawing_id}"  # just number doesn't work
 
+        # add .prefix class to all css selectors
+        style = svg.find(f"{SVG}defs/{SVG}style")
+        style_data = style.text
+        text = ""
+        brackets_level = 0
+        for l in style_data:
+            if l == "{":
+                if brackets_level == 0:
+                    cur_line = text.splitlines()[-1]
+                    text = text[: -len(cur_line)]
+                    css_selectors = []
+                    # making sure cases like "text, tspan" will be
+                    # converted to "text.prefix, tspan.prefix"
+                    for css_selector in cur_line.split(","):
+                        css_selector = f"{css_selector.strip()}.{prefix}"
+                        css_selectors.append(css_selector)
+                    text += ", ".join(css_selectors) + " "
+                brackets_level += 1
+            elif l == "}":
+                brackets_level -= 1
+            text += l
+
+        def replace_urls(text):
+            """replace urls `url(#marker)` with `url(#prefix-marker)`
+            since `url(#marker.prefix)` doesn't seem to work
+            """
+            return re.sub(r"url\(#([^\)]+)\)", rf"url(#{prefix}-\1)", text)
+
+        style.text = replace_urls(text)
+
+        for svg_element in svg.findall(f".//*"):
+            if svg_element.tag in (f"{SVG}style", f"{SVG}svg"):
+                continue
+            attrib = svg_element.attrib
+            # add "prefix-" to all ids
+            if "id" in attrib:
+                attrib["id"] = f"{prefix}-{attrib['id']}"
+            # add class "prefix" to all classes
+            if "class" in attrib:
+                attrib["class"] += f" {prefix}"
+            if "filter" in attrib:
+                # example use "#fill-background" filter
+                attrib["filter"] = replace_urls(attrib["filter"])
+            if svg_element.tag == f"{SVG}use":
+                href_attrib = f"{XLINK}href"
+                if href_attrib in attrib:
+                    href = attrib[href_attrib]
+                    if href.startswith("#"):
+                        attrib[href_attrib] = f"#{prefix}-{href[1:]}"
+
+        return svg
+
+    def build_drawings(self, root, sheet):
         for view in root.findall('{http://www.w3.org/2000/svg}g[@data-type="drawing"]'):
+            drawing_id = int(view.attrib["data-id"])
             reference = tool.Ifc.get().by_id(int(view.attrib["data-id"]))
             drawing = tool.Ifc.get().by_id(view.attrib["data-drawing"])
 
@@ -229,15 +361,20 @@ class SheetBuilder:
                     view_title = image
 
             if foreground is not None:
-                view.append(self.parse_embedded_svg(foreground, {}))
+                svg = self.parse_embedded_svg(foreground, {})
+                svg = self.ensure_drawing_unique_styles(svg, drawing_id)
+                view.append(svg)
 
             if background is not None:
-                background_path = os.path.join(self.data_dir, "sheets", self.get_href(background))
-                copy(background_path, os.path.join(self.data_dir, "build", sheet_name))
+                background_path = os.path.join(self.layout_dir, self.get_href(background))
+                raster_path = os.path.join(self.sheets_dir, os.path.basename(background_path))
+                shutil.copy(background_path, raster_path)
+                self.references["RASTER"].append(raster_path)
 
             if view_title is not None:
                 foreground_path = self.get_href(foreground)
                 data = reference.get_info()
+                data.update({"Sheet" + k: v for k, v in sheet.get_info().items()})
                 if not data["Name"]:
                     data["Name"] = ntpath.basename(foreground_path)[0:-4]
                 data["Scale"] = tool.Drawing.get_drawing_human_scale(drawing)
@@ -246,7 +383,7 @@ class SheetBuilder:
             for image in images:
                 view.remove(image)
 
-    def build_schedules(self, root):
+    def build_schedules(self, root, sheet):
         for view in root.findall('{http://www.w3.org/2000/svg}g[@data-type="schedule"]'):
             reference = tool.Ifc.get().by_id(int(view.attrib["data-id"]))
             schedule = tool.Ifc.get().by_id(int(view.attrib["data-schedule"]))
@@ -268,6 +405,7 @@ class SheetBuilder:
             if view_title is not None:
                 path = self.get_href(table)
                 data = reference.get_info()
+                data.update({"Sheet" + k: v for k, v in sheet.get_info().items()})
                 if not data["Name"]:
                     data["Name"] = schedule.Name or "Unnamed"
                 view.append(self.parse_embedded_svg(view_title, data))
@@ -298,7 +436,7 @@ class SheetBuilder:
         self.defs.append(clip_path)
 
         svg_path = self.get_href(image)
-        with open(os.path.join(self.data_dir, "sheets", svg_path), "r") as template:
+        with open(os.path.join(self.layout_dir, svg_path), "r") as template:
             embedded = ET.fromstring(pystache.render(template.read(), data))
             # viewBox should not be nested
             embedded.attrib["viewBox"] = ""
@@ -314,6 +452,39 @@ class SheetBuilder:
             group.append(child)
         return group
 
+    def change_titleblock(self, sheet, titleblock_name):
+        ootb_titleblock_path = os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
+        titleblock_path = tool.Drawing.get_default_titleblock_path(titleblock_name)
+        sheet_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        sheet_dir = os.path.dirname(sheet_path)
+
+        os.makedirs(sheet_dir, exist_ok=True)
+        os.makedirs(os.path.dirname(titleblock_path), exist_ok=True)
+        if not os.path.exists(titleblock_path):
+            shutil.copy(ootb_titleblock_path, titleblock_path)
+
+        ET.register_namespace("", "http://www.w3.org/2000/svg")
+        ET.register_namespace("xlink", "http://www.w3.org/1999/xlink")
+
+        view_root = ET.parse(ootb_titleblock_path).getroot()
+        view_width = self.convert_to_mm(view_root.attrib.get("width"))
+        view_height = self.convert_to_mm(view_root.attrib.get("height"))
+
+        sheet_tree = ET.parse(sheet_path)
+        root = sheet_tree.getroot()
+
+        titleblock = sheet_tree.findall('{http://www.w3.org/2000/svg}g[@data-type="titleblock"]')[0]
+        image = titleblock.findall("{http://www.w3.org/2000/svg}image[@{http://www.w3.org/1999/xlink}href]")[0]
+        image.attrib["{http://www.w3.org/1999/xlink}href"] = os.path.relpath(titleblock_path, sheet_dir)
+        image.attrib["width"] = str(view_width)
+        image.attrib["height"] = str(view_height)
+
+        root.attrib["width"] = "{}mm".format(view_width)
+        root.attrib["height"] = "{}mm".format(view_height)
+        root.attrib["viewBox"] = "0 0 {} {}".format(view_width, view_height)
+
+        sheet_tree.write(sheet_path)
+
     def convert_to_mm(self, value):
         # CSS is what defines these possibilities
         # https://www.w3.org/TR/SVG/refs.html#ref-css-values-3

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

@@ -23,10 +23,11 @@ from bpy.types import Panel
 from blenderbim.bim.module.drawing.data import (
     ProductAssignmentsData,
     SheetsData,
-    SchedulesData,
+    DocumentsData,
     DrawingsData,
     DecoratorData,
 )
+from blenderbim.bim.module.drawing.prop import ANNOTATION_TYPES_DATA
 
 
 class BIM_PT_camera(Panel):
@@ -62,29 +63,31 @@ class BIM_PT_camera(Panel):
         row.prop(props, "has_annotation", icon="MOD_EDGESPLIT")
         row.prop(dprops, "should_use_annotation_cache", text="", icon="FILE_REFRESH")
 
+        row = layout.row()
+        row.prop(props, "calculate_shapely_surfaces")
+        row = layout.row()
+        row.prop(props, "calculate_svgfill_surfaces")
+
         row = layout.row()
         row.prop(dprops, "should_extract")
 
-        row = layout.row()
-        row.prop(props, "is_nts")
-
-        row = layout.row()
-        row.operator("bim.resize_text")
-
         row = layout.row()
         row.prop(props, "raster_x")
         row = layout.row()
         row.prop(props, "raster_y")
 
-        row = layout.row()
+        row = layout.row(align=True)
         row.prop(props, "diagram_scale")
+        row.prop(props, "is_nts", text="", icon="MOD_EDGESPLIT")
+
         if props.diagram_scale == "CUSTOM":
-            row = layout.row()
-            row.prop(props, "custom_diagram_scale")
+            row = layout.row(align=True)
+            row.prop(props, "custom_scale_numerator", text="Custom Scale")
+            row.prop(props, "custom_scale_denominator", text="")
 
         row = layout.row(align=True)
         row.operator("bim.create_drawing", text="Create Drawing", icon="OUTPUT")
-        op = row.operator("bim.open_view", icon="URL", text="")
+        op = row.operator("bim.open_drawing", icon="URL", text="")
         op.view = context.active_object.name.split("/")[1]
 
 
@@ -106,58 +109,74 @@ class BIM_PT_drawing_underlay(Panel):
         layout.use_property_split = True
         dprops = context.scene.DocProperties
         props = context.active_object.data.BIMCameraProperties
+        drawing_index_is_valid = props.active_drawing_style_index < len(dprops.drawing_styles)
+
+        if not DrawingsData.is_loaded:
+            DrawingsData.load()
+        drawing_pset_data = DrawingsData.data["active_drawing_pset_data"]
 
         row = layout.row(align=True)
-        row.operator("bim.add_drawing_style")
+        current_shading_style = drawing_pset_data.get("CurrentShadingStyle", None)
+        if current_shading_style is None:
+            row.label(text="Current style is not set.")
+        else:
+            row.label(text="Current Shading Style:")
+            row.label(text=current_shading_style)
+        row.operator("bim.add_drawing_style", icon="ADD", text="")
+        if drawing_index_is_valid:
+            row.operator("bim.remove_drawing_style", icon="X", text="").index = props.active_drawing_style_index
+        row.operator("bim.reload_drawing_styles", icon="FILE_REFRESH", text="")
 
-        if dprops.drawing_styles:
-            layout.template_list("BIM_UL_generic", "", dprops, "drawing_styles", props, "active_drawing_style_index")
+        if not dprops.drawing_styles:
+            return
+        layout.template_list("BIM_UL_generic", "", dprops, "drawing_styles", props, "active_drawing_style_index")
 
-            if props.active_drawing_style_index < len(dprops.drawing_styles):
-                drawing_style = dprops.drawing_styles[props.active_drawing_style_index]
+        if not drawing_index_is_valid:
+            return
+        drawing_style = dprops.drawing_styles[props.active_drawing_style_index]
 
-                row = layout.row(align=True)
-                row.prop(drawing_style, "name")
-                row.operator("bim.remove_drawing_style", icon="X", text="").index = props.active_drawing_style_index
+        row = layout.row(align=True)
+        row.prop(drawing_style, "name")
 
-                row = layout.row()
-                row.prop(drawing_style, "render_type")
-                row = layout.row(align=True)
-                row.prop(drawing_style, "vector_style")
-                row.operator("bim.edit_vector_style", text="", icon="GREASEPENCIL")
-                row = layout.row(align=True)
-                row.prop(drawing_style, "include_query")
-                row = layout.row(align=True)
-                row.prop(drawing_style, "exclude_query")
+        row = layout.row()
+        row.prop(drawing_style, "render_type")
+        row = layout.row(align=True)
+        row.prop(drawing_style, "include_query")
+        row = layout.row(align=True)
+        row.prop(drawing_style, "exclude_query")
 
-                row = layout.row()
-                row.operator("bim.add_drawing_style_attribute")
+        row = layout.row()
+        row.operator("bim.add_drawing_style_attribute")
 
-                for index, attribute in enumerate(drawing_style.attributes):
-                    row = layout.row(align=True)
-                    row.prop(attribute, "name", text="")
-                    row.operator("bim.remove_drawing_style_attribute", icon="X", text="").index = index
+        for index, attribute in enumerate(drawing_style.attributes):
+            row = layout.row(align=True)
+            row.prop(attribute, "name", text="")
+            row.operator("bim.remove_drawing_style_attribute", icon="X", text="").index = index
 
-                row = layout.row(align=True)
-                row.operator("bim.save_drawing_style")
-                row.operator("bim.activate_drawing_style")
+        row = layout.row(align=True)
+        row.operator("bim.save_drawing_style")
+        row.operator("bim.activate_drawing_style")
 
 
 class BIM_PT_drawings(Panel):
     bl_label = "Drawings"
     bl_idname = "BIM_PT_drawings"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_category = "BIM Documentation"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
 
     @classmethod
     def poll(cls, context):
-        return tool.Ifc.get()
+        return tool.Blender.is_tab(context, "DRAWINGS") and tool.Ifc.get()
 
     def draw(self, context):
         if not DrawingsData.is_loaded:
             DrawingsData.load()
 
+        if not DrawingsData.data["has_saved_ifc"]:
+            draw_project_not_saved_ui(self)
+            return
+
         self.props = context.scene.DocProperties
 
         if not self.props.is_editing_drawings:
@@ -180,16 +199,31 @@ class BIM_PT_drawings(Panel):
                 col.alignment = "LEFT"
                 row2 = col.row(align=True)
                 row2.operator("bim.remove_drawing", icon="X", text="").drawing = active_drawing.ifc_definition_id
+
                 row2.operator(
                     "bim.duplicate_drawing", icon="COPYDOWN", text=""
                 ).drawing = active_drawing.ifc_definition_id
+
                 col = row.column()
                 col.alignment = "RIGHT"
-                op = row.operator("bim.open_view", icon="URL", text="")
+
+                op = row.operator("bim.select_all_drawings", icon="SELECT_SUBTRACT", text="")
+
+                open_drawing_button = row.row(align=True)
+                op = open_drawing_button.operator("bim.open_drawing", icon="URL", text="")
                 op.view = active_drawing.name
-                op = row.operator("bim.activate_view", icon="OUTLINER_OB_CAMERA", text="")
+                open_drawing_button.enabled = active_drawing.ifc_definition_id > 0
+
+                row.operator("bim.activate_model", icon="VIEW3D", text="")
+
+                drawing_button = row.row(align=True)
+                op = drawing_button.operator("bim.activate_drawing", icon="OUTLINER_OB_CAMERA", text="")
                 op.drawing = active_drawing.ifc_definition_id
-                row.operator("bim.create_drawing", text="", icon="OUTPUT")
+                drawing_button.enabled = active_drawing.ifc_definition_id > 0
+
+                create_drawing_button = row.row(align=True)
+                create_drawing_button.operator("bim.create_drawing", text="", icon="OUTPUT")
+                create_drawing_button.enabled = active_drawing.ifc_definition_id > 0
             self.layout.template_list(
                 "BIM_UL_drawinglist", "", self.props, "drawings", self.props, "active_drawing_index"
             )
@@ -208,23 +242,27 @@ class BIM_PT_drawings(Panel):
 class BIM_PT_schedules(Panel):
     bl_label = "Schedules"
     bl_idname = "BIM_PT_schedules"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_category = "BIM Documentation"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
 
     @classmethod
     def poll(cls, context):
-        return tool.Ifc.get()
+        return tool.Blender.is_tab(context, "DRAWINGS") and tool.Ifc.get()
 
     def draw(self, context):
-        if not SchedulesData.is_loaded:
-            SchedulesData.load()
+        if not DocumentsData.is_loaded:
+            DocumentsData.load()
+
+        if not DocumentsData.data["has_saved_ifc"]:
+            draw_project_not_saved_ui(self)
+            return
 
         self.props = context.scene.DocProperties
 
         if not self.props.is_editing_schedules:
             row = self.layout.row(align=True)
-            row.label(text=f"{SchedulesData.data['total_schedules']} Schedules Found", icon="LONGDISPLAY")
+            row.label(text=f"{DocumentsData.data['total_schedules']} Schedules Found", icon="LONGDISPLAY")
             row.operator("bim.load_schedules", text="", icon="IMPORT")
             return
 
@@ -248,21 +286,74 @@ class BIM_PT_schedules(Panel):
             )
 
 
-class BIM_PT_sheets(Panel):
-    bl_label = "Sheets"
-    bl_idname = "BIM_PT_sheets"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_category = "BIM Documentation"
+def draw_project_not_saved_ui(self):
+    row = self.layout.row()
+    row.label(text="Project Not Yet Saved", icon="ERROR")
+
+
+class BIM_PT_references(Panel):
+    bl_label = "References"
+    bl_idname = "BIM_PT_references"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
 
     @classmethod
     def poll(cls, context):
-        return tool.Ifc.get()
+        return tool.Blender.is_tab(context, "DRAWINGS") and tool.Ifc.get()
+
+    def draw(self, context):
+        if not DocumentsData.is_loaded:
+            DocumentsData.load()
+
+        if not DocumentsData.data["has_saved_ifc"]:
+            draw_project_not_saved_ui(self)
+            return
+
+        self.props = context.scene.DocProperties
+
+        if not self.props.is_editing_references:
+            row = self.layout.row(align=True)
+            row.label(text=f"{DocumentsData.data['total_references']} References Found", icon="LONGDISPLAY")
+            row.operator("bim.load_references", text="", icon="IMPORT")
+            return
+
+        row = self.layout.row(align=True)
+        row.operator("bim.add_reference", icon="ADD")
+        row.operator("bim.disable_editing_references", text="", icon="CANCEL")
+
+        if self.props.references:
+            if self.props.active_reference_index < len(self.props.references):
+                active_reference = self.props.references[self.props.active_reference_index]
+                row = self.layout.row(align=True)
+                row.alignment = "RIGHT"
+                row.operator("bim.open_reference", icon="URL", text="").reference = active_reference.ifc_definition_id
+                row.operator("bim.remove_reference", icon="X", text="").reference = active_reference.ifc_definition_id
+
+            self.layout.template_list(
+                "BIM_UL_generic", "", self.props, "references", self.props, "active_reference_index"
+            )
+
+
+class BIM_PT_sheets(Panel):
+    bl_label = "Sheets"
+    bl_idname = "BIM_PT_sheets"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Blender.is_tab(context, "DRAWINGS") and tool.Ifc.get()
 
     def draw(self, context):
         if not SheetsData.is_loaded:
             SheetsData.load()
 
+        if not SheetsData.data["has_saved_ifc"]:
+            draw_project_not_saved_ui(self)
+            return
+
         self.props = context.scene.DocProperties
 
         if not self.props.is_editing_sheets:
@@ -280,9 +371,11 @@ class BIM_PT_sheets(Panel):
             active_sheet = self.props.sheets[self.props.active_sheet_index]
             row = self.layout.row(align=True)
             row.alignment = "RIGHT"
+            row.operator("bim.edit_sheet", icon="GREASEPENCIL", text="")
             row.operator("bim.open_sheet", icon="URL", text="")
             row.operator("bim.add_drawing_to_sheet", icon="IMAGE_PLANE", text="")
             row.operator("bim.add_schedule_to_sheet", icon="PRESET_NEW", text="")
+            row.operator("bim.add_reference_to_sheet", icon="IMAGE_REFERENCE", text="")
             row.operator("bim.create_sheets", icon="FILE_REFRESH", text="")
             if active_sheet.is_sheet:
                 row.operator("bim.remove_sheet", icon="X", text="").sheet = active_sheet.ifc_definition_id
@@ -343,7 +436,7 @@ class BIM_PT_text(Panel):
         element = tool.Ifc.get_entity(context.active_object)
         if not element:
             return
-        return element.is_a("IfcAnnotation") and element.ObjectType in ["TEXT", "TEXT_LEADER"]
+        return tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"])
 
     def draw(self, context):
         obj = context.active_object
@@ -406,89 +499,22 @@ class BIM_PT_text(Panel):
                     row.label(text=literal_data[attribute])
 
 
-class BIM_PT_annotation_utilities(Panel):
-    bl_idname = "BIM_PT_annotation_utilities"
-    bl_label = "Annotation"
-    bl_space_type = "VIEW_3D"
-    bl_region_type = "UI"
-    bl_category = "BIM Documentation"
-
-    def draw(self, context):
-        layout = self.layout
-
-        self.props = context.scene.DocProperties
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Dimension", icon="FIXED_SIZE")
-        op.object_type = "DIMENSION"
-        op.data_type = "curve"
-        op = row.operator("bim.add_annotation", text="Angle", icon="DRIVER_ROTATIONAL_DIFFERENCE")
-        op.object_type = "ANGLE"
-        op.data_type = "curve"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Radius", icon="FORWARD")
-        op.object_type = "RADIUS"
-        op.data_type = "curve"
-        op = row.operator("bim.add_annotation", text="Diameter", icon="ARROW_LEFTRIGHT")
-        op.object_type = "DIAMETER"
-        op.data_type = "curve"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Text", icon="SMALL_CAPS")
-        op.object_type = "TEXT"
-        op.data_type = "empty"
-        op = row.operator("bim.add_annotation", text="Leader", icon="TRACKING_BACKWARDS")
-        op.object_type = "TEXT_LEADER"
-        op.data_type = "curve"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Stair Arrow", icon="SCREEN_BACK")
-        op.object_type = "STAIR_ARROW"
-        op.data_type = "curve"
-        op = row.operator("bim.add_annotation", text="Hidden", icon="CON_TRACKTO")
-        op.object_type = "HIDDEN_LINE"
-        op.data_type = "mesh"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Level (Plan)", icon="SORTBYEXT")
-        op.object_type = "PLAN_LEVEL"
-        op.data_type = "curve"
-        op = row.operator("bim.add_annotation", text="Level (Section)", icon="TRIA_DOWN")
-        op.object_type = "SECTION_LEVEL"
-        op.data_type = "curve"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Breakline", icon="FCURVE")
-        op.object_type = "BREAKLINE"
-        op.data_type = "mesh"
-        op = row.operator("bim.add_annotation", text="Line", icon="MESH_MONKEY")
-        op.object_type = "LINEWORK"
-        op.data_type = "mesh"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Batting", icon="FORCE_FORCE")
-        op.object_type = "BATTING"
-        op.data_type = "mesh"
-        op = row.operator("bim.add_annotation", text="Fill Area", icon="NODE_TEXTURE")
-        op.object_type = "FILL_AREA"
-
-        row = layout.row(align=True)
-        op = row.operator("bim.add_annotation", text="Fall", icon="SORT_ASC")
-        op.object_type = "FALL"
-        op.data_type = "curve"
-
-        row = layout.row(align=True)
-        row.prop(self.props, "should_draw_decorations", text="Viewport Annotations")
-        row.enabled = context.scene.camera is not None
-
-
 class BIM_UL_drawinglist(bpy.types.UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-            icon = "UV_FACESEL"
-            if item.target_view == "ELEVATION_VIEW":
+        if not item:
+            layout.label(text="", translate=False)
+            return
+
+        row = layout.row(align=True)
+        if item.is_drawing:
+            row.label(text="", icon="BLANK1")
+            selected_icon = "CHECKBOX_HLT" if item.is_selected else "CHECKBOX_DEHLT"
+            row.prop(item, "is_selected", text="", icon=selected_icon, emboss=False)
+            row.prop(item, "name", text="", emboss=False)
+        else:
+            if item.target_view == "PLAN_VIEW":
+                icon = "UV_FACESEL"
+            elif item.target_view == "ELEVATION_VIEW":
                 icon = "UV_VERTEXSEL"
             elif item.target_view == "SECTION_VIEW":
                 icon = "UV_EDGESEL"
@@ -496,33 +522,80 @@ class BIM_UL_drawinglist(bpy.types.UIList):
                 icon = "XRAY"
             elif item.target_view == "MODEL_VIEW":
                 icon = "SNAP_VOLUME"
+            else:
+                icon = "CLIPUV_HLT"
+            if item.is_expanded:
+                row.operator(
+                    "bim.contract_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN"
+                ).target_view = item.target_view
+            else:
+                row.operator(
+                    "bim.expand_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
+                ).target_view = item.target_view
             row.prop(item, "name", text="", icon=icon, emboss=False)
-        else:
-            layout.label(text="", translate=False)
 
 
 class BIM_UL_sheets(bpy.types.UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
-        if item:
-            row = layout.row(align=True)
-
-            if item.is_sheet:
-                if item.is_expanded:
-                    row.operator(
-                        "bim.contract_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN"
-                    ).sheet = item.ifc_definition_id
-                else:
-                    row.operator(
-                        "bim.expand_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
-                    ).sheet = item.ifc_definition_id
-            else:
-                row.label(text="", icon="BLANK1")
-                if item.reference_type == "DRAWING":
-                    row.label(text="", icon="IMAGE_DATA")
-                elif item.reference_type == "SCHEDULE":
-                    row.label(text="", icon="LONGDISPLAY")
-
-            name = "{} - {}".format(item.identification or "X", item.name or "Unnamed")
-            row.label(text=name)
-        else:
+        if not item:
             layout.label(text="", translate=False)
+            return
+
+        row = layout.row(align=True)
+        if item.is_sheet:
+            if item.is_expanded:
+                row.operator(
+                    "bim.contract_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN"
+                ).sheet = item.ifc_definition_id
+            else:
+                row.operator(
+                    "bim.expand_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
+                ).sheet = item.ifc_definition_id
+
+            row.label(text=f"{item.identification} - {item.name}")
+        else:
+            row.label(text="", icon="BLANK1")
+            if item.reference_type == "DRAWING":
+                row.label(text="", icon="IMAGE_DATA")
+            elif item.reference_type == "SCHEDULE":
+                row.label(text="", icon="LONGDISPLAY")
+            elif item.reference_type == "TITLEBLOCK":
+                row.label(text="", icon="MENU_PANEL")
+            elif item.reference_type == "REVISION":
+                row.label(text="", icon="RECOVER_LAST")
+            elif item.reference_type == "REFERENCE":
+                row.label(text="", icon="IMAGE_REFERENCE")
+
+            if item.identification:
+                name = f"{item.identification} - {item.name or 'Unnamed'}"
+            else:
+                name = item.name or "Unnamed"
+            row.label(text=name)
+
+    def draw_filter(self, context, layout):
+        # We only need filtering, not reordering for sheets.
+        row = layout.row(align=True)
+        row.prop(self, "filter_name", text="")
+        row.prop(self, "use_filter_invert", text="", icon="ARROW_LEFTRIGHT")
+
+    def filter_items(self, context, data, propname):
+        flt_flags = []
+        flt_neworder = []
+
+        if self.filter_name:
+            filter_name = self.filter_name.lower()
+            active_sheet = None
+            for sheet in data.sheets:
+                if sheet.is_sheet:
+                    active_sheet = sheet
+                    active_sheet_index = len(flt_flags)
+                if filter_name in sheet.name.lower() or filter_name in sheet.identification.lower():
+                    flt_flags.append(self.bitflag_filter_item)
+                    if not sheet.is_sheet:
+                        flt_flags[active_sheet_index] = self.bitflag_filter_item
+                else:
+                    flt_flags.append(0)
+
+        if not flt_flags:
+            return flt_flags, flt_neworder
+        return flt_flags, flt_neworder

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

@@ -0,0 +1,320 @@
+# BlenderBIM Add-on - OpenBIM Blender Add-on
+# Copyright (C) 2023 @Andrej730
+#
+# 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 blenderbim.tool as tool
+from blenderbim.bim.helper import prop_with_search
+from bpy.types import WorkSpaceTool
+
+from blenderbim.bim.module.drawing.prop import ANNOTATION_TYPES_DATA
+from blenderbim.bim.module.drawing.data import DecoratorData, AnnotationData
+from blenderbim.bim.ifc import IfcStore
+import blenderbim.bim.handler
+
+
+# TODO: Fix circular import.
+# Declaring it here to avoid circular import problems
+class Operator:
+    def execute(self, context):
+        IfcStore.execute_ifc_operator(self, context)
+        blenderbim.bim.handler.refresh_ui_data()
+        return {"FINISHED"}
+
+
+class LaunchAnnotationTypeManager(bpy.types.Operator):
+    bl_idname = "bim.launch_annotation_type_manager"
+    bl_label = "Launch Annotation Type Manager"
+    bl_options = {"REGISTER"}
+    bl_description = "Manage annotation types and templates"
+
+    def execute(self, context):
+        return {"FINISHED"}
+
+    def invoke(self, context, event):
+        return context.window_manager.invoke_popup(self, width=550)
+
+    def draw(self, context):
+        if not AnnotationData.is_loaded:
+            AnnotationData.load()
+
+        props = context.scene.BIMAnnotationProperties
+
+        columns = self.layout.column_flow(columns=3)
+        row = columns.row()
+        row.alignment = "LEFT"
+        row.label(text=f"{len(AnnotationData.data['relating_types'])} Types", icon="FILE_VOLUME")
+
+        row = columns.row(align=True)
+        row.alignment = "CENTER"
+        # In case you want something here in the future
+
+        row = columns.row(align=True)
+        row.alignment = "RIGHT"
+        # In case you want something here in the future
+
+        if props.is_adding_type:
+            row = self.layout.row()
+            box = row.box()
+            row = box.row()
+            row.prop(props, "type_name")
+            row = box.row()
+            row.prop(props, "create_representation_for_type", text="Geometric Type")
+            row = box.row(align=True)
+            row.operator("bim.add_annotation_type", icon="CHECKMARK", text="Save New Type")
+            row.operator("bim.disable_add_annotation_type", icon="CANCEL", text="")
+        else:
+            row = self.layout.row()
+            row.operator("bim.enable_add_annotation_type", icon="ADD", text="Create New Type")
+
+        flow = self.layout.grid_flow(row_major=True, columns=3, even_columns=True, even_rows=True, align=True)
+
+        for relating_type in AnnotationData.data["relating_types"]:
+            outer_col = flow.column()
+            box = outer_col.box()
+
+            row = box.row()
+            row.alignment = "CENTER"
+            row.label(text=relating_type["name"], icon="FILE_3D")
+
+            row = box.row()
+            row.alignment = "CENTER"
+            row.label(text=relating_type["description"])
+
+            row = box.row(align=True)
+
+            op = row.operator("bim.select_type", icon="OBJECT_DATA")
+            op.relating_type = relating_type["id"]
+            op = row.operator("bim.duplicate_type", icon="DUPLICATE", text="")
+            op.element = relating_type["id"]
+            op = row.operator("bim.remove_type", icon="X", text="")
+            op.element = relating_type["id"]
+
+
+class AnnotationTool(WorkSpaceTool):
+    bl_space_type = "VIEW_3D"
+    bl_context_mode = "OBJECT"
+
+    bl_idname = "bim.annotation_tool"
+    bl_label = "Annotation Tool"
+    bl_description = "Gives you Annotation related superpowers"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.annotation")
+    bl_widget = None
+    bl_keymap = tool.Blender.get_default_selection_keypmap() + (
+        ("bim.annotation_hotkey", {"type": "A", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_A")]}),
+        ("bim.annotation_hotkey", {"type": "C", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_C")]}),
+        ("bim.annotation_hotkey", {"type": "E", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_E")]}),
+        ("bim.annotation_hotkey", {"type": "F", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_F")]}),
+        ("bim.annotation_hotkey", {"type": "G", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_G")]}),
+        ("bim.annotation_hotkey", {"type": "K", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_K")]}),
+        ("bim.annotation_hotkey", {"type": "M", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_M")]}),
+        ("bim.annotation_hotkey", {"type": "O", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_O")]}),
+        ("bim.annotation_hotkey", {"type": "Q", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_Q")]}),
+        ("bim.annotation_hotkey", {"type": "R", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_R")]}),
+        ("bim.annotation_hotkey", {"type": "T", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_T")]}),
+        ("bim.annotation_hotkey", {"type": "V", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_V")]}),
+        ("bim.annotation_hotkey", {"type": "X", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_X")]}),
+        ("bim.annotation_hotkey", {"type": "Y", "value": "PRESS", "shift": True}, {"properties": [("hotkey", "S_Y")]}),
+        ("bim.annotation_hotkey", {"type": "D", "value": "PRESS", "alt": True}, {"properties": [("hotkey", "A_D")]}),
+        ("bim.annotation_hotkey", {"type": "E", "value": "PRESS", "alt": True}, {"properties": [("hotkey", "A_E")]}),
+        ("bim.annotation_hotkey", {"type": "O", "value": "PRESS", "alt": True}, {"properties": [("hotkey", "A_O")]}),
+    )
+
+    def draw_settings(context, layout, ws_tool):
+        # Unlike operators, Blender doesn't treat workspace tools as a class, so we'll create our own.
+        AnnotationToolUI.draw(context, layout)
+
+
+def add_layout_hotkey_operator(layout, text, hotkey, description):
+    modifiers = {
+        "A": "EVENT_ALT",
+        "S": "EVENT_SHIFT",
+    }
+    modifier, key = hotkey.split("_")
+
+    row = layout.row(align=True)
+    row.label(text="", icon=modifiers[modifier])
+    row.label(text="", icon=f"EVENT_{key}")
+
+    op = row.operator("bim.annotation_hotkey", text=text)
+    op.hotkey = hotkey
+    op.description = description
+    return op, row
+
+
+# TODO: move to operator
+def create_annotation_occurence(context):
+    props = context.scene.BIMAnnotationProperties
+    relating_type = tool.Ifc.get().by_id(int(props.relating_type_id))
+    object_type = props.object_type
+
+    drawing = tool.Ifc.get_entity(context.scene.camera)
+    obj = tool.Drawing.create_annotation_object(drawing, object_type)
+    obj.name = relating_type.Name
+    ifc_context = tool.Drawing.get_annotation_context(tool.Drawing.get_drawing_target_view(drawing), object_type)
+    relating_type_repr = tool.Drawing.get_annotation_representation(relating_type)
+    element = tool.Drawing.run_root_assign_class(
+        obj=obj,
+        ifc_class="IfcAnnotation",
+        predefined_type=object_type,
+        should_add_representation=not bool(relating_type_repr),
+        context=ifc_context,
+        ifc_representation_class=tool.Drawing.get_ifc_representation_class(object_type),
+    )
+
+    blenderbim.core.type.assign_type(tool.Ifc, tool.Type, element=element, type=relating_type)
+
+    tool.Ifc.run("group.assign_group", group=tool.Drawing.get_drawing_group(drawing), products=[element])
+    tool.Collector.assign(obj)
+    tool.Blender.select_and_activate_single_object(context, obj)
+
+
+def create_annotation():
+    props = bpy.context.scene.BIMAnnotationProperties
+    create_type_occurence = props.relating_type_id != "0"
+    if create_type_occurence:
+        create_annotation_occurence(bpy.context)
+    else:
+        object_type = props.object_type
+        bpy.ops.bim.add_annotation(object_type=object_type, data_type=ANNOTATION_TYPES_DATA[object_type][-1])
+
+
+class AnnotationToolUI:
+    @classmethod
+    def draw(cls, context, layout):
+        cls.layout = layout
+        cls.props = context.scene.BIMAnnotationProperties
+
+        row = cls.layout.row(align=True)
+        if not tool.Ifc.get():
+            row.label(text="No IFC Project", icon="ERROR")
+            return
+
+        drawing = tool.Ifc.get_entity(context.scene.camera)
+        if not drawing:
+            row.label(text="No Active Drawing", icon="ERROR")
+            return
+
+        if not AnnotationData.is_loaded:
+            AnnotationData.load()
+
+        cls.draw_type_selection_interface()
+
+        if context.active_object and context.selected_objects:
+            cls.draw_edit_object_interface(context)
+        cls.draw_create_object_interface()
+
+    @classmethod
+    def draw_create_object_interface(cls):
+        row = cls.layout.row(align=True)
+        row.prop(bpy.context.scene.DocProperties, "should_draw_decorations", text="Viewport Annotations")
+
+    @classmethod
+    def draw_edit_object_interface(cls, context):
+        if DecoratorData.get_ifc_text_data(bpy.context.object):
+            add_layout_hotkey_operator(cls.layout, "Edit Text", "S_E", "")
+
+    @classmethod
+    def draw_type_selection_interface(cls):
+        # shared by both sidebar and header
+        object_type = cls.props.object_type
+
+        row = cls.layout.row(align=True)
+        row.label(text="", icon="FILE_VOLUME")
+        prop_with_search(row, cls.props, "object_type", text="")
+
+        row = cls.layout.row(align=True)
+        row.label(text="", icon="FILE_3D")
+        prop_with_search(row, cls.props, "relating_type_id", text="")
+        row.operator("bim.launch_annotation_type_manager", icon="LIGHTPROBE_GRID", text="")
+
+        add_layout_hotkey_operator(cls.layout, "Add", "S_A", "Create a new annotation")
+
+        if object_type in ("TEXT", "STAIR_ARROW"):
+            add_layout_hotkey_operator(
+                cls.layout,
+                "Bulk Tag",
+                "S_T",
+                "Create new annotations and automatically adjust them to the selected objects",
+            )
+        add_layout_hotkey_operator(
+            cls.layout, "Readjust", "S_G", "Readjust tags based on the products they are assigned to"
+        )
+
+
+class Hotkey(bpy.types.Operator, Operator):
+    bl_idname = "bim.annotation_hotkey"
+    bl_label = "Hotkey"
+    bl_options = {"REGISTER", "UNDO"}
+    hotkey: bpy.props.StringProperty()
+    description: bpy.props.StringProperty()
+
+    @classmethod
+    def poll(cls, context):
+        return tool.Ifc.get()
+
+    @classmethod
+    def description(cls, context, operator):
+        return operator.description or ""
+
+    def _execute(self, context):
+        self.props = context.scene.BIMAnnotationProperties
+        getattr(self, f"hotkey_{self.hotkey}")()
+
+    def invoke(self, context, event):
+        # https://blender.stackexchange.com/questions/276035/how-do-i-make-operators-remember-their-property-values-when-called-from-a-hotkey
+        self.props = context.scene.BIMAnnotationProperties
+        return self.execute(context)
+
+    def draw(self, context):
+        pass
+
+    def hotkey_S_T(self):
+        props = bpy.context.scene.BIMAnnotationProperties
+        object_type = props.object_type
+
+        related_objects = bpy.context.selected_objects
+        for related_object in related_objects:
+            create_annotation()
+            obj = bpy.context.active_object
+            bpy.ops.object.mode_set(mode="OBJECT")
+            tool.Drawing.setup_annotation_object(obj, object_type, related_object)
+
+    def hotkey_S_A(self):
+        create_annotation()
+
+    def hotkey_S_E(self):
+        if not bpy.context.object:
+            return
+
+        if DecoratorData.get_ifc_text_data(bpy.context.object):
+            bpy.ops.bim.edit_text_popup()
+
+    def hotkey_S_G(self):
+        for obj in bpy.context.selected_objects:
+            element = tool.Ifc.get_entity(obj)
+            if not element or not element.is_a("IfcAnnotation"):
+                continue
+
+            related_product = tool.Drawing.get_assigned_product(element)
+            if not related_product:
+                continue
+            related_object = tool.Ifc.get_object(related_product)
+
+            tool.Drawing.setup_annotation_object(obj, element.ObjectType, related_object)

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

@@ -27,6 +27,11 @@ classes = (
     operator.OverrideDelete,
     operator.OverrideDuplicateMove,
     operator.OverrideDuplicateMoveLinked,
+    operator.OverrideDuplicateMoveLinkedMacro,
+    operator.OverrideDuplicateMoveMacro,
+    operator.OverrideDuplicateMoveAggregate,
+    operator.OverrideDuplicateMoveAggregateMacro,
+    operator.RefreshAggregate,
     operator.OverrideJoin,
     operator.OverrideModeSetEdit,
     operator.OverrideModeSetObject,
@@ -52,35 +57,62 @@ addon_keymaps = []
 
 
 def register():
+    operator.OverrideDuplicateMoveMacro.define("BIM_OT_override_object_duplicate_move")
+    operator.OverrideDuplicateMoveMacro.define("TRANSFORM_OT_translate")
+    operator.OverrideDuplicateMoveLinkedMacro.define("BIM_OT_override_object_duplicate_move_linked")
+    operator.OverrideDuplicateMoveLinkedMacro.define("TRANSFORM_OT_translate")
+    operator.OverrideDuplicateMoveAggregateMacro.define("BIM_OT_override_object_duplicate_move_aggregate")
+    operator.OverrideDuplicateMoveAggregateMacro.define("TRANSFORM_OT_translate")
+
     bpy.types.Object.BIMGeometryProperties = bpy.props.PointerProperty(type=prop.BIMObjectGeometryProperties)
     bpy.types.Scene.BIMGeometryProperties = bpy.props.PointerProperty(type=prop.BIMGeometryProperties)
     bpy.types.OBJECT_PT_transform.append(ui.BIM_PT_transform)
     bpy.types.VIEW3D_MT_object.append(ui.object_menu)
+    bpy.types.OUTLINER_MT_object.append(ui.outliner_menu)
+    bpy.types.VIEW3D_MT_object_context_menu.append(ui.object_menu)
     wm = bpy.context.window_manager
     if wm.keyconfigs.addon:
         km = wm.keyconfigs.addon.keymaps.new(name="Object Mode", space_type="EMPTY")
         kmi = km.keymap_items.new("bim.override_object_join", "J", "PRESS", ctrl=True)
-        kmi = km.keymap_items.new("bim.override_object_duplicate_move", "D", "PRESS", shift=True)
-        kmi.properties.is_interactive = True
-        kmi = km.keymap_items.new("bim.override_object_duplicate_move_linked", "D", "PRESS", alt=True)
+        addon_keymaps.append((km, kmi))
+        kmi = km.keymap_items.new("bim.override_object_duplicate_move_macro", "D", "PRESS", shift=True)
+        addon_keymaps.append((km, kmi))
+        kmi = km.keymap_items.new("bim.override_object_duplicate_move_linked_macro", "D", "PRESS", alt=True)
+        addon_keymaps.append((km, kmi))
+        kmi = km.keymap_items.new("bim.override_object_duplicate_move_aggregate_macro", "D", "PRESS", ctrl=True, shift=True)
+        addon_keymaps.append((km, kmi))
         kmi = km.keymap_items.new("bim.override_paste_buffer", "V", "PRESS", ctrl=True)
+        addon_keymaps.append((km, kmi))
         kmi = km.keymap_items.new("bim.override_mode_set_edit", "TAB", "PRESS")
+        addon_keymaps.append((km, kmi))
         kmi = km.keymap_items.new("bim.override_object_delete", "X", "PRESS")
+        addon_keymaps.append((km, kmi))
         kmi = km.keymap_items.new("bim.override_object_delete", "DEL", "PRESS")
         kmi.properties.confirm = False
+        addon_keymaps.append((km, kmi))
 
         km = wm.keyconfigs.addon.keymaps.new(name="Mesh", space_type="EMPTY")
         kmi = km.keymap_items.new("bim.override_mode_set_object", "TAB", "PRESS")
+        addon_keymaps.append((km, kmi))
+
+        km = wm.keyconfigs.addon.keymaps.new(name="Curve", space_type="EMPTY")
+        kmi = km.keymap_items.new("bim.override_mode_set_object", "TAB", "PRESS")
+        addon_keymaps.append((km, kmi))
 
         km = wm.keyconfigs.addon.keymaps.new(name="Outliner", space_type="OUTLINER")
         kmi = km.keymap_items.new("bim.override_paste_buffer", "V", "PRESS", ctrl=True)
+        addon_keymaps.append((km, kmi))
         kmi = km.keymap_items.new("bim.override_outliner_delete", "X", "PRESS")
+        addon_keymaps.append((km, kmi))
         kmi = km.keymap_items.new("bim.override_outliner_delete", "DEL", "PRESS")
+        addon_keymaps.append((km, kmi))
 
 
 def unregister():
     bpy.types.VIEW3D_MT_object.remove(ui.object_menu)
     bpy.types.OBJECT_PT_transform.remove(ui.BIM_PT_transform)
+    bpy.types.OUTLINER_MT_object.remove(ui.outliner_menu)
+    bpy.types.VIEW3D_MT_object_context_menu.remove(ui.outliner_menu)
     del bpy.types.Scene.BIMGeometryProperties
     del bpy.types.Object.BIMGeometryProperties
     wm = bpy.context.window_manager

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

@@ -104,24 +104,50 @@ class ConnectionsData:
     def connections(cls):
         results = []
         element = tool.Ifc.get_entity(bpy.context.active_object)
-        for rel in getattr(element, "ConnectedTo", []):
+
+        connected_to = getattr(element, "ConnectedTo", [])
+        connected_from = getattr(element, "ConnectedFrom", [])
+
+        for rel in connected_to:
+            if element.is_a("IfcDistributionPort"):
+                related_element = rel.RelatedPort
+            else:
+                related_element = rel.RelatedElement
+
+            if element.is_a("IfcRelConnectsPathElements"):
+                related_element_connection_type = rel.RelatedConnectionType
+            else:
+                related_element_connection_type = ""
+
             results.append(
                 {
                     "id": rel.id(),
                     "is_relating": True,
-                    "Name": rel.RelatedElement.Name or "Unnamed",
-                    "ConnectionType": rel.RelatingConnectionType,
+                    "Name": related_element.Name or "Unnamed",
+                    "ConnectionType": related_element_connection_type,
                 }
             )
-        for rel in getattr(element, "ConnectedFrom", []):
+
+        for rel in connected_from:
+            if element.is_a("IfcDistributionPort"):
+                relating_element = rel.RelatingPort
+            else:
+                relating_element = rel.RelatingElement
+
+            if element.is_a("IfcRelConnectsPathElements"):
+                relating_element_connection_type = rel.RelatingConnectionType
+            else:
+                relating_element_connection_type = ""
+
             results.append(
                 {
                     "id": rel.id(),
                     "is_relating": False,
-                    "Name": rel.RelatingElement.Name or "Unnamed",
-                    "ConnectionType": rel.RelatedConnectionType,
+                    "Name": relating_element.Name or "Unnamed",
+                    "ConnectionType": relating_element_connection_type,
                 }
             )
+
         return results
 
 
@@ -152,10 +178,18 @@ class DerivedPlacementsData:
 
     @classmethod
     def load_collection(cls):
-        cls.collection = bpy.data.objects.get(bpy.context.active_object.users_collection[0].name)
+        cls.collection = None
         cls.collection_z = 0
-        if cls.collection:
-            cls.collection_z = cls.collection.matrix_world.translation.z
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if not element:
+            return
+        parent = ifcopenshell.util.element.get_aggregate(element)
+        if not parent:
+            parent = ifcopenshell.util.element.get_container(element)
+        if parent:
+            cls.collection = tool.Ifc.get_object(parent)
+            if cls.collection:
+                cls.collection_z = cls.collection.matrix_world.translation.z
 
     @classmethod
     def has_collection(cls):

src/blenderbim/blenderbim/bim/module/geometry/helper.py

@@ -38,7 +38,7 @@ class Helper:
         bm = bmesh.new()
         bm.from_mesh(mesh)
         bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
-        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
 
         bm.faces.ensure_lookup_table()
         face = None
@@ -62,7 +62,7 @@ class Helper:
         bm = bmesh.new()
         bm.from_mesh(mesh)
         bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
-        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
 
         bm.faces.ensure_lookup_table()
         potential_faces = []
@@ -90,7 +90,7 @@ class Helper:
         bm = bmesh.new()
         bm.from_mesh(mesh)
         bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
-        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
 
         bm.faces.ensure_lookup_table()
         potential_faces = []
@@ -292,7 +292,7 @@ class Helper:
         bm = bmesh.new()
         bm.from_mesh(mesh)
         bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
-        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
 
         bm.faces.ensure_lookup_table()
         potential_faces = []
@@ -389,7 +389,7 @@ class Helper:
         bm = bmesh.new()
         bm.from_mesh(mesh)
         bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 1, verts=bm.verts, edges=bm.edges)
-        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.001)
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
 
         bm.faces.ensure_lookup_table()
         faces = bm.faces

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

@@ -24,10 +24,14 @@ from blenderbim.bim.module.geometry.data import RepresentationsData, Connections
 
 
 def object_menu(self, context):
+    self.layout.separator()
     self.layout.operator("bim.override_object_duplicate_move", icon="PLUGIN")
     self.layout.operator("bim.override_object_delete", icon="PLUGIN")
     self.layout.operator("bim.override_paste_buffer", icon="PLUGIN")
 
+def outliner_menu(self, context):
+    self.layout.separator()
+    self.layout.operator("bim.override_outliner_delete", icon='X')
 
 class BIM_PT_representations(Panel):
     bl_label = "IFC Representations"

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

@@ -33,6 +33,7 @@ classes = (
     operator.ConvertGlobalToLocal,
     operator.GetCursorLocation,
     operator.SetCursorLocation,
+    operator.ConvertAngleToCoordinates,
     prop.BIMGeoreferenceProperties,
     ui.BIM_PT_gis,
     ui.BIM_PT_gis_utilities,

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

@@ -171,3 +171,19 @@ class ConvertGlobalToLocal(bpy.types.Operator, tool.Ifc.Operator):
 
     def _execute(self, context):
         core.convert_global_to_local(tool.Georeference)
+
+class ConvertAngleToCoordinates(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.convert_angle_to_coord"
+    bl_label = "Convert Angle To Y Axis"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Convert angle to Y axis"
+    type: bpy.props.StringProperty()
+
+    @classmethod
+    def poll(cls, context):
+        file = tool.Ifc.get()
+        props = context.scene.BIMGeoreferenceProperties
+        return file and (props.angle_degree_input_x or props.angle_degree_input_y)
+
+    def _execute(self, context):
+        core.convert_angle_to_coord(tool.Georeference, type=self.type)

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

@@ -37,6 +37,12 @@ class BIMGeoreferenceProperties(PropertyGroup):
     projected_crs: CollectionProperty(name="Projected CRS", type=Attribute)
     coordinate_input: StringProperty(name="Coordinate Input", description='Formatted "x,y,z" (without quotes)')
     coordinate_output: StringProperty(name="Coordinate Output", description='Formatted "x,y,z" (without quotes)')
+    angle_degree_input_x: FloatProperty(name="Angle Degree Input", description="Angle (in degrees) rel to Easting")
+    angle_degree_input_y: FloatProperty(name="Angle Degree Input", description="Angle (in degrees) rel to +Y")
+    x_axis_abscissa_output: StringProperty(name="X Axis Abscissa Ordinate Output", description="X axis abscissa and ordinate", )
+    x_axis_ordinate_output: StringProperty(name="X Axis Abscissa Ordinate Output", description="X axis abscissa and ordinate", )
+    y_axis_abscissa_output: StringProperty(name="Y Axis Abscissa Ordinate Output", description="Y axis abscissa and ordinate", )
+    y_axis_ordinate_output: StringProperty(name="Y Axis Abscissa Ordinate Output", description="Y axis abscissa and ordinate", )
     has_blender_offset: BoolProperty(name="Has Blender Offset")
     blender_eastings: StringProperty(name="Blender Eastings", default="0")
     blender_northings: StringProperty(name="Blender Northings", default="0")

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

@@ -167,3 +167,21 @@ class BIM_PT_gis_utilities(Panel):
         row = self.layout.row(align=True)
         row.operator("bim.convert_local_to_global", text="Local to Global")
         row.operator("bim.convert_global_to_local", text="Global to Local")
+
+        row = self.layout.row(align=True)
+        row.label(text="Orientation Calculator", icon="TRACKING_REFINE_FORWARDS")
+        row = self.layout.row(align=True)
+        row.prop(props, "angle_degree_input_x", text="Angle (°) rel to Easting")
+        row.operator("bim.convert_angle_to_coord", text="", icon="FILE_REFRESH").type = "rel_x"
+        row = self.layout.row(align=True)
+        row.prop(props, "x_axis_abscissa_output", text="XAxis Abscissa")
+        row = self.layout.row(align=True)
+        row.prop(props, "x_axis_ordinate_output", text="XAxis Ordinate")
+
+        row = self.layout.row(align=True)
+        row.prop(props, "angle_degree_input_y", text="Angle (°) rel to to +Y")
+        row.operator("bim.convert_angle_to_coord", text="", icon="FILE_REFRESH").type = "rel_y"
+        row = self.layout.row(align=True)
+        row.prop(props, "y_axis_abscissa_output", text="North Abscissa")
+        row = self.layout.row(align=True)
+        row.prop(props, "y_axis_ordinate_output", text="North Ordinate")

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

@@ -49,7 +49,7 @@ class BIM_OT_cityjson2ifc(Operator):
 
 class BIM_OT_find_cityjson_lod(Operator):
     bl_idname = "bim.find_cityjson_lod"
-    bl_label = "Find LODs in CityJSON file"
+    bl_label = "Find LODs in CityJSON File"
     bl_context = "scene"
 
     def execute(self, context):