[QGIS Commit] r9733 - branches/advanced_printing_branch2/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-12-03 11:23:02 -0500 (Wed, 03 Dec 2008)
New Revision: 9733

Modified:
   branches/advanced_printing_branch2/src/app/composer/qgscomposer.cpp
   branches/advanced_printing_branch2/src/app/composer/qgscomposer.h
Log:
Always refresh legend completely after reading template

Modified: branches/advanced_printing_branch2/src/app/composer/qgscomposer.cpp
===================================================================
--- branches/advanced_printing_branch2/src/app/composer/qgscomposer.cpp	2008-12-03 12:52:20 UTC (rev 9732)
+++ branches/advanced_printing_branch2/src/app/composer/qgscomposer.cpp	2008-12-03 16:23:02 UTC (rev 9733)
@@ -858,6 +858,9 @@
   }
 
   readXML(templateDocument);
+
+  //clean up after template read (e.g. legend and map extent)
+  cleanupAfterTemplateRead();
 }
 
 void QgsComposer::moveItemContent()
@@ -1297,3 +1300,23 @@
     m->exec();
   }
 }
+
+void QgsComposer::cleanupAfterTemplateRead()
+{
+  QMap<QgsComposerItem*, QWidget*>::const_iterator itemIt = mItemWidgetMap.constBegin();
+  for ( ; itemIt != mItemWidgetMap.constEnd(); ++itemIt )
+  {
+    QgsComposerLegend* legendItem = dynamic_cast<QgsComposerLegend*>(itemIt.key());
+    if(legendItem)
+    {
+      legendItem->updateLegend();
+      continue;
+    }
+
+    QgsComposerMap* mapItem = dynamic_cast<QgsComposerMap*>(itemIt.key());
+    if(mapItem)
+    {
+      //todo: add some logic to get better extent
+    }
+  }
+}

Modified: branches/advanced_printing_branch2/src/app/composer/qgscomposer.h
===================================================================
--- branches/advanced_printing_branch2/src/app/composer/qgscomposer.h	2008-12-03 12:52:20 UTC (rev 9732)
+++ branches/advanced_printing_branch2/src/app/composer/qgscomposer.h	2008-12-03 16:23:02 UTC (rev 9733)
@@ -233,6 +233,9 @@
     //! Displays a warning because of possible min/max size in WMS
     void showWMSPrintingWarning();
 
+    //! Changes elements that are not suitable for this project
+    void cleanupAfterTemplateRead();
+
      //! Writes state under DOM element
     void writeXML(QDomNode& parentNode, QDomDocument& doc);
     //! Pointer to composer view