allow output size in grid tool to fix #2941

git-svn-id: http://svn.osgeo.org/qgis/trunk@15471 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
brushtyler 2011-03-14 08:51:11 +00:00
parent 6d06ec30b3
commit a4e8e75835
4 changed files with 758 additions and 662 deletions

View File

@ -20,6 +20,10 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
self.setupUi(self) self.setupUi(self)
BasePluginWidget.__init__(self, self.iface, "gdal_grid") BasePluginWidget.__init__(self, self.iface, "gdal_grid")
# set the default QSpinBoxes and QProgressBar value
self.widthSpin.setValue(3000)
self.heightSpin.setValue(3000)
self.extentSelector.setCanvas(self.canvas) self.extentSelector.setCanvas(self.canvas)
#self.extentSelector.stop() #self.extentSelector.stop()
@ -44,7 +48,8 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
(self.datametricsCombo, SIGNAL("currentIndexChanged(int)")), (self.datametricsCombo, SIGNAL("currentIndexChanged(int)")),
([self.datametricsRadius1Spin, self.datametricsRadius2Spin, self.datametricsAngleSpin, self.datametricsNoDataSpin], SIGNAL("valueChanged(double)")), ([self.datametricsRadius1Spin, self.datametricsRadius2Spin, self.datametricsAngleSpin, self.datametricsNoDataSpin], SIGNAL("valueChanged(double)")),
(self.datametricsMinPointsSpin, SIGNAL("valueChanged(int)")), (self.datametricsMinPointsSpin, SIGNAL("valueChanged(int)")),
(self.extentSelector, [SIGNAL("selectionStarted()"), SIGNAL("newExtentDefined()")], self.extentGroup) (self.extentSelector, [SIGNAL("selectionStarted()"), SIGNAL("newExtentDefined()")], self.extentGroup),
( [self.widthSpin, self.heightSpin], SIGNAL( "valueChanged(int)" ), self.resizeGroupBox )
] ]
) )
@ -122,6 +127,10 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
if self.algorithmCheck.isChecked() and self.algorithmCombo.currentIndex() >= 0: if self.algorithmCheck.isChecked() and self.algorithmCombo.currentIndex() >= 0:
arguments << "-a" arguments << "-a"
arguments << self.algorithmArguments(self.algorithmCombo.currentIndex()) arguments << self.algorithmArguments(self.algorithmCombo.currentIndex())
if self.resizeGroupBox.isChecked():
arguments << "-outsize"
arguments << str( self.widthSpin.value() )
arguments << str( self.heightSpin.value() )
if not self.outputFileEdit.text().isEmpty(): if not self.outputFileEdit.text().isEmpty():
arguments << "-of" arguments << "-of"
arguments << self.outputFormat arguments << self.outputFormat

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>509</width> <width>509</width>
<height>214</height> <height>189</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -123,14 +123,17 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_7">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_11">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Image width</string> <string>Width</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -141,14 +144,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="2">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_12">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Image height</string> <string>Height</string>
</property>
<property name="indent">
<number>40</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="3">
<widget class="QSpinBox" name="heightSpin"> <widget class="QSpinBox" name="heightSpin">
<property name="maximum"> <property name="maximum">
<number>999999</number> <number>999999</number>

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>415</width> <width>415</width>
<height>442</height> <height>417</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -236,14 +236,17 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_7">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_11">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Image width</string> <string>Width</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -254,14 +257,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="2">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_12">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Image height</string> <string>Height</string>
</property>
<property name="indent">
<number>40</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="3">
<widget class="QSpinBox" name="heightSpin"> <widget class="QSpinBox" name="heightSpin">
<property name="maximum"> <property name="maximum">
<number>999999</number> <number>999999</number>