Skip to content

Commit 6fa26cf

Browse files
committed
[composer] Add a manual 'refresh' button to attribute tables, to refresh table if data has changed outside of QGIS
1 parent a386e89 commit 6fa26cf

File tree

3 files changed

+48
-27
lines changed

3 files changed

+48
-27
lines changed

src/app/composer/qgscomposertablewidget.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,16 @@ void QgsComposerTableWidget::refreshMapComboBox()
9494
}
9595
}
9696

97+
void QgsComposerTableWidget::on_mRefreshPushButton_clicked()
98+
{
99+
if ( !mComposerTable )
100+
{
101+
return;
102+
}
103+
104+
mComposerTable->refreshAttributes();
105+
}
106+
97107
void QgsComposerTableWidget::on_mAttributesPushButton_clicked()
98108
{
99109
if ( !mComposerTable )

src/app/composer/qgscomposertablewidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class QgsComposerTableWidget: public QWidget, private Ui::QgsComposerTableWidget
4040
void refreshMapComboBox();
4141

4242
private slots:
43+
void on_mRefreshPushButton_clicked();
4344
void on_mAttributesPushButton_clicked();
4445
void on_mComposerMapComboBox_activated( int index );
4546
void on_mMaximumColumnsSpinBox_valueChanged( int i );

src/ui/qgscomposertablewidgetbase.ui

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@
6363
<bool>false</bool>
6464
</property>
6565
<layout class="QFormLayout" name="formLayout">
66-
<item row="0" column="0">
66+
<property name="fieldGrowthPolicy">
67+
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
68+
</property>
69+
<item row="1" column="0">
6770
<widget class="QLabel" name="mLayerLabel">
6871
<property name="text">
6972
<string>Layer</string>
@@ -73,14 +76,38 @@
7376
</property>
7477
</widget>
7578
</item>
76-
<item row="8" column="0" colspan="2">
79+
<item row="1" column="1">
80+
<widget class="QgsMapLayerComboBox" name="mLayerComboBox">
81+
<property name="sizePolicy">
82+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
83+
<horstretch>0</horstretch>
84+
<verstretch>0</verstretch>
85+
</sizepolicy>
86+
</property>
87+
</widget>
88+
</item>
89+
<item row="4" column="0" colspan="2">
90+
<widget class="QPushButton" name="mRefreshPushButton">
91+
<property name="text">
92+
<string>Refresh table data</string>
93+
</property>
94+
</widget>
95+
</item>
96+
<item row="5" column="0" colspan="2">
97+
<widget class="QPushButton" name="mAttributesPushButton">
98+
<property name="text">
99+
<string>Attributes...</string>
100+
</property>
101+
</widget>
102+
</item>
103+
<item row="9" column="0" colspan="2">
77104
<widget class="QCheckBox" name="mShowOnlyVisibleFeaturesCheckBox">
78105
<property name="text">
79106
<string>Show only visible features</string>
80107
</property>
81108
</widget>
82109
</item>
83-
<item row="10" column="0">
110+
<item row="11" column="0">
84111
<widget class="QLabel" name="mComposerMapLabel">
85112
<property name="text">
86113
<string>Composer map</string>
@@ -93,17 +120,17 @@
93120
</property>
94121
</widget>
95122
</item>
96-
<item row="10" column="1">
123+
<item row="11" column="1">
97124
<widget class="QComboBox" name="mComposerMapComboBox"/>
98125
</item>
99-
<item row="12" column="0">
126+
<item row="13" column="0">
100127
<widget class="QCheckBox" name="mFeatureFilterCheckBox">
101128
<property name="text">
102129
<string>Filter with</string>
103130
</property>
104131
</widget>
105132
</item>
106-
<item row="12" column="1">
133+
<item row="13" column="1">
107134
<layout class="QHBoxLayout" name="horizontalLayout">
108135
<item>
109136
<widget class="QLineEdit" name="mFeatureFilterEdit"/>
@@ -121,7 +148,7 @@
121148
</item>
122149
</layout>
123150
</item>
124-
<item row="14" column="0">
151+
<item row="15" column="0">
125152
<widget class="QLabel" name="mMaxNumFeaturesLabel">
126153
<property name="text">
127154
<string>Maximum rows</string>
@@ -134,10 +161,10 @@
134161
</property>
135162
</widget>
136163
</item>
137-
<item row="14" column="1">
164+
<item row="15" column="1">
138165
<widget class="QSpinBox" name="mMaximumColumnsSpinBox"/>
139166
</item>
140-
<item row="16" column="0">
167+
<item row="17" column="0">
141168
<widget class="QLabel" name="mMarginLabel">
142169
<property name="text">
143170
<string>Margin</string>
@@ -150,26 +177,9 @@
150177
</property>
151178
</widget>
152179
</item>
153-
<item row="16" column="1">
180+
<item row="17" column="1">
154181
<widget class="QDoubleSpinBox" name="mMarginSpinBox"/>
155182
</item>
156-
<item row="0" column="1">
157-
<widget class="QgsMapLayerComboBox" name="mLayerComboBox">
158-
<property name="sizePolicy">
159-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
160-
<horstretch>0</horstretch>
161-
<verstretch>0</verstretch>
162-
</sizepolicy>
163-
</property>
164-
</widget>
165-
</item>
166-
<item row="4" column="0" colspan="2">
167-
<widget class="QPushButton" name="mAttributesPushButton">
168-
<property name="text">
169-
<string>Attributes...</string>
170-
</property>
171-
</widget>
172-
</item>
173183
</layout>
174184
</widget>
175185
</item>

0 commit comments

Comments
 (0)