| @@ -6,11 +6,6 QT += declarative | |||
|
|
6 | 6 | } |
|
|
7 | 7 | INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR |
|
|
8 | 8 | |
|
|
9 | contains(QT_MAJOR_VERSION, 5) { | |
|
|
10 | # TODO: QtQuick2 not supported by the implementation currently | |
|
|
11 | DEFINES += QTQUICK2 | |
|
|
12 | } | |
|
|
13 | ||
|
|
14 | 9 | CONFIG(debug, debug|release) { |
|
|
15 | 10 | mac: TARGET = $$join(TARGET,,,_debug) |
|
|
16 | 11 | win32: TARGET = $$join(TARGET,,,d) |
| @@ -28,8 +28,6 | |||
|
|
28 | 28 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
|
29 | 29 | |
|
|
30 | 30 | class DeclarativeChart : public QDeclarativeItem |
|
|
31 | // TODO: for QTQUICK2: extend QQuickPainterItem instead | |
|
|
32 | //class DeclarativeChart : public QQuickPaintedItem, public Chart | |
|
|
33 | 31 | { |
|
|
34 | 32 | Q_OBJECT |
|
|
35 | 33 | Q_PROPERTY(Theme theme READ theme WRITE setTheme) |
| @@ -83,7 +83,6 QPieSlice* DeclarativePieSeries::find(QString label) | |||
|
|
83 | 83 | |
|
|
84 | 84 | QPieSlice* DeclarativePieSeries::append(QString label, qreal value) |
|
|
85 | 85 | { |
|
|
86 | // TODO: parameter order is wrong, switch it: | |
|
|
87 | 86 | QPieSlice *slice = new QPieSlice(this); |
|
|
88 | 87 | slice->setLabel(label); |
|
|
89 | 88 | slice->setValue(value); |
| @@ -30,9 +30,8 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||
|
|
30 | 30 | class DeclarativeXYPoint : public QObject, public QPointF |
|
|
31 | 31 | { |
|
|
32 | 32 | Q_OBJECT |
|
|
33 | // TODO: make the setters change the value, if parented by a series | |
|
|
34 |
Q_PROPERTY(qreal |
|
|
|
35 | Q_PROPERTY(qreal y READ y WRITE setY /*NOTIFY dataYChanged*/) | |
|
|
33 | Q_PROPERTY(qreal x READ x WRITE setX) | |
|
|
34 | Q_PROPERTY(qreal y READ y WRITE setY) | |
|
|
36 | 35 | |
|
|
37 | 36 | public: |
|
|
38 | 37 | explicit DeclarativeXYPoint(QObject *parent = 0); |
| @@ -45,11 +45,8 public: | |||
|
|
45 | 45 | ChartThemeSystem() : ChartTheme(QChart::ChartThemeLight /*QChart::ChartThemeSystem*/) |
|
|
46 | 46 | { |
|
|
47 | 47 | #ifdef Q_OS_WIN |
|
|
48 |
// |
|
|
|
48 | // We could also use theme specific window frame color as a series base color (it would give more | |
|
|
49 | 49 | // variation to the base colors in addition to the blue and black used now) |
|
|
50 | // TODO: COLOR_WINDOWTEXT for text color? | |
|
|
51 | // TODO: COLOR_INFOTEXT for tooltip text color? | |
|
|
52 | // TODO: COLOR_INFOBK for tooltip background color? | |
|
|
53 | 50 | |
|
|
54 | 51 | // First series base color from COLOR_HIGHLIGHT |
|
|
55 | 52 | DWORD colorHighlight; |
| @@ -104,7 +101,7 public: | |||
|
|
104 | 101 | m_backgroundShades = BackgroundShadesNone; |
|
|
105 | 102 | |
|
|
106 | 103 | #elif defined(Q_OS_LINUX) |
|
|
107 | // TODO: replace this dummy theme with linux specific theme | |
|
|
104 | // Using a hard coded theme for Linux system theme | |
|
|
108 | 105 | m_seriesColors << QRgb(0x60a6e6); |
|
|
109 | 106 | m_seriesColors << QRgb(0x92ca66); |
|
|
110 | 107 | m_seriesColors << QRgb(0xeba85f); |
| @@ -127,7 +124,7 public: | |||
|
|
127 | 124 | m_backgroundShades = BackgroundShadesNone; |
|
|
128 | 125 | |
|
|
129 | 126 | #elif defined(Q_OS_MAC) |
|
|
130 | // TODO: replace this dummy theme with OSX specific theme | |
|
|
127 | // Using a hard coded theme for OSX system theme; the colors match the OSX 10.7 colors | |
|
|
131 | 128 | m_seriesColors << QRgb(0x60a6e6); |
|
|
132 | 129 | m_seriesColors << QRgb(0x92ca66); |
|
|
133 | 130 | m_seriesColors << QRgb(0xeba85f); |
| @@ -150,7 +147,7 public: | |||
|
|
150 | 147 | m_backgroundShades = BackgroundShadesNone; |
|
|
151 | 148 | |
|
|
152 | 149 | #else |
|
|
153 | // TODO: replace this dummy theme with generic (not OS specific) theme | |
|
|
150 | // Hard coded theme | |
|
|
154 | 151 | m_seriesColors << QRgb(0x60a6e6); |
|
|
155 | 152 | m_seriesColors << QRgb(0x92ca66); |
|
|
156 | 153 | m_seriesColors << QRgb(0xeba85f); |
General Comments 0
You need to be logged in to leave comments.
Login now