-Prevent QgsRasterLayer::idenfity() from proceeding if the provider key is wms

ersts · ersts · commit d9f3afa4e932 · 2008-09-26T17:19:56.000Z
-Change QgsRasterLayer::identify() to return a bool git-svn-id: http://svn.osgeo.org/qgis/trunk@9414 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgsrasterlayer.sip b/python/core/qgsrasterlayer.sip
@@ -77,7 +77,7 @@ public:
      *
      * \param point[in]  a coordinate in the CRS of this layer.
      */
-    void identify(const QgsPoint & point, QMap<QString,QString>& results /Out/);
+    bool identify(const QgsPoint & point, QMap<QString,QString>& results /Out/);
 
     /** \brief Identify arbitrary details from the WMS server found on the point position
      *
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -4416,8 +4416,14 @@ bool QgsRasterLayer::writeXml( QDomNode & layer_node,
 
 
 
-void QgsRasterLayer::identify( const QgsPoint& point, QMap<QString, QString>& results )
+bool QgsRasterLayer::identify( const QgsPoint& point, QMap<QString, QString>& results )
 {
+  results.clear();
+  if ( mProviderKey == "wms" )
+  {
+    return false;
+  }
+  
   double x = point.x();
   double y = point.y();
 
@@ -4478,7 +4484,8 @@ void QgsRasterLayer::identify( const QgsPoint& point, QMap<QString, QString>& re
     }
   }
 
-} // void QgsRasterLayer::identify
+  return true;
+} // bool QgsRasterLayer::identify
 
 
 QString QgsRasterLayer::identifyAsText( const QgsPoint& point )
diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -252,7 +252,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
      *
      * \param point[in]  a coordinate in the CRS of this layer.
      */
-    void identify( const QgsPoint & point, QMap<QString, QString>& results );
+    bool identify( const QgsPoint & point, QMap<QString, QString>& results );
 
     /** \brief Identify arbitrary details from the WMS server found on the point position
      *

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public:`
`77`	`77`	`*`
`78`	`78`	`* \param point[in] a coordinate in the CRS of this layer.`
`79`	`79`	`*/`
`80`		`- void identify(const QgsPoint & point, QMap<QString,QString>& results /Out/);`
	`80`	`+ bool identify(const QgsPoint & point, QMap<QString,QString>& results /Out/);`
`81`	`81`
`82`	`82`	`/** \brief Identify arbitrary details from the WMS server found on the point position`
`83`	`83`	`*`
Original file line number	Diff line number	Diff line change
`@@ -4416,8 +4416,14 @@ bool QgsRasterLayer::writeXml( QDomNode & layer_node,`
`4416`	`4416`
`4417`	`4417`
`4418`	`4418`
`4419`		`-void QgsRasterLayer::identify( const QgsPoint& point, QMap<QString, QString>& results )`
	`4419`	`+bool QgsRasterLayer::identify( const QgsPoint& point, QMap<QString, QString>& results )`
`4420`	`4420`	`{`
	`4421`	`+ results.clear();`
	`4422`	`+ if ( mProviderKey == "wms" )`
	`4423`	`+ {`
	`4424`	`+ return false;`
	`4425`	`+ }`
	`4426`	`+`
`4421`	`4427`	`double x = point.x();`
`4422`	`4428`	`double y = point.y();`
`4423`	`4429`
`@@ -4478,7 +4484,8 @@ void QgsRasterLayer::identify( const QgsPoint& point, QMap<QString, QString>& re`
`4478`	`4484`	`}`
`4479`	`4485`	`}`
`4480`	`4486`
`4481`		`-} // void QgsRasterLayer::identify`
	`4487`	`+ return true;`
	`4488`	`+} // bool QgsRasterLayer::identify`
`4482`	`4489`
`4483`	`4490`
`4484`	`4491`	`QString QgsRasterLayer::identifyAsText( const QgsPoint& point )`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer`
`252`	`252`	`*`
`253`	`253`	`* \param point[in] a coordinate in the CRS of this layer.`
`254`	`254`	`*/`
`255`		`- void identify( const QgsPoint & point, QMap<QString, QString>& results );`
	`255`	`+ bool identify( const QgsPoint & point, QMap<QString, QString>& results );`
`256`	`256`
`257`	`257`	`/** \brief Identify arbitrary details from the WMS server found on the point position`
`258`	`258`	`*`