Skip to content

Commit 7094c19

Browse files
committed
Ticket #6643 Interpolation plugin: the option to load a layer after analyses should be on by default
1 parent 59fe8fd commit 7094c19

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

src/plugins/interpolation/qgsinterpolationdialog.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,10 @@ void QgsInterpolationDialog::on_buttonBox_accepted()
201201
mNumberOfRowsSpinBox->value(), mCellsizeXSpinBox->value(), mCellSizeYSpinBox->value() );
202202
if ( theWriter.writeFile( true ) == 0 )
203203
{
204-
mIface->addRasterLayer( fileName, QFileInfo( fileName ).baseName() );
204+
if ( mAddResultToProjectCheckBox->isChecked() )
205+
{
206+
mIface->addRasterLayer( fileName, QFileInfo( fileName ).baseName() );
207+
}
205208
accept();
206209
}
207210

src/plugins/interpolation/qgsinterpolationdialogbase.ui

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>748</width>
9+
<width>772</width>
1010
<height>382</height>
1111
</rect>
1212
</property>
@@ -137,10 +137,10 @@
137137
</property>
138138
</widget>
139139
</item>
140-
<item row="0" column="2" colspan="4">
140+
<item row="0" column="2">
141141
<widget class="QComboBox" name="mInterpolationMethodComboBox"/>
142142
</item>
143-
<item row="0" column="6">
143+
<item row="0" column="5">
144144
<widget class="QToolButton" name="mConfigureInterpolationButton">
145145
<property name="text">
146146
<string>...</string>
@@ -168,7 +168,7 @@
168168
</property>
169169
</widget>
170170
</item>
171-
<item row="1" column="3" colspan="2">
171+
<item row="1" column="3">
172172
<widget class="QLabel" name="mNumberOfRowsLabel">
173173
<property name="text">
174174
<string>Number of rows</string>
@@ -178,7 +178,7 @@
178178
</property>
179179
</widget>
180180
</item>
181-
<item row="1" column="5" colspan="2">
181+
<item row="1" column="4" colspan="2">
182182
<widget class="QSpinBox" name="mNumberOfRowsSpinBox">
183183
<property name="maximum">
184184
<number>10000000</number>
@@ -205,7 +205,7 @@
205205
</property>
206206
</widget>
207207
</item>
208-
<item row="2" column="3" colspan="2">
208+
<item row="2" column="3">
209209
<widget class="QLabel" name="mCellsizeYLabel">
210210
<property name="text">
211211
<string>Cellsize Y</string>
@@ -215,7 +215,7 @@
215215
</property>
216216
</widget>
217217
</item>
218-
<item row="2" column="5" colspan="2">
218+
<item row="2" column="4" colspan="2">
219219
<widget class="QDoubleSpinBox" name="mCellSizeYSpinBox">
220220
<property name="decimals">
221221
<number>5</number>
@@ -225,7 +225,7 @@
225225
</property>
226226
</widget>
227227
</item>
228-
<item row="3" column="0" colspan="7">
228+
<item row="3" column="0" colspan="5">
229229
<layout class="QGridLayout" name="gridLayout_2">
230230
<item row="0" column="0">
231231
<widget class="QLabel" name="mXMinLabel">
@@ -288,7 +288,7 @@
288288
</item>
289289
</layout>
290290
</item>
291-
<item row="5" column="0">
291+
<item row="4" column="0">
292292
<widget class="QLabel" name="mOutputFileLabel">
293293
<property name="text">
294294
<string>Output file </string>
@@ -298,17 +298,27 @@
298298
</property>
299299
</widget>
300300
</item>
301-
<item row="5" column="1" colspan="5">
301+
<item row="4" column="1" colspan="4">
302302
<widget class="QLineEdit" name="mOutputFileLineEdit"/>
303303
</item>
304-
<item row="5" column="6">
304+
<item row="4" column="5">
305305
<widget class="QToolButton" name="mOutputFileButton">
306306
<property name="text">
307307
<string>...</string>
308308
</property>
309309
</widget>
310310
</item>
311-
<item row="6" column="1">
311+
<item row="5" column="0" colspan="3">
312+
<widget class="QCheckBox" name="mAddResultToProjectCheckBox">
313+
<property name="text">
314+
<string>Add result to project</string>
315+
</property>
316+
<property name="checked">
317+
<bool>true</bool>
318+
</property>
319+
</widget>
320+
</item>
321+
<item row="6" column="0">
312322
<spacer name="verticalSpacer">
313323
<property name="orientation">
314324
<enum>Qt::Vertical</enum>

0 commit comments

Comments
 (0)