show residuals in pixel for non-linear transformations

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13626 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 2, 2010 · 20f3504 · 20f3504
1 parent 3a2e0f7
commit 20f3504
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/src/plugins/georeferencer/qgsgcplistmodel.cpp b/src/plugins/georeferencer/qgsgcplistmodel.cpp
@@ -92,14 +92,22 @@ void QgsGCPListModel::updateModel()
   vector<QgsPoint> mapCoords, pixelCoords;
   mGCPList->createGCPVectors( mapCoords, pixelCoords );
 
-  // TODO: the parameters should probable be updated externally (by user interaction)
-  bTransformUpdated = mGeorefTransform->updateParametersFromGCPs( mapCoords, pixelCoords );
+
 
   //  // Setup table header
   QStringList itemLabels;
   QString unitType;
   QSettings s;
-  if ( s.value( "/Plugin-GeoReferencer/Config/ResidualUnits" ) == "mapUnits" )
+  bool mapUnitsPossible = false;
+
+  if ( mGeorefTransform )
+  {
+    bTransformUpdated = mGeorefTransform->updateParametersFromGCPs( mapCoords, pixelCoords );
+    mapUnitsPossible = mGeorefTransform->providesAccurateInverseTransformation();
+  }
+
+
+  if ( s.value( "/Plugin-GeoReferencer/Config/ResidualUnits" ) == "mapUnits" && mapUnitsPossible )
   {
     unitType = tr( "map units" );
   }

diff --git a/src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui b/src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui
@@ -70,7 +70,7 @@
       <item row="1" column="0">
        <widget class="QRadioButton" name="mMapUnitsButton">
         <property name="text">
-         <string>Map units</string>
+         <string>Use map units if possible</string>
         </property>
        </widget>
       </item>

diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -1344,7 +1344,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
 
   QString residualUnits;
   QSettings s;
-  if ( s.value( "/Plugin-GeoReferencer/Config/ResidualUnits" ) == "mapUnits" )
+  if ( s.value( "/Plugin-GeoReferencer/Config/ResidualUnits" ) == "mapUnits" && mGeorefTransform.providesAccurateInverseTransformation() )
   {
     residualUnits = tr( "map units" );
   }

diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp
@@ -150,6 +150,13 @@ void QgsGeorefTransform::selectTransformParametrisation( TransformParametrisatio
   }
 }
 
+bool QgsGeorefTransform::providesAccurateInverseTransformation() const
+{
+  return ( mTransformParametrisation == Linear \
+           || mTransformParametrisation == Helmert \
+           || mTransformParametrisation == PolynomialOrder1 );
+}
+
 bool QgsGeorefTransform::parametersInitialized() const
 {
   return mParametersInitialized;

diff --git a/src/plugins/georeferencer/qgsgeoreftransform.h b/src/plugins/georeferencer/qgsgeoreftransform.h
@@ -82,6 +82,9 @@ class QgsGeorefTransform : public QgsGeorefTransformInterface
     //! \brief The transform parametrisation currently in use.
     TransformParametrisation transformParametrisation() const;
 
+    /**True for linear, Helmert, first order polynomial*/
+    bool providesAccurateInverseTransformation() const;
+
     //! \returns whether the parameters of this transform have been initialised by \ref updateParametersFromGCPs
     bool parametersInitialized() const;