sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed #5435

Browse Source 
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@139 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
This commit is contained in:
volayaf@gmail.com 2012-04-22 12:44:16 +00:00
parent 3fd0697fb4
commit cc3184c909
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sextante/grass/GrassAlgorithm.py
View File

@ -221,13 +221,13 @@ class GrassAlgorithm(GeoAlgorithm):
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)

6
src/sextante/gui/ParametersDialog.py
View File

@ -59,7 +59,10 @@ class Ui_ParametersDialog(object):
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 @@ class Ui_ParametersDialog(object):
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 @@ class Ui_ParametersDialog(object):
def setPercentage(self, i):
self.progress.setValue(i)
def setText(self, text):
self.progressLabel.setText(text)

2
src/sextante/lastools/LasToolsAlgorithm.py
View File

@ -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))