vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Reinstated progress support for OpenCSG evaluation

felipesanches-svg
Marius Kintel 2012-01-25 23:35:25 +01:00
parent 43f48ef942
commit ca41285391
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainwin.cc
View File

@ -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()