Skip to content

Commit b713b4a

Browse files
nyalldawsonnyalldawson
committedSep 28, 2015
Revert "[composer] Add an apply button for atlas settings, prevents"
This reverts commit 7934a92. Change proved to have little value and was too easy to overlook.
·
ltr-3_40archive/master_2
1 parent 8a9009d commit b713b4a

File tree

3 files changed

+95
-55
lines changed

3 files changed

+95
-55
lines changed
 

‎src/app/composer/qgsatlascompositionwidget.cpp

Lines changed: 84 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
4545
mAtlasCoverageLayerComboBox->setFilters( QgsMapLayerProxyModel::VectorLayer );
4646

4747
connect( mAtlasCoverageLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), mAtlasSortFeatureKeyComboBox, SLOT( setLayer( QgsMapLayer* ) ) );
48-
connect( mAtlasCoverageLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), mPageNameWidget, SLOT( setLayer( QgsMapLayer* ) ) );
48+
connect( mAtlasCoverageLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( changeCoverageLayer( QgsMapLayer* ) ) );
49+
connect( mAtlasSortFeatureKeyComboBox, SIGNAL( fieldChanged( QString ) ), this, SLOT( changesSortFeatureField( QString ) ) );
50+
connect( mPageNameWidget, SIGNAL( fieldChanged( QString, bool ) ), this, SLOT( pageNameExpressionChanged( QString, bool ) ) );
4951

5052
// Sort direction
5153
mAtlasSortFeatureDirectionButton->setEnabled( false );
@@ -80,6 +82,27 @@ void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
8082
}
8183
}
8284

85+
void QgsAtlasCompositionWidget::changeCoverageLayer( QgsMapLayer *layer )
86+
{
87+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
88+
if ( !atlasMap )
89+
{
90+
return;
91+
}
92+
93+
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );
94+
95+
if ( !vl )
96+
{
97+
atlasMap->setCoverageLayer( 0 );
98+
}
99+
else
100+
{
101+
atlasMap->setCoverageLayer( vl );
102+
updateAtlasFeatures();
103+
}
104+
}
105+
83106
void QgsAtlasCompositionWidget::on_mAtlasFilenamePatternEdit_editingFinished()
84107
{
85108
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
@@ -133,6 +156,16 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
133156
}
134157
}
135158

159+
void QgsAtlasCompositionWidget::on_mAtlasHideCoverageCheckBox_stateChanged( int state )
160+
{
161+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
162+
if ( !atlasMap )
163+
{
164+
return;
165+
}
166+
atlasMap->setHideCoverage( state == Qt::Checked );
167+
}
168+
136169
void QgsAtlasCompositionWidget::on_mAtlasSingleFileCheckBox_stateChanged( int state )
137170
{
138171
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
@@ -155,6 +188,12 @@ void QgsAtlasCompositionWidget::on_mAtlasSingleFileCheckBox_stateChanged( int st
155188

156189
void QgsAtlasCompositionWidget::on_mAtlasSortFeatureCheckBox_stateChanged( int state )
157190
{
191+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
192+
if ( !atlasMap )
193+
{
194+
return;
195+
}
196+
158197
if ( state == Qt::Checked )
159198
{
160199
mAtlasSortFeatureDirectionButton->setEnabled( true );
@@ -165,6 +204,8 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureCheckBox_stateChanged( int s
165204
mAtlasSortFeatureDirectionButton->setEnabled( false );
166205
mAtlasSortFeatureKeyComboBox->setEnabled( false );
167206
}
207+
atlasMap->setSortFeatures( state == Qt::Checked );
208+
updateAtlasFeatures();
168209
}
169210

170211
void QgsAtlasCompositionWidget::updateAtlasFeatures()
@@ -190,12 +231,31 @@ void QgsAtlasCompositionWidget::updateAtlasFeatures()
190231
QMessageBox::Ok,
191232
QMessageBox::Ok );
192233

234+
//Perhaps atlas preview should be disabled now? If so, it may get annoying if user is editing
235+
//the filter expression and it keeps disabling itself.
236+
return;
237+
}
238+
}
239+
240+
void QgsAtlasCompositionWidget::changesSortFeatureField( QString fieldName )
241+
{
242+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
243+
if ( !atlasMap )
244+
{
193245
return;
194246
}
247+
atlasMap->setSortKeyAttributeName( fieldName );
248+
updateAtlasFeatures();
195249
}
196250

