fix #2255

jef · jef · commit 92e67c85ce10 · 2009-12-11T10:27:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12405 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
@@ -159,13 +159,15 @@ void QgsIdentifyResults::addFeature( QgsMapLayer *layer, int fid,
     if ( vlayer )
     {
       connect( vlayer, SIGNAL( layerDeleted() ), this, SLOT( layerDestroyed() ) );
+      connect( vlayer, SIGNAL( layerCrsChanged() ), this, SLOT( layerDestroyed() ) );
       connect( vlayer, SIGNAL( featureDeleted( int ) ), this, SLOT( featureDeleted( int ) ) );
       connect( vlayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );
       connect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
     }
     else
     {
       connect( layer, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) );
+      connect( layer, SIGNAL( layerCrsChanged() ), this, SLOT( layerDestroyed() ) );
     }
   }
 
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -440,9 +440,11 @@ const QgsCoordinateReferenceSystem& QgsMapLayer::srs()
   return *mCRS;
 }
 
-void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem& srs )
+void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal )
 {
   *mCRS = srs;
+  if ( emitSignal )
+    emit layerCrsChanged();
 }
 
 unsigned int QgsMapLayer::getTransparency()
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -211,8 +211,9 @@ class CORE_EXPORT QgsMapLayer : public QObject
     */
     const QgsCoordinateReferenceSystem& srs();
 
-    /** Sets layer's spatial reference system */
-    void setCrs( const QgsCoordinateReferenceSystem& srs );
+    /** Sets layer's spatial reference system
+    @note emitSignal added in 1.4 */
+    void setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal = true );
 
 
     /** A convenience function to capitalise the layer name */
@@ -320,9 +321,14 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /** Emit a signal with status (e.g. to be caught by QgisApp and display a msg on status bar) */
     void statusChanged( QString theStatus );
 
-    /** Emit a signal that layer name has been changed */
+    /** Emit a signal that the layer name has been changed */
     void layerNameChanged();
 
+    /** Emit a signal that layer's CRS has been reset
+     added in 1.4
+     */
+    void layerCrsChanged();
+
     /** This signal should be connected with the slot QgsMapCanvas::refresh()
      * @TODO: to be removed - GUI dependency
      */

Original file line number	Diff line number	Diff line change
`@@ -159,13 +159,15 @@ void QgsIdentifyResults::addFeature( QgsMapLayer *layer, int fid,`
`159`	`159`	`if ( vlayer )`
`160`	`160`	`{`
`161`	`161`	`connect( vlayer, SIGNAL( layerDeleted() ), this, SLOT( layerDestroyed() ) );`
	`162`	`+ connect( vlayer, SIGNAL( layerCrsChanged() ), this, SLOT( layerDestroyed() ) );`
`162`	`163`	`connect( vlayer, SIGNAL( featureDeleted( int ) ), this, SLOT( featureDeleted( int ) ) );`
`163`	`164`	`connect( vlayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );`
`164`	`165`	`connect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );`
`165`	`166`	`}`
`166`	`167`	`else`
`167`	`168`	`{`
`168`	`169`	`connect( layer, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) );`
	`170`	`+ connect( layer, SIGNAL( layerCrsChanged() ), this, SLOT( layerDestroyed() ) );`
`169`	`171`	`}`
`170`	`172`	`}`
`171`	`173`
Original file line number	Diff line number	Diff line change
`@@ -440,9 +440,11 @@ const QgsCoordinateReferenceSystem& QgsMapLayer::srs()`
`440`	`440`	`return *mCRS;`
`441`	`441`	`}`
`442`	`442`
`443`		`-void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem& srs )`
	`443`	`+void QgsMapLayer::setCrs( const QgsCoordinateReferenceSystem& srs, bool emitSignal )`
`444`	`444`	`{`
`445`	`445`	`*mCRS = srs;`
	`446`	`+ if ( emitSignal )`
	`447`	`+ emit layerCrsChanged();`
`446`	`448`	`}`
`447`	`449`
`448`	`450`	`unsigned int QgsMapLayer::getTransparency()`