Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-22 12:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch errors in entity traversal while adding a new entity. In particular for late bound instances having unset attributes.

Browse Source
This commit is contained in:
Thomas Krijnen
2015-02-17 22:02:06 +00:00
parent 6c8a60db6e
commit e6ff1126ad
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcParse.cpp
+11 -6
View File
@@ -981,12 +981,14 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
// Obtain all forward references by a depth-first // Obtain all forward references by a depth-first
// traversal and add them to the file. // traversal and add them to the file.
{ IfcEntityList::ptr entity_attributes = traverse(entity, 1); try {
for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) { IfcEntityList::ptr entity_attributes = traverse(entity, 1);
if (*it != entity) { for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) {
entity_file_map.insert(entity_entity_map_t::value_type(*it, addEntity(*it))); if (*it != entity) {
entity_file_map.insert(entity_entity_map_t::value_type(*it, addEntity(*it)));
}
} }
} } } catch (...) {}
// See whether the instance is already part of a file // See whether the instance is already part of a file
if (entity->entity->file != 0) { if (entity->entity->file != 0) {
@@ -1109,7 +1111,10 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
byid[new_id] = entity; byid[new_id] = entity;
// The mapping by reference is updated. // The mapping by reference is updated.
IfcEntityList::ptr entity_attributes = traverse(entity, 1); IfcEntityList::ptr entity_attributes(new IfcEntityList);
try {
entity_attributes = traverse(entity, 1);
} catch (...) {}
for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) { for (IfcEntityList::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) {
IfcUtil::IfcBaseClass* entity_attribute = *it; IfcUtil::IfcBaseClass* entity_attribute = *it;
try { try {