[QGIS Commit] r10035 - trunk/qgis/python/plugins/ftools/tools
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Jan 27 18:38:47 EST 2009
Author: cfarmer
Date: 2009-01-27 18:38:46 -0500 (Tue, 27 Jan 2009)
New Revision: 10035
Modified:
trunk/qgis/python/plugins/ftools/tools/doVectorGrid.py
trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.py
trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.ui
Log:
Fixes error when manually specifying output coordinates
Modifies ui to increase control on output grid extents
Modified: trunk/qgis/python/plugins/ftools/tools/doVectorGrid.py
===================================================================
--- trunk/qgis/python/plugins/ftools/tools/doVectorGrid.py 2009-01-27 12:44:59 UTC (rev 10034)
+++ trunk/qgis/python/plugins/ftools/tools/doVectorGrid.py 2009-01-27 23:38:46 UTC (rev 10035)
@@ -42,52 +42,67 @@
self.setupUi(self)
QObject.connect(self.toolOut, SIGNAL("clicked()"), self.outFile)
QObject.connect(self.spnX, SIGNAL("valueChanged(double)"), self.offset)
+ #QObject.connect(self.inShape, SIGNAL("currentIndexChanged(QString)"), self.updateInput)
+ QObject.connect(self.btnUpdate, SIGNAL("clicked()"), self.updateInput)
self.setWindowTitle("Vector grid")
- mapCanvas = self.iface.mapCanvas()
- for i in range(mapCanvas.layerCount()):
- layer = mapCanvas.layer(i)
- self.inShape.addItem(layer.name())
+ self.xMin.setValidator(QDoubleValidator(self.xMin))
+ self.xMax.setValidator(QDoubleValidator(self.xMax))
+ self.yMin.setValidator(QDoubleValidator(self.yMin))
+ self.yMax.setValidator(QDoubleValidator(self.yMax))
+ layers = ftools_utils.getLayerNames(
+ [ QGis.Point, QGis.Line, QGis.Polygon ] )
+ for layer in layers:
+ self.inShape.addItem( layer )
def offset(self, value):
if self.chkLock.isChecked():
self.spnY.setValue(value)
+ def updateInput( self ):
+ mLayerName = self.inShape.currentText()
+ if not mLayerName == "":
+ mLayer = self.getMapLayerByName( unicode( mLayerName ) )
+ self.inLayer = mLayer
+ boundBox = mLayer.extent()
+ self.updateExtents( boundBox )
+
+ def updateExtents( self, boundBox ):
+ self.xMin.setText( unicode( boundBox.xMinimum() ) )
+ self.yMin.setText( unicode( boundBox.yMinimum() ) )
+ self.xMax.setText( unicode( boundBox.xMaximum() ) )
+ self.yMax.setText( unicode( boundBox.yMaximum() ) )
+
def accept(self):
- if not self.rdoCoordinates.isChecked() and self.inShape.currentText() == "":
- QMessageBox.information(self, "Generate Vector Grid", "Please specify input layer")
- elif self.rdoCoordinates.isChecked() and (self.xMin.text() == "" or self.xMax.text() == "" or self.yMin.text() == "" or self.yMax.text() == ""):
- QMessageBox.information(self, "Generate Vector Grid", "Please properly specify extent coordinates")
+ if self.xMin.text() == "" or self.xMax.text() == "" or self.yMin.text() == "" or self.yMax.text() == "":
+ QMessageBox.information(self, "Vector grid", "Please specify valid extent coordinates")
elif self.outShape.text() == "":
- QMessageBox.information(self, "Generate Vector Grid", "Please specify output shapefile")
+ QMessageBox.information(self, "Vector grid", "Please specify output shapefile")
else:
- inName = self.inShape.currentText()
- outPath = self.outShape.text()
- self.outShape.clear()
- if outPath.contains("\\"):
- outName = outPath.right((outPath.length() - outPath.lastIndexOf("\\")) - 1)
- else:
- outName = outPath.right((outPath.length() - outPath.lastIndexOf("/")) - 1)
- if outName.endsWith(".shp"):
- outName = outName.left(outName.length() - 4)
- if self.rdoBoundary.isChecked():
- mLayer = self.getMapLayerByName(unicode(inName))
- boundBox = mLayer.extent()
- else:
- boundBox = QgsRect(float(self.xMin.text()), float(self.yMin.text()), float(self.xMax.text()), float(self.yMax.text()))
+ try:
+ boundBox = QgsRectangle(
+ float( self.xMin.text() ),
+ float( self.yMin.text() ),
+ float( self.xMax.text() ),
+ float( self.yMax.text() ) )
+ except:
+ QMessageBox.information(self, "Vector grid", "Invalid extent coordinates entered")
xSpace = self.spnX.value()
ySpace = self.spnY.value()
if self.rdoPolygons.isChecked(): polygon = True
else: polygon = False
- self.compute(boundBox, outPath, xSpace, ySpace, polygon, self.progressBar)
- addToTOC = QMessageBox.question(self, "Generate Vector Grid", "Created output Shapefile:\n" + outPath
- + "\nNote: Layer has no associated coordinate system, please use the Projection Management Tool to specify spatial reference system."
- + "\n\nWould you like to add the new layer to the TOC?", QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+ self.outShape.clear()
+ self.compute( boundBox, xSpace, ySpace, polygon )
+ addToTOC = QMessageBox.question(self,
+ "Generate Vector Grid", "Created output Shapefile:\n" + outPath
+ + "\nNote: Layer has no associated coordinate system, please use "
+ + "the Projection Management Tool to specify spatial reference system."
+ + "\n\nWould you like to add the new layer to the TOC?",
+ QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
if addToTOC == QMessageBox.Yes:
- self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
- QgsMapLayerRegistry.instance().addMapLayer(self.vlayer)
- self.progressBar.setValue(0)
+ ftools_utils.addShapeToCanvas( self.shapefileName )
+ self.progressBar.setValue( 0 )
- def compute(self, bound, outPath, xOffset, yOffset, polygon, progressBar):
+ def compute( self, bound, xOffset, yOffset, polygon ):
if polygon:
fields = {0:QgsField("ID", QVariant.Int), 1:QgsField("XMIN", QVariant.Double), 2:QgsField("XMAX", QVariant.Double),
3:QgsField("YMIN", QVariant.Double), 4:QgsField("YMAX", QVariant.Double)}
@@ -108,7 +123,7 @@
outFeat = QgsFeature()
outGeom = QgsGeometry()
idVar = 0
- progressBar.setRange(0,0)
+ self.progressBar.setRange( 0, 0 )
if not polygon:
y = bound.yMaximum()
while y >= bound.yMinimum():
@@ -153,7 +168,7 @@
idVar = idVar + 1
x = x + xOffset
y = y - yOffset
- progressBar.setRange(0,100)
+ self.progressBar.setRange( 0, 100 )
del writer
def outFile(self):
Modified: trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.py
===================================================================
--- trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.py 2009-01-27 12:44:59 UTC (rev 10034)
+++ trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.py 2009-01-27 23:38:46 UTC (rev 10035)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'frmVectorGrid.ui'
#
-# Created: Mon Nov 10 00:06:05 2008
+# Created: Tue Jan 27 23:10:42 2009
# by: PyQt4 UI code generator 4.3.3
#
# WARNING! All changes made in this file will be lost!
@@ -13,7 +13,7 @@
def setupUi(self, Dialog):
Dialog.setObjectName("Dialog")
Dialog.setWindowModality(QtCore.Qt.NonModal)
- Dialog.resize(QtCore.QSize(QtCore.QRect(0,0,374,483).size()).expandedTo(Dialog.minimumSizeHint()))
+ Dialog.resize(QtCore.QSize(QtCore.QRect(0,0,369,459).size()).expandedTo(Dialog.minimumSizeHint()))
Dialog.setSizeGripEnabled(True)
self.gridlayout = QtGui.QGridLayout(Dialog)
@@ -25,70 +25,76 @@
self.gridlayout1 = QtGui.QGridLayout(self.groupBox)
self.gridlayout1.setObjectName("gridlayout1")
- self.rdoBoundary = QtGui.QRadioButton(self.groupBox)
- self.rdoBoundary.setChecked(True)
- self.rdoBoundary.setObjectName("rdoBoundary")
- self.gridlayout1.addWidget(self.rdoBoundary,0,0,1,2)
+ spacerItem = QtGui.QSpacerItem(80,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.gridlayout1.addItem(spacerItem,1,0,1,1)
- self.inShape = QtGui.QComboBox(self.groupBox)
- self.inShape.setObjectName("inShape")
- self.gridlayout1.addWidget(self.inShape,1,0,1,2)
+ self.btnUpdate = QtGui.QToolButton(self.groupBox)
+ self.btnUpdate.setMinimumSize(QtCore.QSize(0,30))
+ self.btnUpdate.setObjectName("btnUpdate")
+ self.gridlayout1.addWidget(self.btnUpdate,1,1,1,2)
- self.rdoCoordinates = QtGui.QRadioButton(self.groupBox)
- self.rdoCoordinates.setObjectName("rdoCoordinates")
- self.gridlayout1.addWidget(self.rdoCoordinates,2,0,1,2)
+ spacerItem1 = QtGui.QSpacerItem(79,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.gridlayout1.addItem(spacerItem1,1,3,1,1)
self.hboxlayout = QtGui.QHBoxLayout()
self.hboxlayout.setObjectName("hboxlayout")
self.label = QtGui.QLabel(self.groupBox)
- self.label.setEnabled(False)
+ self.label.setEnabled(True)
self.label.setObjectName("label")
self.hboxlayout.addWidget(self.label)
self.xMin = QtGui.QLineEdit(self.groupBox)
+ self.xMin.setEnabled(True)
self.xMin.setObjectName("xMin")
self.hboxlayout.addWidget(self.xMin)
- self.gridlayout1.addLayout(self.hboxlayout,3,0,1,1)
+ self.gridlayout1.addLayout(self.hboxlayout,2,0,1,2)
self.hboxlayout1 = QtGui.QHBoxLayout()
self.hboxlayout1.setObjectName("hboxlayout1")
self.label_4 = QtGui.QLabel(self.groupBox)
- self.label_4.setEnabled(False)
+ self.label_4.setEnabled(True)
self.label_4.setObjectName("label_4")
self.hboxlayout1.addWidget(self.label_4)
self.yMin = QtGui.QLineEdit(self.groupBox)
+ self.yMin.setEnabled(True)
self.yMin.setObjectName("yMin")
self.hboxlayout1.addWidget(self.yMin)
- self.gridlayout1.addLayout(self.hboxlayout1,3,1,1,1)
+ self.gridlayout1.addLayout(self.hboxlayout1,2,2,1,2)
self.hboxlayout2 = QtGui.QHBoxLayout()
self.hboxlayout2.setObjectName("hboxlayout2")
self.label_3 = QtGui.QLabel(self.groupBox)
- self.label_3.setEnabled(False)
+ self.label_3.setEnabled(True)
self.label_3.setObjectName("label_3")
self.hboxlayout2.addWidget(self.label_3)
self.xMax = QtGui.QLineEdit(self.groupBox)
+ self.xMax.setEnabled(True)
self.xMax.setObjectName("xMax")
self.hboxlayout2.addWidget(self.xMax)
- self.gridlayout1.addLayout(self.hboxlayout2,4,0,1,1)
+ self.gridlayout1.addLayout(self.hboxlayout2,3,0,1,2)
self.hboxlayout3 = QtGui.QHBoxLayout()
self.hboxlayout3.setObjectName("hboxlayout3")
self.label_5 = QtGui.QLabel(self.groupBox)
- self.label_5.setEnabled(False)
+ self.label_5.setEnabled(True)
self.label_5.setObjectName("label_5")
self.hboxlayout3.addWidget(self.label_5)
self.yMax = QtGui.QLineEdit(self.groupBox)
+ self.yMax.setEnabled(True)
self.yMax.setObjectName("yMax")
self.hboxlayout3.addWidget(self.yMax)
- self.gridlayout1.addLayout(self.hboxlayout3,4,1,1,1)
+ self.gridlayout1.addLayout(self.hboxlayout3,3,2,1,2)
+
+ self.inShape = QtGui.QComboBox(self.groupBox)
+ self.inShape.setObjectName("inShape")
+ self.gridlayout1.addWidget(self.inShape,0,0,1,4)
self.gridlayout.addWidget(self.groupBox,0,0,1,2)
self.gridBox = QtGui.QGroupBox(Dialog)
@@ -97,8 +103,8 @@
self.gridlayout2 = QtGui.QGridLayout(self.gridBox)
self.gridlayout2.setObjectName("gridlayout2")
- spacerItem = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
- self.gridlayout2.addItem(spacerItem,0,0,1,1)
+ spacerItem2 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.gridlayout2.addItem(spacerItem2,0,0,1,1)
self.label_7 = QtGui.QLabel(self.gridBox)
self.label_7.setObjectName("label_7")
@@ -107,7 +113,7 @@
self.spnX = QtGui.QDoubleSpinBox(self.gridBox)
self.spnX.setDecimals(4)
self.spnX.setMinimum(0.0001)
- self.spnX.setMaximum(9999.0)
+ self.spnX.setMaximum(999999999.0)
self.spnX.setSingleStep(0.0001)
self.spnX.setObjectName("spnX")
self.gridlayout2.addWidget(self.spnX,0,2,1,1)
@@ -117,11 +123,11 @@
self.chkLock.setObjectName("chkLock")
self.gridlayout2.addWidget(self.chkLock,0,3,2,1)
- spacerItem1 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
- self.gridlayout2.addItem(spacerItem1,0,4,1,1)
+ spacerItem3 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.gridlayout2.addItem(spacerItem3,0,4,1,1)
- spacerItem2 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
- self.gridlayout2.addItem(spacerItem2,1,0,1,1)
+ spacerItem4 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.gridlayout2.addItem(spacerItem4,1,0,1,1)
self.label_8 = QtGui.QLabel(self.gridBox)
self.label_8.setEnabled(False)
@@ -132,7 +138,7 @@
self.spnY.setEnabled(False)
self.spnY.setDecimals(4)
self.spnY.setMinimum(0.0001)
- self.spnY.setMaximum(9999.0)
+ self.spnY.setMaximum(999999999.0)
self.spnY.setSingleStep(0.0001)
self.spnY.setObjectName("spnY")
self.gridlayout2.addWidget(self.spnY,1,2,1,1)
@@ -186,24 +192,14 @@
self.retranslateUi(Dialog)
QtCore.QObject.connect(self.buttonBox_2,QtCore.SIGNAL("accepted()"),Dialog.accept)
QtCore.QObject.connect(self.buttonBox_2,QtCore.SIGNAL("rejected()"),Dialog.close)
- QtCore.QObject.connect(self.rdoBoundary,QtCore.SIGNAL("toggled(bool)"),self.inShape.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.xMin.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.xMax.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.yMin.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.yMax.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.label.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.label_3.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.label_4.setEnabled)
- QtCore.QObject.connect(self.rdoCoordinates,QtCore.SIGNAL("toggled(bool)"),self.label_5.setEnabled)
QtCore.QObject.connect(self.chkLock,QtCore.SIGNAL("clicked(bool)"),self.spnY.setDisabled)
QtCore.QObject.connect(self.chkLock,QtCore.SIGNAL("toggled(bool)"),self.label_8.setDisabled)
QtCore.QMetaObject.connectSlotsByName(Dialog)
def retranslateUi(self, Dialog):
Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Generate Regular Points", None, QtGui.QApplication.UnicodeUTF8))
- self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", "Grid Extent", None, QtGui.QApplication.UnicodeUTF8))
- self.rdoBoundary.setText(QtGui.QApplication.translate("Dialog", "Input Boundary Layer", None, QtGui.QApplication.UnicodeUTF8))
- self.rdoCoordinates.setText(QtGui.QApplication.translate("Dialog", "Input Coordinates", None, QtGui.QApplication.UnicodeUTF8))
+ self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", "Grid extent", None, QtGui.QApplication.UnicodeUTF8))
+ self.btnUpdate.setText(QtGui.QApplication.translate("Dialog", "Update extents from layer", None, QtGui.QApplication.UnicodeUTF8))
self.label.setText(QtGui.QApplication.translate("Dialog", "X Min", None, QtGui.QApplication.UnicodeUTF8))
self.label_4.setText(QtGui.QApplication.translate("Dialog", "Y Min", None, QtGui.QApplication.UnicodeUTF8))
self.label_3.setText(QtGui.QApplication.translate("Dialog", "X Max", None, QtGui.QApplication.UnicodeUTF8))
@@ -212,8 +208,8 @@
self.label_7.setText(QtGui.QApplication.translate("Dialog", "X", None, QtGui.QApplication.UnicodeUTF8))
self.chkLock.setText(QtGui.QApplication.translate("Dialog", "Lock 1:1 ratio", None, QtGui.QApplication.UnicodeUTF8))
self.label_8.setText(QtGui.QApplication.translate("Dialog", "Y", None, QtGui.QApplication.UnicodeUTF8))
- self.rdoPolygons.setText(QtGui.QApplication.translate("Dialog", "Output as polygons", None, QtGui.QApplication.UnicodeUTF8))
- self.rdoLines.setText(QtGui.QApplication.translate("Dialog", "Output as lines", None, QtGui.QApplication.UnicodeUTF8))
- self.label_2.setText(QtGui.QApplication.translate("Dialog", "Output Shapefile", None, QtGui.QApplication.UnicodeUTF8))
+ self.rdoPolygons.setText(QtGui.QApplication.translate("Dialog", "Output grid as polygons", None, QtGui.QApplication.UnicodeUTF8))
+ self.rdoLines.setText(QtGui.QApplication.translate("Dialog", "Output grid as lines", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_2.setText(QtGui.QApplication.translate("Dialog", "Output shapefile", None, QtGui.QApplication.UnicodeUTF8))
self.toolOut.setText(QtGui.QApplication.translate("Dialog", "Browse", None, QtGui.QApplication.UnicodeUTF8))
Modified: trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.ui
===================================================================
--- trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.ui 2009-01-27 12:44:59 UTC (rev 10034)
+++ trunk/qgis/python/plugins/ftools/tools/frmVectorGrid.ui 2009-01-27 23:38:46 UTC (rev 10035)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>374</width>
- <height>483</height>
+ <width>369</width>
+ <height>459</height>
</rect>
</property>
<property name="windowTitle" >
@@ -18,39 +18,58 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout" >
+ <layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
- <string>Grid Extent</string>
+ <string>Grid extent</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QRadioButton" name="rdoBoundary" >
- <property name="text" >
- <string>Input Boundary Layer</string>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="1" column="0" >
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="checked" >
- <bool>true</bool>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>80</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QComboBox" name="inShape" />
- </item>
- <item row="2" column="0" colspan="2" >
- <widget class="QRadioButton" name="rdoCoordinates" >
+ <item row="1" column="1" colspan="2" >
+ <widget class="QToolButton" name="btnUpdate" >
+ <property name="minimumSize" >
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
<property name="text" >
- <string>Input Coordinates</string>
+ <string>Update extents from layer</string>
</property>
</widget>
</item>
- <item row="3" column="0" >
+ <item row="1" column="3" >
+ <spacer name="horizontalSpacer_2" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>79</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="text" >
<string>X Min</string>
@@ -58,16 +77,26 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="xMin" />
+ <widget class="QLineEdit" name="xMin" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="inputMask" >
+ <string/>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
</item>
</layout>
</item>
- <item row="3" column="1" >
+ <item row="2" column="2" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_4" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="text" >
<string>Y Min</string>
@@ -75,16 +104,26 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="yMin" />
+ <widget class="QLineEdit" name="yMin" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="inputMask" >
+ <string/>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
</item>
</layout>
</item>
- <item row="4" column="0" >
+ <item row="3" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_3" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="text" >
<string>X Max</string>
@@ -92,16 +131,26 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="xMax" />
+ <widget class="QLineEdit" name="xMax" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="inputMask" >
+ <string/>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
</item>
</layout>
</item>
- <item row="4" column="1" >
+ <item row="3" column="2" colspan="2" >
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="label_5" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="text" >
<string>Y Max</string>
@@ -109,10 +158,23 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="yMax" />
+ <widget class="QLineEdit" name="yMax" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="inputMask" >
+ <string/>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
</item>
</layout>
</item>
+ <item row="0" column="0" colspan="4" >
+ <widget class="QComboBox" name="inShape" />
+ </item>
</layout>
</widget>
</item>
@@ -151,7 +213,7 @@
<double>0.000100000000000</double>
</property>
<property name="maximum" >
- <double>9999.000000000000000</double>
+ <double>999999999.000000000000000</double>
</property>
<property name="singleStep" >
<double>0.000100000000000</double>
@@ -216,7 +278,7 @@
<double>0.000100000000000</double>
</property>
<property name="maximum" >
- <double>9999.000000000000000</double>
+ <double>999999999.000000000000000</double>
</property>
<property name="singleStep" >
<double>0.000100000000000</double>
@@ -226,7 +288,7 @@
<item row="2" column="0" colspan="3" >
<widget class="QRadioButton" name="rdoPolygons" >
<property name="text" >
- <string>Output as polygons</string>
+ <string>Output grid as polygons</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -236,7 +298,7 @@
<item row="3" column="0" colspan="3" >
<widget class="QRadioButton" name="rdoLines" >
<property name="text" >
- <string>Output as lines</string>
+ <string>Output grid as lines</string>
</property>
</widget>
</item>
@@ -252,7 +314,7 @@
</sizepolicy>
</property>
<property name="text" >
- <string>Output Shapefile</string>
+ <string>Output shapefile</string>
</property>
</widget>
</item>
@@ -298,6 +360,12 @@
</widget>
</item>
</layout>
+ <zorder>groupBox</zorder>
+ <zorder>gridBox</zorder>
+ <zorder>label_2</zorder>
+ <zorder>progressBar</zorder>
+ <zorder>buttonBox_2</zorder>
+ <zorder>inShape</zorder>
</widget>
<resources/>
<connections>
@@ -308,8 +376,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
- <x>142</x>
- <y>444</y>
+ <x>330</x>
+ <y>449</y>
</hint>
<hint type="destinationlabel" >
<x>215</x>
@@ -324,8 +392,8 @@
<slot>close()</slot>
<hints>
<hint type="sourcelabel" >
- <x>68</x>
- <y>444</y>
+ <x>256</x>
+ <y>449</y>
</hint>
<hint type="destinationlabel" >
<x>132</x>
@@ -334,162 +402,18 @@
</hints>
</connection>
<connection>
- <sender>rdoBoundary</sender>
- <signal>toggled(bool)</signal>
- <receiver>inShape</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>125</x>
- <y>59</y>
- </hint>
- <hint type="destinationlabel" >
- <x>123</x>
- <y>89</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>xMin</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>57</x>
- <y>120</y>
- </hint>
- <hint type="destinationlabel" >
- <x>118</x>
- <y>151</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>xMax</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>39</x>
- <y>120</y>
- </hint>
- <hint type="destinationlabel" >
- <x>132</x>
- <y>183</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>yMin</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>102</x>
- <y>120</y>
- </hint>
- <hint type="destinationlabel" >
- <x>351</x>
- <y>151</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>yMax</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>78</x>
- <y>120</y>
- </hint>
- <hint type="destinationlabel" >
- <x>351</x>
- <y>183</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>label</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>26</x>
- <y>115</y>
- </hint>
- <hint type="destinationlabel" >
- <x>34</x>
- <y>143</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_3</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>155</x>
- <y>111</y>
- </hint>
- <hint type="destinationlabel" >
- <x>52</x>
- <y>170</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_4</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>222</x>
- <y>108</y>
- </hint>
- <hint type="destinationlabel" >
- <x>213</x>
- <y>136</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>rdoCoordinates</sender>
- <signal>toggled(bool)</signal>
- <receiver>label_5</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>257</x>
- <y>119</y>
- </hint>
- <hint type="destinationlabel" >
- <x>210</x>
- <y>174</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>chkLock</sender>
<signal>clicked(bool)</signal>
<receiver>spnY</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
- <x>264</x>
- <y>268</y>
+ <x>279</x>
+ <y>244</y>
</hint>
<hint type="destinationlabel" >
- <x>158</x>
- <y>272</y>
+ <x>164</x>
+ <y>280</y>
</hint>
</hints>
</connection>
@@ -500,12 +424,12 @@
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
- <x>248</x>
- <y>256</y>
+ <x>302</x>
+ <y>261</y>
</hint>
<hint type="destinationlabel" >
- <x>90</x>
- <y>275</y>
+ <x>73</x>
+ <y>280</y>
</hint>
</hints>
</connection>
More information about the QGIS-commit
mailing list