[QGIS Commit] r10178 - in branches/vector_overlay_branch/src: core plugins/diagram_overlay

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-02-16 05:08:11 -0500 (Mon, 16 Feb 2009)
New Revision: 10178

Modified:
   branches/vector_overlay_branch/src/core/qgsvectorlayer.cpp
   branches/vector_overlay_branch/src/core/qgsvectoroverlay.cpp
   branches/vector_overlay_branch/src/core/qgsvectoroverlay.h
   branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramoverlay.h
Log:
Save diagram settings to project file

Modified: branches/vector_overlay_branch/src/core/qgsvectorlayer.cpp
===================================================================
--- branches/vector_overlay_branch/src/core/qgsvectorlayer.cpp	2009-02-16 05:56:46 UTC (rev 10177)
+++ branches/vector_overlay_branch/src/core/qgsvectorlayer.cpp	2009-02-16 10:08:11 UTC (rev 10178)
@@ -2369,6 +2369,16 @@
     myLabel->writeXML( layer_node, document );
   }
 
+  //save vector overlays (e.g. diagrams)
+  QList<QgsVectorOverlay*>::const_iterator overlay_it = mOverlays.constBegin();
+  for(; overlay_it != mOverlays.constEnd(); ++overlay_it)
+  {
+    if(*overlay_it)
+    {
+      (*overlay_it)->writeXML(layer_node, document);
+    }
+  }
+
   return true;
 } // bool QgsVectorLayer::writeXml
 

Modified: branches/vector_overlay_branch/src/core/qgsvectoroverlay.cpp
===================================================================
--- branches/vector_overlay_branch/src/core/qgsvectoroverlay.cpp	2009-02-16 05:56:46 UTC (rev 10177)
+++ branches/vector_overlay_branch/src/core/qgsvectoroverlay.cpp	2009-02-16 10:08:11 UTC (rev 10178)
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsvectoroverlay.h"
+#include "qgsoverlayobject.h"
 
 QgsVectorOverlay::QgsVectorOverlay(QgsVectorLayer* vl): mVectorLayer(vl), mDisplayFlag(true)
 {

Modified: branches/vector_overlay_branch/src/core/qgsvectoroverlay.h
===================================================================
--- branches/vector_overlay_branch/src/core/qgsvectoroverlay.h	2009-02-16 05:56:46 UTC (rev 10177)
+++ branches/vector_overlay_branch/src/core/qgsvectoroverlay.h	2009-02-16 10:08:11 UTC (rev 10178)
@@ -55,6 +55,12 @@
         /**Display yes/no*/
         void setDisplayFlag(bool flag){mDisplayFlag = flag;}
 
+        /**Restore from project file*/
+        virtual bool readXML(const QDomNode& overlayNode) = 0;
+
+        /**Save to project file*/
+        virtual bool writeXML(QDomNode& layer_node, QDomDocument& doc) const = 0;
+
     protected:
         /**Pointer to the vector layer for this overlay*/
         QgsVectorLayer* mVectorLayer;

Modified: branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramoverlay.h
===================================================================
--- branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramoverlay.h	2009-02-16 05:56:46 UTC (rev 10177)
+++ branches/vector_overlay_branch/src/plugins/diagram_overlay/qgsdiagramoverlay.h	2009-02-16 10:08:11 UTC (rev 10178)
@@ -46,6 +46,7 @@
    in case of error.*/
   static QString attributeNameFromIndex(int index, const QgsVectorLayer* vl);
 
+
 protected:
   int getOverlayObjectSize(int& width, int& height, double value, const QgsFeature& f, const QgsRenderContext& renderContext) const;