songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add sequential qprogressdialog

This commit is contained in:
Simon Giraudot 2018-03-13 12:57:39 +01:00
parent 9dbdc6c826
commit cea723cbff
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Polyhedron/demo/Polyhedron/include/run_with_qprogressdialog.h
View File

@ -2,16 +2,22 @@
#define RUN_WITH_QPROGRESSDIALOG_H
#include <QProgressDialog>
#include <QThread>
#include <CGAL/Real_timer.h>
#include "Callback_signaler.h"
#ifdef CGAL_LINKED_WITH_TBB
#ifndef TBB_IMPLEMENT_CPP0X
#define TBB_IMPLEMENT_CPP0X 1
#endif
#include <tbb/compat/thread>
typedef CGAL::Parallel_tag Concurrency_tag;
# undef TBB_IMPLEMENT_CPP0X
# define TBB_IMPLEMENT_CPP0X 1
# include <tbb/compat/thread>
#else
typedef CGAL::Sequential_tag Concurrency_tag;
#endif
class Signal_callback
{
public:
@ -89,6 +95,14 @@ public:
template <typename Functor>
void run_with_qprogressdialog (Functor& functor,
const char* title,
QWidget* mainWindow)
{
return run_with_qprogressdialog<Concurrency_tag> (functor, title, mainWindow);
}
template <typename ConcurrencyTag, typename Functor>
void run_with_qprogressdialog (Functor& functor,
const char* title,
QWidget* mainWindow)
@ -108,20 +122,25 @@ void run_with_qprogressdialog (Functor& functor,
signal_callback->signaler.get(), SLOT(cancel()));
#ifdef CGAL_LINKED_WITH_TBB
std::thread thread (functor);
while (*signal_callback->latest_adv != 1. &&
*signal_callback->state)
if (boost::is_convertible<ConcurrencyTag, CGAL::Parallel_tag>::value)
{
QThread::msleep(10);
QApplication::processEvents ();
}
std::thread thread (functor);
while (*signal_callback->latest_adv != 1. &&
*signal_callback->state)
{
QThread::msleep(10);
QApplication::processEvents ();
}
thread.join();
#else // Sequential version
progress.setWindowModality(Qt::WindowModal);
functor();
#endif
thread.join();
}
else
#endif // Sequential version
{
progress.setWindowModality(Qt::WindowModal);
functor();
}
mainWindow->setEnabled(true);
}