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

[svn_qgis at osgeo.org]

Author: mmassing
Date: 2010-05-23 09:47:07 -0400 (Sun, 23 May 2010)
New Revision: 13554

Modified:
   trunk/qgis/src/plugins/georeferencer/qgsgcplistwidget.cpp
   trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
Log:
georeferencer: Fix parameter reporting when enabling/disabling GCPs.

Updates the model before emiting pointEnabled signal, so that downstream
handlers work with up-to-date transform parameters.

Modified: trunk/qgis/src/plugins/georeferencer/qgsgcplistwidget.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgcplistwidget.cpp	2010-05-23 13:46:56 UTC (rev 13553)
+++ trunk/qgis/src/plugins/georeferencer/qgsgcplistwidget.cpp	2010-05-23 13:47:07 UTC (rev 13554)
@@ -109,15 +109,14 @@
     if ( item->checkState() == Qt::Checked )
     {
       p->setEnabled( true );
-      emit pointEnabled( p, index.row() );
     }
     else // Qt::Unchecked
     {
       p->setEnabled( false );
-      emit pointEnabled( p, index.row() );
     }
 
     mGCPListModel->updateModel();
+    emit pointEnabled( p, index.row() );
     adjustTableContent();
   }
 

Modified: trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-05-23 13:46:56 UTC (rev 13553)
+++ trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-05-23 13:47:07 UTC (rev 13554)
@@ -1345,16 +1345,6 @@
     parameterLabel->setSceneRect( QRectF( 2, composerMap->rect().bottom() + composerMap->transform().dy() + 5, composition->paperWidth(), 8 ) );
     parameterLabel->setFrame( false );
 
-    int nPointsEnabled = 0;
-    QgsGCPList::const_iterator gcpIt = mPoints.constBegin();
-    for ( ; gcpIt != mPoints.constEnd(); ++gcpIt )
-    {
-      if (( *gcpIt )->isEnabled() )
-      {
-        ++nPointsEnabled;
-      }
-    }
-
     //calculate mean error
     double meanError = 0;
     calculateMeanError( meanError );