197251
void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int state )
198252
{
253+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
254+
if ( !atlasMap )
255+
{
256+
return;
257+
}
258+
199259
if ( state == Qt::Checked )
200260
{
201261
mAtlasFeatureFilterEdit->setEnabled( true );
@@ -206,36 +266,30 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int
206266
mAtlasFeatureFilterEdit->setEnabled( false );
207267
mAtlasFeatureFilterButton->setEnabled( false );
208268
}
269+
atlasMap->setFilterFeatures( state == Qt::Checked );
270+
updateAtlasFeatures();
209271
}
210272

211-
void QgsAtlasCompositionWidget::on_mApplyConfigButton_clicked()
273+
void QgsAtlasCompositionWidget::pageNameExpressionChanged( QString expression, bool valid )
212274
{
213275
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
214-
if ( !atlasMap )
276+
if ( !atlasMap || ( !valid && !expression.isEmpty() ) )
215277
{
216278
return;
217279
}
218280

219-
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( mAtlasCoverageLayerComboBox->currentLayer() );
220-
if ( !vl )
221-
{
222-
atlasMap->setCoverageLayer( 0 );
223-
}
224-
else
281+
atlasMap->setPageNameExpression( expression );
282+
}
283+
284+
void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_editingFinished()
285+
{
286+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
287+
if ( !atlasMap )
225288
{
226-
atlasMap->setCoverageLayer( vl );
289+
return;
227290
}
228291

229-
atlasMap->setSortFeatures( mAtlasSortFeatureCheckBox->isChecked() );
230-
atlasMap->setSortKeyAttributeName( mAtlasSortFeatureKeyComboBox->currentField() );
231-
Qt::ArrowType at = mAtlasSortFeatureDirectionButton->arrowType();
232-
at = ( at == Qt::UpArrow ) ? Qt::DownArrow : Qt::UpArrow;
233-
atlasMap->setSortAscending( at == Qt::UpArrow );
234-
atlasMap->setFilterFeatures( mAtlasFeatureFilterCheckBox->isChecked() );
235292
atlasMap->setFeatureFilter( mAtlasFeatureFilterEdit->text() );
236-
atlasMap->setPageNameExpression( mPageNameWidget->currentField() );
237-
atlasMap->setHideCoverage( mAtlasHideCoverageCheckBox->isChecked() );
238-
239293
updateAtlasFeatures();
240294
}
241295

@@ -259,6 +313,8 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterButton_clicked()
259313
if ( !expression.isEmpty() )
260314
{
261315
mAtlasFeatureFilterEdit->setText( expression );
316+
atlasMap->setFeatureFilter( mAtlasFeatureFilterEdit->text() );
317+
updateAtlasFeatures();
262318
}
263319
}
264320
}
@@ -268,6 +324,15 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureDirectionButton_clicked()
268324
Qt::ArrowType at = mAtlasSortFeatureDirectionButton->arrowType();
269325
at = ( at == Qt::UpArrow ) ? Qt::DownArrow : Qt::UpArrow;
270326
mAtlasSortFeatureDirectionButton->setArrowType( at );
327+
328+
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
329+
if ( !atlasMap )
330+
{
331+
return;
332+
}
333+
334+
atlasMap->setSortAscending( at == Qt::UpArrow );
335+
updateAtlasFeatures();
271336
}
272337

273338
void QgsAtlasCompositionWidget::updateGuiElements()

‎src/app/composer/qgsatlascompositionwidget.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,19 @@ class QgsAtlasCompositionWidget:
3636

3737
public slots:
3838
void on_mUseAtlasCheckBox_stateChanged( int state );
39+
void changeCoverageLayer( QgsMapLayer* layer );
3940
void on_mAtlasFilenamePatternEdit_editingFinished();
4041
void on_mAtlasFilenameExpressionButton_clicked();
42+
void on_mAtlasHideCoverageCheckBox_stateChanged( int state );
4143
void on_mAtlasSingleFileCheckBox_stateChanged( int state );
4244

