From 1e19e99c7383cdc6c3e6953ca942d9d92d93b75a Mon Sep 17 00:00:00 2001 From: jef Date: Fri, 29 Aug 2008 13:29:04 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.osgeo.org/qgis/trunk@9209 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/app/qgsidentifyresults.cpp | 4 ++-- src/app/qgsmaptoolidentify.cpp | 4 ++-- src/core/qgsvectorlayer.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp index 275e14aad41..e858edc2edd 100644 --- a/src/app/qgsidentifyresults.cpp +++ b/src/app/qgsidentifyresults.cpp @@ -164,8 +164,7 @@ void QgsIdentifyResults::addDerivedAttribute( QTreeWidgetItem * fnode, QString f { 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::expandColumnsToFit() void QgsIdentifyResults::clear() { + mDerivedAttributeRootNodes.clear(); lstResults->clear(); } diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp index 3103f190ee6..0fff1a7e373 100644 --- a/src/app/qgsmaptoolidentify.cpp +++ b/src/app/qgsmaptoolidentify.cpp @@ -263,10 +263,10 @@ void QgsMapToolIdentify::identifyVectorLayer( const QgsPoint& point ) 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(); diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index d2001017a08..efbecbc4289 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -1715,7 +1715,7 @@ int QgsVectorLayer::splitFeatures( const QList& splitLine, bool topolo QgsFeature f; while ( getNextFeature( f ) ) - featureList << f; + featureList << QgsFeature(f); } QgsFeatureList::iterator select_it = featureList.begin();