Fix for composer attribute table

mhugent · mhugent · commit 0e2ffec722bd · 2010-11-28T12:46:06.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14776 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp
@@ -66,6 +66,7 @@ QgsComposerTableWidget::QgsComposerTableWidget( QgsComposerAttributeTable* table
   mLayerComboBox->blockSignals( false );
 
   updateGuiElements();
+  on_mComposerMapComboBox_activated( mComposerMapComboBox->currentIndex() );
 
   if ( mComposerTable )
   {
@@ -123,7 +124,7 @@ void QgsComposerTableWidget::on_mAttributesPushButton_clicked()
   }
 }
 
-void QgsComposerTableWidget::on_mComposerMapComboBox_currentIndexChanged( int index )
+void QgsComposerTableWidget::on_mComposerMapComboBox_activated( int index )
 {
   if ( !mComposerTable )
   {
diff --git a/src/app/composer/qgscomposertablewidget.h b/src/app/composer/qgscomposertablewidget.h
@@ -40,7 +40,7 @@ class QgsComposerTableWidget: public QWidget, private Ui::QgsComposerTableWidget
   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 );
diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
@@ -132,11 +132,11 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap>& at
 
   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;

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ QgsComposerTableWidget::QgsComposerTableWidget( QgsComposerAttributeTable* table`
`66`	`66`	`mLayerComboBox->blockSignals( false );`
`67`	`67`
`68`	`68`	`updateGuiElements();`
	`69`	`+ on_mComposerMapComboBox_activated( mComposerMapComboBox->currentIndex() );`
`69`	`70`
`70`	`71`	`if ( mComposerTable )`
`71`	`72`	`{`
`@@ -123,7 +124,7 @@ void QgsComposerTableWidget::on_mAttributesPushButton_clicked()`
`123`	`124`	`}`
`124`	`125`	`}`
`125`	`126`
`126`		`-void QgsComposerTableWidget::on_mComposerMapComboBox_currentIndexChanged( int index )`
	`127`	`+void QgsComposerTableWidget::on_mComposerMapComboBox_activated( int index )`
`127`	`128`	`{`
`128`	`129`	`if ( !mComposerTable )`
`129`	`130`	`{`
Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,11 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap>& at`
`132`	`132`
`133`	`133`	`if ( mDisplayAttributes.size() < 1 )`
`134`	`134`	`{`
`135`		`- mVectorLayer->select( mVectorLayer->pendingAllAttributesList(), selectionRect, false, true );`
	`135`	`+ mVectorLayer->select( mVectorLayer->pendingAllAttributesList(), selectionRect, mShowOnlyVisibleFeatures, mShowOnlyVisibleFeatures );`
`136`	`136`	`}`
`137`	`137`	`else`
`138`	`138`	`{`
`139`		`- mVectorLayer->select( mDisplayAttributes.toList(), selectionRect, false, true );`
	`139`	`+ mVectorLayer->select( mDisplayAttributes.toList(), selectionRect, mShowOnlyVisibleFeatures, mShowOnlyVisibleFeatures );`
`140`	`140`	`}`
`141`	`141`	`QgsFeature f;`
`142`	`142`	`int counter = 0;`