Enable mapping single role to multiple properties for bars

Surface and scatter to follow in separate task

Task-number: QTRD-3074
Change-Id: I790078446cd1b805a83da2e3760eaf27c586aaab
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 108 insertions, 97 deletions

diff --git a/tests/itemmodeltest/main.cpp b/tests/itemmodeltest/main.cpp
index 419ee162..a607fe8d 100644
--- a/tests/itemmodeltest/main.cpp
+++ b/tests/itemmodeltest/main.cpp
@@ -149,11 +149,11 @@ void GraphDataGenerator::setupModel()
     weeks << "week 1" << "week 2" << "week 3" << "week 4" << "week 5";
 
     // Set up data         Mon  Tue  Wed  Thu  Fri  Sat  Sun
-    float hours[5][7] = {{2.0f, 1.0f, 3.0f, 0.2f, 1.0f, 5.0f, 10.0f},     // week 1
-                         {0.5f, 1.0f, 3.0f, 1.0f, 2.0f, 2.0f, 3.0f},      // week 2
-                         {1.0f, 1.0f, 2.0f, 1.0f, 4.0f, 4.0f, 4.0f},      // week 3
-                         {0.0f, 1.0f, 0.0f, 0.0f, 2.0f, 2.0f, 0.3f},      // week 4
-                         {3.0f, 3.0f, 6.0f, 2.0f, 2.0f, 1.0f, 1.0f}};     // week 5
+    const char *hours[5][7] = {{"2.0/30", "1.0/30", "3.0/30", "0.2/30", "1.0/30", "5.0/30", "10.0/30"},     // week 1
+                               {"0.5/45", "1.0/45", "3.0/45", "1.0/45", "2.0/45", "2.0/45", "3.0/45"},      // week 2
+                               {"1.0/60", "1.0/60", "2.0/60", "1.0/60", "4.0/60", "4.0/60", "4.0/60"},      // week 3
+                               {"0.0/75", "1.0/75", "0.0/75", "0.0/75", "2.0/75", "2.0/75", "0.3/75"},      // week 4
+                               {"3.0/90", "3.0/90", "6.0/90", "2.0/90", "2.0/90", "1.0/90", "1.0/90"}};     // week 5
 
     // Add labels
     m_barGraph->rowAxis()->setTitle("Week of year");
@@ -190,7 +190,8 @@ void GraphDataGenerator::addRow()
     for (int i = 0; i < m_columnCount; i++) {
         QModelIndex index = m_tableWidget->model()->index(0, i);
         m_tableWidget->model()->setData(index,
-            ((float)i / (float)m_columnCount) / 2.0f + (float)(rand() % 30) / 100.0f);
+                                        ((float)i / (float)m_columnCount) / 2.0f
+                                        + (float)(rand() % 30) / 100.0f);
     }
     m_tableWidget->resizeColumnsToContents();
 }
@@ -225,8 +226,12 @@ void GraphDataGenerator::changeSelectedButtonClicked()
     // Change all selected cells to a random value 1-10
     QVariant value = QVariant::fromValue(float((rand() % 10) + 1));
     QList<QTableWidgetItem *> selectedItems = m_tableWidget->selectedItems();
-    foreach (QTableWidgetItem *item, selectedItems)
-        item->setData(Qt::DisplayRole, value);
+    foreach (QTableWidgetItem *item, selectedItems) {
+        item->setData(Qt::DisplayRole,
+                      QString::number(value.toReal())
+                      .append("/")
+                      .append(QString::number(value.toReal() * 10)));
+    }
 }
 
 int main(int argc, char **argv)
@@ -269,6 +274,12 @@ int main(int argc, char **argv)
     QItemModelSurfaceDataProxy *surfaceProxy = new QItemModelSurfaceDataProxy(tableWidget->model());
     barProxy->setUseModelCategories(true);
     surfaceProxy->setUseModelCategories(true);
+    barProxy->setRotationRole(tableWidget->model()->roleNames().value(Qt::DisplayRole));
+    barProxy->setValueRolePattern(QRegExp(QStringLiteral("^(\\d*[\\.\\,]?\\d*)\\/(\\d*[\\.\\,]?\\d*)$")));
+    barProxy->setRotationRolePattern(QRegExp(QStringLiteral("^(\\d*[\\.\\,]?\\d*)\\/(\\d*[\\.\\,]?\\d*)$")));
+    barProxy->setValueRoleReplace(QStringLiteral("\\1"));
+    barProxy->setRotationRoleReplace(QStringLiteral("\\2"));
+    // TODO surface proxy test
     QBar3DSeries *barSeries = new QBar3DSeries(barProxy);
     QSurface3DSeries *surfaceSeries = new QSurface3DSeries(surfaceProxy);
     barSeries->setMesh(QAbstract3DSeries::MeshPyramid);
