diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CGALEvaluator.cc | 5 | ||||
| -rw-r--r-- | src/mainwin.cc | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index d44b5a9..cd8cd55 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -579,12 +579,7 @@ CGAL_Nef_polyhedron CGALEvaluator::evaluateCGALMesh(const PolySet &ps) }; PolyReducer pr(ps); - int numpolygons_before = pr.polygons.size(); pr.reduce(); - int numpolygons_after = pr.polygons.size(); - if (numpolygons_after < numpolygons_before) { - PRINTB("reduce polygons: %d -> %d", numpolygons_before % numpolygons_after); - } return CGAL_Nef_polyhedron(pr.toNef()); #endif #if 0 diff --git a/src/mainwin.cc b/src/mainwin.cc index c0a0bff..f70b451 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -451,6 +451,7 @@ void MainWindow::report_func(const class AbstractNode*, void *vp, int mark) if (percent > thisp->progresswidget->value()) { QMetaObject::invokeMethod(thisp->progresswidget, "setValue", Qt::QueuedConnection, Q_ARG(int, percent)); + QApplication::processEvents(); } if (thisp->progresswidget->wasCanceled()) throw ProgressCancelException(); @@ -749,9 +750,8 @@ void MainWindow::compileCSG(bool procevents) this->progresswidget = new ProgressWidget(this); connect(this->progresswidget, SIGNAL(requestShow()), this, SLOT(showProgress())); - QApplication::processEvents(); - progress_report_prep(root_node, report_func, this); + progress_report_prep(this->root_node, report_func, this); try { CGALEvaluator cgalevaluator(this->tree); PolySetCGALEvaluator psevaluator(cgalevaluator); @@ -1152,13 +1152,10 @@ void MainWindow::actionRenderCGAL() } PRINT("Rendering Polygon Mesh using CGAL..."); - QApplication::processEvents(); this->progresswidget = new ProgressWidget(this); connect(this->progresswidget, SIGNAL(requestShow()), this, SLOT(showProgress())); - QApplication::processEvents(); - progress_report_prep(this->root_node, report_func, this); GuiLocker::lock(); // Will be unlocked in actionRenderCGALDone() |