Skip to content

Commit

Permalink
[sextante] changes in R interface
Browse files Browse the repository at this point in the history
  • Loading branch information
@volaya
volaya committed Feb 24, 2013
1 parent 42672e5 commit 2c00099
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 33 deletions.
69 changes: 37 additions & 32 deletions python/plugins/sextante/r/RAlgorithm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ def defineCharacteristicsFromFile(self):
self.commands=[]
self.showPlots = False
self.showConsoleOutput = False
self.useRasterPackage = False
self.passFileNames = False
self.verboseCommands = []
filename = os.path.basename(self.descriptionFile)
self.name = filename[:filename.rfind(".")].replace("_", " ")
Expand Down Expand Up @@ -129,36 +131,26 @@ def processParameterLine(self,line):
self.showPlots = True
self.addOutput(OutputHTML(RAlgorithm.RPLOTS, "R Plots"));
return
if line.lower().strip().startswith("userasterpackage"):
self.useRasterPackage = True
return
if line.lower().strip().startswith("passfilenames"):
self.passFileNames = True
return
tokens = line.split("=");
desc = self.createDescriptiveName(tokens[0])
if tokens[1].lower().strip() == "group":
self.group = tokens[0]
return
if tokens[1].lower().strip().startswith("raster"):
param = ParameterRaster(tokens[0], desc, False)
try:
lib = tokens[1].strip()[len("raster")+1:]
if lib == "R.raster":
self.useRraster = True
else:
self.useRraster = False
except:
self.useRraster = False
elif tokens[1].lower().strip() == "vector":
param = ParameterVector(tokens[0], desc,ParameterVector.VECTOR_TYPE_ANY)
elif tokens[1].lower().strip() == "table":
param = ParameterTable(tokens[0], desc, False)
elif tokens[1].lower().strip().startswith("multiple raster"):
param = ParameterMultipleInput(tokens[0], desc, ParameterMultipleInput.TYPE_RASTER)
param.optional = False
try:
lib = tokens[1].strip()[len("multiple raster")+1:]
if lib == "R.raster":
self.useRraster = True
else:
self.useRraster = False
except:
self.useRraster = False
elif tokens[1].lower().strip() == "multiple vector":
param = ParameterMultipleInput(tokens[0], desc, ParameterMultipleInput.TYPE_VECTOR_ANY)
param.optional = False
Expand Down Expand Up @@ -279,15 +271,17 @@ def getImportCommands(self):
commands.append(
'tryCatch(find.package("rgdal"), error=function(e) install.packages("rgdal", lib="%s"))' % rLibDir)
commands.append("library(\"rgdal\")");
if self.useRraster:
if self.useRasterPackage:
commands.append(
'tryCatch(find.package("raster"), error=function(e) install.packages("raster", lib="%s"))' % rLibDir)
commands.append("library(\"raster\")");
for param in self.parameters:
if isinstance(param, ParameterRaster):
value = param.value
value = value.replace("\\", "/")
if self.useRraster:
if self.passFileNames:
commands.append(param.name + " = " + value)
elif self.useRasterPackage:
commands.append(param.name + " = " + "brick(\"" + value + "\")")
else:
commands.append(param.name + " = " + "readGDAL(\"" + value + "\")")
Expand All @@ -297,44 +291,55 @@ def getImportCommands(self):
filename = os.path.basename(value)
filename = filename[:-4]
folder = os.path.dirname(value)
commands.append(param.name + " = readOGR(\"" + folder + "\",layer=\"" + filename + "\")")
if self.passFileNames:
commands.append(param.name + " = " + value)
else:
commands.append(param.name + " = readOGR(\"" + folder + "\",layer=\"" + filename + "\")")
if isinstance(param, ParameterTable):
value = param.value
value = param.value
if not value.lower().endswith("csv"):
raise GeoAlgorithmExecutionException("Unsupported input file format.\n" + value)
commands.append(param.name + " <- read.csv(\"" + value + "\", head=TRUE, sep=\",\")")
if isinstance(param, (ParameterTableField, ParameterString)):
if self.passFileNames:
commands.append(param.name + " = " + value)
else:
commands.append(param.name + " <- read.csv(\"" + value + "\", head=TRUE, sep=\",\")")
elif isinstance(param, (ParameterTableField, ParameterString, ParameterFile)):
commands.append(param.name + "=\"" + param.value + "\"")
if isinstance(param, (ParameterNumber, ParameterSelection)):
elif isinstance(param, (ParameterNumber, ParameterSelection)):
commands.append(param.name + "=" + str(param.value))
if isinstance(param, ParameterBoolean):
elif isinstance(param, ParameterBoolean):
if param.value:
commands.append(param.name + "=TRUE")
else:
commands.append(param.name + "=FALSE")
if isinstance(param, ParameterMultipleInput):
elif isinstance(param, ParameterMultipleInput):
iLayer = 0;
if param.datatype == ParameterMultipleInput.TYPE_RASTER:
layers = param.value.split(";")
for layer in layers:
if not layer.lower().endswith("asc") and not layer.lower().endswith("tif"):
raise GeoAlgorithmExecutionException("Unsupported input file format.\n" + layer)
#if not layer.lower().endswith("asc") and not layer.lower().endswith("tif") and not self.passFileNames:
#raise GeoAlgorithmExecutionException("Unsupported input file format.\n" + layer)
layer = layer.replace("\\", "/")
if self.useRraster:
commands.append("tempvar" + str(iLayer)+ " = " + "brick(\"" + layer + "\"")
if self.passFileNames:
commands.append("tempvar" + str(iLayer)+ " = \"" + layer + "\"")
elif self.useRasterPackage:
commands.append("tempvar" + str(iLayer)+ " = " + "brick(\"" + layer + "\")")
else:
commands.append("tempvar" + str(iLayer)+ " = " + "readGDAL(\"" + layer + "\"")
commands.append("tempvar" + str(iLayer)+ " = " + "readGDAL(\"" + layer + "\")")
iLayer+=1
else:
exported = param.getSafeExportedLayers()
layers = exported.split(";")
for layer in layers:
if not layer.lower().endswith("shp"):
if not layer.lower().endswith("shp") and not self.passFileNames:
raise GeoAlgorithmExecutionException("Unsupported input file format.\n" + layer)
layer = layer.replace("\\", "/")
filename = os.path.basename(layer)
filename = filename[:-4]
commands.append("tempvar" + str(iLayer) + " = " + "readOGR(\"" + layer + "\",layer=\"" + filename + "\")")
if self.passFileNames:
commands.append("tempvar" + str(iLayer)+ " = \"" + layer + "\"")
else:
commands.append("tempvar" + str(iLayer) + " = " + "readOGR(\"" + layer + "\",layer=\"" + filename + "\")")
iLayer+=1
s = ""
s += param.name
Expand Down
2 changes: 2 additions & 0 deletions python/plugins/sextante/r/RAlgorithmProvider.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@ def initializeSettings(self):
SextanteConfig.addSetting(Setting(self.getDescription(), RUtils.RSCRIPTS_FOLDER, "R Scripts folder", RUtils.RScriptsFolder()))
if SextanteUtils.isWindows():
SextanteConfig.addSetting(Setting(self.getDescription(), RUtils.R_FOLDER, "R folder", RUtils.RFolder()))
SextanteConfig.addSetting(Setting(self.getDescription(), RUtils.R_USE64, "Use 64 bit version", False))

