Fix use of QWidgets from non-gui thread

nyalldawson · nyalldawson · commit eda3d6e4759a · 2017-12-05T20:05:19.000+10:00
diff --git a/src/gui/processing/qgsprocessingalgorithmdialogbase.cpp b/src/gui/processing/qgsprocessingalgorithmdialogbase.cpp
@@ -24,40 +24,39 @@
 
 ///@cond NOT_STABLE
 
-QgsProcessingAlgorithmDialogFeedback::QgsProcessingAlgorithmDialogFeedback( QgsProcessingAlgorithmDialogBase *dialog )
+QgsProcessingAlgorithmDialogFeedback::QgsProcessingAlgorithmDialogFeedback()
   : QgsProcessingFeedback()
-  , mDialog( dialog )
 {
 }
 
 void QgsProcessingAlgorithmDialogFeedback::setProgressText( const QString &text )
 {
-  mDialog->setProgressText( text );
+  emit progressTextChanged( text );
 }
 
 void QgsProcessingAlgorithmDialogFeedback::reportError( const QString &error )
 {
-  mDialog->reportError( error );
+  emit errorReported( error );
 }
 
 void QgsProcessingAlgorithmDialogFeedback::pushInfo( const QString &info )
 {
-  mDialog->pushInfo( info );
+  emit infoPushed( info );
 }
 
 void QgsProcessingAlgorithmDialogFeedback::pushCommandInfo( const QString &info )
 {
-  mDialog->pushCommandInfo( info );
+  emit commandInfoPushed( info );
 }
 
 void QgsProcessingAlgorithmDialogFeedback::pushDebugInfo( const QString &info )
 {
-  mDialog->pushDebugInfo( info );
+  emit debugInfoPushed( info );
 }
 
 void QgsProcessingAlgorithmDialogFeedback::pushConsoleInfo( const QString &info )
 {
-  mDialog->pushConsoleInfo( info );
+  emit consoleInfoPushed( info );
 }
 
 //
@@ -158,8 +157,14 @@ QVariantMap QgsProcessingAlgorithmDialogBase::getParameterValues() const
 
 QgsProcessingFeedback *QgsProcessingAlgorithmDialogBase::createFeedback()
 {
-  auto feedback = qgis::make_unique< QgsProcessingAlgorithmDialogFeedback >( this );
+  auto feedback = qgis::make_unique< QgsProcessingAlgorithmDialogFeedback >();
   connect( feedback.get(), &QgsProcessingFeedback::progressChanged, this, &QgsProcessingAlgorithmDialogBase::setPercentage );
+  connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::commandInfoPushed, this, &QgsProcessingAlgorithmDialogBase::pushCommandInfo );
+  connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::consoleInfoPushed, this, &QgsProcessingAlgorithmDialogBase::pushConsoleInfo );
+  connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::debugInfoPushed, this, &QgsProcessingAlgorithmDialogBase::pushDebugInfo );
+  connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::errorReported, this, &QgsProcessingAlgorithmDialogBase::reportError );
+  connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::infoPushed, this, &QgsProcessingAlgorithmDialogBase::pushInfo );
+  connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::progressTextChanged, this, &QgsProcessingAlgorithmDialogBase::setProgressText );
   connect( buttonCancel, &QPushButton::clicked, feedback.get(), &QgsProcessingFeedback::cancel );
   return feedback.release();
 }
diff --git a/src/gui/processing/qgsprocessingalgorithmdialogbase.h b/src/gui/processing/qgsprocessingalgorithmdialogbase.h
@@ -46,7 +46,16 @@ class QgsProcessingAlgorithmDialogFeedback : public QgsProcessingFeedback
     /**
      * Constructor for QgsProcessingAlgorithmDialogFeedback.
      */
-    QgsProcessingAlgorithmDialogFeedback( QgsProcessingAlgorithmDialogBase *dialog );
+    QgsProcessingAlgorithmDialogFeedback();
+
+  signals:
+
+    void progressTextChanged( const QString &text );
+    void errorReported( const QString &text );
+    void infoPushed( const QString &text );
+    void commandInfoPushed( const QString &text );
+    void debugInfoPushed( const QString &text );
+    void consoleInfoPushed( const QString &text );
 
   public slots:
 
