Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 02:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.8.0' of https://github.com/IfcOpenShell/IfcOpenShell into v0.8.0

Browse Source
This commit is contained in:
Thomas Krijnen
2025-10-21 13:06:05 +02:00
parent 67678cb7f1 e2cf60f0c1
commit 550779deee
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+1 -1
View File
@@ -146,7 +146,7 @@ SWIG_VERSION = "4.1.0"
OPENCOLLADA_VERSION = "v1.6.68" OPENCOLLADA_VERSION = "v1.6.68"
HDF5_VERSION = "1.13.1" HDF5_VERSION = "1.13.1"
GMP_VERSION = "6.2.1" GMP_VERSION = "6.3.0"
MPFR_VERSION = "3.1.6" # latest is 4.1.0 MPFR_VERSION = "3.1.6" # latest is 4.1.0
CGAL_VERSION = "v5.6.3" CGAL_VERSION = "v5.6.3"
USD_VERSION = "23.05" USD_VERSION = "23.05"
src/bonsai/bonsai/bim/import_ifc.py
+3
View File
@@ -952,6 +952,9 @@ class IfcImporter:
if not props.ifc_file: if not props.ifc_file:
props.ifc_file = self.ifc_import_settings.input_file props.ifc_file = self.ifc_import_settings.input_file
self.file = tool.Ifc.get() self.file = tool.Ifc.get()
# IFC4 Reference View shall have no booleans https://github.com/BuildingSMART/IFC4-CV/issues/14
if self.file.schema == "IFC4" and "ReferenceView" in str(self.file.header.file_description.description):
self.ifc_import_settings.void_limit = 0
def calculate_unit_scale(self): def calculate_unit_scale(self):
self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file) self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
src/ifcparse/IfcFile.cpp
+4 -2
View File
@@ -752,7 +752,8 @@ std::optional<std::tuple<size_t, const IfcParse::declaration*, IfcEntityInstance
IfcUtil::IfcBaseClass* IfcParse::impl::rocks_db_file_storage::create(const IfcParse::declaration* decl) { IfcUtil::IfcBaseClass* IfcParse::impl::rocks_db_file_storage::create(const IfcParse::declaration* decl) {
if (decl->as_entity() || decl->as_type_declaration()) { if (decl->as_entity() || decl->as_type_declaration()) {
auto* inst = file->schema()->instantiate(decl, rocks_db_attribute_storage{}); auto* inst = file->schema()->instantiate(decl, rocks_db_attribute_storage{});
inst->file_ = file; // @todo maybe this needs to be set to file? In order to have a context (ie. rocksdb::db*) to write to?
inst->file_ = nullptr;
return file->addEntity(inst); return file->addEntity(inst);
} else { } else {
throw std::runtime_error("Requires and entity or type declaration"); throw std::runtime_error("Requires and entity or type declaration");
@@ -768,6 +769,7 @@ IfcUtil::IfcBaseClass* IfcParse::impl::in_memory_file_storage::create(const IfcP
} else { } else {
throw std::runtime_error("Requires and entity or type declaration"); throw std::runtime_error("Requires and entity or type declaration");
} }
inst->file_ = file; // file_ should be nullptr in order not to bypass addEntity() behaviour of registration in maps
inst->file_ = nullptr;
return file->addEntity(inst); return file->addEntity(inst);
} }