sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Processing][Rscripts] Use temp script filename

Browse Source 
The build RScript is stored in the User folder, so the script is erased at each RAlgorithm execute.
Server side or for debugging this could be a problem.
So processing_script.r will be stored in temp folder.
This commit is contained in:
rldhont 2016-09-15 11:15:11 +02:00
parent 89d4998510
commit 4feeab85a5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/plugins/processing/algs/r/RUtils.py
View File

@ -45,6 +45,8 @@ class RUtils(object):
R_USE64 = 'R_USE64' R_USE64 = 'R_USE64'
R_LIBS_USER = 'R_LIBS_USER' R_LIBS_USER = 'R_LIBS_USER'
rscriptfilename = userFolder() + os.sep + 'processing_script.r'
@staticmethod @staticmethod
def RFolder(): def RFolder():
folder = ProcessingConfig.getSetting(RUtils.R_FOLDER) folder = ProcessingConfig.getSetting(RUtils.R_FOLDER)
@ -108,7 +110,7 @@ class RUtils(object):
@staticmethod @staticmethod
def getRScriptFilename(): def getRScriptFilename():
return userFolder() + os.sep + 'processing_script.r' return RUtils.rscriptfilename
@staticmethod @staticmethod
def getConsoleOutputFilename(): def getConsoleOutputFilename():
@ -116,6 +118,9 @@ class RUtils(object):
@staticmethod @staticmethod
def executeRAlgorithm(alg, progress): def executeRAlgorithm(alg, progress):
# generate new R script file name in a temp folder
RUtils.rscriptfilename = getTempFilenameInTempFolder('processing_script.r')
# run commands
RUtils.verboseCommands = alg.getVerboseCommands() RUtils.verboseCommands = alg.getVerboseCommands()
RUtils.createRScriptFromRCommands(alg.getFullSetOfRCommands()) RUtils.createRScriptFromRCommands(alg.getFullSetOfRCommands())
if isWindows(): if isWindows():