Add method QgsComposition::loadFromTemplate and python bindings

qgis · Sep 5, 2012 · fd514a0 · fd514a0
1 parent 17393bd
commit fd514a0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/python/core/qgscomposition.sip b/python/core/qgscomposition.sip
@@ -107,6 +107,8 @@ class QgsComposition: QGraphicsScene
     /**Reads settings from xml file*/
     bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
 
+    bool loadFromTemplate( const QDomDocument& doc, bool addUndoCommands = false );
+
     /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
       @param elem items parent element, e.g. <Composer> or <ComposerItemClipboard>
       @param doc xml document

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -60,13 +60,7 @@ QgsComposition::QgsComposition():
 QgsComposition::~QgsComposition()
 {
   removePaperItems();
-
-  QSet<QgsComposerMultiFrame*>::iterator multiFrameIt = mMultiFrames.begin();
-  for ( ; multiFrameIt != mMultiFrames.end(); ++multiFrameIt )
-  {
-    delete *multiFrameIt;
-  }
-  mMultiFrames.clear();
+  deleteAndRemoveMultiFrames();
 
   // make sure that all composer items are removed before
   // this class is deconstructed - to avoid segfaults
@@ -320,6 +314,33 @@ bool QgsComposition::readXML( const QDomElement& compositionElem, const QDomDocu
   return true;
 }
 
+bool QgsComposition::loadFromTemplate( const QDomDocument& doc, bool addUndoCommands )
+{
+  //delete multiframes and its items
+  deleteAndRemoveMultiFrames();
+
+  //delete all other items
+  clear();
+  mPages.clear();
+
+  //read general settings
+  QDomElement compositionElem = doc.documentElement().firstChildElement( "Composition" );
+  if ( compositionElem.isNull() )
+  {
+    return false;
+  }
+
+  bool ok = readXML( compositionElem, doc );
+  if ( !ok )
+  {
+    return false;
+  }
+
+  //addItemsFromXML
+  addItemsFromXML( doc.documentElement(), doc, 0, addUndoCommands, 0 );
+  return true;
+}
+
 void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocument& doc, QMap< QgsComposerMap*, int >* mapsToRestore,
                                       bool addUndoCommands, QPointF* pos )
 {
@@ -1374,6 +1395,16 @@ void QgsComposition::removePaperItems()
   mPages.clear();
 }
 
+void QgsComposition::deleteAndRemoveMultiFrames()
+{
+  QSet<QgsComposerMultiFrame*>::iterator multiFrameIt = mMultiFrames.begin();
+  for ( ; multiFrameIt != mMultiFrames.end(); ++multiFrameIt )
+  {
+    delete *multiFrameIt;
+  }
+  mMultiFrames.clear();
+}
+
 void QgsComposition::exportAsPDF( const QString& file )
 {
   QPrinter printer;

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -153,6 +153,8 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     /**Reads settings from xml file*/
     bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
 
+    bool loadFromTemplate( const QDomDocument& doc, bool addUndoCommands = false );
+
     /**Add items from XML representation to the graphics scene (for project file reading, pasting items from clipboard)
       @param elem items parent element, e.g. \verbatim <Composer> \endverbatim or \verbatim <ComposerItemClipboard> \endverbatim
       @param doc xml document
@@ -308,6 +310,7 @@ class CORE_EXPORT QgsComposition: public QGraphicsScene
     void updatePaperItems();
     void addPaperItem();
     void removePaperItems();
+    void deleteAndRemoveMultiFrames();
 
   signals:
     void paperSizeChanged();