Fix for ticket #6062, unique composer map id in copy / paste

qgis · Jul 19, 2012 · b299e08 · b299e08
1 parent 408d266
commit b299e08
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -49,18 +49,8 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
   mOverviewFrameMapSymbol = 0;
   createDefaultOverviewFrameSymbol();
 
-  //mId = mComposition->composerMapItems().size();
-  int maxId = -1;
-  QList<const QgsComposerMap*> mapList = mComposition->composerMapItems();
-  QList<const QgsComposerMap*>::const_iterator mapIt = mapList.constBegin();
-  for ( ; mapIt != mapList.constEnd(); ++mapIt )
-  {
-    if (( *mapIt )->id() > maxId )
-    {
-      maxId = ( *mapIt )->id();
-    }
-  }
-  mId = maxId + 1;
+  mId = 0;
+  assignFreeId();
 
   mMapRenderer = mComposition->mapRenderer();
   mPreviewMode = QgsComposerMap::Rectangle;
@@ -1957,3 +1947,29 @@ void QgsComposerMap::createDefaultOverviewFrameSymbol()
   mOverviewFrameMapSymbol = QgsFillSymbolV2::createSimple( properties );
   mOverviewFrameMapSymbol->setAlpha( 0.3 );
 }
+
+void QgsComposerMap::assignFreeId()
+{
+  if ( !mComposition )
+  {
+    return;
+  }
+
+  const QgsComposerMap* existingMap = mComposition->getComposerMapById( mId );
+  if ( !existingMap )
+  {
+    return; //keep mId as it is still available
+  }
+
+  int maxId = -1;
+  QList<const QgsComposerMap*> mapList = mComposition->composerMapItems();
+  QList<const QgsComposerMap*>::const_iterator mapIt = mapList.constBegin();
+  for ( ; mapIt != mapList.constEnd(); ++mapIt )
+  {
+    if (( *mapIt )->id() > maxId )
+    {
+      maxId = ( *mapIt )->id();
+    }
+  }
+  mId = maxId + 1;
+}
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -300,6 +300,10 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol );
     QgsFillSymbolV2* overviewFrameMapSymbol() { return mOverviewFrameMapSymbol; }
 
+    /**Sets mId to a number not yet used in the composition. mId is kept if it is not in use.
+        Usually, this function is called before adding the composer map to the composition*/
+    void assignFreeId();
+
   signals:
     void extentChanged();
 

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -309,6 +309,7 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
     QDomElement currentComposerMapElem = composerMapList.at( i ).toElement();
     QgsComposerMap* newMap = new QgsComposerMap( this );
     newMap->readXML( currentComposerMapElem, doc );
+    newMap->assignFreeId();
 
     if ( mapsToRestore )
     {