[composer] Fix refresh HTML item always using cached copy (fix #11747)

nyalldawson · nyalldawson · commit 949185179ebf · 2014-11-27T13:15:37.000+11:00
diff --git a/python/core/composer/qgscomposerhtml.sip b/python/core/composer/qgscomposerhtml.sip
@@ -183,10 +183,12 @@ class QgsComposerHtml: QgsComposerMultiFrame
   public slots:
 
     /**Reloads the html source from the url and redraws the item.
+     * @param useCache set to true to use a cached copy of remote html
+     * content
      * @see setUrl
      * @see url
      */
-    void loadHtml();
+    void loadHtml( const bool useCache = false );
 
     /**Recalculates the frame sizes for the current viewport dimensions*/
     void recalculateFrameSizes();
diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -120,7 +120,7 @@ void QgsComposerHtml::setUrl( const QUrl& url )
   }
 
   mUrl = url;
-  loadHtml();
+  loadHtml( true );
   emit changed();
 }
 
@@ -136,11 +136,11 @@ void QgsComposerHtml::setHtml( const QString html )
 void QgsComposerHtml::setEvaluateExpressions( bool evaluateExpressions )
 {
   mEvaluateExpressions = evaluateExpressions;
-  loadHtml();
+  loadHtml( true );
   emit changed();
 }
 
-void QgsComposerHtml::loadHtml()
+void QgsComposerHtml::loadHtml( const bool useCache )
 {
   if ( !mWebPage )
   {
@@ -166,7 +166,7 @@ void QgsComposerHtml::loadHtml()
       {
         return;
       }
-      if ( currentUrl != mLastFetchedUrl )
+      if ( !( useCache && currentUrl == mLastFetchedUrl ) )
       {
         loadedHtml = fetchHtml( QUrl( currentUrl ) );
         mLastFetchedUrl = currentUrl;
@@ -459,7 +459,7 @@ void QgsComposerHtml::setUserStylesheetEnabled( const bool stylesheetEnabled )
   if ( mEnableUserStylesheet != stylesheetEnabled )
   {
     mEnableUserStylesheet = stylesheetEnabled;
-    loadHtml();
+    loadHtml( true );
     emit changed();
   }
 }
@@ -518,7 +518,7 @@ bool QgsComposerHtml::readXML( const QDomElement& itemElem, const QDomDocument&
   {
     mUrl = urlString;
   }
-  loadHtml();
+  loadHtml( true );
 
   //since frames had to be created before, we need to emit a changed signal to refresh the widget
   emit changed();
@@ -562,15 +562,15 @@ void QgsComposerHtml::refreshExpressionContext()
   }
 
   setExpressionContext( feature, vl );
-  loadHtml();
+  loadHtml( true );
 }
 
 void QgsComposerHtml::refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property )
 {
   //updates data defined properties and redraws item to match
   if ( property == QgsComposerObject::SourceUrl || property == QgsComposerObject::AllProperties )
   {
-    loadHtml();
+    loadHtml( true );
   }
   QgsComposerObject::refreshDataDefinedProperty( property );
 }
diff --git a/src/core/composer/qgscomposerhtml.h b/src/core/composer/qgscomposerhtml.h
@@ -211,10 +211,12 @@ class CORE_EXPORT QgsComposerHtml: public QgsComposerMultiFrame
   public slots:
 
     /**Reloads the html source from the url and redraws the item.
+     * @param useCache set to true to use a cached copy of remote html
+     * content
      * @see setUrl
      * @see url
      */
-    void loadHtml();
+    void loadHtml( const bool useCache = false );
 
     /**Recalculates the frame sizes for the current viewport dimensions*/
     void recalculateFrameSizes();

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ void QgsComposerHtml::setUrl( const QUrl& url )`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`mUrl = url;`
`123`		`- loadHtml();`
	`123`	`+ loadHtml( true );`
`124`	`124`	`emit changed();`
`125`	`125`	`}`
`126`	`126`
`@@ -136,11 +136,11 @@ void QgsComposerHtml::setHtml( const QString html )`
`136`	`136`	`void QgsComposerHtml::setEvaluateExpressions( bool evaluateExpressions )`
`137`	`137`	`{`
`138`	`138`	`mEvaluateExpressions = evaluateExpressions;`
`139`		`- loadHtml();`
	`139`	`+ loadHtml( true );`
`140`	`140`	`emit changed();`
`141`	`141`	`}`
`142`	`142`
`143`		`-void QgsComposerHtml::loadHtml()`
	`143`	`+void QgsComposerHtml::loadHtml( const bool useCache )`
`144`	`144`	`{`
`145`	`145`	`if ( !mWebPage )`
`146`	`146`	`{`
`@@ -166,7 +166,7 @@ void QgsComposerHtml::loadHtml()`
`166`	`166`	`{`
`167`	`167`	`return;`
`168`	`168`	`}`
`169`		`- if ( currentUrl != mLastFetchedUrl )`
	`169`	`+ if ( !( useCache && currentUrl == mLastFetchedUrl ) )`
`170`	`170`	`{`
`171`	`171`	`loadedHtml = fetchHtml( QUrl( currentUrl ) );`
`172`	`172`	`mLastFetchedUrl = currentUrl;`
`@@ -459,7 +459,7 @@ void QgsComposerHtml::setUserStylesheetEnabled( const bool stylesheetEnabled )`
`459`	`459`	`if ( mEnableUserStylesheet != stylesheetEnabled )`
`460`	`460`	`{`
`461`	`461`	`mEnableUserStylesheet = stylesheetEnabled;`
`462`		`- loadHtml();`
	`462`	`+ loadHtml( true );`
`463`	`463`	`emit changed();`
`464`	`464`	`}`
`465`	`465`	`}`
`@@ -518,7 +518,7 @@ bool QgsComposerHtml::readXML( const QDomElement& itemElem, const QDomDocument&`
`518`	`518`	`{`
`519`	`519`	`mUrl = urlString;`
`520`	`520`	`}`
`521`		`- loadHtml();`
	`521`	`+ loadHtml( true );`
`522`	`522`
`523`	`523`	`//since frames had to be created before, we need to emit a changed signal to refresh the widget`
`524`	`524`	`emit changed();`
`@@ -562,15 +562,15 @@ void QgsComposerHtml::refreshExpressionContext()`
`562`	`562`	`}`
`563`	`563`
`564`	`564`	`setExpressionContext( feature, vl );`
`565`		`- loadHtml();`
	`565`	`+ loadHtml( true );`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`void QgsComposerHtml::refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property )`
`569`	`569`	`{`
`570`	`570`	`//updates data defined properties and redraws item to match`
`571`	`571`	`if ( property == QgsComposerObject::SourceUrl \|\| property == QgsComposerObject::AllProperties )`
`572`	`572`	`{`
`573`		`- loadHtml();`
	`573`	`+ loadHtml( true );`
`574`	`574`	`}`
`575`	`575`	`QgsComposerObject::refreshDataDefinedProperty( property );`
`576`	`576`	`}`