Follow up to 4240807

qgis · Jul 1, 2013 · cfebe8f · cfebe8f
1 parent 4240807
commit cfebe8f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp
@@ -280,7 +280,7 @@ void HeatmapGui::on_advancedGroupBox_toggled( bool enabled )
   }
 }
 
-void HeatmapGui::on_rowsSpinBox_editingFinished()
+void HeatmapGui::on_rowsSpinBox_valueChanged()
 {
   mRows = rowsSpinBox->value();
   mYcellsize = mBBox.height() / mRows;
@@ -290,7 +290,7 @@ void HeatmapGui::on_rowsSpinBox_editingFinished()
   updateSize();
 }
 
-void HeatmapGui::on_columnsSpinBox_editingFinished()
+void HeatmapGui::on_columnsSpinBox_valueChanged()
 {
   mColumns = columnsSpinBox->value();
   mXcellsize = mBBox.width() / mColumns;
@@ -304,8 +304,8 @@ void HeatmapGui::on_cellXLineEdit_editingFinished()
 {
   mXcellsize = cellXLineEdit->text().toDouble();
   mYcellsize = mXcellsize;
-  mRows = max( mBBox.height() / mYcellsize, 1 );
+  mRows = max( round( mBBox.height() / mYcellsize ), 1 );
-  mColumns = max( mBBox.width() / mXcellsize, 1 );
+  mColumns = max( round( mBBox.width() / mXcellsize ), 1 );
 
   updateSize();
 }
@@ -314,8 +314,8 @@ void HeatmapGui::on_cellYLineEdit_editingFinished()
 {
   mYcellsize = cellYLineEdit->text().toDouble();
   mXcellsize = mYcellsize;
-  mRows = max( mBBox.height() / mYcellsize, 1 );
+  mRows = max( round( mBBox.height() / mYcellsize ), 1 );
-  mColumns = max( mBBox.width() / mXcellsize, 1 );
+  mColumns = max( round( mBBox.width() / mXcellsize ), 1 );
 
   updateSize();
 }

diff --git a/src/plugins/heatmap/heatmapgui.h b/src/plugins/heatmap/heatmapgui.h
@@ -131,8 +131,8 @@ class HeatmapGui : public QDialog, private Ui::HeatmapGuiBase
     void on_browseButton_clicked();
     void on_outputRasterLineEdit_editingFinished();
     void on_advancedGroupBox_toggled( bool enabled );
-    void on_rowsSpinBox_editingFinished();
+    void on_rowsSpinBox_valueChanged();
-    void on_columnsSpinBox_editingFinished();
+    void on_columnsSpinBox_valueChanged();
     void on_cellXLineEdit_editingFinished();
     void on_cellYLineEdit_editingFinished();
     void on_radiusFieldCombo_currentIndexChanged( int index );

diff --git a/src/plugins/heatmap/heatmapguibase.ui b/src/plugins/heatmap/heatmapguibase.ui
@@ -166,6 +166,9 @@
         </item>
         <item row="0" column="1">
          <widget class="QSpinBox" name="rowsSpinBox">
+          <property name="keyboardTracking">
+           <bool>false</bool>
+          </property>
           <property name="minimum">
            <number>1</number>
           </property>
@@ -176,6 +179,9 @@
         </item>
         <item row="0" column="3">
          <widget class="QSpinBox" name="columnsSpinBox">
+          <property name="keyboardTracking">
+           <bool>false</bool>
+          </property>
           <property name="minimum">
            <number>1</number>
           </property>