[sextante] R algorithms now use raster package by default

qgis · Mar 10, 2013 · 5872d49 · 5872d49
1 parent da40d3d
commit 5872d49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/python/plugins/sextante/r/RAlgorithm.py b/python/plugins/sextante/r/RAlgorithm.py
@@ -91,7 +91,7 @@ def defineCharacteristicsFromFile(self):
         self.commands=[]
         self.showPlots = False
         self.showConsoleOutput = False
-        self.useRasterPackage = False
+        self.useRasterPackage = True
         self.passFileNames = False
         self.verboseCommands = []
         filename = os.path.basename(self.descriptionFile)
@@ -136,8 +136,8 @@ def processParameterLine(self,line):
             self.showPlots = True
             self.addOutput(OutputHTML(RAlgorithm.RPLOTS, "R Plots"));
             return
-        if line.lower().strip().startswith("userasterpackage"):
-            self.useRasterPackage = True
+        if line.lower().strip().startswith("usereadgdal"):
+            self.useRasterPackage = False
             return
         if line.lower().strip().startswith("passfilenames"):
             self.passFileNames = True

diff --git a/python/plugins/sextante/r/scripts/Advanced_Raster_histogram.rsx b/python/plugins/sextante/r/scripts/Advanced_Raster_histogram.rsx
@@ -1,4 +1,3 @@
-##userasterpackage
 ##[Example scripts]=group
 ##Layer = raster
 ##no_data_value = number 0