Fix for scalebar not responding to map changes after reading from project file and template

mhugent · mhugent · commit e873cd29e838 · 2009-12-25T22:43:19.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12619 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -343,6 +343,11 @@ bool QgsComposerScaleBar::readXML( const QDomElement& itemElem, const QDomDocume
   {
     const QgsComposerMap* composerMap = mComposition->getComposerMapById( mapId );
     mComposerMap = composerMap;
+    if ( mComposerMap )
+    {
+      connect( mComposerMap, SIGNAL( extentChanged() ), this, SLOT( updateSegmentSize() ) );
+      connect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
+    }
   }
 
   refreshSegmentMillimeters();

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,11 @@ bool QgsComposerScaleBar::readXML( const QDomElement& itemElem, const QDomDocume`
`343`	`343`	`{`
`344`	`344`	`const QgsComposerMap* composerMap = mComposition->getComposerMapById( mapId );`
`345`	`345`	`mComposerMap = composerMap;`
	`346`	`+ if ( mComposerMap )`
	`347`	`+ {`
	`348`	`+ connect( mComposerMap, SIGNAL( extentChanged() ), this, SLOT( updateSegmentSize() ) );`
	`349`	`+ connect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );`
	`350`	`+ }`
`346`	`351`	`}`
`347`	`352`
`348`	`353`	`refreshSegmentMillimeters();`