From a4e8e75835062561fc64bf6c3eca6029a48f244e Mon Sep 17 00:00:00 2001 From: brushtyler Date: Mon, 14 Mar 2011 08:51:11 +0000 Subject: [PATCH] allow output size in grid tool to fix #2941 git-svn-id: http://svn.osgeo.org/qgis/trunk@15471 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/plugins/GdalTools/tools/doGrid.py | 11 +- python/plugins/GdalTools/tools/widgetGrid.ui | 1341 +++++++++-------- .../GdalTools/tools/widgetRasterize.ui | 34 +- python/plugins/GdalTools/tools/widgetWarp.ui | 34 +- 4 files changed, 758 insertions(+), 662 deletions(-) diff --git a/python/plugins/GdalTools/tools/doGrid.py b/python/plugins/GdalTools/tools/doGrid.py index bb0cc1e6abd..7021677c89c 100644 --- a/python/plugins/GdalTools/tools/doGrid.py +++ b/python/plugins/GdalTools/tools/doGrid.py @@ -20,6 +20,10 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): self.setupUi(self) 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.stop() @@ -44,7 +48,8 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): (self.datametricsCombo, SIGNAL("currentIndexChanged(int)")), ([self.datametricsRadius1Spin, self.datametricsRadius2Spin, self.datametricsAngleSpin, self.datametricsNoDataSpin], SIGNAL("valueChanged(double)")), (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: arguments << "-a" 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(): arguments << "-of" arguments << self.outputFormat diff --git a/python/plugins/GdalTools/tools/widgetGrid.ui b/python/plugins/GdalTools/tools/widgetGrid.ui index 5ffb649d75f..eed9f0f1279 100644 --- a/python/plugins/GdalTools/tools/widgetGrid.ui +++ b/python/plugins/GdalTools/tools/widgetGrid.ui @@ -6,7 +6,7 @@ 0 0 - 494 + 777 366 @@ -19,8 +19,8 @@ Grid - - + + @@ -133,648 +133,711 @@ - - - - 20 + + + + QFrame::NoFrame - - 20 + + 0 - - - - QFrame::NoFrame - - - 0 - - - - - - - Power - - + + + + + + Power + + + + + + + + 0 + 0 + + + + 1 + + + + + + + Smoothing + + + 30 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Radius1 + + + 30 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Radius2 + + + 30 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Max points + + + + + + + + 0 + 0 + + + + 65000 + + + + + + + Min points + + + 30 + + + + + + + + 0 + 0 + + + + 65000 + + + + + + + Angle + + + 30 + + + + + + + + 0 + 0 + + + + 1 + + + 359.000000000000000 + + + + + + + No data + + + 30 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + + + Radius1 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Radius2 + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Angle + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 359.000000000000000 + + + + + + + Min points + + + + + + + + 0 + 0 + + + + 65000 + + + + + + + No data + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + + + Radius1 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Radius2 + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Angle + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 359.000000000000000 + + + + + + + No data + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + + + + Metrics + + + + + + + + 0 + 0 + + + + + Minimum + - - - - - 0 - 0 - - - - 1 - - + + + Maximum + - - - - Radius1 - - + + + Range + - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - Angle - - - - - - - - 0 - 0 - - - - 1 - - - 359.000000000000000 - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - 0 - 0 - - - - 65000 - - - - - - - Max points - - - - - - - Min points - - - 40 - - - - - - - - 0 - 0 - - - - 65000 - - - - - - - Radius2 - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - No data - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - Smoothing - - - 40 - - - - - - - - - - - Radius1 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - Angle - - - - - - - - 0 - 0 - - - - 1 - - - 359.000000000000000 - - - - - - - Min points - - - - - - - - 0 - 0 - - - - 65000 - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - Radius2 - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - No data - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - - - - - Radius1 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - Angle - - - - - - - - 0 - 0 - - - - 1 - - - 359.000000000000000 - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - Radius2 - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - No data - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - - - - - Metrics - - - - - - - - 0 - 0 - - - - - Minimum - - - - - Maximum - - - - - Range - - - - - - - - Radius1 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - Angle - - - - - - - - 0 - 0 - - - - 1 - - - 359.000000000000000 - - - - - - - Min points - - - - - - - - 0 - 0 - - - - 65000 - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - Radius2 - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - No data - - - 40 - - - - - - - - 0 - 0 - - - - 1 - - - 65000.000000000000000 - - - - - - - - + + + + + + Radius1 + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Radius2 + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Angle + + + + + + + + 0 + 0 + + + + 1 + + + 359.000000000000000 + + + + + + + No data + + + 40 + + + + + + + + 0 + 0 + + + + 1 + + + 65000.000000000000000 + + + + + + + Min points + + + 40 + + + + + + + + 0 + 0 + + + + 65000 + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + - + + + + Resize + + + true + + + false + + + + + + + 0 + 0 + + + + Width + + + + + + + 999999 + + + + + + + + 0 + 0 + + + + Height + + + 40 + + + + + + + 999999 + + + + + + + Extent diff --git a/python/plugins/GdalTools/tools/widgetRasterize.ui b/python/plugins/GdalTools/tools/widgetRasterize.ui index 0ed5942c4af..3a54d2af996 100644 --- a/python/plugins/GdalTools/tools/widgetRasterize.ui +++ b/python/plugins/GdalTools/tools/widgetRasterize.ui @@ -7,7 +7,7 @@ 0 0 509 - 214 + 189 @@ -123,14 +123,17 @@ false - - - 0 - + - + + + + 0 + 0 + + - Image width + Width @@ -141,14 +144,23 @@ - - + + + + + 0 + 0 + + - Image height + Height + + + 40 - + 999999 diff --git a/python/plugins/GdalTools/tools/widgetWarp.ui b/python/plugins/GdalTools/tools/widgetWarp.ui index 2edee23740f..fefa1337949 100644 --- a/python/plugins/GdalTools/tools/widgetWarp.ui +++ b/python/plugins/GdalTools/tools/widgetWarp.ui @@ -7,7 +7,7 @@ 0 0 415 - 442 + 417 @@ -236,14 +236,17 @@ false - - - 0 - + - + + + + 0 + 0 + + - Image width + Width @@ -254,14 +257,23 @@ - - + + + + + 0 + 0 + + - Image height + Height + + + 40 - + 999999