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

[svn_qgis at osgeo.org]

Author: mmassing
Date: 2010-02-15 05:59:58 -0500 (Mon, 15 Feb 2010)
New Revision: 12947

Modified:
   trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
Log:
Fix #2443 - georeferencer switches 'link georeferencer to QGIS' and 'link QGIS to georeferencer' labels.

Modified: trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-02-15 10:26:13 UTC (rev 12946)
+++ trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-02-15 10:59:58 UTC (rev 12947)
@@ -364,25 +364,35 @@
   mCanvas->zoomToNextExtent();
 }
 
-void QgsGeorefPluginGui::linkGeorefToQGis( bool link )
+void QgsGeorefPluginGui::linkQGisToGeoref( bool link )
 {
   if ( link )
   {
     if (QgsGeorefTransform::InvalidTransform != mTransformParam)
+    {
+      // Indicate that georeferencer canvas extent has changed
       extentsChangedGeorefCanvas();
+    }
     else
+    {
       mActionLinkGeorefToQGis->setEnabled(false);
+    }
   }
 }
 
-void QgsGeorefPluginGui::linkQGisToGeoref( bool link )
+void QgsGeorefPluginGui::linkGeorefToQGis( bool link )
 {
   if ( link )
   {
     if (QgsGeorefTransform::InvalidTransform != mTransformParam)
+    {
+      // Indicate that qgis main canvas extent has changed
       extentsChangedQGisCanvas();
+    }
     else
+    {
       mActionLinkQGisToGeoref->setEnabled(false);
+    }
   }
 }
 
@@ -565,7 +575,7 @@
     return;
   }
 
-  if (mActionLinkGeorefToQGis->isChecked())
+  if (mActionLinkQGisToGeoref->isChecked())
   {
     if (!updateGeorefTransform())
     {
@@ -593,7 +603,7 @@
     return;
   }
 
-  if (mActionLinkQGisToGeoref->isChecked())
+  if (mActionLinkGeorefToQGis->isChecked())
   {
     // Update transform if necessary
     if (!updateGeorefTransform())