Convert radius to a float, not an integer. Fixes heatmaps created with a radius < 1.

nyalldawson · nyalldawson · commit 3b8cbc2adb08 · 2013-03-13T09:07:48.000+11:00
diff --git a/src/plugins/heatmap/heatmap.cpp b/src/plugins/heatmap/heatmap.cpp
@@ -172,7 +172,7 @@ void Heatmap::run()
       rField = d.radiusField();
       myAttrList.append( rField );
       QgsDebugMsg( QString( "Radius Field index received: %1" ).arg( rField ) );
-      
+
       // If not using map units, then calculate a conversion factor to convert the radii to map units
       if ( d.radiusUnit() == HeatmapGui::Meters )
       {
@@ -184,13 +184,13 @@ void Heatmap::run()
       radius = d.radius(); // radius returned by d.radius() is already in map units
       myBuffer = bufferSize( radius, cellsize );
     }
-    
+
     if ( d.weighted() )
     {
       wField = d.weightField();
       myAttrList.append( wField );
     }
-    
+
     // This might have attributes or mightnot have attibutes at all
     // based on the variableRadius() and weighted()
     QgsFeatureIterator fit = inputLayer->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( myAttrList ) );
@@ -222,14 +222,14 @@ void Heatmap::run()
       {
         continue;
       }
-      
+
       // If radius is variable then fetch it and calculate new pixel buffer size
       if ( d.variableRadius() )
       {
         radius = myFeature.attribute( rField ).toFloat() * radiusToMapUnits;
         myBuffer = bufferSize( radius, cellsize );
       }
-      
+
       int blockSize = 2 * myBuffer + 1; //Block SIDE would be more appropriate
       // calculate the pixel position
       unsigned int xPosition, yPosition;
@@ -252,13 +252,13 @@ void Heatmap::run()
         for ( int yp = 0; yp <= myBuffer; yp++ )
         {
           float distance = sqrt( pow( xp, 2.0 ) + pow( yp, 2.0 ) );
-          
+
           // is pixel outside search bandwidth of feature?
           if ( distance > myBuffer )
           {
             continue;
           }
-          
+
           float pixelValue = weight * ( 1 - (( 1 - myDecay ) * distance / myBuffer ) );
 
           // clearing anamolies along the axes
@@ -304,7 +304,7 @@ void Heatmap::run()
  * Local functions
  *
  */
- 
+
 float Heatmap::mapUnitsOf( float meters, QgsCoordinateReferenceSystem layerCrs )
 {
   // Worker to transform metres input to mapunits
@@ -328,8 +328,8 @@ int Heatmap::bufferSize( float radius, float cellsize )
     ++buffer;
   }
   return buffer;
-}    
-    
+}
+
 
 // Unload the plugin by cleaning up the GUI
 void Heatmap::unload()
diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp
@@ -358,7 +358,7 @@ bool HeatmapGui::variableRadius()
 
 float HeatmapGui::radius()
 {
-  float radius = mBufferLineEdit->text().toInt();
+  float radius = mBufferLineEdit->text().toFloat();
   if ( mRadiusUnitCombo->currentIndex() == HeatmapGui::Meters )
   {
     radius = mapUnitsOf( radius, inputVectorLayer()->crs() );

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ void Heatmap::run()`
`172`	`172`	`rField = d.radiusField();`
`173`	`173`	`myAttrList.append( rField );`
`174`	`174`	`QgsDebugMsg( QString( "Radius Field index received: %1" ).arg( rField ) );`
`175`		`-`
	`175`	`+`
`176`	`176`	`// If not using map units, then calculate a conversion factor to convert the radii to map units`
`177`	`177`	`if ( d.radiusUnit() == HeatmapGui::Meters )`
`178`	`178`	`{`
`@@ -184,13 +184,13 @@ void Heatmap::run()`
`184`	`184`	`radius = d.radius(); // radius returned by d.radius() is already in map units`
`185`	`185`	`myBuffer = bufferSize( radius, cellsize );`
`186`	`186`	`}`
`187`		`-`
	`187`	`+`
`188`	`188`	`if ( d.weighted() )`
`189`	`189`	`{`
`190`	`190`	`wField = d.weightField();`
`191`	`191`	`myAttrList.append( wField );`
`192`	`192`	`}`
`193`		`-`
	`193`	`+`
`194`	`194`	`// This might have attributes or mightnot have attibutes at all`
`195`	`195`	`// based on the variableRadius() and weighted()`
`196`	`196`	`QgsFeatureIterator fit = inputLayer->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( myAttrList ) );`
`@@ -222,14 +222,14 @@ void Heatmap::run()`
`222`	`222`	`{`
`223`	`223`	`continue;`
`224`	`224`	`}`
`225`		`-`
	`225`	`+`
`226`	`226`	`// If radius is variable then fetch it and calculate new pixel buffer size`
`227`	`227`	`if ( d.variableRadius() )`
`228`	`228`	`{`
`229`	`229`	`radius = myFeature.attribute( rField ).toFloat() * radiusToMapUnits;`
`230`	`230`	`myBuffer = bufferSize( radius, cellsize );`
`231`	`231`	`}`
`232`		`-`
	`232`	`+`
`233`	`233`	`int blockSize = 2 * myBuffer + 1; //Block SIDE would be more appropriate`
`234`	`234`	`// calculate the pixel position`
`235`	`235`	`unsigned int xPosition, yPosition;`
`@@ -252,13 +252,13 @@ void Heatmap::run()`
`252`	`252`	`for ( int yp = 0; yp <= myBuffer; yp++ )`
`253`	`253`	`{`
`254`	`254`	`float distance = sqrt( pow( xp, 2.0 ) + pow( yp, 2.0 ) );`
`255`		`-`
	`255`	`+`
`256`	`256`	`// is pixel outside search bandwidth of feature?`
`257`	`257`	`if ( distance > myBuffer )`
`258`	`258`	`{`
`259`	`259`	`continue;`
`260`	`260`	`}`
`261`		`-`
	`261`	`+`
`262`	`262`	`float pixelValue = weight * ( 1 - (( 1 - myDecay ) * distance / myBuffer ) );`
`263`	`263`
`264`	`264`	`// clearing anamolies along the axes`
`@@ -304,7 +304,7 @@ void Heatmap::run()`
`304`	`304`	`* Local functions`
`305`	`305`	`*`
`306`	`306`	`*/`
`307`		`-`
	`307`	`+`
`308`	`308`	`float Heatmap::mapUnitsOf( float meters, QgsCoordinateReferenceSystem layerCrs )`
`309`	`309`	`{`
`310`	`310`	`// Worker to transform metres input to mapunits`
`@@ -328,8 +328,8 @@ int Heatmap::bufferSize( float radius, float cellsize )`
`328`	`328`	`++buffer;`
`329`	`329`	`}`
`330`	`330`	`return buffer;`
`331`		`-}`
`332`		`-`
	`331`	`+}`
	`332`	`+`
`333`	`333`
`334`	`334`	`// Unload the plugin by cleaning up the GUI`
`335`	`335`	`void Heatmap::unload()`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ bool HeatmapGui::variableRadius()`
`358`	`358`
`359`	`359`	`float HeatmapGui::radius()`
`360`	`360`	`{`
`361`		`- float radius = mBufferLineEdit->text().toInt();`
	`361`	`+ float radius = mBufferLineEdit->text().toFloat();`
`362`	`362`	`if ( mRadiusUnitCombo->currentIndex() == HeatmapGui::Meters )`
`363`	`363`	`{`
`364`	`364`	`radius = mapUnitsOf( radius, inputVectorLayer()->crs() );`