Save html multiframe

qgis · Jul 30, 2012 · 0e5e367 · 0e5e367
1 parent d57ecae
commit 0e5e367
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 10 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -1136,15 +1136,6 @@ void QgsComposer::writeXML( QDomNode& parentNode, QDomDocument& doc )
   }
   parentNode.appendChild( composerElem );
 
-  //store composer items:
-  QMap<QgsComposerItem*, QWidget*>::const_iterator itemIt = mItemWidgetMap.constBegin();
-  for ( ; itemIt != mItemWidgetMap.constEnd(); ++itemIt )
-  {
-    itemIt.key()->writeXML( composerElem, doc );
-  }
-
-  //store composer view
-
   //store composition
   if ( mComposition )
   {

diff --git a/src/core/composer/qgscomposerframe.h b/src/core/composer/qgscomposerframe.h
@@ -36,6 +36,8 @@ class QgsComposerFrame: public QgsComposerItem
     bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
     bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
 
+    int type() const { return ComposerFrame; }
+
   private:
     QgsComposerFrame(); //forbidden
 

diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -113,3 +113,12 @@ void QgsComposerHtml::addFrame( QgsComposerFrame* frame )
     mComposition->addComposerHtmlFrame( this, frame );
   }
 }
+
+bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc ) const
+{
+  QDomElement htmlElem = doc.createElement( "ComposerHtml" );
+  htmlElem.setAttribute( "url", mUrl.toString() );
+  bool state = _writeXML( htmlElem, doc );
+  elem.appendChild( htmlElem );
+  return state;
+}
diff --git a/src/core/composer/qgscomposerhtml.h b/src/core/composer/qgscomposerhtml.h
@@ -35,6 +35,8 @@ class QgsComposerHtml: public QgsComposerMultiFrame
     QSizeF totalSize() const;
     void render( QPainter* p, const QRectF& renderExtent );
 
+    bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
+
   protected:
     void addFrame( QgsComposerFrame* frame );
 

diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h
@@ -52,7 +52,8 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
       ComposerShape,
       ComposerTable,
       ComposerAttributeTable,
-      ComposerTextTable
+      ComposerTextTable,
+      ComposerFrame
     };
 
     /**Describes the action (move or resize in different directon) to be done during mouse move*/

diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -148,3 +148,14 @@ void QgsComposerMultiFrame::update()
     ( *frameIt )->update();
   }
 }
+
+bool QgsComposerMultiFrame::_writeXML( QDomElement& elem, QDomDocument& doc ) const
+{
+  elem.setAttribute( "resizeMode", mResizeMode );
+  QList<QgsComposerFrame*>::const_iterator frameIt = mFrameItems.constBegin();
+  for ( ; frameIt != mFrameItems.constEnd(); ++frameIt )
+  {
+    ( *frameIt )->writeXML( elem, doc );
+  }
+  return true;
+}
diff --git a/src/core/composer/qgscomposermultiframe.h b/src/core/composer/qgscomposermultiframe.h
@@ -22,6 +22,8 @@
 class QgsComposerFrame;
 class QgsComposerItem;
 class QgsComposition;
+class QDomDocument;
+class QDomElement;
 class QRectF;
 class QPainter;
 
@@ -48,6 +50,9 @@ class QgsComposerMultiFrame: public QObject
     void setResizeMode( ResizeMode mode );
     ResizeMode resizeMode() const { return mResizeMode; }
 
+    virtual bool writeXML( QDomElement& elem, QDomDocument & doc ) const = 0;
+    bool _writeXML( QDomElement& elem, QDomDocument& doc ) const;
+
   protected:
     QgsComposition* mComposition;
     QList<QgsComposerFrame*> mFrameItems;

diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -238,6 +238,28 @@ bool QgsComposition::writeXML( QDomElement& composerElem, QDomDocument& doc )
   compositionElem.setAttribute( "printResolution", mPrintResolution );
   compositionElem.setAttribute( "printAsRaster", mPrintAsRaster );
 
+  //save items except paper items and frame items (they are saved with the corresponding multiframe)
+  QList<QGraphicsItem*> itemList = items();
+  QList<QGraphicsItem*>::const_iterator itemIt = itemList.constBegin();
+  for ( ; itemIt != itemList.constEnd(); ++itemIt )
+  {
+    const QgsComposerItem* composerItem = dynamic_cast<const QgsComposerItem*>( *itemIt );
+    if ( composerItem )
+    {
+      if ( composerItem->type() != QgsComposerItem::ComposerPaper &&  composerItem->type() != QgsComposerItem::ComposerFrame )
+      {
+        composerItem->writeXML( compositionElem, doc );
+      }
+    }
+  }
+
+  //save multiframes
+  QSet<QgsComposerMultiFrame*>::const_iterator multiFrameIt = mMultiFrames.constBegin();
+  for ( ; multiFrameIt != mMultiFrames.constEnd(); ++mMultiFrameIt )
+  {
+    ( *multiFrameIt )->writeXML( compositionElem, doc );
+  }
+
   composerElem.appendChild( compositionElem );
 
   return true;