attribute table: show progress only every 5s

jef-n · jef-n · commit 0c9e60fb6906 · 2012-01-17T14:50:47.000+01:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -831,13 +831,9 @@ void QgsAttributeTableDialog::progress( int i, bool &cancel )
   }
 
   mProgress->setValue( i );
+  mProgress->setLabelText( tr( "%1 features loaded." ).arg( i ) );
 
-  if ( i > 0 && i % 5000 == 0 )
-  {
-    mProgress->setLabelText( tr( "%1 features loaded." ).arg( i ) );
-  }
-
-  if ( !mProgress->isVisible() && mStarted.elapsed() > mProgress->minimumDuration()*5 / 4 )
+  if ( !mProgress->isVisible() && mStarted.elapsed() > mProgress->minimumDuration()* 5 / 4 )
   {
     // for some reason this is sometimes necessary
     mProgress->show();
diff --git a/src/gui/attributetable/qgsattributetablememorymodel.cpp b/src/gui/attributetable/qgsattributetablememorymodel.cpp
@@ -54,22 +54,32 @@ void QgsAttributeTableMemoryModel::loadLayer()
   else
     mFeatureMap.reserve( mLayer->selectedFeatureCount() );
 
-  int n = 0;
+  int i = 0;
+
+  QTime t;
+  t.start();
 
   QgsFeature f;
   while ( mLayer->nextFeature( f ) )
   {
     if ( behaviour == 1 && !mLayer->selectedFeaturesIds().contains( f.id() ) )
       continue;
 
-    mIdRowMap.insert( f.id(), n );
-    mRowIdMap.insert( n, f.id() );
+    mIdRowMap.insert( f.id(), i );
+    mRowIdMap.insert( i, f.id() );
     mFeatureMap.insert( f.id(), f );
 
-    bool cancel = false;
-    emit progress( n++, cancel );
-    if ( cancel )
-      break;
+    i++;
+
+    if ( t.elapsed() > 5000 )
+    {
+      bool cancel = false;
+      emit progress( i, cancel );
+      if ( cancel )
+        break;
+
+      t.restart();
+    }
   }
 
   emit finished();
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -247,17 +247,27 @@ void QgsAttributeTableModel::loadLayer()
   int behaviour = settings.value( "/qgis/attributeTableBehaviour", 0 ).toInt();
   int i = 0;
 
+  QTime t;
+  t.start();
+
   if ( behaviour == 1 )
   {
     beginInsertRows( QModelIndex(), 0, mLayer->selectedFeatureCount() - 1 );
     foreach( QgsFeatureId fid, mLayer->selectedFeaturesIds() )
     {
       featureAdded( fid, false );
 
-      bool cancel = false;
-      emit progress( i++, cancel );
-      if ( cancel )
-        break;
+      i++;
+
+      if ( t.elapsed() > 5000 )
+      {
+        bool cancel = false;
+        emit progress( i, cancel );
+        if ( cancel )
+          break;
+
+        t.restart();
+      }
     }
     emit finished();
     endInsertRows();
@@ -278,10 +288,15 @@ void QgsAttributeTableModel::loadLayer()
     {
       featureAdded( f.id() );
 
-      bool cancel = false;
-      emit progress( i, cancel );
-      if ( cancel )
-        break;
+      if ( t.elapsed() > 5000 )
+      {
+        bool cancel = false;
+        emit progress( i, cancel );
+        if ( cancel )
+          break;
+
+        t.restart();
+      }
     }
     emit finished();
   }
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -74,22 +74,16 @@ void QgsAttributeTableView::setCanvasAndLayer( QgsMapCanvas *canvas, QgsVectorLa
     mModel = new QgsAttributeTableMemoryModel( canvas, layer );
   }
 
-  connect( mModel, SIGNAL( finished() ), this, SLOT( setFilterModel() ) );
-
-  connect( mModel, SIGNAL( progress(int, bool&) ), this, SIGNAL( progress(int, bool&) ) );
+  connect( mModel, SIGNAL( progress( int, bool& ) ), this, SIGNAL( progress( int, bool& ) ) );
   connect( mModel, SIGNAL( finished() ), this, SIGNAL( finished() ) );
   mModel->loadLayer();
 
-  delete oldModel;
-  delete filterModel;
-}
-
-void QgsAttributeTableView::setFilterModel()
-{
-  disconnect( mModel, SIGNAL( finished() ), this, SLOT( setFilterModel() ) );
   mFilterModel = new QgsAttributeTableFilterModel( mModel->layer() );
   mFilterModel->setSourceModel( mModel );
   setModel( mFilterModel );
+
+  delete oldModel;
+  delete filterModel;
 }
 
 QgsAttributeTableView::~QgsAttributeTableView()
diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h
@@ -50,9 +50,6 @@ class GUI_EXPORT QgsAttributeTableView : public QTableView
 
     void contextMenuEvent( QContextMenuEvent* );
 
-  public slots:
-    void setFilterModel();
-
   signals:
     void willShowContextMenu( QMenu* menu, QModelIndex atIndex );
 

Original file line number	Diff line number	Diff line change
`@@ -831,13 +831,9 @@ void QgsAttributeTableDialog::progress( int i, bool &cancel )`
`831`	`831`	`}`
`832`	`832`
`833`	`833`	`mProgress->setValue( i );`
	`834`	`+ mProgress->setLabelText( tr( "%1 features loaded." ).arg( i ) );`
`834`	`835`
`835`		`- if ( i > 0 && i % 5000 == 0 )`
`836`		`- {`
`837`		`- mProgress->setLabelText( tr( "%1 features loaded." ).arg( i ) );`
`838`		`- }`
`839`		`-`
`840`		`- if ( !mProgress->isVisible() && mStarted.elapsed() > mProgress->minimumDuration()*5 / 4 )`
	`836`	`+ if ( !mProgress->isVisible() && mStarted.elapsed() > mProgress->minimumDuration()* 5 / 4 )`
`841`	`837`	`{`
`842`	`838`	`// for some reason this is sometimes necessary`
`843`	`839`	`mProgress->show();`