Show datum transform parameters in datum transform selection dialog

mhugent · mhugent · commit a919eed6778b · 2013-10-23T10:58:13.000+02:00
diff --git a/resources/srs.db b/resources/srs.db
diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h
@@ -213,6 +213,7 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
 
     /**Returns list of datum transformations for the given src and dest CRS*/
     static QList< QList< int > > datumTransformations( const QgsCoordinateReferenceSystem& srcCRS, const QgsCoordinateReferenceSystem& destCRS );
+    static QString datumTransformString( int datumTransform );
 
     int sourceDatumTransform() const { return mSourceDatumTransform; }
     void setSourceDatumTransform( int dt ) { mSourceDatumTransform = dt; }
@@ -284,7 +285,6 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
     /**Removes +nadgrids and +towgs84 from proj4 string*/
     static QString stripDatumTransform( const QString& proj4 );
     static void searchDatumTransform( const QString& sql, QList< int >& transforms );
-    static QString datumTransformString( int datumTransform );
 };
 
 //! Output stream operator
diff --git a/src/gui/qgsdatumtransformdialog.cpp b/src/gui/qgsdatumtransformdialog.cpp
@@ -1,4 +1,5 @@
 #include "qgsdatumtransformdialog.h"
+#include "qgscoordinatetransform.h"
 
 QgsDatumTransformDialog::QgsDatumTransformDialog( const QList< QList< int > >& dt, QWidget* parent, Qt::WindowFlags f ): QDialog( parent, f )
 {
@@ -10,10 +11,11 @@ QgsDatumTransformDialog::QgsDatumTransformDialog( const QList< QList< int > >& d
     QString itemText;
     for ( int i = 0; i < 2; ++i )
     {
-      itemText = QString::number( it->at( i ) );
-      if ( itemText.compare( "-1" ) != 0 )
+      int nr = it->at( i );
+      if ( nr != -1 )
       {
-        item->setText( i, itemText );
+        item->setData( i, Qt::UserRole, nr );
+        item->setText( i, QgsCoordinateTransform::datumTransformString( nr ) );
       }
     }
     mDatumTransformTreeWidget->addTopLevelItem( item );
@@ -37,15 +39,12 @@ QList< int > QgsDatumTransformDialog::selectedDatumTransform()
   {
     for ( int i = 0; i < 2; ++i )
     {
-      bool conversionOk = false;
-      QString itemText = item->text( i );
-      int transformNr = itemText.toInt( &conversionOk );
-      if ( !itemText.isEmpty() && conversionOk )
+      int transformNr = item->data( i, Qt::UserRole ).toInt();
+      if ( transformNr != -1 )
       {
         list << transformNr;
       }
     }
   }
-
   return list;
 }
diff --git a/src/ui/qgsdatumtransformdialogbase.ui b/src/ui/qgsdatumtransformdialogbase.ui
@@ -11,14 +11,19 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Select datum transformations</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QTreeWidget" name="mDatumTransformTreeWidget">
      <column>
       <property name="text">
-       <string/>
+       <string>src transform</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>dst transform</string>
       </property>
      </column>
      <column>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "qgsdatumtransformdialog.h"`
	`2`	`+#include "qgscoordinatetransform.h"`
`2`	`3`
`3`	`4`	`QgsDatumTransformDialog::QgsDatumTransformDialog( const QList< QList< int > >& dt, QWidget* parent, Qt::WindowFlags f ): QDialog( parent, f )`
`4`	`5`	`{`
`@@ -10,10 +11,11 @@ QgsDatumTransformDialog::QgsDatumTransformDialog( const QList< QList< int > >& d`
`10`	`11`	`QString itemText;`
`11`	`12`	`for ( int i = 0; i < 2; ++i )`
`12`	`13`	`{`
`13`		`- itemText = QString::number( it->at( i ) );`
`14`		`- if ( itemText.compare( "-1" ) != 0 )`
	`14`	`+ int nr = it->at( i );`
	`15`	`+ if ( nr != -1 )`
`15`	`16`	`{`
`16`		`- item->setText( i, itemText );`
	`17`	`+ item->setData( i, Qt::UserRole, nr );`
	`18`	`+ item->setText( i, QgsCoordinateTransform::datumTransformString( nr ) );`
`17`	`19`	`}`
`18`	`20`	`}`
`19`	`21`	`mDatumTransformTreeWidget->addTopLevelItem( item );`
`@@ -37,15 +39,12 @@ QList< int > QgsDatumTransformDialog::selectedDatumTransform()`
`37`	`39`	`{`
`38`	`40`	`for ( int i = 0; i < 2; ++i )`
`39`	`41`	`{`
`40`		`- bool conversionOk = false;`
`41`		`- QString itemText = item->text( i );`
`42`		`- int transformNr = itemText.toInt( &conversionOk );`
`43`		`- if ( !itemText.isEmpty() && conversionOk )`
	`42`	`+ int transformNr = item->data( i, Qt::UserRole ).toInt();`
	`43`	`+ if ( transformNr != -1 )`
`44`	`44`	`{`
`45`	`45`	`list << transformNr;`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`-`
`50`	`49`	`return list;`
`51`	`50`	`}`