Skip to content
Permalink
Browse files
Patch by Luiz Motta: Do not translate gdal compression arguments, fixes
#2881. Thanks.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13959 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mmassing committed Jul 25, 2010
1 parent 1d023f8 commit 3af41b194422cedc2b8bbfb839186f82ada80b3d
@@ -46,6 +46,19 @@ QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, c
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 @@ void QgsTransformSettingsDialog::getTransformSettings( QgsGeorefTransform::Trans
tp = ( QgsGeorefTransform::TransformParametrisation )cmbTransformType->currentIndex();

rm = ( QgsImageWarper::ResamplingMethod )cmbResampling->currentIndex();
comprMethod = cmbCompressionComboBox->currentText();
comprMethod = mListCompression.at( cmbCompressionComboBox->currentIndex() );
if ( mWorldFileCheckBox->isChecked() )
{
raster = "";
@@ -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 @@ class QgsTransformSettingsDialog : public QDialog, private Ui::QgsTransformSetti
QString mModifiedRaster;

int mCountGCPpoints;

QStringList mListCompression;
};

#endif // QGSTRANSFORMSETTINGSDIALOG_H
@@ -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">

0 comments on commit 3af41b1

Please sign in to comment.