Use proxy progress task for Oracle db table scan

qgis · Aug 20, 2018 · 6e9e0e8 · 6e9e0e8
1 parent aa62f3a
commit 6e9e0e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/providers/oracle/qgsoraclesourceselect.cpp b/src/providers/oracle/qgsoraclesourceselect.cpp
@@ -29,6 +29,7 @@ email                : jef at norbit dot de
 #include "qgsvectorlayer.h"
 #include "qgsoraclecolumntypethread.h"
 #include "qgssettings.h"
+#include "qgsproxyprogresstask.h"
 
 #include <QFileDialog>
 #include <QInputDialog>
@@ -516,15 +517,20 @@ void QgsOracleSourceSelect::on_btnConnect_clicked()
       QgsOracleConn::restrictToSchema( cmbConnections->currentText() ),
       uri.useEstimatedMetadata(),
       cbxAllowGeometrylessTables->isChecked() );
+  mColumnTypeTask = new QgsProxyProgressTask( tr( "Scanning tables for %1" ).arg( cmbConnections->currentText() ) );
+  QgsApplication::taskManager()->addTask( mColumnTypeTask );
 
   connect( mColumnTypeThread, &QgsOracleColumnTypeThread::setLayerType,
            this, &QgsOracleSourceSelect::setLayerType );
   connect( mColumnTypeThread, &QThread::finished,
            this, &QgsOracleSourceSelect::columnThreadFinished );
   connect( mColumnTypeThread, &QgsOracleColumnTypeThread::progress,
-           this, &QgsOracleSourceSelect::progress );
+           mColumnTypeTask, [ = ]( int i, int n )
+  {
+    mColumnTypeTask->setProxyProgress( 100.0 * static_cast< double >( i ) / n );
+  } );
   connect( mColumnTypeThread, &QgsOracleColumnTypeThread::progressMessage,
-           this, &QgsOracleSourceSelect::progressMessage );
+           this, &QgsAbstractDataSourceWidget::progressMessage );
 
   btnConnect->setText( tr( "Stop" ) );
   mColumnTypeThread->start();
@@ -565,6 +571,10 @@ void QgsOracleSourceSelect::columnThreadFinished()
 
   delete mColumnTypeThread;
   mColumnTypeThread = nullptr;
+
+  mColumnTypeTask->finalize( true );
+  mColumnTypeTask = nullptr;
+
   btnConnect->setText( tr( "Connect" ) );
 
   finishList();

diff --git a/src/providers/oracle/qgsoraclesourceselect.h b/src/providers/oracle/qgsoraclesourceselect.h
@@ -36,6 +36,7 @@ class QStringList;
 class QgsOracleColumnTypeThread;
 class QgisApp;
 class QgsOracleSourceSelect;
+class QgsProxyProgressTask;
 
 class QgsOracleSourceSelectDelegate : public QItemDelegate
 {
@@ -98,8 +99,6 @@ class QgsOracleSourceSelect : public QgsAbstractDataSourceWidget, private Ui::Qg
 
   signals:
     void addDatabaseLayers( QStringList const &layerPathList, QString const &providerKey );
-    void progress( int, int );
-    void progressMessage( QString );
 
   public slots:
     //! Determines the tables the user selected and closes the dialog
@@ -158,6 +157,7 @@ class QgsOracleSourceSelect : public QgsAbstractDataSourceWidget, private Ui::Qg
     QStringList mColumnLabels;
     // Our thread for doing long running queries
     QgsOracleColumnTypeThread *mColumnTypeThread = nullptr;
+    QgsProxyProgressTask *mColumnTypeTask = nullptr;
     QgsDataSourceUri mConnInfo;
     QStringList mSelectedTables;
     // Storage for the range of layer type icons