[QGIS Commit] r15698 - trunk/qgis/python/plugins/GdalTools/tools
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Apr 13 18:15:37 EDT 2011
Author: brushtyler
Date: 2011-04-13 15:15:37 -0700 (Wed, 13 Apr 2011)
New Revision: 15698
Modified:
trunk/qgis/python/plugins/GdalTools/tools/doClipper.py
trunk/qgis/python/plugins/GdalTools/tools/widgetClipper.ui
Log:
fixed #3662 and #3663
Modified: trunk/qgis/python/plugins/GdalTools/tools/doClipper.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doClipper.py 2011-04-13 18:04:31 UTC (rev 15697)
+++ trunk/qgis/python/plugins/GdalTools/tools/doClipper.py 2011-04-13 22:15:37 UTC (rev 15698)
@@ -16,77 +16,54 @@
self.canvas = self.iface.mapCanvas()
self.setupUi(self)
- BasePluginWidget.__init__(self, self.iface, "gdal_merge.py", None, self.iface.mainWindow())
+ BasePluginWidget.__init__(self, self.iface, "gdal_translate", None, self.iface.mainWindow())
self.extentSelector.setCanvas(self.canvas)
self.outputFormat = Utils.fillRasterOutputFormat()
- self.inputFiles = QStringList()
- self.warningDialog = QErrorMessage(self)
-
self.setParamsStatus(
[
+ (self.inputLayerCombo, [SIGNAL("currentIndexChanged(int)"), SIGNAL("editTextChanged(const QString &)")] ),
(self.outputFileEdit, SIGNAL("textChanged(const QString &)")),
(self.noDataSpin, SIGNAL("valueChanged(int)"), self.noDataCheck),
- (self.pctCheck, SIGNAL("stateChanged(int)")),
( self.extentSelector, [SIGNAL("selectionStarted()"), SIGNAL("newExtentDefined()")] )
]
)
+ self.connect(self.selectInputFileButton, SIGNAL("clicked()"), self.fillInputFileEdit)
self.connect(self.selectOutputFileButton, SIGNAL("clicked()"), self.fillOutputFileEdit)
self.connect(self.extentSelector, SIGNAL("newExtentDefined()"), self.checkRun)
self.connect(self.extentSelector, SIGNAL("selectionStarted()"), self.checkRun)
def show_(self):
- self.connect(self.canvas, SIGNAL("layersChanged()"), self.fillInputFiles)
self.extentSelector.start()
BasePluginWidget.show_(self)
- self.fillInputFiles()
- self.checkRun()
-
def onClosing(self):
- self.disconnect(self.canvas, SIGNAL("layersChanged()"), self.fillInputFiles)
self.extentSelector.stop()
BasePluginWidget.onClosing(self)
- def fillInputFiles(self):
- self.inputFiles = QStringList()
+ def checkRun(self):
+ self.base.enableRun( self.extentSelector.getExtent() != None )
- # Reversed list to have the topmost layer as the last one in the list
- # because "In areas of overlap, the last image will be copied over
- # earlier ones" (see http://www.gdal.org/gdal_merge.html).
- for i in range(self.canvas.layerCount()-1, -1, -1):
- layer = self.canvas.layer(i)
- # only raster layers, but not WMS ones
- if layer.type() != layer.RasterLayer:
- continue
- if layer.usesProvider() and layer.providerKey() != 'gdal':
- continue
+ def onLayersChanged(self):
+ self.fillInputLayerCombo()
- # do not use the output file as input
- if layer.source() == self.outputFileEdit.text():
- continue
- self.inputFiles << layer.source()
+ def fillInputLayerCombo(self):
+ self.inputLayerCombo.clear()
+ ( self.layers, names ) = Utils.LayerRegistry.instance().getRasterLayers()
+ self.inputLayerCombo.addItems( names )
- if self.inputFiles.isEmpty():
- self.extentSelector.stop()
+ def fillInputFileEdit( self ):
+ lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
+ inputFile = Utils.FileDialog.getOpenFileName( self, self.tr( "Select the input file for Translate" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
+ if inputFile.isEmpty():
+ return
+ Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter )
- if self.isVisible() and self.warningDialog.isHidden():
- msg = QString( self.tr("No active raster layers. You must add almost one raster layer to continue.") )
- self.warningDialog.showMessage(msg)
+ self.inputLayerCombo.setCurrentIndex(-1)
+ self.inputLayerCombo.setEditText( inputFile )
- # refresh command when there are no active layers
- self.someValueChanged()
- else:
- self.warningDialog.hide()
- self.extentSelector.start()
-
- self.checkRun()
-
- def checkRun(self):
- self.base.enableRun( not self.inputFiles.isEmpty() and self.extentSelector.getExtent() != None )
-
def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
@@ -95,48 +72,36 @@
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)
self.outputFormat = Utils.fillRasterOutputFormat(lastUsedFilter, outputFile)
-
- # do not use the output file as input
- if self.inputFiles.contains(outputFile):
- self.inputFiles.removeAt( self.inputFiles.indexOf(outputFile) )
self.outputFileEdit.setText(outputFile)
def getArguments(self):
arguments = QStringList()
if self.noDataCheck.isChecked():
- arguments << "-n"
+ arguments << "-a_nodata"
arguments << str(self.noDataSpin.value())
- if self.pctCheck.isChecked():
- arguments << "-pct"
if self.extentSelector.isCoordsValid():
rect = self.extentSelector.getExtent()
if rect != None:
- arguments << "-ul_lr"
+ arguments << "-projwin"
arguments << str(rect.xMinimum())
arguments << str(rect.yMaximum())
arguments << str(rect.xMaximum())
arguments << str(rect.yMinimum())
- if not self.outputFileEdit.text().isEmpty():
+ if not self.getOutputFileName().isEmpty():
arguments << "-of"
arguments << self.outputFormat
- if not self.outputFileEdit.text().isEmpty():
- arguments << "-o"
- arguments << self.outputFileEdit.text()
-
- if self.pctCheck.isChecked() and len(self.inputFiles) > 1:
- # The topmost layer in the TOC is the last one in the list (see above),
- # but I want to grab the pseudocolor table from the first image (the
- # topmost layer in the TOC).
- # Workaround: duplicate the last layer inserting it also as the first
- # one to grab the pseudocolor table from it.
- arguments << self.inputFiles[ len(self.inputFiles)-1 ]
-
- arguments << self.inputFiles
+ arguments << self.getInputFileName()
+ arguments << self.getOutputFileName()
return arguments
def getOutputFileName(self):
return self.outputFileEdit.text()
+ def getInputFileName(self):
+ if self.inputLayerCombo.currentIndex() >= 0:
+ return self.layers[self.inputLayerCombo.currentIndex()].source()
+ return self.inputLayerCombo.currentText()
+
def addLayerIntoCanvas(self, fileInfo):
self.iface.addRasterLayer(fileInfo.filePath())
Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetClipper.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetClipper.ui 2011-04-13 18:04:31 UTC (rev 15697)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetClipper.ui 2011-04-13 22:15:37 UTC (rev 15698)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>338</width>
- <height>165</height>
+ <height>172</height>
</rect>
</property>
<property name="sizePolicy">
@@ -22,7 +22,7 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>&Output file</string>
@@ -32,7 +32,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="outputFileEdit">
@@ -53,20 +53,57 @@
</item>
</layout>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QCheckBox" name="noDataCheck">
<property name="text">
<string>&No data value</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="QSpinBox" name="noDataSpin">
<property name="maximum">
<number>65000</number>
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QComboBox" name="inputLayerCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ <property name="insertPolicy">
+ <enum>QComboBox::NoInsert</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="selectInputFileButton">
+ <property name="text">
+ <string>Select...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>&Input file</string>
+ </property>
+ <property name="buddy">
+ <cstring>selectInputFileButton</cstring>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -81,13 +118,6 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="pctCheck">
- <property name="text">
- <string>Grab pseudocolor table from the first image</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<customwidgets>
More information about the QGIS-commit
mailing list