[FEATURE] Possibility to search in attribute table within selected records only.

wonder · wonder · commit 783b8cb97169 · 2009-05-14T16:40:06.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10792 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/attributetable/qgsattributetabledialog.cpp b/src/app/attributetable/qgsattributetabledialog.cpp
@@ -424,19 +424,35 @@ void QgsAttributeTableDialog::doSearch( QString searchString )
   }
 
   QApplication::setOverrideCursor( Qt::WaitCursor );
-
   mSelectedFeatures.clear();
-  mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), false );
+  
+  if ( cbxSearchSelectedOnly->isChecked() )
+  {
+    QgsFeatureList selectedFeatures = mLayer->selectedFeatures();
+    for (QgsFeatureList::ConstIterator it = selectedFeatures.begin(); it != selectedFeatures.end(); ++it)
+    {
+      if ( searchTree->checkAgainst( mLayer->pendingFields(), it->attributeMap() ) )
+        mSelectedFeatures << it->id();
 
-  QgsFeature f;
-  while ( mLayer->nextFeature( f ) )
+      // check if there were errors during evaluating
+      if ( searchTree->hasError() )
+        break;
+    } 
+  }
+  else
   {
-    if ( searchTree->checkAgainst( mLayer->pendingFields(), f.attributeMap() ) )
-      mSelectedFeatures << f.id();
+    mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), false );
+    QgsFeature f;
+
+    while ( mLayer->nextFeature( f ) )
+    {
+      if ( searchTree->checkAgainst( mLayer->pendingFields(), f.attributeMap() ) )
+        mSelectedFeatures << f.id();
 
-    // check if there were errors during evaluating
-    if ( searchTree->hasError() )
-      break;
+      // check if there were errors during evaluating
+      if ( searchTree->hasError() )
+        break;
+    }
   }
 
   QApplication::restoreOverrideCursor();
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -219,6 +219,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QCheckBox" name="cbxSearchSelectedOnly" >
+       <property name="text" >
+        <string>Search selected records only</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer>
        <property name="orientation" >
