126 changes: 63 additions & 63 deletions src/plugins/heatmap/heatmapgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ HeatmapGui::HeatmapGui( QWidget* parent, Qt::WFlags fl, QMap<QString, QVariant>*

mHeatmapSessionSettings = temporarySettings;

// Adding point layers to the mInputVectorCombo
// Adding point layers to the inputLayerCombo
QString defaultLayer = mHeatmapSessionSettings->value( QString( "lastInputLayer" ) ).toString();
int defaultLayerIndex = 0;
bool usingLastInputLayer = false;
Expand All @@ -60,7 +60,7 @@ HeatmapGui::HeatmapGui( QWidget* parent, Qt::WFlags fl, QMap<QString, QVariant>*
continue;

currentIndex++;
mInputVectorCombo->addItem( vl->name(), vl->id() );
inputLayerCombo->addItem( vl->name(), vl->id() );
if ( vl->id() == defaultLayer )
{
// if this layer is the same layer as a heatmap was last generated using,
Expand All @@ -70,9 +70,9 @@ HeatmapGui::HeatmapGui( QWidget* parent, Qt::WFlags fl, QMap<QString, QVariant>*
}
}

mInputVectorCombo->setCurrentIndex( defaultLayerIndex );
inputLayerCombo->setCurrentIndex( defaultLayerIndex );

// Adding GDAL drivers with CREATE to the mFormatCombo
// Adding GDAL drivers with CREATE to formatCombo
int myTiffIndex = -1;
int myIndex = -1;
GDALAllRegister();
Expand All @@ -88,7 +88,7 @@ HeatmapGui::HeatmapGui( QWidget* parent, Qt::WFlags fl, QMap<QString, QVariant>*
++myIndex;
QString myLongName = nthDriver->GetMetadataItem( GDAL_DMD_LONGNAME );
// Add LongName text, shortname variant; GetDescription actually gets the shortname
mFormatCombo->addItem( myLongName, QVariant( nthDriver->GetDescription() ) );
formatCombo->addItem( myLongName, QVariant( nthDriver->GetDescription() ) );
// Add the drivers and their extensions to a map for filename correction
mExtensionMap.insert( nthDriver->GetDescription(), nthDriver->GetMetadataItem( GDAL_DMD_EXTENSION ) );
if ( myLongName == "GeoTIFF" )
Expand All @@ -100,7 +100,7 @@ HeatmapGui::HeatmapGui( QWidget* parent, Qt::WFlags fl, QMap<QString, QVariant>*
//Restore choice of output format from last run
QSettings s;
int defaultFormatIndex = s.value( "/Heatmap/lastFormat", myTiffIndex ).toInt();
mFormatCombo->setCurrentIndex( defaultFormatIndex );
formatCombo->setCurrentIndex( defaultFormatIndex );

restoreSettings( usingLastInputLayer );
updateBBox();
Expand All @@ -118,9 +118,9 @@ HeatmapGui::~HeatmapGui()

void HeatmapGui::blockAllSignals( bool b )
{
mBufferLineEdit->blockSignals( b );
mInputVectorCombo->blockSignals( b );
mRowsSpinBox->blockSignals( b );
bufferLineEdit->blockSignals( b );
inputLayerCombo->blockSignals( b );
rowsSpinBox->blockSignals( b );
radiusFieldCombo->blockSignals( b );
advancedGroupBox->blockSignals( b );
kernelShapeCombo->blockSignals( b );
Expand All @@ -131,7 +131,7 @@ void HeatmapGui::blockAllSignals( bool b )
* Private Slots
*
*/
void HeatmapGui::on_mButtonBox_accepted()
void HeatmapGui::on_buttonBox_accepted()
{
saveSettings();
accept();
Expand All @@ -151,17 +151,17 @@ void HeatmapGui::restoreSettings( bool usingLastInputLayer )
populateFields();

// Radius controls
mBufferLineEdit->setText( mHeatmapSessionSettings->value( QString( "lastRadius" ) ).toString() );
mRadiusUnitCombo->setCurrentIndex( mHeatmapSessionSettings->value( QString( "lastRadiusUnit" ) ).toInt() );
bufferLineEdit->setText( mHeatmapSessionSettings->value( QString( "lastRadius" ) ).toString() );
radiusUnitCombo->setCurrentIndex( mHeatmapSessionSettings->value( QString( "lastRadiusUnit" ) ).toInt() );

// Raster size controls
mRows = mHeatmapSessionSettings->value( QString( "lastRows" ) ).toInt();
mRowsSpinBox->setValue( mRows );
rowsSpinBox->setValue( mRows );

// Data defined radius controls
if ( mHeatmapSessionSettings->value( QString( "useRadius" ) ).toBool() )
{
useRadius->setChecked( true );
radiusFieldCheckBox->setChecked( true );
radiusFieldUnitCombo->setCurrentIndex( mHeatmapSessionSettings->value( QString( "radiusFieldUnit" ) ).toInt() );
// Default to same radius field as last run
QString prevRadiusField = mHeatmapSessionSettings->value( QString( "radiusField" ) ).toString();
Expand All @@ -178,7 +178,7 @@ void HeatmapGui::restoreSettings( bool usingLastInputLayer )
// Data defined weight controls
if ( mHeatmapSessionSettings->value( QString( "useWeight" ) ).toBool() )
{
useWeight->setChecked( true );
weightFieldCheckBox->setChecked( true );
// Default to same weight field as last run
QString prevWeightField = mHeatmapSessionSettings->value( QString( "weightField" ) ).toString();
for ( int idx = 0; idx < weightFieldCombo->count(); ++idx )
Expand All @@ -194,58 +194,58 @@ void HeatmapGui::restoreSettings( bool usingLastInputLayer )
else
{
// Default to estimated radius
mBufferLineEdit->setText( QString::number( estimateRadius() ) );
bufferLineEdit->setText( QString::number( estimateRadius() ) );
}

// Kernel setting - not layer specific
if ( mHeatmapSessionSettings->value( QString( "lastKernel" ) ).toInt() )
{
kernelShapeCombo->setCurrentIndex( mHeatmapSessionSettings->value( QString( "lastKernel" ) ).toInt() );
mDecayLineEdit->setText( mHeatmapSessionSettings->value( QString( "decayRatio" ) ).toString() );
mDecayLineEdit->setEnabled( advancedGroupBox->isChecked() && kernelShapeCombo->currentIndex() == Heatmap::Triangular );
decayLineEdit->setText( mHeatmapSessionSettings->value( QString( "decayRatio" ) ).toString() );
decayLineEdit->setEnabled( advancedGroupBox->isChecked() && kernelShapeCombo->currentIndex() == Heatmap::Triangular );
}
}

void HeatmapGui::saveSettings()
{
// Save persistant settings
QSettings s;
s.setValue( "/Heatmap/lastFormat", QVariant( mFormatCombo->currentIndex() ) );
s.setValue( "/Heatmap/lastFormat", QVariant( formatCombo->currentIndex() ) );

// Store temporary settings, which only apply to this session
mHeatmapSessionSettings->insert( QString( "lastInputLayer" ), QVariant( mInputVectorCombo->itemData( mInputVectorCombo->currentIndex() ) ) );
mHeatmapSessionSettings->insert( QString( "lastRadius" ), QVariant( mBufferLineEdit->text().toDouble() ) );
mHeatmapSessionSettings->insert( QString( "lastRadiusUnit" ), QVariant( mRadiusUnitCombo->currentIndex() ) );
mHeatmapSessionSettings->insert( QString( "lastInputLayer" ), QVariant( inputLayerCombo->itemData( inputLayerCombo->currentIndex() ) ) );
mHeatmapSessionSettings->insert( QString( "lastRadius" ), QVariant( bufferLineEdit->text().toDouble() ) );
mHeatmapSessionSettings->insert( QString( "lastRadiusUnit" ), QVariant( radiusUnitCombo->currentIndex() ) );
mHeatmapSessionSettings->insert( QString( "advancedEnabled" ), QVariant( advancedGroupBox->isChecked() ) );
mHeatmapSessionSettings->insert( QString( "lastRows" ), QVariant( mRowsSpinBox->value() ) );
mHeatmapSessionSettings->insert( QString( "lastRows" ), QVariant( rowsSpinBox->value() ) );
mHeatmapSessionSettings->insert( QString( "lastKernel" ), QVariant( kernelShapeCombo->currentIndex() ) );
mHeatmapSessionSettings->insert( QString( "useRadius" ), QVariant( useRadius->isChecked() ) );
mHeatmapSessionSettings->insert( QString( "useRadius" ), QVariant( radiusFieldCheckBox->isChecked() ) );
mHeatmapSessionSettings->insert( QString( "radiusField" ), QVariant( radiusFieldCombo->currentText() ) );
mHeatmapSessionSettings->insert( QString( "radiusFieldUnit" ), QVariant( radiusFieldUnitCombo->currentIndex() ) );
mHeatmapSessionSettings->insert( QString( "useWeight" ), QVariant( useWeight->isChecked() ) );
mHeatmapSessionSettings->insert( QString( "useWeight" ), QVariant( weightFieldCheckBox->isChecked() ) );
mHeatmapSessionSettings->insert( QString( "weightField" ), QVariant( weightFieldCombo->currentText() ) );
mHeatmapSessionSettings->insert( QString( "decayRatio" ), QVariant( mDecayLineEdit->text() ) );
mHeatmapSessionSettings->insert( QString( "decayRatio" ), QVariant( decayLineEdit->text() ) );
}

void HeatmapGui::on_mButtonBox_rejected()
void HeatmapGui::on_buttonBox_rejected()
{
reject();
}

void HeatmapGui::on_mButtonBox_helpRequested()
void HeatmapGui::on_buttonBox_helpRequested()
{
QgsContextHelp::run( metaObject()->className() );
}

void HeatmapGui::on_mBrowseButton_clicked()
void HeatmapGui::on_browseButton_clicked()
{
QSettings s;
QString lastDir = s.value( "/Heatmap/lastOutputDir", "" ).toString();

QString outputFilename = QFileDialog::getSaveFileName( 0, tr( "Save Heatmap as:" ), lastDir );
if ( !outputFilename.isEmpty() )
{
mOutputRasterLineEdit->setText( outputFilename );
outputRasterLineEdit->setText( outputFilename );
QFileInfo outputFileInfo( outputFilename );
QDir outputDir = outputFileInfo.absoluteDir();
if ( outputDir.exists() )
Expand All @@ -257,7 +257,7 @@ void HeatmapGui::on_mBrowseButton_clicked()
enableOrDisableOkButton();
}

void HeatmapGui::on_mOutputRasterLineEdit_editingFinished()
void HeatmapGui::on_outputRasterLineEdit_editingFinished()
{
enableOrDisableOkButton();
}
Expand All @@ -267,7 +267,7 @@ void HeatmapGui::on_advancedGroupBox_toggled( bool enabled )
if ( enabled )
{
// if there are no layers point layers then show error dialog and toggle
if ( mInputVectorCombo->count() == 0 )
if ( inputLayerCombo->count() == 0 )
{
QMessageBox::information( 0, tr( "No valid layers found!" ), tr( "Advanced options cannot be enabled." ) );
advancedGroupBox->setChecked( false );
Expand All @@ -276,23 +276,23 @@ void HeatmapGui::on_advancedGroupBox_toggled( bool enabled )
// if there are layers then populate fields
populateFields();
updateBBox();
mDecayLineEdit->setEnabled( kernelShapeCombo->currentIndex() == Heatmap::Triangular );
decayLineEdit->setEnabled( kernelShapeCombo->currentIndex() == Heatmap::Triangular );
}
}

void HeatmapGui::on_mRowsSpinBox_editingFinished()
void HeatmapGui::on_rowsSpinBox_editingFinished()
{
mRows = mRowsSpinBox->value();
mRows = rowsSpinBox->value();
mYcellsize = mBBox.height() / mRows;
mXcellsize = mYcellsize;
mColumns = max( mBBox.width() / mXcellsize, 1 );

updateSize();
}

void HeatmapGui::on_mColumnsSpinBox_editingFinished()
void HeatmapGui::on_columnsSpinBox_editingFinished()
{
mColumns = mColumnsSpinBox->value();
mColumns = columnsSpinBox->value();
mXcellsize = mBBox.width() / mColumns;
mYcellsize = mXcellsize;
mRows = max( mBBox.height() / mYcellsize, 1 );
Expand Down Expand Up @@ -328,7 +328,7 @@ void HeatmapGui::on_radiusFieldUnitCombo_currentIndexChanged( int index )
QgsDebugMsg( QString( "Unit index set to %1" ).arg( index ) );
}

void HeatmapGui::on_mRadiusUnitCombo_currentIndexChanged( int index )
void HeatmapGui::on_radiusUnitCombo_currentIndexChanged( int index )
{
Q_UNUSED( index );
QgsDebugMsg( QString( "Unit index set to %1" ).arg( index ) );
Expand Down Expand Up @@ -360,7 +360,7 @@ double HeatmapGui::estimateRadius()

double estimate = maxExtent / 30;

if ( mRadiusUnitCombo->currentIndex() == HeatmapGui::Meters )
if ( radiusUnitCombo->currentIndex() == HeatmapGui::Meters )
{
// metres selected, so convert estimate from map units
QgsCoordinateReferenceSystem layerCrs = inputLayer->crs();
Expand All @@ -372,12 +372,12 @@ double HeatmapGui::estimateRadius()
return floor( estimate / tens + 0.5 ) * tens;
}

void HeatmapGui::on_mInputVectorCombo_currentIndexChanged( int index )
void HeatmapGui::on_inputLayerCombo_currentIndexChanged( int index )
{
Q_UNUSED( index );

// Set initial value for radius field based on layer's extent
mBufferLineEdit->setText( QString::number( estimateRadius() ) );
bufferLineEdit->setText( QString::number( estimateRadius() ) );

updateBBox();

Expand All @@ -395,7 +395,7 @@ void HeatmapGui::on_radiusFieldCombo_currentIndexChanged( int index )
QgsDebugMsg( QString( "Radius Field index changed to %1" ).arg( index ) );
}

void HeatmapGui::on_mBufferLineEdit_editingFinished()
void HeatmapGui::on_bufferLineEdit_editingFinished()
{
updateBBox();
}
Expand All @@ -404,7 +404,7 @@ void HeatmapGui::on_kernelShapeCombo_currentIndexChanged( int index )
{
Q_UNUSED( index );
// Only enable the decay edit if the kernel shape is set to triangular
mDecayLineEdit->setEnabled( index == Heatmap::Triangular );
decayLineEdit->setEnabled( index == Heatmap::Triangular );
}

/*
Expand All @@ -415,13 +415,13 @@ void HeatmapGui::on_kernelShapeCombo_currentIndexChanged( int index )
void HeatmapGui::enableOrDisableOkButton()
{
bool enabled = true;
QString filename = mOutputRasterLineEdit->text();
QString filename = outputRasterLineEdit->text();
QFileInfo theFileInfo( filename );
if ( filename.isEmpty() || !theFileInfo.dir().exists() || ( mInputVectorCombo->count() == 0 ) )
if ( filename.isEmpty() || !theFileInfo.dir().exists() || ( inputLayerCombo->count() == 0 ) )
{
enabled = false;
}
mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( enabled );
buttonBox->button( QDialogButtonBox::Ok )->setEnabled( enabled );
}

void HeatmapGui::populateFields()
Expand All @@ -447,8 +447,8 @@ void HeatmapGui::populateFields()

void HeatmapGui::updateSize()
{
mRowsSpinBox->setValue( mRows );
mColumnsSpinBox->setValue( mColumns );
rowsSpinBox->setValue( mRows );
columnsSpinBox->setValue( mColumns );
cellXLineEdit->setText( QString::number( mXcellsize ) );
cellYLineEdit->setText( QString::number( mYcellsize ) );
}
Expand All @@ -464,7 +464,7 @@ void HeatmapGui::updateBBox()
QgsCoordinateReferenceSystem layerCrs = inputLayer->crs();

double radiusInMapUnits = 0.0;
if ( useRadius->isChecked() )
if ( radiusFieldCheckBox->isChecked() )
{
double maxInField = inputLayer->maximumValue( radiusFieldCombo->itemData( radiusFieldCombo->currentIndex() ).toInt() ).toDouble();

Expand All @@ -479,12 +479,12 @@ void HeatmapGui::updateBBox()
}
else
{
double radiusValue = mBufferLineEdit->text().toDouble();
if ( mRadiusUnitCombo->currentIndex() == HeatmapGui::Meters )
double radiusValue = bufferLineEdit->text().toDouble();
if ( radiusUnitCombo->currentIndex() == HeatmapGui::Meters )
{
radiusInMapUnits = mapUnitsOf( radiusValue, layerCrs );
}
else if ( mRadiusUnitCombo->currentIndex() == HeatmapGui::MapUnits )
else if ( radiusUnitCombo->currentIndex() == HeatmapGui::MapUnits )
{
radiusInMapUnits = radiusValue;
}
Expand Down Expand Up @@ -526,18 +526,18 @@ double HeatmapGui::mapUnitsOf( double meters, QgsCoordinateReferenceSystem layer

bool HeatmapGui::weighted()
{
return useWeight->isChecked();
return weightFieldCheckBox->isChecked();
}

bool HeatmapGui::variableRadius()
{
return useRadius->isChecked();
return radiusFieldCheckBox->isChecked();
}

double HeatmapGui::radius()
{
double radius = mBufferLineEdit->text().toDouble();
if ( mRadiusUnitCombo->currentIndex() == HeatmapGui::Meters )
double radius = bufferLineEdit->text().toDouble();
if ( radiusUnitCombo->currentIndex() == HeatmapGui::Meters )
{
radius = mapUnitsOf( radius, inputVectorLayer()->crs() );
}
Expand All @@ -546,11 +546,11 @@ double HeatmapGui::radius()

int HeatmapGui::radiusUnit()
{
if ( useRadius->isChecked() )
if ( radiusFieldCheckBox->isChecked() )
{
return radiusFieldUnitCombo->currentIndex();
}
return mRadiusUnitCombo->currentIndex();
return radiusUnitCombo->currentIndex();
}

int HeatmapGui::kernelShape()
Expand All @@ -560,7 +560,7 @@ int HeatmapGui::kernelShape()

double HeatmapGui::decayRatio()
{
return mDecayLineEdit->text().toDouble();
return decayLineEdit->text().toDouble();
}

int HeatmapGui::radiusField()
Expand All @@ -582,7 +582,7 @@ QString HeatmapGui::outputFilename()
QString outputFileName;
QString outputFormat;

outputFileName = mOutputRasterLineEdit->text();
outputFileName = outputRasterLineEdit->text();
QFileInfo myFileInfo( outputFileName );
if ( outputFileName.isEmpty() || !myFileInfo.dir().exists() )
{
Expand All @@ -591,7 +591,7 @@ QString HeatmapGui::outputFilename()
}

// The output format
outputFormat = mFormatCombo->itemData( mFormatCombo->currentIndex() ).toString();
outputFormat = formatCombo->itemData( formatCombo->currentIndex() ).toString();
// append the file format if the suffix is empty
QString suffix = myFileInfo.suffix();
if ( suffix.isEmpty() )
Expand All @@ -614,12 +614,12 @@ QString HeatmapGui::outputFilename()

QString HeatmapGui::outputFormat()
{
return mFormatCombo->itemData( mFormatCombo->currentIndex() ).toString();
return formatCombo->itemData( formatCombo->currentIndex() ).toString();
}

QgsVectorLayer* HeatmapGui::inputVectorLayer()
{
QString myLayerId = mInputVectorCombo->itemData( mInputVectorCombo->currentIndex() ).toString();
QString myLayerId = inputLayerCombo->itemData( inputLayerCombo->currentIndex() ).toString();

QgsVectorLayer* inputLayer = qobject_cast<QgsVectorLayer *>( QgsMapLayerRegistry::instance()->mapLayer( myLayerId ) );
if ( !inputLayer )
Expand Down
20 changes: 10 additions & 10 deletions src/plugins/heatmap/heatmapgui.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,21 @@ class HeatmapGui : public QDialog, private Ui::HeatmapGuiBase
{ return a > b ? a : b; }

private slots:
void on_mButtonBox_accepted();
void on_mButtonBox_rejected();
void on_mButtonBox_helpRequested();
void on_mBrowseButton_clicked();
void on_mOutputRasterLineEdit_editingFinished();
void on_buttonBox_accepted();
void on_buttonBox_rejected();
void on_buttonBox_helpRequested();
void on_browseButton_clicked();
void on_outputRasterLineEdit_editingFinished();
void on_advancedGroupBox_toggled( bool enabled );
void on_mRowsSpinBox_editingFinished();
void on_mColumnsSpinBox_editingFinished();
void on_rowsSpinBox_editingFinished();
void on_columnsSpinBox_editingFinished();
void on_cellXLineEdit_editingFinished();
void on_cellYLineEdit_editingFinished();
void on_radiusFieldCombo_currentIndexChanged( int index );
void on_radiusFieldUnitCombo_currentIndexChanged( int index );
void on_mRadiusUnitCombo_currentIndexChanged( int index );
void on_mInputVectorCombo_currentIndexChanged( int index );
void on_mBufferLineEdit_editingFinished();
void on_radiusUnitCombo_currentIndexChanged( int index );
void on_inputLayerCombo_currentIndexChanged( int index );
void on_bufferLineEdit_editingFinished();
void on_kernelShapeCombo_currentIndexChanged( int index );
};

Expand Down
84 changes: 42 additions & 42 deletions src/plugins/heatmap/heatmapguibase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mInputLabel">
<widget class="QLabel" name="inputLabel">
<property name="text">
<string>Input point layer</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="mInputVectorCombo"/>
<widget class="QComboBox" name="inputLayerCombo"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mOutputLabel">
<widget class="QLabel" name="outputLabel">
<property name="text">
<string>Output raster</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mOutputRasterLineEdit"/>
<widget class="QLineEdit" name="outputRasterLineEdit"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="mBrowseButton">
<widget class="QPushButton" name="browseButton">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
Expand All @@ -57,38 +57,38 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mFormatLabel">
<widget class="QLabel" name="formatLabel">
<property name="text">
<string>Output format</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QComboBox" name="mFormatCombo"/>
<widget class="QComboBox" name="formatCombo"/>
</item>
<item row="9" column="0" colspan="3">
<widget class="QDialogButtonBox" name="mButtonBox">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mRadiusLabel">
<widget class="QLabel" name="radiusLabel">
<property name="text">
<string>Radius</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="mBufferLineEdit">
<widget class="QLineEdit" name="bufferLineEdit">
<property name="text">
<string>10</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QComboBox" name="mRadiusUnitCombo">
<widget class="QComboBox" name="radiusUnitCombo">
<item>
<property name="text">
<string>meters</string>
Expand Down Expand Up @@ -130,7 +130,7 @@
<string>Rows</string>
</property>
<property name="buddy">
<cstring>mRowsSpinBox</cstring>
<cstring>rowsSpinBox</cstring>
</property>
</widget>
</item>
Expand All @@ -150,7 +150,7 @@
<string>Columns</string>
</property>
<property name="buddy">
<cstring>mColumnsSpinBox</cstring>
<cstring>columnsSpinBox</cstring>
</property>
</widget>
</item>
Expand All @@ -165,7 +165,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="mRowsSpinBox">
<widget class="QSpinBox" name="rowsSpinBox">
<property name="minimum">
<number>1</number>
</property>
Expand All @@ -175,7 +175,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="QSpinBox" name="mColumnsSpinBox">
<widget class="QSpinBox" name="columnsSpinBox">
<property name="minimum">
<number>1</number>
</property>
Expand All @@ -195,7 +195,7 @@
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<widget class="QCheckBox" name="useRadius">
<widget class="QCheckBox" name="radiusFieldCheckBox">
<property name="text">
<string>Use radius from field</string>
</property>
Expand Down Expand Up @@ -226,7 +226,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="useWeight">
<widget class="QCheckBox" name="weightFieldCheckBox">
<property name="text">
<string>Use weight from field</string>
</property>
Expand All @@ -240,7 +240,7 @@
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="mDecayLineEdit">
<widget class="QLineEdit" name="decayLineEdit">
<property name="enabled">
<bool>false</bool>
</property>
Expand All @@ -250,7 +250,7 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mDecayLabel">
<widget class="QLabel" name="decayLabel">
<property name="text">
<string>Decay ratio</string>
</property>
Expand Down Expand Up @@ -286,7 +286,7 @@
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="kernelShapeLable">
<widget class="QLabel" name="kernelShapeLabel">
<property name="text">
<string>Kernel shape</string>
</property>
Expand All @@ -300,29 +300,29 @@
</layout>
</widget>
<tabstops>
<tabstop>mInputVectorCombo</tabstop>
<tabstop>mOutputRasterLineEdit</tabstop>
<tabstop>mFormatCombo</tabstop>
<tabstop>mBufferLineEdit</tabstop>
<tabstop>mRadiusUnitCombo</tabstop>
<tabstop>inputLayerCombo</tabstop>
<tabstop>outputRasterLineEdit</tabstop>
<tabstop>formatCombo</tabstop>
<tabstop>bufferLineEdit</tabstop>
<tabstop>radiusUnitCombo</tabstop>
<tabstop>advancedGroupBox</tabstop>
<tabstop>mRowsSpinBox</tabstop>
<tabstop>mColumnsSpinBox</tabstop>
<tabstop>rowsSpinBox</tabstop>
<tabstop>columnsSpinBox</tabstop>
<tabstop>cellXLineEdit</tabstop>
<tabstop>cellYLineEdit</tabstop>
<tabstop>kernelShapeCombo</tabstop>
<tabstop>useRadius</tabstop>
<tabstop>radiusFieldCheckBox</tabstop>
<tabstop>radiusFieldCombo</tabstop>
<tabstop>radiusFieldUnitCombo</tabstop>
<tabstop>useWeight</tabstop>
<tabstop>weightFieldCheckBox</tabstop>
<tabstop>weightFieldCombo</tabstop>
<tabstop>mDecayLineEdit</tabstop>
<tabstop>mButtonBox</tabstop>
<tabstop>decayLineEdit</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>mButtonBox</sender>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>HeatmapGuiBase</receiver>
<slot>accept()</slot>
Expand All @@ -338,7 +338,7 @@
</hints>
</connection>
<connection>
<sender>mButtonBox</sender>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>HeatmapGuiBase</receiver>
<slot>reject()</slot>
Expand All @@ -354,7 +354,7 @@
</hints>
</connection>
<connection>
<sender>useWeight</sender>
<sender>weightFieldCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>weightFieldCombo</receiver>
<slot>setEnabled(bool)</slot>
Expand All @@ -370,7 +370,7 @@
</hints>
</connection>
<connection>
<sender>useRadius</sender>
<sender>radiusFieldCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>radiusFieldCombo</receiver>
<slot>setEnabled(bool)</slot>
Expand All @@ -386,7 +386,7 @@
</hints>
</connection>
<connection>
<sender>useRadius</sender>
<sender>radiusFieldCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>radiusFieldUnitCombo</receiver>
<slot>setEnabled(bool)</slot>
Expand All @@ -402,9 +402,9 @@
</hints>
</connection>
<connection>
<sender>useRadius</sender>
<sender>radiusFieldCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>mBufferLineEdit</receiver>
<receiver>bufferLineEdit</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
Expand All @@ -418,9 +418,9 @@
</hints>
</connection>
<connection>
<sender>useRadius</sender>
<sender>radiusFieldCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>mRadiusUnitCombo</receiver>
<receiver>radiusUnitCombo</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
Expand All @@ -434,9 +434,9 @@
</hints>
</connection>
<connection>
<sender>useRadius</sender>
<sender>radiusFieldCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>mRadiusLabel</receiver>
<receiver>radiusLabel</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
Expand Down