[Composer] Fix The ComposerMap's tooltip is not updated after readXML

rldhont · nyalldawson · commit 10ffcebfd946 · 2014-10-09T21:46:14.000+11:00
The ComposerMap's tooltip is only set in the private init method. This method is only used in the ComposerMap constructor. The result is that the tooltip is not updated after reading the id from the XML.

The solution could be to add a private method updateToolTip used when the id is changed :
* constructor
* assignFreeId
* readXML
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -112,6 +112,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition )
   mCurrentRectangle = rect();
 
   init();
+  updateToolTip();
 }
 
 void QgsComposerMap::init()
@@ -120,8 +121,6 @@ void QgsComposerMap::init()
   mOverviewStack = new QgsComposerMapOverviewStack( this );
   connectUpdateSlot();
 
-  setToolTip( tr( "Map %1" ).arg( mId ) );
-
   // data defined strings
   mDataDefinedNames.insert( QgsComposerObject::MapRotation, QString( "dataDefinedMapRotation" ) );
   mDataDefinedNames.insert( QgsComposerObject::MapScale, QString( "dataDefinedMapScale" ) );
@@ -132,6 +131,11 @@ void QgsComposerMap::init()
   mDataDefinedNames.insert( QgsComposerObject::MapAtlasMargin, QString( "dataDefinedMapAtlasMargin" ) );
 }
 
+void QgsComposerMap::updateToolTip()
+{
+    setToolTip( tr( "Map %1" ).arg( mId ) );
+}
+
 void QgsComposerMap::adjustExtentToItemShape( double itemWidth, double itemHeight, QgsRectangle& extent ) const
 {
   double itemWidthHeightRatio = itemWidth / itemHeight;
@@ -1292,6 +1296,7 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d
   if ( idRead != "not found" )
   {
     mId = idRead.toInt();
+    updateToolTip();
   }
   mPreviewMode = Rectangle;
 
@@ -2268,6 +2273,7 @@ void QgsComposerMap::assignFreeId()
     }
   }
   mId = maxId + 1;
+  updateToolTip();
 }
 
 bool QgsComposerMap::imageSizeConsideringRotation( double& width, double& height ) const
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -906,6 +906,7 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     double mAtlasMargin;
 
     void init();
+    void updateToolTip();
 
     /**Returns a list of the layers to render for this map item*/
     QStringList layersToRender() const;

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition )`
`112`	`112`	`mCurrentRectangle = rect();`
`113`	`113`
`114`	`114`	`init();`
	`115`	`+ updateToolTip();`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`void QgsComposerMap::init()`
`@@ -120,8 +121,6 @@ void QgsComposerMap::init()`
`120`	`121`	`mOverviewStack = new QgsComposerMapOverviewStack( this );`
`121`	`122`	`connectUpdateSlot();`
`122`	`123`
`123`		`- setToolTip( tr( "Map %1" ).arg( mId ) );`
`124`		`-`
`125`	`124`	`// data defined strings`
`126`	`125`	`mDataDefinedNames.insert( QgsComposerObject::MapRotation, QString( "dataDefinedMapRotation" ) );`
`127`	`126`	`mDataDefinedNames.insert( QgsComposerObject::MapScale, QString( "dataDefinedMapScale" ) );`
`@@ -132,6 +131,11 @@ void QgsComposerMap::init()`
`132`	`131`	`mDataDefinedNames.insert( QgsComposerObject::MapAtlasMargin, QString( "dataDefinedMapAtlasMargin" ) );`
`133`	`132`	`}`
`134`	`133`
	`134`	`+void QgsComposerMap::updateToolTip()`
	`135`	`+{`
	`136`	`+ setToolTip( tr( "Map %1" ).arg( mId ) );`
	`137`	`+}`
	`138`	`+`
`135`	`139`	`void QgsComposerMap::adjustExtentToItemShape( double itemWidth, double itemHeight, QgsRectangle& extent ) const`
`136`	`140`	`{`
`137`	`141`	`double itemWidthHeightRatio = itemWidth / itemHeight;`
`@@ -1292,6 +1296,7 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d`
`1292`	`1296`	`if ( idRead != "not found" )`
`1293`	`1297`	`{`
`1294`	`1298`	`mId = idRead.toInt();`
	`1299`	`+ updateToolTip();`
`1295`	`1300`	`}`
`1296`	`1301`	`mPreviewMode = Rectangle;`
`1297`	`1302`
`@@ -2268,6 +2273,7 @@ void QgsComposerMap::assignFreeId()`
`2268`	`2273`	`}`
`2269`	`2274`	`}`
`2270`	`2275`	`mId = maxId + 1;`
	`2276`	`+ updateToolTip();`
`2271`	`2277`	`}`
`2272`	`2278`
`2273`	`2279`	`bool QgsComposerMap::imageSizeConsideringRotation( double& width, double& height ) const`