fixed #5435

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@139 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 22, 2012 · cc3184c · cc3184c
1 parent 3fd0697
commit cc3184c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/sextante/grass/GrassAlgorithm.py b/src/sextante/grass/GrassAlgorithm.py
@@ -221,13 +221,13 @@ def processAlgorithm(self, progress):
                 command = "r.out.gdal -c createopt=\"TFW=YES,COMPRESS=LZW\""
                 command += " input="
                 command += out.name
-                command += " output=\"" + filename[:-4] + "\""
+                command += " output=\"" + filename + "\""
                 commands.append(command)
             if isinstance(out, OutputVector):
                 command = "v.out.ogr -e input=" + out.name
                 command += " dsn=\"" + os.path.dirname(out.value) + "\""
                 command += " format=ESRI_Shapefile"
-                command += " olayer=" + os.path.basename(out.value)
+                command += " olayer=" + os.path.basename(out.value)[:-4]
                 command += " type=auto"
                 commands.append(command)
 

diff --git a/src/sextante/gui/ParametersDialog.py b/src/sextante/gui/ParametersDialog.py
@@ -59,7 +59,10 @@ def setupUi(self, dialog, alg):
         self.scrollArea.setWidgetResizable(True)
         dialog.setWindowTitle(self.alg.name)
         self.progressLabel = QtGui.QLabel()
+        self.progressLabel.setText("Processing algorithm...")
+        self.progressLabel.setVisible(False)
         self.progress = QtGui.QProgressBar()
+        self.progress.setVisible(False)
         self.progress.setMinimum(0)
         self.progress.setMaximum(100)
         self.verticalLayout = QtGui.QVBoxLayout(dialog)
@@ -140,6 +143,8 @@ def accept(self):
                     if button.isChecked():
                         iterateParam = buttons.keys()[i]
                         break
+                self.progress.setVisible(True)
+                self.progressLabel.setVisible(True)
                 if iterateParam:
                     QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
                     AlgorithmExecutor.runalgIterating(self.alg, iterateParam, self)
@@ -173,6 +178,7 @@ def reject(self):
     def setPercentage(self, i):
         self.progress.setValue(i)
 
+
     def setText(self, text):
         self.progressLabel.setText(text)
 

diff --git a/src/sextante/lastools/LasToolsAlgorithm.py b/src/sextante/lastools/LasToolsAlgorithm.py
@@ -12,7 +12,7 @@ class LasToolsAlgorithm(GeoAlgorithm):
     def checkBeforeOpeningParametersDialog(self):
             path = LasToolsUtils.LasToolsPath()
             if path == "":
-                return "SAGA folder is not configured.\nPlease configure it before running SAGA algorithms."
+                return "LasTools folder is not configured.\nPlease configure it before running LasTools algorithms."
 
     def addCommonParameters(self):
         self.addParameter(ParameterBoolean(LasToolsAlgorithm.FIRST_ONLY, "Keep first return only", False))