Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 17:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1732 0.7 IfcBaseClass::identity()

Browse Source
This commit is contained in:
Thomas Krijnen
2021-09-11 12:59:48 +02:00
parent d99caf15e6
commit 7661899e9d
4 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcBaseClass.h
+11 -3
View File
@@ -28,6 +28,8 @@
#include <boost/shared_ptr.hpp>
#include <atomic>
class Argument;
class aggregate_of_instance;
@@ -67,15 +69,19 @@ namespace IfcUtil {
};
class IFC_PARSE_API IfcBaseClass : public virtual IfcBaseInterface {
protected:
private:
uint32_t identity_;
static std::atomic_uint32_t counter_;
protected:
IfcEntityInstanceData* data_;
static bool is_null(const IfcBaseClass* not_this) {
return !not_this;
}
public:
IfcBaseClass() : data_(0) {}
IfcBaseClass(IfcEntityInstanceData* d) : data_(d) {}
IfcBaseClass() : identity_(counter_++), data_(0) {}
IfcBaseClass(IfcEntityInstanceData* d) : identity_(counter_++), data_(d) {}
virtual ~IfcBaseClass() { delete data_; }
const IfcEntityInstanceData& data() const { return *data_; }
@@ -83,6 +89,8 @@ namespace IfcUtil {
void data(IfcEntityInstanceData* d);
virtual const IfcParse::declaration& declaration() const = 0;
uint32_t identity() const { return identity_; }
};
class IFC_PARSE_API IfcLateBoundEntity : public IfcBaseClass {
src/ifcparse/IfcFile.h
+2 -1
View File
@@ -23,6 +23,7 @@
#include <map>
#include <set>
#include <iterator>
#include <boost/unordered_map.hpp>
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/sequenced_index.hpp>
@@ -112,7 +113,7 @@ public:
};
private:
typedef std::map<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*> entity_entity_map_t;
typedef std::map<uint32_t, IfcUtil::IfcBaseClass*> entity_entity_map_t;
bool parsing_complete_;
file_open_status good_ = file_open_status::SUCCESS;
src/ifcparse/IfcParse.cpp
+12 -12
View File
@@ -1703,7 +1703,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity, int id)
// If this instance has been inserted before, return
// a reference to the copy that was created from it.
entity_entity_map_t::iterator mit = entity_file_map.find(entity);
entity_entity_map_t::iterator mit = entity_file_map.find(entity->identity());
if (mit != entity_file_map.end()) {
return mit->second;
}
@@ -1717,9 +1717,9 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity, int id)
aggregate_of_instance::ptr entity_attributes = traverse(entity, 1);
for (aggregate_of_instance::it it = entity_attributes->begin(); it != entity_attributes->end(); ++it) {
if (*it != entity) {
entity_entity_map_t::iterator mit2 = entity_file_map.find(*it);
entity_entity_map_t::iterator mit2 = entity_file_map.find((*it)->identity());
if (mit2 == entity_file_map.end()) {
entity_file_map.insert(entity_entity_map_t::value_type(*it, addEntity(*it)));
entity_file_map.insert(entity_entity_map_t::value_type((*it)->identity(), addEntity(*it)));
}
}
}
@@ -1764,7 +1764,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity, int id)
}
if (attr_type == IfcUtil::Argument_ENTITY_INSTANCE) {
entity_entity_map_t::const_iterator eit = entity_file_map.find(*attr);
entity_entity_map_t::const_iterator eit = entity_file_map.find(((IfcUtil::IfcBaseClass*)(*attr))->identity());
if (eit == entity_file_map.end()) throw IfcParse::IfcException("Unable to map instance to file");
IfcWrite::IfcWriteArgument* copy = new IfcWrite::IfcWriteArgument();
@@ -1774,7 +1774,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity, int id)
aggregate_of_instance::ptr instances = *attr;
aggregate_of_instance::ptr new_instances(new aggregate_of_instance);
for (aggregate_of_instance::it it = instances->begin(); it != instances->end(); ++it) {
entity_entity_map_t::const_iterator eit = entity_file_map.find(*it);
entity_entity_map_t::const_iterator eit = entity_file_map.find((*it)->identity());
if (eit == entity_file_map.end()) throw IfcParse::IfcException("Unable to map instance to file");
new_instances->push(eit->second);
}
@@ -1788,7 +1788,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity, int id)
for (aggregate_of_aggregate_of_instance::outer_it it = instances->begin(); it != instances->end(); ++it) {
std::vector<IfcUtil::IfcBaseClass*> list;
for (aggregate_of_aggregate_of_instance::inner_it jt = it->begin(); jt != it->end(); ++jt) {
entity_entity_map_t::const_iterator eit = entity_file_map.find(*jt);
entity_entity_map_t::const_iterator eit = entity_file_map.find((*jt)->identity());
if (eit == entity_file_map.end()) throw IfcParse::IfcException("Unable to map instance to file");
list.push_back(eit->second);
}
@@ -1842,8 +1842,7 @@ IfcUtil::IfcBaseClass* IfcFile::addEntity(IfcUtil::IfcBaseClass* entity, int id)
}
}
// @todo entity_file_map: use weak_ptr
entity_file_map.insert(entity_entity_map_t::value_type(entity, new_entity));
entity_file_map.insert(entity_entity_map_t::value_type(entity->identity(), new_entity));
}
// For subtypes of IfcRoot, the GUID mapping needs to be updated.
@@ -2096,13 +2095,12 @@ void IfcFile::process_deletion_() {
}
}
// This entity_file_map remains obviously flawed, but until we have proper lookup by value, or another mechanism,
// to prevent duplicate definitions with usage of add() we have to keep it. This might be a good moment to clear it.
// entity_file_map is in place to prevent duplicate definitions with usage of add().
// Upon deletion the pairs need to be erased.
for (auto it = entity_file_map.begin(); it != entity_file_map.end();) {
if (it->second == entity) {
it = entity_file_map.erase(it);
}
else {
} else {
++it;
}
}
@@ -2401,3 +2399,5 @@ void IfcParse::IfcFile::build_inverses() {
build_inverses_(pair.second);
}
}
std::atomic_uint32_t IfcUtil::IfcBaseClass::counter_ = 0;
src/ifcwrap/IfcParseWrapper.i
+1 -11
View File
@@ -236,17 +236,7 @@ static IfcUtil::ArgumentType helper_fn_attribute_type(const IfcUtil::IfcBaseClas
}
bool __eq__(IfcUtil::IfcBaseClass* other) const {
if ($self == other) {
return true;
}
if (!$self->declaration().as_entity() || !other->declaration().as_entity()) {
/// @todo
return false;
} else {
IfcUtil::IfcBaseEntity* self_ = (IfcUtil::IfcBaseEntity*) self;
IfcUtil::IfcBaseEntity* other_ = (IfcUtil::IfcBaseEntity*) other;
return self_->data().id() == other_->data().id() && self_->data().file == other_->data().file;
}
return $self->identity() == other->identity();
}
std::string __repr__() const {