Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-14 11:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #244 and provide instances by entity type without subtypes

Browse Source
This commit is contained in:
Thomas Krijnen
2017-08-16 21:46:39 +02:00
parent b019ff6aed
commit 490c35bf60
9 changed files with 138 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcParse.cpp
+69 -5
View File
@@ -1320,6 +1320,16 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
}
IfcSchema::Type::Enum ty = instance->type();
{
IfcEntityList::ptr instances_by_type = entitiesByTypeExclSubtypes(ty);
if (!instances_by_type) {
instances_by_type = IfcEntityList::ptr(new IfcEntityList());
bytype_excl[ty] = instances_by_type;
}
instances_by_type->push(instance);
}
for (;;) {
IfcEntityList::ptr instances_by_type = entitiesByType(ty);
if (!instances_by_type) {
@@ -1334,7 +1344,7 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
break;
}
}
if (byid.find(current_id) != byid.end()) {
std::stringstream ss;
ss << "Overwriting instance with name #" << current_id;
@@ -1567,6 +1577,16 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
// The mapping by entity type is updated.
IfcSchema::Type::Enum ty = new_entity->type();
{
IfcEntityList::ptr instances_by_type = entitiesByTypeExclSubtypes(ty);
if (!instances_by_type) {
instances_by_type = IfcEntityList::ptr(new IfcEntityList());
bytype_excl[ty] = instances_by_type;
}
instances_by_type->push(new_entity);
}
for (;;) {
IfcEntityList::ptr instances_by_type = entitiesByType(ty);
if (!instances_by_type) {
@@ -1582,7 +1602,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity) {
break;
}
}
int new_id = -1;
if (!new_entity->entity->file) {
// For newly created entities ensure a valid ENTITY_INSTANCE_NAME is set
@@ -1720,10 +1740,33 @@ void IfcFile::removeEntity(IfcUtil::IfcBaseClass* entity) {
}
byid.erase(byid.find(id));
IfcEntityList::ptr instances_of_same_type = entitiesByType(entity->type());
instances_of_same_type->remove(entity);
IfcSchema::Type::Enum ty = entity->type();
{
IfcEntityList::ptr instances_of_same_type = entitiesByTypeExclSubtypes(ty);
instances_of_same_type->remove(entity);
if (instances_of_same_type->size() == 0) {
bytype_excl.erase(ty);
}
}
for (;;) {
IfcEntityList::ptr instances_of_same_type = entitiesByType(ty);
if (instances_of_same_type) {
instances_of_same_type->remove(entity);
}
if (instances_of_same_type->size() == 0) {
bytype.erase(ty);
}
boost::optional<IfcSchema::Type::Enum> pt = IfcSchema::Type::Parent(ty);
if (pt) {
ty = *pt;
} else {
break;
}
}
delete entity->entity;
delete entity;
}
@@ -1733,6 +1776,11 @@ IfcEntityList::ptr IfcFile::entitiesByType(IfcSchema::Type::Enum t) {
return (it == bytype.end()) ? IfcEntityList::ptr() : it->second;
}
IfcEntityList::ptr IfcFile::entitiesByTypeExclSubtypes(IfcSchema::Type::Enum t) {
entities_by_type_t::const_iterator it = bytype_excl.find(t);
return (it == bytype_excl.end()) ? IfcEntityList::ptr() : it->second;
}
IfcEntityList::ptr IfcFile::entitiesByType(const std::string& t) {
return entitiesByType(IfcSchema::Type::FromString(boost::to_upper_copy(t)));
}
@@ -1787,6 +1835,22 @@ IfcFile::entity_by_id_t::const_iterator IfcFile::end() const {
return byid.end();
}
IfcFile::type_iterator IfcFile::types_begin() const {
return bytype_excl.begin();
}
IfcFile::type_iterator IfcFile::types_end() const {
return bytype_excl.end();
}
IfcFile::type_iterator IfcFile::types_incl_super_begin() const {
return bytype.begin();
}
IfcFile::type_iterator IfcFile::types_incl_super_end() const {
return bytype.end();
}
std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f) {
f.header().write(os);