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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-11-28 04:46:06 -0800 (Sun, 28 Nov 2010)
New Revision: 14776

Modified:
   trunk/qgis/src/app/composer/qgscomposertablewidget.cpp
   trunk/qgis/src/app/composer/qgscomposertablewidget.h
   trunk/qgis/src/core/composer/qgscomposerattributetable.cpp
Log:
Fix for composer attribute table

Modified: trunk/qgis/src/app/composer/qgscomposertablewidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposertablewidget.cpp	2010-11-27 11:26:05 UTC (rev 14775)
+++ trunk/qgis/src/app/composer/qgscomposertablewidget.cpp	2010-11-28 12:46:06 UTC (rev 14776)
@@ -66,6 +66,7 @@
   mLayerComboBox->blockSignals( false );
 
   updateGuiElements();
+  on_mComposerMapComboBox_activated( mComposerMapComboBox->currentIndex() );
 
   if ( mComposerTable )
   {
@@ -123,7 +124,7 @@
   }
 }
 
-void QgsComposerTableWidget::on_mComposerMapComboBox_currentIndexChanged( int index )
+void QgsComposerTableWidget::on_mComposerMapComboBox_activated( int index )
 {
   if ( !mComposerTable )
   {

Modified: trunk/qgis/src/app/composer/qgscomposertablewidget.h
===================================================================
--- trunk/qgis/src/app/composer/qgscomposertablewidget.h	2010-11-27 11:26:05 UTC (rev 14775)
+++ trunk/qgis/src/app/composer/qgscomposertablewidget.h	2010-11-28 12:46:06 UTC (rev 14776)
@@ -40,7 +40,7 @@
   private slots:
     void on_mLayerComboBox_currentIndexChanged( int index );
     void on_mAttributesPushButton_clicked();
-    void on_mComposerMapComboBox_currentIndexChanged( int index );
+    void on_mComposerMapComboBox_activated( int index );
     void on_mMaximumColumnsSpinBox_valueChanged( int i );
     void on_mMarginSpinBox_valueChanged( double d );
     void on_mGridStrokeWidthSpinBox_valueChanged( double d );

Modified: trunk/qgis/src/core/composer/qgscomposerattributetable.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerattributetable.cpp	2010-11-27 11:26:05 UTC (rev 14775)
+++ trunk/qgis/src/core/composer/qgscomposerattributetable.cpp	2010-11-28 12:46:06 UTC (rev 14776)
@@ -132,11 +132,11 @@
 
   if ( mDisplayAttributes.size() < 1 )
   {
-    mVectorLayer->select( mVectorLayer->pendingAllAttributesList(), selectionRect, false, true );
+    mVectorLayer->select( mVectorLayer->pendingAllAttributesList(), selectionRect, mShowOnlyVisibleFeatures, mShowOnlyVisibleFeatures );
   }
   else
   {
-    mVectorLayer->select( mDisplayAttributes.toList(), selectionRect, false, true );
+    mVectorLayer->select( mDisplayAttributes.toList(), selectionRect, mShowOnlyVisibleFeatures, mShowOnlyVisibleFeatures );
   }
   QgsFeature f;
   int counter = 0;