@@ -57,9 +66,6 @@ class QgsProcessingAlgorithmDialogFeedback : public QgsProcessingFeedback
     void pushDebugInfo( const QString &info ) override;
     void pushConsoleInfo( const QString &info ) override;
 
-  private:
-
-    QgsProcessingAlgorithmDialogBase *mDialog = nullptr;
 
 };
 #endif

Original file line number	Diff line number	Diff line change
`@@ -24,40 +24,39 @@`
`24`	`24`
`25`	`25`	`///@cond NOT_STABLE`
`26`	`26`
`27`		`-QgsProcessingAlgorithmDialogFeedback::QgsProcessingAlgorithmDialogFeedback( QgsProcessingAlgorithmDialogBase *dialog )`
	`27`	`+QgsProcessingAlgorithmDialogFeedback::QgsProcessingAlgorithmDialogFeedback()`
`28`	`28`	`: QgsProcessingFeedback()`
`29`		`- , mDialog( dialog )`
`30`	`29`	`{`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`void QgsProcessingAlgorithmDialogFeedback::setProgressText( const QString &text )`
`34`	`33`	`{`
`35`		`- mDialog->setProgressText( text );`
	`34`	`+ emit progressTextChanged( text );`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`void QgsProcessingAlgorithmDialogFeedback::reportError( const QString &error )`
`39`	`38`	`{`
`40`		`- mDialog->reportError( error );`
	`39`	`+ emit errorReported( error );`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`void QgsProcessingAlgorithmDialogFeedback::pushInfo( const QString &info )`
`44`	`43`	`{`
`45`		`- mDialog->pushInfo( info );`
	`44`	`+ emit infoPushed( info );`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`void QgsProcessingAlgorithmDialogFeedback::pushCommandInfo( const QString &info )`
`49`	`48`	`{`
`50`		`- mDialog->pushCommandInfo( info );`
	`49`	`+ emit commandInfoPushed( info );`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`void QgsProcessingAlgorithmDialogFeedback::pushDebugInfo( const QString &info )`
`54`	`53`	`{`
`55`		`- mDialog->pushDebugInfo( info );`
	`54`	`+ emit debugInfoPushed( info );`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`void QgsProcessingAlgorithmDialogFeedback::pushConsoleInfo( const QString &info )`
`59`	`58`	`{`
`60`		`- mDialog->pushConsoleInfo( info );`
	`59`	`+ emit consoleInfoPushed( info );`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`//`
`@@ -158,8 +157,14 @@ QVariantMap QgsProcessingAlgorithmDialogBase::getParameterValues() const`
`158`	`157`
`159`	`158`	`QgsProcessingFeedback *QgsProcessingAlgorithmDialogBase::createFeedback()`
`160`	`159`	`{`
`161`		`- auto feedback = qgis::make_unique< QgsProcessingAlgorithmDialogFeedback >( this );`
	`160`	`+ auto feedback = qgis::make_unique< QgsProcessingAlgorithmDialogFeedback >();`
`162`	`161`	`connect( feedback.get(), &QgsProcessingFeedback::progressChanged, this, &QgsProcessingAlgorithmDialogBase::setPercentage );`
	`162`	`+ connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::commandInfoPushed, this, &QgsProcessingAlgorithmDialogBase::pushCommandInfo );`
	`163`	`+ connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::consoleInfoPushed, this, &QgsProcessingAlgorithmDialogBase::pushConsoleInfo );`
	`164`	`+ connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::debugInfoPushed, this, &QgsProcessingAlgorithmDialogBase::pushDebugInfo );`
	`165`	`+ connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::errorReported, this, &QgsProcessingAlgorithmDialogBase::reportError );`
	`166`	`+ connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::infoPushed, this, &QgsProcessingAlgorithmDialogBase::pushInfo );`
	`167`	`+ connect( feedback.get(), &QgsProcessingAlgorithmDialogFeedback::progressTextChanged, this, &QgsProcessingAlgorithmDialogBase::setProgressText );`
`163`	`168`	`connect( buttonCancel, &QPushButton::clicked, feedback.get(), &QgsProcessingFeedback::cancel );`
`164`	`169`	`return feedback.release();`
`165`	`170`	`}`