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

Unify variant storage (#5118)

Browse Source
This commit is contained in:
Thomas Krijnen
2024-08-23 20:29:07 +02:00
committed by GitHub
parent e2001e82dd
commit d80bcd1a94
107 changed files with 118028 additions and 142394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcUtil.cpp
+22 -1
View File
@@ -56,6 +56,7 @@
#include "IfcBaseClass.h"
#include "IfcException.h"
#include "utils.h"
#include "IfcFile.h"
#include <algorithm>
#include <boost/algorithm/string/replace.hpp>
@@ -121,6 +122,7 @@ aggregate_of_instance::ptr aggregate_of_instance::unique() {
return return_value;
}
/*
//Note: some of these methods are overloaded in derived classes
Argument::operator int() const { throw IfcParse::IfcException("Argument is not an integer"); }
Argument::operator bool() const { throw IfcParse::IfcException("Argument is not a boolean"); }
@@ -137,6 +139,7 @@ Argument::operator aggregate_of_instance::ptr() const { throw IfcParse::IfcExcep
Argument::operator std::vector<std::vector<int>>() const { throw IfcParse::IfcException("Argument is not a list of list of ints"); }
Argument::operator std::vector<std::vector<double>>() const { throw IfcParse::IfcException("Argument is not a list of list of floats"); }
Argument::operator aggregate_of_aggregate_of_instance::ptr() const { throw IfcParse::IfcException("Argument is not a list of list of entity instances"); }
*/
static const char* const argument_type_string[] = {
"NULL",
@@ -199,16 +202,32 @@ void IfcUtil::unescape_xml(std::string& str) {
boost::replace_all(str, "&gt;", ">");
}
/*
Argument* IfcUtil::IfcBaseEntity::get(const std::string& name) const {
return data().getArgument(declaration().attribute_index(name));
}
*/
AttributeValue IfcUtil::IfcBaseEntity::get(const std::string& name) const
{
auto attrs = declaration().as_entity()->all_attributes();
auto iter = attrs.begin();
size_t idx = 0;
for (; iter != attrs.end(); ++iter, ++idx) {
if ((*iter)->name() == name) {
return data().get_attribute_value(idx);
}
}
throw IfcParse::IfcException(name + " not found on " + declaration().name());
}
aggregate_of_instance::ptr IfcUtil::IfcBaseEntity::get_inverse(const std::string& name) const {
const std::vector<const IfcParse::inverse_attribute*> attrs = declaration().as_entity()->all_inverse_attributes();
std::vector<const IfcParse::inverse_attribute*>::const_iterator iter = attrs.begin();
for (; iter != attrs.end(); ++iter) {
if ((*iter)->name() == name) {
return data().getInverse(
return file_->getInverse(
id_,
(*iter)->entity_reference(),
(int)(*iter)->entity_reference()->attribute_index((*iter)->attribute_reference()));
}
@@ -216,10 +235,12 @@ aggregate_of_instance::ptr IfcUtil::IfcBaseEntity::get_inverse(const std::string
throw IfcParse::IfcException(name + " not found on " + declaration().name());
}
/*
void IfcUtil::IfcBaseClass::data(IfcEntityInstanceData* data) {
delete data_;
data_ = data;
}
*/
IfcUtil::ArgumentType IfcUtil::make_aggregate(IfcUtil::ArgumentType elem_type) {
switch (elem_type) {