[QGIS Commit] r8919 - branches/advanced_printing_branch/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-07-26 11:17:08 -0400 (Sat, 26 Jul 2008)
New Revision: 8919

Modified:
   branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h
   branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp
Log:
More xml coding ...

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp	2008-07-26 14:24:20 UTC (rev 8918)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.cpp	2008-07-26 15:17:08 UTC (rev 8919)
@@ -61,48 +61,36 @@
 
 bool QgsComposerItem::_writeXML(QDomElement& itemElem, QDomDocument& doc)
 {
-  //to come
-  return true;
-}
-
-bool QgsComposerItem::readXML( QDomElement& elem) {  return true; }
-
-void QgsComposerItem::writeFontXML(const QFont& font, QDomElement& parent, QDomDocument& doc)
-{
-  if(parent.isNull())
+  if(itemElem.isNull())
     {
-      return;
+      return false;
     }
 
-  QDomElement fontElem = doc.createElement("Font");
-  bool boldValue = font.bold();
-  bool italic = font.italic();
-  double size = font.pointSizeF();
-
-  if(boldValue)
+  QDomElement composerItemElem = doc.createElement("ComposerItem");
+  
+  //frame
+  if(mFrame)
     {
-      fontElem.setAttribute("bold", "true");
+      composerItemElem.setAttribute("frame", "true");
     }
   else
     {
-      fontElem.setAttribute("bold", "false");
+      composerItemElem.setAttribute("frame", "false");
     }
 
-  if(italic)
-    {
-      fontElem.setAttribute("italic", "true");
-    }
-  else
-    {
-      fontElem.setAttribute("italic", "false");
-    }
+  //scene rect
+  composerItemElem.setAttribute("x", transform().dx());
+  composerItemElem.setAttribute("y", transform().dy());
+  composerItemElem.setAttribute("width", rect().width());
+  composerItemElem.setAttribute("height", rect().height());
 
-  fontElem.setAttribute("pointSize", QString::number(size));
-  fontElem.setAttribute("family", font.family());
+  itemElem.appendChild(composerItemElem);
 
-  parent.appendChild(fontElem);
+  return true;
 }
 
+bool QgsComposerItem::readXML( QDomElement& elem) {  return true; }
+
 void QgsComposerItem::mouseMoveEvent ( QGraphicsSceneMouseEvent * event )
 {
   qWarning("QgsComposerItem::mouseMoveEvent");

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h	2008-07-26 14:24:20 UTC (rev 8918)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposeritem.h	2008-07-26 15:17:08 UTC (rev 8919)
@@ -83,9 +83,6 @@
     /**Writes parameter that are not subclass specific in document. Usually called from subclass specific methods*/
     bool _writeXML(QDomElement& itemElem, QDomDocument& doc);
 
-    /**Creates a font element and appends it to parent*/
-    void writeFontXML(const QFont& font, QDomElement& parent, QDomDocument& doc);
-
     /** sets state from DOM document
      * @param node is DOM node corresponding to 'Composer' tag
      */

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp	2008-07-26 14:24:20 UTC (rev 8918)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlabel.cpp	2008-07-26 15:17:08 UTC (rev 8919)
@@ -80,7 +80,7 @@
 
   //font
   QDomElement labelFontElem = doc.createElement("LabelFont");
-  writeFontXML(mFont, labelFontElem, doc);
+  labelFontElem.setAttribute("description", mFont.toString());
   composerLabelElem.appendChild(labelFontElem);
 
   elem.appendChild(composerLabelElem);