[QGIS Commit] r13959 - trunk/qgis/src/plugins/georeferencer

[svn_qgis at osgeo.org]

Author: mmassing
Date: 2010-07-25 15:20:01 +0000 (Sun, 25 Jul 2010)
New Revision: 13959

Modified:
   trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.cpp
   trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.h
   trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui
Log:
Patch by Luiz Motta: Do not translate gdal compression arguments, fixes #2881. Thanks.

Modified: trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.cpp	2010-07-24 20:24:44 UTC (rev 13958)
+++ trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.cpp	2010-07-25 15:20:01 UTC (rev 13959)
@@ -46,6 +46,19 @@
   mRegExpValidator = new QRegExpValidator( QRegExp( "(^epsg:{1}\\s*\\d+)|(^\\+proj.*)", Qt::CaseInsensitive ), leTargetSRS );
   leTargetSRS->setValidator( mRegExpValidator );
 
+  // Populate CompressionComboBox
+  mListCompression.append("NONE");
+  mListCompression.append("LZW");
+  mListCompression.append("PACKBITS");
+  mListCompression.append("DEFLATE");
+  QStringList listCompressionTr;
+  foreach ( QString item, mListCompression)
+  {
+    listCompressionTr.append(tr(item.toAscii().data()));
+  }
+  cmbCompressionComboBox->addItems(listCompressionTr);
+
+
   QSettings s;
   cmbTransformType->setCurrentIndex( s.value( "/Plugin-GeoReferencer/lasttransformation", -1 ).toInt() );
   cmbResampling->setCurrentIndex( s.value( "/Plugin-GeoReferencer/lastresampling", 0 ).toInt() );
@@ -86,7 +99,7 @@
     tp = ( QgsGeorefTransform::TransformParametrisation )cmbTransformType->currentIndex();
 
   rm = ( QgsImageWarper::ResamplingMethod )cmbResampling->currentIndex();
-  comprMethod = cmbCompressionComboBox->currentText();
+  comprMethod = mListCompression.at( cmbCompressionComboBox->currentIndex() );
   if ( mWorldFileCheckBox->isChecked() )
   {
     raster = "";

Modified: trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.h
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.h	2010-07-24 20:24:44 UTC (rev 13958)
+++ trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialog.h	2010-07-25 15:20:01 UTC (rev 13959)
@@ -12,7 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-/* $Id$ */
+/* $Id: qgstransformsettingsdialog.h 13764 2010-06-21 12:11:11Z mhugent $ */
 
 #ifndef QGSTRANSFORMSETTINGSDIALOG_H
 #define QGSTRANSFORMSETTINGSDIALOG_H
@@ -57,6 +57,8 @@
     QString mModifiedRaster;
 
     int mCountGCPpoints;
+
+    QStringList mListCompression;
 };
 
 #endif // QGSTRANSFORMSETTINGSDIALOG_H

Modified: trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui	2010-07-24 20:24:44 UTC (rev 13958)
+++ trunk/qgis/src/plugins/georeferencer/qgstransformsettingsdialogbase.ui	2010-07-25 15:20:01 UTC (rev 13959)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>356</width>
-    <height>381</height>
+    <height>429</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -93,26 +93,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <item>
-        <property name="text">
-         <string>NONE</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>LZW</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>PACKBITS</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>DEFLATE</string>
-        </property>
-       </item>
       </widget>
      </item>
      <item row="4" column="0">