def unload(self):
AlgorithmProvider.unload(self)
SextanteConfig.removeSetting(RUtils.RSCRIPTS_FOLDER)
if SextanteUtils.isWindows():
SextanteConfig.removeSetting(RUtils.R_FOLDER)
SextanteConfig.removeSetting(RUtils.R_USE64)

def getIcon(self):
return QtGui.QIcon(os.path.dirname(__file__) + "/../images/r.png")
Expand Down
7 changes: 6 additions & 1 deletion python/plugins/sextante/r/RUtils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class RUtils:

RSCRIPTS_FOLDER = "R_SCRIPTS_FOLDER"
R_FOLDER = "R_FOLDER"
R_USE64 = "R_USE64"

@staticmethod
def RFolder():
Expand Down Expand Up @@ -73,7 +74,11 @@ def executeRAlgorithm(alg, progress):
RUtils.verboseCommands = alg.getVerboseCommands();
RUtils.createRScriptFromRCommands(alg.getFullSetOfRCommands())
if SextanteUtils.isWindows():
command = [RUtils.RFolder() + os.sep + "bin" + os.sep + "R.exe", "CMD", "BATCH", "--vanilla",
if SextanteConfig.getSetting(RUtils.R_USE64):
execDir = "x64"
else:
execDir = "i386"
command = [RUtils.RFolder() + os.sep + "bin" + os.sep + execDir + os.sep + "R.exe", "CMD", "BATCH", "--vanilla",
RUtils.getRScriptFilename(), RUtils.getConsoleOutputFilename()]
else:
os.chmod(RUtils.getRScriptFilename(), stat.S_IEXEC | stat.S_IREAD | stat.S_IWRITE)
Expand Down

0 comments on commit 2c00099

Please sign in to comment.