diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-11 07:10:31 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-11 07:10:31 (GMT) |
| commit | 18e97e0bd3f6bda4fdcd17de2a85173ba59b6b00 (patch) | |
| tree | 327ec7c648e0f01a2673672ebe83c3524c971e19 /src/mainwin.cc | |
| parent | 9afeded46c0e9023002dc04ba6131adcb39762b1 (diff) | |
Fixed bug introduced by the new PolySet cache; string filtering done in the wrong place, refactored cache into separate class
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index e4d9684..130e237 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -24,6 +24,7 @@ * */ +#include "PolySetCache.h" #include "MainWindow.h" #include "openscad.h" // examplesdir #include "Preferences.h" @@ -790,7 +791,7 @@ void MainWindow::compileCSG(bool procevents) if (procevents) QApplication::processEvents(); } - psevaluator.printCache(); + PolySetCache::instance()->print(); } catch (ProgressCancelException e) { PRINT("CSG generation cancelled."); @@ -1226,7 +1227,7 @@ void MainWindow::actionRenderCGAL() QHash<std::string, CGAL_Nef_polyhedron> cache; CGALEvaluator evaluator(cache, this->tree); this->root_N = new CGAL_Nef_polyhedron(evaluator.evaluateCGALMesh(*this->root_node)); - evaluator.psevaluator.printCache(); + PolySetCache::instance()->print(); } catch (ProgressCancelException e) { PRINT("Rendering cancelled."); @@ -1497,7 +1498,7 @@ void MainWindow::actionExportImage() void MainWindow::actionFlushCaches() { // FIXME: Polycache -> PolySetEvaluator - PolySetEvaluator::clearCache(); + PolySetCache::instance()->clear(); #ifdef ENABLE_CGAL // FIXME: Flush caches through whatever channels we have // CGALEvaluator::evaluator()->getCache().clear(); |