Working label updates on atlas feature change

nyalldawson · nyalldawson · commit b602b3d58ecc · 2018-01-05T11:15:03.000+10:00
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -1943,6 +1943,7 @@ void QgsLayoutDesignerDialog::atlasPreviewTriggered( bool checked )
     else
     {
       QgisApp::instance()->mapCanvas()->stopRendering();
+      atlas->first();
 #if 0 //TODO
       emit atlasPreviewFeatureChanged();
 #endif
@@ -2220,6 +2221,7 @@ void QgsLayoutDesignerDialog::createAtlasWidget()
     mStatusBar->showMessage( message );
   } );
   connect( atlas, &QgsLayoutAtlas::toggled, this, &QgsLayoutDesignerDialog::toggleAtlasControls );
+  connect( atlas, &QgsLayoutAtlas::toggled, this, &QgsLayoutDesignerDialog::refreshLayout );
   connect( atlas, &QgsLayoutAtlas::numberFeaturesChanged, this, &QgsLayoutDesignerDialog::updateAtlasPageComboBox );
   connect( atlas, &QgsLayoutAtlas::featureChanged, this, &QgsLayoutDesignerDialog::atlasFeatureChanged );
   toggleAtlasControls( atlas->enabled() && atlas->coverageLayer() );
diff --git a/src/core/layout/qgslayoutitemlabel.cpp b/src/core/layout/qgslayoutitemlabel.cpp
@@ -492,6 +492,7 @@ void QgsLayoutItemLabel::setFrameStrokeWidth( const QgsLayoutMeasurement &stroke
 
 void QgsLayoutItemLabel::refresh()
 {
+  QgsLayoutItem::refresh();
   contentChanged();
 }
 
diff --git a/src/core/layout/qgslayoutobject.cpp b/src/core/layout/qgslayoutobject.cpp
@@ -18,6 +18,7 @@
 #include <QPainter>
 
 #include "qgslayout.h"
+#include "qgslayoutcontext.h"
 #include "qgslayoutobject.h"
 
 
@@ -92,6 +93,7 @@ QgsLayoutObject::QgsLayoutObject( QgsLayout *layout )
   if ( mLayout )
   {
     connect( mLayout, &QgsLayout::refreshed, this, &QgsLayoutObject::refresh );
+    connect( &mLayout->context(), &QgsLayoutContext::changed, this, &QgsLayoutObject::refresh );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -492,6 +492,7 @@ void QgsLayoutItemLabel::setFrameStrokeWidth( const QgsLayoutMeasurement &stroke`
`492`	`492`
`493`	`493`	`void QgsLayoutItemLabel::refresh()`
`494`	`494`	`{`
	`495`	`+ QgsLayoutItem::refresh();`
`495`	`496`	`contentChanged();`
`496`	`497`	`}`
`497`	`498`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include <QPainter>`
`19`	`19`
`20`	`20`	`#include "qgslayout.h"`
	`21`	`+#include "qgslayoutcontext.h"`
`21`	`22`	`#include "qgslayoutobject.h"`
`22`	`23`
`23`	`24`
`@@ -92,6 +93,7 @@ QgsLayoutObject::QgsLayoutObject( QgsLayout *layout )`
`92`	`93`	`if ( mLayout )`
`93`	`94`	`{`
`94`	`95`	`connect( mLayout, &QgsLayout::refreshed, this, &QgsLayoutObject::refresh );`
	`96`	`+ connect( &mLayout->context(), &QgsLayoutContext::changed, this, &QgsLayoutObject::refresh );`
`95`	`97`	`}`
`96`	`98`	`}`
`97`	`99`