Fixed #3335 caused by 36b746d

Just scrolling Git panel shouldn't do any Git IO

.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,12 @@ 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

README.md

@@ -1,9 +1,12 @@
 
 IfcOpenShell 
 ============
+<p align="center">
+  <img src="https://github.com/IfcOpenShell/IfcOpenShell/assets/79010126/9e540403-c79f-446a-88c6-7c1ebc6ba864">
+</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/README.md

@@ -0,0 +1,48 @@
+Dockerized AWS Lambda Function with Python and IfcOpenShell
+===========================================================
+
+This guide provides a Dockerfile and sample code to help you run an AWS Lambda function written in Python and utilizing IfcOpenShell library. 
+
+Prerequisites
+-------------
+
+Make sure you have Docker installed on your machine. You can download Docker from the official website: [Docker Instalation](https://docs.docker.com/engine/install/)
+
+Getting Started
+---------------
+
+1. **Clone this repository to your local machine:**
+
+2. **Customize the Lambda function code:**
+   
+   - Replace the sample Lambda function code in the `example_handler` directory with your own code.
+   - Update the import path in the Dockerfile's `CMD` instruction to match your Lambda function's handler function.
+
+3. **Install the required Python packages:**
+   - Edit the `requirements.txt` file and add any additional dependencies required by your Lambda function.
+
+4. **Build the Docker image:**
+
+   ```shell
+   $ docker build -t lambda-ifcopenshell .
+   ```
+
+5. **Run the Docker container:**
+
+    ```shell
+   $ docker run lambda-ifcopenshell
+    ```
+6. **Test lambda locally**
+    
+    Follow the steps in this [guide](https://docs.aws.amazon.com/lambda/latest/dg/images-test.html)
+
+
+7. **Deploy to lambda**
+ 
+    This is beyond the scope of this example. Please refer to AWS documentation. Some tools that could be useful are - AWS CloudFormaton, AWS CDK, pulumi or terraform
+
+
+---------
+> Note: This is a superficial guide, in order to make this work for your usecase you will need a good understanding of other AWS services like SQS, S3, API Gateway etc.
+
+For more information on building lambda containers refer to this [guide](https://docs.aws.amazon.com/lambda/latest/dg/images-create.html).

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/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
-    - {{ pin_compatible('occt', max_pin='x.x.x') }}
+    - 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/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

@@ -190,7 +190,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-8f41ae0-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcopenshell-python*
 	cp -r dist/working/ifcopenshell dist/blenderbim/libs/site/packages/
 
@@ -236,6 +236,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,7 +408,8 @@ 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
 
@@ -613,37 +619,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,6 +639,13 @@ 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 && 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

@@ -71,6 +71,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,
@@ -94,6 +95,8 @@ classes = [
     operator.SelectIfcFile,
     operator.ReloadSelectedIfcFile,
     operator.SelectSchemaDir,
+    operator.FileAssociate,
+    operator.FileUnassociate,
     operator.SelectURIAttribute,
     operator.EditBlenderCollection,
     operator.BIM_OT_open_webbrowser,
@@ -108,6 +111,7 @@ classes = [
     prop.PsetQto,
     prop.GlobalId,
     prop.BIMObjectProperties,
+    prop.BIMCollectionProperties,
     prop.BIMMaterialProperties,
     prop.BIMMeshProperties,
     ui.BIM_PT_section_plane,
@@ -155,6 +159,7 @@ def register():
     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.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)
@@ -172,25 +177,16 @@ def register():
 
 def unregister():
     for cls in reversed(classes):
-        if ( #these panels haven't the cls.is_registered attribute
-            cls == blenderbim.bim.module.drawing.gizmos.ExtrusionWidget or
-            cls == blenderbim.bim.module.drawing.gizmos.ExtrusionGuidesGizmo or
-            cls == blenderbim.bim.module.drawing.gizmos.DimensionLabelGizmo or
-            cls == blenderbim.bim.module.drawing.gizmos.DotGizmo or
-            cls == blenderbim.bim.module.drawing.gizmos.UglyDotGizmo
-        ):
-            if bpy.data.scenes['Scene'].BIMProperties.module_visibility['drawing'].is_visible is True:
-                bpy.utils.unregister_class(cls)
-                continue
-            else:
-                continue
-        if cls.is_registered is not False:
+        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.setDefaultProperties)
     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

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/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": "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": 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": "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.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

@@ -3,11 +3,29 @@
     <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 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>
+        <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" />

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/libraries/IFC4 AU Library.ifc

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('/dev/null','2023-04-03T19:29:45+05:00',(),(),'IfcOpenShell v0.7.0-476ab506d','IfcOpenShell v0.7.0-476ab506d','Nobody');
+FILE_NAME('/dev/null','2023-04-21T17:25:39+05:00',(),(),'IfcOpenShell v0.7.0-198fa67cc','IfcOpenShell v0.7.0-198fa67cc','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
@@ -45,7 +45,7 @@ DATA;
 #38=IFCDIRECTION((0.,0.,1.));
 #39=IFCAXIS2PLACEMENT3D(#36,#38,#37);
 #40=IFCREPRESENTATIONMAP(#39,#29);
-#41=IFCRELDECLARES('0Dz4P9itjCTflpwPRPDUNo',$,$,$,#2,(#9354,#10932,#8663,#2058,#8742,#11460,#9235,#11964,#11196,#11724,#10956,#4758,#10628,#4362,#10256,#10016,#10392,#11052,#11028,#9516,#10328,#11556,#11796,#10088,#9465,#12060,#474,#450,#9980,#289,#10352,#10724,#9071,#11652,#8538,#10884,#1638,#11388,#12132,#4026,#161,#9942,#11148,#11892,#10052,#11916,#10490,#10208,#10184,#8916,#1338,#57,#11988,#9618,#11220,#6666,#9391,#10980,#10280,#10652,#11748,#9567,#255,#7542,#11484,#12228,#12252,#30,#9831,#11292,#11076,#11820,#10136,#10112,#8800,#12324,#10812,#11340,#11316,#498,#12084,#11844,#10748,#12180,#11412,#12156,#11940,#10778,#11172,#10232,#11676,#12204,#187,#3378,#3750,#8887,#11268,#11244,#12012,#10304,#9153,#10676,#83,#12276,#11508,#10700,#558,#362,#11604,#10836,#11580,#10530,#5910,#11364,#12108,#12348,#8998,#8771,#1158,#9317,#10908,#11436,#10441,#11700,#858,#3534,#9428,#10579,#213,#11772,#11004,#12300,#11532,#8858,#8829,#12036,#426,#109,#135,#11100,#2598,#10860,#9720,#11628,#9669,#8595,#11124,#5274,#11868,#10160));
+#41=IFCRELDECLARES('0qe7r9ppfDoPMyT5rZMAre',$,$,$,#2,(#10778,#10232,#11676,#12204,#3378,#3750,#8887,#3534,#9428,#10579,#11268,#213,#11772,#11004,#12300,#11532,#12276,#426,#109,#558,#135,#11604,#10836,#10530,#11364,#5910,#8595,#8771,#5274,#11868,#1158,#10160,#10932,#8663,#2058,#11460,#9235,#10441,#11196,#10956,#4362,#858,#10628,#11700,#10392,#11796,#11028,#9516,#10328,#11556,#8858,#10088,#9465,#8829,#12060,#12036,#450,#10352,#10724,#9071,#11100,#2598,#10860,#9720,#10884,#11628,#9669,#12132,#161,#11892,#11124,#10052,#10490,#10184,#8916,#9354,#8742,#57,#9618,#11220,#11964,#6666,#10980,#4758,#10652,#10256,#11724,#9567,#11748,#10016,#10908,#7542,#12228,#30,#9831,#11292,#11820,#11052,#10112,#12324,#12084,#11316,#474,#11844,#11436,#10748,#9980,#289,#11652,#8538,#1638,#12156,#11388,#4026,#9942,#11148,#11172,#11916,#10208,#1338,#187,#12012,#11244,#11988,#9391,#10304,#9153,#10676,#10280,#255,#83,#11508,#11484,#12252,#10700,#11076,#362,#10136,#8800,#12348,#11580,#10812,#12108,#11340,#498,#8998,#9317,#12180,#11412,#11940));
 #42=IFCCARTESIANPOINTLIST2D(((0.,0.),(920.,0.),(920.,1880.),(0.,1880.)));
 #43=IFCINDEXEDPOLYCURVE(#42,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #44=IFCCARTESIANPOINTLIST2D(((0.,1598.),(184.,1598.),(184.,1880.),(184.,1598.),(644.,1598.),(736.,1559.89235226168),(736.,1880.),(736.,1559.89235226168),(920.,1483.67705678503)));
@@ -8769,13 +8769,13 @@ DATA;
 #8762=IFCCARTESIANPOINTLIST2D(((0.,0.),(900.,0.),(900.,750.),(0.,750.)));
 #8763=IFCINDEXEDPOLYCURVE(#8762,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8764=IFCCARTESIANPOINTLIST2D(((100.,50.),(64.6446609406726,64.6446609406726),(50.,100.),(50.,650.),(64.6446609406726,685.355339059327),(100.,700.),(800.,700.),(835.355339059327,685.355339059327),(850.,650.),(850.,100.),(835.355339059327,64.6446609406726),(800.,50.)));
-#8765=IFCINDEXEDPOLYCURVE(#8764,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8765=IFCINDEXEDPOLYCURVE(#8764,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8766=IFCCARTESIANPOINT((775.,625.));
 #8767=IFCAXIS2PLACEMENT2D(#8766,$);
 #8768=IFCCIRCLE(#8767,25.);
 #8769=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8763,#8765,#8768));
 #8770=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8761));
-#8771=IFCFURNITURETYPE('2chEfLNDjDBfuAcIHy$U7g',$,'Neufert Shower 75x90',$,$,$,(#8776,#8781),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8771=IFCSANITARYTERMINALTYPE('3U0$ARtYzFbP_oNE6zPHi2',$,'Neufert Shower 75x90',$,$,$,(#8776,#8781),$,$,.NOTDEFINED.);
 #8772=IFCCARTESIANPOINT((0.,0.,0.));
 #8773=IFCDIRECTION((1.,0.,0.));
 #8774=IFCDIRECTION((0.,0.,1.));
@@ -8798,13 +8798,13 @@ DATA;
 #8791=IFCCARTESIANPOINTLIST2D(((0.,0.),(800.,0.),(800.,800.),(0.,800.)));
 #8792=IFCINDEXEDPOLYCURVE(#8791,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8793=IFCCARTESIANPOINTLIST2D(((100.,50.),(64.6446609406726,64.6446609406726),(50.,100.),(50.,700.),(64.6446609406726,735.355339059327),(100.,750.),(700.,750.),(735.355339059327,735.355339059327),(750.,700.),(750.,100.),(735.355339059327,64.6446609406726),(700.,50.)));
-#8794=IFCINDEXEDPOLYCURVE(#8793,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8794=IFCINDEXEDPOLYCURVE(#8793,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8795=IFCCARTESIANPOINT((675.,675.));
 #8796=IFCAXIS2PLACEMENT2D(#8795,$);
 #8797=IFCCIRCLE(#8796,25.);
 #8798=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8792,#8794,#8797));
 #8799=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8790));
-#8800=IFCFURNITURETYPE('3tvqhdgN12U8zgpbiq9dyZ',$,'Neufert Shower 80x80',$,$,$,(#8805,#8810),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8800=IFCSANITARYTERMINALTYPE('2vHm$vQOD1xgAACHvuyeyR',$,'Neufert Shower 80x80',$,$,$,(#8805,#8810),$,$,.NOTDEFINED.);
 #8801=IFCCARTESIANPOINT((0.,0.,0.));
 #8802=IFCDIRECTION((1.,0.,0.));
 #8803=IFCDIRECTION((0.,0.,1.));
@@ -8827,13 +8827,13 @@ DATA;
 #8820=IFCCARTESIANPOINTLIST2D(((0.,0.),(900.,0.),(900.,900.),(0.,900.)));
 #8821=IFCINDEXEDPOLYCURVE(#8820,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8822=IFCCARTESIANPOINTLIST2D(((100.,50.),(64.6446609406726,64.6446609406726),(50.,100.),(50.,800.),(64.6446609406726,835.355339059327),(100.,850.),(800.,850.),(835.355339059327,835.355339059327),(850.,800.),(850.,100.),(835.355339059327,64.6446609406726),(800.,50.)));
-#8823=IFCINDEXEDPOLYCURVE(#8822,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8823=IFCINDEXEDPOLYCURVE(#8822,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8824=IFCCARTESIANPOINT((775.,775.));
 #8825=IFCAXIS2PLACEMENT2D(#8824,$);
 #8826=IFCCIRCLE(#8825,25.);
 #8827=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8821,#8823,#8826));
 #8828=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8819));
-#8829=IFCFURNITURETYPE('1UyR8fZnv4SfxUZScwrbKJ',$,'Neufert Shower 90x90',$,$,$,(#8834,#8839),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8829=IFCSANITARYTERMINALTYPE('3HQEnvhRj1wQamEFWrV4kf',$,'Neufert Shower 90x90',$,$,$,(#8834,#8839),$,$,.NOTDEFINED.);
 #8830=IFCCARTESIANPOINT((0.,0.,0.));
 #8831=IFCDIRECTION((1.,0.,0.));
 #8832=IFCDIRECTION((0.,0.,1.));
@@ -8856,13 +8856,13 @@ DATA;
 #8849=IFCCARTESIANPOINTLIST2D(((0.,0.),(1600.,0.),(1600.,700.),(0.,700.)));
 #8850=IFCINDEXEDPOLYCURVE(#8849,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8851=IFCCARTESIANPOINTLIST2D(((300.,50.),(123.223304703363,123.223304703363),(50.,300.),(50.,400.),(123.223304703363,576.776695296637),(300.,650.),(1500.,650.),(1535.35533905933,635.355339059327),(1550.,600.),(1550.,100.),(1535.35533905933,64.6446609406726),(1500.,50.)));
-#8852=IFCINDEXEDPOLYCURVE(#8851,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8852=IFCINDEXEDPOLYCURVE(#8851,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8853=IFCCARTESIANPOINT((1475.,350.));
 #8854=IFCAXIS2PLACEMENT2D(#8853,$);
 #8855=IFCCIRCLE(#8854,25.);
 #8856=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8850,#8852,#8855));
 #8857=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8848));
-#8858=IFCFURNITURETYPE('0__rwF$0D6kRx13TBzmHBn',$,'Neufert Small Bathtub',$,$,$,(#8863,#8868),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8858=IFCSANITARYTERMINALTYPE('2MMyq_g4n8u85FkAhm47jZ',$,'Neufert Small Bathtub',$,$,$,(#8863,#8868),$,$,.NOTDEFINED.);
 #8859=IFCCARTESIANPOINT((0.,0.,0.));
 #8860=IFCDIRECTION((1.,0.,0.));
 #8861=IFCDIRECTION((0.,0.,1.));
@@ -8885,13 +8885,13 @@ DATA;
 #8878=IFCCARTESIANPOINTLIST2D(((0.,0.),(1700.,0.),(1700.,750.),(0.,750.)));
 #8879=IFCINDEXEDPOLYCURVE(#8878,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8880=IFCCARTESIANPOINTLIST2D(((300.,50.),(123.223304703363,123.223304703363),(50.,300.),(50.,450.),(123.223304703363,626.776695296637),(300.,700.),(1600.,700.),(1635.35533905933,685.355339059327),(1650.,650.),(1650.,100.),(1635.35533905933,64.6446609406726),(1600.,50.)));
-#8881=IFCINDEXEDPOLYCURVE(#8880,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8881=IFCINDEXEDPOLYCURVE(#8880,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8882=IFCCARTESIANPOINT((1575.,375.));
 #8883=IFCAXIS2PLACEMENT2D(#8882,$);
 #8884=IFCCIRCLE(#8883,25.);
 #8885=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8879,#8881,#8884));
 #8886=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8877));
-#8887=IFCFURNITURETYPE('1X7mg3PuL9rfGp$vmES4UV',$,'Neufert Medium Bathtub',$,$,$,(#8892,#8897),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8887=IFCSANITARYTERMINALTYPE('0NUlR8z5TFHed$dKBY5GZH',$,'Neufert Medium Bathtub',$,$,$,(#8892,#8897),$,$,.NOTDEFINED.);
 #8888=IFCCARTESIANPOINT((0.,0.,0.));
 #8889=IFCDIRECTION((1.,0.,0.));
 #8890=IFCDIRECTION((0.,0.,1.));
@@ -8914,13 +8914,13 @@ DATA;
 #8907=IFCCARTESIANPOINTLIST2D(((0.,0.),(1800.,0.),(1800.,800.),(0.,800.)));
 #8908=IFCINDEXEDPOLYCURVE(#8907,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8909=IFCCARTESIANPOINTLIST2D(((300.,50.),(123.223304703363,123.223304703363),(50.,300.),(50.,500.),(123.223304703363,676.776695296637),(300.,750.),(1700.,750.),(1735.35533905933,735.355339059327),(1750.,700.),(1750.,100.),(1735.35533905933,64.6446609406726),(1700.,50.)));
-#8910=IFCINDEXEDPOLYCURVE(#8909,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8910=IFCINDEXEDPOLYCURVE(#8909,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8911=IFCCARTESIANPOINT((1675.,400.));
 #8912=IFCAXIS2PLACEMENT2D(#8911,$);
 #8913=IFCCIRCLE(#8912,25.);
 #8914=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8908,#8910,#8913));
 #8915=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8906));
-#8916=IFCFURNITURETYPE('1n7otEOHX7jBOfKKASIJps',$,'Neufert Large Bathtub',$,$,$,(#8921,#8926),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8916=IFCSANITARYTERMINALTYPE('2By7l0FbPCTvFIMnmpR6Fr',$,'Neufert Large Bathtub',$,$,$,(#8921,#8926),$,$,.NOTDEFINED.);
 #8917=IFCCARTESIANPOINT((0.,0.,0.));
 #8918=IFCDIRECTION((1.,0.,0.));
 #8919=IFCDIRECTION((0.,0.,1.));
@@ -8932,8 +8932,8 @@ DATA;
 #8925=IFCAXIS2PLACEMENT3D(#8922,#8924,#8923);
 #8926=IFCREPRESENTATIONMAP(#8925,#8914);
 #8927=IFCCARTESIANPOINTLIST2D(((275.,0.),(80.5456351736994,80.5456351736994),(0.,275.),(32.2182540694798,352.78174593052),(110.,385.),(55.,385.),(55.,450.),(495.,450.),(495.,385.),(440.,385.),(517.78174593052,352.78174593052),(550.,275.),(469.454364826301,80.5456351736994),(275.,0.)));
-#8928=IFCINDEXEDPOLYCURVE(#8927,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((1,14))),$);
-#8929=IFCINDEXEDPOLYCURVE(#8930,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((1,14))),$);
+#8928=IFCINDEXEDPOLYCURVE(#8927,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((14,1))),$);
+#8929=IFCINDEXEDPOLYCURVE(#8930,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((14,1))),$);
 #8930=IFCCARTESIANPOINTLIST2D(((275.,0.),(80.5456351736994,80.5456351736994),(0.,275.),(32.2182540694798,352.78174593052),(110.,385.),(55.,385.),(55.,450.),(495.,450.),(495.,385.),(440.,385.),(517.78174593052,352.78174593052),(550.,275.),(469.454364826301,80.5456351736994),(275.,0.)));
 #8931=IFCCARTESIANPOINTLIST2D(((-275.,0.),(275.,0.),(275.,-200.),(-275.,-200.)));
 #8932=IFCINDEXEDPOLYCURVE(#8931,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
@@ -8964,8 +8964,8 @@ DATA;
 #8957=IFCCARTESIANPOINT((34.375,-452.));
 #8958=IFCTRIMMEDCURVE(#8955,(#8956),(#8957),.T.,.CARTESIAN.);
 #8959=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8932,#8936,#8943,#8944,#8949,#8951,#8958));
-#8960=IFCCARTESIANPOINTLIST2D(((-275.,-200.),(50.,-200.),(209.099029541016,-265.900970458984),(275.,-425.),(209.099029541016,-584.098999023438),(50.,-650.),(-275.,-650.)));
-#8961=IFCINDEXEDPOLYCURVE(#8960,(IFCLINEINDEX((1,2)),IFCARCINDEX((2,3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((1,7))),$);
+#8960=IFCCARTESIANPOINTLIST2D(((-275.,-200.),(275.,-200.),(275.,-425.),(209.099029541016,-584.098999023438),(50.,-650.),(-50.,-650.),(-209.099029541016,-584.098999023438),(-275.,-425.)));
+#8961=IFCINDEXEDPOLYCURVE(#8960,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCARCINDEX((6,7,8)),IFCLINEINDEX((8,1))),$);
 #8962=IFCCARTESIANPOINT((0.,-425.));
 #8963=IFCAXIS2PLACEMENT2D(#8962,$);
 #8964=IFCCIRCLE(#8963,168.75);
@@ -8976,8 +8976,8 @@ DATA;
 #8969=IFCAXIS2PLACEMENT3D(#8966,#8967,#8968);
 #8970=IFCDIRECTION((0.,0.,1.));
 #8971=IFCEXTRUDEDAREASOLID(#8965,#8969,#8970,150.);
-#8972=IFCINDEXEDPOLYCURVE(#8973,(IFCLINEINDEX((1,2)),IFCARCINDEX((2,3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((1,7))),$);
-#8973=IFCCARTESIANPOINTLIST2D(((-275.,-200.),(50.,-200.),(209.099029541016,-265.900970458984),(275.,-425.),(209.099029541016,-584.098999023438),(50.,-650.),(-275.,-650.)));
+#8972=IFCINDEXEDPOLYCURVE(#8973,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCARCINDEX((6,7,8)),IFCLINEINDEX((8,1))),$);
+#8973=IFCCARTESIANPOINTLIST2D(((-275.,-200.),(275.,-200.),(275.,-425.),(209.099029541016,-584.098999023438),(50.,-650.),(-50.,-650.),(-209.099029541016,-584.098999023438),(-275.,-425.)));
 #8974=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#8972);
 #8975=IFCCARTESIANPOINT((0.,0.,200.));
 #8976=IFCDIRECTION((0.,0.,1.));
@@ -9002,7 +9002,7 @@ DATA;
 #8995=IFCDIRECTION((0.,0.,1.));
 #8996=IFCEXTRUDEDAREASOLID(#8990,#8994,#8995,570.);
 #8997=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8971,#8980,#8989,#8996));
-#8998=IFCFURNITURETYPE('3mCxX9DhT959tCgDkSzzNw',$,'Neufert Toilet with Cistern',$,$,$,(#9003,#9008),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8998=IFCSANITARYTERMINALTYPE('2ELi2Yj71C4xU0Oz4KZxu6',$,'Neufert Toilet with Cistern',$,$,$,(#9003,#9008),$,$,.NOTDEFINED.);
 #8999=IFCCARTESIANPOINT((0.,0.,0.));
 #9000=IFCDIRECTION((1.,0.,0.));
 #9001=IFCDIRECTION((0.,0.,1.));
@@ -9014,8 +9014,8 @@ DATA;
 #9007=IFCAXIS2PLACEMENT3D(#9004,#9006,#9005);
 #9008=IFCREPRESENTATIONMAP(#9007,#8959);
 #9009=IFCCARTESIANPOINTLIST2D(((200.,0.),(58.5786437626905,58.5786437626905),(0.,200.),(0.,397.),(23.4314575050762,453.568542494924),(80.,477.),(40.,477.),(40.,530.),(360.,530.),(360.,477.),(320.,477.),(376.568542494924,453.568542494924),(400.,397.),(400.,200.),(341.42135623731,58.5786437626905),(200.,0.)));
-#9010=IFCINDEXEDPOLYCURVE(#9009,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((1,16))),$);
-#9011=IFCINDEXEDPOLYCURVE(#9012,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((1,16))),$);
+#9010=IFCINDEXEDPOLYCURVE(#9009,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((16,1))),$);
+#9011=IFCINDEXEDPOLYCURVE(#9012,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((16,1))),$);
 #9012=IFCCARTESIANPOINTLIST2D(((200.,0.),(58.5786437626905,58.5786437626905),(0.,200.),(0.,397.),(23.4314575050762,453.568542494924),(80.,477.),(40.,477.),(40.,530.),(360.,530.),(360.,477.),(320.,477.),(376.568542494924,453.568542494924),(400.,397.),(400.,200.),(341.42135623731,58.5786437626905),(200.,0.)));
 #9013=IFCCARTESIANPOINTLIST2D(((-120.,0.),(120.,0.)));
 #9014=IFCINDEXEDPOLYCURVE(#9013,(IFCLINEINDEX((1,2))),$);
@@ -9044,8 +9044,8 @@ DATA;
 #9037=IFCCARTESIANPOINT((25.,-296.799987792969));
 #9038=IFCTRIMMEDCURVE(#9035,(#9036),(#9037),.T.,.CARTESIAN.);
 #9039=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9014,#9016,#9023,#9024,#9029,#9031,#9038));
-#9040=IFCCARTESIANPOINTLIST2D(((-200.,0.),(0.,0.),(141.421356201172,-58.5786437988281),(200.,-200.),(200.,-330.),(141.421356201172,-471.421356201172),(0.,-530.),(-200.,-530.)));
-#9041=IFCINDEXEDPOLYCURVE(#9040,(IFCLINEINDEX((1,2)),IFCARCINDEX((2,3,4)),IFCLINEINDEX((4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((1,8))),$);
+#9040=IFCCARTESIANPOINTLIST2D(((-200.,0.),(200.,0.),(200.,-330.),(141.421356201172,-471.421356201172),(0.,-530.),(-141.421356201172,-471.421356201172),(-200.,-330.)));
+#9041=IFCINDEXEDPOLYCURVE(#9040,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((7,1))),$);
 #9042=IFCCARTESIANPOINT((0.,-330.));
 #9043=IFCAXIS2PLACEMENT2D(#9042,$);
 #9044=IFCCIRCLE(#9043,150.);
@@ -9056,8 +9056,8 @@ DATA;
 #9049=IFCAXIS2PLACEMENT3D(#9046,#9047,#9048);
 #9050=IFCDIRECTION((0.,0.,1.));
 #9051=IFCEXTRUDEDAREASOLID(#9045,#9049,#9050,150.);
-#9052=IFCINDEXEDPOLYCURVE(#9053,(IFCLINEINDEX((1,2)),IFCARCINDEX((2,3,4)),IFCLINEINDEX((4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((1,8))),$);
-#9053=IFCCARTESIANPOINTLIST2D(((-200.,0.),(0.,0.),(141.421356201172,-58.5786437988281),(200.,-200.),(200.,-330.),(141.421356201172,-471.421356201172),(0.,-530.),(-200.,-530.)));
+#9052=IFCINDEXEDPOLYCURVE(#9053,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((7,1))),$);
+#9053=IFCCARTESIANPOINTLIST2D(((-200.,0.),(200.,0.),(200.,-330.),(141.421356201172,-471.421356201172),(0.,-530.),(-141.421356201172,-471.421356201172),(-200.,-330.)));
 #9054=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#9052);
 #9055=IFCCARTESIANPOINT((0.,0.,200.));
 #9056=IFCDIRECTION((0.,0.,1.));
@@ -9075,7 +9075,7 @@ DATA;
 #9068=IFCDIRECTION((0.,0.,1.));
 #9069=IFCEXTRUDEDAREASOLID(#9063,#9067,#9068,200.);
 #9070=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9051,#9060,#9069));
-#9071=IFCFURNITURETYPE('3xUJfw$IbFUPh91ZO_d_fu',$,'Generic Toilet without Cistern',$,$,$,(#9076,#9081),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9071=IFCSANITARYTERMINALTYPE('2vY_mwxpT4KgZns4S6eU9l',$,'Generic Toilet without Cistern',$,$,$,(#9076,#9081),$,$,.NOTDEFINED.);
 #9072=IFCCARTESIANPOINT((0.,0.,0.));
 #9073=IFCDIRECTION((1.,0.,0.));
 #9074=IFCDIRECTION((0.,0.,1.));
@@ -9157,7 +9157,7 @@ DATA;
 #9150=IFCINDEXEDPOLYCURVE(#9151,(IFCARCINDEX((1,2,3))),$);
 #9151=IFCCARTESIANPOINTLIST2D(((105.,-35.),(105.01000213623,-35.),(140.,-70.)));
 #9152=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9133,#9135,#9138,#9145,#9147,#9149,#9150));
-#9153=IFCFURNITURETYPE('1YCUnWRTnESRIZdrbBF3VL',$,'Neufert Small Urinal',$,$,$,(#9158,#9163),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9153=IFCSANITARYTERMINALTYPE('0zb2_ICkH9NwVzxpLrXuTX',$,'Neufert Small Urinal',$,$,$,(#9158,#9163),$,$,.NOTDEFINED.);
 #9154=IFCCARTESIANPOINT((0.,0.,0.));
 #9155=IFCDIRECTION((1.,0.,0.));
 #9156=IFCDIRECTION((0.,0.,1.));
@@ -9239,7 +9239,7 @@ DATA;
 #9232=IFCINDEXEDPOLYCURVE(#9233,(IFCARCINDEX((1,2,3))),$);
 #9233=IFCCARTESIANPOINTLIST2D(((120.,-40.),(120.01000213623,-40.),(160.,-80.)));
 #9234=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9215,#9217,#9220,#9227,#9229,#9231,#9232));
-#9235=IFCFURNITURETYPE('3vdltXoZ50afR6p8pzbYyC',$,'Neufert Medium Urinal',$,$,$,(#9240,#9245),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9235=IFCSANITARYTERMINALTYPE('14zYtDSYbEC891_yH57cDT',$,'Neufert Medium Urinal',$,$,$,(#9240,#9245),$,$,.NOTDEFINED.);
 #9236=IFCCARTESIANPOINT((0.,0.,0.));
 #9237=IFCDIRECTION((1.,0.,0.));
 #9238=IFCDIRECTION((0.,0.,1.));
@@ -9321,7 +9321,7 @@ DATA;
 #9314=IFCINDEXEDPOLYCURVE(#9315,(IFCARCINDEX((1,2,3))),$);
 #9315=IFCCARTESIANPOINTLIST2D(((135.,-45.),(135.009994506836,-45.),(180.,-90.)));
 #9316=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9297,#9299,#9302,#9309,#9311,#9313,#9314));
-#9317=IFCFURNITURETYPE('0yaEPbrwX9cQ3AX$Ow8i6o',$,'Neufert Large Urinal',$,$,$,(#9322,#9327),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9317=IFCSANITARYTERMINALTYPE('0MPobFK4nA99hcB1hla$mr',$,'Neufert Large Urinal',$,$,$,(#9322,#9327),$,$,.NOTDEFINED.);
 #9318=IFCCARTESIANPOINT((0.,0.,0.));
 #9319=IFCDIRECTION((1.,0.,0.));
 #9320=IFCDIRECTION((0.,0.,1.));
@@ -9333,13 +9333,13 @@ DATA;
 #9326=IFCAXIS2PLACEMENT3D(#9323,#9325,#9324);
 #9327=IFCREPRESENTATIONMAP(#9326,#9316);
 #9328=IFCCARTESIANPOINTLIST2D(((-225.,-350.),(-210.355346679688,-385.355346679688),(-175.,-400.),(175.,-400.),(210.355346679688,-385.355346679688),(225.,-350.),(225.,-50.),(210.355346679688,-14.6446533203125),(175.,0.),(-175.,0.),(-210.355346679688,-14.6446533203125),(-225.,-50.)));
-#9329=IFCINDEXEDPOLYCURVE(#9328,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9330=IFCINDEXEDPOLYCURVE(#9331,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9329=IFCINDEXEDPOLYCURVE(#9328,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9330=IFCINDEXEDPOLYCURVE(#9331,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9331=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(400.,0.),(435.355339059327,14.6446609406726),(450.,50.),(450.,350.),(435.355339059327,385.355339059327),(400.,400.),(50.,400.),(14.6446609406726,385.355339059327),(0.,350.)));
-#9332=IFCCARTESIANPOINTLIST2D(((-202.5,-314.),(-187.855346679688,-349.355346679688),(-152.5,-364.),(52.5,-364.),(158.566009521484,-320.066009521484),(202.5,-214.),(202.5,-234.),(158.566009521484,-127.933990478516),(52.5,-84.),(-152.5,-84.),(-187.855346679688,-98.6446533203125),(-202.5,-134.)));
-#9333=IFCINDEXEDPOLYCURVE(#9332,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9334=IFCINDEXEDPOLYCURVE(#9335,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9335=IFCCARTESIANPOINTLIST2D(((22.5,86.),(37.1446609406726,50.6446609406726),(72.5,36.),(277.5,36.),(383.566017177982,79.9339828220179),(427.5,186.),(427.5,166.),(383.566017177982,272.066017177982),(277.5,316.),(72.5,316.),(37.1446609406726,301.355339059327),(22.5,266.)));
+#9332=IFCCARTESIANPOINTLIST2D(((-202.5,-214.),(-158.566009521484,-320.066009521484),(-52.5,-364.),(52.5,-364.),(158.566009521484,-320.066009521484),(202.5,-214.),(202.5,-134.),(187.855346679688,-98.6446533203125),(152.5,-84.),(-152.5,-84.),(-187.855346679688,-98.6446533203125),(-202.5,-134.)));
+#9333=IFCINDEXEDPOLYCURVE(#9332,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9334=IFCINDEXEDPOLYCURVE(#9335,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9335=IFCCARTESIANPOINTLIST2D(((22.5,186.),(66.4339828220179,79.9339828220179),(172.5,36.),(277.5,36.),(383.566017177982,79.9339828220179),(427.5,186.),(427.5,266.),(412.855339059327,301.355339059327),(377.5,316.),(72.5,316.),(37.1446609406726,301.355339059327),(22.5,266.)));
 #9336=IFCCARTESIANPOINTLIST2D(((0.,-30.),(0.,-150.)));
 #9337=IFCINDEXEDPOLYCURVE(#9336,(IFCLINEINDEX((1,2))),$);
 #9338=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9329,#9333,#9337));
@@ -9358,7 +9358,7 @@ DATA;
 #9351=IFCDIRECTION((0.,0.,1.));
 #9352=IFCEXTRUDEDAREASOLID(#9346,#9350,#9351,100.);
 #9353=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9345,#9352));
-#9354=IFCFURNITURETYPE('05JxHlo9D4qBpvNf_FD3EO',$,'Neufert Extra Small Basin',$,$,$,(#9359,#9364),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9354=IFCSANITARYTERMINALTYPE('2woKwWEUP7lPTAJuxRv0Hq',$,'Neufert Extra Small Basin',$,$,$,(#9359,#9364),$,$,.NOTDEFINED.);
 #9355=IFCCARTESIANPOINT((0.,0.,0.));
 #9356=IFCDIRECTION((1.,0.,0.));
 #9357=IFCDIRECTION((0.,0.,1.));
@@ -9370,13 +9370,13 @@ DATA;
 #9363=IFCAXIS2PLACEMENT3D(#9360,#9362,#9361);
 #9364=IFCREPRESENTATIONMAP(#9363,#9338);
 #9365=IFCCARTESIANPOINTLIST2D(((-250.,-400.),(-235.355346679688,-435.355346679688),(-200.,-450.),(200.,-450.),(235.355346679688,-435.355346679688),(250.,-400.),(250.,-50.),(235.355346679688,-14.6446533203125),(200.,0.),(-200.,0.),(-235.355346679688,-14.6446533203125),(-250.,-50.)));
-#9366=IFCINDEXEDPOLYCURVE(#9365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9367=IFCINDEXEDPOLYCURVE(#9368,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9366=IFCINDEXEDPOLYCURVE(#9365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9367=IFCINDEXEDPOLYCURVE(#9368,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9368=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(450.,0.),(485.355339059327,14.6446609406726),(500.,50.),(500.,400.),(485.355339059327,435.355339059327),(450.,450.),(50.,450.),(14.6446609406726,435.355339059327),(0.,400.)));
-#9369=IFCCARTESIANPOINTLIST2D(((-225.,-359.5),(-210.355346679688,-394.855346679688),(-175.,-409.5),(75.,-409.5),(181.066009521484,-365.566009521484),(225.,-259.5),(225.,-244.5),(181.066009521484,-138.433990478516),(75.,-94.5),(-175.,-94.5),(-210.355346679688,-109.144653320312),(-225.,-144.5)));
-#9370=IFCINDEXEDPOLYCURVE(#9369,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9371=IFCINDEXEDPOLYCURVE(#9372,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9372=IFCCARTESIANPOINTLIST2D(((25.,90.5),(39.6446609406726,55.1446609406726),(75.,40.5),(325.,40.5),(431.066017177982,84.4339828220179),(475.,190.5),(475.,205.5),(431.066017177982,311.566017177982),(325.,355.5),(75.,355.5),(39.6446609406726,340.855339059327),(25.,305.5)));
+#9369=IFCCARTESIANPOINTLIST2D(((-225.,-259.5),(-181.066009521484,-365.566009521484),(-75.,-409.5),(75.,-409.5),(181.066009521484,-365.566009521484),(225.,-259.5),(225.,-144.5),(210.355346679688,-109.144653320312),(175.,-94.5),(-175.,-94.5),(-210.355346679688,-109.144653320312),(-225.,-144.5)));
+#9370=IFCINDEXEDPOLYCURVE(#9369,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9371=IFCINDEXEDPOLYCURVE(#9372,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9372=IFCCARTESIANPOINTLIST2D(((25.,190.5),(68.9339828220179,84.4339828220179),(175.,40.5),(325.,40.5),(431.066017177982,84.4339828220179),(475.,190.5),(475.,305.5),(460.355339059327,340.855339059327),(425.,355.5),(75.,355.5),(39.6446609406726,340.855339059327),(25.,305.5)));
 #9373=IFCCARTESIANPOINTLIST2D(((0.,-33.75),(0.,-153.75)));
 #9374=IFCINDEXEDPOLYCURVE(#9373,(IFCLINEINDEX((1,2))),$);
 #9375=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9366,#9370,#9374));
@@ -9395,7 +9395,7 @@ DATA;
 #9388=IFCDIRECTION((0.,0.,1.));
 #9389=IFCEXTRUDEDAREASOLID(#9383,#9387,#9388,100.);
 #9390=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9382,#9389));
-#9391=IFCFURNITURETYPE('0kYBmaLQf0eP_Nk0CBMDKj',$,'Neufert Small Basin',$,$,$,(#9396,#9401),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9391=IFCSANITARYTERMINALTYPE('3qg2RWSZzFxBTEAOnH9LnV',$,'Neufert Small Basin',$,$,$,(#9396,#9401),$,$,.NOTDEFINED.);
 #9392=IFCCARTESIANPOINT((0.,0.,0.));
 #9393=IFCDIRECTION((1.,0.,0.));
 #9394=IFCDIRECTION((0.,0.,1.));
@@ -9407,13 +9407,13 @@ DATA;
 #9400=IFCAXIS2PLACEMENT3D(#9397,#9399,#9398);
 #9401=IFCREPRESENTATIONMAP(#9400,#9375);
 #9402=IFCCARTESIANPOINTLIST2D(((-275.,-450.),(-260.355346679688,-485.355346679688),(-225.,-500.),(225.,-500.),(260.355346679688,-485.355346679688),(275.,-450.),(275.,-50.),(260.355346679688,-14.6446533203125),(225.,0.),(-225.,0.),(-260.355346679688,-14.6446533203125),(-275.,-50.)));
-#9403=IFCINDEXEDPOLYCURVE(#9402,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9404=IFCINDEXEDPOLYCURVE(#9405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9403=IFCINDEXEDPOLYCURVE(#9402,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9404=IFCINDEXEDPOLYCURVE(#9405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9405=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(500.,0.),(535.355339059327,14.6446609406726),(550.,50.),(550.,450.),(535.355339059327,485.355339059327),(500.,500.),(50.,500.),(14.6446609406726,485.355339059327),(0.,450.)));
-#9406=IFCCARTESIANPOINTLIST2D(((-247.5,-405.),(-232.855346679688,-440.355346679688),(-197.5,-455.),(97.5,-455.),(203.566009521484,-411.066009521484),(247.5,-305.),(247.5,-255.),(203.566009521484,-148.933990478516),(97.5,-105.),(-197.5,-105.),(-232.855346679688,-119.644653320312),(-247.5,-155.)));
-#9407=IFCINDEXEDPOLYCURVE(#9406,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9408=IFCINDEXEDPOLYCURVE(#9409,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9409=IFCCARTESIANPOINTLIST2D(((27.5,95.),(42.1446609406726,59.6446609406726),(77.5,45.),(372.5,45.),(478.566017177982,88.9339828220179),(522.5,195.),(522.5,245.),(478.566017177982,351.066017177982),(372.5,395.),(77.5,395.),(42.1446609406726,380.355339059327),(27.5,345.)));
+#9406=IFCCARTESIANPOINTLIST2D(((-247.5,-305.),(-203.566009521484,-411.066009521484),(-97.5,-455.),(97.5,-455.),(203.566009521484,-411.066009521484),(247.5,-305.),(247.5,-155.),(232.855346679688,-119.644653320312),(197.5,-105.),(-197.5,-105.),(-232.855346679688,-119.644653320312),(-247.5,-155.)));
+#9407=IFCINDEXEDPOLYCURVE(#9406,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9408=IFCINDEXEDPOLYCURVE(#9409,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9409=IFCCARTESIANPOINTLIST2D(((27.5,195.),(71.4339828220179,88.9339828220179),(177.5,45.),(372.5,45.),(478.566017177982,88.9339828220179),(522.5,195.),(522.5,345.),(507.855339059327,380.355339059327),(472.5,395.),(77.5,395.),(42.1446609406726,380.355339059327),(27.5,345.)));
 #9410=IFCCARTESIANPOINTLIST2D(((0.,-37.5),(0.,-157.5)));
 #9411=IFCINDEXEDPOLYCURVE(#9410,(IFCLINEINDEX((1,2))),$);
 #9412=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9403,#9407,#9411));
@@ -9432,7 +9432,7 @@ DATA;
 #9425=IFCDIRECTION((0.,0.,1.));
 #9426=IFCEXTRUDEDAREASOLID(#9420,#9424,#9425,100.);
 #9427=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9419,#9426));
-#9428=IFCFURNITURETYPE('3HOnoiBqfEaPpzRbqAX7kZ',$,'Neufert Medium Basin',$,$,$,(#9433,#9438),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9428=IFCSANITARYTERMINALTYPE('2hG4PoXST1MfIppfz0tX8j',$,'Neufert Medium Basin',$,$,$,(#9433,#9438),$,$,.NOTDEFINED.);
 #9429=IFCCARTESIANPOINT((0.,0.,0.));
 #9430=IFCDIRECTION((1.,0.,0.));
 #9431=IFCDIRECTION((0.,0.,1.));
@@ -9444,13 +9444,13 @@ DATA;
 #9437=IFCAXIS2PLACEMENT3D(#9434,#9436,#9435);
 #9438=IFCREPRESENTATIONMAP(#9437,#9412);
 #9439=IFCCARTESIANPOINTLIST2D(((-300.,-500.),(-285.355346679688,-535.355346679688),(-250.,-550.),(250.,-550.),(285.355346679688,-535.355346679688),(300.,-500.),(300.,-50.),(285.355346679688,-14.6446533203125),(250.,0.),(-250.,0.),(-285.355346679688,-14.6446533203125),(-300.,-50.)));
-#9440=IFCINDEXEDPOLYCURVE(#9439,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9441=IFCINDEXEDPOLYCURVE(#9442,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9440=IFCINDEXEDPOLYCURVE(#9439,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9441=IFCINDEXEDPOLYCURVE(#9442,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9442=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(550.,0.),(585.355339059327,14.6446609406726),(600.,50.),(600.,500.),(585.355339059327,535.355339059327),(550.,550.),(50.,550.),(14.6446609406726,535.355339059327),(0.,500.)));
-#9443=IFCCARTESIANPOINTLIST2D(((-270.,-450.5),(-255.355346679688,-485.855346679688),(-220.,-500.5),(120.,-500.5),(226.066040039062,-456.566009521484),(270.,-350.5),(270.,-265.5),(226.066040039062,-159.433990478516),(120.,-115.5),(-220.,-115.5),(-255.355346679688,-130.144653320312),(-270.,-165.5)));
-#9444=IFCINDEXEDPOLYCURVE(#9443,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9445=IFCINDEXEDPOLYCURVE(#9446,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9446=IFCCARTESIANPOINTLIST2D(((30.,99.5),(44.6446609406726,64.1446609406726),(80.,49.5),(420.,49.5),(526.066017177982,93.4339828220179),(570.,199.5),(570.,284.5),(526.066017177982,390.566017177982),(420.,434.5),(80.,434.5),(44.6446609406726,419.855339059327),(30.,384.5)));
+#9443=IFCCARTESIANPOINTLIST2D(((-270.,-350.5),(-226.066009521484,-456.566009521484),(-120.,-500.5),(120.,-500.5),(226.066040039062,-456.566009521484),(270.,-350.5),(270.,-165.5),(255.355346679688,-130.144653320312),(220.,-115.5),(-220.,-115.5),(-255.355346679688,-130.144653320312),(-270.,-165.5)));
+#9444=IFCINDEXEDPOLYCURVE(#9443,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9445=IFCINDEXEDPOLYCURVE(#9446,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9446=IFCCARTESIANPOINTLIST2D(((30.,199.5),(73.9339828220179,93.4339828220179),(180.,49.5),(420.,49.5),(526.066017177982,93.4339828220179),(570.,199.5),(570.,384.5),(555.355339059327,419.855339059327),(520.,434.5),(80.,434.5),(44.6446609406726,419.855339059327),(30.,384.5)));
 #9447=IFCCARTESIANPOINTLIST2D(((0.,-41.25),(0.,-161.25)));
 #9448=IFCINDEXEDPOLYCURVE(#9447,(IFCLINEINDEX((1,2))),$);
 #9449=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9440,#9444,#9448));
@@ -9469,7 +9469,7 @@ DATA;
 #9462=IFCDIRECTION((0.,0.,1.));
 #9463=IFCEXTRUDEDAREASOLID(#9457,#9461,#9462,100.);
 #9464=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9456,#9463));
-#9465=IFCFURNITURETYPE('3nmkIPXnfEEBAnojjNPbJc',$,'Neufert Large Basin',$,$,$,(#9470,#9475),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9465=IFCSANITARYTERMINALTYPE('0DhF1owWTBQBX24vCUdbCL',$,'Neufert Large Basin',$,$,$,(#9470,#9475),$,$,.NOTDEFINED.);
 #9466=IFCCARTESIANPOINT((0.,0.,0.));
 #9467=IFCDIRECTION((1.,0.,0.));
 #9468=IFCDIRECTION((0.,0.,1.));
@@ -9984,7 +9984,7 @@ DATA;
 #9977=IFCCARTESIANPOINTLIST2D(((500.,570.),(348.915649414062,397.763854980469)));
 #9978=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9961));
 #9979=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9963,#9966,#9969,#9971,#9972,#9974,#9976));
-#9980=IFCFURNITURETYPE('1AFtSxjp11OfXPVIXCEHTW',$,'Neufert Dishwasher',$,$,$,(#9985,#9990),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9980=IFCELECTRICAPPLIANCETYPE('1sNE7qfUz3h9cTdLK3fjiA',$,'Neufert Dishwasher',$,$,$,(#9985,#9990),$,$,.NOTDEFINED.);
 #9981=IFCCARTESIANPOINT((0.,0.,0.));
 #9982=IFCDIRECTION((1.,0.,0.));
 #9983=IFCDIRECTION((0.,0.,1.));
@@ -10020,7 +10020,7 @@ DATA;
 #10013=IFCCARTESIANPOINT((464.,408.));
 #10014=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9999));
 #10015=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10001,#10004,#10005,#10008,#10011));
-#10016=IFCFURNITURETYPE('2IGxEEswv8qP7nVni78cfm',$,'Neufert Cooktop 58x51',$,$,$,(#10021,#10026),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10016=IFCELECTRICAPPLIANCETYPE('0nKrtvdUHFAefjRSEpm9Vo',$,'Neufert Cooktop 58x51',$,$,$,(#10021,#10026),$,$,.NOTDEFINED.);
 #10017=IFCCARTESIANPOINT((0.,0.,0.));
 #10018=IFCDIRECTION((1.,0.,0.));
 #10019=IFCDIRECTION((0.,0.,1.));
@@ -10056,7 +10056,7 @@ DATA;
 #10049=IFCCARTESIANPOINT((600.,408.));
 #10050=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10035));
 #10051=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10037,#10040,#10041,#10044,#10047));
-#10052=IFCFURNITURETYPE('0u0AIl1iz1kg0k4hVZokMR',$,'Neufert Cooktop 75x51',$,$,$,(#10057,#10062),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10052=IFCELECTRICAPPLIANCETYPE('0h0jY$RHnDtuHFECA28DmA',$,'Neufert Cooktop 75x51',$,$,$,(#10057,#10062),$,$,.NOTDEFINED.);
 #10053=IFCCARTESIANPOINT((0.,0.,0.));
 #10054=IFCDIRECTION((1.,0.,0.));
 #10055=IFCDIRECTION((0.,0.,1.));
@@ -10092,7 +10092,7 @@ DATA;
 #10085=IFCCARTESIANPOINT((712.,408.));
 #10086=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10071));
 #10087=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10073,#10076,#10077,#10080,#10083));
-#10088=IFCFURNITURETYPE('0tLA79Xrj3ygMHNIS4kMgp',$,'Neufert Cooktop 89x51',$,$,$,(#10093,#10098),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10088=IFCELECTRICAPPLIANCETYPE('29HQ13NSn9$fDs0$FEoLi4',$,'Neufert Cooktop 89x51',$,$,$,(#10093,#10098),$,$,.NOTDEFINED.);
 #10089=IFCCARTESIANPOINT((0.,0.,0.));
 #10090=IFCDIRECTION((1.,0.,0.));
 #10091=IFCDIRECTION((0.,0.,1.));
@@ -10308,7 +10308,7 @@ DATA;
 #10301=IFCCARTESIANPOINTLIST2D(((0.,0.),(750.,0.),(750.,650.),(0.,650.)));
 #10302=IFCINDEXEDPOLYCURVE(#10301,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10303=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10302));
-#10304=IFCFURNITURETYPE('1vlTJXFfXAnh7gnD04f$1P',$,'Generic Small Fridge Zone',$,$,$,(#10309,#10314),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10304=IFCELECTRICAPPLIANCETYPE('2$EOIIzKDC9R3FuDYcR7Ch',$,'Generic Small Fridge Zone',$,$,$,(#10309,#10314),$,$,.NOTDEFINED.);
 #10305=IFCCARTESIANPOINT((0.,0.,0.));
 #10306=IFCDIRECTION((1.,0.,0.));
 #10307=IFCDIRECTION((0.,0.,1.));
@@ -10332,7 +10332,7 @@ DATA;
 #10325=IFCCARTESIANPOINTLIST2D(((0.,0.),(900.,0.),(900.,700.),(0.,700.)));
 #10326=IFCINDEXEDPOLYCURVE(#10325,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10327=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10326));
-#10328=IFCFURNITURETYPE('1pCxw0yID16ORM48tmev1T',$,'Generic Medium Fridge Zone',$,$,$,(#10333,#10338),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10328=IFCELECTRICAPPLIANCETYPE('1dJrjS_f50o98cKyloLBwg',$,'Generic Medium Fridge Zone',$,$,$,(#10333,#10338),$,$,.NOTDEFINED.);
 #10329=IFCCARTESIANPOINT((0.,0.,0.));
 #10330=IFCDIRECTION((1.,0.,0.));
 #10331=IFCDIRECTION((0.,0.,1.));
@@ -10356,7 +10356,7 @@ DATA;
 #10349=IFCCARTESIANPOINTLIST2D(((0.,0.),(1000.,0.),(1000.,750.),(0.,750.)));
 #10350=IFCINDEXEDPOLYCURVE(#10349,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10351=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10350));
-#10352=IFCFURNITURETYPE('2$$8n27rr6$hvFFgMEptvR',$,'Generic Large Fridge Zone',$,$,$,(#10357,#10362),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10352=IFCELECTRICAPPLIANCETYPE('0m9WySWkv6nwxrkqK2gOXU',$,'Generic Large Fridge Zone',$,$,$,(#10357,#10362),$,$,.NOTDEFINED.);
 #10353=IFCCARTESIANPOINT((0.,0.,0.));
 #10354=IFCDIRECTION((1.,0.,0.));
 #10355=IFCDIRECTION((0.,0.,1.));
@@ -10370,7 +10370,7 @@ DATA;
 #10363=IFCCARTESIANPOINTLIST2D(((-430.,-440.),(430.,-440.),(430.,0.),(-430.,0.)));
 #10364=IFCINDEXEDPOLYCURVE(#10363,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10365=IFCCARTESIANPOINTLIST2D(((-405.,-365.),(-390.355346679688,-400.355346679688),(-355.,-415.),(355.,-415.),(390.355346679688,-400.355346679688),(405.,-365.),(405.,-75.),(390.355346679688,-39.6446533203125),(355.,-25.),(-355.,-25.),(-390.355346679688,-39.6446533203125),(-405.,-75.)));
-#10366=IFCINDEXEDPOLYCURVE(#10365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10366=IFCINDEXEDPOLYCURVE(#10365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10367=IFCCARTESIANPOINT((0.,-125.));
 #10368=IFCAXIS2PLACEMENT2D(#10367,$);
 #10369=IFCCIRCLE(#10368,25.);
@@ -10379,7 +10379,7 @@ DATA;
 #10372=IFCCARTESIANPOINTLIST2D(((0.,0.),(860.,0.),(860.,440.),(0.,440.)));
 #10373=IFCINDEXEDPOLYCURVE(#10372,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10374=IFCCARTESIANPOINTLIST2D(((25.,75.),(39.6446609406726,39.6446609406726),(75.,25.),(785.,25.),(820.355339059327,39.6446609406726),(835.,75.),(835.,365.),(820.355339059327,400.355339059327),(785.,415.),(75.,415.),(39.6446609406726,400.355339059327),(25.,365.)));
-#10375=IFCINDEXEDPOLYCURVE(#10374,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10375=IFCINDEXEDPOLYCURVE(#10374,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10376=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10373,(#10375));
 #10377=IFCCARTESIANPOINT((-430.,-440.,36.));
 #10378=IFCDIRECTION((0.,0.,1.));
@@ -10396,7 +10396,7 @@ DATA;
 #10389=IFCEXTRUDEDAREASOLID(#10383,#10387,#10388,36.);
 #10390=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10364,#10366,#10369,#10371));
 #10391=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10382,#10389));
-#10392=IFCFURNITURETYPE('0q4OLC4k59zQgK4HaRjm$m',$,'Neufert Sink 86x44',$,$,$,(#10397,#10402),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10392=IFCSANITARYTERMINALTYPE('2BgxNZ_oT9nwJKl8YigkmY',$,'Neufert Sink 86x44',$,$,$,(#10397,#10402),$,$,.NOTDEFINED.);
 #10393=IFCCARTESIANPOINT((0.,0.,0.));
 #10394=IFCDIRECTION((1.,0.,0.));
 #10395=IFCDIRECTION((0.,0.,1.));
@@ -10410,7 +10410,7 @@ DATA;
 #10403=IFCCARTESIANPOINTLIST2D(((-555.,-440.),(555.,-440.),(555.,0.),(-555.,0.)));
 #10404=IFCINDEXEDPOLYCURVE(#10403,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10405=IFCCARTESIANPOINTLIST2D(((25.,-365.),(39.6446533203125,-400.355346679688),(75.,-415.),(480.,-415.),(515.355346679688,-400.355346679688),(530.,-365.),(530.,-75.),(515.355346679688,-39.6446533203125),(480.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10406=IFCINDEXEDPOLYCURVE(#10405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10406=IFCINDEXEDPOLYCURVE(#10405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10407=IFCCARTESIANPOINT((277.5,-125.));
 #10408=IFCAXIS2PLACEMENT2D(#10407,$);
 #10409=IFCCIRCLE(#10408,25.);
@@ -10428,7 +10428,7 @@ DATA;
 #10421=IFCCARTESIANPOINTLIST2D(((555.,0.),(1110.,0.),(1110.,440.),(555.,440.)));
 #10422=IFCINDEXEDPOLYCURVE(#10421,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10423=IFCCARTESIANPOINTLIST2D(((580.,75.),(594.644660940673,39.6446609406726),(630.,25.),(1035.,25.),(1070.35533905933,39.6446609406726),(1085.,75.),(1085.,365.),(1070.35533905933,400.355339059327),(1035.,415.),(630.,415.),(594.644660940673,400.355339059327),(580.,365.)));
-#10424=IFCINDEXEDPOLYCURVE(#10423,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10424=IFCINDEXEDPOLYCURVE(#10423,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10425=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10422,(#10424));
 #10426=IFCCARTESIANPOINT((-555.,-440.,36.));
 #10427=IFCDIRECTION((0.,0.,1.));
@@ -10445,7 +10445,7 @@ DATA;
 #10438=IFCEXTRUDEDAREASOLID(#10432,#10436,#10437,36.);
 #10439=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10404,#10406,#10409,#10411));
 #10440=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10420,#10431,#10438));
-#10441=IFCFURNITURETYPE('0kORuZKn58PQZTtdW8oCLl',$,'Neufert Sink 110x44',$,$,$,(#10446,#10451),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10441=IFCSANITARYTERMINALTYPE('1f15OHuoj2pAdtiC4FZRI1',$,'Neufert Sink 110x44',$,$,$,(#10446,#10451),$,$,.NOTDEFINED.);
 #10442=IFCCARTESIANPOINT((0.,0.,0.));
 #10443=IFCDIRECTION((1.,0.,0.));
 #10444=IFCDIRECTION((0.,0.,1.));
@@ -10459,7 +10459,7 @@ DATA;
 #10452=IFCCARTESIANPOINTLIST2D(((-620.,-440.),(620.,-440.),(620.,0.),(-620.,0.)));
 #10453=IFCINDEXEDPOLYCURVE(#10452,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10454=IFCCARTESIANPOINTLIST2D(((25.,-365.),(39.6446533203125,-400.355346679688),(75.,-415.),(545.,-415.),(580.355346679688,-400.355346679688),(595.,-365.),(595.,-75.),(580.355346679688,-39.6446533203125),(545.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10455=IFCINDEXEDPOLYCURVE(#10454,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10455=IFCINDEXEDPOLYCURVE(#10454,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10456=IFCCARTESIANPOINT((310.,-125.));
 #10457=IFCAXIS2PLACEMENT2D(#10456,$);
 #10458=IFCCIRCLE(#10457,25.);
@@ -10477,7 +10477,7 @@ DATA;
 #10470=IFCCARTESIANPOINTLIST2D(((620.,0.),(1240.,0.),(1240.,440.),(620.,440.)));
 #10471=IFCINDEXEDPOLYCURVE(#10470,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10472=IFCCARTESIANPOINTLIST2D(((645.,75.),(659.644660940673,39.6446609406726),(695.,25.),(1165.,25.),(1200.35533905933,39.6446609406726),(1215.,75.),(1215.,365.),(1200.35533905933,400.355339059327),(1165.,415.),(695.,415.),(659.644660940673,400.355339059327),(645.,365.)));
-#10473=IFCINDEXEDPOLYCURVE(#10472,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10473=IFCINDEXEDPOLYCURVE(#10472,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10474=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10471,(#10473));
 #10475=IFCCARTESIANPOINT((-620.,-440.,36.));
 #10476=IFCDIRECTION((0.,0.,1.));
@@ -10494,7 +10494,7 @@ DATA;
 #10487=IFCEXTRUDEDAREASOLID(#10481,#10485,#10486,36.);
 #10488=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10453,#10455,#10458,#10460));
 #10489=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10469,#10480,#10487));
-#10490=IFCFURNITURETYPE('0VKDCN_y17$h1$zxaTc2YO',$,'Neufert Sink 124x44',$,$,$,(#10495,#10500),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10490=IFCSANITARYTERMINALTYPE('2M2NjuGej10vAcBw7HPUOF',$,'Neufert Sink 124x44',$,$,$,(#10495,#10500),$,$,.NOTDEFINED.);
 #10491=IFCCARTESIANPOINT((0.,0.,0.));
 #10492=IFCDIRECTION((1.,0.,0.));
 #10493=IFCDIRECTION((0.,0.,1.));
@@ -10508,7 +10508,7 @@ DATA;
 #10501=IFCCARTESIANPOINTLIST2D(((-225.,-460.),(225.,-460.),(225.,0.),(-225.,0.)));
 #10502=IFCINDEXEDPOLYCURVE(#10501,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10503=IFCCARTESIANPOINTLIST2D(((-200.,-385.),(-185.355346679688,-420.355346679688),(-150.,-435.),(150.,-435.),(185.355346679688,-420.355346679688),(200.,-385.),(200.,-75.),(185.355346679688,-39.6446533203125),(150.,-25.),(-150.,-25.),(-185.355346679688,-39.6446533203125),(-200.,-75.)));
-#10504=IFCINDEXEDPOLYCURVE(#10503,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10504=IFCINDEXEDPOLYCURVE(#10503,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10505=IFCCARTESIANPOINT((0.,-125.));
 #10506=IFCAXIS2PLACEMENT2D(#10505,$);
 #10507=IFCCIRCLE(#10506,25.);
@@ -10517,7 +10517,7 @@ DATA;
 #10510=IFCCARTESIANPOINTLIST2D(((0.,0.),(450.,0.),(450.,460.),(0.,460.)));
 #10511=IFCINDEXEDPOLYCURVE(#10510,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10512=IFCCARTESIANPOINTLIST2D(((25.,75.),(39.6446609406726,39.6446609406726),(75.,25.),(375.,25.),(410.355339059327,39.6446609406726),(425.,75.),(425.,385.),(410.355339059327,420.355339059327),(375.,435.),(75.,435.),(39.6446609406726,420.355339059327),(25.,385.)));
-#10513=IFCINDEXEDPOLYCURVE(#10512,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10513=IFCINDEXEDPOLYCURVE(#10512,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10514=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10511,(#10513));
 #10515=IFCCARTESIANPOINT((-225.,-460.,42.));
 #10516=IFCDIRECTION((0.,0.,1.));
@@ -10534,7 +10534,7 @@ DATA;
 #10527=IFCEXTRUDEDAREASOLID(#10521,#10525,#10526,42.);
 #10528=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10502,#10504,#10507,#10509));
 #10529=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10520,#10527));
-#10530=IFCFURNITURETYPE('2pjroZyl10oPBZteEpnMt_',$,'Generic Small Sink',$,$,$,(#10535,#10540),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10530=IFCSANITARYTERMINALTYPE('2RWyo9tFj1UxIXXqoldH5y',$,'Generic Small Sink',$,$,$,(#10535,#10540),$,$,.NOTDEFINED.);
 #10531=IFCCARTESIANPOINT((0.,0.,0.));
 #10532=IFCDIRECTION((1.,0.,0.));
 #10533=IFCDIRECTION((0.,0.,1.));
@@ -10548,7 +10548,7 @@ DATA;
 #10541=IFCCARTESIANPOINTLIST2D(((-400.,-460.),(400.,-460.),(400.,0.),(-400.,0.)));
 #10542=IFCINDEXEDPOLYCURVE(#10541,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10543=IFCCARTESIANPOINTLIST2D(((25.,-385.),(39.6446533203125,-420.355346679688),(75.,-435.),(325.,-435.),(360.355346679688,-420.355346679688),(375.,-385.),(375.,-75.),(360.355346679688,-39.6446533203125),(325.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10544=IFCINDEXEDPOLYCURVE(#10543,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10544=IFCINDEXEDPOLYCURVE(#10543,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10545=IFCCARTESIANPOINT((200.,-125.));
 #10546=IFCAXIS2PLACEMENT2D(#10545,$);
 #10547=IFCCIRCLE(#10546,25.);
@@ -10566,7 +10566,7 @@ DATA;
 #10559=IFCCARTESIANPOINTLIST2D(((400.,0.),(800.,0.),(800.,460.),(400.,460.)));
 #10560=IFCINDEXEDPOLYCURVE(#10559,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10561=IFCCARTESIANPOINTLIST2D(((425.,75.),(439.644660940673,39.6446609406726),(475.,25.),(725.,25.),(760.355339059327,39.6446609406726),(775.,75.),(775.,385.),(760.355339059327,420.355339059327),(725.,435.),(475.,435.),(439.644660940673,420.355339059327),(425.,385.)));
-#10562=IFCINDEXEDPOLYCURVE(#10561,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10562=IFCINDEXEDPOLYCURVE(#10561,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10563=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10560,(#10562));
 #10564=IFCCARTESIANPOINT((-400.,-460.,42.));
 #10565=IFCDIRECTION((0.,0.,1.));
@@ -10583,7 +10583,7 @@ DATA;
 #10576=IFCEXTRUDEDAREASOLID(#10570,#10574,#10575,42.);
 #10577=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10542,#10544,#10547,#10549));
 #10578=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10558,#10569,#10576));
-#10579=IFCFURNITURETYPE('3P8g0eZYH438vX$VAfsGny',$,'Generic Medium Sink',$,$,$,(#10584,#10589),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10579=IFCSANITARYTERMINALTYPE('0qTxCveKTFp8fc8iAM75SF',$,'Generic Medium Sink',$,$,$,(#10584,#10589),$,$,.NOTDEFINED.);
 #10580=IFCCARTESIANPOINT((0.,0.,0.));
 #10581=IFCDIRECTION((1.,0.,0.));
 #10582=IFCDIRECTION((0.,0.,1.));
@@ -10597,7 +10597,7 @@ DATA;
 #10590=IFCCARTESIANPOINTLIST2D(((-550.,-490.),(550.,-490.),(550.,0.),(-550.,0.)));
 #10591=IFCINDEXEDPOLYCURVE(#10590,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10592=IFCCARTESIANPOINTLIST2D(((25.,-415.),(39.6446533203125,-450.355346679688),(75.,-465.),(475.,-465.),(510.355346679688,-450.355346679688),(525.,-415.),(525.,-75.),(510.355346679688,-39.6446533203125),(475.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10593=IFCINDEXEDPOLYCURVE(#10592,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10593=IFCINDEXEDPOLYCURVE(#10592,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10594=IFCCARTESIANPOINT((275.,-125.));
 #10595=IFCAXIS2PLACEMENT2D(#10594,$);
 #10596=IFCCIRCLE(#10595,25.);
@@ -10615,7 +10615,7 @@ DATA;
 #10608=IFCCARTESIANPOINTLIST2D(((550.,0.),(1100.,0.),(1100.,490.),(550.,490.)));
 #10609=IFCINDEXEDPOLYCURVE(#10608,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10610=IFCCARTESIANPOINTLIST2D(((575.,75.),(589.644660940673,39.6446609406726),(625.,25.),(1025.,25.),(1060.35533905933,39.6446609406726),(1075.,75.),(1075.,415.),(1060.35533905933,450.355339059327),(1025.,465.),(625.,465.),(589.644660940673,450.355339059327),(575.,415.)));
-#10611=IFCINDEXEDPOLYCURVE(#10610,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10611=IFCINDEXEDPOLYCURVE(#10610,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10612=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10609,(#10611));
 #10613=IFCCARTESIANPOINT((-550.,-490.,44.));
 #10614=IFCDIRECTION((0.,0.,1.));
@@ -10632,7 +10632,7 @@ DATA;
 #10625=IFCEXTRUDEDAREASOLID(#10619,#10623,#10624,44.);
 #10626=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10591,#10593,#10596,#10598));
 #10627=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10607,#10618,#10625));
-#10628=IFCFURNITURETYPE('0D8gU$yLHAyOyIZ9ipVZ0x',$,'Generic Large Sink',$,$,$,(#10633,#10638),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10628=IFCSANITARYTERMINALTYPE('3klCEQBdP8p8G4$350f2zd',$,'Generic Large Sink',$,$,$,(#10633,#10638),$,$,.NOTDEFINED.);
 #10629=IFCCARTESIANPOINT((0.,0.,0.));
 #10630=IFCDIRECTION((1.,0.,0.));
 #10631=IFCDIRECTION((0.,0.,1.));
@@ -10782,7 +10782,7 @@ DATA;
 #10775=IFCCIRCLE(#10774,59.5);
 #10776=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10767));
 #10777=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10769,#10772,#10775));
-#10778=IFCFURNITURETYPE('3UABTzXzbDnAwQIRJnJ$kO',$,'Neufert Washing Machine',$,$,$,(#10783,#10788),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10778=IFCELECTRICAPPLIANCETYPE('3Z3u9w3a11N8E0Z$J6XcGg',$,'Neufert Washing Machine',$,$,$,(#10783,#10788),$,$,.NOTDEFINED.);
 #10779=IFCCARTESIANPOINT((0.,0.,0.));
 #10780=IFCDIRECTION((1.,0.,0.));
 #10781=IFCDIRECTION((0.,0.,1.));
@@ -10816,7 +10816,7 @@ DATA;
 #10809=IFCCARTESIANPOINTLIST2D(((386.75,359.125),(312.375,626.12939453125)));
 #10810=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10797));
 #10811=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10799,#10802,#10805,#10807,#10808));
-#10812=IFCFURNITURETYPE('28$4UCrKfFvhM_N82QBikC',$,'Neufert Drier',$,$,$,(#10817,#10822),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10812=IFCELECTRICAPPLIANCETYPE('34Po40ClzDxftujBwTKoDd',$,'Neufert Drier',$,$,$,(#10817,#10822),$,$,.NOTDEFINED.);
 #10813=IFCCARTESIANPOINT((0.,0.,0.));
 #10814=IFCDIRECTION((1.,0.,0.));
 #10815=IFCDIRECTION((0.,0.,1.));

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/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)

src/blenderbim/blenderbim/bim/handler.py

@@ -22,19 +22,18 @@ 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
 
 
 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]
@@ -75,19 +74,8 @@ def name_callback(obj, data):
     element = IfcStore.get_file().by_id(obj.BIMObjectProperties.ifc_definition_id)
     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,6 +87,53 @@ 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).idname
+    if current_tool != "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):
@@ -224,6 +259,12 @@ 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"
+
+
 @persistent
 def setDefaultProperties(scene):
     global global_subscription_owner
@@ -231,74 +272,21 @@ def setDefaultProperties(scene):
     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 = {}

src/blenderbim/blenderbim/bim/ifc.py

@@ -36,7 +36,6 @@ class IfcStore:
     cache_path = None
     id_map = {}
     guid_map = {}
-    deleted_ids = set()
     edited_objs = set()
     pset_template_path = ""
     pset_template_file = None
@@ -63,7 +62,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
@@ -278,23 +276,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)

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,13 @@ 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"))
+            self.annotations = set([a for a in self.file.by_type("IfcAnnotation") if not a.HasAssignments])
         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")
+            self.annotations = set([a for a in self.file.by_type("IfcAnnotation") if not a.HasAssignments])
 
         self.elements = [e for e in self.elements if not e.is_a("IfcFeatureElement")]
         if self.ifc_import_settings.is_coordinating:
@@ -338,7 +347,8 @@ class IfcImporter:
             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"))
@@ -352,7 +362,7 @@ 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 ("IfcContext", "IfcProject"):
                     break
         return results
 
@@ -372,7 +382,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),
@@ -400,16 +410,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
 
@@ -679,28 +693,31 @@ class IfcImporter:
 
     def create_generic_elements(self, 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)
+        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
         for element in elements:
             self.create_product(element)
 
-    def create_products(self, products):
+    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:
@@ -767,10 +784,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):
@@ -858,40 +875,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
@@ -905,9 +888,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)
@@ -1297,7 +1277,6 @@ class IfcImporter:
         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)
@@ -1332,39 +1311,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 []:
@@ -1407,7 +1390,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))
@@ -1493,183 +1476,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():
@@ -1689,6 +1507,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):
@@ -1703,7 +1523,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"):
@@ -1730,14 +1553,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 []:
@@ -1818,54 +1635,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

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/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/bcf/operator.py

@@ -218,7 +218,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 +233,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 +940,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/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
@@ -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/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")
@@ -229,6 +233,7 @@ class CadHotkey(bpy.types.Operator):
                 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,28 +259,30 @@ 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 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 (
+            (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 (
+            (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()
 
     def hotkey_S_R(self):
         if self.is_profile():
@@ -285,7 +292,9 @@ class CadHotkey(bpy.types.Operator):
             and RoofData.data["parameters"]
             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/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"
@@ -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"}
 
@@ -132,14 +150,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=args.format, delimiter=sep)
         return {"FINISHED"}
 
 
@@ -164,12 +177,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/ui.py

@@ -49,27 +49,18 @@ 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")
 
@@ -78,7 +69,7 @@ class BIM_PT_ifccsv(Panel):
             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 = split.column()

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

@@ -17,11 +17,12 @@
 # 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.AddDrawing,
     operator.AddDrawingStyle,
@@ -29,7 +30,9 @@ classes = (
     operator.AddDrawingToSheet,
     operator.AddSchedule,
     operator.AddScheduleToSheet,
+    operator.AddReferenceToSheet,
     operator.AddSheet,
+    operator.AddTextLiteral,
     operator.BuildSchedule,
     operator.CleanWireframes,
     operator.ContractSheet,
@@ -40,36 +43,42 @@ classes = (
     operator.DisableEditingSchedules,
     operator.DisableEditingSheets,
     operator.DisableEditingText,
-    operator.AddTextLiteral,
-    operator.RemoveTextLiteral,
     operator.DuplicateDrawing,
     operator.EditAssignedProduct,
+    operator.EditSheet,
     operator.EditText,
     operator.EditTextPopup,
-    operator.EditVectorStyle,
     operator.EnableEditingAssignedProduct,
     operator.EnableEditingText,
     operator.ExpandSheet,
     operator.LoadDrawings,
     operator.LoadSchedules,
     operator.LoadSheets,
+    operator.OpenDrawing,
     operator.OpenSchedule,
     operator.OpenSheet,
-    operator.ChangeSheetTitleBlock,
-    operator.OpenView,
     operator.RemoveDrawing,
     operator.RemoveDrawingFromSheet,
     operator.RemoveDrawingStyle,
     operator.RemoveDrawingStyleAttribute,
     operator.RemoveSchedule,
+    operator.ReloadDrawingStyles,
     operator.RemoveSheet,
+    operator.RemoveTextLiteral,
+    operator.SelectAllDrawings,
     operator.ResizeText,
     operator.SaveDrawingStyle,
-    operator.SelectDocIfcFile,
+    operator.SaveDrawingStylesData,
     operator.SelectAssignedProduct,
+    operator.SelectDocIfcFile,
+    operator.LoadReferences,
+    operator.DisableEditingReferences,
+    operator.AddReference,
+    operator.RemoveReference,
+    operator.OpenReference,
     prop.Variable,
     prop.Drawing,
-    prop.Schedule,
+    prop.Document,
     prop.DrawingStyle,
     prop.Sheet,
     prop.DocProperties,
@@ -77,12 +86,14 @@ 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,
@@ -92,11 +103,15 @@ classes = (
     gizmos.DimensionLabelGizmo,
     gizmos.ExtrusionGuidesGizmo,
     gizmos.ExtrusionWidget,
+    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)
@@ -106,7 +121,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,21 +74,24 @@ 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):
+    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]
@@ -101,7 +101,9 @@ class Annotator:
         bm = tool.Blender.get_bmesh_for_mesh(obj.data, clean=True)
         new_verts = [bm.verts.new(v) for v in verts_local]
 
-        bm.faces.new([new_verts[i] for i in face_verts])
+        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
 
@@ -110,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"
@@ -127,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)
@@ -148,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,19 +283,20 @@ 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"
+    # used by Ifc Annotations with ObjectType = "DIMENSION" / "DIAMETER"
     @classmethod
-    def get_dimension_style(cls, obj):
+    def get_dimension_data(cls, obj):
         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")
+        if not element or not element.is_a("IfcAnnotation") or element.ObjectType not in supported_object_types:
             return None
 
         dimension_style = "arrow"
@@ -234,5 +304,43 @@ class DecoratorData:
         if classes and "oblique" in classes.lower().split():
             dimension_style = "oblique"
 
-        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", "")
+        text_suffix = pset_data.get("TextSuffix", "")
+
+        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,
+        }
+        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_types"] = cls.get_relating_types()
+
+    @classmethod
+    def get_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(relating_type)
+
+        enum_items = [(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in relating_types]
+
+        # item to create anootations without relating types
+        enum_items.insert(0, ("0", "-", ""))
+        return enum_items

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

@@ -23,7 +23,7 @@ from bpy import types
 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
 
 
@@ -251,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:
@@ -264,13 +265,17 @@ 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)
 
         gpu.state.blend_set("NONE")
 
@@ -360,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"""
 
@@ -389,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
@@ -407,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"""
 
@@ -486,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
@@ -496,6 +505,7 @@ 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)

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:
+            fmt = "%1." + str(decimal_places) + "f"
+
         # Meters
         if unit_length == "METERS":
-            fmt = "%1.3f"
+            if not decimal_places:
+                fmt = "%1.3f"
             if hide_units is False:
                 fmt += " m"
             tx_dist = fmt % value
         # Centimeters
         elif unit_length == "CENTIMETERS":
-            fmt = "%1.1f"
+            if not decimal_places:
+                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 not decimal_places:
+                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 not decimal_places:
                 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 not decimal_places:
                     fmt = "%1.1f"
                     if hide_units is False:
                         fmt += " cm"
                     d_cm = value * (100)
                     tx_dist = fmt % d_cm
                 else:
-                    fmt = "%1.0f"
+                    if not decimal_places:
+                        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):
@@ -162,13 +169,32 @@ def update_drawing_name(self, context):
     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 +217,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 +243,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,43 +252,27 @@ 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)
 
 
-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")
-
-        if new == old:
-            return
-        sheet = tool.Ifc.get().by_id(self.ifc_definition_id)
-        old_path = Path(tool.Drawing.get_document_uri(sheet))
-        core.update_sheet_name(tool.Ifc, tool.Drawing, sheet=sheet, name=new)
-        self["name"] = new
-
-        new_path = Path(tool.Drawing.get_document_uri(sheet))
-        if old and old_path.is_file():
-            old_path.rename(new_path)
-
-    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", ""),
@@ -285,37 +282,26 @@ 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"
+
+
+RASTER_STYLE_PROPERTIES_EXCLUDE = (
+    "scene.render.filepath",
+)
 
 
 class DocProperties(PropertyGroup):
@@ -325,6 +311,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", ""),
@@ -342,38 +329,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"
     )
-    docs_dir: StringProperty(default=os.path.join(".", "docs") + os.path.sep, name="Default Docs Directory")
-    sheets_dir: StringProperty(default=os.path.join(".", "sheets") + os.path.sep, name="Default Sheets 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")
+    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"
@@ -485,3 +483,62 @@ 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",             "", "MESH_MONKEY", "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_annotation_data_prop(prop_name):
+    def function(self, context):
+        if not AnnotationData.is_loaded:
+            AnnotationData.load()
+        return AnnotationData.data[prop_name]
+
+    return function
+
+
+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_annotation_data_prop("relating_types")
+    )
+    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",
+    )

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,9 +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/>.
 
-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 = """
@@ -29,12 +43,6 @@ BASE_DEF_GLSL = """
 #define lineSmooth true
 """
 
-# 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_LIB_GLSL = """
 // TODO: redefine as macor instead
 uniform vec2 winsize;
@@ -160,12 +168,11 @@ void do_vertex_util(vec4 pos, vec2 ofs)
 
 // geometry utils
 void triangle_head(in vec4 side, in vec4 dir, in float length, in float width, in float radius, out vec4 head[5]) {
-    vec4 nose = side * length;
-    vec4 ear = dir * width;
+    // TODO: radius is unnecessary?
     head[0] = side * -radius;
-    head[1] = nose * -.5;
-    head[2] = vec4(0) + ear;
-    head[3] = nose * .5;
+    head[1] = side * length * -.5;
+    head[2] = dir * width;
+    head[3] = side * length * .5;
     head[4] = side * radius;
 }
 
@@ -189,6 +196,22 @@ void do_circle_head(vec4 pos_w, vec4 head[CIRCLE_SEGS]) {
 """
 
 
+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:
     """Wrapper for GPUShader
     To use for viewport decorations with geometry generated on GPU side.
@@ -265,48 +288,49 @@ class BaseShader:
     """
 
     def __init__(self):
-        # NB: libcode arg doesn't work
-        # TODO: rename to .shader
-        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):
         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
 
         uniform_floats = {
-            "viewMatrix": region3d.perspective_matrix,
-            "winsize": (region.width, region.height),
+            "ModelViewProjectionMatrix": region3d.perspective_matrix,
+            # POLYLINE_UNIFORM_COLOR specific uniforms
+            "viewportSize": (region.width, region.height),
             "lineWidth": 2.5,
         }
 
         for name, value in uniform_floats.items():
-            try:
-                self.prog.uniform_float(name, value)
-                # TODO: shouldn't just try'n'catch them
-                # because they may indicate errors in code
-            except ValueError:  # unused uniform
-                pass
+            shader.uniform_float(name, value)
 
 
-# TODO: add smoothing if this shades is going to be used
+# 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"""
 
@@ -429,37 +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(triangle_strip, max_vertices=MAX_POINTS) out;
+        output_verts = []
+        output_edges = []
+        out_kwargs = {
+            "output_verts": output_verts,
+            "output_edges": output_edges,
+        }
 
-    void main() {
-        // default setup for macro to work
-        vec2 EDGE_DIR;
+        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)
 
-        vec4 p0 = gl_in[0].gl_Position, p1 = gl_in[1].gl_Position;
-        do_edge_verts(p0, p1);
-        EndPrimitive();
-
-        vec4 bx = ModelViewProjectionMatrix[0] * CROSS_SIZE;
-        vec4 by = ModelViewProjectionMatrix[1] * CROSS_SIZE;
-
-        do_edge_verts(p0 - bx, p0 + bx);
-        EndPrimitive();
-        do_edge_verts(p0 - by, p0 + by);
-        EndPrimitive();
-        do_edge_verts(p1 - bx, p1 + bx);
-        EndPrimitive();
-        do_edge_verts(p1 - by, p1 + by);
-        EndPrimitive();
-    }
-    """
+        return output_verts, output_edges

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

@@ -27,6 +27,13 @@ import xml.etree.ElementTree as ET
 import blenderbim.tool as tool
 import ifcopenshell.util.geolocation
 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:
@@ -34,21 +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"
 
-        titleblock_path = os.path.join(self.data_dir, "templates", "titleblocks", titleblock_name + ".svg")
+        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"] = f"./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,33 +73,25 @@ class SheetBuilder:
         root.attrib["height"] = "{}mm".format(view_height)
         root.attrib["viewBox"] = "0 0 {} {}".format(view_width, view_height)
 
-        sheet_dir = os.path.dirname(sheet_path)
-        os.makedirs(sheet_dir, exist_ok=True)
-        os.makedirs(os.path.join(sheet_dir, "titleblocks"), exist_ok=True)
-        sheet_titleblock_path = os.path.join(sheet_dir, "titleblocks", titleblock_name + ".svg")
-        if not os.path.exists(sheet_titleblock_path):
-            shutil.copy(titleblock_path, sheet_titleblock_path)
-        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_path = tool.Drawing.get_document_uri(sheet)
-        sheet_name = os.path.splitext(os.path.basename(sheet_path))[0]
-        sheet_dir = os.path.dirname(sheet_path)
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        layout_dir = os.path.dirname(layout_path)
 
         drawing_path = tool.Drawing.get_document_uri(tool.Drawing.get_drawing_reference(drawing))
-        drawing_path = tool.Ifc.resolve_uri(drawing_path)
         underlay_path = os.path.splitext(drawing_path)[0] + "-underlay.png"
 
-        if not os.path.isfile(sheet_path):
+        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()
@@ -92,85 +99,130 @@ 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_dir)
-        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):
+    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)
-        sheet_dir = os.path.dirname(sheet_path)
+        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"] = os.path.relpath(view_path, sheet_dir)
-        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_dir)
-        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, sheet_dir):
-        title_path = os.path.join(sheet_dir, "assets", "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")
@@ -180,25 +232,27 @@ class SheetBuilder:
         title_root = title_tree.getroot()
         title = ET.SubElement(parent, "image")
         title.attrib["data-type"] = "view-title"
-        title.attrib["xlink:href"] = os.path.relpath(title_path, sheet_dir)
+        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_path = tool.Drawing.get_document_uri(sheet)
-        sheet_name = os.path.splitext(os.path.basename(sheet_path))[0]
-        self.sheet_dir = os.path.dirname(sheet_path)
+        self.references = {"SHEET": None, "RASTER": []}
 
-        docs_dir = tool.Ifc.resolve_uri(os.path.join(bpy.context.scene.DocProperties.docs_dir, sheet_name))
+        layout_path = tool.Drawing.get_document_uri(sheet, "LAYOUT")
+        self.layout_dir = os.path.dirname(layout_path)
 
-        os.makedirs(docs_dir, exist_ok=True)
+        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")
@@ -206,14 +260,14 @@ class SheetBuilder:
 
         self.build_titleblock(root, sheet)
         self.build_drawings(root, sheet)
-        self.build_schedules(root)
+        self.build_schedules(root, sheet)
 
-        output_filename = os.path.join(docs_dir, f"{sheet_name}.svg")
-
-        with open(output_filename, "wb") as output:
+        with open(sheet_path, "wb") as output:
             tree.write(output)
 
-        return output_filename
+        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]
@@ -228,10 +282,61 @@ 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
+
+        # replace urls url(#marker) with url(#prefix-marker)
+        # since url(#marker.prefix) doesn't seem to work
+        text = re.sub(r"url\(#([^\)]+)\)", rf"url(#{prefix}-\1)", text)
+        style.text = 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 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"])
 
@@ -250,15 +355,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))
-                shutil.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)
@@ -267,7 +377,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"]))
@@ -289,6 +399,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))
@@ -319,7 +430,7 @@ class SheetBuilder:
         self.defs.append(clip_path)
 
         svg_path = self.get_href(image)
-        with open(os.path.join(self.sheet_dir, 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"] = ""
@@ -336,23 +447,29 @@ class SheetBuilder:
         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")
 
-        titleblock_svg_path = os.path.join(self.data_dir, "templates", "titleblocks", f"{titleblock_name}.svg")
-        view_root = ET.parse(titleblock_svg_path).getroot()
+        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_dir = os.path.join(self.data_dir, "sheets")
-        sheet_name = os.path.splitext(os.path.basename(tool.Drawing.get_document_uri(sheet)))[0]
-        sheet_path = os.path.join(sheet_dir, sheet_name + ".svg")
         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"] = f"../templates/titleblocks/{titleblock_name}.svg"
+        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)
 

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

@@ -85,13 +85,7 @@ class SvgWriter:
         self.svg.save(pretty=True)
 
     def draw_underlay(self, image):
-        self.svg.add(
-            self.svg.image(
-                os.path.join("..", "diagrams", os.path.basename(image)),
-                width=self.width,
-                height=self.height,
-            )
-        )
+        self.svg.add(self.svg.image(os.path.basename(image), width=self.width, height=self.height))
         return self
 
     def setup_drawing_resource_paths(self, element):
@@ -99,14 +93,16 @@ class SvgWriter:
         for resource in ("Stylesheet", "Markers", "Symbols", "Patterns"):
             resource_path = pset.get(resource)
             if not resource_path:
+                self.resource_paths[resource] = None
                 continue
+            resource_path = tool.Ifc.resolve_uri(resource_path)
             os.makedirs(os.path.dirname(resource_path), exist_ok=True)
             if not os.path.exists(resource_path):
                 resource_basename = os.path.basename(resource_path)
                 ootb_resource = os.path.join(bpy.context.scene.BIMProperties.data_dir, "assets", resource_basename)
                 if os.path.exists(ootb_resource):
                     shutil.copy(ootb_resource, resource_path)
-            self.resource_paths[resource] = tool.Ifc.resolve_uri(resource_path)
+            self.resource_paths[resource] = resource_path
 
     def define_boilerplate(self):
         self.add_stylesheet()
@@ -159,7 +155,9 @@ class SvgWriter:
         for child in root:
             self.svg.defs.add(External(child))
 
-    def draw_annotations(self, annotations):
+    def draw_annotations(self, annotations, precision, decimal_places):
+        self.precision = precision
+        self.decimal_places = decimal_places
         for element in annotations:
             obj = tool.Ifc.get_object(element)
             if not obj or element.ObjectType == "DRAWING":
@@ -227,21 +225,24 @@ class SvgWriter:
                 )
             )
             # TODO: allow metric to be configurable
-            rl = (matrix_world @ points[0].co.xyz).z
+            rl_value = (matrix_world @ points[0].co.xyz).z
             if bpy.context.scene.unit_settings.system == "IMPERIAL":
-                rl = helper.format_distance(rl)
+                rl = helper.format_distance(rl_value, precision=self.precision, decimal_places=self.decimal_places)
             else:
                 unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-                rl /= unit_scale
+                rl = rl_value / unit_scale
                 rl = ifcopenshell.util.geolocation.auto_z2e(tool.Ifc.get(), rl)
                 rl *= unit_scale
                 rl = "{:.3f}m".format(rl)
-            text_style = {
-                "text-anchor": "start",
-                "alignment-baseline": "baseline",
-                "dominant-baseline": "baseline",
-            }
-            self.svg.add(self.svg.text(f"RL +{rl}", insert=tuple(text_position), class_="SECTIONLEVEL", **text_style))
+            text_style = SvgWriter.get_box_alignment_parameters("bottom-left")
+            self.svg.add(
+                self.svg.text(
+                    "RL {}{}".format("" if rl_value < 0 else "+", rl),
+                    insert=tuple(text_position),
+                    class_="SECTIONLEVEL",
+                    **text_style,
+                )
+            )
             if tag:
                 self.svg.add(self.svg.text(tag, insert=(text_position[0], text_position[1] - 5), **text_style))
 
@@ -269,11 +270,7 @@ class SvgWriter:
                     "UP",
                     insert=tuple(text_position),
                     class_="STAIR",
-                    **{
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    },
+                    **SvgWriter.get_box_alignment_parameters("center"),
                 )
             )
 
@@ -297,16 +294,13 @@ class SvgWriter:
             )
             line["stroke-dasharray"] = "12.5, 3, 3, 3"
             axis_tag = tool.Ifc.get_entity(obj).Name
+            text_style = SvgWriter.get_box_alignment_parameters("center")
             self.svg.add(
                 self.svg.text(
                     axis_tag,
                     insert=tuple(start * self.svg_scale),
                     class_="GRID",
-                    **{
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    },
+                    **text_style,
                 )
             )
             self.svg.add(
@@ -314,11 +308,7 @@ class SvgWriter:
                     axis_tag,
                     insert=tuple(end * self.svg_scale),
                     class_="GRID",
-                    **{
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    },
+                    **text_style,
                 )
             )
 
@@ -357,7 +347,7 @@ class SvgWriter:
     def get_attribute_classes(self, obj):
         element = tool.Ifc.get_entity(obj)
         global_id = "GlobalId-{}".format(element.GlobalId)
-        predefined_type = "PredefinedType-" + self.canonicalise_class_name(
+        predefined_type = "PredefinedType-" + tool.Drawing.canonicalise_class_name(
             str(ifcopenshell.util.element.get_predefined_type(element))
         )
         classes = [global_id, element.is_a(), predefined_type]
@@ -367,12 +357,11 @@ class SvgWriter:
         for key in self.metadata:
             value = ifcopenshell.util.selector.get_element_value(element, key)
             if value:
-                classes.append(self.canonicalise_class_name(key) + "-" + self.canonicalise_class_name(str(value)))
+                classes.append(
+                    tool.Drawing.canonicalise_class_name(key) + "-" + tool.Drawing.canonicalise_class_name(str(value))
+                )
         return classes
 
-    def canonicalise_class_name(self, name):
-        return re.sub("[^0-9a-zA-Z]+", "", name)
-
     def draw_line_annotation(self, obj):
         # TODO: properly scope these offsets
         x_offset = self.raw_width / 2
@@ -414,8 +403,7 @@ class SvgWriter:
                 self.svg.line(start=start * self.svg_scale, end=end * self.svg_scale, class_=" ".join(classes))
             )
 
-        # BATTING ANNOTATIONS
-        if predefined_type == "BATTING":
+        def draw_batting_annotation():
             v0_global = matrix_world @ obj.data.vertices[0].co.xyz
             v1_global = matrix_world @ obj.data.vertices[1].co.xyz
             v0 = self.project_point_onto_camera(v0_global)
@@ -481,7 +469,94 @@ class SvgWriter:
             )
             self.svg.add(self.svg.polyline(points=points, class_=" ".join(classes), style=polyline_style))
 
-        elif predefined_type == "SECTION":
+        def draw_revision_cloud_annotation():
+            segment_width = 15.0
+            base_height = 1
+            width = 5
+
+            def get_svg_half_circle(height, width):
+                cp0 = f"0,-{height}"
+                cp1 = f"{width},-{height}"
+                end_point = f"{width},0"
+                circle = f"c{cp0} {cp1} {end_point}"
+                return circle
+
+            def get_revision_pattern(base_offset):
+                pattern = f"m{base_offset.x},{base_offset.y}"
+                pattern += " " + get_svg_half_circle(2 * base_height, width)
+                pattern += " " + get_svg_half_circle(2.5 * base_height, width)
+                pattern += " " + get_svg_half_circle(1.5 * base_height, width)
+                return pattern
+
+            def get_scale(size, direction):
+                vector = direction * size
+                shrinked_vector = size // segment_width * segment_width * direction
+                scale = [1 if vector[i] == 0 else vector[i] / shrinked_vector[i] for i in range(2)]
+                return "scale(%f, %f)" % (scale[0], scale[1])
+
+            def poly_to_edges(poly):
+                edges = []
+                n_verts = len(poly)
+                lats_index = n_verts - 1
+                for i in range(len(poly)):
+                    edge = [poly[i], (poly[i + 1]) if i != lats_index else poly[0]]
+                    edges.append(edge)
+                return edges
+
+            element = tool.Ifc.get_entity(obj)
+            safe_offset_x = 2.0
+            marker_width = segment_width + safe_offset_x * 2
+            market_height = 15.0
+            ref_y = 5.0
+            revision_pattern = get_revision_pattern(Vector([safe_offset_x, ref_y]))
+
+            bm = tool.Blender.get_bmesh_for_mesh(obj.data).copy()
+            bmesh.ops.contextual_create(bm, geom=bm.edges[:])
+            faces = bm.faces[:]
+            assert len(faces) == 1, "Revision cloud edges must form just 1 polygon"
+
+            # ensure clockwise order of polygon verts
+            # given default blender counter-clockwise order
+            polygon = faces[0]
+            if polygon.normal.z > 0:
+                polygon.normal_flip()
+
+            marker_id = f"revision-cloud-{element.GlobalId}"
+            svg_path = self.svg.path(style="fill: none; stroke:red; stroke-width:0.20", d=revision_pattern)
+            marker = self.svg.marker(
+                markerUnits="userSpaceOnUse",
+                insert=(safe_offset_x, ref_y),
+                size=(marker_width, market_height),
+                orient="auto",
+                id=marker_id,
+            )
+            marker.add(svg_path)
+            self.svg.add(marker)
+
+            for v0, v1 in poly_to_edges(polygon.verts):
+                v0_global = matrix_world @ v0.co.xyz
+                v1_global = matrix_world @ v1.co.xyz
+                v0 = self.project_point_onto_camera(v0_global)
+                v1 = self.project_point_onto_camera(v1_global)
+                start_svg = Vector(((x_offset + v0.x), (y_offset - v0.y))) * self.svg_scale
+                end_svg = Vector(((x_offset + v1.x), (y_offset - v1.y))) * self.svg_scale
+
+                pattern_edge = end_svg - start_svg
+                pattern_dir = pattern_edge.normalized()
+                pattern_length = pattern_edge.length
+
+                segments = int(pattern_length // segment_width)
+                pattern_dir_step = pattern_dir * segment_width
+                points = [pattern_dir_step * i for i in range(segments)]
+
+                polyline_style = f"marker: url(#{marker_id}); stroke: none;"
+                polyline_transform = f"translate({start_svg.x}, {start_svg.y}) {get_scale(pattern_length, pattern_dir)}"
+                polyline = self.svg.polyline(
+                    points=points, class_=" ".join(classes), style=polyline_style, transform=polyline_transform
+                )
+                self.svg.add(polyline)
+
+        def draw_section_annotation():
             display_data = DecoratorData.get_section_markers_display_data(obj)
             connect_markers = display_data["connect_markers"]
 
@@ -522,6 +597,12 @@ class SvgWriter:
                             )
                         )
 
+        if predefined_type == "BATTING":
+            draw_batting_annotation()
+        elif predefined_type == "REVISIONCLOUD":
+            draw_revision_cloud_annotation()
+        elif predefined_type == "SECTION":
+            draw_section_annotation()
         else:
             for edge in obj.data.edges:
                 draw_simple_edge_annotation(*edge.vertices[:])
@@ -575,11 +656,7 @@ class SvgWriter:
 
                     reference_id, sheet_id = self.get_reference_and_sheet_id_from_annotation(tool.Ifc.get_entity(obj))
                     text_position = symbol_position_svg
-                    text_style = {
-                        "text-anchor": "middle",
-                        "alignment-baseline": "middle",
-                        "dominant-baseline": "middle",
-                    }
+                    text_style = SvgWriter.get_box_alignment_parameters("center")
                     self.svg.add(
                         self.svg.text(
                             reference_id,
@@ -612,11 +689,7 @@ class SvgWriter:
 
         reference_id, sheet_id = self.get_reference_and_sheet_id_from_annotation(tool.Ifc.get_entity(obj))
         text_position = symbol_position_svg
-        text_style = {
-            "text-anchor": "middle",
-            "alignment-baseline": "middle",
-            "dominant-baseline": "middle",
-        }
+        text_style = SvgWriter.get_box_alignment_parameters("center")
         self.svg.add(
             self.svg.text(
                 reference_id, insert=(text_position[0], text_position[1] - 2.5), class_="ELEVATION", **text_style
@@ -643,6 +716,44 @@ class SvgWriter:
                 return (reference_id, sheet_id)
         return ("-", "-")
 
+    @staticmethod
+    def get_box_alignment_parameters(box_alignment):
+        """Convenience method to get svg parameters for text alignment
+        in a readable way.
+
+        Metehod expecting values like:
+
+        `top-left`, `top-middle`, `top-right`,
+
+        `middle-left`, `center`, `middle-right`,
+
+        `bottom-left`, `bottom-middle`, `bottom-right`
+        """
+        # reference for alignment values:
+        # https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/text-anchor
+        # https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/alignment-baseline
+        vertical_alignment = {
+            "top": "hanging",
+            "bottom": "baseline",
+            "center": "middle",
+            "middle": "middle",
+        }
+        alignment_baseline = vertical_alignment[next(align for align in vertical_alignment if align in box_alignment)]
+        horizontal_alignment = {
+            "left": "start",
+            "right": "end",
+            "center": "middle",
+            "middle": "middle",
+        }
+        text_anchor = horizontal_alignment[next(align for align in horizontal_alignment if align in box_alignment)]
+
+        # using dominant-baseline because we plan to use <tspan> subtags
+        # otherwise alignment-baseline would be sufficient
+        return {
+            "dominant-baseline": alignment_baseline,
+            "text-anchor": text_anchor,
+        }
+
     def draw_text_annotation(self, text_obj, position):
         x_offset = self.raw_width / 2
         y_offset = self.raw_height / 2
@@ -653,22 +764,28 @@ class SvgWriter:
         text_position = self.project_point_onto_camera(position)
         text_position = Vector(((x_offset + text_position.x), (y_offset - text_position.y)))
         text_position_svg = text_position * self.svg_scale
+        text_position_svg_str = ", ".join(map(str, text_position_svg))
 
-        local_x_axis = text_obj.matrix_world.to_quaternion() @ Vector((1, 0, 0))
-        projected_x_axis = self.project_point_onto_camera(position + local_x_axis)
-        angle = math.degrees(
-            (Vector((x_offset + projected_x_axis.x, y_offset - projected_x_axis.y)) - text_position).angle_signed(
-                Vector((1, 0))
-            )
-        )
+        def get_basis_vector(matrix, i=0):
+            """returns basis vector for i in world space, unaffected by object scale"""
+            return matrix.inverted()[i].to_3d().normalized()
+
+        text_dir_world_x_axis = get_basis_vector(text_obj.matrix_world)
+        text_dir = (self.camera.matrix_world.inverted().to_quaternion() @ text_dir_world_x_axis).to_2d().normalized()
+        angle = math.degrees(-text_dir.angle_signed(Vector((1, 0))))
 
-        transform = "rotate({}, {}, {})".format(angle, *text_position_svg)
         classes = self.get_attribute_classes(text_obj)
         classes_str = " ".join(classes)
 
         symbol = tool.Drawing.get_annotation_symbol(element)
         template_text_fields = []
-        if symbol:
+        if not symbol:
+            text_transform = f"translate({text_position_svg_str}) rotate({angle})"
+        else:
+            # NOTE: for now we assume that scale is uniform
+            symbol_transform = f"translate({text_position_svg_str}) rotate({angle}) scale({text_obj.scale.x})"
+            text_transform = symbol_transform
+
             symbol_svg = self.find_xml_symbol_by_id(symbol)
             if symbol_svg:
                 symbol_xml = symbol_svg.get_xml()
@@ -676,7 +793,7 @@ class SvgWriter:
                 # if there is a symbol with template text fields
                 # then we just populate it's fields with the data from text literals
                 if template_text_fields:
-                    symbol_xml.attrib["transform"] = f"translate({', '.join(map(str, text_position_svg))})"
+                    symbol_xml.attrib["transform"] = symbol_transform
                     symbol_xml.attrib.pop("id")
                     # note: zip makes sure that we iterate over the shortest list
                     for field, text_literal in zip(template_text_fields, text_literals):
@@ -686,36 +803,9 @@ class SvgWriter:
                     return None
 
             if not symbol_svg or not template_text_fields:
-                self.svg.add(self.svg.use(f"#{symbol}", insert=text_position_svg))
-
-        def get_box_alignment_parameters(box_alignment):
-            # reference for alignment values:
-            # https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/text-anchor
-            # https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/alignment-baseline
-            vertical_alignment = {
-                "top": "hanging",
-                "bottom": "baseline",
-                "center": "middle",
-                "middle": "middle",
-            }
-            alignment_baseline = vertical_alignment[
-                next(align for align in vertical_alignment if align in box_alignment)
-            ]
-            horizontal_alignment = {
-                "left": "start",
-                "right": "end",
-                "center": "middle",
-                "middle": "middle",
-            }
-            text_anchor = horizontal_alignment[next(align for align in horizontal_alignment if align in box_alignment)]
-
-            # using dominant-baseline because we plan to use <tspan> subtags
-            # otherwise alignment-baseline would be sufficient
-            return {
-                "dominant-baseline": alignment_baseline,
-                "text-anchor": text_anchor,
-            }
+                self.svg.add(self.svg.use(f"#{symbol}", transform=symbol_transform))
 
+        line_number = 0
         for text_literal in text_literals:
             # after pretty indentation some redundant spaces can occur in svg tags
             # this is why we apply "font-size: 0;" to the text tag to remove those spaces
@@ -723,34 +813,35 @@ class SvgWriter:
             # ref: https://github.com/IfcOpenShell/IfcOpenShell/issues/2833#issuecomment-1471584960
 
             text = tool.Drawing.replace_text_literal_variables(text_literal.Literal, product)
-            text_tag = self.svg.text(
-                "",
-                **{
-                    "transform": transform,
-                    "style": "font-size: 0;",
-                },
-                **get_box_alignment_parameters(text_literal.BoxAlignment),
-            )
-            self.svg.add(text_tag)
+            attribs = {
+                "transform": text_transform,
+                "style": "font-size: 0;",
+            }
 
-            text_lines = text.replace("\\n", "\n").split("\n")
-
-            # adding fill background tspan
-            # tspans and text doesn't support setting up "background-color"
-            # so we add a filter, we do it in separate span because otherwise it will produce blurry image
-            # adding just 1 tspan seems to work
-            if "fill-bg" in classes:
-                tspan = self.svg.tspan(
-                    text_lines[0], class_=classes_str, insert=text_position_svg, filter="url(#fill-background)"
+            def add_text_tag(add_fill_bg):
+                nonlocal line_number
+                text_tag = self.svg.text(
+                    "",
+                    **(attribs | {"filter": "url(#fill-background)"}) if add_fill_bg else attribs,
+                    **SvgWriter.get_box_alignment_parameters(text_literal.BoxAlignment),
                 )
-                text_tag.add(tspan)
+                self.svg.add(text_tag)
 
-            for line_number, text_line in enumerate(text_lines):
-                # position has to be inserted at tspan to avoid x offset between tspans
-                tspan = self.svg.tspan(text_line, class_=classes_str, insert=text_position_svg)
-                # doing it here and not in tspan constructor because constructor adds unnecessary spaces
-                tspan.update({"dy": f"{line_number}em"})
-                text_tag.add(tspan)
+                text_lines = text.replace("\\n", "\n").split("\n")
+
+                for text_line in text_lines:
+                    # position has to be inserted at tspan to avoid x offset between tspans
+                    # note that tspan doesn't support using `transform` attribute
+                    # so we use (0,0) position because tspan is already offseted by text transform
+                    tspan = self.svg.tspan(text_line, class_=classes_str, insert=(0, 0))
+                    # doing it here and not in tspan constructor because constructor adds unnecessary spaces
+                    tspan.update({"dy": f"{line_number}em"})
+                    text_tag.add(tspan)
+                    line_number += 1
+
+            if "fill-bg" in classes:
+                add_text_tag(True)
+            add_text_tag(False)
 
     def draw_break_annotations(self, obj):
         x_offset = self.raw_width / 2
@@ -794,33 +885,28 @@ class SvgWriter:
             text_position = Vector(
                 (
                     (x_offset + projected_points[0].x) * self.svg_scale,
-                    ((y_offset - projected_points[0].y) * self.svg_scale) - 2.5,
+                    ((y_offset - projected_points[0].y) * self.svg_scale) - 1.0,
                 )
             )
             # TODO: allow metric to be configurable
-            rl = ((matrix_world @ points[0].co).xyz + obj.location).z
+            rl_value = (matrix_world @ points[0].co).z
             if bpy.context.scene.unit_settings.system == "IMPERIAL":
-                rl = helper.format_distance(rl)
+                rl = helper.format_distance(rl_value, precision=self.precision, decimal_places=self.decimal_places)
             else:
                 unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-                rl /= unit_scale
+                rl = rl_value / unit_scale
                 rl = ifcopenshell.util.geolocation.auto_z2e(tool.Ifc.get(), rl)
                 rl *= unit_scale
                 rl = "{:.3f}m".format(rl)
-            if projected_points[0].x > projected_points[-1].x:
-                text_anchor = "end"
-            else:
-                text_anchor = "start"
+
+            box_alignment = "bottom-left" if projected_points[0].x <= projected_points[-1].x else "bottom-right"
+            text_style = SvgWriter.get_box_alignment_parameters(box_alignment)
             self.svg.add(
                 self.svg.text(
-                    "RL +{}".format(rl),
+                    "{}{}".format("" if rl_value < 0 else "+", rl),
                     insert=tuple(text_position),
                     class_="PLANLEVEL",
-                    **{
-                        "text-anchor": text_anchor,
-                        "alignment-baseline": "baseline",
-                        "dominant-baseline": "baseline",
-                    },
+                    **text_style,
                 )
             )
 
@@ -936,12 +1022,7 @@ class SvgWriter:
         text_offset = (text_position - center_position).xy.normalized() * 5
         text_position += text_offset
 
-        text_style = {
-            "text-anchor": "middle",
-            "alignment-baseline": "middle",
-            "dominant-baseline": "middle",
-        }
-
+        text_style = SvgWriter.get_box_alignment_parameters("center")
         angle_text = abs(round(math.degrees(angle), 3))
         if is_reflex:
             angle_text = 360 - angle_text
@@ -1002,14 +1083,9 @@ class SvgWriter:
             )
             text_position += text_offset
 
-            text_style = {
-                "text-anchor": "middle",
-                "alignment-baseline": "middle",
-                "dominant-baseline": "middle",
-            }
-
+            text_style = SvgWriter.get_box_alignment_parameters("center")
             radius = (points[-1].co - points[-2].co).length
-            radius = helper.format_distance(radius)
+            radius = helper.format_distance(radius, precision=self.precision, decimal_places=self.decimal_places)
             tag = element.Description or f"R{radius}"
 
             self.svg.add(self.svg.text(tag, insert=tuple(text_position), class_="RADIUS", **text_style))
@@ -1065,7 +1141,7 @@ class SvgWriter:
                 elif element.ObjectType == "SLOPE_FRACTION":
                     if angle == 90:
                         return "-"
-                    return f"{helper.format_distance(rise)} / {helper.format_distance(run)}"
+                    return f"{helper.format_distance(rise, precision=self.precision, decimal_places=self.decimal_places)} / {helper.format_distance(run, precision=self.precision, decimal_places=self.decimal_places)}"
                 elif element.ObjectType == "SLOPE_PERCENT":
                     if angle == 90:
                         return "-"
@@ -1080,19 +1156,16 @@ class SvgWriter:
             )
             text_position += text_offset
 
-            text_style = {
-                "text-anchor": "middle",
-                "alignment-baseline": "middle",
-                "dominant-baseline": "middle",
-            }
-
+            text_style = SvgWriter.get_box_alignment_parameters("center")
             self.svg.add(self.svg.text(tag, insert=tuple(text_position), class_="RADIUS", **text_style))
 
     def draw_diameter_annotations(self, obj):
         classes = self.get_attribute_classes(obj)
         matrix_world = obj.matrix_world
         element = tool.Ifc.get_entity(obj)
-        text_override = element.Description
+        dimension_text = element.Description
+        dimension_data = DecoratorData.get_dimension_data(obj)
+
         for spline in obj.data.splines:
             points = self.get_spline_points(spline)
             for i, p in enumerate(points):
@@ -1101,22 +1174,39 @@ class SvgWriter:
                 v0_global = matrix_world @ points[i].co.xyz
                 v1_global = matrix_world @ points[i + 1].co.xyz
                 self.draw_dimension_annotation(
-                    v0_global, v1_global, classes, text_override, text_format=lambda x: "D" + x
+                    v0_global,
+                    v1_global,
+                    classes,
+                    dimension_text,
+                    text_format=lambda x: "D" + x,
+                    show_description_only=dimension_data["show_description_only"],
+                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
+                    text_prefix=dimension_data["text_prefix"],
+                    text_suffix=dimension_data["text_suffix"],
                 )
 
     def draw_dimension_annotations(self, obj):
         classes = self.get_attribute_classes(obj)
         matrix_world = obj.matrix_world
         element = tool.Ifc.get_entity(obj)
-        text_override = element.Description
+        dimension_text = element.Description
+        dimension_data = DecoratorData.get_dimension_data(obj)
+
         for spline in obj.data.splines:
             points = self.get_spline_points(spline)
-            for i, p in enumerate(points):
-                if i + 1 >= len(points):
-                    continue
+            for i in range(len(points) - 1):
                 v0_global = matrix_world @ points[i].co.xyz
                 v1_global = matrix_world @ points[i + 1].co.xyz
-                self.draw_dimension_annotation(v0_global, v1_global, classes, text_override)
+                self.draw_dimension_annotation(
+                    v0_global,
+                    v1_global,
+                    classes,
+                    dimension_text=dimension_text,
+                    show_description_only=dimension_data["show_description_only"],
+                    suppress_zero_inches=dimension_data["suppress_zero_inches"],
+                    text_prefix=dimension_data["text_prefix"],
+                    text_suffix=dimension_data["text_suffix"],
+                )
 
     def draw_measureit_arch_dimension_annotations(self):
         try:
@@ -1130,46 +1220,117 @@ class SvgWriter:
                 Vector(coord[0]), Vector(coord[1]), ["IfcAnnotation", "PredefinedType-DIMENSION"]
             )
 
-    def draw_dimension_annotation(self, v0_global, v1_global, classes, text_override=None, text_format=lambda x: x):
-        x_offset = self.raw_width / 2
-        y_offset = self.raw_height / 2
+    def draw_dimension_annotation(
+        self,
+        v0_global,
+        v1_global,
+        classes,
+        dimension_text=None,
+        text_format=lambda x: x,
+        show_description_only=False,
+        suppress_zero_inches=False,
+        text_prefix="",
+        text_suffix="",
+    ):
+        offset = Vector([self.raw_width, self.raw_height]) / 2
         v0 = self.project_point_onto_camera(v0_global)
         v1 = self.project_point_onto_camera(v1_global)
-        start = Vector(((x_offset + v0.x), (y_offset - v0.y)))
-        end = Vector(((x_offset + v1.x), (y_offset - v1.y)))
+        start = (offset + v0.xy * Vector((1, -1))) * self.svg_scale
+        end = (offset + v1.xy * Vector((1, -1))) * self.svg_scale
         mid = ((end - start) / 2) + start
         vector = end - start
         perpendicular = Vector((vector.y, -vector.x)).normalized()
         dimension = (v1_global - v0_global).length
-        dimension = helper.format_distance(dimension)
-        sheet_dimension = ((end * self.svg_scale) - (start * self.svg_scale)).length
-        if sheet_dimension < 5:  # annotation can't fit
-            # offset text to right of marker
-            text_position = (end * self.svg_scale) + perpendicular + (3 * vector.normalized())
-        else:
-            text_position = (mid * self.svg_scale) + perpendicular
-        rotation = math.degrees(vector.angle_signed(Vector((1, 0))))
-        line = self.svg.add(
-            self.svg.line(
-                start=tuple(start * self.svg_scale), end=tuple(end * self.svg_scale), class_=" ".join(classes)
-            )
+        dimension = helper.format_distance(
+            dimension,
+            precision=self.precision,
+            decimal_places=self.decimal_places,
+            suppress_zero_inches=suppress_zero_inches,
         )
-        if text_override is not None:
-            text = text_override
-        else:
-            text = str(dimension)
-        text = text_format(text)
-        self.svg.add(
-            self.svg.text(
+        sheet_dimension = (end - start).length
+
+        # if annotation can't fit offset text to the right of marker
+        text_position = mid if sheet_dimension > 5 else (end + (3 * vector.normalized()))
+        angle = math.degrees(vector.angle_signed(Vector((1, 0))))
+
+        line = self.svg.line(start=start, end=end, class_=" ".join(classes))
+        self.svg.add(line)
+
+        if not show_description_only:
+            text = f"{text_prefix}{str(dimension)}{text_suffix}"
+            text_tag = self.create_text_tag(
                 text,
-                insert=tuple(text_position),
-                class_="DIMENSION",
-                **{
-                    "transform": "rotate({} {} {})".format(rotation, text_position.x, text_position.y),
-                    "text-anchor": "middle",
-                },
+                text_position + perpendicular,
+                angle,
+                "bottom-middle",
+                "DIMENSION",
+                text_format=text_format,
+                multiline=True,
+                multiline_to_bottom=False,
             )
-        )
+            self.svg.add(text_tag)
+            if dimension_text:
+                text_tag = self.create_text_tag(
+                    dimension_text,
+                    text_position - perpendicular,
+                    angle,
+                    "top-middle",
+                    "DIMENSION",
+                    text_format=text_format,
+                    multiline=True,
+                    multiline_to_bottom=True,
+                )
+                self.svg.add(text_tag)
+
+        elif show_description_only and dimension_text:
+            text_tag = self.create_text_tag(
+                dimension_text,
+                text_position + perpendicular,
+                angle,
+                "bottom-middle",
+                "DIMENSION",
+                text_format=text_format,
+                multiline=True,
+                multiline_to_bottom=False,
+            )
+            self.svg.add(text_tag)
+
+    def create_text_tag(
+        self,
+        text,
+        text_position,
+        angle,
+        box_alignment,
+        class_str,
+        text_format=lambda x: x,
+        multiline=False,
+        multiline_to_bottom=False,
+    ):
+        if not multiline:
+            text_kwargs = {"transform": "rotate({} {} {})".format(angle, text_position.x, text_position.y)}
+            return self.svg.text(
+                text_format(text),
+                insert=text_position,
+                class_=class_str,
+                **(text_kwargs | SvgWriter.get_box_alignment_parameters(box_alignment)),
+            )
+
+        text_position_svg_str = ", ".join(map(str, text_position))
+        text_transform = f"translate({text_position_svg_str}) rotate({angle})"
+        text_kwargs = {
+            "transform": text_transform,
+            "style": "font-size: 0;",
+        }
+
+        text_tag = self.svg.text("", **text_kwargs, **SvgWriter.get_box_alignment_parameters(box_alignment))
+        text_lines = text.replace("\\n", "\n").split("\n")
+        text_lines = text_lines if multiline_to_bottom else text_lines[::-1]
+
+        for line_number, text_line in enumerate(text_lines):
+            tspan = self.svg.tspan(text_format(text_line), class_=class_str, insert=(0, 0))
+            tspan.update({"dy": f"{line_number if multiline_to_bottom else -line_number}em"})
+            text_tag.add(tspan)
+        return text_tag
 
     def project_point_onto_camera(self, point):
         # TODO is this needlessly complex?

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,41 +109,53 @@ 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):
@@ -158,6 +173,10 @@ class BIM_PT_drawings(Panel):
         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:
@@ -185,9 +204,11 @@ class BIM_PT_drawings(Panel):
                 ).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="")
+                op = row.operator("bim.open_drawing", icon="URL", text="")
                 op.view = active_drawing.name
-                op = row.operator("bim.activate_view", icon="OUTLINER_OB_CAMERA", text="")
+                row.operator("bim.activate_model", icon="VIEW3D", text="")
+                op = row.operator("bim.activate_drawing", icon="OUTLINER_OB_CAMERA", text="")
                 op.drawing = active_drawing.ifc_definition_id
                 row.operator("bim.create_drawing", text="", icon="OUTPUT")
             self.layout.template_list(
@@ -217,14 +238,18 @@ class BIM_PT_schedules(Panel):
         return 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,6 +273,58 @@ class BIM_PT_schedules(Panel):
             )
 
 
+def draw_project_not_saved_ui(self):
+    row = self.layout.row()
+    row.label(text="Project Not Yet Saved", icon="ERROR")
+    row = self.layout.row()
+    op = row.operator("export_ifc.bim", icon="EXPORT", text="Save Project")
+    op.should_save_as = False
+
+
+class BIM_PT_references(Panel):
+    bl_label = "References"
+    bl_idname = "BIM_PT_references"
+    bl_space_type = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_category = "BIM Documentation"
+
+    @classmethod
+    def poll(cls, context):
+        return 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"
@@ -263,6 +340,10 @@ class BIM_PT_sheets(Panel):
         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:
@@ -274,16 +355,17 @@ class BIM_PT_sheets(Panel):
         row = self.layout.row(align=True)
         row.prop(self.props, "titleblock", text="")
         row.operator("bim.add_sheet", text="", icon="ADD")
-        row.operator("bim.change_sheet_title_block", text="", icon="MODIFIER_DATA")
         row.operator("bim.disable_editing_sheets", text="", icon="CANCEL")
 
         if self.props.sheets and self.props.active_sheet_index < len(self.props.sheets):
             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
@@ -344,7 +426,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
@@ -422,56 +504,55 @@ class BIM_PT_annotation_utilities(Panel):
         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.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op = row.operator("bim.add_annotation", text="Angle", icon="DRIVER_ROTATIONAL_DIFFERENCE")
         op.object_type = "ANGLE"
-        op.data_type = "curve"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         row = layout.row(align=True)
         op = row.operator("bim.add_annotation", text="Radius", icon="FORWARD")
         op.object_type = "RADIUS"
-        op.data_type = "curve"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op = row.operator("bim.add_annotation", text="Diameter", icon="ARROW_LEFTRIGHT")
         op.object_type = "DIAMETER"
-        op.data_type = "curve"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         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.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op = row.operator("bim.add_annotation", text="Leader", icon="TRACKING_BACKWARDS")
         op.object_type = "TEXT_LEADER"
-        op.data_type = "curve"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         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.description = "Add stair arrow annotation.\nIf you have IfcStairFlight object selected, it will be used as a reference for the annotation"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op = row.operator("bim.add_annotation", text="Hidden", icon="CON_TRACKTO")
         op.object_type = "HIDDEN_LINE"
-        op.data_type = "mesh"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         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.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op = row.operator("bim.add_annotation", text="Level (Section)", icon="TRIA_DOWN")
         op.object_type = "SECTION_LEVEL"
-        op.data_type = "curve"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         row = layout.row(align=True)
         op = row.operator("bim.add_annotation", text="Breakline", icon="FCURVE")
         op.object_type = "BREAKLINE"
-        op.data_type = "mesh"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op = row.operator("bim.add_annotation", text="Line", icon="MESH_MONKEY")
         op.object_type = "LINEWORK"
-        op.data_type = "mesh"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         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.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
         op.description = "Add batting annotation.\nThickness could be changed through Thickness property of BBIM_Batting property set"
         op = row.operator("bim.add_annotation", text="Fill Area", icon="NODE_TEXTURE")
         op.object_type = "FILL_AREA"
@@ -479,7 +560,10 @@ class BIM_PT_annotation_utilities(Panel):
         row = layout.row(align=True)
         op = row.operator("bim.add_annotation", text="Fall", icon="SORT_ASC")
         op.object_type = "FALL"
-        op.data_type = "curve"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
+        op = row.operator("bim.add_annotation", text="Revision", icon="VOLUME_DATA")
+        op.object_type = "REVISION_CLOUD"
+        op.data_type = tool.Drawing.get_annotation_data_type(op.object_type)
 
         row = layout.row(align=True)
         row.prop(self.props, "should_draw_decorations", text="Viewport Annotations")
@@ -490,6 +574,8 @@ 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)
+            selected_icon = "CHECKBOX_HLT" if item.is_selected else "CHECKBOX_DEHLT"
+            row.prop(item, "is_selected", text="", icon=selected_icon)
             icon = "UV_FACESEL"
             if item.target_view == "ELEVATION_VIEW":
                 icon = "UV_VERTEXSEL"
@@ -510,7 +596,7 @@ class BIM_UL_sheets(bpy.types.UIList):
             layout.label(text="", translate=False)
             return
 
-        row = layout.row()
+        row = layout.row(align=True)
         if item.is_sheet:
             if item.is_expanded:
                 row.operator(
@@ -520,13 +606,23 @@ class BIM_UL_sheets(bpy.types.UIList):
                 row.operator(
                     "bim.expand_sheet", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
                 ).sheet = item.ifc_definition_id
-            name = "{} - {}".format(item.identification or "X", item.name or "Unnamed")
-            row.prop(item, "name", text=item.identification or "X", emboss=False)
+
+            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")
-            name = "{} - {}".format(item.identification or "X", item.name or "Unnamed")
+            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)

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

@@ -0,0 +1,286 @@
+# 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.model.data import AuthoringData, RailingData, RoofData
+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
+
+
+# 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 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_type(context):
+    # just empty to store parameters
+    props = context.scene.BIMAnnotationProperties
+    object_type = props.object_type
+    create_representation = props.create_representation_for_type
+    drawing = tool.Ifc.get_entity(bpy.context.scene.camera)
+
+    if props.create_representation_for_type:
+        obj = tool.Drawing.create_annotation_object(drawing, object_type)
+    else:
+        obj = bpy.data.objects.new(object_type, None)
+
+    obj.name = f"{object_type}_TYPE"
+    obj.location = context.scene.cursor.location
+    tool.Drawing.ensure_annotation_in_drawing_plane(obj)
+
+    drawing = tool.Ifc.get_entity(context.scene.camera)
+    ifc_context = tool.Drawing.get_annotation_context(tool.Drawing.get_drawing_target_view(drawing), object_type)
+
+    element = tool.Drawing.run_root_assign_class(
+        obj=obj,
+        ifc_class="IfcTypeProduct",
+        predefined_type=object_type,
+        should_add_representation=create_representation,
+        context=ifc_context,
+        ifc_representation_class=tool.Drawing.get_ifc_representation_class(object_type),
+    )
+    element.ApplicableOccurrence = f"IfcAnnotation/{object_type}"
+
+    tool.Blender.select_and_activate_single_object(context, obj)
+
+
+# TODO: move to operator
+def create_annotation_occurence(context):
+    # object_type = context.scene.BIMAnnotationProperties.object_type
+    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
+
+        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)
+        op, row = add_layout_hotkey_operator(cls.layout, "Add Type", "S_C", "Create a new annotation type")
+        selected_icon = "CHECKBOX_HLT" if cls.props.create_representation_for_type else "CHECKBOX_DEHLT"
+        row.prop(cls.props, "create_representation_for_type", text="", icon=selected_icon)
+
+    @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="")
+
+        create_type_occurence = cls.props.relating_type_id != "0"
+        label = "Add Type Occurence" if create_type_occurence else "Add Annotation"
+        add_layout_hotkey_operator(cls.layout, label, "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)
+
+    def hotkey_S_C(self):
+        create_annotation_type(bpy.context)

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

@@ -78,6 +78,9 @@ def register():
         km = wm.keyconfigs.addon.keymaps.new(name="Mesh", space_type="EMPTY")
         kmi = km.keymap_items.new("bim.override_mode_set_object", "TAB", "PRESS")
 
+        km = wm.keyconfigs.addon.keymaps.new(name="Curve", space_type="EMPTY")
+        kmi = km.keymap_items.new("bim.override_mode_set_object", "TAB", "PRESS")
+
         km = wm.keyconfigs.addon.keymaps.new(name="Outliner", space_type="OUTLINER")
         kmi = km.keymap_items.new("bim.override_paste_buffer", "V", "PRESS", ctrl=True)
         kmi = km.keymap_items.new("bim.override_outliner_delete", "X", "PRESS")

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

@@ -104,24 +104,44 @@ 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
+                related_element_connection_type = ""
+            else:
+                related_element = rel.RelatedElement
+                related_element_connection_type = rel.RelatedConnectionType
+
             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
+                relating_element_connection_type = ""
+            else:
+                relating_element = rel.RelatingElement
+                relating_element_connection_type = rel.RelatingConnectionType
+
             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 +172,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/operator.py

@@ -189,7 +189,8 @@ class UpdateRepresentation(bpy.types.Operator, Operator):
             ifcopenshell.api.run("boundary.assign_connection_geometry", tool.Ifc.get(), **settings)
             return
 
-        core.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
+        if tool.Ifc.is_moved(obj):
+            core.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
 
         if material and material.is_a() in ["IfcMaterialProfileSet", "IfcMaterialLayerSet"]:
             # These objects are parametrically based on an axis and should not be modified as a mesh
@@ -198,6 +199,13 @@ class UpdateRepresentation(bpy.types.Operator, Operator):
         old_representation = self.file.by_id(obj.data.BIMMeshProperties.ifc_definition_id)
         context_of_items = old_representation.ContextOfItems
 
+        # TODO: remove this code a bit later
+        # added this as a fallback for easier transition some annotation types to 3d
+        # if they were create before as 2d
+        element = tool.Ifc.get_entity(obj)
+        if tool.Drawing.is_annotation_object_type(element, ("FALL", "SECTION_LEVEL", "PLAN_LEVEL")):
+            context_of_items = tool.Drawing.get_annotation_context("MODEL_VIEW")
+
         gprop = context.scene.BIMGeoreferenceProperties
         coordinate_offset = None
         if gprop.has_blender_offset and obj.BIMObjectProperties.blender_offset_type == "CARTESIAN_POINT":
@@ -250,6 +258,20 @@ class UpdateRepresentation(bpy.types.Operator, Operator):
 
         obj.data.BIMMeshProperties.ifc_definition_id = int(new_representation.id())
         obj.data.name = f"{old_representation.ContextOfItems.id()}/{new_representation.id()}"
+
+        # TODO: In simple scenarios, a type has a ShapeRepresentation of ID
+        # 123. This is then mapped through mapped representations by
+        # occurrences, with no cartesian transformation. In this case, the mesh
+        # data is 100% shared and therefore all have the same mesh name
+        # referencing ID 123. (i.e. the local origins are shared). However, in
+        # complex scenarios, occurrences may have their own cartesian
+        # transformation (via MappingTarget). This will mean that occurrences
+        # will not share the same mesh data and will instead reference a
+        # different ShapeRepresentation ID. In this scenario, we have to
+        # propagate the obj.data back to the type itself and all sibling
+        # occurrences and accommodate their individual cartesian
+        # transformations.
+
         core.remove_representation(tool.Ifc, tool.Geometry, obj=obj, representation=old_representation)
         if obj.data.BIMMeshProperties.ifc_parameters:
             core.get_representation_ifc_parameters(tool.Geometry, obj=obj)
@@ -345,57 +367,13 @@ class CopyRepresentation(bpy.types.Operator, Operator):
                     return r.MappedRepresentation
 
 
-class OverrideDeleteTrait:
-    def delete_ifc_object(self, obj):
-        element = tool.Ifc.get_entity(obj)
-        if not element:
-            return
-        if element.is_a("IfcAnnotation") and element.ObjectType == "DRAWING":
-            return blenderbim.core.drawing.remove_drawing(tool.Ifc, tool.Drawing, drawing=element)
-        IfcStore.delete_element(element)
-        if obj.users_collection and obj.users_collection[0].name == obj.name:
-            parent = ifcopenshell.util.element.get_aggregate(element)
-            if not parent:
-                parent = ifcopenshell.util.element.get_container(element)
-            if parent:
-                parent_obj = tool.Ifc.get_object(parent)
-                if parent_obj:
-                    parent_collection = bpy.data.collections.get(parent_obj.name)
-                    for child in obj.users_collection[0].children:
-                        parent_collection.children.link(child)
-            bpy.data.collections.remove(obj.users_collection[0])
-        if getattr(element, "FillsVoids", None):
-            self.remove_filling(element)
-        if element.is_a("IfcOpeningElement"):
-            if element.HasFillings:
-                for rel in element.HasFillings:
-                    self.remove_filling(rel.RelatedBuildingElement)
-            else:
-                if element.VoidsElements:
-                    self.delete_opening_element(element)
-        else:
-            if getattr(element, "HasOpenings", None):
-                for rel in element.HasOpenings:
-                    self.delete_opening_element(rel.RelatedOpeningElement)
-            for port in ifcopenshell.util.system.get_ports(element):
-                self.remove_port(port)
-
-    def delete_opening_element(self, element):
-        bpy.ops.bim.remove_opening(opening_id=element.id())
-
-    def remove_filling(self, element):
-        bpy.ops.bim.remove_filling(filling=element.id())
-
-    def remove_port(self, port):
-        blenderbim.core.system.remove_port(tool.Ifc, tool.System, port=port)
-
-
-class OverrideDelete(bpy.types.Operator, OverrideDeleteTrait):
+class OverrideDelete(bpy.types.Operator):
     bl_idname = "bim.override_object_delete"
     bl_label = "IFC Delete"
     bl_options = {"REGISTER", "UNDO"}
     use_global: bpy.props.BoolProperty(default=False)
     confirm: bpy.props.BoolProperty(default=True)
+    is_batch: bpy.props.BoolProperty(name="Is Batch", default=False)
 
     @classmethod
     def poll(cls, context):
@@ -403,7 +381,7 @@ class OverrideDelete(bpy.types.Operator, OverrideDeleteTrait):
 
     def execute(self, context):
         # Deep magick from the dawn of time
-        if IfcStore.get_file():
+        if tool.Ifc.get():
             return IfcStore.execute_ifc_operator(self, context)
         for obj in context.selected_objects:
             bpy.data.objects.remove(obj)
@@ -412,25 +390,57 @@ class OverrideDelete(bpy.types.Operator, OverrideDeleteTrait):
         return {"FINISHED"}
 
     def invoke(self, context, event):
-        if self.confirm:
+        if tool.Ifc.get():
+            total_elements = len(tool.Ifc.get().wrapped_data.entity_names())
+            total_polygons = sum([len(o.data.polygons) for o in context.selected_objects if o.type == "MESH"])
+            # These numbers are a bit arbitrary, but basically batching is only
+            # really necessary on large models and large geometry removals.
+            self.is_batch = total_elements > 500000 and total_polygons > 2000
+            if self.is_batch:
+                return context.window_manager.invoke_props_dialog(self)
+            elif self.confirm:
+                return context.window_manager.invoke_confirm(self, event)
+        elif self.confirm:
             return context.window_manager.invoke_confirm(self, event)
         self.confirm = True
         return self.execute(context)
 
+    def draw(self, context):
+        row = self.layout.row()
+        row.label(text="Warning: Faster deletion will use more memory.", icon="ERROR")
+        row = self.layout.row()
+        row.prop(self, "is_batch", text="Enable Faster Deletion")
+
     def _execute(self, context):
+        if self.is_batch:
+            ifcopenshell.util.element.batch_remove_deep2(tool.Ifc.get())
         for obj in context.selected_objects:
-            self.delete_ifc_object(obj)
-            try:
-                obj.name
+            if tool.Ifc.get_entity(obj):
+                tool.Geometry.delete_ifc_object(obj)
+            else:
                 bpy.data.objects.remove(obj)
-            except:
-                pass
+        if self.is_batch:
+            old_file = tool.Ifc.get()
+            old_file.end_transaction()
+            new_file = ifcopenshell.util.element.unbatch_remove_deep2(tool.Ifc.get())
+            new_file.begin_transaction()
+            tool.Ifc.set(new_file)
+            self.transaction_data = {"old_file": old_file, "new_file": new_file}
+            IfcStore.add_transaction_operation(self)
         # Required otherwise gizmos are still visible
         context.view_layer.objects.active = None
         return {"FINISHED"}
 
+    def rollback(self, data):
+        tool.Ifc.set(data["old_file"])
+        data["old_file"].undo()
 
-class OverrideOutlinerDelete(bpy.types.Operator, OverrideDeleteTrait):
+    def commit(self, data):
+        data["old_file"].redo()
+        tool.Ifc.set(data["new_file"])
+
+
+class OverrideOutlinerDelete(bpy.types.Operator):
     bl_idname = "bim.override_outliner_delete"
     bl_label = "IFC Delete"
     bl_options = {"REGISTER", "UNDO"}
@@ -481,8 +491,7 @@ class OverrideOutlinerDelete(bpy.types.Operator, OverrideDeleteTrait):
                 objects_to_delete.add(bpy.data.objects.get(item.name))
         for obj in objects_to_delete:
             # This is the only difference
-            self.delete_ifc_object(obj)
-            bpy.data.objects.remove(obj)
+            tool.Geometry.delete_ifc_object(obj)
         return {"FINISHED"}
 
     def get_collection_objects_and_children(self, collection):
@@ -552,6 +561,8 @@ class OverrideDuplicateMove(bpy.types.Operator):
                 collection.objects.link(new_obj)
             obj.select_set(False)
             new_obj.select_set(True)
+            # clear object's collection so it will be able to have it's own
+            new_obj.BIMObjectProperties.collection = None
             # Copy the actual class
             new = blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=new_obj)
             if new:
@@ -560,6 +571,8 @@ class OverrideDuplicateMove(bpy.types.Operator):
                     array_pset = tool.Ifc.get().by_id(array_pset["id"])
                     ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), product=new, pset=array_pset)
                 old_to_new[tool.Ifc.get_entity(obj)] = [new]
+                if new.is_a("IfcRelSpaceBoundary"):
+                    tool.Boundary.decorate_boundary(new_obj)
         # Recreate decompositions
         tool.Root.recreate_decompositions(relationships, old_to_new)
         blenderbim.bim.handler.purge_module_data()
@@ -661,7 +674,7 @@ class OverrideJoin(bpy.types.Operator, Operator):
                     continue
                 element = tool.Ifc.get_entity(obj)
                 if element:
-                    tool.Ifc.delete(element)
+                    ifcopenshell.api.run("root.remove_product", tool.Ifc.get(), product=element)
             bpy.ops.object.join()
             bpy.ops.bim.update_representation(obj=self.target.name, ifc_representation_class="")
         elif representation.RepresentationType == "SweptSolid":
@@ -672,7 +685,7 @@ class OverrideJoin(bpy.types.Operator, Operator):
                     continue
                 element = tool.Ifc.get_entity(obj)
 
-                # Non IFC elements cannot be join since we cannot guarantee SweptSolid compliance
+                # Non IFC elements cannot be joined since we cannot guarantee SweptSolid compliance
                 if not element:
                     obj.select_set(False)
                     continue
@@ -687,6 +700,9 @@ class OverrideJoin(bpy.types.Operator, Operator):
 
                 for item in obj_rep.Items:
                     copied_item = ifcopenshell.util.element.copy_deep(tool.Ifc.get(), item)
+                    for style in item.StyledByItem:
+                        copied_style = ifcopenshell.util.element.copy(tool.Ifc.get(), style)
+                        copied_style.Item = copied_item
                     if copied_item.Position:
                         position = ifcopenshell.util.placement.get_axis2placement(copied_item.Position)
                     else:
@@ -699,7 +715,7 @@ class OverrideJoin(bpy.types.Operator, Operator):
                         tool.Ifc.get().createIfcDirection([float(n) for n in position[:, 0][:3]]),
                     )
                     items.append(copied_item)
-                tool.Ifc.delete(element)
+                ifcopenshell.api.run("root.remove_product", tool.Ifc.get(), product=element)
             representation.Items = items
             bpy.ops.object.join()
             core.switch_representation(
@@ -719,7 +735,7 @@ class OverrideJoin(bpy.types.Operator, Operator):
                 continue
             element = tool.Ifc.get_entity(obj)
             if element:
-                tool.Ifc.delete(element)
+                ifcopenshell.api.run("root.remove_product", tool.Ifc.get(), product=element)
         bpy.ops.object.join()
 
 
@@ -745,20 +761,31 @@ class OverrideModeSetEdit(bpy.types.Operator):
         return IfcStore.execute_ifc_operator(self, context)
 
     def _execute(self, context):
-        objs = context.selected_objects or [context.active_object]
+        objs = context.selected_objects or ([context.active_object] if context.active_object else [])
+        active_obj = context.active_object
+
         if context.active_object:
             context.active_object.select_set(True)
+
+            element = tool.Ifc.get_entity(context.active_object)
+            if element and element.is_a("IfcRelSpaceBoundary"):
+                return bpy.ops.bim.enable_editing_boundary_geometry()
+
         for obj in objs:
             if not obj:
                 continue
 
+            if not obj.data:
+                obj.select_set(False)
+                continue
+
             element = tool.Ifc.get_entity(obj)
             if not element:
                 continue
 
             # We are switching from OBJECT to EDIT mode.
             usage_type = tool.Model.get_usage_type(element)
-            if usage_type:
+            if usage_type is not None and usage_type not in ("PROFILE", "LAYER3"):
                 # Parametric objects shall not be edited as meshes as they
                 # can be modified to be incompatible with the parametric
                 # constraints.
@@ -769,6 +796,36 @@ class OverrideModeSetEdit(bpy.types.Operator):
             if not representation:
                 continue
 
+            if (
+                tool.Pset.get_element_pset(element, "BBIM_Door")
+                or tool.Pset.get_element_pset(element, "BBIM_Window")
+                or tool.Pset.get_element_pset(element, "BBIM_Stair")
+            ):
+                obj.select_set(False)
+                continue
+            if usage_type == "PROFILE":
+                if len(context.selected_objects) == 1:
+                    bpy.ops.bim.hotkey(hotkey="A_E", description="")
+                    return {"FINISHED"}
+                else:
+                    self.report({"INFO"}, "Only a single profile-based representation can be edited at a time.")
+                    obj.select_set(False)
+                    continue
+            if (
+                tool.Geometry.is_profile_based(obj.data)
+                or usage_type == "LAYER3"
+                or tool.Geometry.is_swept_profile(representation)
+                or tool.Pset.get_element_pset(element, "BBIM_Roof")
+                or tool.Pset.get_element_pset(element, "BBIM_Railing")
+            ):
+                if len(context.selected_objects) == 1:
+                    bpy.ops.bim.hotkey(hotkey="S_E", description="")
+                    return {"FINISHED"}
+                else:
+                    self.report({"INFO"}, "Only a single profile-based representation can be edited at a time.")
+                    obj.select_set(False)
+                    continue
+
             if tool.Geometry.is_meshlike(representation):
                 if getattr(element, "HasOpenings", None):
                     # Mesh elements with openings must disable openings
@@ -797,6 +854,11 @@ class OverrideModeSetEdit(bpy.types.Operator):
             context.view_layer.objects.active = context.selected_objects[0] if context.selected_objects else None
         if context.active_object:
             bpy.ops.object.mode_set(mode="EDIT", toggle=True)
+        else:
+            # restore the selection if nothing worked
+            for obj in objs:
+                obj.select_set(True)
+            context.view_layer.objects.active = active_obj
         return {"FINISHED"}
 
     def invoke(self, context, event):
@@ -818,7 +880,7 @@ class OverrideModeSetObject(bpy.types.Operator):
         for obj in self.edited_objs:
             if self.should_save:
                 bpy.ops.bim.update_representation(obj=obj.name, ifc_representation_class="")
-                if tool.Ifc.get_entity(obj).HasOpenings:
+                if getattr(tool.Ifc.get_entity(obj), "HasOpenings", False):
                     self.reload_representation(obj)
             else:
                 self.reload_representation(obj)
@@ -841,15 +903,27 @@ class OverrideModeSetObject(bpy.types.Operator):
         )
 
     def draw(self, context):
-        row = self.layout.row(align=True)
-        row.prop(self, "should_save")
+        if self.is_valid:
+            row = self.layout.row()
+            row.prop(self, "should_save")
+        else:
+            row = self.layout.row()
+            row.label(text="No Geometry Found: Object will revert to previous state.")
 
     def invoke(self, context, event):
+        self.is_valid = True
+        self.should_save = True
+
         bpy.ops.object.mode_set(mode="EDIT", toggle=True)
 
         if not tool.Ifc.get():
             return {"FINISHED"}
 
+        if context.active_object:
+            element = tool.Ifc.get_entity(context.active_object)
+            if element and element.is_a("IfcRelSpaceBoundary"):
+                return bpy.ops.bim.edit_boundary_geometry()
+
         objs = context.selected_objects or [context.active_object]
 
         self.edited_objs = []
@@ -860,16 +934,34 @@ class OverrideModeSetObject(bpy.types.Operator):
                 continue
 
             element = tool.Ifc.get_entity(obj)
-            if not element or element.is_a("IfcAnnotation"):
+            if not element:
                 continue
 
-            if obj.data.BIMMeshProperties.ifc_definition_id:
+            if tool.Profile.is_editing_profile():
+                profile_id = context.scene.BIMProfileProperties.active_profile_id
+                if profile_id:
+                    profile = tool.Ifc.get().by_id(profile_id)
+                    if tool.Ifc.get_object(profile):  # We are editing an arbitrary profile
+                        bpy.ops.bim.edit_arbitrary_profile()
+                elif tool.Pset.get_element_pset(element, "BBIM_Railing"):
+                    bpy.ops.bim.cad_hotkey(hotkey="S_Q")
+                elif tool.Pset.get_element_pset(element, "BBIM_Roof"):
+                    bpy.ops.bim.cad_hotkey(hotkey="S_Q")
+                elif tool.Model.get_usage_type(element) == "PROFILE":
+                    bpy.ops.bim.edit_extrusion_axis()
+                else:
+                    bpy.ops.bim.edit_extrusion_profile()
+                return self.execute(context)
+            elif obj.data.BIMMeshProperties.ifc_definition_id:
+                if not tool.Geometry.has_geometric_data(obj):
+                    self.is_valid = False
+                    self.should_save = False
                 representation = tool.Ifc.get().by_id(obj.data.BIMMeshProperties.ifc_definition_id)
                 if tool.Geometry.is_meshlike(
                     representation
                 ) and obj.data.BIMMeshProperties.mesh_checksum != tool.Geometry.get_mesh_checksum(obj.data):
                     self.edited_objs.append(obj)
-                elif element.HasOpenings:
+                elif getattr(element, "HasOpenings", None):
                     self.unchanged_objs_with_openings.append(obj)
 
         if self.edited_objs:

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

@@ -33,6 +33,7 @@ classes = (
     operator.ToggleGroup,
     operator.UnassignGroup,
     operator.UpdateGroup,
+    operator.SelectGroupElements,
     prop.ExpandedGroups,
     prop.Group,
     prop.BIMGroupProperties,

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

@@ -275,3 +275,19 @@ class UpdateGroup(bpy.types.Operator, tool.Ifc.Operator):
         )
         bpy.ops.bim.load_groups()
         return {"FINISHED"}
+
+
+class SelectGroupElements(bpy.types.Operator):
+    bl_idname = "bim.select_group_elements"
+    bl_label = "Select Group elements"
+    bl_options = {"REGISTER", "UNDO"}
+    group: bpy.props.IntProperty()
+
+    @classmethod
+    def poll(cls, context):
+        return bool(tool.Ifc.get() and context.active_object)
+
+    def execute(self, context):
+        elements = tool.Drawing.get_group_elements(tool.Ifc.get().by_id(self.group))
+        tool.Spatial.select_products(elements)
+        return {"FINISHED"}

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

@@ -107,6 +107,7 @@ class BIM_PT_object_groups(Panel):
         for group in ObjectGroupsData.data["groups"]:
             row = self.layout.row(align=True)
             row.label(text=group["name"])
+            row.operator("bim.select_group_elements", text="", icon="RESTRICT_SELECT_OFF").group = group["id"]
             op = row.operator("bim.unassign_group", text="", icon="X")
             op.group = group["id"]
 

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

@@ -0,0 +1,54 @@
+#  This program 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 2
+#  of the License, or (at your option) any later version.
+#
+#  This program 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 this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# 2023 Bruno Postle <bruno@postle.net>, Bruno Perdigão <brunoperdigao@tutanota.com>,
+# Massimo Fabbro <maxfb87@yahoo.it>
+
+import bpy
+from . import ui, prop, operator
+
+
+classes = (
+    operator.AddFileToRepo,
+    operator.AddRemote,
+    operator.AddTag,
+    operator.CloneRepo,
+    operator.CommitChanges,
+    operator.CreateRepo,
+    operator.DeleteRemote,
+    operator.DeleteTag,
+    operator.DiscardUncommitted,
+    operator.DisplayRevision,
+    operator.DisplayUncommitted,
+    operator.Fetch,
+    operator.Merge,
+    operator.ObjectLog,
+    operator.Push,
+    operator.RefreshGit,
+    operator.SwitchRevision,
+    prop.IfcGitTag,
+    prop.IfcGitListItem,
+    prop.IfcGitProperties,
+    ui.IFCGIT_PT_panel,
+    ui.COMMIT_UL_List,
+    ui.IFCGIT_PT_revision_inspector,
+)
+
+
+def register():
+    bpy.types.Scene.IfcGitProperties = bpy.props.PointerProperty(type=prop.IfcGitProperties)
+
+
+def unregister():
+    del bpy.types.Scene.IfcGitProperties

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

@@ -0,0 +1,174 @@
+import bpy
+import os
+import shutil
+
+# import tool
+import blenderbim.tool as tool
+
+
+def refresh():
+    IfcGitData.is_loaded = False
+
+
+class IfcGitData:
+
+    data = {}
+    is_loaded = False
+
+    @classmethod
+    def make_sure_is_loaded(cls):
+        if not cls.is_loaded:
+            cls.load()
+
+    @classmethod
+    def load(cls):
+        cls.data = {
+            "repo": cls.repo(),
+            "remotes": cls.remotes(),
+            "branch_names": cls.branch_names(),
+            "remote_names": cls.remote_names(),
+            "remote_urls": cls.remote_urls(),
+            "path_ifc": cls.path_ifc(),
+            "branches_by_hexsha": cls.branches_by_hexsha(),
+            "tags_by_hexsha": cls.tags_by_hexsha(),
+            "name_ifc": cls.name_ifc(),
+            "dir_name": cls.dir_name(),
+            "base_name": cls.base_name(),
+            "working_dir": cls.working_dir(),
+            "untracked_files": cls.untracked_files(),
+            "is_detached": cls.is_detached(),
+            "active_branch_name": cls.active_branch_name(),
+            "is_dirty": cls.is_dirty(),
+            "commit": cls.commit(),
+            "current_revision": cls.current_revision(),
+            "git_exe": cls.git_exe(),
+            "ifcmerge_exe": cls.ifcmerge_exe(),
+        }
+        cls.is_loaded = True
+
+    @classmethod
+    def repo(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return tool.IfcGit.repo_from_path(path_ifc)
+        return None
+
+    @classmethod
+    def remotes(cls):
+        if cls.repo():
+            return cls.repo().remotes
+        return None
+
+    @classmethod
+    def branch_names(cls):
+        return []
+
+    @classmethod
+    def remote_names(cls):
+        return []
+
+    @classmethod
+    def remote_urls(cls):
+        result = {}
+        if cls.repo():
+            for remote in cls.repo().remotes:
+                result[remote.name] = remote.url
+        return result
+
+    @classmethod
+    def path_ifc(cls):
+        path_ifc = tool.Ifc.get_path()
+        if os.path.isfile(path_ifc):
+            return tool.Ifc.get_path()
+        return None
+
+    @classmethod
+    def branches_by_hexsha(cls):
+        try:
+            if tool.IfcGitRepo.repo.branches:
+                return tool.IfcGit.branches_by_hexsha(tool.IfcGitRepo.repo)
+        except:
+            return {}
+
+    @classmethod
+    def tags_by_hexsha(cls):
+        if tool.IfcGitRepo.repo:
+            return tool.IfcGit.tags_by_hexsha(tool.IfcGitRepo.repo)
+        return {}
+
+    @classmethod
+    def name_ifc(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if tool.IfcGitRepo.repo and os.path.isfile(path_ifc):
+                working_dir = tool.IfcGitRepo.repo.working_dir
+                return os.path.relpath(path_ifc, working_dir)
+        return None
+
+    @classmethod
+    def dir_name(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return os.path.dirname(path_ifc)
+        return None
+
+    @classmethod
+    def base_name(cls):
+        if bool(tool.Ifc.get()):
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return os.path.basename(path_ifc)
+        return None
+
+    @classmethod
+    def working_dir(cls):
+        if cls.repo():
+            return cls.repo().working_dir
+
+    @classmethod
+    def untracked_files(cls):
+        if cls.repo():
+            return cls.repo().untracked_files
+        return []
+
+    @classmethod
+    def is_detached(cls):
+        if cls.repo():
+            return cls.repo().head.is_detached
+
+    @classmethod
+    def active_branch_name(cls):
+        if cls.repo() and not cls.is_detached():
+            return cls.repo().active_branch.name
+
+    @classmethod
+    def is_dirty(cls):
+        if cls.repo() and cls.git_exe():
+            path_ifc = tool.Ifc.get_path()
+            if os.path.isfile(path_ifc):
+                return cls.repo().is_dirty(path=path_ifc)
+        return False
+
+    @classmethod
+    def commit(cls):
+        props = bpy.context.scene.IfcGitProperties
+        if len(props.ifcgit_commits) > 0:
+            item = props.ifcgit_commits[props.commit_index]
+            if cls.repo():
+                return cls.repo().commit(rev=item.hexsha)
+
+    @classmethod
+    def current_revision(cls):
+        props = bpy.context.scene.IfcGitProperties
+        if len(props.ifcgit_commits) > 0:
+            return tool.IfcGitRepo.repo.commit()
+
+    @classmethod
+    def git_exe(cls):
+        return shutil.which("git")
+
+    @classmethod
+    def ifcmerge_exe(cls):
+        return shutil.which("ifcmerge")

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

@@ -0,0 +1,387 @@
+import os
+import re
+import bpy
+import blenderbim.core.ifcgit as core
+import blenderbim.tool as tool
+from blenderbim.bim.module.ifcgit.data import IfcGitData, refresh
+
+
+class CreateRepo(bpy.types.Operator):
+    """Initialise a Git repository"""
+
+    bl_label = "Create Git repository"
+    bl_idname = "ifcgit.createrepo"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        path_ifc = IfcGitData.data["path_ifc"]
+        if not os.path.isfile(path_ifc):
+            return False
+        if IfcGitData.data["repo"]:
+            # repo already exists
+            return False
+        if re.match("^/home/[^/]+/?$", os.path.dirname(path_ifc)):
+            # don't make ${HOME} a repo
+            return False
+        return True
+
+    def execute(self, context):
+
+        core.create_repo(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class AddFileToRepo(bpy.types.Operator):
+    """Add a file to a repository"""
+
+    bl_label = "Add file to repository"
+    bl_idname = "ifcgit.addfile"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        path_ifc = IfcGitData.data["path_ifc"]
+        if not os.path.isfile(path_ifc):
+            return False
+        if not IfcGitData.data["repo"]:
+            # repo doesn't exist
+            return False
+        return True
+
+    def execute(self, context):
+
+        core.add_file(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class CloneRepo(bpy.types.Operator):
+    """Clone a remote Git repository"""
+
+    bl_label = "Clone repository"
+    bl_idname = "ifcgit.clone_repo"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.IfcGitProperties
+        if (
+            props.remote_url
+            and props.local_folder
+            and os.path.isdir(props.local_folder)
+            and not os.listdir(props.local_folder)
+        ):
+            return True
+        return False
+
+    def execute(self, context):
+
+        props = context.scene.IfcGitProperties
+        core.clone_repo(tool.IfcGit, props.remote_url, props.local_folder, self)
+        props.remote_url = ""
+        refresh()
+        return {"FINISHED"}
+
+
+class DiscardUncommitted(bpy.types.Operator):
+    """Discard saved changes and update to HEAD"""
+
+    bl_label = "Discard uncommitted changes"
+    bl_idname = "ifcgit.discard"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        core.discard_uncomitted(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class CommitChanges(bpy.types.Operator):
+    """Commit current saved changes"""
+
+    bl_label = "Commit changes"
+    bl_idname = "ifcgit.commit_changes"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        props = context.scene.IfcGitProperties
+        repo = IfcGitData.data["repo"]
+        if props.commit_message == "":
+            return False
+        if (
+            repo
+            and repo.head.is_detached
+            and (
+                not tool.IfcGit.is_valid_ref_format(props.new_branch_name)
+                or props.new_branch_name in [branch.name for branch in repo.branches]
+            )
+        ):
+            cls.poll_message_set(
+                "The new branch name is invalid, please insert a valid branch name (eg. with no spaces, ...)"
+            )
+            return False
+        return True
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.commit_changes(tool.IfcGit, tool.Ifc, repo)
+        bpy.ops.ifcgit.refresh()
+        refresh()
+        return {"FINISHED"}
+
+
+class AddTag(bpy.types.Operator):
+    """Tag selected revision"""
+
+    bl_label = "Tag selected revision"
+    bl_idname = "ifcgit.add_tag"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        props = context.scene.IfcGitProperties
+        if props.new_tag_name == "":
+            return False
+        repo = IfcGitData.data["repo"]
+        if repo and (
+            not tool.IfcGit.is_valid_ref_format(props.new_tag_name)
+            or props.new_tag_name in [tag.name for tag in repo.tags]
+        ):
+            return False
+        return True
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.add_tag(tool.IfcGit, repo)
+        bpy.ops.ifcgit.refresh()
+        refresh()
+        return {"FINISHED"}
+
+
+class DeleteTag(bpy.types.Operator):
+    """Delete a tag"""
+
+    bl_label = "Delete tag"
+    bl_idname = "ifcgit.delete_tag"
+    bl_options = {"REGISTER"}
+    tag_name: bpy.props.StringProperty()
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.delete_tag(tool.IfcGit, repo, self.tag_name)
+        bpy.ops.ifcgit.refresh()
+        refresh()
+        return {"FINISHED"}
+
+
+class RefreshGit(bpy.types.Operator):
+    """Refresh revision list"""
+
+    bl_label = ""
+    bl_idname = "ifcgit.refresh"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        repo = IfcGitData.data["repo"]
+        if repo:
+            return True
+        return False
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.refresh_revision_list(tool.IfcGit, repo, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class DisplayRevision(bpy.types.Operator):
+    """Colourise objects by selected revision"""
+
+    bl_label = ""
+    bl_idname = "ifcgit.display_revision"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.IfcGitProperties
+        if props.ifcgit_commits:
+            return True
+
+    def execute(self, context):
+
+        core.colourise_revision(tool.IfcGit)
+        refresh()
+        return {"FINISHED"}
+
+
+class DisplayUncommitted(bpy.types.Operator):
+    """Colourise uncommitted objects"""
+
+    bl_label = "Show uncommitted changes"
+    bl_idname = "ifcgit.display_uncommitted"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.colourise_uncommitted(tool.IfcGit, tool.Ifc, repo)
+        refresh()
+        return {"FINISHED"}
+
+
+class SwitchRevision(bpy.types.Operator):
+    """Switches the repository to the selected revision and reloads the IFC file"""
+
+    bl_label = ""
+    bl_idname = "ifcgit.switch_revision"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        props = context.scene.IfcGitProperties
+        if props.ifcgit_commits:
+            return True
+
+    def execute(self, context):
+
+        core.switch_revision(tool.IfcGit, tool.Ifc)
+        refresh()
+        return {"FINISHED"}
+
+
+class Merge(bpy.types.Operator):
+    """Merges the selected branch into working branch"""
+
+    bl_label = "Merge this branch"
+    bl_idname = "ifcgit.merge"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        props = context.scene.IfcGitProperties
+        if IfcGitData.data["ifcmerge_exe"] and props.ifcgit_commits and not IfcGitData.data["is_detached"]:
+            return True
+        return False
+
+    def execute(self, context):
+
+        if core.merge_branch(tool.IfcGit, tool.Ifc, self):
+            refresh()
+            return {"FINISHED"}
+        else:
+            return {"CANCELLED"}
+
+
+class Push(bpy.types.Operator):
+    """Pushes the working branch to selected remote"""
+
+    bl_label = "Push working branch"
+    bl_idname = "ifcgit.push"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        props = context.scene.IfcGitProperties
+        repo = IfcGitData.data["repo"]
+        core.push(tool.IfcGit, repo, props.select_remote, self)
+        return {"FINISHED"}
+
+
+class Fetch(bpy.types.Operator):
+    """Fetches from the selected remote"""
+
+    bl_label = "Fetch from remote"
+    bl_idname = "ifcgit.fetch"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        props = context.scene.IfcGitProperties
+        repo = IfcGitData.data["repo"]
+        remote = repo.remotes[props.select_remote]
+        remote.fetch()
+        return {"FINISHED"}
+
+
+class AddRemote(bpy.types.Operator):
+    """Add a remote repository"""
+
+    bl_label = "Add Remote"
+    bl_idname = "ifcgit.add_remote"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        IfcGitData.make_sure_is_loaded()
+        props = context.scene.IfcGitProperties
+        repo = IfcGitData.data["repo"]
+        if (
+            not repo
+            or not tool.IfcGit.is_valid_ref_format(props.remote_name)
+            or not props.remote_url
+            or props.remote_name in [remote.name for remote in repo.remotes]
+        ):
+            return False
+        return True
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.add_remote(tool.IfcGit, repo)
+        bpy.ops.ifcgit.refresh()
+        refresh()
+        return {"FINISHED"}
+
+
+class DeleteRemote(bpy.types.Operator):
+    """Delete the selected remote"""
+
+    bl_label = "Delete Remote"
+    bl_idname = "ifcgit.delete_remote"
+    bl_options = {"REGISTER"}
+
+    def execute(self, context):
+
+        repo = IfcGitData.data["repo"]
+        core.delete_remote(tool.IfcGit, repo)
+        bpy.ops.ifcgit.refresh()
+        refresh()
+        return {"FINISHED"}
+
+
+class ObjectLog(bpy.types.Operator):
+    """Displays Git log of selected object"""
+
+    bl_label = "Selected Object History"
+    bl_idname = "ifcgit.object_log"
+    bl_options = {"REGISTER"}
+
+    @classmethod
+    def poll(cls, context):
+        if not context.active_object:
+            cls.poll_message_set("No Active Object")
+        elif not context.active_object.BIMObjectProperties.ifc_definition_id:
+            cls.poll_message_set("Active Object doesn't have an IFC definition")
+        else:
+            return True
+
+    def execute(self, context):
+
+        step_id = context.active_object.BIMObjectProperties.ifc_definition_id
+        core.entity_log(tool.IfcGit, tool.Ifc, step_id, self)
+        return {"FINISHED"}

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

@@ -0,0 +1,142 @@
+import bpy
+from bpy.types import PropertyGroup
+from bpy.props import (
+    StringProperty,
+    BoolProperty,
+    CollectionProperty,
+    IntProperty,
+    EnumProperty,
+)
+from blenderbim.bim.module.ifcgit.data import IfcGitData
+
+
+def git_branches(self, context):
+    """branches enum"""
+
+    # NOTE "Python must keep a reference to the strings returned by
+    # the callback or Blender will misbehave or even crash"
+    IfcGitData.data["branch_names"] = sorted([branch.name for branch in IfcGitData.data["repo"].heads])
+
+    if "main" in IfcGitData.data["branch_names"]:
+        IfcGitData.data["branch_names"].remove("main")
+        IfcGitData.data["branch_names"] = ["main"] + IfcGitData.data["branch_names"]
+
+    if IfcGitData.data["remotes"]:
+        for remote in IfcGitData.data["remotes"]:
+            for remote_branch in remote.refs:
+                IfcGitData.data["branch_names"].append(remote_branch.name)
+
+    return [(myname, myname, myname) for myname in IfcGitData.data["branch_names"]]
+
+
+def git_remotes(self, context):
+    """remotes enum"""
+
+    IfcGitData.data["remote_names"] = sorted([remote.name for remote in IfcGitData.data["remotes"]])
+
+    if "origin" in IfcGitData.data["remote_names"]:
+        IfcGitData.data["remote_names"].remove("origin")
+        IfcGitData.data["remote_names"] = ["origin"] + IfcGitData.data["remote_names"]
+
+    return [(myname, myname, myname) for myname in IfcGitData.data["remote_names"]]
+
+
+def update_revlist(self, context):
+    """wrapper to trigger update of the revision list"""
+
+    bpy.ops.ifcgit.refresh()
+    props = context.scene.IfcGitProperties
+    props.commit_index = 0
+
+
+class IfcGitTag(PropertyGroup):
+    """Properties of a Git tag"""
+
+    name: StringProperty(
+        name="Tag name",
+        default="",
+    )
+    message: StringProperty(
+        name="Tag message",
+        default="",
+    )
+
+
+class IfcGitListItem(PropertyGroup):
+    """Group of properties representing an item in the list."""
+
+    hexsha: StringProperty(
+        name="Git hash",
+        description="checksum for this commit",
+        default="Uncommitted data!",
+    )
+    relevant: BoolProperty(
+        name="Is relevant",
+        description="does this commit reference our ifc file",
+        default=False,
+    )
+    author_name: StringProperty(
+        name="Author Name",
+        default="",
+    )
+    author_email: StringProperty(
+        name="Author Email",
+        default="",
+    )
+    message: StringProperty(
+        name="Commit Message",
+        default="",
+    )
+    tags: CollectionProperty(type=IfcGitTag, name="List of revision tags")
+
+
+class IfcGitProperties(PropertyGroup):
+
+    ifcgit_commits: CollectionProperty(type=IfcGitListItem, name="List of git items")
+    commit_index: IntProperty(name="Index for my_list", default=0)
+    commit_message: StringProperty(
+        name="Commit message",
+        description="A human readable description of these changes",
+        default="",
+    )
+    new_branch_name: StringProperty(
+        name="New branch name",
+        description="A short name used to refer to this branch",
+        default="",
+    )
+    new_tag_name: StringProperty(
+        name="New tag name",
+        description="A short name used to refer to this tag",
+        default="",
+    )
+    new_tag_message: StringProperty(
+        name="Tag message (optional)",
+        description="An optional human readable description of this tag",
+        default="",
+    )
+    remote_name: StringProperty(
+        name="New remote name",
+        description="A local name for a remote Git repository",
+        default="",
+    )
+    remote_url: StringProperty(
+        name="Git URL",
+        description="A URL pointing to a Git repository",
+        default="",
+    )
+    local_folder: StringProperty(
+        name="Local folder",
+        description="A local Git repository path",
+        default="",
+        subtype="DIR_PATH",
+    )
+    display_branch: EnumProperty(items=git_branches, update=update_revlist)
+    select_remote: EnumProperty(items=git_remotes)
+    ifcgit_filter: EnumProperty(
+        items=[
+            ("all", "All", "All revisions"),
+            ("tagged", "Tagged", "Tagged revisions"),
+            ("relevant", "Relevant", "Revisions for this project"),
+        ],
+        update=update_revlist,
+    )

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

@@ -0,0 +1,241 @@
+import bpy
+import time
+from blenderbim.bim.module.ifcgit.data import IfcGitData
+
+
+class IFCGIT_PT_panel(bpy.types.Panel):
+    """Scene Properties panel to interact with IFC repository data"""
+
+    bl_label = "IFC Git"
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_parent_id = "BIM_PT_project_info"
+
+    def draw(self, context):
+
+        if not IfcGitData.is_loaded:
+            IfcGitData.load()
+
+        layout = self.layout
+        path_ifc = IfcGitData.data["path_ifc"]
+
+        if not IfcGitData.data["git_exe"]:
+            row = layout.row()
+            row.label(text="Git is not installed", icon="ERROR")
+            return
+
+        props = context.scene.IfcGitProperties
+
+        # TODO if file isn't saved, offer to save to disk
+
+        row = layout.row()
+        if path_ifc:
+            if IfcGitData.data["repo"]:
+                name_ifc = IfcGitData.data["name_ifc"]
+                row.label(text=IfcGitData.data["working_dir"], icon="SYSTEM")
+                if name_ifc in IfcGitData.data["untracked_files"]:
+                    row.operator(
+                        "ifcgit.addfile",
+                        text="Add '" + name_ifc + "' to repository",
+                        icon="FILE",
+                    )
+                else:
+                    row.label(text=name_ifc, icon="FILE")
+            else:
+                row.operator(
+                    "ifcgit.createrepo",
+                    text="Create '" + IfcGitData.data["dir_name"] + "' repository",
+                    icon="SYSTEM",
+                )
+                row.label(text=IfcGitData.data["base_name"], icon="FILE")
+                return
+        else:
+            row.label(text="No Git repository found", icon="SYSTEM")
+            row.label(text="No IFC project saved", icon="FILE")
+
+            box = layout.box()
+            row = box.row()
+            row.label(text="Clone a remote Git repository")
+            row = box.row()
+            row.prop(props, "remote_url")
+            row = box.row()
+            row.prop(props, "local_folder")
+            row = box.row()
+            row.operator("ifcgit.clone_repo", icon="IMPORT")
+            return
+
+        is_dirty = IfcGitData.data["is_dirty"]
+
+        if is_dirty:
+            row = layout.row()
+            row.label(text="Saved changes have not been committed", icon="ERROR")
+
+            row = layout.row()
+            row.operator("ifcgit.display_uncommitted", icon="SELECT_DIFFERENCE")
+            row.operator("ifcgit.discard", icon="TRASH")
+
+            row = layout.row()
+            row.prop(props, "commit_message")
+
+            if IfcGitData.data["is_detached"]:
+                row = layout.row()
+                row.label(text="HEAD is detached, commit will create a branch", icon="ERROR")
+                row.prop(props, "new_branch_name")
+
+            row = layout.row()
+            row.operator("ifcgit.commit_changes", icon="GREASEPENCIL")
+
+        row = layout.row()
+        if IfcGitData.data["is_detached"]:
+            row.label(text="Working branch: Detached HEAD")
+        else:
+            row.label(text="Working branch: " + IfcGitData.data["active_branch_name"])
+
+        grouped = layout.row()
+        column = grouped.column()
+        row = column.row()
+        row.prop(props, "display_branch", text="Browse branch")
+        row.prop(props, "ifcgit_filter", text="Filter revisions")
+
+        row = column.row()
+        row.template_list(
+            "COMMIT_UL_List",
+            "The_List",
+            props,
+            "ifcgit_commits",
+            props,
+            "commit_index",
+        )
+        column = grouped.column()
+        row = column.row()
+        row.operator("ifcgit.refresh", icon="FILE_REFRESH")
+
+        if not is_dirty:
+
+            row = column.row()
+            row.operator("ifcgit.display_revision", icon="SELECT_DIFFERENCE")
+
+            row = column.row()
+            row.operator("ifcgit.switch_revision", icon="CURRENT_FILE")
+
+            row = column.row()
+            row.operator("ifcgit.merge", icon="EXPERIMENTAL", text="")
+
+        if not props.ifcgit_commits:
+            return
+
+        item = props.ifcgit_commits[props.commit_index]
+        if not item.relevant:
+            row = layout.row()
+            row.label(text="Revision unrelated to current IFC project", icon="ERROR")
+
+        box = layout.box()
+        column = box.column(align=True)
+        row = column.row()
+        row.label(text=item.hexsha)
+        row = column.row()
+        row.label(text=item.author_name + " <" + item.author_email + ">")
+        for message_line in item.message.split("\n"):
+            row = column.row()
+            row.label(text=message_line)
+
+        for tag in item.tags:
+            box = layout.box()
+            item = box.row()
+            column = item.column(align=True)
+            row = column.row()
+            row.label(text=tag.name)
+            row.operator("ifcgit.delete_tag", icon="PANEL_CLOSE").tag_name = tag.name
+            if tag.message:
+                for message_line in tag.message.split("\n"):
+                    row = column.row()
+                    row.label(text=message_line)
+
+        box = layout.box()
+        row = box.row()
+        row.prop(props, "new_tag_name")
+        row = box.row()
+        row.prop(props, "new_tag_message")
+        row = box.row()
+        row.operator("ifcgit.add_tag", icon="GREASEPENCIL")
+
+        if IfcGitData.data["remotes"]:
+            row = layout.row()
+            row.prop(props, "select_remote", text="Select remote")
+            urls = IfcGitData.data["remote_urls"]
+            row.label(text=urls[props.select_remote])
+            row.operator("ifcgit.delete_remote", text="", icon="PANEL_CLOSE")
+            row = layout.row()
+            row.operator("ifcgit.push", icon="EXPORT")
+            row.operator("ifcgit.fetch", icon="IMPORT")
+
+        box = layout.box()
+        row = box.row()
+        row.prop(props, "remote_name")
+        row = box.row()
+        row.prop(props, "remote_url")
+        row = box.row()
+        row.operator("ifcgit.add_remote", icon="ADD")
+
+
+class COMMIT_UL_List(bpy.types.UIList):
+    """List of Git commits"""
+
+    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+
+        props = context.scene.IfcGitProperties
+
+        current_revision = IfcGitData.data["current_revision"]
+
+        # TODO Figure how this "item" can be acesse in "data.py"
+        # so it's possible to move the ".commit"
+        commit = IfcGitData.data["repo"].commit(rev=item.hexsha)
+
+        lookup = IfcGitData.data["branches_by_hexsha"]
+        refs = ""
+        if item.hexsha in lookup:
+            for branch in lookup[item.hexsha]:
+                if branch.name == props.display_branch:
+                    refs = "[" + branch.name + "] "
+
+        lookup = IfcGitData.data["tags_by_hexsha"]
+        if item.hexsha in lookup:
+            for tag in lookup[item.hexsha]:
+                refs += "{" + tag.name + "} "
+
+        if commit == current_revision:
+            layout.label(text="[HEAD] " + refs + commit.message.split("\n")[0], icon="DECORATE_KEYFRAME")
+        else:
+            layout.label(text=refs + commit.message.split("\n")[0], icon="DECORATE_ANIMATE")
+        layout.label(text=time.strftime("%c", time.localtime(commit.committed_date)))
+
+
+class IFCGIT_PT_revision_inspector(bpy.types.Panel):
+    """Tool panel to interact with revision history"""
+
+    bl_idname = "IFCGIT_PT_revision_inspector"
+    bl_label = "Git History"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_category = "BlenderBIM"
+
+    def draw(self, context):
+
+        if not IfcGitData.is_loaded:
+            IfcGitData.load()
+
+        layout = self.layout
+
+        if not IfcGitData.data["git_exe"]:
+            row = layout.row()
+            row.label(text="Git is not installed", icon="ERROR")
+            return
+
+        row = layout.row()
+        row.operator(
+            "ifcgit.object_log",
+            icon="TEXT",
+        )

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

@@ -31,13 +31,16 @@ classes = (
     operator.ContractMaterialCategory,
     operator.CopyMaterial,
     operator.DisableEditingAssignedMaterial,
+    operator.DisableEditingMaterial,
+    operator.DisableEditingMaterials,
     operator.DisableEditingMaterialSetItem,
     operator.DisableEditingMaterialSetItemProfile,
-    operator.DisableEditingMaterials,
     operator.EditAssignedMaterial,
+    operator.EditMaterial,
     operator.EditMaterialSetItem,
     operator.EditMaterialSetItemProfile,
     operator.EnableEditingAssignedMaterial,
+    operator.EnableEditingMaterial,
     operator.EnableEditingMaterialSetItem,
     operator.EnableEditingMaterialSetItemProfile,
     operator.ExpandMaterialCategory,

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

@@ -96,6 +96,7 @@ class ObjectMaterialData:
         cls.data["total_thickness"] = cls.total_thickness()
         cls.data["materials"] = cls.materials()
         cls.data["type_material"] = cls.type_material()
+        cls.data["material_type"] = cls.material_type()
         cls.is_loaded = True
 
     @classmethod
@@ -244,3 +245,17 @@ class ObjectMaterialData:
             else:
                 name_attr = "Name"
             return getattr(material, name_attr, "Unnamed") or "Unnamed"
+
+    @classmethod
+    def material_type(cls):
+        material_types = [
+            "IfcMaterial",
+            "IfcMaterialConstituentSet",
+            "IfcMaterialLayerSet",
+            "IfcMaterialProfileSet",
+            "IfcMaterialList",
+        ]
+        version = tool.Ifc.get_schema()
+        if version == "IFC2X3":
+            material_types = ["IfcMaterial", "IfcMaterialLayerSet", "IfcMaterialList"]
+        return [(m, m, ifcopenshell.util.doc.get_entity_doc(version, m).get("description", "")) for m in material_types]

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

@@ -56,7 +56,37 @@ class SelectByMaterial(bpy.types.Operator, tool.Ifc.Operator):
     material: bpy.props.IntProperty()
 
     def _execute(self, context):
-        core.select_by_material(tool.Material, material=tool.Ifc.get().by_id(self.material))
+        core.select_by_material(tool.Material, tool.Spatial, material=tool.Ifc.get().by_id(self.material))
+
+
+class EnableEditingMaterial(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.enable_editing_material"
+    bl_label = "Enable Editing Material"
+    bl_options = {"REGISTER", "UNDO"}
+    material: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        core.enable_editing_material(tool.Material, material=tool.Ifc.get().by_id(self.material))
+
+
+class EditMaterial(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.edit_material"
+    bl_label = "Edit Material"
+    bl_options = {"REGISTER", "UNDO"}
+    material: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        core.edit_material(tool.Ifc, tool.Material, material=tool.Ifc.get().by_id(self.material))
+
+
+class DisableEditingMaterial(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.disable_editing_material"
+    bl_label = "Disable Editing Material"
+    bl_options = {"REGISTER", "UNDO"}
+    material: bpy.props.IntProperty()
+
+    def _execute(self, context):
+        core.disable_editing_material(tool.Material)
 
 
 class AssignParameterizedProfile(bpy.types.Operator, tool.Ifc.Operator):
@@ -144,59 +174,7 @@ class AssignMaterial(bpy.types.Operator, tool.Ifc.Operator):
 
     def _execute(self, context):
         objects = [bpy.data.objects.get(self.obj)] if self.obj else tool.Blender.get_selected_objects()
-        active_obj = context.active_object
-        active_object_material_type = self.material_type or active_obj.BIMObjectMaterialProperties.material_type
-        material = tool.Ifc.get().by_id(int(active_obj.BIMObjectMaterialProperties.material))
-        for obj in objects:
-            element = tool.Ifc.get_entity(obj)
-            if not element:
-                continue
-            ifcopenshell.api.run(
-                "material.assign_material",
-                tool.Ifc.get(),
-                product=element,
-                type=active_object_material_type,
-                material=material,
-            )
-            assigned_material = ifcopenshell.util.element.get_material(element)
-            if assigned_material.is_a("IfcMaterialLayerSet"):
-                if not assigned_material.MaterialLayers:
-                    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-                    layer = ifcopenshell.api.run(
-                        "material.add_layer",
-                        tool.Ifc.get(),
-                        layer_set=assigned_material,
-                        material=tool.Ifc.get().by_type("IfcMaterial")[0],
-                    )
-                    thickness = 0.1  # Arbitrary metric thickness for now
-                    layer.LayerThickness = thickness / unit_scale
-            elif assigned_material.is_a("IfcMaterialProfileSet"):
-                if not assigned_material.MaterialProfiles:
-                    named_profiles = [p for p in tool.Ifc.get().by_type("IfcProfileDef") if p.ProfileName]
-                    if named_profiles:
-                        profile = named_profiles[0]
-                    else:
-                        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-                        size = 0.5 / unit_scale
-                        profile = tool.Ifc.get().create_entity(
-                            "IfcRectangleProfileDef",
-                            ProfileName="New Profile",
-                            ProfileType="AREA",
-                            XDim=size,
-                            YDim=size,
-                        )
-                        material_profile = ifcopenshell.api.run(
-                            "material.add_profile",
-                            tool.Ifc.get(),
-                            profile_set=assigned_material,
-                            material=tool.Ifc.get().by_type("IfcMaterial")[0],
-                        )
-                        ifcopenshell.api.run(
-                            "material.assign_profile",
-                            tool.Ifc.get(),
-                            material_profile=material_profile,
-                            profile=profile,
-                        )
+        core.assign_material(tool.Ifc, tool.Material, material_type= self.material_type , objects=objects )
 
 
 class UnassignMaterial(bpy.types.Operator, tool.Ifc.Operator):
@@ -207,12 +185,7 @@ class UnassignMaterial(bpy.types.Operator, tool.Ifc.Operator):
 
     def _execute(self, context):
         objects = [bpy.data.objects.get(self.obj)] if self.obj else tool.Blender.get_selected_objects()
-        for obj in objects:
-            element = tool.Ifc.get_entity(obj)
-            if element:
-                material = ifcopenshell.util.element.get_material(element, should_inherit=False)
-                if "Usage" not in material.is_a():
-                    ifcopenshell.api.run("material.unassign_material", tool.Ifc.get(), product=element)
+        core.unassign_material(tool.Ifc, tool.Material, objects=objects )
 
 
 class AddConstituent(bpy.types.Operator, tool.Ifc.Operator):
@@ -243,12 +216,12 @@ class RemoveConstituent(bpy.types.Operator, tool.Ifc.Operator):
     constituent: bpy.props.IntProperty()
 
     def _execute(self, context):
-        for inverse in tool.Ifc.get().get_inverse(tool.Ifc.get().by_id(self.constituent)):
-            if inverse.is_a("IfcMaterialConstituentSet") and len(inverse.MaterialConstituents) == 1:
-                return
-        ifcopenshell.api.run(
-            "material.remove_constituent", tool.Ifc.get(), constituent=tool.Ifc.get().by_id(self.constituent)
-        )
+        constituent = tool.Ifc.get().by_id(self.constituent)
+        for material_set in layer.ToMaterialConstituentSet:
+            if len(material_set.MaterialConstituents) == 1:
+                self.report({"ERROR"}, "At least one constituent must exist")
+                return {"ERROR"}
+        ifcopenshell.api.run("material.remove_constituent", tool.Ifc.get(), constituent=constituent)
 
 
 class AddProfile(bpy.types.Operator, tool.Ifc.Operator):
@@ -278,10 +251,12 @@ class RemoveProfile(bpy.types.Operator, tool.Ifc.Operator):
     profile: bpy.props.IntProperty()
 
     def _execute(self, context):
-        for inverse in tool.Ifc.get().get_inverse(tool.Ifc.get().by_id(self.profile)):
-            if inverse.is_a("IfcMaterialProfileSet") and len(inverse.MaterialProfiles) == 1:
-                return
-        ifcopenshell.api.run("material.remove_profile", tool.Ifc.get(), profile=tool.Ifc.get().by_id(self.profile))
+        profile = tool.Ifc.get().by_id(self.profile)
+        for material_set in profile.ToMaterialProfileSet:
+            if len(material_set.MaterialProfiles) == 1:
+                self.report({"ERROR"}, "At least one profile must exist")
+                return {"ERROR"}
+        ifcopenshell.api.run("material.remove_profile", tool.Ifc.get(), profile=profile)
 
 
 class AddLayer(bpy.types.Operator, tool.Ifc.Operator):
@@ -294,7 +269,7 @@ class AddLayer(bpy.types.Operator, tool.Ifc.Operator):
     def _execute(self, context):
         obj = bpy.data.objects.get(self.obj) if self.obj else context.active_object
         self.file = IfcStore.get_file()
-        ifcopenshell.api.run(
+        layer = ifcopenshell.api.run(
             "material.add_layer",
             self.file,
             **{
@@ -303,6 +278,10 @@ class AddLayer(bpy.types.Operator, tool.Ifc.Operator):
             },
         )
 
+        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        thickness = 0.1  # Arbitrary metric thickness for now
+        layer.LayerThickness = thickness / unit_scale
+
 
 class ReorderMaterialSetItem(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.reorder_material_set_item"
@@ -336,10 +315,12 @@ class RemoveLayer(bpy.types.Operator, tool.Ifc.Operator):
     layer: bpy.props.IntProperty()
 
     def _execute(self, context):
-        for inverse in tool.Ifc.get().get_inverse(tool.Ifc.get().by_id(self.layer)):
-            if inverse.is_a("IfcMaterialLayerSet") and len(inverse.MaterialLayers) == 1:
-                return
-        ifcopenshell.api.run("material.remove_layer", tool.Ifc.get(), layer=tool.Ifc.get().by_id(self.layer))
+        layer = tool.Ifc.get().by_id(self.layer)
+        for material_set in layer.ToMaterialLayerSet:
+            if len(material_set.MaterialLayers) == 1:
+                self.report({"ERROR"}, "At least one layer must exist")
+                return {"ERROR"}
+        ifcopenshell.api.run("material.remove_layer", tool.Ifc.get(), layer=layer)
 
 
 class AddListItem(bpy.types.Operator, tool.Ifc.Operator):
@@ -516,7 +497,7 @@ class EditAssignedMaterial(bpy.types.Operator, tool.Ifc.Operator):
 
 class EnableEditingMaterialSetItemProfile(bpy.types.Operator):
     bl_idname = "bim.enable_editing_material_set_item_profile"
-    bl_label = "Enable Editing Material Set Item"
+    bl_label = "Enable Editing Material Set Item Profile"
     bl_options = {"REGISTER", "UNDO"}
     obj: bpy.props.StringProperty()
     material_set_item: bpy.props.IntProperty()
@@ -532,7 +513,7 @@ class EnableEditingMaterialSetItemProfile(bpy.types.Operator):
 
 class DisableEditingMaterialSetItemProfile(bpy.types.Operator):
     bl_idname = "bim.disable_editing_material_set_item_profile"
-    bl_label = "Disable Editing Material Set Item"
+    bl_label = "Disable Editing Material Set Item Profile"
     bl_options = {"REGISTER", "UNDO"}
     obj: bpy.props.StringProperty()
 

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

@@ -85,24 +85,10 @@ def get_materials(self, context):
     return ObjectMaterialData.data["materials"]
 
 
-def get_object_material_types(self, context):
-    global materialtypes_enum
-    if len(materialtypes_enum) == 0 and IfcStore.get_file():
-        material_types = [
-            "IfcMaterial",
-            "IfcMaterialConstituentSet",
-            "IfcMaterialLayerSet",
-            "IfcMaterialLayerSetUsage",
-            "IfcMaterialProfileSet",
-            "IfcMaterialProfileSetUsage",
-            "IfcMaterialList",
-        ]
-        version = tool.Ifc.get_schema()
-        if version == "IFC2X3":
-            material_types = ["IfcMaterial", "IfcMaterialLayerSet", "IfcMaterialLayerSetUsage", "IfcMaterialList"]
-        materialtypes_enum.clear()
-        materialtypes_enum = [(m, m, get_entity_doc(version, m).get("description", "")) for m in material_types]
-    return materialtypes_enum
+def get_object_material_type(self, context):
+    if not ObjectMaterialData.is_loaded:
+        ObjectMaterialData.load()
+    return ObjectMaterialData.data["material_type"]
 
 
 def get_material_types(self, context):
@@ -131,10 +117,13 @@ class BIMMaterialProperties(PropertyGroup):
     materials: CollectionProperty(name="Materials", type=Material)
     active_material_index: IntProperty(name="Active Material Index")
     profiles: EnumProperty(items=get_profiles, name="Profiles")
+    active_material_id: IntProperty(name="Active Material ID")
+    material_attributes: CollectionProperty(name="Material Attributes", type=Attribute)
+    editing_material_type = StringProperty(name="Editing Material Type")
 
 
 class BIMObjectMaterialProperties(PropertyGroup):
-    material_type: EnumProperty(items=get_object_material_types, name="Material Type")
+    material_type: EnumProperty(items=get_object_material_type, name="Material Type")
     material: EnumProperty(items=get_materials, name="Material")
     is_editing: BoolProperty(name="Is Editing", default=False)
     material_set_usage_attributes: CollectionProperty(name="Material Set Usage Attributes", type=Attribute)

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

@@ -57,13 +57,21 @@ class BIM_PT_materials(Panel):
         row.alignment = "RIGHT"
 
         if self.props.material_type == "IfcMaterial":
-            row.operator("bim.add_material", text="", icon="ADD")
             if self.props.materials and self.props.active_material_index < len(self.props.materials):
                 material = self.props.materials[self.props.active_material_index]
                 if material.ifc_definition_id:
-                    op = row.operator("bim.select_by_material", text="", icon="RESTRICT_SELECT_OFF")
-                    op.material = material.ifc_definition_id
-                    row.operator("bim.remove_material", text="", icon="X").material = material.ifc_definition_id
+                    if self.props.active_material_id:
+                        row.operator("bim.edit_material", text="", icon="CHECKMARK").material = material.ifc_definition_id
+                        row.operator("bim.disable_editing_material", text="", icon="CANCEL").material = material.ifc_definition_id
+                        self.draw_editable_material_attributes_ui()
+                    else:
+                        row.operator("bim.add_material", text="", icon="ADD")
+                        op = row.operator("bim.select_by_material", text="", icon="RESTRICT_SELECT_OFF")
+                        op.material = material.ifc_definition_id
+                        row.operator("bim.enable_editing_material", text="", icon="GREASEPENCIL").material = material.ifc_definition_id
+                        row.operator("bim.remove_material", text="", icon="X").material = material.ifc_definition_id
+            else:
+                row.operator("bim.add_material", text="", icon="ADD")
         else:
             row.operator("bim.add_material_set", text="", icon="ADD").set_type = self.props.material_type
             if self.props.materials and self.props.active_material_index < len(self.props.materials):
@@ -76,6 +84,9 @@ class BIM_PT_materials(Panel):
         self.layout.template_list("BIM_UL_materials", "", self.props, "materials", self.props, "active_material_index")
 
 
+    def draw_editable_material_attributes_ui(self):
+        blenderbim.bim.helper.draw_attributes(self.props.material_attributes, self.layout)
+
 class BIM_PT_material(Panel):
     bl_label = "IFC Material"
     bl_idname = "BIM_PT_material"
@@ -144,8 +155,7 @@ class BIM_PT_object_material(Panel):
 
         row = self.layout.row(align=True)
         prop_with_search(row, self.props, "material_type", text="")
-        if self.props.material_type == "IfcMaterial" or self.props.material_type == "IfcMaterialList":
-            prop_with_search(row, self.props, "material", text="")
+        prop_with_search(row, self.props, "material", text="")
         row.operator("bim.assign_material", icon="ADD", text="")
 
     def draw_material_ui(self):
@@ -196,7 +206,7 @@ class BIM_PT_object_material(Panel):
         else:
             row = self.layout.row(align=True)
             if ObjectMaterialData.data["set_item_name"] == "profile":
-                row.prop(self.mprops, "profiles", icon="ITALIC", text="")
+                prop_with_search(row, self.mprops, "profiles", icon="ITALIC", text="")
             prop_with_search(row, self.props, "material", icon="MATERIAL", text="")
             op = row.operator(f"bim.add_{ObjectMaterialData.data['set_item_name']}", icon="ADD", text="")
             setattr(op, f"{ObjectMaterialData.data['set_item_name']}_set", ObjectMaterialData.data["set"]["id"])
@@ -230,11 +240,11 @@ class BIM_PT_object_material(Panel):
         draw_attributes(self.props.material_set_item_attributes, box)
 
         row = box.row()
-        row.prop(self.props, "material_set_item_material", icon="MATERIAL", text="Material")
+        prop_with_search(row, self.props, "material_set_item_material", icon="MATERIAL", text="Material")
 
         if ObjectMaterialData.data["set_item_name"] == "profile":
             row = box.row()
-            row.prop(self.mprops, "profiles", icon="ITALIC", text="Profile")
+            prop_with_search(row, self.mprops, "profiles", icon="ITALIC", text="Profile")
 
     def draw_read_only_set_item_ui(self, set_item, index, is_first=False, is_last=False):
         if ObjectMaterialData.data["material_class"] == "IfcMaterialList":

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

@@ -30,7 +30,6 @@ class BIM_PT_misc_utilities(bpy.types.Panel):
     def draw(self, context):
         layout = self.layout
         props = context.scene.BIMMiscProperties
-
         row = layout.split(factor=0.2, align=True)
         row.prop(props, "override_colour", text="")
         row.operator("bim.set_override_colour")
@@ -49,6 +48,8 @@ class BIM_PT_misc_utilities(bpy.types.Panel):
         row.operator("bim.draw_system_arrows")
         row = layout.row()
         row.operator("bim.clean_wireframes")
+        row = layout.row()
+        row.operator("bim.patch_non_parametric_mep_segment")
 
         row = layout.row(align=True)
         row.operator("bim.enable_editing_sketch_extrusion_profile", text="Start Sketching")

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

@@ -86,6 +86,7 @@ classes = (
     profile.ExtendProfile,
     profile.RecalculateProfile,
     profile.Rotate90,
+    profile.PatchNonParametricMepSegment,
     roof.GenerateHippedRoof,
     slab.DisableEditingExtrusionProfile,
     slab.DisableEditingSketchExtrusionProfile,
@@ -96,9 +97,8 @@ classes = (
     slab.ResetVertex,
     slab.SetArcIndex,
     space.GenerateSpace,
-    prop.ConstrTypeInfo,
-    prop.ConstrClassInfo,
-    prop.ConstrBrowserState,
+    space.GenerateSpacesFromWalls,
+    space.ToggleSpaceVisibility,
     prop.BIMModelProperties,
     prop.BIMArrayProperties,
     prop.BIMStairProperties,
@@ -107,7 +107,6 @@ classes = (
     prop.BIMDoorProperties,
     prop.BIMRailingProperties,
     prop.BIMRoofProperties,
-    ui.BIM_PT_authoring,
     ui.BIM_PT_array,
     ui.BIM_PT_stair,
     ui.BIM_PT_sverchok,
@@ -116,8 +115,8 @@ classes = (
     ui.BIM_PT_railing,
     ui.BIM_PT_roof,
     ui.LaunchTypeManager,
-    ui.HelpConstrTypes,
     ui.BIM_MT_model,
+    ui.BIM_PT_Grids,
     grid.BIM_OT_add_object,
     stair.BIM_OT_add_object,
     stair.BIM_OT_add_clever_stair,
@@ -152,6 +151,7 @@ classes = (
     railing.AddRailing,
     railing.CancelEditingRailing,
     railing.FinishEditingRailing,
+    railing.FlipRailingPathOrder,
     railing.EnableEditingRailing,
     railing.CancelEditingRailingPath,
     railing.FinishEditingRailingPath,

src/blenderbim/blenderbim/bim/module/model/array.py

@@ -28,7 +28,7 @@ from mathutils import Vector, Matrix
 class AddArray(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.add_array"
     bl_label = "Add Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
         obj = context.active_object
@@ -42,7 +42,7 @@ class AddArray(bpy.types.Operator, tool.Ifc.Operator):
             "z": 0.0,
             "use_local_space": True,
             "sync_children": False,
-            "dimension_input_type": "Increment",
+            "method": "OFFSET",
         }
 
         pset = ifcopenshell.util.element.get_pset(element, "BBIM_Array")
@@ -67,7 +67,7 @@ class AddArray(bpy.types.Operator, tool.Ifc.Operator):
 class DisableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.disable_editing_array"
     bl_label = "Disable Editing Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
         context.active_object.BIMArrayProperties.is_editing = -1
@@ -77,7 +77,7 @@ class DisableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
 class EnableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.enable_editing_array"
     bl_label = "Enable Editing Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
     item: bpy.props.IntProperty()
 
     def _execute(self, context):
@@ -86,12 +86,13 @@ class EnableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
         data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Array", "Data"))[self.item]
         props = obj.BIMArrayProperties
         props.count = data["count"]
-        props.x = data["x"]
-        props.y = data["y"]
-        props.z = data["z"]
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+        props.x = data["x"] * si_conversion
+        props.y = data["y"] * si_conversion
+        props.z = data["z"] * si_conversion
         props.use_local_space = data.get("use_local_space", False)
         props.sync_children = data.get("sync_children", False)
-        props.dimension_input_type = data.get("dimension_input_type", "Increment")
+        props.method = data.get("method", "OFFSET")
         props.is_editing = self.item
         return {"FINISHED"}
 
@@ -99,25 +100,26 @@ class EnableEditingArray(bpy.types.Operator, tool.Ifc.Operator):
 class EditArray(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.edit_array"
     bl_label = "Edit Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
     item: bpy.props.IntProperty()
 
     def _execute(self, context):
         obj = context.active_object
         element = tool.Ifc.get_entity(obj)
         props = obj.BIMArrayProperties
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
 
         pset = ifcopenshell.util.element.get_pset(element, "BBIM_Array")
         data = json.loads(pset["Data"])
         data[self.item] = {
             "children": data[self.item]["children"],
             "count": props.count,
-            "x": props.x,
-            "y": props.y,
-            "z": props.z,
+            "x": props.x / si_conversion,
+            "y": props.y / si_conversion,
+            "z": props.z / si_conversion,
             "use_local_space": props.use_local_space,
             "sync_children": props.sync_children,
-            "dimension_input_type": props.dimension_input_type,
+            "method": props.method,
         }
 
         props.is_editing = -1
@@ -138,7 +140,7 @@ class EditArray(bpy.types.Operator, tool.Ifc.Operator):
 class RemoveArray(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.remove_array"
     bl_label = "Remove Array"
-    bl_options = {"REGISTER"}
+    bl_options = {"REGISTER", "UNDO"}
     item: bpy.props.IntProperty()
 
     def _execute(self, context):
@@ -187,6 +189,7 @@ class SelectArrayParent(bpy.types.Operator):
             obj.select_set(True)
         return {"FINISHED"}
 
+
 class Input3DCursorXArray(bpy.types.Operator):
     bl_idname = "bim.input_cursor_x_array"
     bl_label = "Get 3d Cursor X Input for Array"
@@ -202,6 +205,7 @@ class Input3DCursorXArray(bpy.types.Operator):
             props.x = cursor.location.x - obj.location.x
         return {"FINISHED"}
 
+
 class Input3DCursorYArray(bpy.types.Operator):
     bl_idname = "bim.input_cursor_y_array"
     bl_label = "Get 3d Cursor Y Input for Array"
@@ -217,6 +221,7 @@ class Input3DCursorYArray(bpy.types.Operator):
             props.y = cursor.location.y - obj.location.y
         return {"FINISHED"}
 
+
 class Input3DCursorZArray(bpy.types.Operator):
     bl_idname = "bim.input_cursor_z_array"
     bl_label = "Get 3d Cursor Z Input for Array"

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

@@ -24,8 +24,6 @@ import ifcopenshell
 import ifcopenshell.util.element
 from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.module.model.root import ConstrTypeEntityNotFound
 
 
 def refresh():
@@ -49,9 +47,8 @@ class AuthoringData:
     def load(cls):
         cls.is_loaded = True
         cls.props = bpy.context.scene.BIMModelProperties
-        cls.load_ifc_classes()
-        cls.load_relating_types()
-        cls.load_relating_types_browser()
+        cls.data["ifc_classes"] = cls.ifc_classes()
+        cls.data["relating_type_id"] = cls.relating_type_id()
         cls.data["type_class"] = cls.type_class()
         cls.data["type_predefined_type"] = cls.type_predefined_type()
         cls.data["total_types"] = cls.total_types()
@@ -62,9 +59,19 @@ class AuthoringData:
         cls.data["type_thumbnail"] = cls.type_thumbnail()
         cls.data["is_voidable_element"] = cls.is_voidable_element()
         cls.data["has_visible_openings"] = cls.has_visible_openings()
+        cls.data["has_visible_boundaries"] = cls.has_visible_boundaries()
         cls.data["active_class"] = cls.active_class()
         cls.data["active_material_usage"] = cls.active_material_usage()
         cls.data["active_representation_type"] = cls.active_representation_type()
+        cls.data["boundary_class"] = cls.boundary_class()
+
+    @classmethod
+    def boundary_class(cls):
+        declaration = tool.Ifc.schema().declaration_by_name("IfcRelSpaceBoundary")
+        declarations = ifcopenshell.util.schema.get_subtypes(declaration)
+        names = [d.name() for d in declarations]
+        version = tool.Ifc.get_schema()
+        return [(c, c, get_entity_doc(version, c).get("description", "")) for c in sorted(names)]
 
     @classmethod
     def type_class(cls):
@@ -72,7 +79,10 @@ class AuthoringData:
         declarations = ifcopenshell.util.schema.get_subtypes(declaration)
         names = [d.name() for d in declarations]
 
-        declaration = tool.Ifc.schema().declaration_by_name("IfcSpatialElementType")
+        if tool.Ifc.get_schema() == "IFC2X3":
+            declaration = tool.Ifc.schema().declaration_by_name("IfcSpatialStructureElementType")
+        else:
+            declaration = tool.Ifc.schema().declaration_by_name("IfcSpatialElementType")
         declarations = ifcopenshell.util.schema.get_subtypes(declaration)
         names.extend([d.name() for d in declarations])
 
@@ -100,23 +110,11 @@ class AuthoringData:
 
     @classmethod
     def type_thumbnail(cls):
-        if not cls.data["relating_types_ids"]:
+        if not cls.data["relating_type_id"]:
             return 0
         element = tool.Ifc.get().by_id(int(cls.props.relating_type_id))
         return cls.type_thumbnails.get(element.id(), None) or 0
 
-    @classmethod
-    def load_ifc_classes(cls):
-        cls.data["ifc_classes"] = cls.ifc_classes()
-
-    @classmethod
-    def load_relating_types(cls):
-        cls.data["relating_types_ids"] = cls.relating_types()
-
-    @classmethod
-    def load_relating_types_browser(cls):
-        cls.data["relating_types_ids_browser"] = cls.relating_types_browser()
-
     @classmethod
     def total_types(cls):
         type_class = cls.props.type_class
@@ -176,6 +174,17 @@ class AuthoringData:
                     return True
         return False
 
+    @classmethod
+    def has_visible_boundaries(cls):
+        element = tool.Ifc.get_entity(bpy.context.active_object)
+        if element:
+            if element.is_a("IfcRelSpaceBoundary"):
+                return True
+            for boundary in getattr(element, "BoundedBy", []):
+                if tool.Ifc.get_object(boundary):
+                    return True
+        return False
+
     @classmethod
     def active_class(cls):
         element = tool.Ifc.get_entity(bpy.context.active_object)
@@ -192,7 +201,7 @@ class AuthoringData:
     def active_representation_type(cls):
         if bpy.context.active_object:
             representation = tool.Geometry.get_active_representation(bpy.context.active_object)
-            if representation:
+            if representation and representation.is_a("IfcShapeRepresentation"):
                 return representation.RepresentationType
 
     @classmethod
@@ -210,155 +219,23 @@ class AuthoringData:
         return results
 
     @classmethod
-    def constr_class_entities(cls, ifc_class=None):
+    def relating_type_id(cls):
         ifc_classes = cls.data["ifc_classes"]
         if not ifc_classes:
             return []
         results = []
-        if ifc_class is None:
-            ifc_class = cls.props.ifc_class
+        ifc_class = cls.props.ifc_class
         if not ifc_class and ifc_classes:
             ifc_class = ifc_classes[0][0]
         if ifc_class:
             elements = sorted(tool.Ifc.get().by_type(ifc_class), key=lambda s: s.Name or "Unnamed")
             results.extend(elements)
-            return results
+            return [
+                (str(e.id()), e.Name or "Unnamed", e.Description or "")
+                for e in results
+            ]
         return []
 
-    @classmethod
-    def relating_types(cls, ifc_class=None):
-        return [
-            (str(e.id()), e.Name or "Unnamed", e.Description or "")
-            for e in cls.constr_class_entities(ifc_class=ifc_class)
-        ]
-
-    @classmethod
-    def relating_types_browser(cls):
-        if cls.data["ifc_classes"]:
-            return cls.relating_types(ifc_class=cls.props.ifc_class_browser)
-
-    @classmethod
-    def new_constr_class_info(cls, ifc_class):
-        if ifc_class not in cls.props.constr_classes:
-            cls.props.constr_classes.add().name = ifc_class
-        return cls.props.constr_classes[ifc_class]
-
-    @classmethod
-    def assetize_constr_class(cls, ifc_class=None):
-        selected_ifc_class = cls.props.ifc_class
-        selected_relating_type_id = cls.props.relating_type_id
-        if ifc_class is None:
-            ifc_class = cls.props.ifc_class_browser
-        if cls.constr_class_info(ifc_class) is None:
-            cls.new_constr_class_info(ifc_class)
-        constr_class_occurrences = cls.constr_class_entities(ifc_class)
-        constr_classes = cls.props.constr_classes
-
-        for constr_class_entity in constr_class_occurrences:
-            if (
-                ifc_class not in constr_classes
-                or constr_class_entity.Name not in constr_classes[ifc_class].constr_types
-            ):
-                obj = tool.Ifc.get_object(constr_class_entity)
-                cls.assetize_object(obj, ifc_class, constr_class_entity)
-        cls.constr_class_info(ifc_class).fully_loaded = True
-        cls.props.updating = True
-        cls.props.ifc_class = selected_ifc_class
-        cls.props.relating_type_id = selected_relating_type_id
-        cls.props.updating = False
-
-    @classmethod
-    def assetize_object(cls, obj, ifc_class, ifc_class_entity, from_selection=False):
-        relating_type_id = ifc_class_entity.id()
-        to_be_deleted = False
-        if obj.type == "EMPTY":
-            kwargs = {}
-            if not from_selection:
-                kwargs.update({"ifc_class": ifc_class, "relating_type_id": relating_type_id})
-            new_obj = cls.new_relating_type(**kwargs)
-            if new_obj is not None:
-                to_be_deleted = True
-                obj = new_obj
-                obj.hide_set(True)
-        obj.asset_mark()
-        obj.asset_generate_preview()
-        blender33_or_above = bpy.app.version >= (3, 3, 0)
-        interval = 1e-4
-
-        def wait_for_asset_previews_generation(check_interval_seconds=interval):
-            if blender33_or_above and bpy.app.is_job_running("RENDER_PREVIEW"):
-                return check_interval_seconds
-            else:
-                if ifc_class not in cls.props.constr_classes:
-                    cls.props.constr_classes.add().name = ifc_class
-                constr_class_info = cls.props.constr_classes[ifc_class]
-                # relating_type = cls.relating_type_name_by_id(ifc_class, relating_type_id)
-                if str(relating_type_id) not in constr_class_info.constr_types:
-                    constr_class_info.constr_types.add().name = str(relating_type_id)
-                relating_type_info = constr_class_info.constr_types[str(relating_type_id)]
-                relating_type_info.object = obj
-                relating_type_info.icon_id = obj.preview.icon_id
-
-                if to_be_deleted:
-                    element = tool.Ifc.get_entity(obj)
-                    if element:
-                        tool.Ifc.delete(element)
-                    tool.Ifc.unlink(obj=obj)
-                    for collection in obj.users_collection:
-                        collection.objects.unlink(obj)
-                return None
-
-        first_interval = 0 if blender33_or_above else interval
-        bpy.app.timers.register(wait_for_asset_previews_generation, first_interval=first_interval)
-
-    @classmethod
-    def assetize_relating_type_from_selection(cls, browser=False):
-        ifc_class = cls.props.ifc_class_browser if browser else cls.props.ifc_class
-        relating_type_id = cls.props.relating_type_id_browser if browser else cls.props.relating_type_id
-        constr_class_occurrences = cls.constr_class_entities(ifc_class=ifc_class)
-        constr_class_occurrences = [
-            entity for entity in constr_class_occurrences if entity.id() == int(relating_type_id)
-        ]
-        if len(constr_class_occurrences) == 0:
-            raise ConstrTypeEntityNotFound()
-        constr_class_entity = constr_class_occurrences[0]
-        if (obj := tool.Ifc.get_object(constr_class_entity)) is None:
-            raise ConstrTypeEntityNotFound()
-        cls.assetize_object(obj, ifc_class, constr_class_entity, from_selection=True)
-
-    @staticmethod
-    def constr_class_info(ifc_class):
-        props = bpy.context.scene.BIMModelProperties
-        return props.constr_classes[ifc_class] if ifc_class in props.constr_classes else None
-
-    @classmethod
-    def new_relating_type(cls, ifc_class=None, relating_type_id=None):
-        if ifc_class is None:
-            bpy.ops.bim.add_constr_type_instance(
-                ifc_class=cls.props.ifc_class, relating_type_id=int(cls.props.relating_type_id)
-            )
-        else:
-            cls.props.updating = True
-            cls.props.ifc_class = ifc_class
-            cls.props.relating_type_id = str(relating_type_id)
-            cls.props.updating = False
-            bpy.ops.bim.add_constr_type_instance()
-        return bpy.context.selected_objects[-1]
-
-    @staticmethod
-    def relating_type_name_by_id(ifc_class, relating_type_id):
-        file = IfcStore.get_file()
-        try:
-            constr_class_entity = file.by_id(int(relating_type_id))
-        except (RuntimeError, ValueError):
-            return None
-        return constr_class_entity.Name if constr_class_entity.is_a() == ifc_class else None
-
-    @classmethod
-    def relating_type_id_by_name(cls, ifc_class, relating_type):
-        relating_types = [ct[0] for ct in cls.relating_types(ifc_class=ifc_class) if ct[1] == relating_type]
-        return None if len(relating_types) == 0 else relating_types[0]
-
 
 class ArrayData:
     data = {}

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

@@ -25,15 +25,14 @@ from mathutils import Vector, Matrix
 from gpu_extras.batch import batch_for_shader
 
 
-white = (1, 1, 1, 1)
-white_t = (1, 1, 1, 0.5)
-green = (0.545, 0.863, 0, 1)
-red = (1, 0.2, 0.322, 1)
-blue = (0.157, 0.565, 1, 1)
-grey = (0.2, 0.2, 0.2, 1)
+ERROR_ELEMENTS_COLOR = (1, 0.2, 0.322, 1)  # RED
+UNSPECIAL_ELEMENT_COLOR = (0.2, 0.2, 0.2, 1)  # GREY
 
-faces_color = (0.494, 0.540, 0.593, 1)
-preview_edges_color = (0.130, 0.141, 0.371, 1)
+
+def transparent_color(color, alpha=0.1):
+    color = [i for i in color]
+    color[3] = alpha
+    return color
 
 
 def bm_check_vertex_in_groups(vertex, deform_layer, groups):
@@ -83,9 +82,15 @@ class ProfileDecorator:
         bmesh.ops.triangulate(traingulated_bm, faces=traingulated_bm.faces)
 
         face_indices = [[v.index for v in f.verts] for f in traingulated_bm.faces]
+        faces_color = transparent_color(self.addon_prefs.decorator_color_special)
         self.draw_batch("TRIS", vertices_coords, faces_color, face_indices)
 
     def __call__(self, context, get_custom_bmesh=None, draw_faces=False, exit_edit_mode_callback=None):
+        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
+
         obj = context.active_object
 
         if obj.mode != "EDIT":
@@ -201,16 +206,16 @@ class ProfileDecorator:
         if draw_faces:
             self.draw_faces(bm, all_vertices)
 
-        self.draw_batch("LINES", all_vertices, white_t, unselected_edges)
-        self.draw_batch("LINES", all_vertices, green, selected_edges)
-        self.draw_batch("LINES", all_vertices, grey, arc_edges)
-        self.draw_batch("LINES", all_vertices, preview_edges_color, preview_edges)
-        self.draw_batch("LINES", all_vertices, blue, roof_angle_edges)
+        self.draw_batch("LINES", all_vertices, transparent_color(unselected_elements_color), unselected_edges)
+        self.draw_batch("LINES", all_vertices, selected_elements_color, selected_edges)
+        self.draw_batch("LINES", all_vertices, UNSPECIAL_ELEMENT_COLOR, arc_edges)
+        self.draw_batch("LINES", all_vertices, special_elements_color, preview_edges)
+        self.draw_batch("LINES", all_vertices, special_elements_color, roof_angle_edges)
 
-        self.draw_batch("POINTS", unselected_vertices, white_t)
-        self.draw_batch("POINTS", error_vertices, red)
-        self.draw_batch("POINTS", special_vertices, blue)
-        self.draw_batch("POINTS", selected_vertices, green)
+        self.draw_batch("POINTS", unselected_vertices, transparent_color(unselected_elements_color, 0.5))
+        self.draw_batch("POINTS", error_vertices, ERROR_ELEMENTS_COLOR)
+        self.draw_batch("POINTS", special_vertices, special_elements_color)
+        self.draw_batch("POINTS", selected_vertices, selected_elements_color)
 
         # Draw arcs
         arc_centroids = []
@@ -235,9 +240,9 @@ class ProfileDecorator:
                 arc_centroids.append(tuple(centroid))
             arc_segments.append(tool.Cad.create_arc_segments(pts=points, num_verts=17, make_edges=True))
 
-        self.draw_batch("POINTS", arc_centroids, grey)
+        self.draw_batch("POINTS", arc_centroids, UNSPECIAL_ELEMENT_COLOR)
         for verts, edges in arc_segments:
-            self.draw_batch("LINES", verts, blue, edges)
+            self.draw_batch("LINES", verts, special_elements_color, edges)
 
         # Draw circles
         circle_centroids = []
@@ -256,9 +261,9 @@ class ProfileDecorator:
             segments = [[list(matrix @ Vector(v)) for v in segments[0]], segments[1]]
             circle_segments.append(segments)
 
-        self.draw_batch("POINTS", circle_centroids, grey)
+        self.draw_batch("POINTS", circle_centroids, UNSPECIAL_ELEMENT_COLOR)
         for verts, edges in circle_segments:
-            self.draw_batch("LINES", verts, blue, edges)
+            self.draw_batch("LINES", verts, special_elements_color, edges)
 
     def create_matrix(self, p, x, y, z):
         return Matrix([x, y, z, p]).to_4x4().transposed()

src/blenderbim/blenderbim/bim/module/model/door.py

@@ -18,7 +18,6 @@
 
 
 import bpy
-from bpy.types import Operator
 import bmesh
 from bmesh.types import BMVert, BMFace
 
@@ -27,8 +26,6 @@ from ifcopenshell.util.shape_builder import V
 import blenderbim
 import blenderbim.tool as tool
 import blenderbim.core.geometry as core
-from blenderbim.bim.helper import convert_property_group_from_si
-from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.model.window import create_bm_window, create_bm_box, update_simple_openings
 
 from mathutils import Vector, Matrix
@@ -44,32 +41,31 @@ def update_door_modifier_representation(context):
     element = tool.Ifc.get_entity(obj)
     ifc_file = tool.Ifc.get()
     sliding_door = "SLIDING" in props.door_type
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
 
     representation_data = {
         "operation_type": props.door_type,
-        "overall_height": props.overall_height,
-        "overall_width": props.overall_width,
+        "overall_height": props.overall_height / si_conversion,
+        "overall_width": props.overall_width / si_conversion,
         "lining_properties": {
-            "LiningDepth": props.lining_depth,
-            "LiningThickness": props.lining_thickness,
-            "LiningOffset": props.lining_offset,
-            "LiningToPanelOffsetX": props.lining_to_panel_offset_x,
-            "LiningToPanelOffsetY": props.lining_to_panel_offset_y,
-            "TransomThickness": props.transom_thickness,
-            "TransomOffset": props.transom_offset,
-            "transomThickness": props.transom_thickness,
-            "TransomOffset": props.transom_offset,
-            "CasingThickness": props.casing_thickness,
-            "CasingDepth": props.casing_depth,
-            "ThresholdThickness": props.threshold_thickness,
-            "ThresholdDepth": props.threshold_depth,
-            "ThresholdOffset": props.threshold_offset,
+            "LiningDepth": props.lining_depth / si_conversion,
+            "LiningThickness": props.lining_thickness / si_conversion,
+            "LiningOffset": props.lining_offset / si_conversion,
+            "LiningToPanelOffsetX": props.lining_to_panel_offset_x / si_conversion,
+            "LiningToPanelOffsetY": props.lining_to_panel_offset_y / si_conversion,
+            "TransomThickness": props.transom_thickness / si_conversion,
+            "TransomOffset": props.transom_offset / si_conversion,
+            "CasingThickness": props.casing_thickness / si_conversion,
+            "CasingDepth": props.casing_depth / si_conversion,
+            "ThresholdThickness": props.threshold_thickness / si_conversion,
+            "ThresholdDepth": props.threshold_depth / si_conversion,
+            "ThresholdOffset": props.threshold_offset / si_conversion,
         },
         "panel_properties": {
-            "PanelDepth": props.panel_depth,
+            "PanelDepth": props.panel_depth / si_conversion,
             "PanelWidth": props.panel_width_ratio,
-            "FrameDepth": props.frame_depth,
-            "FrameThickness": props.frame_thickness,
+            "FrameDepth": props.frame_depth / si_conversion,
+            "FrameThickness": props.frame_thickness / si_conversion,
         },
     }
 
@@ -137,10 +133,10 @@ def update_door_modifier_representation(context):
     # occurences attributes
     occurences = tool.Ifc.get_all_element_occurences(element)
     for occurence in occurences:
-        occurence.OverallWidth = props.overall_width
-        occurence.OverallHeight = props.overall_height
+        occurence.OverallWidth = props.overall_width / si_conversion
+        occurence.OverallHeight = props.overall_height / si_conversion
 
-    update_simple_openings(element, props.overall_width, props.overall_height)
+    update_simple_openings(element, props.overall_width / si_conversion, props.overall_height / si_conversion)
 
 
 # TODO: move it out to tools
@@ -281,27 +277,26 @@ def create_bm_door_lining(bm, size: Vector, thickness: list, position: Vector =
 def update_door_modifier_bmesh(context):
     obj = context.object
     props = obj.BIMDoorProperties
-    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
 
-    overall_width = props.overall_width * si_conversion
-    overall_height = props.overall_height * si_conversion
+    overall_width = props.overall_width
+    overall_height = props.overall_height
     door_type = props.door_type
     double_swing_door = "DOUBLE_SWING" in door_type
     double_door = "DOUBLE_DOOR" in door_type
     sliding_door = "SLIDING" in door_type
 
     # lining params
-    lining_depth = props.lining_depth * si_conversion
-    lining_thickness_default = props.lining_thickness * si_conversion
-    lining_offset = props.lining_offset * si_conversion
+    lining_depth = props.lining_depth
+    lining_thickness_default = props.lining_thickness
+    lining_offset = props.lining_offset
     lining_to_panel_offset_x = (
-        props.lining_to_panel_offset_x * si_conversion if not sliding_door else lining_thickness_default
+        props.lining_to_panel_offset_x if not sliding_door else lining_thickness_default
     )
-    panel_depth = props.panel_depth * si_conversion
-    lining_to_panel_offset_y = props.lining_to_panel_offset_y * si_conversion if not sliding_door else -panel_depth
+    panel_depth = props.panel_depth
+    lining_to_panel_offset_y = props.lining_to_panel_offset_y if not sliding_door else -panel_depth
 
-    transom_thickness = props.transom_thickness * si_conversion / 2
-    transfom_offset = props.transom_offset * si_conversion
+    transom_thickness = props.transom_thickness / 2
+    transfom_offset = props.transom_offset
     if transom_thickness == 0:
         transfom_offset = 0
     window_lining_height = overall_height - transfom_offset - transom_thickness
@@ -316,24 +311,24 @@ def update_door_modifier_bmesh(context):
         side_lining_thickness = side_lining_thickness - panel_lining_overlap_x
         top_lining_thickness = top_lining_thickness - panel_top_lining_overlap_x
 
-    threshold_thickness = props.threshold_thickness * si_conversion
-    threshold_depth = props.threshold_depth * si_conversion
-    threshold_offset = props.threshold_offset * si_conversion
+    threshold_thickness = props.threshold_thickness
+    threshold_depth = props.threshold_depth
+    threshold_offset = props.threshold_offset
     threshold_width = overall_width - side_lining_thickness * 2
 
-    casing_thickness = props.casing_thickness * si_conversion
-    casing_depth = props.casing_depth * si_conversion
+    casing_thickness = props.casing_thickness
+    casing_depth = props.casing_depth
 
     # panel params
     panel_width = door_opening_width * props.panel_width_ratio
-    frame_depth = props.frame_depth * si_conversion
-    frame_thickness = props.frame_thickness * si_conversion
+    frame_depth = props.frame_depth
+    frame_thickness = props.frame_thickness
     frame_height = window_lining_height - lining_to_panel_offset_x * 2
-    glass_thickness = 0.01 * si_conversion
+    glass_thickness = 0.01
 
     # handle dimensions (hardcoded)
-    handle_size = V(120, 40, 20) * 0.001 * si_conversion
-    handle_offset = V(60, 0, 1000) * 0.001 * si_conversion  # to the handle center
+    handle_size = V(120, 40, 20) * 0.001
+    handle_offset = V(60, 0, 1000) * 0.001  # to the handle center
     handle_center_offset = V(handle_size.y / 2, 0, handle_size.z) / 2
 
     if transfom_offset:
@@ -418,7 +413,7 @@ def update_door_modifier_bmesh(context):
 
     if double_door:
         # keeping a little space between doors for readibility
-        double_door_offset = 0.001 * si_conversion
+        double_door_offset = 0.001
         panel_size.x = panel_size.x / 2 - double_door_offset
         door_verts.extend(create_bm_door_panel(panel_size, panel_position, "LEFT"))
 
@@ -516,14 +511,9 @@ class AddDoor(bpy.types.Operator, tool.Ifc.Operator):
             self.report({"ERROR"}, "Object has to be IfcDoor/IfcDoorType type to add a door.")
             return {"CANCELLED"}
 
-        # need to make sure all default props will have correct units
-        if not props.door_added_previously:
-            skip_props = ("is_editing", "door_type", "door_added_previously", "panel_width_ratio")
-            convert_property_group_from_si(props, skip_props=skip_props)
-
-        door_data = props.get_general_kwargs()
-        lining_props = props.get_lining_kwargs()
-        panel_props = props.get_panel_kwargs()
+        door_data = props.get_general_kwargs(convert_to_project_units=True)
+        lining_props = props.get_lining_kwargs(convert_to_project_units=True)
+        panel_props = props.get_panel_kwargs(convert_to_project_units=True)
 
         door_data["lining_properties"] = lining_props
         door_data["panel_properties"] = panel_props
@@ -550,11 +540,13 @@ class CancelEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
     def _execute(self, context):
         obj = context.active_object
         element = tool.Ifc.get_entity(obj)
-        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Door", "Data"))
         props = obj.BIMDoorProperties
+        data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Door", "Data"))
+        data.update(data.pop("lining_properties"))
+        data.update(data.pop("panel_properties"))
+
         # restore previous settings since editing was canceled
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
+        props.set_props_kwargs_from_ifc_data(data)
 
         body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
         blenderbim.core.geometry.switch_representation(
@@ -581,9 +573,9 @@ class FinishEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
         element = tool.Ifc.get_entity(obj)
         props = obj.BIMDoorProperties
 
-        door_data = props.get_general_kwargs()
-        lining_props = props.get_lining_kwargs()
-        panel_props = props.get_panel_kwargs()
+        door_data = props.get_general_kwargs(convert_to_project_units=True)
+        lining_props = props.get_lining_kwargs(convert_to_project_units=True)
+        panel_props = props.get_panel_kwargs(convert_to_project_units=True)
 
         door_data["lining_properties"] = lining_props
         door_data["panel_properties"] = panel_props
@@ -612,15 +604,7 @@ class EnableEditingDoor(bpy.types.Operator, tool.Ifc.Operator):
         data.update(data.pop("panel_properties"))
 
         # required since we could load pset from .ifc and BIMDoorProperties won't be set
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
-
-        # need to make sure all props that weren't used before
-        # will have correct units
-        skip_props = ("is_editing", "door_type", "door_added_previously", "panel_width_ratio")
-        skip_props += tuple(data.keys())
-        convert_property_group_from_si(props, skip_props=skip_props)
-
+        props.set_props_kwargs_from_ifc_data(data)
         props.is_editing = 1
         return {"FINISHED"}
 
@@ -638,7 +622,6 @@ class RemoveDoor(bpy.types.Operator, tool.Ifc.Operator):
 
         pset = tool.Pset.get_element_pset(element, "BBIM_Door")
         ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-        props.door_added_previously = True
 
         return {"FINISHED"}
 

src/blenderbim/blenderbim/bim/module/model/grid.py

@@ -30,32 +30,20 @@ def add_object(self, context):
     obj = bpy.data.objects.new("Grid", None)
     obj.name = "Grid"
 
-    collection = bpy.data.collections.new(obj.name)
-    has_site_collection = False
-    for child in context.view_layer.layer_collection.children:
-        if "IfcProject/" not in child.name:
-            continue
-        for grandchild in child.children:
-            if "IfcSite/" not in grandchild.name:
-                continue
-            has_site_collection = True
-            grandchild.collection.children.link(collection)
-            break
-    if not has_site_collection:
-        context.view_layer.active_layer_collection.collection.children.link(collection)
+    collection = context.view_layer.active_layer_collection.collection
+    site = tool.Ifc.get().by_type("IfcSite")
+    if site:
+        site = site[0]
+        site_obj = tool.Ifc.get_object(site)
+        if site_obj:
+            collection = site_obj.BIMObjectProperties.collection or collection
+
     collection.objects.link(obj)
 
-    self.file = IfcStore.get_file()
-    if self.file:
-        bpy.ops.bim.assign_class(obj=obj.name, ifc_class="IfcGrid")
-        collection.name = obj.name
-        grid = self.file.by_id(obj.BIMObjectProperties.ifc_definition_id)
-        if has_site_collection:
-            site_obj = bpy.data.objects.get(grandchild.name)
-            if site_obj and site_obj.BIMObjectProperties.ifc_definition_id:
-                blenderbim.core.spatial.assign_container(
-                    tool.Ifc, tool.Collector, tool.Spatial, structure_obj=site_obj, element_obj=obj
-                )
+    bpy.ops.bim.assign_class(obj=obj.name, ifc_class="IfcGrid")
+    grid = tool.Ifc.get_entity(obj)
+
+    collection = obj.BIMObjectProperties.collection or collection
 
     axes_collection = bpy.data.collections.new("UAxes")
     collection.children.link(axes_collection)
@@ -73,15 +61,14 @@ def add_object(self, context):
 
         axes_collection.objects.link(obj)
 
-        if self.file:
-            result = ifcopenshell.api.run(
-                "grid.create_grid_axis",
-                self.file,
-                **{"axis_tag": tag, "uvw_axes": "UAxes", "grid": grid},
-            )
-            IfcStore.link_element(result, obj)
-            ifcopenshell.api.run("grid.create_axis_curve", self.file, **{"axis_curve": obj, "grid_axis": result})
-            obj.BIMObjectProperties.ifc_definition_id = result.id()
+        result = ifcopenshell.api.run(
+            "grid.create_grid_axis",
+            tool.Ifc.get(),
+            **{"axis_tag": tag, "uvw_axes": "UAxes", "grid": grid},
+        )
+        IfcStore.link_element(result, obj)
+        ifcopenshell.api.run("grid.create_axis_curve", tool.Ifc.get(), **{"axis_curve": obj, "grid_axis": result})
+        obj.BIMObjectProperties.ifc_definition_id = result.id()
 
     axes_collection = bpy.data.collections.new("VAxes")
     collection.children.link(axes_collection)
@@ -99,18 +86,17 @@ def add_object(self, context):
 
         axes_collection.objects.link(obj)
 
-        if self.file:
-            result = ifcopenshell.api.run(
-                "grid.create_grid_axis",
-                self.file,
-                **{"axis_tag": tag, "uvw_axes": "VAxes", "grid": grid},
-            )
-            IfcStore.link_element(result, obj)
-            ifcopenshell.api.run("grid.create_axis_curve", self.file, **{"axis_curve": obj, "grid_axis": result})
-            obj.BIMObjectProperties.ifc_definition_id = result.id()
+        result = ifcopenshell.api.run(
+            "grid.create_grid_axis",
+            tool.Ifc.get(),
+            **{"axis_tag": tag, "uvw_axes": "VAxes", "grid": grid},
+        )
+        IfcStore.link_element(result, obj)
+        ifcopenshell.api.run("grid.create_axis_curve", tool.Ifc.get(), **{"axis_curve": obj, "grid_axis": result})
+        obj.BIMObjectProperties.ifc_definition_id = result.id()
 
 
-class BIM_OT_add_object(Operator):
+class BIM_OT_add_object(Operator, tool.Ifc.Operator):
     bl_idname = "mesh.add_grid"
     bl_label = "IFC Grid"
     bl_options = {"REGISTER", "UNDO"}
@@ -122,10 +108,7 @@ class BIM_OT_add_object(Operator):
 
     @classmethod
     def poll(cls, context):
-        return IfcStore.get_file()
-
-    def execute(self, context):
-        return IfcStore.execute_ifc_operator(self, context)
+        return tool.Ifc.get()
 
     def _execute(self, context):
         add_object(self, context)

src/blenderbim/blenderbim/bim/module/model/opening.py

@@ -336,15 +336,13 @@ class RecalculateFill(bpy.types.Operator, tool.Ifc.Operator):
             for building_element in decomposed_building_elements:
                 building_obj = tool.Ifc.get_object(building_element)
                 if building_obj and building_obj.data:
-                    body = ifcopenshell.util.representation.get_representation(
-                        building_element, "Model", "Body", "MODEL_VIEW"
-                    )
-                    if body:
+                    representation = tool.Geometry.get_active_representation(building_obj)
+                    if representation:
                         blenderbim.core.geometry.switch_representation(
                             tool.Ifc,
                             tool.Geometry,
                             obj=building_obj,
-                            representation=body,
+                            representation=representation,
                             should_reload=True,
                             is_global=True,
                             should_sync_changes_first=False,
@@ -659,7 +657,7 @@ class ShowOpenings(Operator, tool.Ifc.Operator):
         props = bpy.context.scene.BIMModelProperties
         for obj in context.selected_objects:
             element = tool.Ifc.get_entity(obj)
-            if not element:
+            if not element or not getattr(element, "HasOpenings", None):
                 continue
             if tool.Ifc.is_moved(obj):
                 blenderbim.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
@@ -684,7 +682,6 @@ class HideOpenings(Operator, tool.Ifc.Operator):
     bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
-        props = bpy.context.scene.BIMModelProperties
         to_delete = set()
         for obj in context.selected_objects:
             element = tool.Ifc.get_entity(obj)
@@ -696,7 +693,7 @@ class HideOpenings(Operator, tool.Ifc.Operator):
                 if opening_obj:
                     to_delete.add(opening_obj)
         for opening_obj in to_delete:
-            tool.Ifc.unlink(element=opening, obj=opening_obj)
+            tool.Ifc.unlink(obj=opening_obj)
             bpy.data.objects.remove(opening_obj)
         tool.Model.clear_scene_openings()
         return {"FINISHED"}
@@ -768,6 +765,7 @@ class EditOpenings(Operator, tool.Ifc.Operator):
                             results.add(obj)
         return results
 
+
 # TODO: merge with ProfileDecorator?
 class DecorationsHandler:
     installed = None
@@ -794,26 +792,26 @@ class DecorationsHandler:
         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")
 
         for opening in context.scene.BIMModelProperties.openings:
             obj = opening.obj
-
             if not obj:
                 continue
 
-            white = (1, 1, 1, 1)
-            white_t = (1, 1, 1, 0.5)
-            green = (0.545, 0.863, 0, 1)
-            red = (1, 0.2, 0.322, 1)
-            red_t = (1, 0.2, 0.322, 0.1)
-            blue = (0.157, 0.565, 1, 1)
-            blue_t = (0.157, 0.565, 1, 0.1)
-            grey = (0.2, 0.2, 0.2, 1)
-
             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
+            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)
@@ -850,21 +848,22 @@ class DecorationsHandler:
                     else:
                         unselected_edges.append(edge_indices)
 
-                self.draw_batch("LINES", verts, white_t, unselected_edges)
-                self.draw_batch("LINES", verts, green, selected_edges)
-                self.draw_batch("POINTS", unselected_vertices, white)
-                self.draw_batch("POINTS", selected_vertices, green)
+                self.draw_batch("LINES", verts, transparent_color(unselected_elements_color, 0.5), unselected_edges)
+                self.draw_batch("LINES", verts, selected_elements_color, selected_edges)
+                self.draw_batch("POINTS", unselected_vertices, unselected_elements_color)
+                self.draw_batch("POINTS", selected_vertices, selected_elements_color)
             else:
                 bm = bmesh.new()
                 bm.from_mesh(obj.data)
 
                 verts = [tuple(obj.matrix_world @ v.co) for v in bm.verts]
                 edges = [tuple([v.index for v in e.verts]) for e in bm.edges]
-                self.draw_batch("LINES", verts, green if obj in context.selected_objects else blue, edges)
+                color = selected_elements_color if obj in context.selected_objects else special_elements_color
+                self.draw_batch("LINES", verts, color, edges)
 
             obj.data.calc_loop_triangles()
             tris = [tuple(t.vertices) for t in obj.data.loop_triangles]
-            self.draw_batch("TRIS", verts, blue_t, tris)
+            self.draw_batch("TRIS", verts, transparent_color(special_elements_color), tris)
 
             if "HalfSpaceSolid" in obj.name:
                 # Arrow shape
@@ -877,7 +876,8 @@ class DecorationsHandler:
                     tuple(obj.matrix_world @ Vector((0, -0.05, 0.45))),
                 ]
                 edges = [(0, 1), (1, 2), (1, 3), (1, 4), (1, 5)]
-                self.draw_batch("LINES", verts, green if obj in context.selected_objects else blue, edges)
+                color = selected_elements_color if obj in context.selected_objects else special_elements_color
+                self.draw_batch("LINES", verts, color, edges)
 
             if obj.mode != "EDIT":
                 bm.free()

src/blenderbim/blenderbim/bim/module/model/pie.py

@@ -19,6 +19,7 @@
 import bpy
 import blenderbim.tool as tool
 import blenderbim.core.spatial
+import blenderbim.core.aggregate
 from blenderbim.bim.ifc import IfcStore
 
 
@@ -67,7 +68,7 @@ class PieUpdateContainer(bpy.types.Operator):
             if not obj.BIMObjectProperties.ifc_definition_id:
                 continue
             for collection in obj.users_collection:
-                spatial_obj = bpy.data.objects.get(collection.name)
+                spatial_obj = collection.BIMCollectionProperties.obj
                 if spatial_obj and spatial_obj.BIMObjectProperties.ifc_definition_id:
                     blenderbim.core.spatial.assign_container(
                         tool.Ifc, tool.Collector, tool.Spatial, structure_obj=spatial_obj, element_obj=obj
@@ -86,6 +87,8 @@ class VIEW3D_MT_PIE_bim(bpy.types.Menu):
         pie.operator("bim.pie_add_opening")
         pie.operator("bim.pie_update_container")
         pie.operator("bim.open_pie_class", text="Assign IFC Class")
+        pie.operator("bim.assign_object", text ="Assign Aggregation")
+        pie.operator("bim.unassign_object", text ="Unassign Aggregation")
 
 
 class VIEW3D_MT_PIE_bim_class(bpy.types.Menu):

src/blenderbim/blenderbim/bim/module/model/product.py

@@ -37,12 +37,6 @@ from . import prop
 import json
 
 
-def select_and_activate_single_object(context, obj):
-    bpy.ops.object.select_all(action="DESELECT")
-    context.view_layer.objects.active = obj
-    obj.select_set(True)
-
-
 class AddEmptyType(bpy.types.Operator, AddObjectHelper):
     bl_idname = "bim.add_empty_type"
     bl_label = "Add Empty Type"
@@ -52,7 +46,7 @@ class AddEmptyType(bpy.types.Operator, AddObjectHelper):
         obj = bpy.data.objects.new("TYPEX", None)
         context.scene.collection.objects.link(obj)
         context.scene.BIMRootProperties.ifc_product = "IfcElementType"
-        select_and_activate_single_object(context, obj)
+        tool.Blender.select_and_activate_single_object(context, obj)
         return {"FINISHED"}
 
 
@@ -97,7 +91,7 @@ class AddConstrTypeInstance(bpy.types.Operator):
                 return {"FINISHED"}
         elif material and material.is_a("IfcMaterialLayerSet"):
             if self.generate_layered_element(ifc_class, relating_type):
-                select_and_activate_single_object(context, context.selected_objects[-1])
+                tool.Blender.select_and_activate_single_object(context, context.selected_objects[-1])
                 return {"FINISHED"}
         if relating_type.is_a("IfcFlowSegmentType") and not relating_type.RepresentationMaps:
             if mep.MepGenerator(relating_type).generate():
@@ -133,9 +127,10 @@ class AddConstrTypeInstance(bpy.types.Operator):
         obj = bpy.data.objects.new(tool.Model.generate_occurrence_name(relating_type, instance_class), mesh)
 
         obj.location = context.scene.cursor.location
+
         collection = context.view_layer.active_layer_collection.collection
         collection.objects.link(obj)
-        collection_obj = bpy.data.objects.get(collection.name)
+        collection_obj = collection.BIMCollectionProperties.obj
 
         bpy.ops.bim.assign_class(obj=obj.name, ifc_class=instance_class)
         element = tool.Ifc.get_entity(obj)
@@ -144,6 +139,26 @@ class AddConstrTypeInstance(bpy.types.Operator):
         # Update required as core.type.assign_type may change obj.data
         context.view_layer.update()
 
+        if (
+            building_obj
+            and building_element
+            and building_element.is_a() in ["IfcWall", "IfcWallStandardCase", "IfcCovering"]
+            and instance_class in ["IfcWindow", "IfcDoor"]
+        ):
+            # Fills should be a sibling to the building element
+            parent = ifcopenshell.util.element.get_aggregate(building_element)
+            if parent:
+                parent_obj = tool.Ifc.get_object(parent)
+                blenderbim.core.aggregate.assign_object(
+                    tool.Ifc, tool.Aggregate, tool.Collector, relating_obj=parent_obj, related_obj=obj
+                )
+            else:
+                parent = ifcopenshell.util.element.get_container(building_element)
+                parent_obj = tool.Ifc.get_object(parent)
+                blenderbim.core.spatial.assign_container(
+                    tool.Ifc, tool.Collector, tool.Spatial, structure_obj=parent_obj, element_obj=obj
+                )
+
         # set occurences properties for the types defined with modifiers
         if instance_class in ["IfcWindow", "IfcDoor"]:
             pset_name = f"BBIM_{instance_class[3:]}"
@@ -179,7 +194,7 @@ class AddConstrTypeInstance(bpy.types.Operator):
         if ifc_class == "IfcDoorType" and len(context.selected_objects) >= 1:
             pass
         else:
-            select_and_activate_single_object(context, obj)
+            tool.Blender.select_and_activate_single_object(context, obj)
         return {"FINISHED"}
 
     @staticmethod
@@ -402,7 +417,7 @@ class MirrorElements(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.mirror_elements"
     bl_label = "Mirror Elements"
     bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Faux-mirrors the selected object by an active empty along a mirror plane."
+    bl_description = "Faux-mirrors the selected objects by an active empty along a mirror plane"
 
     @classmethod
     def poll(cls, context):
@@ -456,11 +471,6 @@ class MirrorElements(bpy.types.Operator, tool.Ifc.Operator):
 
             obj.matrix_world = newmat
 
-    def copy_obj(self, obj):
-        new = obj.copy()
-        new.data = wall2.data.copy()
-        wall1.users_collection[0].objects.link(wall2)
-        blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=wall2)
 
 
 def generate_box(usecase_path, ifc_file, settings):

src/blenderbim/blenderbim/bim/module/model/profile.py

@@ -28,6 +28,7 @@ import blenderbim.bim.handler
 import blenderbim.tool as tool
 import blenderbim.core.type
 import blenderbim.core.geometry
+import blenderbim.core.material
 from math import pi, degrees, inf
 from mathutils import Vector, Matrix, Quaternion
 from blenderbim.bim.module.geometry.helper import Helper
@@ -53,8 +54,8 @@ class DumbProfileGenerator:
         self.axis_context = ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Model", "Axis", "GRAPH_VIEW")
         props = bpy.context.scene.BIMModelProperties
         self.collection = bpy.context.view_layer.active_layer_collection.collection
-        self.collection_obj = bpy.data.objects.get(self.collection.name)
-        self.depth = props.extrusion_depth * self.unit_scale
+        self.collection_obj = self.collection.BIMCollectionProperties.obj
+        self.depth = props.extrusion_depth
         self.rotation = 0
         self.location = Vector((0, 0, 0))
         self.cardinal_point = int(bpy.context.scene.BIMModelProperties.cardinal_point)
@@ -260,7 +261,7 @@ class DumbProfileJoiner:
         body[1 if connection == "ATEND" else 0] = intersect
         self.recreate_profile(element1, profile1, axis, body)
 
-    def set_depth(self, profile1, length):
+    def set_depth(self, profile1, si_length):
         element1 = tool.Ifc.get_entity(profile1)
         if not element1:
             return
@@ -270,8 +271,6 @@ class DumbProfileJoiner:
         axis1 = self.get_profile_axis(profile1)
         axis = copy.deepcopy(axis1)
         body = copy.deepcopy(axis1)
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        si_length = unit_scale * length
         end = profile1.matrix_world @ Vector((0, 0, si_length))
         axis[1] = end
         body[1] = end
@@ -859,6 +858,25 @@ class Rotate90(bpy.types.Operator, tool.Ifc.Operator):
         return {"FINISHED"}
 
 
+class PatchNonParametricMepSegment(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.patch_non_parametric_mep_segment"
+    bl_label = "Set MEP segment Material Profile"
+    bl_options = {"REGISTER", "UNDO"}
+
+    @classmethod
+    def poll(cls, context):
+        return context.active_object
+
+    def _execute(self, context):
+        styles = tool.Geometry.get_styles(context.active_object)
+        blenderbim.core.material.patch_non_parametric_mep_segment(
+            tool.Ifc, tool.Material, tool.Profile, obj=context.active_object
+        )
+        bpy.ops.bim.enable_editing_extrusion_axis()
+        bpy.ops.bim.edit_extrusion_axis()
+        styles = tool.Geometry.get_styles(context.active_object)
+
+
 class EnableEditingExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.enable_editing_extrusion_axis"
     bl_label = "Enable Editing Extrusion Axis"
@@ -929,7 +947,7 @@ class DisableEditingExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
         return context.selected_objects
 
     def _execute(self, context):
-        return disable_editing_extrusion_axis()
+        return disable_editing_extrusion_axis(context)
 
 
 class EditExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
@@ -950,6 +968,10 @@ class EditExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
         depth = (end - start).length
         z_axis = (end - start).normalized()
         y_axis = Vector((0, 0, 1))
+        # making sure z_axis != y_axis
+        if z_axis == y_axis:
+            y_axis = Vector((0,1,0))
+
         x_axis = y_axis.cross(z_axis).normalized()
         y_axis = z_axis.cross(x_axis).normalized()
 
@@ -977,5 +999,5 @@ class EditExtrusionAxis(bpy.types.Operator, tool.Ifc.Operator):
         bpy.context.view_layer.update()
 
         joiner = DumbProfileJoiner()
-        joiner.set_depth(obj, depth / self.unit_scale)
+        joiner.set_depth(obj, depth)
         return {"FINISHED"}

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

@@ -21,7 +21,6 @@ import ifcopenshell
 import blenderbim.tool as tool
 from blenderbim.bim.prop import ObjProperty
 from blenderbim.bim.module.model.data import AuthoringData
-from blenderbim.bim.module.model.root import ConstrTypeEntityNotFound
 from bpy.types import PropertyGroup, NodeTree
 from math import pi
 
@@ -38,16 +37,16 @@ def get_type_class(self, context):
     return AuthoringData.data["type_class"]
 
 
-def get_relating_type(self, context):
+def get_boundary_class(self, context):
     if not AuthoringData.is_loaded:
         AuthoringData.load()
-    return AuthoringData.data["relating_types_ids"]
+    return AuthoringData.data["boundary_class"]
 
 
-def get_relating_type_browser(self, context):
+def get_relating_type_id(self, context):
     if not AuthoringData.is_loaded:
         AuthoringData.load()
-    return AuthoringData.data["relating_types_ids_browser"]
+    return AuthoringData.data["relating_type_id"]
 
 
 def get_type_predefined_type(self, context):
@@ -56,33 +55,9 @@ def get_type_predefined_type(self, context):
     return AuthoringData.data["type_predefined_type"]
 
 
-def update_icon_id(self, context, browser=False):
-    if context == "lost_context" or (context.region is not None and context.region.type != "TOOL_HEADER"):
-        ifc_class = self.ifc_class_browser if browser else self.ifc_class
-        relating_type_id = self.relating_type_id_browser if browser else self.relating_type_id
-        # relating_type = AuthoringData.relating_type_name_by_id(ifc_class, relating_type_id)
-
-        if ifc_class not in self.constr_classes or relating_type_id not in self.constr_classes[ifc_class].constr_types:
-            try:
-                AuthoringData.assetize_relating_type_from_selection(browser=browser)
-            except ConstrTypeEntityNotFound:
-                return
-
-        def set_icon(update_interval_seconds=1e-4):
-            if (
-                ifc_class not in self.constr_classes
-                or relating_type_id not in self.constr_classes[ifc_class].constr_types
-            ):
-                return update_interval_seconds
-            else:
-                self.icon_id = self.constr_classes[ifc_class].constr_types[relating_type_id].icon_id
-
-        bpy.app.timers.register(set_icon)
-
-
 def update_ifc_class(self, context):
     bpy.ops.bim.load_type_thumbnails(ifc_class=self.ifc_class)
-    AuthoringData.data["relating_types_ids"] = AuthoringData.relating_types()
+    AuthoringData.data["relating_type_id"] = AuthoringData.relating_type_id()
     AuthoringData.data["type_thumbnail"] = AuthoringData.type_thumbnail()
 
 
@@ -95,21 +70,8 @@ def update_type_class(self, context):
     AuthoringData.data["type_predefined_type"] = AuthoringData.type_predefined_type()
 
 
-def update_ifc_class_browser(self, context):
-    if context.region is not None and context.region.type != "TOOL_HEADER":
-        AuthoringData.load_ifc_classes()
-        AuthoringData.load_relating_types_browser()
-        if self.updating:
-            return
-        ifc_class = self.ifc_class_browser
-        constr_class_info = AuthoringData.constr_class_info(ifc_class)
-
-        if constr_class_info is None or not constr_class_info.fully_loaded:
-            AuthoringData.assetize_constr_class(ifc_class)
-
-
-def update_relating_type(self, context):
-    AuthoringData.load_relating_types()
+def update_relating_type_id(self, context):
+    AuthoringData.data["relating_type_id"] = AuthoringData.relating_type_id()
     AuthoringData.data["type_thumbnail"] = AuthoringData.type_thumbnail()
 
 
@@ -117,81 +79,20 @@ def update_type_page(self, context):
     AuthoringData.data["paginated_relating_types"] = AuthoringData.paginated_relating_types()
 
 
-def update_relating_type_browser(self, context):
-    AuthoringData.load_relating_types_browser()
-    if not self.updating:
-        update_icon_id(self, context, browser=True)
-
-
-def update_relating_type_by_name(self, context):
-    AuthoringData.load_relating_types()
-    relating_type_id = AuthoringData.relating_type_id_by_name(self.ifc_class, self.relating_type)
-    if relating_type_id is not None:
-        self.relating_type_id = relating_type_id
-
-
-def get_constr_class_info(props, ifc_class):
-    return props.constr_classes[ifc_class] if ifc_class in props.constr_classes else None
-
-
-def update_preview_multiple(self, context):
-    if context.region is not None and context.region.type != "TOOL_HEADER":
-        if self.preview_multiple_constr_types:
-            ifc_class = self.ifc_class
-            constr_class_info = get_constr_class_info(self, ifc_class)
-            if constr_class_info is None or not constr_class_info.fully_loaded:
-                AuthoringData.assetize_constr_class(ifc_class)
-        else:
-            update_relating_type(self, context)
-
-
-class ConstrTypeInfo(PropertyGroup):
-    name: bpy.props.StringProperty(name="Construction type ID")
-    icon_id: bpy.props.IntProperty(name="Icon ID")
-    object: bpy.props.PointerProperty(name="Object", type=bpy.types.Object)
-
-
-class ConstrClassInfo(PropertyGroup):
-    name: bpy.props.StringProperty(name="Construction class")
-    constr_types: bpy.props.CollectionProperty(type=ConstrTypeInfo)
-    fully_loaded: bpy.props.BoolProperty(default=False)
-
-
-class ConstrBrowserState(PropertyGroup):
-    cursor_x: bpy.props.IntProperty()
-    cursor_y: bpy.props.IntProperty()
-    window_x: bpy.props.IntProperty()
-    window_y: bpy.props.IntProperty()
-    far_away_x: bpy.props.IntProperty(default=10)  # lower left corner to temporarily warp the mouse
-    far_away_y: bpy.props.IntProperty(default=10)  # useful to close popup operators
-    updating: bpy.props.BoolProperty()
-    update_delay: bpy.props.FloatProperty(default=3e-2)
-
-
 class BIMModelProperties(PropertyGroup):
     ifc_class: bpy.props.EnumProperty(items=get_ifc_class, name="Construction Class", update=update_ifc_class)
-    ifc_class_browser: bpy.props.EnumProperty(
-        items=get_ifc_class, name="Construction Class", update=update_ifc_class_browser
-    )
-    relating_type: bpy.props.StringProperty(update=update_relating_type_by_name)
     relating_type_id: bpy.props.EnumProperty(
-        items=get_relating_type, name="Construction Type", update=update_relating_type
-    )
-    relating_type_id_browser: bpy.props.EnumProperty(
-        items=get_relating_type_browser, name="Construction Type", update=update_relating_type_browser
+        items=get_relating_type_id, name="Relating Type", update=update_relating_type_id
     )
     icon_id: bpy.props.IntProperty()
-    preview_multiple_constr_types: bpy.props.BoolProperty(default=False, update=update_preview_multiple)
     updating: bpy.props.BoolProperty(default=False)
     occurrence_name_style: bpy.props.EnumProperty(
         items=[("CLASS", "By Class", ""), ("TYPE", "By Type", ""), ("CUSTOM", "Custom", "")],
         name="Occurrence Name Style",
     )
     occurrence_name_function: bpy.props.StringProperty(name="Occurrence Name Function")
-    getter_enum = {"ifc_class": get_ifc_class, "relating_type": get_relating_type}
-    constr_classes: bpy.props.CollectionProperty(type=ConstrClassInfo)
-    constr_browser_state: bpy.props.PointerProperty(type=ConstrBrowserState)
-    extrusion_depth: bpy.props.FloatProperty(default=42.0)
+    getter_enum = {"ifc_class": get_ifc_class, "relating_type": get_relating_type_id}
+    extrusion_depth: bpy.props.FloatProperty(default=42.0, subtype="DISTANCE")
     cardinal_point: bpy.props.EnumProperty(
         items=(
             # TODO: complain to buildingSMART
@@ -218,14 +119,14 @@ class BIMModelProperties(PropertyGroup):
         name="Cardinal Point",
         default="5",
     )
-    length: bpy.props.FloatProperty(default=42.0)
+    length: bpy.props.FloatProperty(default=42.0, subtype="DISTANCE")
     openings: bpy.props.CollectionProperty(type=ObjProperty)
     x: bpy.props.FloatProperty(name="X", default=0.5)
     y: bpy.props.FloatProperty(name="Y", default=0.5)
     z: bpy.props.FloatProperty(name="Z", default=0.5)
     rl1: bpy.props.FloatProperty(name="RL", default=1)  # Used for things like walls, doors, flooring, skirting, etc
     rl2: bpy.props.FloatProperty(name="RL", default=1)  # Used for things like windows, other hosted furniture
-    x_angle: bpy.props.FloatProperty(name="X Angle", default=0)
+    x_angle: bpy.props.FloatProperty(name="X Angle", default=0, subtype="ANGLE")
     type_page: bpy.props.IntProperty(name="Type Page", default=1, update=update_type_page)
     type_template: bpy.props.EnumProperty(
         items=(
@@ -246,6 +147,7 @@ class BIMModelProperties(PropertyGroup):
     type_class: bpy.props.EnumProperty(items=get_type_class, name="IFC Class", update=update_type_class)
     type_predefined_type: bpy.props.EnumProperty(items=get_type_predefined_type, name="Predefined Type", default=None)
     type_name: bpy.props.StringProperty(name="Name", default="TYPEX")
+    boundary_class: bpy.props.EnumProperty(items=get_boundary_class, name="Boundary Class")
 
 
 class BIMArrayProperties(PropertyGroup):
@@ -253,49 +155,46 @@ class BIMArrayProperties(PropertyGroup):
         default=-1, description="Currently edited array index. -1 if not in array editing mode."
     )
     count: bpy.props.IntProperty(name="Count", default=0, min=0)
-    x: bpy.props.FloatProperty(name="X", default=0)
-    y: bpy.props.FloatProperty(name="Y", default=0)
-    z: bpy.props.FloatProperty(name="Z", default=0)
+    x: bpy.props.FloatProperty(name="X", default=0, subtype="DISTANCE")
+    y: bpy.props.FloatProperty(name="Y", default=0, subtype="DISTANCE")
+    z: bpy.props.FloatProperty(name="Z", default=0, subtype="DISTANCE")
     use_local_space: bpy.props.BoolProperty(
         name="Use Local Space",
         description="Use local space for array items offset instead of world space",
         default=True,
     )
-    dimension_input_type: bpy.props.EnumProperty(
-        items=(
-            ("Increment", "Increment", ""),
-            ("Total", "Total", ""),
-        ),
-        name="Type of input dimension",
-        default="Increment",
+    method: bpy.props.EnumProperty(
+        items=(("OFFSET", "Offset", ""), ("DISTRIBUTE", "Distribute", "")),
+        name="Method",
+        default="OFFSET",
     )
     sync_children: bpy.props.BoolProperty(
         name="Sync Children",
-        description="Keep children objects in sync with parent object",
-        default = False,
+        description="Regenerate all children based on the parent object",
+        default=False,
     )
 
 
 class BIMStairProperties(PropertyGroup):
+    non_si_units_props = ("is_editing", "number_of_treads", "has_top_nib", "stair_type")
     stair_types = (
         ("CONCRETE", "Concrete", ""),
         ("WOOD/STEEL", "Wood / Steel", ""),
         ("GENERIC", "Generic", ""),
     )
 
-    stair_added_previously: bpy.props.BoolProperty(default=False)
     is_editing: bpy.props.IntProperty(default=-1)
-    width: bpy.props.FloatProperty(name="Width", default=1.2, soft_min=0.01)
-    height: bpy.props.FloatProperty(name="Height", default=1.0, soft_min=0.01)
+    width: bpy.props.FloatProperty(name="Width", default=1.2, soft_min=0.01, subtype="DISTANCE")
+    height: bpy.props.FloatProperty(name="Height", default=1.0, soft_min=0.01, subtype="DISTANCE")
     number_of_treads: bpy.props.IntProperty(name="Number of treads", default=6, soft_min=1)
-    tread_depth: bpy.props.FloatProperty(name="Tread Depth", default=0.25, soft_min=0.01)
-    tread_run: bpy.props.FloatProperty(name="Tread Run", default=0.3, soft_min=0.01)
-    base_slab_depth: bpy.props.FloatProperty(name="Base slab depth", default=0.25, soft_min=0)
-    top_slab_depth: bpy.props.FloatProperty(name="Top slab depth", default=0.25, soft_min=0)
+    tread_depth: bpy.props.FloatProperty(name="Tread Depth", default=0.25, soft_min=0.01, subtype="DISTANCE")
+    tread_run: bpy.props.FloatProperty(name="Tread Run", default=0.3, soft_min=0.01, subtype="DISTANCE")
+    base_slab_depth: bpy.props.FloatProperty(name="Base slab depth", default=0.25, soft_min=0, subtype="DISTANCE")
+    top_slab_depth: bpy.props.FloatProperty(name="Top slab depth", default=0.25, soft_min=0, subtype="DISTANCE")
     has_top_nib: bpy.props.BoolProperty(name="Has top nib", default=True)
     stair_type: bpy.props.EnumProperty(name="Stair type", items=stair_types, default="CONCRETE")
 
-    def get_props_kwargs(self):
+    def get_props_kwargs(self, convert_to_project_units=False):
         stair_kwargs = {
             "stair_type": self.stair_type,
             "width": self.width,
@@ -305,27 +204,34 @@ class BIMStairProperties(PropertyGroup):
         }
 
         if self.stair_type == "CONCRETE":
-            stair_kwargs.update(
-                {
-                    "base_slab_depth": self.base_slab_depth,
-                    "top_slab_depth": self.top_slab_depth,
-                    "has_top_nib": self.has_top_nib,
-                    "tread_depth": self.tread_depth,
-                }
-            )
-            return stair_kwargs
+            concrete_props = {
+                "base_slab_depth": self.base_slab_depth,
+                "top_slab_depth": self.top_slab_depth,
+                "has_top_nib": self.has_top_nib,
+                "tread_depth": self.tread_depth,
+            }
+            stair_kwargs.update(concrete_props)
 
         elif self.stair_type == "WOOD/STEEL":
-            stair_kwargs.update(
-                {
-                    "tread_depth": self.tread_depth,
-                }
-            )
-            return stair_kwargs
+            wood_steel_props = {
+                "tread_depth": self.tread_depth,
+            }
+            stair_kwargs.update(wood_steel_props)
 
         elif self.stair_type == "GENERIC":
+            pass
+
+        if not convert_to_project_units:
             return stair_kwargs
 
+        stair_kwargs = tool.Model.convert_data_to_project_units(stair_kwargs, self.non_si_units_props)
+        return stair_kwargs
+
+    def set_props_kwargs_from_ifc_data(self, kwargs):
+        kwargs = tool.Model.convert_data_to_si_units(kwargs, self.non_si_units_props)
+        for prop_name in kwargs:
+            setattr(self, prop_name, kwargs[prop_name])
+
 
 class BIMSverchokProperties(PropertyGroup):
     node_group: bpy.props.PointerProperty(name="Node Group", type=NodeTree)
@@ -333,15 +239,13 @@ class BIMSverchokProperties(PropertyGroup):
 
 def window_type_prop_update(self, context):
     number_of_panels, panels_data = self.window_types_panels[self.window_type]
-
-    si_coversion = 1.0 / ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-    panels_data = [[v * si_coversion for v in data] for data in panels_data]
     self.first_mullion_offset, self.second_mullion_offset = panels_data[0]
     self.first_transom_offset, self.second_transom_offset = panels_data[1]
 
 
 # default prop values are in mm and converted later
 class BIMWindowProperties(PropertyGroup):
+    non_si_units_props = ("is_editing", "window_type")
     window_types = (
         ("SINGLE_PANEL", "SINGLE_PANEL", ""),
         ("DOUBLE_PANEL_HORIZONTAL", "DOUBLE_PANEL_HORIZONTAL", ""),
@@ -355,6 +259,7 @@ class BIMWindowProperties(PropertyGroup):
     )
 
     # number of panels and default mullion/transom values
+    # fmt: off
     window_types_panels = {
         "SINGLE_PANEL":            (1, ((0,   0  ), (0,    0  ))),
         "DOUBLE_PANEL_HORIZONTAL": (2, ((0,   0  ), (0.45, 0  ))),
@@ -366,56 +271,69 @@ class BIMWindowProperties(PropertyGroup):
         "TRIPLE_PANEL_HORIZONTAL": (3, ((0,   0  ), (0.3,  0.6))),
         "TRIPLE_PANEL_VERTICAL":   (3, ((0.2, 0.4), (0,    0  ))),
     }
+    # fmt: on
 
-    window_added_previously: bpy.props.BoolProperty(default=False)
     is_editing: bpy.props.IntProperty(default=-1)
     window_type: bpy.props.EnumProperty(
         name="Window Type", items=window_types, default="SINGLE_PANEL", update=window_type_prop_update
     )
-    overall_height: bpy.props.FloatProperty(name="Overall Height", default=0.9)
-    overall_width: bpy.props.FloatProperty(name="Overall Width", default=0.6)
+    overall_height: bpy.props.FloatProperty(name="Overall Height", default=0.9, subtype="DISTANCE")
+    overall_width: bpy.props.FloatProperty(name="Overall Width", default=0.6, subtype="DISTANCE")
 
     # lining properties
-    lining_depth: bpy.props.FloatProperty(name="Lining Depth", default=0.050)
-    lining_thickness: bpy.props.FloatProperty(name="Lining Thickness", default=0.050)
-    lining_offset: bpy.props.FloatProperty(name="Lining Offset", default=0.050)
-    lining_to_panel_offset_x: bpy.props.FloatProperty(name="Lining to Panel Offset X", default=0.025)
-    lining_to_panel_offset_y: bpy.props.FloatProperty(name="Lining to Panel Offset Y", default=0.025)
-    mullion_thickness: bpy.props.FloatProperty(name="Mullion Thickness", default=0.050)
+    lining_depth: bpy.props.FloatProperty(name="Lining Depth", default=0.050, subtype="DISTANCE")
+    lining_thickness: bpy.props.FloatProperty(name="Lining Thickness", default=0.050, subtype="DISTANCE")
+    lining_offset: bpy.props.FloatProperty(name="Lining Offset", default=0.050, subtype="DISTANCE")
+    lining_to_panel_offset_x: bpy.props.FloatProperty(
+        name="Lining to Panel Offset X", default=0.025, subtype="DISTANCE"
+    )
+    lining_to_panel_offset_y: bpy.props.FloatProperty(
+        name="Lining to Panel Offset Y", default=0.025, subtype="DISTANCE"
+    )
+    mullion_thickness: bpy.props.FloatProperty(name="Mullion Thickness", default=0.050, subtype="DISTANCE")
     first_mullion_offset: bpy.props.FloatProperty(
         name="First Mullion Offset",
         description="Distance from the first lining to the first mullion center",
         default=0.3,
+        subtype="DISTANCE",
     )
     second_mullion_offset: bpy.props.FloatProperty(
         name="Second Mullion Offset",
         description="Distance from the first lining to the second mullion center",
         default=0.45,
+        subtype="DISTANCE",
     )
-    transom_thickness: bpy.props.FloatProperty(name="Transom Thickness", default=0.050)
+    transom_thickness: bpy.props.FloatProperty(name="Transom Thickness", default=0.050, subtype="DISTANCE")
     first_transom_offset: bpy.props.FloatProperty(
         name="First Transom Offset",
         description="Distance from the first lining to the first transom center",
         default=0.3,
+        subtype="DISTANCE",
     )
     second_transom_offset: bpy.props.FloatProperty(
         name="Second Transom Offset",
         description="Distance from the first lining to the second transom center",
         default=0.6,
+        subtype="DISTANCE",
     )
 
     # panel properties
-    frame_depth: bpy.props.FloatVectorProperty(name="Frame Depth", size=3, default=[0.035] * 3)
-    frame_thickness: bpy.props.FloatVectorProperty(name="Frame Thickness", size=3, default=[0.035] * 3)
+    frame_depth: bpy.props.FloatVectorProperty(name="Frame Depth", size=3, default=[0.035] * 3, subtype="TRANSLATION")
+    frame_thickness: bpy.props.FloatVectorProperty(
+        name="Frame Thickness", size=3, default=[0.035] * 3, subtype="TRANSLATION"
+    )
 
-    def get_general_kwargs(self):
-        return {
+    def get_general_kwargs(self, convert_to_project_units=False):
+        kwargs = {
             "window_type": self.window_type,
             "overall_height": self.overall_height,
             "overall_width": self.overall_width,
         }
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs, ["window_type"])
 
-    def get_lining_kwargs(self):
+    def get_lining_kwargs(self, convert_to_project_units=False):
         kwargs = {
             "lining_depth": self.lining_depth,
             "lining_thickness": self.lining_thickness,
@@ -452,16 +370,27 @@ class BIMWindowProperties(PropertyGroup):
         if self.window_type in ("TRIPLE_PANEL_HORIZONTAL",):
             kwargs["second_transom_offset"] = self.second_transom_offset
 
-        return kwargs
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs)
 
-    def get_panel_kwargs(self):
-        return {
+    def get_panel_kwargs(self, convert_to_project_units=False):
+        kwargs = {
             "frame_depth": self.frame_depth,
             "frame_thickness": self.frame_thickness,
         }
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs)
+
+    def set_props_kwargs_from_ifc_data(self, kwargs):
+        kwargs = tool.Model.convert_data_to_si_units(kwargs, self.non_si_units_props)
+        for prop_name in kwargs:
+            setattr(self, prop_name, kwargs[prop_name])
 
 
 class BIMDoorProperties(PropertyGroup):
+    non_si_units_props = ("is_editing", "door_type", "panel_width_ratio")
     door_types = (
         ("SINGLE_SWING_LEFT", "SINGLE_SWING_LEFT", ""),
         ("SINGLE_SWING_RIGHT", "SINGLE_SWING_RIGHT", ""),
@@ -473,51 +402,56 @@ class BIMDoorProperties(PropertyGroup):
         ("DOUBLE_DOOR_SLIDING", "DOUBLE_DOOR_SLIDING", ""),
     )
 
-    door_added_previously: bpy.props.BoolProperty(default=False)
     is_editing: bpy.props.IntProperty(default=-1)
     door_type: bpy.props.EnumProperty(name="Door Operation Type", items=door_types, default="SINGLE_SWING_LEFT")
-    overall_height: bpy.props.FloatProperty(name="Overall Height", default=2.0)
-    overall_width: bpy.props.FloatProperty(name="Overall Width", default=0.9)
+    overall_height: bpy.props.FloatProperty(name="Overall Height", default=2.0, subtype="DISTANCE")
+    overall_width: bpy.props.FloatProperty(name="Overall Width", default=0.9, subtype="DISTANCE")
 
     # lining properties
-    lining_depth: bpy.props.FloatProperty(name="Lining Depth", default=0.050)
-    lining_thickness: bpy.props.FloatProperty(name="Lining Thickness", default=0.050)
+    lining_depth: bpy.props.FloatProperty(name="Lining Depth", default=0.050, subtype="DISTANCE")
+    lining_thickness: bpy.props.FloatProperty(name="Lining Thickness", default=0.050, subtype="DISTANCE")
     lining_offset: bpy.props.FloatProperty(
         name="Lining Offset",
         description="Offset from the outer side of the wall (by Y-axis). "
         "If present then adding casing is not possible.\n"
         "`0.025 mm` is good as default value",
-        default=0.0,
+        default=0.0, 
+        subtype="DISTANCE"
     )
-    lining_to_panel_offset_x: bpy.props.FloatProperty(name="Lining to Panel Offset X", default=0.025)
-    lining_to_panel_offset_y: bpy.props.FloatProperty(name="Lining to Panel Offset Y", default=0.025)
+    lining_to_panel_offset_x: bpy.props.FloatProperty(name="Lining to Panel Offset X", default=0.025, subtype="DISTANCE")
+    lining_to_panel_offset_y: bpy.props.FloatProperty(name="Lining to Panel Offset Y", default=0.025, subtype="DISTANCE")
 
     transom_thickness: bpy.props.FloatProperty(
         name="Transom Thickness",
         description="Set values > 0 to add a transom.\n" "`0.050 mm` is good as default value",
         default=0.000,
+        subtype="DISTANCE"
     )
     transom_offset: bpy.props.FloatProperty(
         name="Transom Offset",
         description="Distance from the bottom door opening to the beginning of the transom (unlike windows)",
         default=1.525,
+        subtype="DISTANCE"
     )
 
     casing_thickness: bpy.props.FloatProperty(
-        name="Casing Thickness", description="Set values > 0 and LiningOffset = 0 to add a casing.", default=0.075
+        name="Casing Thickness", description="Set values > 0 and LiningOffset = 0 to add a casing.", default=0.075,
+        subtype="DISTANCE"
     )
-    casing_depth: bpy.props.FloatProperty(name="Casing Depth", default=0.005)
+    casing_depth: bpy.props.FloatProperty(name="Casing Depth", default=0.005, subtype="DISTANCE")
 
     threshold_thickness: bpy.props.FloatProperty(
-        name="Threshold Thickness", description="Set values > 0 to add a threshold.", default=0.025
+        name="Threshold Thickness", description="Set values > 0 to add a threshold.", default=0.025,
+        subtype="DISTANCE"
     )
-    threshold_depth: bpy.props.FloatProperty(name="Threshold Depth", default=0.1)
+    threshold_depth: bpy.props.FloatProperty(name="Threshold Depth", default=0.1, subtype="DISTANCE")
     threshold_offset: bpy.props.FloatProperty(
-        name="Threshold Offset", description="`0.025 mm` is good as default value", default=0.000
+        name="Threshold Offset", description="`0.025 mm` is good as default value", default=0.000,
+        subtype="DISTANCE"
     )
 
     # panel properties
-    panel_depth: bpy.props.FloatProperty(name="Panel Depth", default=0.035)
+    panel_depth: bpy.props.FloatProperty(name="Panel Depth", default=0.035, subtype="DISTANCE")
     panel_width_ratio: bpy.props.FloatProperty(
         name="Panel Width Ratio",
         description="Width of this panel, given as ratio " "relative to the total clear opening width of the door",
@@ -525,17 +459,20 @@ class BIMDoorProperties(PropertyGroup):
         soft_min=0,
         soft_max=1,
     )
-    frame_thickness: bpy.props.FloatProperty(name="Window Frame Thickness", default=0.035)
-    frame_depth: bpy.props.FloatProperty(name="Window Frame Depth", default=0.035)
+    frame_thickness: bpy.props.FloatProperty(name="Window Frame Thickness", default=0.035, subtype="DISTANCE")
+    frame_depth: bpy.props.FloatProperty(name="Window Frame Depth", default=0.035, subtype="DISTANCE")
 
-    def get_general_kwargs(self):
-        return {
+    def get_general_kwargs(self, convert_to_project_units=False):
+        kwargs = {
             "door_type": self.door_type,
             "overall_height": self.overall_height,
             "overall_width": self.overall_width,
         }
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs, ["door_type"])
 
-    def get_lining_kwargs(self):
+    def get_lining_kwargs(self, convert_to_project_units=False):
         kwargs = {
             "lining_depth": self.lining_depth,
             "lining_thickness": self.lining_thickness,
@@ -560,47 +497,120 @@ class BIMDoorProperties(PropertyGroup):
             kwargs["threshold_depth"] = self.threshold_depth
             kwargs["threshold_offset"] = self.threshold_offset
 
-        return kwargs
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs)
 
-    def get_panel_kwargs(self):
+    def get_panel_kwargs(self, convert_to_project_units=False):
         kwargs = {"panel_depth": self.panel_depth, "panel_width_ratio": self.panel_width_ratio}
 
         if self.transom_thickness:
             kwargs["frame_thickness"] = self.frame_thickness
             kwargs["frame_depth"] = self.frame_depth
 
-        return kwargs
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs, ("panel_width_ratio", ))
+
+    def set_props_kwargs_from_ifc_data(self, kwargs):
+        kwargs = tool.Model.convert_data_to_si_units(kwargs, self.non_si_units_props)
+        for prop_name in kwargs:
+            setattr(self, prop_name, kwargs[prop_name])
 
 
 class BIMRailingProperties(PropertyGroup):
-    railing_types = (("FRAMELESS_PANEL", "FRAMELESS_PANEL", ""),)
+    non_si_units_props = (
+        "is_editing",
+        "railing_type",
+        "use_manual_supports",
+        "terminal_type",
+        "path_data",
+    )
+
+    railing_types = (
+        ("FRAMELESS_PANEL", "FRAMELESS_PANEL", ""),
+        ("WALL_MOUNTED_HANDRAIL", "WALL_MOUNTED_HANDRAIL", ""),
+    )
+    cap_types = (
+        ("TO_END_POST_AND_FLOOR", "TO_END_POST_AND_FLOOR", ""),
+        ("TO_END_POST", "TO_END_POST", ""),
+        ("TO_FLOOR", "TO_FLOOR", ""),
+        ("TO_WALL", "TO_WALL", ""),
+        ("180", "180", ""),
+        ("NONE", "NONE", ""),
+    )
 
-    railing_added_previously: bpy.props.BoolProperty(default=False)
     is_editing: bpy.props.IntProperty(default=-1)
     is_editing_path: bpy.props.BoolProperty(default=False)
 
     railing_type: bpy.props.EnumProperty(name="Railing Type", items=railing_types, default="FRAMELESS_PANEL")
-    height: bpy.props.FloatProperty(name="Height", default=1.0)
-    thickness: bpy.props.FloatProperty(name="Thickness", default=0.050)
-    spacing: bpy.props.FloatProperty(name="Spacing", default=0.050)
+    height: bpy.props.FloatProperty(name="Height", default=1.0, subtype="DISTANCE")
+    thickness: bpy.props.FloatProperty(name="Thickness", default=0.050, subtype="DISTANCE")
+    spacing: bpy.props.FloatProperty(name="Spacing", default=0.050, subtype="DISTANCE")
 
-    def get_general_kwargs(self):
-        return {
+    # wall mounted handrail specific properties
+    use_manual_supports: bpy.props.BoolProperty(
+        name="Use Manual Supports",
+        default=False,
+        description="If enabled, supports are added on every vertex on the edges of the railing path.\n"
+        "If disabled, supports are added automatically based on the support spacing",
+    )
+    support_spacing: bpy.props.FloatProperty(
+        name="Support Spacing", default=1.0, description="Distance between supports if automatic supports are used"
+    )
+    railing_diameter: bpy.props.FloatProperty(name="Railing Diameter", default=0.050)
+    clear_width: bpy.props.FloatProperty(
+        name="Clear Width", default=0.040, description="Clear width between the railing and the wall"
+    )
+    terminal_type: bpy.props.EnumProperty(name="Terminal Type", items=cap_types, default="180")
+
+    def get_general_kwargs(self, convert_to_project_units=False):
+        base_kwargs = {
             "railing_type": self.railing_type,
             "height": self.height,
-            "thickness": self.thickness,
-            "spacing": self.spacing,
         }
+        additional_kwargs = {}
+        if self.railing_type == "FRAMELESS_PANEL":
+            additional_kwargs = {
+                "thickness": self.thickness,
+                "spacing": self.spacing,
+            }
+        elif self.railing_type == "WALL_MOUNTED_HANDRAIL":
+            additional_kwargs = {
+                "railing_diameter": self.railing_diameter,
+                "clear_width": self.clear_width,
+                "use_manual_supports": self.use_manual_supports,
+                "support_spacing": self.support_spacing,
+                "terminal_type": self.terminal_type,
+            }
+        kwargs = base_kwargs | additional_kwargs
 
+        if not convert_to_project_units:
+            return kwargs
+
+        kwargs = tool.Model.convert_data_to_project_units(kwargs, self.non_si_units_props)
+        return kwargs
+
+    def set_props_kwargs_from_ifc_data(self, kwargs):
+        kwargs = tool.Model.convert_data_to_si_units(kwargs, self.non_si_units_props)
+        for prop_name in kwargs:
+            setattr(self, prop_name, kwargs[prop_name])
 
 class BIMRoofProperties(PropertyGroup):
+    non_si_units_props = (
+        "is_editing",
+        "path_data",
+        "roof_type",
+        "generation_method",
+        "angle",
+        "rafter_edge_angle",
+    )
     roof_types = (("HIP/GABLE ROOF", "HIP/GABLE ROOF", ""),)
     roof_generation_methods = (
         ("HEIGHT", "HEIGHT", ""),
         ("ANGLE", "ANGLE", ""),
     )
 
-    roof_added_previously: bpy.props.BoolProperty(default=False)
     is_editing: bpy.props.IntProperty(default=-1)
     is_editing_path: bpy.props.BoolProperty(default=False)
 
@@ -612,14 +622,26 @@ class BIMRoofProperties(PropertyGroup):
         name="Height", default=1.0, description="Maximum height of the roof to be generated.", subtype="DISTANCE"
     )
     angle: bpy.props.FloatProperty(name="Slope Angle", default=pi / 18, subtype="ANGLE")
+    roof_thickness: bpy.props.FloatProperty(name="Roof Thickness", default=0.1, subtype="DISTANCE")
+    rafter_edge_angle: bpy.props.FloatProperty(name="Rafter Edge Angle", min=0, max=pi, default=pi / 2, subtype="ANGLE")
 
-    def get_general_kwargs(self):
+    def get_general_kwargs(self, convert_to_project_units=False):
         kwargs = {
             "roof_type": self.roof_type,
             "generation_method": self.generation_method,
+            "roof_thickness": self.roof_thickness,
+            "rafter_edge_angle": self.rafter_edge_angle,
         }
         if self.generation_method == "HEIGHT":
             kwargs["height"] = self.height
         else:
             kwargs["angle"] = self.angle
-        return kwargs
+
+        if not convert_to_project_units:
+            return kwargs
+        return tool.Model.convert_data_to_project_units(kwargs, self.non_si_units_props)
+
+    def set_props_kwargs_from_ifc_data(self, kwargs):
+        kwargs = tool.Model.convert_data_to_si_units(kwargs, self.non_si_units_props)
+        for prop_name in kwargs:
+            setattr(self, prop_name, kwargs[prop_name])

src/blenderbim/blenderbim/bim/module/model/railing.py

@@ -18,14 +18,11 @@
 
 
 import bpy
-from bpy.types import Operator
 import bmesh
-
 import ifcopenshell
 from ifcopenshell.util.shape_builder import V
 import blenderbim
 import blenderbim.tool as tool
-import blenderbim.core.geometry as core
 from blenderbim.bim.helper import convert_property_group_from_si
 from blenderbim.bim.ifc import IfcStore
 from blenderbim.bim.module.model.door import bm_sort_out_geom
@@ -41,6 +38,7 @@ import json
 # https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRailingType.htm
 
 
+
 def bm_split_edge_at_offset(edge, offset):
     v0, v1 = edge.verts
 
@@ -82,7 +80,33 @@ def update_railing_modifier_ifc_data(context):
             "Height": props.height,
         },
     )
-    tool.Ifc.edit(obj)
+
+    if props.railing_type == "WALL_MOUNTED_HANDRAIL":
+        body = ifcopenshell.util.representation.get_context(ifc_file, "Model", "Body", "MODEL_VIEW")
+        railing_path = [Vector(v) for v in RailingData.data["parameters"]["data_dict"]["path_data"]["verts"]]
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
+
+        representation_data = {
+            "railing_type": props.railing_type,
+            "context": body,
+            "railing_path": railing_path,
+            "use_manual_supports": props.use_manual_supports,
+            "support_spacing": props.support_spacing / si_conversion,
+            "railing_diameter": props.railing_diameter / si_conversion,
+            "clear_width": props.clear_width / si_conversion,
+            "terminal_type": props.terminal_type,
+            "height": props.height / si_conversion,
+        }
+        model_representation = ifcopenshell.api.run(
+            "geometry.add_railing_representation", ifc_file, **representation_data
+        )
+        tool.Model.replace_object_ifc_representation(body, obj, model_representation)
+
+        # hacky way to ensure tha ifc representation won't get tessellated at project save
+        IfcStore.edited_objs.discard(obj)
+
+    elif props.railing_type == "FRAMELESS_PANEL":
+        tool.Ifc.edit(obj)
 
 
 def update_bbim_railing_pset(element, railing_data):
@@ -118,77 +142,114 @@ def update_railing_modifier_bmesh(context):
         tool.Blender.apply_bmesh(obj.data, bm)
         return
 
-    # generating the entire railing
-    height = props.height * si_conversion
-    thickness = props.thickness * si_conversion
-    spacing = props.spacing * si_conversion
+    if props.railing_type != "FRAMELESS_PANEL":
+        return
 
-    # spacing
-    # split each edge in 3 segments by 0.5 * spacing by x-y plane
-    main_edges = bm.edges[:]
-    for main_edge in main_edges:
-        bm_split_edge_at_offset(main_edge, spacing)
+    def generate_frameless_panel_railing():
+        # generating FRAMELESS_PANEL railing
+        height = props.height
+        thickness = props.thickness
+        spacing = props.spacing
 
-    # thickness
-    # keep track of translated verts so we won't translate the same
-    # vert twice
-    edge_dissolving_verts = []
-    for main_edge in main_edges:
-        v0, v1 = main_edge.verts
-        edge_dissolving_verts.extend([v0, v1])
+        # spacing
+        # split each edge in 3 segments by 0.5 * spacing by x-y plane
+        main_edges = bm.edges[:]
+        for main_edge in main_edges:
+            bm_split_edge_at_offset(main_edge, spacing)
 
-        edge_dir = ((v1.co - v0.co) * V(1, 1, 0)).normalized()
-        ortho_vector = edge_dir.cross(V(0, 0, 1))
+        # thickness
+        # keep track of translated verts so we won't translate the same
+        # vert twice
+        edge_dissolving_verts = []
+        for main_edge in main_edges:
+            v0, v1 = main_edge.verts
+            edge_dissolving_verts.extend([v0, v1])
 
-        extruded_geom = bmesh.ops.extrude_edge_only(bm, edges=[main_edge])["geom"]
+            edge_dir = ((v1.co - v0.co) * V(1, 1, 0)).normalized()
+            ortho_vector = edge_dir.cross(V(0, 0, 1))
+
+            extruded_geom = bmesh.ops.extrude_edge_only(bm, edges=[main_edge])["geom"]
+            extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
+            bmesh.ops.translate(bm, vec=ortho_vector * (-thickness / 2), verts=extruded_verts)
+
+            extruded_geom = bmesh.ops.extrude_edge_only(bm, edges=[main_edge])["geom"]
+            extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
+            bmesh.ops.translate(bm, vec=ortho_vector * (thickness / 2), verts=extruded_verts)
+
+            # dissolve middle edge
+            bmesh.ops.dissolve_edges(bm, edges=[main_edge])
+
+        # height
+        extruded_geom = bmesh.ops.extrude_face_region(bm, geom=bm.faces)["geom"]
         extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
-        bmesh.ops.translate(bm, vec=ortho_vector * (-thickness / 2), verts=extruded_verts)
+        extrusion_vector = Vector((0, 0, 1)) * height
+        bmesh.ops.translate(bm, vec=extrusion_vector, verts=extruded_verts)
 
-        extruded_geom = bmesh.ops.extrude_edge_only(bm, edges=[main_edge])["geom"]
-        extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
-        bmesh.ops.translate(bm, vec=ortho_vector * (thickness / 2), verts=extruded_verts)
+        # dissolve middle edges
+        edges_to_dissolve = []
+        verts_to_dissolve = []
+        for v in edge_dissolving_verts:
+            for e in v.link_edges:
+                other_vert = e.other_vert(v)
+                if other_vert in extruded_verts:
+                    edges_to_dissolve.append(e)
+                    verts_to_dissolve.append(other_vert)
+        bmesh.ops.dissolve_edges(bm, edges=edges_to_dissolve)
+        bmesh.ops.dissolve_verts(bm, verts=verts_to_dissolve)
 
-        # dissolve middle edge
-        bmesh.ops.dissolve_edges(bm, edges=[main_edge])
+        # to remove unnecessary verts in 0 spacing case
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
 
-    # height
-    extruded_geom = bmesh.ops.extrude_face_region(bm, geom=bm.faces)["geom"]
-    extruded_verts = bm_sort_out_geom(extruded_geom)["verts"]
-    extrusion_vector = Vector((0, 0, 1)) * height
-    bmesh.ops.translate(bm, vec=extrusion_vector, verts=extruded_verts)
+        tool.Blender.apply_bmesh(obj.data, bm)
 
-    # dissolve middle edges
-    edges_to_dissolve = []
-    verts_to_dissolve = []
-    for v in edge_dissolving_verts:
-        for e in v.link_edges:
-            other_vert = e.other_vert(v)
-            if other_vert in extruded_verts:
-                edges_to_dissolve.append(e)
-                verts_to_dissolve.append(other_vert)
-    bmesh.ops.dissolve_edges(bm, edges=edges_to_dissolve)
-    bmesh.ops.dissolve_verts(bm, verts=verts_to_dissolve)
-
-    # to remove unnecessary verts in 0 spacing case
-    bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
-
-    tool.Blender.apply_bmesh(obj.data, bm)
+    generate_frameless_panel_railing()
 
 
 def get_path_data(obj):
     si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-    if obj.mode == "EDIT":
-        # otherwise mesh may not contain all changes
-        # added in edit mode
-        obj.update_from_editmode()
 
-    mesh = obj.data
-    path_data = dict()
-    path_data["edges"] = [e.vertices[:] for e in mesh.edges]
-    path_data["verts"] = [v.co / si_conversion for v in mesh.vertices]
-
-    if not path_data["edges"] or not path_data["verts"]:
+    bm = tool.Blender.get_bmesh_for_mesh(obj.data)
+    end_points = [v for v in bm.verts if len(v.link_edges) == 1]
+    if not end_points:
         return None
+
+    # if we have some previous data then we try to match
+    # start or end of the path with the previous path
+    previous_data = False
+    if previous_data:
+        previous_start = previous_data[0]
+        previous_end = previous_data[-1]
+
+        potential_start = min([(v, (v.co - previous_start).length) for v in end_points], key=lambda v_data: v_data[1])
+        potential_end = min([(v, (v.co - previous_end).length) for v in end_points], key=lambda v_data: v_data[1])
+
+        if potential_start[1] < potential_end[1]:
+            start_point = potential_start[0]
+        else:
+            start_point = next(v for v in end_points if v != potential_start[0])
+    else:
+        start_point = min(end_points, key=lambda v: v.index)
+
+    # walking through the path
+    # to make sure all verts and in consequent order
+    edge = start_point.link_edges[0]
+    v = edge.other_vert(start_point)
+    points = [start_point.co, v.co]
+    segments = [(0, 1)]
+    i = 2
+
+    other_edge = lambda edges, edge: next(e for e in edges if e != edge)
+
+    while len(link_edges := v.link_edges) != 1:
+        link_edges = v.link_edges
+        edge = other_edge(link_edges, edge)
+        v = edge.other_vert(v)
+        points.append(v.co)
+        segments.append((i - 1, i))
+        i += 1
+
+    path_data = {"edges": segments, "verts": [p / si_conversion for p in points]}
+
     return path_data
 
 
@@ -246,12 +307,8 @@ class AddRailing(bpy.types.Operator, tool.Ifc.Operator):
             self.report({"ERROR"}, "Object has to be IfcRailing/IfcRailingType type to add a railing.")
             return {"CANCELLED"}
 
-        # need to make sure all default props will have correct units
-        if not props.railing_added_previously:
-            skip_props = ("is_editing", "railing_type", "railing_added_previously")
-            convert_property_group_from_si(props, skip_props=skip_props)
 
-        railing_data = props.get_general_kwargs()
+        railing_data = props.get_general_kwargs(convert_to_project_units=True)
         path_data = get_path_data(obj)
         if not path_data:
             path_data = {
@@ -284,14 +341,7 @@ class EnableEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
         data["path_data"] = json.dumps(data["path_data"])
 
         # required since we could load pset from .ifc and BIMRailingProperties won't be set
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
-
-        # need to make sure all props that weren't used before
-        # will have correct units
-        skip_props = ("is_editing", "railing_type", "railing_added_previously")
-        skip_props += tuple(data.keys())
-        convert_property_group_from_si(props, skip_props=skip_props)
+        props.set_props_kwargs_from_ifc_data(data)
 
         props.is_editing = 1
         return {"FINISHED"}
@@ -308,8 +358,7 @@ class CancelEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
         data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Railing", "Data"))
         props = obj.BIMRailingProperties
         # restore previous settings since editing was canceled
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
+        props.set_props_kwargs_from_ifc_data(data)
 
         body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
         blenderbim.core.geometry.switch_representation(
@@ -340,7 +389,7 @@ class FinishEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
             RailingData.load()
         path_data = RailingData.data["parameters"]["data_dict"]["path_data"]
 
-        railing_data = props.get_general_kwargs()
+        railing_data = props.get_general_kwargs(convert_to_project_units=True)
         railing_data["path_data"] = path_data
         props.is_editing = -1
 
@@ -349,6 +398,37 @@ class FinishEditingRailing(bpy.types.Operator, tool.Ifc.Operator):
         return {"FINISHED"}
 
 
+class FlipRailingPathOrder(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.flip_railing_path_order"
+    bl_label = "Flip Railing Path Order"
+    bl_description = "Can be useful to maintain railing supports direction"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        obj = context.active_object
+        element = tool.Ifc.get_entity(obj)
+        props = obj.BIMRailingProperties
+
+        if not RailingData.is_loaded:
+            RailingData.load()
+        path_data = RailingData.data["parameters"]["data_dict"]["path_data"]
+
+        # flip the vertex order and edges
+        path_data["verts"] = path_data["verts"][::-1]
+        last_vert_i = len(path_data["verts"]) - 1
+        edges = []
+        for edge in path_data["edges"][::-1]:
+            edge = [abs(vi - last_vert_i) for vi in edge[::-1]]
+            edges.append(edge)
+
+        railing_data = props.get_general_kwargs(convert_to_project_units=True)
+        railing_data["path_data"] = path_data
+
+        update_bbim_railing_pset(element, railing_data)
+        update_railing_modifier_ifc_data(context)
+        return {"FINISHED"}
+
+
 class EnableEditingRailingPath(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.enable_editing_railing_path"
     bl_label = "Enable Editing Railing Path"
@@ -400,7 +480,7 @@ class FinishEditingRailingPath(bpy.types.Operator, tool.Ifc.Operator):
         element = tool.Ifc.get_entity(obj)
         props = obj.BIMRailingProperties
 
-        railing_data = props.get_general_kwargs()
+        railing_data = props.get_general_kwargs(convert_to_project_units=True)
         path_data = get_path_data(obj)
         railing_data["path_data"] = path_data
         ProfileDecorator.uninstall()
@@ -428,7 +508,6 @@ class RemoveRailing(bpy.types.Operator, tool.Ifc.Operator):
 
         pset = tool.Pset.get_element_pset(element, "BBIM_Railing")
         ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-        props.railing_added_previously = True
         return {"FINISHED"}
 
 

src/blenderbim/blenderbim/bim/module/model/roof.py

@@ -17,7 +17,6 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from bpy.types import Operator
 import bmesh
 
 import ifcopenshell
@@ -29,22 +28,18 @@ from blenderbim.bim.module.model.data import RoofData, refresh
 from blenderbim.bim.module.model.decorator import ProfileDecorator
 
 import json
-from math import tan, radians, degrees, atan
+from math import tan, pi, radians
 from mathutils import Vector, Matrix
+import mathutils.geometry
 from bpypolyskel import bpypolyskel
 import shapely
 from pprint import pprint
-from itertools import chain
-from math import pi
 
 # reference:
 # https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRoof.htm
 # https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcRoofType.htm
 
 
-# create read only property in blender operator
-
-
 def float_is_zero(f):
     return 0.0001 >= f >= -0.0001
 
@@ -90,12 +85,32 @@ class GenerateHippedRoof(bpy.types.Operator, tool.Ifc.Operator):
             return {"CANCELLED"}
 
         bm = tool.Blender.get_bmesh_for_mesh(obj.data)
+        op_status, error_message = is_valid_roof_footprint(bm)
+        if error_message:
+            self.report(op_status, error_message)
+            return {"CANCELLED"}
+
         generate_hiped_roof_bmesh(bm, self.mode, self.height, self.angle)
         tool.Blender.apply_bmesh(obj.data, bm)
         return {"FINISHED"}
 
 
-def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, angle=pi / 18, mutate_current_bmesh=True):
+def is_valid_roof_footprint(bm):
+    # should be bmesh to support edit mode
+    bm.verts.ensure_lookup_table()
+    base_z = bm.verts[0].co.z
+    all_verts_same_level = all([float_is_zero(v.co.z - base_z) for v in bm.verts[1:]])
+    if not all_verts_same_level:
+        return (
+            {"ERROR"},
+            "\nAll roof footprint vertices should have same Z-level.\nCurrently Z-level doesn't completely match",
+        )
+    return ({"FINISHED"}, "")
+
+
+def generate_hiped_roof_bmesh(
+    bm, mode="ANGLE", height=1.0, roof_thickness=0.1, angle=pi / 18, rafter_edge_angle=pi / 2, mutate_current_bmesh=True
+):
     """return bmesh with gable roof geometry
 
     `mutate_current_bmesh` is a flag to indicate whether the input bmesh
@@ -116,10 +131,13 @@ def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, angle=pi / 18, mutat
 
     original_geometry_data = dict()
     angle_layer = bm.edges.layers.float.get("BBIM_gable_roof_angles")
+    separate_verts_layer = bm.edges.layers.int.get("BBIM_gable_roof_separate_verts")
     if angle_layer:
-        original_geometry_data["edges"] = [(set(bm_get_indices(e.verts)), e[angle_layer]) for e in bm.edges]
+        original_geometry_data["edges"] = [
+            (set(bm_get_indices(e.verts)), e[angle_layer], e[separate_verts_layer]) for e in bm.edges
+        ]
     else:
-        original_geometry_data["edges"] = [(set(bm_get_indices(e.verts)), None) for e in bm.edges]
+        original_geometry_data["edges"] = [(set(bm_get_indices(e.verts)), None, None) for e in bm.edges]
 
     original_geometry_data["verts"] = {v.index: v.co.copy() for v in bm.verts}
     footprint_z = bm.verts[:][0].co.z
@@ -212,10 +230,18 @@ def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, angle=pi / 18, mutat
     footprint_edges = []
     footprint_verts = set()
     verts_to_change = {}
+    verts_to_rip = []
+    bottom_chords_to_remove = []
+
+    def is_footprint_vert(v):
+        return float_is_zero(v.co.z - footprint_z)
+
+    def is_footprint_edge(edge):
+        return all(is_footprint_vert(v) for v in edge.verts)
 
     # find footprint edges
     for edge in bm.edges:
-        if all(float_is_zero(v.co.z - footprint_z) for v in edge.verts):
+        if is_footprint_edge(edge):
             footprint_edges.append(edge)
             footprint_verts.update(edge.verts)
 
@@ -227,18 +253,60 @@ def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, angle=pi / 18, mutat
     # iterate over edges from original geometry
     # if their angle was redefined by user - apply the changes to the related vertices
     # to match the requested angle
-    for old_edge_verts, defined_angle in original_geometry_data["edges"]:
+
+    process_later = []
+    for old_edge_verts, defined_angle, separate_verts in original_geometry_data["edges"]:
         if not defined_angle:
             continue
 
         edge_verts_remaped = set(old_verts_remap[old_vert] for old_vert in old_edge_verts)
 
+        identical_edge = None
         for edge in footprint_edges:
             if set(edge.verts) == edge_verts_remaped:
                 identical_edge = edge
                 break
+        assert identical_edge
 
+        if separate_verts:
+            verts_to_move = find_other_polygon_verts(identical_edge)
+            for v in verts_to_move:
+                vert_co = v.co
+                new_vert_co = change_angle(vert_co, edge_verts_remaped, defined_angle)
+                verts_to_rip.append([v, new_vert_co, identical_edge])
+        else:
+            process_later.append([identical_edge, edge_verts_remaped, defined_angle])
+
+        if defined_angle >= pi / 2:
+            bottom_chords_to_remove.append(identical_edge)
+
+    def separate_vert(bm, vert, edge, new_co):
+        face = next(f for f in vert.link_faces if edge in f.edges)
+        new_v = bmesh.utils.face_vert_separate(face, vert)
+        new_v.co = new_co
+        new_edge = bm.edges.new((vert, new_v))
+
+        for cur_edge in face.edges:
+            if cur_edge == edge:
+                continue
+            bmesh.ops.contextual_create(bm, geom=[new_edge, cur_edge])
+        return new_v
+
+    # correct angle for verts that require verts separation
+    # store separated verts for angle correction later
+    related_verts = {}
+    for v, new_co, edge in verts_to_rip:
+        new_v = separate_vert(bm, v, edge, new_co)
+        related_verts.setdefault(v, []).append(new_v)
+
+    # verts angle correction.
+    # we're taking into account new verts created after verts separation
+    # required for asymmetrical gable roof
+    for identical_edge, edge_verts_remaped, defined_angle in process_later:
         verts_to_move = find_other_polygon_verts(identical_edge)
+        for v in verts_to_move[:]:
+            verts_to_move.extend(related_verts.get(v, []))
+
         for v in verts_to_move:
             vert_co = verts_to_change.get(v, v.co)
             new_vert_co = change_angle(vert_co, edge_verts_remaped, defined_angle)
@@ -248,10 +316,65 @@ def generate_hiped_roof_bmesh(bm, mode="ANGLE", height=1.0, angle=pi / 18, mutat
     for v in verts_to_change:
         v.co = verts_to_change[v]
 
-    extrusion_geom = bmesh.ops.extrude_face_region(bm, geom=bm.faces)["geom"]
-    extruded_verts = bm_sort_out_geom(extrusion_geom)["verts"]
-    bmesh.ops.translate(bm, vec=[0.0, 0.0, 0.1], verts=extruded_verts)
+    bmesh.ops.delete(bm, geom=bottom_chords_to_remove, context="EDGES")
 
+    # add roof thickness
+    extrusion_geom = bm_sort_out_geom(bmesh.ops.extrude_face_region(bm, geom=bm.faces)["geom"])
+    extruded_edges = extrusion_geom["edges"]
+    extruded_verts = extrusion_geom["verts"]
+    rafter_edge_angle = pi / 2 - rafter_edge_angle
+    default_offset_dir = Vector([0, 0, 1]) * roof_thickness
+    footprint_verts = set()
+
+    if not float_is_zero(rafter_edge_angle):
+        footprint_edges = []
+        for edge in extruded_edges:
+            if is_footprint_edge(edge):
+                footprint_edges.append(edge)
+                footprint_verts.update(edge.verts)
+
+        def get_top_vert(v):
+            non_footprint_verts = []
+            for edge in v.link_edges:
+                v1 = edge.other_vert(v)
+                if not is_footprint_vert(v1):
+                    non_footprint_verts.append(v1)
+
+            if len(non_footprint_verts) == 1:
+                return non_footprint_verts[0]
+
+            return min(non_footprint_verts, key=lambda v1: (v1.co - v.co).length)
+
+        top_verts = dict()
+        for v in footprint_verts:
+            top_verts[v] = get_top_vert(v)
+
+        # TODO: rafter_edge_angle might differ
+        # if footprint edges are not connected by 90 degrees
+        verts_offsets = dict()
+        for edge in footprint_edges:
+            v0, v1 = edge.verts
+            edge_dir = (v0.co - v1.co).normalized()
+            offset_dir = Matrix.Rotation(rafter_edge_angle, 4, edge_dir) @ default_offset_dir
+            for v in edge.verts:
+                previous_offset = verts_offsets.get(v, None)
+                if previous_offset:
+                    previous_offset.xy += offset_dir.xy
+                else:
+                    verts_offsets[v] = offset_dir
+
+        for v in verts_offsets:
+            vert_offset = verts_offsets[v]
+            top = top_verts[v].co
+            bot = v.co + default_offset_dir
+            base = v.co
+            offsetted = v.co + vert_offset
+            # all this math is needed to maintain the same roof thickness
+            # for different rafter edge angles
+            v.co = mathutils.geometry.intersect_line_line(bot, top, base, offsetted)[0]
+
+    verts = [v for v in extruded_verts if v not in footprint_verts]
+    bmesh.ops.translate(bm, vec=default_offset_dir, verts=verts)
     bmesh.ops.recalc_face_normals(bm, faces=bm.faces[:])
     return bm
 
@@ -289,9 +412,6 @@ def update_roof_modifier_ifc_data(context):
     # occurences attributes
     # occurences = tool.Ifc.get_all_element_occurences(element)
 
-    # TODO: add Qto_RoofBaseQuantities, need to calculate GrossArea, NetArea, ProjectedArea
-    # https://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/Qto_RoofBaseQuantities.htm
-
     tool.Ifc.edit(obj)
 
 
@@ -311,12 +431,14 @@ def update_roof_modifier_bmesh(context):
         RoofData.load()
     path_data = RoofData.data["parameters"]["data_dict"]["path_data"]
     angle_layer_data = path_data.get("gable_roof_angles", None)
+    separate_verts_data = path_data.get("gable_roof_separate_verts", None)
 
     si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
     # need to make sure we support edit mode
     # since users will probably be in edit mode when they'll be changing roof path
     bm = tool.Blender.get_bmesh_for_mesh(obj.data, clean=True)
     angle_layer = bm.edges.layers.float.new("BBIM_gable_roof_angles")
+    separate_verts_layer = bm.edges.layers.int.new("BBIM_gable_roof_separate_verts")
 
     # generating roof path
     new_verts = [bm.verts.new(Vector(v) * si_conversion) for v in path_data["verts"]]
@@ -325,14 +447,22 @@ def update_roof_modifier_bmesh(context):
         e = path_data["edges"][i]
         edge = bm.edges.new((new_verts[e[0]], new_verts[e[1]]))
         edge[angle_layer] = angle_layer_data[i] if angle_layer_data else 0
+        edge[separate_verts_layer] = separate_verts_data[i] if separate_verts_data else 0
         new_edges.append(edge)
 
     if props.is_editing_path:
         tool.Blender.apply_bmesh(obj.data, bm)
         return
 
-    height = props.height * si_conversion
-    generate_hiped_roof_bmesh(bm, props.generation_method, height, props.angle, mutate_current_bmesh=True)
+    generate_hiped_roof_bmesh(
+        bm,
+        props.generation_method,
+        props.height,
+        props.roof_thickness,
+        props.angle,
+        props.rafter_edge_angle,
+        mutate_current_bmesh=True,
+    )
     tool.Blender.apply_bmesh(obj.data, bm)
 
 
@@ -349,12 +479,15 @@ def get_path_data(obj):
     bm_mesh_clean_up(bm)
 
     angle_layer = bm.edges.layers.float.get("BBIM_gable_roof_angles")
+    separate_verts_layer = bm.edges.layers.int.get("BBIM_gable_roof_separate_verts")
 
     path_data = dict()
     path_data["edges"] = [bm_get_indices(e.verts) for e in bm.edges]
     path_data["verts"] = [v.co / si_conversion for v in bm.verts]
     if angle_layer:
         path_data["gable_roof_angles"] = [e[angle_layer] for e in bm.edges]
+    if separate_verts_layer:
+        path_data["gable_roof_separate_verts"] = [e[separate_verts_layer] for e in bm.edges]
 
     if not path_data["edges"] or not path_data["verts"]:
         return None
@@ -415,23 +548,30 @@ class AddRoof(bpy.types.Operator, tool.Ifc.Operator):
             self.report({"ERROR"}, "Object has to be IfcRoof/IfcRoofType type to add a roof.")
             return {"CANCELLED"}
 
-        # need to make sure all default props will have correct units
-        if not props.roof_added_previously:
-            skip_props = ("is_editing", "roof_type", "roof_added_previously", "generation_method")
-            convert_property_group_from_si(props, skip_props=skip_props)
+        # rejecting original roof shape to be safe
+        # taking into account only it's bounding box dimensions
+        if obj.dimensions.x == 0 or obj.dimensions.y == 0:
+            min_x, min_y = -5, -5
+            max_x, max_y = 5, 5
+            min_z = 0
+        else:
+            bbox = tool.Blender.get_object_bounding_box(obj)
+            min_x = bbox["min_x"]
+            min_y = bbox["min_y"]
+            max_x = bbox["max_x"]
+            max_y = bbox["max_y"]
+            min_z = bbox["min_z"]
 
-        roof_data = props.get_general_kwargs()
-        path_data = get_path_data(obj)
-        if not path_data:
-            path_data = {
-                "edges": [[0, 1], [1, 2], [2, 3], [3, 0]],
-                "verts": [
-                    Vector([-5.0, -5.0, 0.0]) / si_conversion,
-                    Vector([-5.0, 5.0, 0.0]) / si_conversion,
-                    Vector([5.0, 5.0, 0.0]) / si_conversion,
-                    Vector([5.0, -5.0, 0.0]) / si_conversion,
-                ],
-            }
+        roof_data = props.get_general_kwargs(convert_to_project_units=True)
+        path_data = {
+            "edges": [[0, 1], [1, 2], [2, 3], [3, 0]],
+            "verts": [
+                Vector([min_x, min_y, min_z]) / si_conversion,
+                Vector([min_x, max_y, min_z]) / si_conversion,
+                Vector([max_x, max_y, min_z]) / si_conversion,
+                Vector([max_x, min_y, min_z]) / si_conversion,
+            ],
+        }
         roof_data["path_data"] = path_data
 
         update_bbim_roof_pset(element, roof_data)
@@ -451,18 +591,8 @@ class EnableEditingRoof(bpy.types.Operator, tool.Ifc.Operator):
         props = obj.BIMRoofProperties
         element = tool.Ifc.get_entity(obj)
         data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Roof", "Data"))
-        data["path_data"] = json.dumps(data["path_data"])
-
         # required since we could load pset from .ifc and BIMRoofProperties won't be set
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
-
-        # need to make sure all props that weren't used before
-        # will have correct units
-        skip_props = ("is_editing", "roof_type", "roof_added_previously", "generation_method")
-        skip_props += tuple(data.keys())
-        convert_property_group_from_si(props, skip_props=skip_props)
-
+        props.set_props_kwargs_from_ifc_data(data)
         props.is_editing = 1
         return {"FINISHED"}
 
@@ -478,8 +608,7 @@ class CancelEditingRoof(bpy.types.Operator, tool.Ifc.Operator):
         data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Roof", "Data"))
         props = obj.BIMRoofProperties
         # restore previous settings since editing was canceled
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
+        props.set_props_kwargs_from_ifc_data(data)
 
         body = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
         blenderbim.core.geometry.switch_representation(
@@ -510,7 +639,7 @@ class FinishEditingRoof(bpy.types.Operator, tool.Ifc.Operator):
             RoofData.load()
         path_data = RoofData.data["parameters"]["data_dict"]["path_data"]
 
-        roof_data = props.get_general_kwargs()
+        roof_data = props.get_general_kwargs(convert_to_project_units=True)
         roof_data["path_data"] = path_data
         props.is_editing = -1
 
@@ -545,12 +674,21 @@ class EnableEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
             # copying to make sure not to mutate the edit mode bmesh
             bm = tool.Blender.get_bmesh_for_mesh(obj.data)
             main_bm = bm.copy()
+            op_status, error_message = is_valid_roof_footprint(main_bm)
+            if error_message:
+                print("Error: %s" % error_message)
+                return main_bm
+
             main_bm.edges.layers.int.new("BBIM_preview")
 
-            si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-            height = props.height * si_conversion
             second_bm = generate_hiped_roof_bmesh(
-                bm, props.generation_method, height, props.angle, mutate_current_bmesh=False
+                bm,
+                props.generation_method,
+                props.height,
+                props.roof_thickness,
+                props.angle,
+                props.rafter_edge_angle,
+                mutate_current_bmesh=False,
             )
             bmesh.ops.translate(second_bm, verts=second_bm.verts, vec=Vector((0, 0, 1)))
 
@@ -598,7 +736,13 @@ class FinishEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
         element = tool.Ifc.get_entity(obj)
         props = obj.BIMRoofProperties
 
-        roof_data = props.get_general_kwargs()
+        bm = tool.Blender.get_bmesh_for_mesh(obj.data)
+        op_status, error_message = is_valid_roof_footprint(bm)
+        if error_message:
+            self.report(op_status, error_message)
+            return {"CANCELLED"}
+
+        roof_data = props.get_general_kwargs(convert_to_project_units=True)
         path_data = get_path_data(obj)
         roof_data["path_data"] = path_data
         ProfileDecorator.uninstall()
@@ -607,6 +751,7 @@ class FinishEditingRoofPath(bpy.types.Operator, tool.Ifc.Operator):
         update_bbim_roof_pset(element, roof_data)
         refresh()  # RoofData has to be updated before run update_roof_modifier_bmesh
         update_roof_modifier_bmesh(context)
+
         update_roof_modifier_ifc_data(context)
         if bpy.context.object.mode == "EDIT":
             bpy.ops.object.mode_set(mode="OBJECT")
@@ -627,7 +772,6 @@ class RemoveRoof(bpy.types.Operator, tool.Ifc.Operator):
 
         pset = tool.Pset.get_element_pset(element, "BBIM_Roof")
         ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-        props.roof_added_previously = True
         return {"FINISHED"}
 
 
@@ -636,6 +780,7 @@ class SetGableRoofEdgeAngle(bpy.types.Operator):
     bl_label = "Set Gable Roof Edge Angle"
     bl_options = {"REGISTER", "UNDO"}
     angle: bpy.props.FloatProperty(name="Angle", default=90)
+    separate_verts: bpy.props.BoolProperty(name="Separate Verts", default=True)
 
     @classmethod
     def poll(cls, context):
@@ -658,12 +803,17 @@ class SetGableRoofEdgeAngle(bpy.types.Operator):
         if "BBIM_gable_roof_angles" not in me.attributes:
             me.attributes.new("BBIM_gable_roof_angles", type="FLOAT", domain="EDGE")
 
+        if "BBIM_gable_roof_separate_verts" not in me.attributes:
+            me.attributes.new("BBIM_gable_roof_separate_verts", type="INT", domain="EDGE")
+
         angles_layer = bm.edges.layers.float["BBIM_gable_roof_angles"]
+        separate_verts_layer = bm.edges.layers.int["BBIM_gable_roof_separate_verts"]
 
         for e in bm.edges:
             if not e.select:
                 continue
             e[angles_layer] = self.angle
+            e[separate_verts_layer] = self.separate_verts
 
         tool.Blender.apply_bmesh(me, bm)
         return {"FINISHED"}

src/blenderbim/blenderbim/bim/module/model/root.py

@@ -43,13 +43,8 @@ def sync_name(usecase_path, ifc_file, settings):
         style = tool.Style.get_style(obj)
         if style and style != element:
             style.Name = new_name
-    collection = bpy.data.collections.get(obj.name)
+    collection = obj.BIMObjectProperties.collection
     if collection:
         collection.name = new_name
     obj.name = new_name
     blenderbim.bim.handler.refresh_ui_data()
-
-
-class ConstrTypeEntityNotFound(Exception):
-    pass
-

src/blenderbim/blenderbim/bim/module/model/slab.py

@@ -133,13 +133,13 @@ class DumbSlabGenerator:
 
         props = bpy.context.scene.BIMModelProperties
         self.collection = bpy.context.view_layer.active_layer_collection.collection
-        self.collection_obj = bpy.data.objects.get(self.collection.name)
+        self.collection_obj = self.collection.BIMCollectionProperties.obj
         self.depth = sum(thicknesses) * unit_scale
         self.width = 3
         self.length = 3
         self.rotation = 0
         self.location = Vector((0, 0, 0))
-        self.x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else radians(props.x_angle)
+        self.x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else props.x_angle
         return self.derive_from_cursor()
 
     def derive_from_cursor(self):
@@ -238,11 +238,11 @@ class DumbSlabPlaner:
                         if not rel.is_a("IfcRelAssociatesMaterial"):
                             continue
                         for element in rel.RelatedObjects:
-                            self.change_thickness(element, thickness)
+                            self.change_thickness(element, total_thickness)
                 else:
                     for rel in inverse.AssociatedTo:
                         for element in rel.RelatedObjects:
-                            self.change_thickness(element, thickness)
+                            self.change_thickness(element, total_thickness)
 
     def regenerate_from_type(self, usecase_path, ifc_file, settings):
         obj = tool.Ifc.get_object(settings["related_object"])
@@ -252,9 +252,17 @@ class DumbSlabPlaner:
         new_material = ifcopenshell.util.element.get_material(settings["relating_type"])
         if not new_material or not new_material.is_a("IfcMaterialLayerSet"):
             return
+        parametric = ifcopenshell.util.element.get_psets(settings["relating_type"]).get("EPset_Parametric")
+        layer_set_direction = None
+        if parametric:
+            layer_set_direction = parametric.get("LayerSetDirection", layer_set_direction)
         new_thickness = sum([l.LayerThickness for l in new_material.MaterialLayers])
         material = ifcopenshell.util.element.get_material(settings["related_object"])
-        if material and material.is_a("IfcMaterialLayerSetUsage") and material.LayerSetDirection == "AXIS3":
+        if not material or not material.is_a("IfcMaterialLayerSetUsage"):
+            return
+        if layer_set_direction:
+            material.LayerSetDirection = layer_set_direction
+        if material.LayerSetDirection == "AXIS3":
             self.change_thickness(settings["related_object"], new_thickness)
 
     def change_thickness(self, element, thickness):
@@ -274,7 +282,7 @@ class DumbSlabPlaner:
                 extrusion.Depth = thickness
             else:
                 props = bpy.context.scene.BIMModelProperties
-                x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else radians(props.x_angle)
+                x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else props.x_angle
                 new_rep = ifcopenshell.api.run(
                     "geometry.add_slab_representation",
                     tool.Ifc.get(),
@@ -299,7 +307,7 @@ class DumbSlabPlaner:
                 return
         else:
             props = bpy.context.scene.BIMModelProperties
-            x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else radians(props.x_angle)
+            x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else props.x_angle
             representation = ifcopenshell.api.run(
                 "geometry.add_slab_representation",
                 tool.Ifc.get(),
@@ -681,32 +689,33 @@ class EditExtrusionProfile(bpy.types.Operator, tool.Ifc.Operator):
 
         # Only certain classes should have a footprint
         if element.is_a() not in ("IfcSlab", "IfcRamp"):
-            return {"FINISHED"}
+            return
 
         footprint_context = ifcopenshell.util.representation.get_context(
             tool.Ifc.get(), "Plan", "FootPrint", "SKETCH_VIEW"
         )
-        if footprint_context:
-            curves = [profile.OuterCurve]
-            if profile.is_a("IfcArbitraryProfileDefWithVoids"):
-                curves.extend(profile.InnerCurves)
-            new_footprint = ifcopenshell.api.run(
-                "geometry.add_footprint_representation", tool.Ifc.get(), context=footprint_context, curves=curves
+        if not footprint_context:
+            return
+
+        curves = [profile.OuterCurve]
+        if profile.is_a("IfcArbitraryProfileDefWithVoids"):
+            curves.extend(profile.InnerCurves)
+        new_footprint = ifcopenshell.api.run(
+            "geometry.add_footprint_representation", tool.Ifc.get(), context=footprint_context, curves=curves
+        )
+        old_footprint = ifcopenshell.util.representation.get_representation(
+            element, "Plan", "FootPrint", "SKETCH_VIEW"
+        )
+        if old_footprint:
+            for inverse in tool.Ifc.get().get_inverse(old_footprint):
+                ifcopenshell.util.element.replace_attribute(inverse, old_footprint, new_footprint)
+            blenderbim.core.geometry.remove_representation(
+                tool.Ifc, tool.Geometry, obj=obj, representation=old_footprint
             )
-            old_footprint = ifcopenshell.util.representation.get_representation(
-                element, "Plan", "FootPrint", "SKETCH_VIEW"
+        else:
+            ifcopenshell.api.run(
+                "geometry.assign_representation", tool.Ifc.get(), product=element, representation=new_footprint
             )
-            if old_footprint:
-                for inverse in tool.Ifc.get().get_inverse(old_footprint):
-                    ifcopenshell.util.element.replace_attribute(inverse, old_footprint, new_footprint)
-                blenderbim.core.geometry.remove_representation(
-                    tool.Ifc, tool.Geometry, obj=obj, representation=old_footprint
-                )
-            else:
-                ifcopenshell.api.run(
-                    "geometry.assign_representation", tool.Ifc.get(), product=element, representation=new_footprint
-                )
-        return {"FINISHED"}
 
 
 class ResetVertex(bpy.types.Operator):

src/blenderbim/blenderbim/bim/module/model/space.py

@@ -26,12 +26,20 @@ import blenderbim.tool as tool
 import blenderbim.core.type
 from math import pi
 from mathutils import Vector, Matrix
+from shapely import Polygon, MultiPolygon
 
 
 class GenerateSpace(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.generate_space"
     bl_label = "Generate Space"
     bl_options = {"REGISTER"}
+    bl_description = "Create a space from the cursor position. Move the cursor position into the desired position, select the right space collection and run the operator"
+
+    @classmethod
+    def poll(cls, context):
+        collection = context.view_layer.active_layer_collection.collection
+        collection_obj = collection.BIMCollectionProperties.obj
+        return tool.Ifc.get_entity(collection_obj)
 
     def _execute(self, context):
         # This only works based on a 2D plan only considering the standard
@@ -52,7 +60,7 @@ class GenerateSpace(bpy.types.Operator, tool.Ifc.Operator):
                 relating_type = None
 
         collection = context.view_layer.active_layer_collection.collection
-        collection_obj = bpy.data.objects.get(collection.name)
+        collection_obj = collection.BIMCollectionProperties.obj
         if not collection_obj:
             bpy.context.window_manager.popup_menu(msg, title="Error", icon="ERROR")
             return
@@ -65,8 +73,13 @@ class GenerateSpace(bpy.types.Operator, tool.Ifc.Operator):
         element = None
         if bpy.context.selected_objects and active_obj:
             element = tool.Ifc.get_entity(active_obj)
-            x, y, z = active_obj.matrix_world.translation.xyz
             mat = active_obj.matrix_world
+            local_bbox_center = 0.125 * sum((Vector(b) for b in active_obj.bound_box), Vector())
+            global_bbox_center = mat @ local_bbox_center
+            x = global_bbox_center.x
+            y = global_bbox_center.y
+            z = (mat @ Vector(active_obj.bound_box[0])).z
+
             h = active_obj.dimensions.z
         else:
             x, y = context.scene.cursor.location.xy
@@ -166,3 +179,225 @@ class GenerateSpace(bpy.types.Operator, tool.Ifc.Operator):
                 (obj.matrix_world @ Vector((max_x, max_y, 0.0))).to_2d(),
             ],
         }
+
+
+class GenerateSpacesFromWalls(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.generate_spaces_from_walls"
+    bl_label = "Generate Spaces From Walls"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = "Generate spaces from selected walls. The active object must be a wall"
+
+    @classmethod
+    def poll(cls, context):
+        active_obj = bpy.context.active_object
+        element = tool.Ifc.get_entity(active_obj)
+        if element:
+            return context.selected_objects and element.is_a("IfcWall")
+
+    def _execute(self, context):
+        # This only works based on a 2D plan only considering the standard
+        # walls (i.e. prismatic) in the active object storey.
+        # In order to run, the active objct must be a wall and
+        # have to be selected walls
+        props = context.scene.BIMModelProperties
+        active_obj = bpy.context.active_object
+
+        if not active_obj:
+            self.report({"ERROR"}, "No active object. Please select a wall")
+            return
+
+        element = tool.Ifc.get_entity(active_obj)
+        if element and not element.is_a("IfcWall"):
+            return self.report({"ERROR"}, "The active object is not a wall. Please select a wall.")
+
+        container = ifcopenshell.util.element.get_container(element)
+        if not container:
+            self.report({"ERROR"}, "The wall is not contained.")
+
+        if not bpy.context.selected_objects:
+            self.report({"ERROR"}, "No selected objects found. Please select walls.")
+            return
+
+        x, y, z = active_obj.matrix_world.translation.xyz
+        mat = active_obj.matrix_world
+        h = active_obj.dimensions.z
+        selected_objects = bpy.context.selected_objects
+
+        boundary_elements = self.get_boundary_elements(selected_objects)
+
+        polys = self.get_polygons(boundary_elements)
+
+        converted_tolerance = self.get_converted_tolerance(tolerance=0.03)
+
+        union = shapely.ops.unary_union(polys).buffer(converted_tolerance, cap_style=2, join_style=2)
+
+        union = self.get_purged_inner_holes_poly(union_geom = union, min_area = self.get_converted_tolerance(tolerance = 3))
+
+        for i, linear_ring in enumerate(union.interiors):
+            poly = Polygon(linear_ring)
+            poly = poly.buffer(converted_tolerance, single_sided=True, cap_style=2, join_style=2)
+
+            bm = self.get_bmesh_from_polygon(poly, mat, h)
+
+            name = "Space" + str(i)
+            mesh = bpy.data.meshes.new(name=name)
+            bm.to_mesh(mesh)
+            bm.free()
+
+            obj = bpy.data.objects.new(name, mesh)
+            obj.matrix_world = mat
+
+            self.set_obj_origin_to_bboxcenter(obj)
+
+            if z != 0:
+                obj.location = obj.location + Vector((0,0,z))
+
+            context.view_layer.active_layer_collection.collection.objects.link(obj)
+            bpy.ops.bim.assign_class(obj=obj.name, ifc_class="IfcSpace")
+            container_obj = tool.Ifc.get_object(container)
+            blenderbim.core.spatial.assign_container(
+                tool.Ifc, tool.Collector, tool.Spatial, structure_obj=container_obj, element_obj=obj
+            )
+
+    def get_boundary_elements(self, selected_objects):
+        boundary_elements = []
+        for obj in selected_objects:
+            subelement = tool.Ifc.get_entity(obj)
+            if subelement.is_a("IfcWall") or subelement.is_a("IfcColumn"):
+                boundary_elements.append(subelement)
+        return boundary_elements
+
+    def get_polygons(self, boundary_elements):
+        polys = []
+        for boundary_element in boundary_elements:
+            obj = tool.Ifc.get_object(boundary_element)
+            if not obj:
+                continue
+            points = []
+            base = self.get_obj_base_points(obj)
+            for index in ["low_left", "low_right", "high_right", "high_left"]:
+                point = base[index]
+                points.append(point)
+
+            polys.append(Polygon(points))
+        return polys
+
+    def get_obj_base_points(self, obj):
+        x_values = [(obj.matrix_world @ Vector(v)).x for v in obj.bound_box]
+        y_values = [(obj.matrix_world @ Vector(v)).y for v in obj.bound_box]
+        return {
+            "low_left": (x_values[0], y_values[0]),
+            "high_left": (x_values[3], y_values[3]),
+            "low_right": (x_values[4], y_values[4]),
+            "high_right": (x_values[7], y_values[7]),
+        }
+
+    def get_converted_tolerance(self, tolerance):
+        model = tool.Ifc.get()
+        project_unit = ifcopenshell.util.unit.get_project_unit(model, "LENGTHUNIT")
+        prefix = getattr(project_unit, "Prefix", None)
+
+        converted_tolerance = ifcopenshell.util.unit.convert(
+            value=tolerance,
+            from_prefix=None,
+            from_unit="METRE",
+            to_prefix=prefix,
+            to_unit=project_unit.Name,
+        )
+        return tolerance
+
+    def get_purged_inner_holes_poly(self, union_geom, min_area):
+        interiors_list = []
+
+        if union_geom.geom_type == "MultiPolygon":
+            for poly in union_geom.geoms:
+                interiors_list = self.get_poly_valid_interior_list(poly = poly, min_area = min_area, interiors_list = interiors_list)
+
+            new_poly = Polygon(poly.exterior.coords, holes = interiors_list)
+
+        if union_geom.geom_type == "Polygon":
+            interiors_list = self.get_poly_valid_interior_list(poly = union_geom, min_area = min_area, interiors_list = interiors_list)
+            new_poly = Polygon(union_geom.exterior.coords, holes = interiors_list)
+
+        return new_poly
+
+    def get_poly_valid_interior_list(self, poly, min_area, interiors_list):
+        for interior in poly.interiors:
+            p = Polygon(interior)
+            if p.area >= min_area:
+                interiors_list.append(interior)
+        return interiors_list
+
+
+    def get_bmesh_from_polygon(self, poly, mat, h):
+        bm = bmesh.new()
+        bm.verts.index_update()
+        bm.edges.index_update()
+
+        mat_invert = mat.inverted()
+
+        new_verts = [bm.verts.new(mat_invert @ Vector([v[0], v[1], 0])) for v in poly.exterior.coords[0:-1]]
+        [bm.edges.new((new_verts[i], new_verts[i + 1])) for i in range(len(new_verts) - 1)]
+        bm.edges.new((new_verts[len(new_verts) - 1], new_verts[0]))
+
+        bm.verts.index_update()
+        bm.edges.index_update()
+
+        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=1e-5)
+        bmesh.ops.triangle_fill(bm, edges=bm.edges)
+        bmesh.ops.dissolve_limit(bm, angle_limit=pi / 180 * 5, verts=bm.verts, edges=bm.edges)
+
+        extrusion = bmesh.ops.extrude_face_region(bm, geom=bm.faces)
+        extruded_verts = [g for g in extrusion["geom"] if isinstance(g, bmesh.types.BMVert)]
+        bmesh.ops.translate(bm, vec=[0.0, 0.0, h], verts=extruded_verts)
+
+        bmesh.ops.recalc_face_normals(bm, faces=bm.faces)
+
+        return bm
+
+    def set_obj_origin_to_bboxcenter(self, obj):
+        mat = obj.matrix_world
+        inverted = mat.inverted()
+        local_bbox_center = 0.125 * sum((Vector(b) for b in obj.bound_box), Vector())
+        global_bbox_center = mat @ local_bbox_center
+
+        oldLoc = obj.location
+        newLoc = global_bbox_center
+        diff = newLoc - oldLoc
+        for vert in obj.data.vertices:
+            aux_vector = mat @ vert.co
+            aux_vector = aux_vector - diff
+            vert.co = inverted @ aux_vector
+        obj.location = newLoc
+
+class ToggleSpaceVisibility(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.toggle_space_visibility"
+    bl_label = "Toggle Space Visibility"
+    bl_options = {"REGISTER"}
+    bl_description = "Change the space visibility"
+
+    def execute(cls, context):
+        model = tool.Ifc.get()
+
+        spaces = model.by_type('IfcSpace')
+
+        if not spaces:
+            print(spaces)
+            return {"FINISHED"}
+
+        first_obj = tool.Ifc.get_object(spaces[0])
+
+        if bpy.data.objects[first_obj.name].display_type == 'TEXTURED':
+            for space in spaces:
+                obj = tool.Ifc.get_object(space)
+                bpy.data.objects[obj.name].show_wire = True
+                bpy.data.objects[obj.name].display_type = 'WIRE'
+            return {"FINISHED"}
+
+        elif bpy.data.objects[first_obj.name].display_type == 'WIRE':
+            for space in spaces:
+                obj = tool.Ifc.get_object(space)
+                bpy.data.objects[obj.name].show_wire = False
+                bpy.data.objects[obj.name].display_type = 'TEXTURED'
+            return {"FINISHED"}
+

src/blenderbim/blenderbim/bim/module/model/stair.py

@@ -18,7 +18,7 @@
 
 import bpy
 from bpy.types import Operator
-from bpy.props import FloatProperty, IntProperty, BoolProperty
+from bpy.props import FloatProperty, IntProperty
 from bpy_extras.object_utils import AddObjectHelper, object_data_add
 
 import bmesh
@@ -28,7 +28,6 @@ import ifcopenshell
 from ifcopenshell.util.shape_builder import V, ShapeBuilder
 import blenderbim
 import blenderbim.tool as tool
-from blenderbim.bim.helper import convert_property_group_from_si
 
 from mathutils import Vector
 from pprint import pprint
@@ -214,14 +213,6 @@ def generate_stair_2d_profile(
 def update_stair_modifier(context):
     obj = context.active_object
     props_kwargs = obj.BIMStairProperties.get_props_kwargs()
-
-    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-    for prop_name in props_kwargs:
-        if prop_name in ("is_editing", "number_of_treads", "has_top_nib", "stair_type"):
-            continue
-        prop_value = props_kwargs[prop_name]
-        props_kwargs[prop_name] = prop_value * si_conversion
-
     vertices, edges, faces = generate_stair_2d_profile(**props_kwargs)
 
     obj = context.object
@@ -263,11 +254,16 @@ def update_ifc_stair_props(obj):
     number_of_risers = props.number_of_treads + 1
     # update IfcStairFlight properties (seems already deprecated but keep it for now)
     # http://ifc43-docs.standards.buildingsmart.org/IFC/RELEASE/IFC4x3/HTML/lexical/IfcStairFlight.htm
+
+    si_conversion = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
+    riser_height = props.height / number_of_risers / si_conversion
+    tread_length = props.tread_depth / si_conversion
+
     if element.is_a("IfcStairFlight"):
         element.NumberOfRisers = number_of_risers
         element.NumberOfTreads = props.number_of_treads
-        element.RiserHeight = props.height / number_of_risers
-        element.TreadLength = props.tread_depth
+        element.RiserHeight = riser_height
+        element.TreadLength = tread_length
 
     # update pset with ifc properties
     pset_common = tool.Pset.get_element_pset(element, "Pset_StairFlightCommon")
@@ -281,8 +277,8 @@ def update_ifc_stair_props(obj):
         properties={
             "NumberOfRiser": number_of_risers,
             "NumberOfTreads": props.number_of_treads,
-            "RiserHeight": props.height / number_of_risers,
-            "TreadLength": props.tread_depth,
+            "RiserHeight": riser_height,
+            "TreadLength": tread_length,
         },
     )
     tool.Ifc.edit(obj)
@@ -360,14 +356,7 @@ class AddStair(bpy.types.Operator, tool.Ifc.Operator):
             self.report({"ERROR"}, "Object has to be IfcStairFlight/IfcStairFlightType to add a stair.")
             return {"CANCELLED"}
 
-        # need to make sure all default props will have correct units
-        if not props.stair_added_previously:
-            convert_property_group_from_si(
-                props,
-                skip_props=("stair_added_previously", "is_editing", "number_of_treads", "has_top_nib", "stair_type"),
-            )
-
-        stair_data = props.get_props_kwargs()
+        stair_data = props.get_props_kwargs(convert_to_project_units=True)
         pset = tool.Pset.get_element_pset(element, "BBIM_Stair")
         if not pset:
             pset = ifcopenshell.api.run("pset.add_pset", ifc_file, product=element, name="BBIM_Stair")
@@ -393,8 +382,7 @@ class CancelEditingStair(bpy.types.Operator, tool.Ifc.Operator):
         data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Stair", "Data"))
         props = obj.BIMStairProperties
         # restore previous settings since editing was canceled
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
+        props.set_props_kwargs_from_ifc_data(data)
         update_stair_modifier(context)
 
         props.is_editing = -1
@@ -412,7 +400,7 @@ class FinishEditingStair(bpy.types.Operator, tool.Ifc.Operator):
         element = tool.Ifc.get_entity(obj)
         props = obj.BIMStairProperties
 
-        data = props.get_props_kwargs()
+        data = props.get_props_kwargs(convert_to_project_units=True)
         props.is_editing = -1
         update_stair_modifier(context)
 
@@ -436,15 +424,7 @@ class EnableEditingStair(bpy.types.Operator, tool.Ifc.Operator):
         element = tool.Ifc.get_entity(obj)
         data = json.loads(ifcopenshell.util.element.get_pset(element, "BBIM_Stair", "Data"))
         # required since we could load pset from .ifc and BIMStairProperties won't be set
-        for prop_name in data:
-            setattr(props, prop_name, data[prop_name])
-
-        # need to make sure all props that weren't used before
-        # will have correct units
-        skip_props = ("stair_added_previously", "is_editing", "number_of_treads", "has_top_nib", "stair_type")
-        skip_props += tuple(data.keys())
-        convert_property_group_from_si(props, skip_props=skip_props)
-
+        props.set_props_kwargs_from_ifc_data(data)
         props.is_editing = 1
         return {"FINISHED"}
 
@@ -462,7 +442,6 @@ class RemoveStair(bpy.types.Operator, tool.Ifc.Operator):
 
         pset = tool.Pset.get_element_pset(element, "BBIM_Stair")
         ifcopenshell.api.run("pset.remove_pset", tool.Ifc.get(), pset=pset)
-        props.stair_added_previously = True
 
         return {"FINISHED"}
 

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

@@ -117,7 +117,7 @@ class LaunchTypeManager(bpy.types.Operator):
 
             op = row.operator("bim.select_type", icon="OBJECT_DATA", text="")
             op.relating_type = relating_type["id"]
-            op = row.operator("bim.duplicate_type", icon="COPYDOWN", text="")
+            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"]
@@ -132,62 +132,25 @@ class BIM_PT_authoring(Panel):
 
     def draw(self, context):
         row = self.layout.row(align=True)
-        row.operator("bim.align_wall", icon="ANCHOR_TOP", text="Ext.").align_type = "EXTERIOR"
-        row.operator("bim.align_wall", icon="ANCHOR_CENTER", text="C/L").align_type = "CENTERLINE"
-        row.operator("bim.align_wall", icon="ANCHOR_BOTTOM", text="Int.").align_type = "INTERIOR"
+        row.operator("bim.generate_space")
+        row = self.layout.row(align=True)
+        row.operator("bim.generate_spaces_from_walls")
+        row = self.layout.row(align=True)
+        row.operator("bim.toggle_space_visibility")
 
 
-class HelpConstrTypes(Operator):
-    bl_idname = "bim.help_relating_types"
-    bl_label = "Construction Types Help"
-    bl_options = {"REGISTER", "UNDO"}
-    bl_description = "Click to read some contextual help"
-
-    def execute(self, context):
-        return {"FINISHED"}
-
-    def invoke(self, context, event):
-        return context.window_manager.invoke_popup(self, width=510)
+class BIM_PT_Grids(Panel):
+    bl_label = "Grids"
+    bl_idname = "BIM_PT_Grids"
+    bl_space_type = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_category = "BlenderBIM"
 
     def draw(self, context):
-        layout = self.layout
-        layout.row().separator(factor=0.5)
-        row = layout.row()
-        row.alignment = "CENTER"
-        row.label(text="BlenderBIM Help", icon="BLENDER")
-        layout.row().separator(factor=0.5)
-
-        row = layout.row().row()
-        row.label(text="Overview:", icon="KEYTYPE_MOVING_HOLD_VEC")
-        self.draw_lines(layout, self.message_summary)
-        layout.row().separator()
-
-        row = layout.row().row()
-        row.label(text="Further support:", icon="KEYTYPE_MOVING_HOLD_VEC")
-        layout.row().separator(factor=0.5)
-        row = layout.row()
-        op = row.operator("bim.open_upstream", text="Homepage", icon="HOME")
-        op.page = "home"
-        op = row.operator("bim.open_upstream", text="Docs", icon="DOCUMENTS")
-        op.page = "docs"
-        op = row.operator("bim.open_upstream", text="Wiki", icon="CURRENT_FILE")
-        op.page = "wiki"
-        op = row.operator("bim.open_upstream", text="Community", icon="COMMUNITY")
-        op.page = "community"
-        layout.row().separator()
-
-    def draw_lines(self, layout, lines):
-        box = layout.box()
-        for line in lines:
-            row = box.row()
-            row.label(text=f"  {line}")
-
-    @property
-    def message_summary(self):
-        return [
-            "The Construction Type Browser allows to preview and add new instances to the model.",
-            "For further support, please click on the Documentation link below.",
-        ]
+        self.animation_props = context.scene.BIMAnimationProperties
+        row = self.layout.row()
+        row.operator("mesh.add_grid", icon="ADD", text="Add Grids")
 
 
 class BIM_PT_array(bpy.types.Panel):
@@ -224,7 +187,7 @@ class BIM_PT_array(bpy.types.Panel):
                     row.operator("bim.edit_array", icon="CHECKMARK", text="").item = i
                     row.operator("bim.disable_editing_array", icon="CANCEL", text="")
                     row = box.row(align=True)
-                    row.prop(props, "dimension_input_type")
+                    row.prop(props, "method")
                     row = box.row(align=True)
                     row.prop(props, "use_local_space")
                     row.prop(props, "sync_children")
@@ -238,18 +201,15 @@ class BIM_PT_array(bpy.types.Panel):
                     row = col.row(align=True)
                     row.prop(props, "z")
                     row.operator("bim.input_cursor_z_array", icon="CURSOR", text="")
-
                 else:
                     row = box.row(align=True)
-                    row.label(text=f"{array['count']} Items", icon="MOD_ARRAY")
+                    name = f"{array['count']} Items ({array.get('method', 'OFFSET').capitalize()})"
+                    row.label(text=name, icon="MOD_ARRAY")
                     row.operator("bim.enable_editing_array", icon="GREASEPENCIL", text="").item = i
                     row.operator("bim.remove_array", icon="X", text="").item = i
                     row = box.row(align=True)
-                    row.label(text=f"Dimension input type: {array.get('dimension_input_type', 'Increment')}")
-                    row = box.row(align=True)
-                    row.label(text=f"Use Local Space: {array.get('use_local_space', False)}")
-                    row = box.row(align=True)
-                    row.label(text=f"X: {array['x']}")
+                    icon = "EMPTY_ARROWS" if array.get("use_local_space", False) else "EMPTY_AXIS"
+                    row.label(text=f"X: {array['x']}", icon=icon)
                     row.label(text=f"Y: {array['y']}")
                     row.label(text=f"Z: {array['z']}")
         else:
@@ -599,6 +559,9 @@ class BIM_PT_railing(bpy.types.Panel):
             else:
                 row.operator("bim.enable_editing_railing", icon="GREASEPENCIL", text="")
                 row.operator("bim.enable_editing_railing_path", icon="ANIM", text="")
+                # TODO: good for preview but probably should move to .is_editing == -1
+                # since it's writing to ifc
+                row.operator("bim.flip_railing_path_order", icon="ARROW_LEFTRIGHT", text="")
                 row.operator("bim.remove_railing", icon="X", text="")
 
                 box = self.layout.box()
@@ -667,7 +630,7 @@ class BIM_PT_roof(bpy.types.Panel):
                     prop_value = round(prop_value, 5) if type(prop_value) is float else prop_value
                     row = box.row(align=True)
                     row.label(text=f"{props.bl_rna.properties[prop].name}")
-                    if prop == 'angle':
+                    if prop in ("angle", "rafter_edge_angle"):
                         prop_value = round(degrees(prop_value), 2)
                     row.label(text=str(prop_value))
         else:

src/blenderbim/blenderbim/bim/module/model/wall.py

@@ -207,6 +207,7 @@ class ChangeExtrusionDepth(bpy.types.Operator, tool.Ifc.Operator):
 
     def _execute(self, context):
         layer2_objs = []
+        si_conversion = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
         for obj in context.selected_objects:
             element = tool.Ifc.get_entity(obj)
             if not element:
@@ -219,7 +220,7 @@ class ChangeExtrusionDepth(bpy.types.Operator, tool.Ifc.Operator):
                 return
             x, y, z = extrusion.ExtrudedDirection.DirectionRatios
             x_angle = Vector((0, 1)).angle_signed(Vector((y, z)))
-            extrusion.Depth = self.depth * (1 / cos(x_angle))
+            extrusion.Depth = self.depth / si_conversion * (1 / cos(x_angle))
             if tool.Model.get_usage_type(element) == "LAYER2":
                 for rel in element.ConnectedFrom:
                     if rel.is_a() == "IfcRelConnectsElements":
@@ -239,7 +240,7 @@ class ChangeExtrusionXAngle(bpy.types.Operator, tool.Ifc.Operator):
     bl_idname = "bim.change_extrusion_x_angle"
     bl_label = "Change Extrusion X Angle"
     bl_options = {"REGISTER", "UNDO"}
-    x_angle: bpy.props.FloatProperty()
+    x_angle: bpy.props.FloatProperty(name="X Angle", default=0, subtype="ANGLE")
 
     @classmethod
     def poll(cls, context):
@@ -248,7 +249,7 @@ class ChangeExtrusionXAngle(bpy.types.Operator, tool.Ifc.Operator):
     def _execute(self, context):
         layer2_objs = []
         other_objs = []
-        x_angle = radians(self.x_angle)
+        x_angle = self.x_angle
         unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
         for obj in context.selected_objects:
             element = tool.Ifc.get_entity(obj)
@@ -433,13 +434,13 @@ class DumbWallGenerator:
 
         props = bpy.context.scene.BIMModelProperties
         self.collection = bpy.context.view_layer.active_layer_collection.collection
-        self.collection_obj = bpy.data.objects.get(self.collection.name)
+        self.collection_obj = self.collection.BIMCollectionProperties.obj
         self.width = self.layers["thickness"]
-        self.height = props.extrusion_depth * self.unit_scale
-        self.length = props.length * self.unit_scale
+        self.height = props.extrusion_depth
+        self.length = props.length
         self.rotation = 0.0
         self.location = Vector((0, 0, 0))
-        self.x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else radians(props.x_angle)
+        self.x_angle = 0 if tool.Cad.is_x(props.x_angle, 0, tolerance=0.001) else props.x_angle
 
         return self.derive_from_cursor()
 
@@ -698,8 +699,16 @@ class DumbWallPlaner:
         new_material = ifcopenshell.util.element.get_material(settings["relating_type"])
         if not new_material or not new_material.is_a("IfcMaterialLayerSet"):
             return
+        parametric = ifcopenshell.util.element.get_psets(settings["relating_type"]).get("EPset_Parametric")
+        layer_set_direction = None
+        if parametric:
+            layer_set_direction = parametric.get("LayerSetDirection", layer_set_direction)
         material = ifcopenshell.util.element.get_material(settings["related_object"])
-        if material and material.is_a("IfcMaterialLayerSetUsage") and material.LayerSetDirection == "AXIS2":
+        if not material or not material.is_a("IfcMaterialLayerSetUsage"):
+            return
+        if layer_set_direction:
+            material.LayerSetDirection = layer_set_direction
+        if material.LayerSetDirection == "AXIS2":
             DumbWallRecalculator().recalculate([obj])
 
 
@@ -925,7 +934,8 @@ class DumbWallJoiner:
     def duplicate_wall(self, wall1):
         wall2 = wall1.copy()
         wall2.data = wall2.data.copy()
-        wall1.users_collection[0].objects.link(wall2)
+        for collection in wall1.users_collection:
+            collection.objects.link(wall2)
         blenderbim.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=wall2)
         return wall2
 
@@ -996,7 +1006,7 @@ class DumbWallJoiner:
 
         self.recreate_wall(element1, wall1, axis, body)
 
-    def set_length(self, wall1, length):
+    def set_length(self, wall1, si_length):
         element1 = tool.Ifc.get_entity(wall1)
         if not element1:
             return
@@ -1006,8 +1016,6 @@ class DumbWallJoiner:
         axis1 = tool.Model.get_wall_axis(wall1)
         axis = copy.deepcopy(axis1["reference"])
         body = copy.deepcopy(axis1["reference"])
-        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
-        si_length = unit_scale * length
         end = (wall1.matrix_world @ Vector((si_length, 0, 0))).to_2d()
         axis[1] = end
         body[1] = end