[QGIS Commit] r14074 - trunk/qgis/python/plugins/GdalTools/tools

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2010-08-13 01:00:58 +0000 (Fri, 13 Aug 2010)
New Revision: 14074

Modified:
   trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
   trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py
   trunk/qgis/python/plugins/GdalTools/tools/widgetTranslate.ui
Log:
fixed nodata max and min value
corrected the spinboxes width
fixed issue using Arc/Info ASCII Grid as output format 


Modified: trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2010-08-12 19:57:00 UTC (rev 14073)
+++ trunk/qgis/python/plugins/GdalTools/tools/GdalTools_utils.py	2010-08-13 01:00:58 UTC (rev 14074)
@@ -281,8 +281,19 @@
   def allRastersFilter(self):
     if self.rastersFilter.isEmpty():
       QgsRasterLayer.buildSupportedRasterFileFilter(self.rastersFilter)
-      # separates multiple extensions (these are joined by a slash)
-      self.rastersFilter.replace( QRegExp('([^/])/([^/])'), '\\1 *.\\2')
+
+      # workaround for QGis < 1.5 (see #2376)
+      # separates multiple extensions that joined by a slash 
+      if QGis.QGIS_VERSION[0:3] < "1.8":
+          formats = self.rastersFilter.split( ";;" )
+          self.rastersFilter = QString()
+          for f in formats:
+            oldExts = QString(f).remove( QRegExp('^.*\(') ).remove( QRegExp('\).*$') )
+            newExts = QString(oldExts).replace( '/', ' *.' )
+            if not self.rastersFilter.isEmpty():
+              self.rastersFilter += ';;'
+            self.rastersFilter += f.replace( oldExts, newExts )
+
     return self.rastersFilter
 
   @classmethod

Modified: trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py	2010-08-12 19:57:00 UTC (rev 14073)
+++ trunk/qgis/python/plugins/GdalTools/tools/doTranslate.py	2010-08-13 01:00:58 UTC (rev 14074)
@@ -193,7 +193,7 @@
                       test = int(x)
               except ValueError:
                   #print "Coordinates must be integer numbers."
-                  QMessageBox.critical(self, "Translate - srcwin", "Image coordinates (pixels) must be integer numbers.")
+                  QMessageBox.critical(self, self.tr("Translate - srcwin"), self.tr("Image coordinates (pixels) must be integer numbers."))
               else:
                   arguments << "-srcwin"
                   for x in coordList:
@@ -207,7 +207,7 @@
                       test = float(x)
               except ValueError:
                   #print "Coordinates must be integer numbers."
-                  QMessageBox.critical(self, "Translate - prjwin", "Image coordinates (geographic) must be numbers.")
+                  QMessageBox.critical(self, self.tr("Translate - prjwin"), self.tr("Image coordinates (geographic) must be numbers."))
               else:
                   arguments << "-projwin"
                   for x in coordList:

Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetTranslate.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetTranslate.ui	2010-08-12 19:57:00 UTC (rev 14073)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetTranslate.ui	2010-08-13 01:00:58 UTC (rev 14074)
@@ -160,11 +160,11 @@
      </item>
      <item row="4" column="1">
       <widget class="QSpinBox" name="outsizeSpin">
-       <property name="maximumSize">
-        <size>
-         <width>75</width>
-         <height>16777215</height>
-        </size>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
        <property name="toolTip">
         <string>Percentage to resize image. This will change pixel size/image resolution accordingly: 25% will create an image with pixels 4x larger.</string>
@@ -190,22 +190,6 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QSpinBox" name="nodataSpin">
-       <property name="maximumSize">
-        <size>
-         <width>75</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Assign a specified nodata value to output bands.</string>
-       </property>
-       <property name="maximum">
-        <number>255</number>
-       </property>
-      </widget>
-     </item>
      <item row="6" column="0">
       <widget class="QCheckBox" name="expandCheck">
        <property name="toolTip">
@@ -286,6 +270,25 @@
        </property>
       </widget>
      </item>
+     <item row="5" column="1">
+      <widget class="QSpinBox" name="nodataSpin">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Assign a specified nodata value to output bands.</string>
+       </property>
+       <property name="minimum">
+        <number>-999999999</number>
+       </property>
+       <property name="maximum">
+        <number>999999999</number>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>