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

Format obj and dae output predictably based on rfc notation of GlobalId. As discussed in https://sourceforge.net/p/ifcopenshell/discussion/1782717/thread/cbb0c8ca/

Browse Source
This commit is contained in:
Thomas Krijnen
2015-05-13 14:30:21 +00:00
parent b37a684eb9
commit 9bf9f82b3b
15 changed files with 176 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcGuidHelper.cpp → src/ifcparse/IfcGlobalId.cpp
+77 -56
View File
@@ -17,91 +17,112 @@
* *
********************************************************************************/
/********************************************************************************
* *
* Please consider this a placeholder for an actual GlobalId generation *
* algorithm. A real implementation could for example be based on Boost::uuid *
* *
********************************************************************************/
#include <time.h>
#include <stdlib.h>
#include <vector>
#include <algorithm>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#include "../ifcparse/IfcWrite.h"
#include "../ifcparse/IfcGlobalId.h"
#include "../ifcparse/IfcException.h"
static const char* chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_$";
// Converts an unsigned integer into a base64 string of length l
std::string base64(unsigned v, int l) {
std::string r;
r.reserve(l);
while ( v ) {
r.push_back(chars[v%64]);
v /= 64;
}
while ( r.size() != l ) r.push_back('0');
std::reverse(r.begin(),r.end());
return r;
std::string r;
r.reserve(l);
while ( v ) {
r.push_back(chars[v%64]);
v /= 64;
}
while ( r.size() != l ) r.push_back('0');
std::reverse(r.begin(),r.end());
return r;
}
// Converts a base64 string into an unsigned integer
unsigned from_base64(const std::string& s) {
std::string::size_type zeros = s.find_first_not_of('0');
unsigned r = 0;
if ( zeros != std::string::npos )
for ( std::string::const_iterator i = s.begin()+zeros; i != s.end(); ++ i ) {
r *= 64;
const char* c = strchr(chars,*i);
if ( !c ) throw IfcParse::IfcException("Failed to decode GlobalId");
r += (c-chars);
}
return r;
std::string::size_type zeros = s.find_first_not_of('0');
unsigned r = 0;
if ( zeros != std::string::npos )
for ( std::string::const_iterator i = s.begin()+zeros; i != s.end(); ++ i ) {
r *= 64;
const char* c = strchr(chars,*i);
if ( !c ) throw IfcParse::IfcException("Failed to decode GlobalId");
r += (c-chars);
}
return r;
}
// Compresses the UUID byte array into a base64 representation
std::string compress(unsigned char* v) {
std::string r;
r.reserve(22);
r += base64(v[0],2);
for ( unsigned i = 1; i < 16; i += 3 ) {
r += base64((v[i]<<16) + (v[i+1]<<8) + v[i+2],4);
}
return r;
std::string r;
r.reserve(22);
r += base64(v[0],2);
for ( unsigned i = 1; i < 16; i += 3 ) {
r += base64((v[i]<<16) + (v[i+1]<<8) + v[i+2],4);
}
return r;
}
// Expands the base64 representation into a UUID byte array
void expand(const std::string& s, std::vector<unsigned char>& v) {
v.push_back(from_base64(s.substr(0,2)));
for( unsigned i = 0; i < 5; ++i ) {
unsigned d = from_base64(s.substr(2+4*i,4));
for ( unsigned j = 0; j < 3; ++ j ) {
v.push_back((d>>(8*(2-j))) % 256);
}
}
v.push_back(from_base64(s.substr(0,2)));
for( unsigned i = 0; i < 5; ++i ) {
unsigned d = from_base64(s.substr(2+4*i,4));
for ( unsigned j = 0; j < 3; ++ j ) {
v.push_back((d>>(8*(2-j))) % 256);
}
}
}
// A random number generator for the UUID
static boost::uuids::basic_random_generator<boost::mt19937> gen;
IfcWrite::IfcGuidHelper::IfcGuidHelper() {
boost::uuids::uuid u = gen();
std::vector<unsigned char> v(u.size());
std::copy(u.begin(), u.end(), v.begin());
data = compress(&v[0]);
IfcParse::IfcGlobalId::IfcGlobalId() {
uuid_data = gen();
std::vector<unsigned char> v(uuid_data.size());
std::copy(uuid_data.begin(), uuid_data.end(), v.begin());
string_data = compress(&v[0]);
formatted_string = boost::uuids::to_string(uuid_data);
std::vector<unsigned char> v2;
expand(data,v2);
boost::uuids::uuid u2;
std::copy(v2.begin(), v2.end(), u2.begin());
}
IfcWrite::IfcGuidHelper::operator std::string() const {
return data;
#ifndef NDEBUG
std::vector<unsigned char> test_vector;
expand(string_data, test_vector);
boost::uuids::uuid test_uuid;
std::copy(test_vector.begin(), test_vector.end(), test_uuid.begin());
if (uuid_data != test_uuid) {
throw IfcParse::IfcException("Internal error generating GlobalId");
}
#endif
}
bool IfcWrite::IfcGuidHelper::seeded = false;
IfcParse::IfcGlobalId::IfcGlobalId(const std::string& s)
: string_data(s)
{
std::vector<unsigned char> v;
expand(string_data, v);
std::copy(v.begin(), v.end(), uuid_data.begin());
formatted_string = boost::uuids::to_string(uuid_data);
#ifndef NDEBUG
const std::string test_string = compress(&uuid_data.data[0]);
if (string_data != test_string) {
throw IfcParse::IfcException("Internal error generating GlobalId");
}
#endif
}
IfcParse::IfcGlobalId::operator const std::string&() const {
return string_data;
}
IfcParse::IfcGlobalId::operator const boost::uuids::uuid&() const {
return uuid_data;
}
const std::string& IfcParse::IfcGlobalId::formatted() const {
return formatted_string;
}
src/ifcparse/IfcGlobalId.h
+44
View File
@@ -0,0 +1,44 @@
/********************************************************************************
* *
* This file is part of IfcOpenShell. *
* *
* IfcOpenShell is free software: you can redistribute it and/or modify *
* it under the terms of the Lesser GNU General Public License as published by *
* the Free Software Foundation, either version 3.0 of the License, or *
* (at your option) any later version. *
* *
* IfcOpenShell is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* Lesser GNU General Public License for more details. *
* *
* You should have received a copy of the Lesser GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
********************************************************************************/
#ifndef IFCGLOBALID_H
#define IFCGLOBALID_H
#include <string>
#include <boost/uuid/uuid.hpp>
namespace IfcParse {
/// A helper class for the creation of IFC GlobalIds.
class IfcGlobalId {
private:
std::string string_data, formatted_string;
boost::uuids::uuid uuid_data;
public:
static const unsigned int length = 22;
IfcGlobalId();
IfcGlobalId(const std::string&);
operator const std::string&() const;
operator const boost::uuids::uuid&() const;
const std::string& formatted() const;
};
}
#endif
src/ifcparse/IfcHierarchyHelper.cpp
+4 -4
View File
@@ -108,7 +108,7 @@ IfcSchema::IfcProject* IfcHierarchyHelper::addProject(IfcSchema::IfcOwnerHistory
IfcSchema::IfcUnitAssignment* unit_assignment = new IfcSchema::IfcUnitAssignment(units);
IfcSchema::IfcProject* project = new IfcSchema::IfcProject(IfcWrite::IfcGuidHelper(), owner_hist, boost::none, boost::none,
IfcSchema::IfcProject* project = new IfcSchema::IfcProject(IfcParse::IfcGlobalId(), owner_hist, boost::none, boost::none,
boost::none, boost::none, boost::none, rep_contexts, unit_assignment);
addEntity(dimexp);
@@ -146,7 +146,7 @@ IfcSchema::IfcSite* IfcHierarchyHelper::addSite(IfcSchema::IfcProject* proj, Ifc
proj = addProject(owner_hist);
}
IfcSchema::IfcSite* site = new IfcSchema::IfcSite(IfcWrite::IfcGuidHelper(), owner_hist, boost::none,
IfcSchema::IfcSite* site = new IfcSchema::IfcSite(IfcParse::IfcGlobalId(), owner_hist, boost::none,
boost::none, boost::none, addLocalPlacement(), 0, boost::none,
IfcSchema::IfcElementCompositionEnum::IfcElementComposition_ELEMENT,
boost::none, boost::none, boost::none, boost::none, 0);
@@ -169,7 +169,7 @@ IfcSchema::IfcBuilding* IfcHierarchyHelper::addBuilding(IfcSchema::IfcSite* site
if (! site) {
site = addSite(0, owner_hist);
}
IfcSchema::IfcBuilding* building = new IfcSchema::IfcBuilding(IfcWrite::IfcGuidHelper(), owner_hist, boost::none, boost::none, boost::none,
IfcSchema::IfcBuilding* building = new IfcSchema::IfcBuilding(IfcParse::IfcGlobalId(), owner_hist, boost::none, boost::none, boost::none,
addLocalPlacement(), 0, boost::none, IfcSchema::IfcElementCompositionEnum::IfcElementComposition_ELEMENT,
boost::none, boost::none, 0);
@@ -195,7 +195,7 @@ IfcSchema::IfcBuildingStorey* IfcHierarchyHelper::addBuildingStorey(IfcSchema::I
if (! building) {
building = addBuilding(0, owner_hist);
}
IfcSchema::IfcBuildingStorey* storey = new IfcSchema::IfcBuildingStorey(IfcWrite::IfcGuidHelper(),
IfcSchema::IfcBuildingStorey* storey = new IfcSchema::IfcBuildingStorey(IfcParse::IfcGlobalId(),
owner_hist, boost::none, boost::none, boost::none, addLocalPlacement(), 0, boost::none,
IfcSchema::IfcElementCompositionEnum::IfcElementComposition_ELEMENT, boost::none);
src/ifcparse/IfcHierarchyHelper.h
+4 -2
View File
@@ -35,8 +35,10 @@
#else
#include "../ifcparse/Ifc2x3.h"
#endif
#include "../ifcparse/IfcFile.h"
#include "../ifcparse/IfcWrite.h"
#include "../ifcparse/IfcGlobalId.h"
class IfcHierarchyHelper : public IfcParse::IfcFile {
public:
@@ -100,7 +102,7 @@ public:
}
IfcSchema::IfcObjectDefinition::list::ptr relating_objects (new IfcTemplatedEntityList<IfcSchema::IfcObjectDefinition>());
relating_objects->push(relating_object);
T* t = new T(IfcWrite::IfcGuidHelper(), owner_hist, boost::none, boost::none, related_object, relating_objects);
T* t = new T(IfcParse::IfcGlobalId(), owner_hist, boost::none, boost::none, related_object, relating_objects);
addEntity(t);
}
}
@@ -196,7 +198,7 @@ inline void IfcHierarchyHelper::addRelatedObject <IfcSchema::IfcRelContainedInSp
}
IfcSchema::IfcProduct::list::ptr relating_objects (new IfcTemplatedEntityList<IfcSchema::IfcProduct>());
relating_objects->push((IfcSchema::IfcProduct*)relating_object);
IfcSchema::IfcRelContainedInSpatialStructure* t = new IfcSchema::IfcRelContainedInSpatialStructure(IfcWrite::IfcGuidHelper(), owner_hist,
IfcSchema::IfcRelContainedInSpatialStructure* t = new IfcSchema::IfcRelContainedInSpatialStructure(IfcParse::IfcGlobalId(), owner_hist,
boost::none, boost::none, relating_objects, (IfcSchema::IfcSpatialStructureElement*)related_object);
addEntity(t);
src/ifcparse/IfcWrite.h
-11
View File
@@ -136,17 +136,6 @@ namespace IfcWrite {
IfcUtil::ArgumentType type() const;
};
/// A helper class for the creation of IFC GlobalIds.
class IfcGuidHelper {
private:
std::string data;
static bool seeded;
public:
static const unsigned int length = 22;
IfcGuidHelper();
operator std::string() const;
};
// Accumulates all schema instances created from constructors
// This way they can be added in a single batch to the IfcFile
class EntityBuffer {