add option to load result to canvas in Heatmap plugin (fix #6645)

alexbruy · alexbruy · commit 8c97462b087f · 2014-03-28T12:12:18.000+02:00
diff --git a/src/plugins/heatmap/heatmap.cpp b/src/plugins/heatmap/heatmap.cpp
@@ -312,8 +312,11 @@ void Heatmap::run()
     // Finally close the dataset
     GDALClose(( GDALDatasetH ) heatmapDS );
 
-    // Open the file in QGIS window
-    mQGisIface->addRasterLayer( d.outputFilename(), QFileInfo( d.outputFilename() ).baseName() );
+    // Open the file in QGIS window if requested
+    if ( d.addToCanvas() )
+    {
+      mQGisIface->addRasterLayer( d.outputFilename(), QFileInfo( d.outputFilename() ).baseName() );
+    }
   }
 }
 
diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp
@@ -106,6 +106,8 @@ HeatmapGui::HeatmapGui( QWidget* parent, Qt::WindowFlags fl, QMap<QString, QVari
   updateBBox();
   updateSize();
 
+  mAddToCanvas->setChecked( s.value( "/Heatmap/addToCanvas", true ).toBool() );
+
   blockAllSignals( false );
 
   //finally set right the ok button
@@ -215,6 +217,7 @@ void HeatmapGui::saveSettings()
   // Save persistent settings
   QSettings s;
   s.setValue( "/Heatmap/lastFormat", QVariant( formatCombo->currentIndex() ) );
+  s.setValue( "/Heatmap/addToCanvas", mAddToCanvas->isChecked() );
 
   // Store temporary settings, which only apply to this session
   mHeatmapSessionSettings->insert( QString( "lastInputLayer" ), QVariant( inputLayerCombo->itemData( inputLayerCombo->currentIndex() ) ) );
@@ -582,6 +585,11 @@ int HeatmapGui::weightField()
   return weightFieldCombo->itemData( weightindex ).toInt();
 }
 
+bool HeatmapGui::addToCanvas()
+{
+  return mAddToCanvas->isChecked();
+}
+
 QString HeatmapGui::outputFilename()
 {
   QString outputFileName;
diff --git a/src/plugins/heatmap/heatmapgui.h b/src/plugins/heatmap/heatmapgui.h
@@ -60,6 +60,9 @@ class HeatmapGui : public QDialog, private Ui::HeatmapGuiBase
     /** Returns the attrinute field for weighted heat */
     int weightField();
 
+    /** Returns state of the add to canvas checkbox*/
+    bool addToCanvas();
+
     /** Returns the output filename/path */
     QString outputFilename();
 
diff --git a/src/plugins/heatmap/heatmapguibase.ui b/src/plugins/heatmap/heatmapguibase.ui
@@ -303,6 +303,13 @@
      </layout>
     </widget>
    </item>
+   <item row="5" column="0" colspan="3">
+    <widget class="QCheckBox" name="mAddToCanvas">
+     <property name="text">
+      <string>Add generated file to map</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>

Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,11 @@ void Heatmap::run()`
`312`	`312`	`// Finally close the dataset`
`313`	`313`	`GDALClose(( GDALDatasetH ) heatmapDS );`
`314`	`314`
`315`		`- // Open the file in QGIS window`
`316`		`- mQGisIface->addRasterLayer( d.outputFilename(), QFileInfo( d.outputFilename() ).baseName() );`
	`315`	`+ // Open the file in QGIS window if requested`
	`316`	`+ if ( d.addToCanvas() )`
	`317`	`+ {`
	`318`	`+ mQGisIface->addRasterLayer( d.outputFilename(), QFileInfo( d.outputFilename() ).baseName() );`
	`319`	`+ }`
`317`	`320`	`}`
`318`	`321`	`}`
`319`	`322`