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

Use boost::shared_ptr

Browse Source 
Fixes https://github.com/IfcOpenShell/IfcOpenShell/issues/17
This commit is contained in:
aothms
2016-01-25 14:42:41 +01:00
parent 9b13ed3f38
commit ed8cc620ea
10 changed files with 26 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcconvert/SvgSerializer.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ void SvgSerializer::finalize() {
const double cx = xmin * sc;
const double cy = ymin * sc;
{std::vector< SHARED_PTR<util::string_buffer::float_item> >::const_iterator it;
{std::vector< boost::shared_ptr<util::string_buffer::float_item> >::const_iterator it;
for (it = xcoords.begin(); it != xcoords.end(); ++it) {
double& v = (*it)->value();
v = v * sc - cx;
src/ifcconvert/SvgSerializer.h
+6 -6
View File
@@ -40,9 +40,9 @@ protected:
boost::optional<double> section_height;
bool rescale;
std::multimap<IfcSchema::IfcBuildingStorey*, path_object> paths;
std::vector< SHARED_PTR<util::string_buffer::float_item> > xcoords;
std::vector< SHARED_PTR<util::string_buffer::float_item> > ycoords;
std::vector< SHARED_PTR<util::string_buffer::float_item> > radii;
std::vector< boost::shared_ptr<util::string_buffer::float_item> > xcoords;
std::vector< boost::shared_ptr<util::string_buffer::float_item> > ycoords;
std::vector< boost::shared_ptr<util::string_buffer::float_item> > radii;
IfcParse::IfcFile* file;
public:
explicit SvgSerializer(const std::string& out_filename)
@@ -55,9 +55,9 @@ public:
, rescale(false)
, file(0)
{}
virtual void addXCoordinate(const SHARED_PTR<util::string_buffer::float_item>& fi) { xcoords.push_back(fi); }
virtual void addYCoordinate(const SHARED_PTR<util::string_buffer::float_item>& fi) { ycoords.push_back(fi); }
virtual void addSizeComponent(const SHARED_PTR<util::string_buffer::float_item>& fi) { radii.push_back(fi); }
virtual void addXCoordinate(const boost::shared_ptr<util::string_buffer::float_item>& fi) { xcoords.push_back(fi); }
virtual void addYCoordinate(const boost::shared_ptr<util::string_buffer::float_item>& fi) { ycoords.push_back(fi); }
virtual void addSizeComponent(const boost::shared_ptr<util::string_buffer::float_item>& fi) { radii.push_back(fi); }
virtual void growBoundingBox(double x, double y) { if (x < xmin) xmin = x; if (x > xmax) xmax = x; if (y < ymin) ymin = y; if (y > ymax) ymax = y; }
virtual ~SvgSerializer() {}
virtual void writeHeader();
src/ifcconvert/util.cpp
+5 -5
View File
@@ -24,19 +24,19 @@
using namespace util;
SHARED_PTR<string_buffer::string_item> string_buffer::add(const std::string& s) {
SHARED_PTR<string_item> i = SHARED_PTR<string_item>(new string_item(s));
boost::shared_ptr<string_buffer::string_item> string_buffer::add(const std::string& s) {
boost::shared_ptr<string_item> i = boost::shared_ptr<string_item>(new string_item(s));
items.push_back(i);
return i;
}
SHARED_PTR<string_buffer::float_item> string_buffer::add(const double& d) {
SHARED_PTR<float_item> i = SHARED_PTR<float_item>(new float_item(d));
boost::shared_ptr<string_buffer::float_item> string_buffer::add(const double& d) {
boost::shared_ptr<float_item> i = boost::shared_ptr<float_item>(new float_item(d));
items.push_back(i);
return i;
}
std::string string_buffer::str() const {
std::stringstream ss;
for (std::vector< SHARED_PTR<item> >::const_iterator it = items.begin(); it != items.end(); ++it) {
for (std::vector< boost::shared_ptr<item> >::const_iterator it = items.begin(); it != items.end(); ++it) {
ss << (**it).str();
}
return ss.str();
src/ifcconvert/util.h
+5 -5
View File
@@ -23,7 +23,7 @@
#include <sstream>
#include <vector>
#include "../ifcparse/SharedPointer.h"
#include <boost/shared_ptr.hpp>
namespace util {
class string_buffer {
@@ -51,12 +51,12 @@ namespace util {
std::string str() const { std::stringstream ss; ss << d; return ss.str(); }
};
private:
std::vector< SHARED_PTR<item> > items;
std::vector< boost::shared_ptr<item> > items;
void clear();
void assign(const std::vector< SHARED_PTR<item> >& other);
void assign(const std::vector< boost::shared_ptr<item> >& other);
public:
SHARED_PTR<string_item> add(const std::string& s);
SHARED_PTR<float_item> add(const double& d);
boost::shared_ptr<string_item> add(const std::string& s);
boost::shared_ptr<float_item> add(const double& d);
std::string str() const;
};
}