Reenabled selection from attribute table. Still some problems with 'i…

…nvertSelection'

git-svn-id: http://svn.osgeo.org/qgis/trunk@6672 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/legend/qgslegendlayerfile.cpp

@@ -255,8 +255,8 @@ void QgsLegendLayerFile::table()
     selectionChanged();
 
     // etablish the necessary connections between the table and the vector layer
-    connect(mTableDisplay->table(), SIGNAL(selected(int)), mLyr.layer(), SLOT(select(int)));
-    connect(mTableDisplay->table(), SIGNAL(selectionRemoved()), mLyr.layer(), SLOT(removeSelection()));
+    connect(mTableDisplay->table(), SIGNAL(selected(int, bool)), mLyr.layer(), SLOT(select(int, bool)));
+    connect(mTableDisplay->table(), SIGNAL(selectionRemoved(bool)), mLyr.layer(), SLOT(removeSelection(bool)));
     connect(mTableDisplay->table(), SIGNAL(repaintRequested()), mLyr.layer(), SLOT(triggerRepaint()));
 
     QApplication::restoreOverrideCursor();

src/app/qgsattributetable.cpp

@@ -126,7 +126,7 @@ void QgsAttributeTable::handleChangedSelections()
   if (lockKeyPressed == false)
     {
       //clear the list and evaluate the last selection
-      emit selectionRemoved();
+      emit selectionRemoved(false);
     }
   //if there is no current selection, there is nothing to do
   if (currentSelection() == -1)
@@ -138,7 +138,7 @@ void QgsAttributeTable::handleChangedSelections()
 
   for (int index = cselection.topRow(); index <= cselection.bottomRow(); index++)
     {
-      emit selected(text(index, 0).toInt());
+      emit selected(text(index, 0).toInt(), false);
     }
 
   //don't send the signal repaintRequested() from here
@@ -652,7 +652,6 @@ void QgsAttributeTable::selectRowsWithId(const QgsFeatureIds& ids)
   }
 
   QObject::connect(this, SIGNAL(selectionChanged()), this, SLOT(handleChangedSelections()));
-
   emit repaintRequested();
 }
 

src/app/qgsattributetable.h

@@ -157,9 +157,9 @@ class QgsAttributeTable:public Q3Table
 signals:
 
     /**Is emitted when a row was selected*/
-    void selected(int);
+    void selected(int, bool);
     /**Is emitted when all rows have been deselected*/
-    void selectionRemoved();
+    void selectionRemoved(bool);
     /**Is emmited when a set of related selection and deselection signals have been emitted*/
     void repaintRequested();
 

src/app/qgsattributetabledisplay.cpp

@@ -226,7 +226,6 @@ void QgsAttributeTableDisplay::invertSelection()
 
 void QgsAttributeTableDisplay::removeSelection()
 {
-    mLayer->removeSelection();
     table()->clearSelection();
     mLayer->triggerRepaint();
 }

src/core/qgsvectorlayer.h

@@ -115,12 +115,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
 
   /** Select features found within the search rectangle (in layer's coordinates) */
   void select(QgsRect & rect, bool lock);
-
-  /** Select feature by its ID, optionally emit signal selectionChanged() */
-  void select(int featureId, bool emitSignal = TRUE);
-
-  /** Clear selection */
-  void removeSelection(bool emitSignal = TRUE);
 
   /** Select not selected features and deselect selected ones */
   void invertSelection();
@@ -403,6 +397,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
 
 public slots:
 
+  /** Select feature by its ID, optionally emit signal selectionChanged() */
+  void select(int featureId, bool emitSignal = TRUE);
+
+  /** Clear selection */
+  void removeSelection(bool emitSignal = TRUE);
+
   void triggerRepaint();
 
   /** Update the extents for the layer. This is necessary if features are