Fix HTML annotation does not display HTML (fix #8609)

nyalldawson · nyalldawson · commit 48e6bfc65b64 · 2016-10-12T20:54:39.000+10:00
Annotation was only rendering html when it was associated with a map layer. Now if it isn't associated with a map layer it will always render the html. (cherry-picked from 53c3ed2)
diff --git a/src/gui/qgshtmlannotationitem.cpp b/src/gui/qgshtmlannotationitem.cpp
@@ -191,42 +191,44 @@ void QgsHtmlAnnotationItem::readXML( const QDomDocument& doc, const QDomElement&
 
 void QgsHtmlAnnotationItem::setFeatureForMapPosition()
 {
-  if ( !mVectorLayer || !mMapCanvas )
+  QString newText;
+  if ( mVectorLayer && mMapCanvas )
   {
-    return;
-  }
+    double halfIdentifyWidth = QgsMapTool::searchRadiusMU( mMapCanvas );
+    QgsRectangle searchRect( mMapPosition.x() - halfIdentifyWidth, mMapPosition.y() - halfIdentifyWidth,
+                             mMapPosition.x() + halfIdentifyWidth, mMapPosition.y() + halfIdentifyWidth );
 
-  QSettings settings;
-  double halfIdentifyWidth = QgsMapTool::searchRadiusMU( mMapCanvas );
-  QgsRectangle searchRect( mMapPosition.x() - halfIdentifyWidth, mMapPosition.y() - halfIdentifyWidth,
-                           mMapPosition.x() + halfIdentifyWidth, mMapPosition.y() + halfIdentifyWidth );
+    QgsFeatureIterator fit = mVectorLayer->getFeatures( QgsFeatureRequest().setFilterRect( searchRect ).setFlags( QgsFeatureRequest::NoGeometry | QgsFeatureRequest::ExactIntersect ) );
 
-  QgsFeatureIterator fit = mVectorLayer->getFeatures( QgsFeatureRequest().setFilterRect( searchRect ).setFlags( QgsFeatureRequest::NoGeometry | QgsFeatureRequest::ExactIntersect ) );
+    QgsFeature currentFeature;
+    QgsFeatureId currentFeatureId = 0;
+    bool featureFound = false;
+
+    while ( fit.nextFeature( currentFeature ) )
+    {
+      currentFeatureId = currentFeature.id();
+      featureFound = true;
+      break;
+    }
 
-  QgsFeature currentFeature;
-  QgsFeatureId currentFeatureId = 0;
-  bool featureFound = false;
+    mHasAssociatedFeature = featureFound;
+    mFeatureId = currentFeatureId;
+    mFeature = currentFeature;
 
-  while ( fit.nextFeature( currentFeature ) )
+    QgsExpressionContext context;
+    context << QgsExpressionContextUtils::globalScope()
+    << QgsExpressionContextUtils::projectScope()
+    << QgsExpressionContextUtils::layerScope( mVectorLayer );
+    if ( mMapCanvas )
+      context.appendScope( QgsExpressionContextUtils::mapSettingsScope( mMapCanvas->mapSettings() ) );
+    context.setFeature( mFeature );
+    newText = QgsExpression::replaceExpressionText( mHtmlSource, &context );
+  }
+  else
   {
-    currentFeatureId = currentFeature.id();
-    featureFound = true;
-    break;
+    newText = mHtmlSource;
   }
-
-  mHasAssociatedFeature = featureFound;
-  mFeatureId = currentFeatureId;
-  mFeature = currentFeature;
-
-  QgsExpressionContext context;
-  context << QgsExpressionContextUtils::globalScope()
-  << QgsExpressionContextUtils::projectScope()
-  << QgsExpressionContextUtils::layerScope( mVectorLayer );
-  if ( mMapCanvas )
-    context.appendScope( QgsExpressionContextUtils::mapSettingsScope( mMapCanvas->mapSettings() ) );
-  context.setFeature( mFeature );
-  QString newtext = QgsExpression::replaceExpressionText( mHtmlSource, &context );
-  mWebView->setHtml( newtext );
+  mWebView->setHtml( newText );
 }
 
 void QgsHtmlAnnotationItem::updateVisibility()
