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

Fix compilation and execution of IfcConvert

Browse Source
This commit is contained in:
Thomas Krijnen
2017-12-21 14:14:04 +01:00
parent 6622afd93a
commit 4d325e026e
10 changed files with 1465 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/Ifc2x3-schema.cpp
+672 -672
View File
File diff suppressed because it is too large Load Diff
src/ifcparse/Ifc4-schema.cpp
+750 -750
View File
File diff suppressed because it is too large Load Diff
src/ifcparse/IfcParse.cpp
+3 -1
View File
@@ -1938,7 +1938,9 @@ void IfcFile::setDefaultHeaderValues() {
std::vector<std::string> file_description, schema_identifiers, empty_vector;
file_description.push_back("ViewDefinition [CoordinationView]");
schema_identifiers.push_back(schema()->name());
if (schema()) {
schema_identifiers.push_back(schema()->name());
}
header().file_description().description(file_description);
header().file_description().implementation_level("2;1");
src/ifcparse/IfcSchema.cpp
+7
View File
@@ -60,7 +60,14 @@ IfcParse::schema_definition::~schema_definition() {
}
}
#include "../ifcparse/Ifc2x3.h"
#include "../ifcparse/Ifc4.h"
const IfcParse::schema_definition* IfcParse::schema_by_name(const std::string& name) {
// TODO: initialize automatically somehow
Ifc2x3::get_schema();
Ifc4::get_schema();
std::map<std::string, const IfcParse::schema_definition*>::const_iterator it = schemas.find(name);
if (it == schemas.end()) {
throw IfcParse::IfcException("No schema named " + name);
src/ifcparse/IfcSchema.h
+7 -5
View File
@@ -119,16 +119,18 @@ namespace IfcParse {
class declaration {
protected:
std::string name_;
std::string name_, name_lower_;
int index_in_schema_;
public:
declaration(const std::string& name, int index_in_schema)
: name_(name)
, name_lower_(boost::to_lower_copy(name))
, index_in_schema_(index_in_schema)
{}
std::string name() const { return name_; }
std::string name_lc() const { return name_lower_; }
virtual const type_declaration* as_type_declaration() const { return static_cast<type_declaration*>(0); }
virtual const select_type* as_select_type() const { return static_cast<select_type*>(0); }
@@ -392,8 +394,7 @@ namespace IfcParse {
class declaration_by_name_cmp : public std::binary_function<const declaration*, const std::string&, bool> {
public:
bool operator()(const declaration* decl, const std::string& name) {
// TODO: Efficiency?
return boost::to_lower_copy(decl->name()) < boost::to_lower_copy(name);
return decl->name_lc() < name;
}
};
@@ -413,8 +414,9 @@ namespace IfcParse {
~schema_definition();
const declaration* declaration_by_name(const std::string& name) const {
std::vector<const declaration*>::const_iterator it = std::lower_bound(declarations_.begin(), declarations_.end(), name, declaration_by_name_cmp());
if (it == declarations_.end() || boost::to_lower_copy((**it).name()) != boost::to_lower_copy(name)) {
const std::string name_lower = boost::to_lower_copy(name);
std::vector<const declaration*>::const_iterator it = std::lower_bound(declarations_.begin(), declarations_.end(), name_lower, declaration_by_name_cmp());
if (it == declarations_.end() || (**it).name_lc() != name_lower) {
throw IfcParse::IfcException("Entity with '" + name + "' not found");
} else {
return *it;