WMS:

jef-n · jef-n · commit 836e1a86368f · 2013-11-15T17:33:13.000+01:00
- don't let failing (optional) GetLegendGraphic request block every following
  request
- don't refresh legend symbology everytime the extent changes
  (ie. don't GetLegendGraphic again and again)
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -114,8 +114,11 @@ QgsLegend::QgsLegend( QgsMapCanvas *canvas, QWidget * parent, const char *name )
 
   connect( mMapCanvas, SIGNAL( layersChanged() ),
            this, SLOT( refreshCheckStates() ) );
+#if 0
+  // too much
   connect( mMapCanvas, SIGNAL( extentsChanged() ),
            this, SLOT( updateLegendItemSymbologies() ) );
+#endif
 
   // Initialise the line indicator widget.
   mInsertionLine = new QWidget( viewport() );
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -1019,13 +1019,13 @@ void QgsWmsProvider::readBlock( int bandNo, QgsRectangle  const & viewExtent, in
   Q_UNUSED( bandNo );
   QgsDebugMsg( "Entered" );
   // TODO: optimize to avoid writing to QImage
-  QImage* image = draw( viewExtent, pixelWidth, pixelHeight );
-
-  if ( ! image )   // should not happen
+  QImage *image = draw( viewExtent, pixelWidth, pixelHeight );
+  if ( !image )   // should not happen
   {
     QgsMessageLog::logMessage( tr( "image is NULL" ), tr( "WMS" ) );
     return;
   }
+
   QgsDebugMsg( QString( "image height = %1 bytesPerLine = %2" ).arg( image->height() ) . arg( image->bytesPerLine() ) ) ;
   size_t myExpectedSize = pixelWidth * pixelHeight * 4;
   size_t myImageSize = image->height() *  image->bytesPerLine();
@@ -4785,9 +4785,7 @@ void QgsWmsProvider::getLegendGraphicReplyFinished()
   }
   else
   {
-    mErrorFormat = "text/plain";
-    mError = tr( "Download of GetLegendGraphic failed: %1" ).arg( mGetLegendGraphicReply->errorString() );
-    QgsMessageLog::logMessage( mError, tr( "WMS" ) );
+    QgsMessageLog::logMessage( tr( "Download of GetLegendGraphic failed: %1" ).arg( mGetLegendGraphicReply->errorString() ), tr( "WMS" ) );
     mHttpGetLegendGraphicResponse.clear();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1019,13 +1019,13 @@ void QgsWmsProvider::readBlock( int bandNo, QgsRectangle const & viewExtent, in`
`1019`	`1019`	`Q_UNUSED( bandNo );`
`1020`	`1020`	`QgsDebugMsg( "Entered" );`
`1021`	`1021`	`// TODO: optimize to avoid writing to QImage`
`1022`		`- QImage* image = draw( viewExtent, pixelWidth, pixelHeight );`
`1023`		`-`
`1024`		`- if ( ! image ) // should not happen`
	`1022`	`+ QImage *image = draw( viewExtent, pixelWidth, pixelHeight );`
	`1023`	`+ if ( !image ) // should not happen`
`1025`	`1024`	`{`
`1026`	`1025`	`QgsMessageLog::logMessage( tr( "image is NULL" ), tr( "WMS" ) );`
`1027`	`1026`	`return;`
`1028`	`1027`	`}`
	`1028`	`+`
`1029`	`1029`	`QgsDebugMsg( QString( "image height = %1 bytesPerLine = %2" ).arg( image->height() ) . arg( image->bytesPerLine() ) ) ;`
`1030`	`1030`	`size_t myExpectedSize = pixelWidth * pixelHeight * 4;`
`1031`	`1031`	`size_t myImageSize = image->height() * image->bytesPerLine();`
`@@ -4785,9 +4785,7 @@ void QgsWmsProvider::getLegendGraphicReplyFinished()`
`4785`	`4785`	`}`
`4786`	`4786`	`else`
`4787`	`4787`	`{`
`4788`		`- mErrorFormat = "text/plain";`
`4789`		`- mError = tr( "Download of GetLegendGraphic failed: %1" ).arg( mGetLegendGraphicReply->errorString() );`
`4790`		`- QgsMessageLog::logMessage( mError, tr( "WMS" ) );`
	`4788`	`+ QgsMessageLog::logMessage( tr( "Download of GetLegendGraphic failed: %1" ).arg( mGetLegendGraphicReply->errorString() ), tr( "WMS" ) );`
`4791`	`4789`	`mHttpGetLegendGraphicResponse.clear();`
`4792`	`4790`	`}`
`4793`	`4791`