|
27 | 27 | from PyQt4.QtCore import *
|
28 | 28 | from PyQt4.QtGui import *
|
29 | 29 | from PyQt4 import QtGui, QtCore
|
| 30 | +from sextante.core.SextanteConfig import SextanteConfig |
30 | 31 | from sextante.core.GeoAlgorithm import GeoAlgorithm
|
31 | 32 | from sextante.parameters.ParameterRaster import ParameterRaster
|
32 | 33 | from sextante.parameters.ParameterTable import ParameterTable
|
@@ -389,16 +390,24 @@ def checkBeforeOpeningParametersDialog(self):
|
389 | 390 | path = RUtils.RFolder()
|
390 | 391 | if path == "":
|
391 | 392 | return "R folder is not configured.\nPlease configure it before running R scripts."
|
| 393 | + |
| 394 | + R_INSTALLED = "R_INSTALLED" |
| 395 | + settings = QSettings() |
| 396 | + if settings.contains(R_INSTALLED): |
| 397 | + return |
| 398 | + if SextanteUtils.isWindows(): |
| 399 | + if SextanteConfig.getSetting(RUtils.R_USE64): |
| 400 | + execDir = "x64" |
| 401 | + else: |
| 402 | + execDir = "i386" |
| 403 | + command = [RUtils.RFolder() + os.sep + "bin" + os.sep + execDir + os.sep + "R.exe --version"] |
392 | 404 | else:
|
393 |
| - R_INSTALLED = "R_INSTALLED" |
394 |
| - settings = QSettings() |
395 |
| - if settings.contains(R_INSTALLED): |
396 |
| - return |
397 | 405 | command = ["R --version"]
|
398 |
| - proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT, universal_newlines=True).stdout |
399 |
| - for line in iter(proc.readline, ""): |
400 |
| - if "R version" in line: |
401 |
| - settings.setValue(R_INSTALLED, True) |
402 |
| - return |
403 |
| - return "It seems that R is not correctly installed in your system.\nPlease install it before running R Scripts." |
| 406 | + proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT, universal_newlines=True).stdout |
| 407 | + |
| 408 | + for line in iter(proc.readline, ""): |
| 409 | + if "R version" in line: |
| 410 | + settings.setValue(R_INSTALLED, True) |
| 411 | + return |
| 412 | + return "It seems that R is not correctly installed in your system.\nPlease install it before running R Scripts." |
404 | 413 |
|
0 commit comments