Skip to content

Commit

Permalink
Ticket #6643 Interpolation plugin: the option to load a layer after a…
Browse files Browse the repository at this point in the history
…nalyses should be on by default
  • Loading branch information
mhugent committed Nov 8, 2012
1 parent 59fe8fd commit 7094c19
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 13 deletions.
5 changes: 4 additions & 1 deletion src/plugins/interpolation/qgsinterpolationdialog.cpp
Expand Up @@ -201,7 +201,10 @@ void QgsInterpolationDialog::on_buttonBox_accepted()
mNumberOfRowsSpinBox->value(), mCellsizeXSpinBox->value(), mCellSizeYSpinBox->value() );
if ( theWriter.writeFile( true ) == 0 )
{
mIface->addRasterLayer( fileName, QFileInfo( fileName ).baseName() );
if ( mAddResultToProjectCheckBox->isChecked() )
{
mIface->addRasterLayer( fileName, QFileInfo( fileName ).baseName() );
}
accept();
}

Expand Down
34 changes: 22 additions & 12 deletions src/plugins/interpolation/qgsinterpolationdialogbase.ui
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>748</width>
<width>772</width>
<height>382</height>
</rect>
</property>
Expand Down Expand Up @@ -137,10 +137,10 @@
</property>
</widget>
</item>
<item row="0" column="2" colspan="4">
<item row="0" column="2">
<widget class="QComboBox" name="mInterpolationMethodComboBox"/>
</item>
<item row="0" column="6">
<item row="0" column="5">
<widget class="QToolButton" name="mConfigureInterpolationButton">
<property name="text">
<string>...</string>
Expand Down Expand Up @@ -168,7 +168,7 @@
</property>
</widget>
</item>
<item row="1" column="3" colspan="2">
<item row="1" column="3">
<widget class="QLabel" name="mNumberOfRowsLabel">
<property name="text">
<string>Number of rows</string>
Expand All @@ -178,7 +178,7 @@
</property>
</widget>
</item>
<item row="1" column="5" colspan="2">
<item row="1" column="4" colspan="2">
<widget class="QSpinBox" name="mNumberOfRowsSpinBox">
<property name="maximum">
<number>10000000</number>
Expand All @@ -205,7 +205,7 @@
</property>
</widget>
</item>
<item row="2" column="3" colspan="2">
<item row="2" column="3">
<widget class="QLabel" name="mCellsizeYLabel">
<property name="text">
<string>Cellsize Y</string>
Expand All @@ -215,7 +215,7 @@
</property>
</widget>
</item>
<item row="2" column="5" colspan="2">
<item row="2" column="4" colspan="2">
<widget class="QDoubleSpinBox" name="mCellSizeYSpinBox">
<property name="decimals">
<number>5</number>
Expand All @@ -225,7 +225,7 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="7">
<item row="3" column="0" colspan="5">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="mXMinLabel">
Expand Down Expand Up @@ -288,7 +288,7 @@
</item>
</layout>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="mOutputFileLabel">
<property name="text">
<string>Output file </string>
Expand All @@ -298,17 +298,27 @@
</property>
</widget>
</item>
<item row="5" column="1" colspan="5">
<item row="4" column="1" colspan="4">
<widget class="QLineEdit" name="mOutputFileLineEdit"/>
</item>
<item row="5" column="6">
<item row="4" column="5">
<widget class="QToolButton" name="mOutputFileButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="0" colspan="3">
<widget class="QCheckBox" name="mAddResultToProjectCheckBox">
<property name="text">
<string>Add result to project</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand Down

0 comments on commit 7094c19

Please sign in to comment.