[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/inc

[Markus Mohrhard]

 chart2/inc/DataSeriesState.hxx |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit b107b8255968449ec461e162dda171cdacd94d77
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Oct 15 12:05:16 2013 +0200

    some small cosmetic changes
    
    Change-Id: I2bc8c39f91faf6915c4970a002e4030f81c95bc5

diff --git a/chart2/inc/DataSeriesState.hxx b/chart2/inc/DataSeriesState.hxx
index bfe14c9..64b27d71 100644
--- a/chart2/inc/DataSeriesState.hxx
+++ b/chart2/inc/DataSeriesState.hxx
@@ -20,11 +20,13 @@
 
 namespace chart {
 
-class DataSeries
+class DataSequence
 {
 public:
     typedef mdds::multi_type_vector<mdds::mtv::element_block_func> DataSeriesType;
 
+    // used for fast iteration through data series
+    // allows to easily skip empty data ranges
     DataSeriesType getDataSeries();
 
     size_t size();
@@ -43,7 +45,11 @@ struct DataSeriesProperties
 {
     typedef std::map< OUString, com::sun::star::uno::Any > PropertyMap;
     PropertyMap aSeriesProps;
+    // we might want to switch to multi_type_vector for better memory usage
+    // hopefully this vector is empty most of the time
     std::vector< PropertyMap > aPointProps;
+
+    com::sun::star::chart::MissingValueTreatment eMissingValueTreatment;
 };
 
 struct Axis
@@ -56,10 +62,13 @@ struct Axis
 
 struct DataSeriesState
 {
-    DataSeries aXValue;
-    DataSeries aYValue;
+    // length of the data series is min(aXValue.size(), aYValue.size());
+    DataSequence aXValue;
+    DataSequence aYValue;
     DataSeriesProperties aProperties;
-    std::map<OUString, DataSeries> aMapProperties;
+    // also contains bubble chart bubble size
+    // apply values to properties with functor
+    std::map<OUString, DataSeries> aMappedProperties;
     Axis aXAxis;
     Axis aYAxis;
 };