diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:28:36 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:28:36 (GMT) |
| commit | 9f6819e68501de16563aeaaadd65dfc915092169 (patch) | |
| tree | 26beade954d4748b44ec303e2fd2e12584abe885 /src/dxfdim.cc | |
| parent | 8740ac3574c5249c9c22f5436d3b14f4f0563a66 (diff) | |
initial rework to enable eigen3 per issue #174.
1. enable eigen3 in qmake build system
2. convert Transform3d and cwise() per the eigen2->eigen3 porting faq online
3. get rid of 'using namespace boost::filesystem' as it conflicts with eigen3
Diffstat (limited to 'src/dxfdim.cc')
| -rw-r--r-- | src/dxfdim.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/dxfdim.cc b/src/dxfdim.cc index 8f68ac6..4af3526 100644 --- a/src/dxfdim.cc +++ b/src/dxfdim.cc @@ -36,10 +36,10 @@ #include <sstream> #include <boost/filesystem.hpp> -using namespace boost::filesystem; boost::unordered_map<std::string,Value> dxf_dim_cache; boost::unordered_map<std::string,Value> dxf_cross_cache; +namespace fs = boost::filesystem; Value builtin_dxf_dim(const Context *ctx, const std::vector<std::string> &argnames, const std::vector<Value> &args) { @@ -65,13 +65,14 @@ Value builtin_dxf_dim(const Context *ctx, const std::vector<std::string> &argnam std::stringstream keystream; keystream << filename << "|" << layername << "|" << name << "|" << xorigin - << "|" << yorigin <<"|" << scale << "|" << last_write_time(filename) - << "|" << file_size(filename); + << "|" << yorigin <<"|" << scale << "|" << fs::last_write_time(filename) + << "|" << fs::file_size(filename); std::string key = keystream.str(); if (dxf_dim_cache.find(key) != dxf_dim_cache.end()) return dxf_dim_cache.find(key)->second; DxfData dxf(36, 0, 0, filename, layername, xorigin, yorigin, scale); +/* for (size_t i = 0; i < dxf.dims.size(); i++) { @@ -123,12 +124,13 @@ Value builtin_dxf_dim(const Context *ctx, const std::vector<std::string> &argnam PRINTB("WARNING: Can't find dimension '%s' in '%s', layer '%s'!", name % filename % layername); +*/ return Value(); } Value builtin_dxf_cross(const Context *ctx, const std::vector<std::string> &argnames, const std::vector<Value> &args) { - std::string filename; +/* std::string filename; std::string layername; double xorigin = 0; double yorigin = 0; @@ -186,7 +188,7 @@ Value builtin_dxf_cross(const Context *ctx, const std::vector<std::string> &argn } PRINTB("WARNING: Can't find cross in '%s', layer '%s'!", filename % layername); - +*/ return Value(); } |