Revert "[sextante] removed "lib" prefix in saga calls"

This reverts commit 1c2e49e. Conflicts: python/plugins/sextante/saga/SagaAlgorithm.py
qgis · Jul 18, 2013 · bd3bb64 · bd3bb64
1 parent c433337
commit bd3bb64
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/python/plugins/sextante/saga/SagaAlgorithm.py b/python/plugins/sextante/saga/SagaAlgorithm.py
@@ -234,8 +234,10 @@ def processAlgorithm(self, progress):
                             raise GeoAlgorithmExecutionException("Unsupported file format")
 
         #2: set parameters and outputs
-
-        command = self.undecoratedGroup  + " \"" + self.cmdname + "\""
+        if SextanteUtils.isWindows() or SextanteUtils.isMac():
+            command = self.undecoratedGroup  + " \"" + self.cmdname + "\""
+        else:
+            command = "lib" + self.undecoratedGroup  + " \"" + self.cmdname + "\""
 
         if self.hardcodedStrings:
             for s in self.hardcodedStrings:
@@ -299,7 +301,10 @@ def processAlgorithm(self, progress):
             if isinstance(out, OutputRaster):
                 filename = out.getCompatibleFileName(self)
                 filename2 = SextanteUtils.tempFolder() + os.sep + os.path.basename(filename) + ".sgrd"
-                commands.append("io_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 4 -TYPE 0 -FILE \"" + filename + "\"");
+                if SextanteUtils.isWindows() or SextanteUtils.isMac():
+                    commands.append("io_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 4 -TYPE 0 -FILE \"" + filename + "\"");
+                else:
+                    commands.append("libio_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 4 -TYPE 0 -FILE \"" + filename + "\"");
 
 
         #4 Run SAGA
@@ -332,9 +337,14 @@ def resampleRasterLayer(self,layer):
             inputFilename = layer
         destFilename = SextanteUtils.getTempFilename("sgrd")
         self.exportedLayers[layer]= destFilename
-        s = "grid_tools \"Resampling\" -INPUT \"" + inputFilename + "\" -TARGET 0 -SCALE_UP_METHOD 4 -SCALE_DOWN_METHOD 4 -USER_XMIN " +\
-            str(self.xmin) + " -USER_XMAX " + str(self.xmax) + " -USER_YMIN " + str(self.ymin) + " -USER_YMAX "  + str(self.ymax) +\
-            " -USER_SIZE " + str(self.cellsize) + " -USER_GRID \"" + destFilename + "\""
+        if SextanteUtils.isWindows() or SextanteUtils.isMac():
+            s = "grid_tools \"Resampling\" -INPUT \"" + inputFilename + "\" -TARGET 0 -SCALE_UP_METHOD 4 -SCALE_DOWN_METHOD 4 -USER_XMIN " +\
+                str(self.xmin) + " -USER_XMAX " + str(self.xmax) + " -USER_YMIN " + str(self.ymin) + " -USER_YMAX "  + str(self.ymax) +\
+                " -USER_SIZE " + str(self.cellsize) + " -USER_GRID \"" + destFilename + "\""
+        else:
+            s = "libgrid_tools \"Resampling\" -INPUT \"" + inputFilename + "\" -TARGET 0 -SCALE_UP_METHOD 4 -SCALE_DOWN_METHOD 4 -USER_XMIN " +\
+                str(self.xmin) + " -USER_XMAX " + str(self.xmax) + " -USER_YMIN " + str(self.ymin) + " -USER_YMAX "  + str(self.ymax) +\
+                " -USER_SIZE " + str(self.cellsize) + " -USER_GRID \"" + destFilename + "\""
         return s