Fix #2443 - georeferencer switches 'link georeferencer to QGIS' and 'link QGIS to georeferencer' labels.

mmassing · mmassing · commit 74997f85affe · 2010-02-15T10:59:58.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12947 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -364,25 +364,35 @@ void QgsGeorefPluginGui::zoomToNext()
   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 @@ void QgsGeorefPluginGui::extentsChangedGeorefCanvas()
     return;
   }
 
-  if (mActionLinkGeorefToQGis->isChecked())
+  if (mActionLinkQGisToGeoref->isChecked())
   {
     if (!updateGeorefTransform())
     {
@@ -593,7 +603,7 @@ void QgsGeorefPluginGui::extentsChangedQGisCanvas()
     return;
   }
 
-  if (mActionLinkQGisToGeoref->isChecked())
+  if (mActionLinkGeorefToQGis->isChecked())
   {
     // Update transform if necessary
     if (!updateGeorefTransform())

Original file line number	Diff line number	Diff line change
`@@ -364,25 +364,35 @@ void QgsGeorefPluginGui::zoomToNext()`
`364`	`364`	`mCanvas->zoomToNextExtent();`
`365`	`365`	`}`
`366`	`366`
`367`		`-void QgsGeorefPluginGui::linkGeorefToQGis( bool link )`
	`367`	`+void QgsGeorefPluginGui::linkQGisToGeoref( bool link )`
`368`	`368`	`{`
`369`	`369`	`if ( link )`
`370`	`370`	`{`
`371`	`371`	`if (QgsGeorefTransform::InvalidTransform != mTransformParam)`
	`372`	`+ {`
	`373`	`+ // Indicate that georeferencer canvas extent has changed`
`372`	`374`	`extentsChangedGeorefCanvas();`
	`375`	`+ }`
`373`	`376`	`else`
	`377`	`+ {`
`374`	`378`	`mActionLinkGeorefToQGis->setEnabled(false);`
	`379`	`+ }`
`375`	`380`	`}`
`376`	`381`	`}`
`377`	`382`
`378`		`-void QgsGeorefPluginGui::linkQGisToGeoref( bool link )`
	`383`	`+void QgsGeorefPluginGui::linkGeorefToQGis( bool link )`
`379`	`384`	`{`
`380`	`385`	`if ( link )`
`381`	`386`	`{`
`382`	`387`	`if (QgsGeorefTransform::InvalidTransform != mTransformParam)`
	`388`	`+ {`
	`389`	`+ // Indicate that qgis main canvas extent has changed`
`383`	`390`	`extentsChangedQGisCanvas();`
	`391`	`+ }`
`384`	`392`	`else`
	`393`	`+ {`
`385`	`394`	`mActionLinkQGisToGeoref->setEnabled(false);`
	`395`	`+ }`
`386`	`396`	`}`
`387`	`397`	`}`
`388`	`398`
`@@ -565,7 +575,7 @@ void QgsGeorefPluginGui::extentsChangedGeorefCanvas()`
`565`	`575`	`return;`
`566`	`576`	`}`
`567`	`577`
`568`		`- if (mActionLinkGeorefToQGis->isChecked())`
	`578`	`+ if (mActionLinkQGisToGeoref->isChecked())`
`569`	`579`	`{`
`570`	`580`	`if (!updateGeorefTransform())`
`571`	`581`	`{`
`@@ -593,7 +603,7 @@ void QgsGeorefPluginGui::extentsChangedQGisCanvas()`
`593`	`603`	`return;`
`594`	`604`	`}`
`595`	`605`
`596`		`- if (mActionLinkQGisToGeoref->isChecked())`
	`606`	`+ if (mActionLinkGeorefToQGis->isChecked())`
`597`	`607`	`{`
`598`	`608`	`// Update transform if necessary`
`599`	`609`	`if (!updateGeorefTransform())`