[QGIS Commit] r9209 - in trunk/qgis/src: app core

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-08-29 09:29:04 -0400 (Fri, 29 Aug 2008)
New Revision: 9209

Modified:
   trunk/qgis/src/app/qgsidentifyresults.cpp
   trunk/qgis/src/app/qgsmaptoolidentify.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
buxfixes
- use useIntersects in identify (fixes #1251)
- clear node list of identify results on new identify (fixes #1252)
- use feature copies for split features and identify


Modified: trunk/qgis/src/app/qgsidentifyresults.cpp
===================================================================
--- trunk/qgis/src/app/qgsidentifyresults.cpp	2008-08-29 13:25:53 UTC (rev 9208)
+++ trunk/qgis/src/app/qgsidentifyresults.cpp	2008-08-29 13:29:04 UTC (rev 9209)
@@ -164,8 +164,7 @@
 {
   QTreeWidgetItem * daRootNode;
 
-  // Determine if this is the first derived attribute for this
-  // feature or not
+  // Determine if this is the first derived attribute for this feature or not
   if ( mDerivedAttributeRootNodes.find( fnode ) != mDerivedAttributeRootNodes.end() )
   {
     // Reuse existing derived-attribute root node
@@ -243,6 +242,7 @@
 
 void QgsIdentifyResults::clear()
 {
+  mDerivedAttributeRootNodes.clear();
   lstResults->clear();
 }
 

Modified: trunk/qgis/src/app/qgsmaptoolidentify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolidentify.cpp	2008-08-29 13:25:53 UTC (rev 9208)
+++ trunk/qgis/src/app/qgsmaptoolidentify.cpp	2008-08-29 13:29:04 UTC (rev 9209)
@@ -263,10 +263,10 @@
   mFeatureList.clear();
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
-  layer->select( layer->pendingAllAttributesList(), r, true );
+  layer->select( layer->pendingAllAttributesList(), r, true, true );
   QgsFeature f;
   while ( layer->getNextFeature( f ) )
-    mFeatureList << f;
+    mFeatureList << QgsFeature(f);
 
   QApplication::restoreOverrideCursor();
 

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2008-08-29 13:25:53 UTC (rev 9208)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2008-08-29 13:29:04 UTC (rev 9209)
@@ -1715,7 +1715,7 @@
 
     QgsFeature f;
     while ( getNextFeature( f ) )
-      featureList << f;
+      featureList << QgsFeature(f);
   }
 
   QgsFeatureList::iterator select_it = featureList.begin();