4345
void on_mAtlasSortFeatureCheckBox_stateChanged( int state );
46+
void changesSortFeatureField( QString fieldName );
4447
void on_mAtlasSortFeatureDirectionButton_clicked();
48+
void on_mAtlasFeatureFilterEdit_editingFinished();
4549
void on_mAtlasFeatureFilterButton_clicked();
4650
void on_mAtlasFeatureFilterCheckBox_stateChanged( int state );
47-
void on_mApplyConfigButton_clicked();
51+
void pageNameExpressionChanged( QString expression, bool valid );
4852

4953
private slots:
5054
void updateGuiElements();

‎src/ui/composer/qgsatlascompositionwidgetbase.ui

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>310</width>
10-
<height>381</height>
9+
<width>435</width>
10+
<height>596</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -111,8 +111,8 @@
111111
<rect>
112112
<x>0</x>
113113
<y>0</y>
114-
<width>306</width>
115-
<height>352</height>
114+
<width>431</width>
115+
<height>567</height>
116116
</rect>
117117
</property>
118118
<layout class="QVBoxLayout" name="mainLayout">
@@ -139,7 +139,7 @@
139139
<property name="collapsed" stdset="0">
140140
<bool>false</bool>
141141
</property>
142-
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0">
142+
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1,0">
143143
<item row="4" column="2">
144144
<widget class="QToolButton" name="mAtlasSortFeatureDirectionButton">
145145
<property name="toolTip">
@@ -237,30 +237,6 @@
237237
</property>
238238
</widget>
239239
</item>
240-
<item row="5" column="0" colspan="3">
241-
<layout class="QHBoxLayout" name="horizontalLayout">
242-
<item>
243-
<spacer name="horizontalSpacer_3">
244-
<property name="orientation">
245-
<enum>Qt::Horizontal</enum>
246-
</property>
247-
<property name="sizeHint" stdset="0">
248-
<size>
249-
<width>40</width>
250-
<height>20</height>
251-
</size>
252-
</property>
253-
</spacer>
254-
</item>
255-
<item>
256-
<widget class="QPushButton" name="mApplyConfigButton">
257-
<property name="text">
258-
<string>Apply configuration</string>
259-
</property>
260-
</widget>
261-
</item>
262-
</layout>
263-
</item>
264240
</layout>
265241
</widget>
266242
</item>
@@ -342,7 +318,7 @@
342318
<customwidget>
343319
<class>QgsCollapsibleGroupBoxBasic</class>
344320
<extends>QGroupBox</extends>
345-
<header location="global">qgscollapsiblegroupbox.h</header>
321+
<header>qgscollapsiblegroupbox.h</header>
346322
<container>1</container>
347323
</customwidget>
348324
<customwidget>
@@ -363,17 +339,12 @@
363339
</customwidgets>
364340
<tabstops>
365341
<tabstop>mUseAtlasCheckBox</tabstop>
366-
<tabstop>scrollArea</tabstop>
367342
<tabstop>mConfigurationGroup</tabstop>
368343
<tabstop>mAtlasCoverageLayerComboBox</tabstop>
369344
<tabstop>mAtlasHideCoverageCheckBox</tabstop>
370345
<tabstop>mAtlasFeatureFilterCheckBox</tabstop>
371346
<tabstop>mAtlasFeatureFilterEdit</tabstop>
372347
<tabstop>mAtlasFeatureFilterButton</tabstop>
373-
<tabstop>mAtlasSortFeatureCheckBox</tabstop>
374-
<tabstop>mAtlasSortFeatureKeyComboBox</tabstop>
375-
<tabstop>mAtlasSortFeatureDirectionButton</tabstop>
376-
<tabstop>mApplyConfigButton</tabstop>
377348
<tabstop>mOutputGroup</tabstop>
378349
<tabstop>mAtlasFilenamePatternEdit</tabstop>
379350
<tabstop>mAtlasFilenameExpressionButton</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.