@@ -27,27 +27,20 @@ void InfographicModelPrivate::generateFakeData()
2727 std::normal_distribution<qreal> distribution(0.5, 0.2);
2828 auto rand = std::bind(distribution, generator);
2929
30− QVector<QColor> colours;
31− colours.push_back(QColor::fromRgbF(0.3, 0.27, 0.32));
32− colours.push_back(QColor::fromRgbF(0.83, 0.49, 0.58));
33− colours.push_back(QColor::fromRgbF(0.63, 0.51, 0.59));
30+ QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
31+ QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
32+ QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
33+ QColor darkPurple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
34+ QColor lightPurple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
35+ QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
3436
35− colours.push_back(QColor::fromRgbF(0.28, 0.26, 0.4));
36− colours.push_back(QColor::fromRgbF(0.47, 0.38, 0.56));
37− colours.push_back(QColor::fromRgbF(0.69, 0.65, 0.78));
38−
39− colours.push_back(QColor::fromRgbF(0.32, 0.21, 0.16));
40− colours.push_back(QColor::fromRgbF(0.55, 0.45, 0.32));
41− colours.push_back(QColor::fromRgbF(0.85, 0.74, 0.53));
42−
43− colours.push_back(QColor::fromRgbF(0.25, 0.31, 0.19));
44− colours.push_back(QColor::fromRgbF(0.63, 0.53, 0.3));
45− colours.push_back(QColor::fromRgbF(0.89, 0.56, 0.31));
46−
47− InfographicColorTheme first(colours[0], colours[1], colours[2]);
48− InfographicColorTheme second(colours[3], colours[4], colours[5]);
49− InfographicColorTheme eighth(colours[6], colours[7], colours[8]);
50− InfographicColorTheme ninth(colours[9], colours[10], colours[11]);
37+ InfographicColorTheme orangeTheme(yellow, orange, red);
38+ InfographicColorTheme yellowTheme(orange, yellow, orange);
39+ InfographicColorTheme redTheme(red, red, red);
40+ InfographicColorTheme darkPurpleTheme(lightPurple, darkPurple, pink);
41+ InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
42+ lightPurple);
43+ InfographicColorTheme pinkTheme(lightPurple, pink, darkPurple);
5144
5245 {
5346 QVariantList firstMonth;
@@ -59,8 +52,8 @@ void InfographicModelPrivate::generateFakeData()
5952 while (secondMonth.size() < 31)
6053 secondMonth.push_back(QVariant(rand()));
6154 QSharedPointer<InfographicData> data(
62− new InfographicData("<b>52km</b> travelled", first, firstMonth,
63− ninth, secondMonth, this));
55+ new InfographicData("<b>52km</b> travelled", yellowTheme, firstMonth,
56+ orangeTheme, secondMonth, this));
6457 m_fakeData.insert("guest", data);
6558 }
6659
@@ -74,8 +67,8 @@ void InfographicModelPrivate::generateFakeData()
7467 while (secondMonth.size() < 31)
7568 secondMonth.push_back(QVariant(rand()));
7669 QSharedPointer<InfographicData> data(
77− new InfographicData("<b>33</b> messages today", second,
78− firstMonth, eighth, secondMonth, this));
70+ new InfographicData("<b>33</b> messages today", pinkTheme,
71+ firstMonth, orangeTheme, secondMonth, this));
7972 m_fakeData.insert("guest", data);
8073 }
8174
@@ -89,8 +82,8 @@ void InfographicModelPrivate::generateFakeData()
8982 while (secondMonth.size() < 31)
9083 secondMonth.push_back(QVariant(rand()));
9184 QSharedPointer<InfographicData> data(
92− new InfographicData("<b>69</b> minutes talk time", eighth,
93− firstMonth, second, secondMonth, this));
85+ new InfographicData("<b>69</b> minutes talk time", darkPurpleTheme,
86+ firstMonth, redTheme, secondMonth, this));
9487 m_fakeData.insert("guest", data);
9588 }
9689}