diff --git a/tests/qmlcamera/qml/qmlcamera/Axes.qml b/tests/qmlcamera/qml/qmlcamera/Axes.qml
index a6b8d4de..6494adbc 100644
--- a/tests/qmlcamera/qml/qmlcamera/Axes.qml
+++ b/tests/qmlcamera/qml/qmlcamera/Axes.qml
@@ -35,15 +35,11 @@ Item {
     }
     ValueAxis3D {
         id: incomeAxis
-        min: 0
-        max: 35
         labelFormat: "%.2f M\u20AC"
         title: "Monthly income"
     }
     ValueAxis3D {
         id: expensesAxis
-        min: 0
-        max: 35
         labelFormat: "-%.2f M\u20AC"
         title: "Monthly expenses"
     }
diff --git a/tests/qmlcamera/qml/qmlcamera/Data.qml b/tests/qmlcamera/qml/qmlcamera/Data.qml
index bab6bf78..8a301925 100644
--- a/tests/qmlcamera/qml/qmlcamera/Data.qml
+++ b/tests/qmlcamera/qml/qmlcamera/Data.qml
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtDataVisualization 1.0
+import QtDataVisualization 1.1
 
 Item {
     property alias model: dataModel
@@ -31,6 +31,10 @@ Item {
         columnRole: "month"
         valueRole: "expenses"
         rotationRole: "angle"
+        valueRolePattern: /@*(\d*)t*/
+        rotationRolePattern: /jjj/
+        valueRoleReplace: "\\1"
+        rotationRoleReplace: "1"
     }
 
     Bar3DSeries {
@@ -43,95 +47,95 @@ Item {
 
     ListModel {
         id: dataModel
-        ListElement{ year: "2006"; month: "Jan"; expenses: "4"; angle: "1";  income: "5" }
-        ListElement{ year: "2006"; month: "Feb"; expenses: "5"; angle: "2";  income: "6" }
-        ListElement{ year: "2006"; month: "Mar"; expenses: "7"; angle: "3";  income: "4" }
-        ListElement{ year: "2006"; month: "Apr"; expenses: "3"; angle: "4";  income: "2" }
-        ListElement{ year: "2006"; month: "May"; expenses: "4"; angle: "5";  income: "1" }
-        ListElement{ year: "2006"; month: "Jun"; expenses: "2"; angle: "6";  income: "2" }
-        ListElement{ year: "2006"; month: "Jul"; expenses: "1"; angle: "7";  income: "3" }
-        ListElement{ year: "2006"; month: "Aug"; expenses: "5"; angle: "8";  income: "1" }
-        ListElement{ year: "2006"; month: "Sep"; expenses: "2"; angle: "9";  income: "3" }
-        ListElement{ year: "2006"; month: "Oct"; expenses: "5"; angle: "10";  income: "2" }
-        ListElement{ year: "2006"; month: "Nov"; expenses: "8"; angle: "11";  income: "5" }
-        ListElement{ year: "2006"; month: "Dec"; expenses: "3"; angle: "12";  income: "3" }
+        ListElement{ year: "2006"; month: "Jan"; expenses: "@@4ttt"; angle: "jjj1";  income: "5" }
+        ListElement{ year: "2006"; month: "Feb"; expenses: "@@5ttt"; angle: "jjj2";  income: "6" }
+        ListElement{ year: "2006"; month: "Mar"; expenses: "@@7ttt"; angle: "jjj3";  income: "4" }
+        ListElement{ year: "2006"; month: "Apr"; expenses: "@@3ttt"; angle: "jjj4";  income: "2" }
+        ListElement{ year: "2006"; month: "May"; expenses: "@@4ttt"; angle: "jjj5";  income: "1" }
+        ListElement{ year: "2006"; month: "Jun"; expenses: "@@2ttt"; angle: "jjj6";  income: "2" }
+        ListElement{ year: "2006"; month: "Jul"; expenses: "@@1ttt"; angle: "jjj7";  income: "3" }
+        ListElement{ year: "2006"; month: "Aug"; expenses: "@@5ttt"; angle: "jjj8";  income: "1" }
+        ListElement{ year: "2006"; month: "Sep"; expenses: "@@2ttt"; angle: "jjj9";  income: "3" }
+        ListElement{ year: "2006"; month: "Oct"; expenses: "@@5ttt"; angle: "jjj10";  income: "2" }
+        ListElement{ year: "2006"; month: "Nov"; expenses: "@@8ttt"; angle: "jjj11";  income: "5" }
+        ListElement{ year: "2006"; month: "Dec"; expenses: "@@3ttt"; angle: "jjj12";  income: "3" }
 
-        ListElement{ year: "2007"; month: "Jan"; expenses: "3"; angle: "13";  income: "1" }
-        ListElement{ year: "2007"; month: "Feb"; expenses: "4"; angle: "14";  income: "2" }
-        ListElement{ year: "2007"; month: "Mar"; expenses: "12";angle: "15";  income: "4" }
-        ListElement{ year: "2007"; month: "Apr"; expenses: "13";angle: "16";  income: "6" }
-        ListElement{ year: "2007"; month: "May"; expenses: "14";angle: "17";  income: "11" }
-        ListElement{ year: "2007"; month: "Jun"; expenses: "7"; angle: "18";  income: "7" }
-        ListElement{ year: "2007"; month: "Jul"; expenses: "6"; angle: "19";  income: "4" }
-        ListElement{ year: "2007"; month: "Aug"; expenses: "4"; angle: "20";  income: "15" }
-        ListElement{ year: "2007"; month: "Sep"; expenses: "2"; angle: "21";  income: "18" }
-        ListElement{ year: "2007"; month: "Oct"; expenses: "29";angle: "22";  income: "25" }
-        ListElement{ year: "2007"; month: "Nov"; expenses: "23";angle: "23";  income: "29" }
-        ListElement{ year: "2007"; month: "Dec"; expenses: "5"; angle: "24";  income: "9" }
+        ListElement{ year: "2007"; month: "Jan"; expenses: "@@3ttt"; angle: "jjj13";  income: "1" }
+        ListElement{ year: "2007"; month: "Feb"; expenses: "@@4ttt"; angle: "jjj14";  income: "2" }
+        ListElement{ year: "2007"; month: "Mar"; expenses: "@@12ttt"; angle: "jjj15";  income: "4" }
+        ListElement{ year: "2007"; month: "Apr"; expenses: "@@13ttt"; angle: "jjj16";  income: "6" }
+        ListElement{ year: "2007"; month: "May"; expenses: "@@14ttt"; angle: "jjj17";  income: "11" }
+        ListElement{ year: "2007"; month: "Jun"; expenses: "@@7ttt"; angle: "jjj18";  income: "7" }
+        ListElement{ year: "2007"; month: "Jul"; expenses: "@@6ttt"; angle: "jjj19";  income: "4" }
+        ListElement{ year: "2007"; month: "Aug"; expenses: "@@4ttt"; angle: "jjj20";  income: "15" }
+        ListElement{ year: "2007"; month: "Sep"; expenses: "@@2ttt"; angle: "jjj21";  income: "18" }
+        ListElement{ year: "2007"; month: "Oct"; expenses: "@@29ttt"; angle: "jjj22";  income: "25" }
+        ListElement{ year: "2007"; month: "Nov"; expenses: "@@23ttt"; angle: "jjj23";  income: "29" }
+        ListElement{ year: "2007"; month: "Dec"; expenses: "@@5ttt"; angle: "jjj24";  income: "9" }
 
-        ListElement{ year: "2008"; month: "Jan"; expenses: "3";  income: "8" }
-        ListElement{ year: "2008"; month: "Feb"; expenses: "8";  income: "14" }
-        ListElement{ year: "2008"; month: "Mar"; expenses: "10"; income: "20" }
-        ListElement{ year: "2008"; month: "Apr"; expenses: "12"; income: "24" }
-        ListElement{ year: "2008"; month: "May"; expenses: "10"; income: "19" }
-        ListElement{ year: "2008"; month: "Jun"; expenses: "5";  income: "8" }
-        ListElement{ year: "2008"; month: "Jul"; expenses: "1";  income: "4" }
-        ListElement{ year: "2008"; month: "Aug"; expenses: "7";  income: "12" }
-        ListElement{ year: "2008"; month: "Sep"; expenses: "4";  income: "16" }
-        ListElement{ year: "2008"; month: "Oct"; expenses: "22"; income: "33" }
-        ListElement{ year: "2008"; month: "Nov"; expenses: "16"; income: "25" }
-        ListElement{ year: "2008"; month: "Dec"; expenses: "2";  income: "7" }
+        ListElement{ year: "2008"; month: "Jan"; expenses: "@@3";  income: "8" }
+        ListElement{ year: "2008"; month: "Feb"; expenses: "@@8";  income: "14" }
+        ListElement{ year: "2008"; month: "Mar"; expenses: "@@10"; income: "20" }
+        ListElement{ year: "2008"; month: "Apr"; expenses: "@@12"; income: "24" }
+        ListElement{ year: "2008"; month: "May"; expenses: "@@10"; income: "19" }
+        ListElement{ year: "2008"; month: "Jun"; expenses: "@@5";  income: "8" }
+        ListElement{ year: "2008"; month: "Jul"; expenses: "@@1";  income: "4" }
+        ListElement{ year: "2008"; month: "Aug"; expenses: "@@7";  income: "12" }
+        ListElement{ year: "2008"; month: "Sep"; expenses: "@@4";  income: "16" }
+        ListElement{ year: "2008"; month: "Oct"; expenses: "@@22"; income: "33" }
+        ListElement{ year: "2008"; month: "Nov"; expenses: "@@16"; income: "25" }
+        ListElement{ year: "2008"; month: "Dec"; expenses: "@@2";  income: "7" }
 
-        ListElement{ year: "2009"; month: "Jan"; expenses: "4"; angle: "37";  income: "5"  }
-        ListElement{ year: "2009"; month: "Feb"; expenses: "4"; angle: "38";  income: "7"  }
-        ListElement{ year: "2009"; month: "Mar"; expenses: "11";angle: "39";  income: "14"  }
-        ListElement{ year: "2009"; month: "Apr"; expenses: "16";angle: "40";  income: "22"  }
-        ListElement{ year: "2009"; month: "May"; expenses: "3"; angle: "41";  income: "5"  }
-        ListElement{ year: "2009"; month: "Jun"; expenses: "4"; angle: "42";  income: "8"  }
-        ListElement{ year: "2009"; month: "Jul"; expenses: "7"; angle: "43";  income: "9"  }
-        ListElement{ year: "2009"; month: "Aug"; expenses: "9"; angle: "44";  income: "13"  }
-        ListElement{ year: "2009"; month: "Sep"; expenses: "1"; angle: "45";  income: "6"  }
-        ListElement{ year: "2009"; month: "Oct"; expenses: "14";angle: "46";  income: "25"  }
-        ListElement{ year: "2009"; month: "Nov"; expenses: "19";angle: "47";  income: "29"  }
-        ListElement{ year: "2009"; month: "Dec"; expenses: "5"; angle: "48";  income: "7"  }
+        ListElement{ year: "2009"; month: "Jan"; expenses: "@@4ttt"; angle: "jjj37";  income: "5"  }
+        ListElement{ year: "2009"; month: "Feb"; expenses: "@@4ttt"; angle: "jjj38";  income: "7"  }
+        ListElement{ year: "2009"; month: "Mar"; expenses: "@@11ttt"; angle: "jjj39";  income: "14"  }
+        ListElement{ year: "2009"; month: "Apr"; expenses: "@@16ttt"; angle: "jjj40";  income: "22"  }
+        ListElement{ year: "2009"; month: "May"; expenses: "@@3ttt"; angle: "jjj41";  income: "5"  }
+        ListElement{ year: "2009"; month: "Jun"; expenses: "@@4ttt"; angle: "jjj42";  income: "8"  }
+        ListElement{ year: "2009"; month: "Jul"; expenses: "@@7ttt"; angle: "jjj43";  income: "9"  }
+        ListElement{ year: "2009"; month: "Aug"; expenses: "@@9ttt"; angle: "jjj44";  income: "13"  }
+        ListElement{ year: "2009"; month: "Sep"; expenses: "@@1ttt"; angle: "jjj45";  income: "6"  }
+        ListElement{ year: "2009"; month: "Oct"; expenses: "@@14ttt"; angle: "jjj46";  income: "25"  }
+        ListElement{ year: "2009"; month: "Nov"; expenses: "@@19ttt"; angle: "jjj47";  income: "29"  }
+        ListElement{ year: "2009"; month: "Dec"; expenses: "@@5ttt"; angle: "jjj48";  income: "7"  }
 
-        ListElement{ year: "2010"; month: "Jan"; expenses: "14";angle: "49";  income: "22"  }
-        ListElement{ year: "2010"; month: "Feb"; expenses: "5"; angle: "50";  income: "7"  }
-        ListElement{ year: "2010"; month: "Mar"; expenses: "1"; angle: "51";  income: "9"  }
-        ListElement{ year: "2010"; month: "Apr"; expenses: "1"; angle: "52";  income: "12"  }
-        ListElement{ year: "2010"; month: "May"; expenses: "5"; angle: "53";  income: "9"  }
-        ListElement{ year: "2010"; month: "Jun"; expenses: "5"; angle: "54";  income: "8"  }
-        ListElement{ year: "2010"; month: "Jul"; expenses: "3"; angle: "55";  income: "7"  }
-        ListElement{ year: "2010"; month: "Aug"; expenses: "1"; angle: "56";  income: "5"  }
-        ListElement{ year: "2010"; month: "Sep"; expenses: "2"; angle: "57";  income: "4"  }
-        ListElement{ year: "2010"; month: "Oct"; expenses: "10";angle: "58";  income: "13"  }
-        ListElement{ year: "2010"; month: "Nov"; expenses: "12";angle: "59";  income: "17"  }
-        ListElement{ year: "2010"; month: "Dec"; expenses: "6"; angle: "60";  income: "9"  }
+        ListElement{ year: "2010"; month: "Jan"; expenses: "@@14ttt"; angle: "jjj49";  income: "22"  }
+        ListElement{ year: "2010"; month: "Feb"; expenses: "@@5ttt"; angle: "jjj50";  income: "7"  }
+        ListElement{ year: "2010"; month: "Mar"; expenses: "@@1ttt"; angle: "jjj51";  income: "9"  }
+        ListElement{ year: "2010"; month: "Apr"; expenses: "@@1ttt"; angle: "jjj52";  income: "12"  }
+        ListElement{ year: "2010"; month: "May"; expenses: "@@5ttt"; angle: "jjj53";  income: "9"  }
+        ListElement{ year: "2010"; month: "Jun"; expenses: "@@5ttt"; angle: "jjj54";  income: "8"  }
+        ListElement{ year: "2010"; month: "Jul"; expenses: "@@3ttt"; angle: "jjj55";  income: "7"  }
+        ListElement{ year: "2010"; month: "Aug"; expenses: "@@1ttt"; angle: "jjj56";  income: "5"  }
+        ListElement{ year: "2010"; month: "Sep"; expenses: "@@2ttt"; angle: "jjj57";  income: "4"  }
+        ListElement{ year: "2010"; month: "Oct"; expenses: "@@10ttt"; angle: "jjj58";  income: "13"  }
+        ListElement{ year: "2010"; month: "Nov"; expenses: "@@12ttt"; angle: "jjj59";  income: "17"  }
+        ListElement{ year: "2010"; month: "Dec"; expenses: "@@6ttt"; angle: "jjj60";  income: "9"  }
 
-        ListElement{ year: "2011"; month: "Jan"; expenses: "2"; angle: "61";  income: "6"  }
-        ListElement{ year: "2011"; month: "Feb"; expenses: "4"; angle: "62";  income: "8"  }
-        ListElement{ year: "2011"; month: "Mar"; expenses: "7"; angle: "63";  income: "12"  }
-        ListElement{ year: "2011"; month: "Apr"; expenses: "9"; angle: "64";  income: "15"  }
-        ListElement{ year: "2011"; month: "May"; expenses: "7"; angle: "65";  income: "19"  }
-        ListElement{ year: "2011"; month: "Jun"; expenses: "9"; angle: "66";  income: "18"  }
-        ListElement{ year: "2011"; month: "Jul"; expenses: "13";angle: "67";  income: "17"  }
-        ListElement{ year: "2011"; month: "Aug"; expenses: "5"; angle: "68";  income: "9"  }
-        ListElement{ year: "2011"; month: "Sep"; expenses: "3"; angle: "69";  income: "8"  }
-        ListElement{ year: "2011"; month: "Oct"; expenses: "13";angle: "70";  income: "15"  }
-        ListElement{ year: "2011"; month: "Nov"; expenses: "8"; angle: "71";  income: "17"  }
-        ListElement{ year: "2011"; month: "Dec"; expenses: "7"; angle: "72";  income: "10"  }
+        ListElement{ year: "2011"; month: "Jan"; expenses: "@@2ttt"; angle: "jjj61";  income: "6"  }
+        ListElement{ year: "2011"; month: "Feb"; expenses: "@@4ttt"; angle: "jjj62";  income: "8"  }
+        ListElement{ year: "2011"; month: "Mar"; expenses: "@@7ttt"; angle: "jjj63";  income: "12"  }
+        ListElement{ year: "2011"; month: "Apr"; expenses: "@@9ttt"; angle: "jjj64";  income: "15"  }
+        ListElement{ year: "2011"; month: "May"; expenses: "@@7ttt"; angle: "jjj65";  income: "19"  }
+        ListElement{ year: "2011"; month: "Jun"; expenses: "@@9ttt"; angle: "jjj66";  income: "18"  }
+        ListElement{ year: "2011"; month: "Jul"; expenses: "@@13ttt"; angle: "jjj67";  income: "17"  }
+        ListElement{ year: "2011"; month: "Aug"; expenses: "@@5ttt"; angle: "jjj68";  income: "9"  }
+        ListElement{ year: "2011"; month: "Sep"; expenses: "@@3ttt"; angle: "jjj69";  income: "8"  }
+        ListElement{ year: "2011"; month: "Oct"; expenses: "@@13ttt"; angle: "jjj70";  income: "15"  }
+        ListElement{ year: "2011"; month: "Nov"; expenses: "@@8ttt"; angle: "jjj71";  income: "17"  }
+        ListElement{ year: "2011"; month: "Dec"; expenses: "@@7ttt"; angle: "jjj72";  income: "10"  }
 
-        ListElement{ year: "2012"; month: "Jan"; expenses: "12";angle: "73";  income: "16"  }
-        ListElement{ year: "2012"; month: "Feb"; expenses: "24";angle: "74";  income: "28"  }
-        ListElement{ year: "2012"; month: "Mar"; expenses: "27";angle: "75";  income: "22"  }
-        ListElement{ year: "2012"; month: "Apr"; expenses: "29";angle: "76";  income: "25"  }
-        ListElement{ year: "2012"; month: "May"; expenses: "27";angle: "77";  income: "29"  }
-        ListElement{ year: "2012"; month: "Jun"; expenses: "19";angle: "78";  income: "18"  }
-        ListElement{ year: "2012"; month: "Jul"; expenses: "13";angle: "79";  income: "17"  }
-        ListElement{ year: "2012"; month: "Aug"; expenses: "15";angle: "80";  income: "19"  }
-        ListElement{ year: "2012"; month: "Sep"; expenses: "3"; angle: "81";  income: "8"  }
-        ListElement{ year: "2012"; month: "Oct"; expenses: "3"; angle: "82";  income: "6"  }
-        ListElement{ year: "2012"; month: "Nov"; expenses: "4"; angle: "83";  income: "8"  }
-        ListElement{ year: "2012"; month: "Dec"; expenses: "5"; angle: "84";  income: "9"  }
+        ListElement{ year: "2012"; month: "Jan"; expenses: "@@12ttt"; angle: "jjj73";  income: "16"  }
+        ListElement{ year: "2012"; month: "Feb"; expenses: "@@24ttt"; angle: "jjj74";  income: "28"  }
+        ListElement{ year: "2012"; month: "Mar"; expenses: "@@27ttt"; angle: "jjj75";  income: "22"  }
+        ListElement{ year: "2012"; month: "Apr"; expenses: "@@29ttt"; angle: "jjj76";  income: "25"  }
+        ListElement{ year: "2012"; month: "May"; expenses: "@@27ttt"; angle: "jjj77";  income: "29"  }
+        ListElement{ year: "2012"; month: "Jun"; expenses: "@@19ttt"; angle: "jjj78";  income: "18"  }
+        ListElement{ year: "2012"; month: "Jul"; expenses: "@@13ttt"; angle: "jjj79";  income: "17"  }
+        ListElement{ year: "2012"; month: "Aug"; expenses: "@@15ttt"; angle: "jjj80";  income: "19"  }
+        ListElement{ year: "2012"; month: "Sep"; expenses: "@@3ttt"; angle: "jjj81";  income: "8"  }
+        ListElement{ year: "2012"; month: "Oct"; expenses: "@@3ttt"; angle: "jjj82";  income: "6"  }
+        ListElement{ year: "2012"; month: "Nov"; expenses: "@@4ttt"; angle: "jjj83";  income: "8"  }
+        ListElement{ year: "2012"; month: "Dec"; expenses: "@@5ttt"; angle: "jjj84";  income: "9"  }
     }
 }