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

Merge pull request #3493 from rldhont/processing_rscripts_temprscritpfilename

Browse Source 
[Processing][Rscripts] Use temp script filename
This commit is contained in:
volaya 2016-09-29 13:52:20 +02:00 committed by GitHub
commit 170ff9fe12
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_LIBS_USER = 'R_LIBS_USER'
rscriptfilename = userFolder() + os.sep + 'processing_script.r'
@staticmethod
def RFolder():
folder = ProcessingConfig.getSetting(RUtils.R_FOLDER)
@ -108,7 +110,7 @@ class RUtils(object):
@staticmethod
def getRScriptFilename():
return userFolder() + os.sep + 'processing_script.r'
return RUtils.rscriptfilename
@staticmethod
def getConsoleOutputFilename():
@ -116,6 +118,9 @@ class RUtils(object):
@staticmethod
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.createRScriptFromRCommands(alg.getFullSetOfRCommands())
if isWindows():