Skip to content
Permalink
Browse files

fix indentation

  • Loading branch information
alexbruy committed Jan 13, 2016
1 parent 864e192 commit b146c3edfc0d115b0cb2936f88005bff386f775b
@@ -81,7 +81,7 @@ def help(self):
folder = OTBUtils.compatibleDescriptionPath(version)
if folder is None:
return False, None
folder = os.path.join(folder, 'doc')
folder = os.path.join(folder, 'doc')
helpfile = os.path.join(unicode(folder), self.appkey + ".html")
if os.path.exists(helpfile):
return False, helpfile
@@ -67,11 +67,9 @@ def _loadAlgorithms(self):
folder = OTBUtils.compatibleDescriptionPath(version)
if folder is None:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('Problem with OTB installation: installed OTB version (%s) is not supported' % version))
self.tr('Problem with OTB installation: installed OTB version (%s) is not supported' % version))
return



for descriptionFile in os.listdir(folder):
if descriptionFile.endswith("xml"):
try:
@@ -111,4 +109,3 @@ def unload(self):
AlgorithmProvider.unload(self)
ProcessingConfig.removeSetting(OTBUtils.OTB_FOLDER)
ProcessingConfig.removeSetting(OTBUtils.OTB_LIB_FOLDER)

@@ -135,7 +135,7 @@ def getInstalledVersion(runOtb=False):
if _installedVersionFound and not runOtb:
return _installedVersion

commands =[os.path.join(otbPath(), "otbcli_Smoothing")]
commands = [os.path.join(otbPath(), "otbcli_Smoothing")]
progress = SilentProgress()
out = executeOtb(commands, progress, False)
for line in out:
@@ -145,6 +145,7 @@ def getInstalledVersion(runOtb=False):
break
return _installedVersion


def compatibleDescriptionPath(version):
supportedVersions = {"5.0.0": "5.0.0"}
if version is None:
@@ -158,7 +159,8 @@ def compatibleDescriptionPath(version):

return os.path.join(otbDescriptionPath(), supportedVersions[version])

def executeOtb(commands, progress, addToLog = True):

def executeOtb(commands, progress, addToLog=True):
loglines = []
loglines.append(tr("OTB execution console output"))
os.putenv('ITK_AUTOLOAD_PATH', otbLibPath())
@@ -29,4 +29,4 @@
counts[clazz] += 1

for c in counts:
writer.addRecord(list(c) + [counts[c]])
writer.addRecord(list(c) + [counts[c]])

0 comments on commit b146c3e

Please sign in to comment.
You can’t perform that action at this time.