diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-12 01:46:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-12 01:46:13 (GMT) |
| commit | ccb6af2816344a2747a9cf03eb9e393a8750dce6 (patch) | |
| tree | f126e750c16ac29e5e9c480c7529c8c60b75cc0b /src | |
| parent | b68c63e3bd37f50c954083d02cb86df07ce808f4 (diff) | |
Don't output deprecated parameters if they're not specified
Diffstat (limited to 'src')
| -rw-r--r-- | src/dxflinextrude.cc | 16 | ||||
| -rw-r--r-- | src/dxfrotextrude.cc | 16 | ||||
| -rw-r--r-- | src/mainwin.cc | 5 |
3 files changed, 21 insertions, 16 deletions
diff --git a/src/dxflinextrude.cc b/src/dxflinextrude.cc index ca98b66..8bb246f 100644 --- a/src/dxflinextrude.cc +++ b/src/dxflinextrude.cc @@ -144,13 +144,17 @@ std::string DxfLinearExtrudeNode::toString() const { std::stringstream stream; - stream << this->name() << "(" - "file = \"" << this->filename << "\", " - "cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", " - "layer = \"" << this->layername << "\", " + stream << this->name() << "("; + if (!this->filename.empty()) { // Ignore deprecated parameters if empty + stream << + "file = \"" << this->filename << "\", " + "cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", " + "layer = \"" << this->layername << "\", " + "origin = [ " << this->origin_x << " " << this->origin_y << " ], " + "scale = " << this->scale << ", "; + } + stream << "height = " << std::dec << this->height << ", " - "origin = [ " << this->origin_x << " " << this->origin_y << " ], " - "scale = " << this->scale << ", " "center = " << (this->center?"true":"false") << ", " "convexity = " << this->convexity; diff --git a/src/dxfrotextrude.cc b/src/dxfrotextrude.cc index cd585aa..646b643 100644 --- a/src/dxfrotextrude.cc +++ b/src/dxfrotextrude.cc @@ -120,12 +120,16 @@ std::string DxfRotateExtrudeNode::toString() const { std::stringstream stream; - stream << this->name() << "(" - "file = \"" << this->filename << "\", " - "cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", " - "layer = \"" << this->layername << "\", " - "origin = [ " << std::dec << this->origin_x << " " << this->origin_y << " ], " - "scale = " << this->scale << ", " + stream << this->name() << "("; + if (!this->filename.empty()) { // Ignore deprecated parameters if empty + stream << + "file = \"" << this->filename << "\", " + "cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", " + "layer = \"" << this->layername << "\", " + "origin = [ " << std::dec << this->origin_x << " " << this->origin_y << " ], " + "scale = " << this->scale << ", "; + } + stream << "convexity = " << this->convexity << ", " "$fn = " << this->fn << ", $fa = " << this->fa << ", $fs = " << this->fs << ")"; diff --git a/src/mainwin.cc b/src/mainwin.cc index 0cf39e7..56502f2 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1496,12 +1496,9 @@ void MainWindow::actionExportImage() void MainWindow::actionFlushCaches() { -// FIXME: Polycache -> PolySetEvaluator PolySetCache::instance()->clear(); #ifdef ENABLE_CGAL -// FIXME: Flush caches through whatever channels we have - // CGALEvaluator::evaluator()->getCache().clear(); - // this->dumper->clearCache(); + CGALCache::instance()->clear(); #endif dxf_dim_cache.clear(); dxf_cross_cache.clear(); |