Index: python/plugins/GdalTools/__init__.py
===================================================================
--- python/plugins/GdalTools/__init__.py (revision 14020)
+++ python/plugins/GdalTools/__init__.py (working copy)
@@ -22,7 +22,7 @@
def description():
return "Integrate gdal tools into qgis"
def version():
- return "Version 1.2.9"
+ return "Version 1.2.10"
def qgisMinimumVersion():
return "1.0"
def classFactory(iface):
Index: python/plugins/GdalTools/tools/doOverview.py
===================================================================
--- python/plugins/GdalTools/tools/doOverview.py (revision 14020)
+++ python/plugins/GdalTools/tools/doOverview.py (working copy)
@@ -32,7 +32,11 @@
(self.inputLayerCombo, [SIGNAL("currentIndexChanged(int)"), SIGNAL("editTextChanged(const QString &)")] ),
( self.algorithmCombo, SIGNAL( "currentIndexChanged( int )" ), self.algorithmCheck ),
( self.levelsEdit, SIGNAL( "textChanged( const QString & )" ) ),
- ( self.roModeCheck, SIGNAL( "stateChanged( int )" ) )
+ ( self.roModeCheck, SIGNAL( "stateChanged( int )" ) ),
+ ( self.rrdCheck, SIGNAL( "stateChanged(int)" ) ),
+ ( self.jpegQualitySpin, SIGNAL( "valueChanged (int)" ), self.tiffjpegCheck),
+ ( self.jpegQualityContainer, None, None, "1.7.0"), #only show for GDAL >=1.7.0
+ ( self.cleanCheck, SIGNAL( "stateChanged(int)" ), None, "1.7.0" ) #only show for GDAL >=1.7.0
]
)
@@ -96,6 +100,14 @@
arguments << self.resampling_method[self.algorithmCombo.currentIndex()]
if self.roModeCheck.isChecked():
arguments << "-ro"
+ if self.rrdCheck.isChecked():
+ arguments << "--config" << "USE_RRD" << "YES"
+ if self.tiffjpegCheck.isChecked():
+ arguments << "--config" << "COMPRESS_OVERVIEW" << "JPEG" << "--config" << "PHOTOMETRIC_OVERVIEW" << "YCBCR" << "--config" << "INTERLEAVE_OVERVIEW" << "PIXEL"
+ if self.jpegQualityContainer.isVisible():
+ arguments << "--config" << "JPEG_QUALITY_OVERVIEW" << self.jpegQualitySpin.cleanText()
+ if self.cleanCheck.isChecked():
+ arguments << "-clean"
if self.isBatchEnabled():
return arguments
Index: python/plugins/GdalTools/tools/doTranslate.py
===================================================================
--- python/plugins/GdalTools/tools/doTranslate.py (revision 14020)
+++ python/plugins/GdalTools/tools/doTranslate.py (working copy)
@@ -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:
Index: python/plugins/GdalTools/tools/widgetOverview.ui
===================================================================
--- python/plugins/GdalTools/tools/widgetOverview.ui (revision 14020)
+++ python/plugins/GdalTools/tools/widgetOverview.ui (working copy)
@@ -6,12 +6,12 @@
0
0
- 376
- 205
+ 391
+ 293
-
+
0
0
@@ -120,13 +120,107 @@
-
+
+
+ Remove all overviews.
+
+
+ Clean
+
+
+
+ -
+
+ In order to generate external overview (for GeoTIFF especially).
+
Open in read-only mode
-
+
+
+ Create external overviews in TIFF format, compressed using JPEG.
+
+
+ Overviews in TIFF format with JPEG compression
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 25
+
+
+
+
+
+ 42
+ 2
+ 131
+ 17
+
+
+
+ For JPEG compressed external overviews,
+the JPEG quality can be set.
+
+
+ JPEG Quality (1-100):
+
+
+
+
+ true
+
+
+
+ 170
+ 0
+ 50
+ 23
+
+
+
+ For JPEG compressed external overviews,
+the JPEG quality can be set.
+
+
+ 100
+
+
+ 50
+
+
+
+
+ -
+
+
+ Alternate overview format using Erdas Imagine format,
+placing the overviews in an associated .aux file
+suitable for direct use with Imagine,ArcGIS, GDAL.
+
+
+ Use Imagine format (.aux file)
+
+
+
+ -