Fix update progressinfo from thread (#124)

* fix: progress dialog should not update gui in secondary thread

Co-authored-by: Bryn Lloyd <[email protected]>

Core/Morpho.h

@@ -22,10 +22,6 @@
 #include <itkImageRegionIteratorWithIndex.h>
 #include <itkPasteImageFilter.h>
 
-#ifndef NO_OPENMP_SUPPORT
-#	include <omp.h>
-#endif
-
 #include <boost/variant.hpp>
 
 namespace iseg {
@@ -182,11 +178,6 @@ void MorphologicalOperation(iseg::SlicesHandlerInterface* handler, boost::varian
 			progress->SetNumberOfSteps(endslice - startslice);
 		}
 
-#ifndef NO_OPENMP_SUPPORT
-		const auto guard = MakeScopeExit([nthreads = omp_get_num_threads()]() { omp_set_num_threads(nthreads); });
-		omp_set_num_threads(std::max<int>(2, std::thread::hardware_concurrency() / 2));
-#endif
-
 #pragma omp parallel for
 		for (std::int64_t slice = startslice; slice < endslice; ++slice)
 		{

Interface/ProgressDialog.cpp

@@ -20,6 +20,7 @@ ProgressDialog::ProgressDialog(const char* msg, QWidget* parent /*= 0*/)
 
 	m_Count.store(0);
 
+	QObject_connect(this, SIGNAL(OnValueChanged(int)), this, SLOT(UpdateValue(int)));
 	QObject_connect(cancel_button, SIGNAL(clicked()), this, SLOT(Cancel()));
 }
 
@@ -32,7 +33,7 @@ void ProgressDialog::SetNumberOfSteps(int N)
 void ProgressDialog::Increment()
 {
 	m_Count++;
-	m_Progress->setValue(m_Count);
+	OnValueChanged(m_Count);
 }
 
 bool ProgressDialog::WasCanceled() const
@@ -41,6 +42,17 @@ bool ProgressDialog::WasCanceled() const
 }
 
 void ProgressDialog::SetValue(int percent)
+{
+	m_Count = percent;
+	OnValueChanged(percent);
+}
+
+void ProgressDialog::Cancel()
+{
+	m_Canceled = true;
+}
+
+void ProgressDialog::UpdateValue(int percent)
 {
 	if (m_Progress->value() != percent)
 	{
@@ -50,9 +62,4 @@ void ProgressDialog::SetValue(int percent)
 	}
 }
 
-void ProgressDialog::Cancel()
-{
-	m_Canceled = true;
-}
-
 } // namespace iseg

Interface/ProgressDialog.h

@@ -35,8 +35,12 @@ class ISEG_INTERFACE_API ProgressDialog
 	bool WasCanceled() const override;
 	void SetValue(int percent) override;
 
+signals:
+	void OnValueChanged(int);
+
 private slots:
 	void Cancel();
+	void UpdateValue(int);
 
 private:
 	bool m_Canceled = false;