[composer] Refresh view action now also reloads html items and refreshes attribute table features.

nyalldawson · nyalldawson · commit 2d7cd38b45cb · 2014-05-01T23:00:43.000+10:00
diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip
@@ -408,6 +408,12 @@ class QgsComposition : QGraphicsScene
     @note added in version 2.2*/
     void updateBounds();
 
+    /**Forces items in the composition to refresh. For instance, this causes maps to redraw
+     * and rebuild cached images, html items to reload their source url, and attribute tables
+     * to refresh their contents.
+    @note added in version 2.3*/
+    void refreshItems();
+
   protected:
     void init();
 
@@ -441,4 +447,7 @@ class QgsComposition : QGraphicsScene
     void composerTableAdded( QgsComposerAttributeTable* table );
     /**Is emitted when a composer item has been removed from the scene*/
     void itemRemoved( QgsComposerItem* );
+    
+    /**Is emitted when item in the composition must be refreshed*/
+    void refreshItemsTriggered();    
 };
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -1022,6 +1022,7 @@ void QgsComposer::on_mActionRefreshView_triggered()
     }
   }
 
+  mComposition->refreshItems();
   mComposition->update();
 }
 
diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
@@ -66,6 +66,11 @@ QgsComposerAttributeTable::QgsComposerAttributeTable( QgsComposition* compositio
     }
   }
   connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( removeLayer( const QString& ) ) );
+
+  if ( mComposition )
+  {
+    connect( mComposition, SIGNAL( refreshItemsTriggered() ), this, SLOT( refreshAttributes() ) );
+  }
 }
 
 QgsComposerAttributeTable::~QgsComposerAttributeTable()
diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -36,6 +36,7 @@ QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ):
   if ( mComposition )
   {
     QObject::connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );
+    connect( mComposition, SIGNAL( refreshItemsTriggered() ), this, SLOT( loadHtml() ) );
   }
 }
 
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -181,6 +181,11 @@ void QgsComposition::updateBounds()
   setSceneRect( compositionBounds() );
 }
 
+void QgsComposition::refreshItems()
+{
+  emit refreshItemsTriggered();
+}
+
 QRectF QgsComposition::compositionBounds() const
 {
   //start with an empty rectangle
diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -464,6 +464,12 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     @note added in version 2.2*/
     void updateBounds();
 
+    /**Forces items in the composition to refresh. For instance, this causes maps to redraw
+     * and rebuild cached images, html items to reload their source url, and attribute tables
+     * to refresh their contents.
+    @note added in version 2.3*/
+    void refreshItems();
+
   protected:
     void init();
 
@@ -596,6 +602,9 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene
     /**Is emitted when a composer item has been removed from the scene*/
     void itemRemoved( QgsComposerItem* );
 
+    /**Is emitted when item in the composition must be refreshed*/
+    void refreshItemsTriggered();
+
     /**Is emitted when the composition has an updated status bar message for the composer window*/
     void statusMsgChanged( QString message );
 };

Original file line number	Diff line number	Diff line change
`@@ -1022,6 +1022,7 @@ void QgsComposer::on_mActionRefreshView_triggered()`
`1022`	`1022`	`}`
`1023`	`1023`	`}`
`1024`	`1024`
	`1025`	`+ mComposition->refreshItems();`
`1025`	`1026`	`mComposition->update();`
`1026`	`1027`	`}`
`1027`	`1028`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,11 @@ QgsComposerAttributeTable::QgsComposerAttributeTable( QgsComposition* compositio`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`connect( QgsMapLayerRegistry::instance(), SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( removeLayer( const QString& ) ) );`
	`69`	`+`
	`70`	`+ if ( mComposition )`
	`71`	`+ {`
	`72`	`+ connect( mComposition, SIGNAL( refreshItemsTriggered() ), this, SLOT( refreshAttributes() ) );`
	`73`	`+ }`
`69`	`74`	`}`
`70`	`75`
`71`	`76`	`QgsComposerAttributeTable::~QgsComposerAttributeTable()`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ):`
`36`	`36`	`if ( mComposition )`
`37`	`37`	`{`
`38`	`38`	`QObject::connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( handleFrameRemoval( QgsComposerItem* ) ) );`
	`39`	`+ connect( mComposition, SIGNAL( refreshItemsTriggered() ), this, SLOT( loadHtml() ) );`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,11 @@ void QgsComposition::updateBounds()`
`181`	`181`	`setSceneRect( compositionBounds() );`
`182`	`182`	`}`
`183`	`183`
	`184`	`+void QgsComposition::refreshItems()`
	`185`	`+{`
	`186`	`+ emit refreshItemsTriggered();`
	`187`	`+}`
	`188`	`+`
`184`	`189`	`QRectF QgsComposition::compositionBounds() const`
`185`	`190`	`{`
`186`	`191`	`//start with an empty rectangle`