Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

approach to pass stringstream to serializers

Browse Source
This commit is contained in:
Thomas Krijnen
2021-07-11 15:01:31 +02:00
parent eeaf04c6ea
commit 975379a3a4
5 changed files with 90 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/GeometrySerializer.h
+37 -1
View File
@@ -27,7 +27,7 @@
class SerializerSettings : public IfcGeom::IteratorSettings class SerializerSettings : public IfcGeom::IteratorSettings
{ {
public: public:
enum Setting enum Setting : uint64_t
{ {
/// Use entity names instead of unique IDs for naming elements. /// Use entity names instead of unique IDs for naming elements.
/// Applicable for OBJ, DAE, and SVG output. /// Applicable for OBJ, DAE, and SVG output.
@@ -64,6 +64,42 @@ public:
enum { DEFAULT_PRECISION = 15 }; enum { DEFAULT_PRECISION = 15 };
}; };
class stream_or_filename {
private:
std::shared_ptr<std::ofstream> ofs_;
std::shared_ptr<std::ostringstream> oss_;
boost::optional<std::string> filename_;
public:
std::ostream& stream;
stream_or_filename(const std::string& fn)
: ofs_(new std::ofstream(IfcUtil::path::from_utf8(fn).c_str()))
, stream(*ofs_)
{}
stream_or_filename()
: oss_(new std::ostringstream)
, stream(*oss_)
{}
std::string get_value() const {
return oss_->str();
}
boost::optional<std::string> filename() const {
return filename_;
}
bool is_ready() {
if (ofs_) {
return ofs_->is_open();
} else {
return true;
}
}
};
class GeometrySerializer : public Serializer { class GeometrySerializer : public Serializer {
public: public:
GeometrySerializer(const SerializerSettings& settings) : settings_(settings) {} GeometrySerializer(const SerializerSettings& settings) : settings_(settings) {}
src/serializers/SvgSerializer.cpp
+14 -14
View File
@@ -1949,30 +1949,30 @@ void SvgSerializer::finalize() {
for (it = paths.begin(); it != paths.end(); ++it) { for (it = paths.begin(); it != paths.end(); ++it) {
if (!previous || it->first != *previous) { if (!previous || it->first != *previous) {
if (previous) { if (previous) {
svg_file << " </g>\n"; svg_file.stream << " </g>\n";
} }
std::ostringstream oss; std::ostringstream oss;
if (it->first.first) { if (it->first.first) {
svg_file << " <g " << nameElement(it->first.first) << " " << writeMetadata(drawing_metadata[it->first]) << ">\n"; svg_file.stream << " <g " << nameElement(it->first.first) << " " << writeMetadata(drawing_metadata[it->first]) << ">\n";
} else { } else {
auto n = it->first.second; auto n = it->first.second;
IfcUtil::escape_xml(n); IfcUtil::escape_xml(n);
svg_file << " <g " << namespace_prefix_ << "name=\"" << n << "\" class=\"section\" " << writeMetadata(drawing_metadata[it->first]) << ">\n"; svg_file.stream << " <g " << namespace_prefix_ << "name=\"" << n << "\" class=\"section\" " << writeMetadata(drawing_metadata[it->first]) << ">\n";
} }
} }
svg_file << " <g " << it->second.first << ">\n"; svg_file.stream << " <g " << it->second.first << ">\n";
std::vector<util::string_buffer>::const_iterator jt; std::vector<util::string_buffer>::const_iterator jt;
for (jt = it->second.second.begin(); jt != it->second.second.end(); ++jt) { for (jt = it->second.second.begin(); jt != it->second.second.end(); ++jt) {
svg_file << jt->str(); svg_file.stream << jt->str();
} }
svg_file << " </g>\n"; svg_file.stream << " </g>\n";
previous = it->first; previous = it->first;
} }
if (previous) { if (previous) {
svg_file << " </g>\n"; svg_file.stream << " </g>\n";
} }
svg_file << "</svg>" << std::endl; svg_file.stream << "</svg>" << std::endl;
} }
void SvgSerializer::writeHeader() { void SvgSerializer::writeHeader() {
@@ -1981,18 +1981,18 @@ void SvgSerializer::writeHeader() {
} }
void SvgSerializer::doWriteHeader() { void SvgSerializer::doWriteHeader() {
svg_file << "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\""; svg_file.stream << "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"";
if (use_namespace_) { if (use_namespace_) {
svg_file << " xmlns:ifc=\"http://www.ifcopenshell.org/ns\""; svg_file.stream << " xmlns:ifc=\"http://www.ifcopenshell.org/ns\"";
} }
if (scale_ && size_) { if (scale_ && size_) {
svg_file << svg_file.stream <<
" width=\"" << size_->first << "mm\"" " width=\"" << size_->first << "mm\""
" height=\"" << size_->second << "mm\"" << " height=\"" << size_->second << "mm\"" <<
" viewBox=\"0 0 " << size_->first << " " << size_->second << "\""; " viewBox=\"0 0 " << size_->first << " " << size_->second << "\"";
} }
svg_file << ">\n" svg_file.stream << ">\n"
" <defs>\n" " <defs>\n"
" <marker id=\"arrowend\" markerWidth=\"10\" markerHeight=\"7\" refX=\"10\" refY=\"3.5\" orient=\"auto\">\n" " <marker id=\"arrowend\" markerWidth=\"10\" markerHeight=\"7\" refX=\"10\" refY=\"3.5\" orient=\"auto\">\n"
" <polygon points=\"0 0, 10 3.5, 0 7\" />\n" " <polygon points=\"0 0, 10 3.5, 0 7\" />\n"
@@ -2027,7 +2027,7 @@ void SvgSerializer::doWriteHeader() {
// (pt) (px) (in) (mm) // (pt) (px) (in) (mm)
// approx 12 / 0.75 / 96 * 25.4 // approx 12 / 0.75 / 96 * 25.4
svg_file << svg_file.stream <<
" text {\n" " text {\n"
" font-size: 2;\n" // (reduced to two). " font-size: 2;\n" // (reduced to two).
" }\n" " }\n"
@@ -2036,7 +2036,7 @@ void SvgSerializer::doWriteHeader() {
" }\n"; " }\n";
} }
svg_file << svg_file.stream <<
" ]]>\n" " ]]>\n"
" </style>\n"; " </style>\n";
} }
src/serializers/SvgSerializer.h
+3 -3
View File
@@ -137,7 +137,7 @@ public:
SH_NONE, SH_FULL, SH_LEFT SH_NONE, SH_FULL, SH_LEFT
}; };
protected: protected:
std::ofstream svg_file; stream_or_filename svg_file;
double xmin, ymin, xmax, ymax; double xmin, ymin, xmax, ymax;
boost::optional<std::vector<section_data>> section_data_; boost::optional<std::vector<section_data>> section_data_;
boost::optional<std::vector<section_data>> deferred_section_data_; boost::optional<std::vector<section_data>> deferred_section_data_;
@@ -182,9 +182,9 @@ protected:
void draw_hlr(const gp_Pln& pln, const drawing_key& drawing_name); void draw_hlr(const gp_Pln& pln, const drawing_key& drawing_name);
public: public:
SvgSerializer(const std::string& out_filename, const SerializerSettings& settings) SvgSerializer(const stream_or_filename& out_filename, const SerializerSettings& settings)
: GeometrySerializer(settings) : GeometrySerializer(settings)
, svg_file(IfcUtil::path::from_utf8(out_filename).c_str()) , svg_file(out_filename)
, xmin(+std::numeric_limits<double>::infinity()) , xmin(+std::numeric_limits<double>::infinity())
, ymin(+std::numeric_limits<double>::infinity()) , ymin(+std::numeric_limits<double>::infinity())
, xmax(-std::numeric_limits<double>::infinity()) , xmax(-std::numeric_limits<double>::infinity())
src/serializers/WavefrontObjSerializer.cpp
+33 -32
View File
@@ -27,35 +27,36 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <iomanip> #include <iomanip>
WaveFrontOBJSerializer::WaveFrontOBJSerializer(const std::string& obj_filename, const std::string& mtl_filename, const SerializerSettings& settings) WaveFrontOBJSerializer::WaveFrontOBJSerializer(const stream_or_filename& obj_filename, const stream_or_filename& mtl_filename, const SerializerSettings& settings)
: GeometrySerializer(settings) : GeometrySerializer(settings)
, mtl_filename(mtl_filename) , obj_stream(obj_filename)
, obj_stream(IfcUtil::path::from_utf8(obj_filename).c_str()) , mtl_stream(mtl_filename)
, mtl_stream(IfcUtil::path::from_utf8(mtl_filename).c_str())
, vcount_total(1) , vcount_total(1)
{ {
obj_stream << std::setprecision(settings.precision); obj_stream.stream << std::setprecision(settings.precision);
mtl_stream << std::setprecision(settings.precision); mtl_stream.stream << std::setprecision(settings.precision);
} }
bool WaveFrontOBJSerializer::ready() { bool WaveFrontOBJSerializer::ready() {
return obj_stream.is_open() && mtl_stream.is_open(); return obj_stream.is_ready() && mtl_stream.is_ready();
} }
void WaveFrontOBJSerializer::writeHeader() { void WaveFrontOBJSerializer::writeHeader() {
obj_stream << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << "\n"; obj_stream.stream << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << "\n";
#ifdef WIN32 #ifdef WIN32
const char dir_separator = '\\'; const char dir_separator = '\\';
#else #else
const char dir_separator = '/'; const char dir_separator = '/';
#endif #endif
std::string mtl_basename = mtl_filename; if (mtl_stream.filename()) {
std::string::size_type slash = mtl_basename.find_last_of(dir_separator); std::string mtl_basename = *mtl_stream.filename();
if (slash != std::string::npos) { std::string::size_type slash = mtl_basename.find_last_of(dir_separator);
mtl_basename = mtl_basename.substr(slash+1); if (slash != std::string::npos) {
mtl_basename = mtl_basename.substr(slash + 1);
}
obj_stream.stream << "mtllib " << mtl_basename << "\n";
} }
obj_stream << "mtllib " << mtl_basename << "\n"; mtl_stream.stream << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << "\n";
mtl_stream << "# File generated by IfcOpenShell " << IFCOPENSHELL_VERSION << "\n";
} }
void WaveFrontOBJSerializer::writeMaterial(const IfcGeom::Material& style) void WaveFrontOBJSerializer::writeMaterial(const IfcGeom::Material& style)
@@ -63,34 +64,34 @@ void WaveFrontOBJSerializer::writeMaterial(const IfcGeom::Material& style)
std::string material_name = (settings().get(SerializerSettings::USE_MATERIAL_NAMES) std::string material_name = (settings().get(SerializerSettings::USE_MATERIAL_NAMES)
? style.original_name() : style.name()); ? style.original_name() : style.name());
IfcUtil::sanitate_material_name(material_name); IfcUtil::sanitate_material_name(material_name);
mtl_stream << "newmtl " << material_name << "\n"; mtl_stream.stream << "newmtl " << material_name << "\n";
if (style.hasDiffuse()) { if (style.hasDiffuse()) {
const double* diffuse = style.diffuse(); const double* diffuse = style.diffuse();
mtl_stream << "Kd " << diffuse[0] << " " << diffuse[1] << " " << diffuse[2] << "\n"; mtl_stream.stream << "Kd " << diffuse[0] << " " << diffuse[1] << " " << diffuse[2] << "\n";
} }
if (style.hasSpecular()) { if (style.hasSpecular()) {
const double* specular = style.specular(); const double* specular = style.specular();
mtl_stream << "Ks " << specular[0] << " " << specular[1] << " " << specular[2] << "\n"; mtl_stream.stream << "Ks " << specular[0] << " " << specular[1] << " " << specular[2] << "\n";
} }
if (style.hasSpecularity()) { if (style.hasSpecularity()) {
mtl_stream << "Ns " << style.specularity() << "\n"; mtl_stream.stream << "Ns " << style.specularity() << "\n";
} }
if (style.hasTransparency()) { if (style.hasTransparency()) {
const double transparency = 1.0 - style.transparency(); const double transparency = 1.0 - style.transparency();
if (transparency < 1) { if (transparency < 1) {
mtl_stream << "d " << transparency << "\n"; mtl_stream.stream << "d " << transparency << "\n";
} }
} }
} }
void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o) void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
{ {
obj_stream << "g " << object_id(o) << "\n"; obj_stream.stream << "g " << object_id(o) << "\n";
obj_stream << "s 1" << "\n"; obj_stream.stream << "s 1" << "\n";
const bool isyup = settings().get(SerializerSettings::USE_Y_UP); const bool isyup = settings().get(SerializerSettings::USE_Y_UP);
const IfcGeom::Representation::Triangulation<double>& mesh = o->geometry(); const IfcGeom::Representation::Triangulation& mesh = o->geometry();
const int vcount = (int)mesh.verts().size() / 3; const int vcount = (int)mesh.verts().size() / 3;
for ( std::vector<double>::const_iterator it = mesh.verts().begin(); it != mesh.verts().end(); ) { for ( std::vector<double>::const_iterator it = mesh.verts().begin(); it != mesh.verts().end(); ) {
@@ -99,9 +100,9 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
const double z = *(it++); const double z = *(it++);
if (isyup) { if (isyup) {
obj_stream << "v " << x << " " << z << " " << -y << "\n"; obj_stream.stream << "v " << x << " " << z << " " << -y << "\n";
} else { } else {
obj_stream << "v " << x << " " << y << " " << z << "\n"; obj_stream.stream << "v " << x << " " << y << " " << z << "\n";
} }
} }
@@ -109,13 +110,13 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
const double x = *(it++); const double x = *(it++);
const double y = *(it++); const double y = *(it++);
const double z = *(it++); const double z = *(it++);
obj_stream << "vn " << x << " " << y << " " << z << "\n"; obj_stream.stream << "vn " << x << " " << y << " " << z << "\n";
} }
for (std::vector<double>::const_iterator it = mesh.uvs().begin(); it != mesh.uvs().end();) { for (std::vector<double>::const_iterator it = mesh.uvs().begin(); it != mesh.uvs().end();) {
const double u = *it++; const double u = *it++;
const double v = *it++; const double v = *it++;
obj_stream << "vt " << u << " " << v << "\n"; obj_stream.stream << "vt " << u << " " << v << "\n";
} }
int previous_material_id = -2; int previous_material_id = -2;
@@ -131,7 +132,7 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
std::string material_name = (settings().get(SerializerSettings::USE_MATERIAL_NAMES) std::string material_name = (settings().get(SerializerSettings::USE_MATERIAL_NAMES)
? material.original_name() : material.name()); ? material.original_name() : material.name());
IfcUtil::sanitate_material_name(material_name); IfcUtil::sanitate_material_name(material_name);
obj_stream << "usemtl " << material_name << "\n"; obj_stream.stream << "usemtl " << material_name << "\n";
if (materials.find(material_name) == materials.end()) { if (materials.find(material_name) == materials.end()) {
writeMaterial(material); writeMaterial(material);
materials.insert(material_name); materials.insert(material_name);
@@ -144,15 +145,15 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
const int v3 = *(it++)+vcount_total; const int v3 = *(it++)+vcount_total;
if (has_normals && has_uvs) { if (has_normals && has_uvs) {
obj_stream << "f " << v1 << "/" << v1 << "/" << v1 << " " obj_stream.stream << "f " << v1 << "/" << v1 << "/" << v1 << " "
<< v2 << "/" << v2 << "/" << v2 << " " << v2 << "/" << v2 << "/" << v2 << " "
<< v3 << "/" << v3 << "/" << v3 << "\n"; << v3 << "/" << v3 << "/" << v3 << "\n";
} else if (has_normals) { } else if (has_normals) {
obj_stream << "f " << v1 << "//" << v1 << " " obj_stream.stream << "f " << v1 << "//" << v1 << " "
<< v2 << "//" << v2 << " " << v2 << "//" << v2 << " "
<< v3 << "//" << v3 << "\n"; << v3 << "//" << v3 << "\n";
} else { } else {
obj_stream << "f " << v1 << " " << v2 << " " << v3 << "\n"; obj_stream.stream << "f " << v1 << " " << v2 << " " << v3 << "\n";
} }
} }
@@ -175,7 +176,7 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
std::string material_name = (settings().get(SerializerSettings::USE_MATERIAL_NAMES) std::string material_name = (settings().get(SerializerSettings::USE_MATERIAL_NAMES)
? material.original_name() : material.name()); ? material.original_name() : material.name());
IfcUtil::sanitate_material_name(material_name); IfcUtil::sanitate_material_name(material_name);
obj_stream << "usemtl " << material_name << "\n"; obj_stream.stream << "usemtl " << material_name << "\n";
if (materials.find(material_name) == materials.end()) { if (materials.find(material_name) == materials.end()) {
writeMaterial(material); writeMaterial(material);
materials.insert(material_name); materials.insert(material_name);
@@ -186,7 +187,7 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
const int v1 = i1 + vcount_total; const int v1 = i1 + vcount_total;
const int v2 = i2 + vcount_total; const int v2 = i2 + vcount_total;
obj_stream << "l " << v1 << " " << v2 << "\n"; obj_stream.stream << "l " << v1 << " " << v2 << "\n";
} }
vcount_total += vcount; vcount_total += vcount;
src/serializers/WavefrontObjSerializer.h
+3 -4
View File
@@ -29,13 +29,12 @@
// http://people.sc.fsu.edu/~jburkardt/txt/obj_format.txt // http://people.sc.fsu.edu/~jburkardt/txt/obj_format.txt
class WaveFrontOBJSerializer : public GeometrySerializer { class WaveFrontOBJSerializer : public GeometrySerializer {
private: private:
const std::string mtl_filename; stream_or_filename obj_stream;
std::ofstream obj_stream; stream_or_filename mtl_stream;
std::ofstream mtl_stream;
unsigned int vcount_total; unsigned int vcount_total;
std::set<std::string> materials; std::set<std::string> materials;
public: public:
WaveFrontOBJSerializer(const std::string& obj_filename, const std::string& mtl_filename, const SerializerSettings& settings); WaveFrontOBJSerializer(const stream_or_filename& obj_filename, const stream_or_filename& mtl_filename, const SerializerSettings& settings);
virtual ~WaveFrontOBJSerializer() {} virtual ~WaveFrontOBJSerializer() {}
bool ready(); bool ready();
void writeHeader(); void writeHeader();