python/plugins/GdalTools/tools/doInfo.py

@@ -70,15 +70,15 @@ def doCopyLine( self ):
       output = ''
       items = self.rasterInfoList.selectedItems()
       for r in items:
-        output.append( r.text() + "\n" )
+        output += r.text() + "\n"
       if output:
         clipboard = QApplication.clipboard()
         clipboard.setText( output )
 
   def doCopyAll( self ):
       output = ''
       for r in range( self.rasterInfoList.count() ):
-        output.append( self.rasterInfoList.item( r ).text() + "\n" )
+        output += self.rasterInfoList.item( r ).text() + "\n"
       if output:
         clipboard = QApplication.clipboard()
         clipboard.setText( output )

python/plugins/processing/gui/Help2Html.py

@@ -53,6 +53,9 @@ def getHtmlFile(self, alg, helpFile):
         for out in self.alg.outputs:
             s += '<h3>' + out.description + '</h3>\n'
             s += '<p>' + self.getDescription(out.name) + '</p>\n'
+        s += '<br>'
+        s += '<p align="right">Algorithm author: ' + self.getDescription(self.ALG_CREATOR) + '</p>'
+        s += '<p align="right">Help author: ' + self.getDescription(self.ALG_HELP_CREATOR) + '</p>'
         s += '</body></html>'
         filename = tempFolder() + os.sep + 'temphelp.html'
         tempHtml = codecs.open(filename, 'w', encoding='utf-8')

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() );
+    }
   }
 }
 

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;

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();
 

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>