Fix for bug where projects loaded slowly

mhugent · mhugent · commit bcdcc68cd032 · 2008-02-08T08:07:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8117 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2669,6 +2669,7 @@ void QgisApp::fileOpen()
     delete openFileDialog;
 
     // clear out any stuff from previous project
+    mMapCanvas->freeze(true);
     removeAllLayers();
 
     QgsProject::instance()->filename( fullPath );
@@ -2704,6 +2705,9 @@ void QgisApp::fileOpen()
           tr("") + "\n" + QString::fromLocal8Bit( e.what() ) );
       QgsDebugMsg("BAD LAYERS FOUND");
     }
+
+    mMapCanvas->freeze(false);
+    mMapCanvas->refresh();
   }
 
 } // QgisApp::fileOpen
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -546,7 +546,10 @@ void QgsPostgresProvider::select(QgsAttributeList fetchAttributes,
   ready = true;
   PQexec(connection, (const char *)(declare.utf8()));
 
-  mFeatureQueue.empty();
+  while(!mFeatureQueue.empty())
+    {
+      mFeatureQueue.pop();
+    }
   mFirstFetch = true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2669,6 +2669,7 @@ void QgisApp::fileOpen()`
`2669`	`2669`	`delete openFileDialog;`
`2670`	`2670`
`2671`	`2671`	`// clear out any stuff from previous project`
	`2672`	`+ mMapCanvas->freeze(true);`
`2672`	`2673`	`removeAllLayers();`
`2673`	`2674`
`2674`	`2675`	`QgsProject::instance()->filename( fullPath );`
`@@ -2704,6 +2705,9 @@ void QgisApp::fileOpen()`
`2704`	`2705`	`tr("") + "\n" + QString::fromLocal8Bit( e.what() ) );`
`2705`	`2706`	`QgsDebugMsg("BAD LAYERS FOUND");`
`2706`	`2707`	`}`
	`2708`	`+`
	`2709`	`+ mMapCanvas->freeze(false);`
	`2710`	`+ mMapCanvas->refresh();`
`2707`	`2711`	`}`
`2708`	`2712`
`2709`	`2713`	`} // QgisApp::fileOpen`