[refs #137] bugfix in widgets.py badly formatted string corrupted load of settings; added a functionality to utils' which function to also look for NLLoc installation in the settings' binary path
This commit is contained in:
@@ -407,10 +407,18 @@ def runProgram(cmd, parameter=None):
|
||||
def which(program):
|
||||
"""
|
||||
takes a program name and returns the full path to the executable or None
|
||||
found on: http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
|
||||
modified after: http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
|
||||
:param program: name of the desired external program
|
||||
:return: full path of the executable file
|
||||
"""
|
||||
try:
|
||||
from PySide.QtCore import QSettings
|
||||
settings = QSettings()
|
||||
for key in settings.allKeys():
|
||||
if 'binPath' in key:
|
||||
os.environ['PATH'] += ':{0}'.format(settings.value(key))
|
||||
except ImportError as e:
|
||||
print(e.message)
|
||||
|
||||
def is_exe(fpath):
|
||||
return os.path.exists(fpath) and os.access(fpath, os.X_OK)
|
||||
|
||||
@@ -1337,8 +1337,8 @@ class LocalisationTab(PropTab):
|
||||
|
||||
self.locToolComboBox.setCurrentIndex(toolind)
|
||||
|
||||
curroot = settings.value("%s/rootPath".format(curtool), None)
|
||||
curbin = settings.value("%s/binPath".format(curtool), None)
|
||||
curroot = settings.value("{0}/rootPath".format(curtool), None)
|
||||
curbin = settings.value("{0}/binPath".format(curtool), None)
|
||||
|
||||
self.rootlabel = QLabel("root directory")
|
||||
self.binlabel = QLabel("bin directory")
|
||||
@@ -1385,8 +1385,8 @@ class LocalisationTab(PropTab):
|
||||
|
||||
def getValues(self):
|
||||
loctool = self.locToolComboBox.currentText()
|
||||
values = {"%s/rootPath".format(loctool): self.rootedit.text(),
|
||||
"%s/binPath".format(loctool): self.binedit.text(),
|
||||
values = {"{0}/rootPath".format(loctool): self.rootedit.text(),
|
||||
"{0}/binPath".format(loctool): self.binedit.text(),
|
||||
"loc/tool": loctool}
|
||||
return values
|
||||
|
||||
|
||||
Reference in New Issue
Block a user