@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef THEMEWINDOW_H |
|
21 | #ifndef THEMEWINDOW_H | |
22 |
#define THEMEWINDOW_H |
|
22 | #define THEMEWINDOW_H | |
23 | #include <QWidget> |
|
23 | #include <QWidget> | |
24 | #include <QChartGlobal> |
|
24 | #include <QChartGlobal> | |
25 |
|
25 | |||
@@ -73,4 +73,4 private: | |||||
73 | QComboBox *m_legendComboBox; |
|
73 | QComboBox *m_legendComboBox; | |
74 | }; |
|
74 | }; | |
75 |
|
75 | |||
76 |
#endif /* THEMEWINDOW_H |
|
76 | #endif /* THEMEWINDOW_H */ |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef MODEL_H |
|
21 | #ifndef MODEL_H | |
22 |
#define MODEL_H |
|
22 | #define MODEL_H | |
23 |
|
23 | |||
24 | #include <QList> |
|
24 | #include <QList> | |
25 | #include <QPair> |
|
25 | #include <QPair> |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef VIEW_H |
|
21 | #ifndef VIEW_H | |
22 |
#define VIEW_H |
|
22 | #define VIEW_H | |
23 | #include <QGraphicsView> |
|
23 | #include <QGraphicsView> | |
24 |
|
24 | |||
25 | class QGraphicsScene; |
|
25 | class QGraphicsScene; |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef WINDOW_H |
|
21 | #ifndef WINDOW_H | |
22 |
#define WINDOW_H |
|
22 | #define WINDOW_H | |
23 | #include "model.h" |
|
23 | #include "model.h" | |
24 | #include <QMainWindow> |
|
24 | #include <QMainWindow> | |
25 | #include <QChartGlobal> |
|
25 | #include <QChartGlobal> |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef CHART_H |
|
21 | #ifndef CHART_H | |
22 |
#define CHART_H |
|
22 | #define CHART_H | |
23 |
|
23 | |||
24 | #include <QChart> |
|
24 | #include <QChart> | |
25 | #include <QTimer> |
|
25 | #include <QTimer> | |
@@ -53,4 +53,4 private: | |||||
53 | }; |
|
53 | }; | |
54 | //![1] |
|
54 | //![1] | |
55 |
|
55 | |||
56 |
#endif /* CHART_H |
|
56 | #endif /* CHART_H */ |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 |
#define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QChartView> | |
25 | #include <QTimer> |
|
25 | #include <QTimer> | |
@@ -46,4 +46,4 private: | |||||
46 | }; |
|
46 | }; | |
47 | //![1] |
|
47 | //![1] | |
48 |
|
48 | |||
49 |
#endif /* CHARTVIEW_H |
|
49 | #endif /* CHARTVIEW_H */ |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef QCHARTSPLUGIN_H |
|
21 | #ifndef QCHARTSPLUGIN_H | |
22 |
#define QCHARTSPLUGIN_H |
|
22 | #define QCHARTSPLUGIN_H | |
23 |
|
23 | |||
24 | #include <QDesignerCustomWidgetInterface> |
|
24 | #include <QDesignerCustomWidgetInterface> | |
25 |
|
25 | |||
@@ -41,4 +41,4 public: | |||||
41 | QWidget *createWidget(QWidget *parent); |
|
41 | QWidget *createWidget(QWidget *parent); | |
42 | }; |
|
42 | }; | |
43 |
|
43 | |||
44 |
#endif /* QCHARTSPLUGIN_H |
|
44 | #endif /* QCHARTSPLUGIN_H */ |
@@ -59,4 +59,4 QTCOMMERCIALCHART_END_NAMESPACE | |||||
59 |
|
59 | |||
60 |
|
60 | |||
61 |
|
61 | |||
62 |
#endif /* AXISI |
|
62 | #endif /* AXISANIMATION_H */ |
@@ -46,6 +46,4 public: | |||||
46 |
|
46 | |||
47 | QTCOMMERCIALCHART_END_NAMESPACE |
|
47 | QTCOMMERCIALCHART_END_NAMESPACE | |
48 |
|
48 | |||
49 |
|
49 | #endif /* CHARTANIMATION_H */ | ||
50 |
|
||||
51 | #endif /* AXISITEM_H_ */ |
|
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef CHARTCATEGOR |
|
30 | #ifndef CHARTBARCATEGORYAXISX_H | |
31 |
#define CHARTCATEGOR |
|
31 | #define CHARTBARCATEGORYAXISX_H | |
32 |
|
32 | |||
33 | #include "chartaxis_p.h" |
|
33 | #include "chartaxis_p.h" | |
34 |
|
34 | |||
@@ -61,4 +61,4 private: | |||||
61 |
|
61 | |||
62 | QTCOMMERCIALCHART_END_NAMESPACE |
|
62 | QTCOMMERCIALCHART_END_NAMESPACE | |
63 |
|
63 | |||
64 |
#endif /* CHARTCATEGOR |
|
64 | #endif /* CHARTBARCATEGORYAXISX_H */ |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef CHARTCATEGOR |
|
30 | #ifndef CHARTBARCATEGORYAXISY_H | |
31 |
#define CHARTCATEGOR |
|
31 | #define CHARTBARCATEGORYAXISY_H | |
32 |
|
32 | |||
33 | #include "chartaxis_p.h" |
|
33 | #include "chartaxis_p.h" | |
34 |
|
34 | |||
@@ -60,4 +60,4 private: | |||||
60 |
|
60 | |||
61 | QTCOMMERCIALCHART_END_NAMESPACE |
|
61 | QTCOMMERCIALCHART_END_NAMESPACE | |
62 |
|
62 | |||
63 |
#endif /* CHARTCATEGOR |
|
63 | #endif /* CHARTBARCATEGORYAXISY_H */ |
@@ -199,7 +199,7 void QBarCategoryAxis::remove(const QString &category) | |||||
199 | if(!d->m_categories.isEmpty()) |
|
199 | if(!d->m_categories.isEmpty()) | |
200 | setRange(d->m_categories.first(),d->m_categories.last()); |
|
200 | setRange(d->m_categories.first(),d->m_categories.last()); | |
201 | else |
|
201 | else | |
202 |
setRange(QString |
|
202 | setRange(QString(),QString()); | |
203 | emit categoriesChanged(); |
|
203 | emit categoriesChanged(); | |
204 | } |
|
204 | } | |
205 | } |
|
205 | } | |
@@ -242,7 +242,7 void QBarCategoryAxis::clear() | |||||
242 | { |
|
242 | { | |
243 | Q_D(QBarCategoryAxis); |
|
243 | Q_D(QBarCategoryAxis); | |
244 | d->m_categories.clear(); |
|
244 | d->m_categories.clear(); | |
245 |
setRange(QString |
|
245 | setRange(QString(),QString()); | |
246 | emit categoriesChanged(); |
|
246 | emit categoriesChanged(); | |
247 | } |
|
247 | } | |
248 |
|
248 |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef QBARCATEGOR |
|
21 | #ifndef QBARCATEGORYAXIS_H | |
22 |
#define QBARCATEGOR |
|
22 | #define QBARCATEGORYAXIS_H | |
23 |
|
23 | |||
24 | #include "qabstractaxis.h" |
|
24 | #include "qabstractaxis.h" | |
25 |
|
25 | |||
@@ -76,4 +76,4 private: | |||||
76 |
|
76 | |||
77 | QTCOMMERCIALCHART_END_NAMESPACE |
|
77 | QTCOMMERCIALCHART_END_NAMESPACE | |
78 |
|
78 | |||
79 |
#endif // QCATEGOR |
|
79 | #endif // QBARCATEGORYAXIS_H |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef QBARCATEGOR |
|
30 | #ifndef QBARCATEGORYAXIS_P_H | |
31 |
#define QBARCATEGOR |
|
31 | #define QBARCATEGORYAXIS_P_H | |
32 |
|
32 | |||
33 | #include "qbarcategoryaxis.h" |
|
33 | #include "qbarcategoryaxis.h" | |
34 | #include "qabstractaxis_p.h" |
|
34 | #include "qabstractaxis_p.h" | |
@@ -73,4 +73,4 private: | |||||
73 |
|
73 | |||
74 | QTCOMMERCIALCHART_END_NAMESPACE |
|
74 | QTCOMMERCIALCHART_END_NAMESPACE | |
75 |
|
75 | |||
76 |
#endif // QBARCATEGOR |
|
76 | #endif // QBARCATEGORYAXIS_P_H |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef CHART |
|
30 | #ifndef CHARTCATEGORYAXISX_H | |
31 |
#define CHART |
|
31 | #define CHARTCATEGORYAXISX_H | |
32 |
|
32 | |||
33 | #include "chartaxis_p.h" |
|
33 | #include "chartaxis_p.h" | |
34 |
|
34 | |||
@@ -55,4 +55,4 protected: | |||||
55 |
|
55 | |||
56 | QTCOMMERCIALCHART_END_NAMESPACE |
|
56 | QTCOMMERCIALCHART_END_NAMESPACE | |
57 |
|
57 | |||
58 |
#endif /* CHART |
|
58 | #endif /* CHARTCATEGORYAXISX_H */ |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef CHART |
|
30 | #ifndef CHARTCATEGORYAXISY_H | |
31 |
#define CHART |
|
31 | #define CHARTCATEGORYAXISY_H | |
32 |
|
32 | |||
33 | #include "chartaxis_p.h" |
|
33 | #include "chartaxis_p.h" | |
34 |
|
34 | |||
@@ -55,4 +55,4 Q_SLOTS | |||||
55 |
|
55 | |||
56 | QTCOMMERCIALCHART_END_NAMESPACE |
|
56 | QTCOMMERCIALCHART_END_NAMESPACE | |
57 |
|
57 | |||
58 |
#endif /* CHART |
|
58 | #endif /* CHARTCATEGORYAXISY_H */ |
@@ -156,7 +156,7 void QCategoryAxis::setStartValue(qreal min) | |||||
156 | qreal QCategoryAxis::startValue(const QString& categoryLabel) const |
|
156 | qreal QCategoryAxis::startValue(const QString& categoryLabel) const | |
157 | { |
|
157 | { | |
158 | Q_D(const QCategoryAxis); |
|
158 | Q_D(const QCategoryAxis); | |
159 |
if (categoryLabel |
|
159 | if (categoryLabel.isEmpty()) | |
160 | return d->m_categoryMinimum; |
|
160 | return d->m_categoryMinimum; | |
161 | else |
|
161 | else | |
162 | return d->m_categoriesMap.value(categoryLabel).first; |
|
162 | return d->m_categoriesMap.value(categoryLabel).first; |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef QCATEGOR |
|
21 | #ifndef QCATEGORYAXIS_H | |
22 |
#define QCATEGOR |
|
22 | #define QCATEGORYAXIS_H | |
23 |
|
23 | |||
24 | #include "qabstractaxis.h" |
|
24 | #include "qabstractaxis.h" | |
25 | #include "qvalueaxis.h" |
|
25 | #include "qvalueaxis.h" | |
@@ -62,4 +62,4 private: | |||||
62 |
|
62 | |||
63 | QTCOMMERCIALCHART_END_NAMESPACE |
|
63 | QTCOMMERCIALCHART_END_NAMESPACE | |
64 |
|
64 | |||
65 |
#endif // QCATEGOR |
|
65 | #endif // QCATEGORYAXIS_H |
@@ -166,4 +166,4 private: | |||||
166 |
|
166 | |||
167 | QTCOMMERCIALCHART_END_NAMESPACE |
|
167 | QTCOMMERCIALCHART_END_NAMESPACE | |
168 |
|
168 | |||
169 |
#endif /* AXI |
|
169 | #endif /* CHARTAXI_H */ |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef Q |
|
30 | #ifndef QDATETIMEAXIS_P_H | |
31 |
#define Q |
|
31 | #define QDATETIMEAXIS_P_H | |
32 |
|
32 | |||
33 | #include "qdatetimeaxis.h" |
|
33 | #include "qdatetimeaxis.h" | |
34 | #include "qabstractaxis_p.h" |
|
34 | #include "qabstractaxis_p.h" | |
@@ -67,4 +67,4 class QDateTimeAxisPrivate : public QAbstractAxisPrivate | |||||
67 |
|
67 | |||
68 | QTCOMMERCIALCHART_END_NAMESPACE |
|
68 | QTCOMMERCIALCHART_END_NAMESPACE | |
69 |
|
69 | |||
70 |
#endif // Q |
|
70 | #endif // QDATETIMEAXIS_P_H |
@@ -572,7 +572,7 void QAbstractAxis::hide() | |||||
572 |
|
572 | |||
573 | /*! |
|
573 | /*! | |
574 | Sets the minimum value shown on the axis. |
|
574 | Sets the minimum value shown on the axis. | |
575 | Depending on the actual axis type the \a min paramter is converted to appropriate type. |
|
575 | Depending on the actual axis type the \a min parameter is converted to appropriate type. | |
576 | If the conversion is impossible then the function call does nothing |
|
576 | If the conversion is impossible then the function call does nothing | |
577 | */ |
|
577 | */ | |
578 | void QAbstractAxis::setMin(const QVariant &min) |
|
578 | void QAbstractAxis::setMin(const QVariant &min) | |
@@ -582,7 +582,7 void QAbstractAxis::setMin(const QVariant &min) | |||||
582 |
|
582 | |||
583 | /*! |
|
583 | /*! | |
584 | Sets the maximum value shown on the axis. |
|
584 | Sets the maximum value shown on the axis. | |
585 | Depending on the actual axis type the \a max paramter is converted to appropriate type. |
|
585 | Depending on the actual axis type the \a max parameter is converted to appropriate type. | |
586 | If the conversion is impossible then the function call does nothing |
|
586 | If the conversion is impossible then the function call does nothing | |
587 | */ |
|
587 | */ | |
588 | void QAbstractAxis::setMax(const QVariant &max) |
|
588 | void QAbstractAxis::setMax(const QVariant &max) | |
@@ -592,7 +592,7 void QAbstractAxis::setMax(const QVariant &max) | |||||
592 |
|
592 | |||
593 | /*! |
|
593 | /*! | |
594 | Sets the range shown on the axis. |
|
594 | Sets the range shown on the axis. | |
595 | Depending on the actual axis type the \a min and \a max paramters are converted to appropriate types. |
|
595 | Depending on the actual axis type the \a min and \a max parameters are converted to appropriate types. | |
596 | If the conversion is impossible then the function call does nothing. |
|
596 | If the conversion is impossible then the function call does nothing. | |
597 | */ |
|
597 | */ | |
598 | void QAbstractAxis::setRange(const QVariant &min, const QVariant &max) |
|
598 | void QAbstractAxis::setRange(const QVariant &min, const QVariant &max) |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef CHARTVALUE |
|
30 | #ifndef CHARTVALUEAXISX_H | |
31 |
#define CHARTVALUE |
|
31 | #define CHARTVALUEAXISX_H | |
32 |
|
32 | |||
33 | #include "chartaxis_p.h" |
|
33 | #include "chartaxis_p.h" | |
34 |
|
34 | |||
@@ -57,4 +57,4 private: | |||||
57 |
|
57 | |||
58 | QTCOMMERCIALCHART_END_NAMESPACE |
|
58 | QTCOMMERCIALCHART_END_NAMESPACE | |
59 |
|
59 | |||
60 |
#endif /* CHARTVALUE |
|
60 | #endif /* CHARTVALUEAXISX_H */ |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef CHARTVALUE |
|
30 | #ifndef CHARTVALUEAXISY_H | |
31 |
#define CHARTVALUE |
|
31 | #define CHARTVALUEAXISY_H | |
32 |
|
32 | |||
33 | #include "chartaxis_p.h" |
|
33 | #include "chartaxis_p.h" | |
34 |
|
34 | |||
@@ -55,4 +55,4 private: | |||||
55 |
|
55 | |||
56 | QTCOMMERCIALCHART_END_NAMESPACE |
|
56 | QTCOMMERCIALCHART_END_NAMESPACE | |
57 |
|
57 | |||
58 |
#endif /* CHARTVALUE |
|
58 | #endif /* CHARTVALUEAXISY_H */ |
@@ -301,8 +301,7 QValueAxisPrivate::QValueAxisPrivate(QValueAxis* q): | |||||
301 | m_min(0), |
|
301 | m_min(0), | |
302 | m_max(0), |
|
302 | m_max(0), | |
303 | m_tickCount(5), |
|
303 | m_tickCount(5), | |
304 |
m_niceNumbers(false) |
|
304 | m_niceNumbers(false) | |
305 | m_format(QString::null) |
|
|||
306 | { |
|
305 | { | |
307 |
|
306 | |||
308 | } |
|
307 | } |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef QVALUE |
|
21 | #ifndef QVALUEAXIS_H | |
22 |
#define QVALUE |
|
22 | #define QVALUEAXIS_H | |
23 |
|
23 | |||
24 | #include "qabstractaxis.h" |
|
24 | #include "qabstractaxis.h" | |
25 |
|
25 | |||
@@ -75,4 +75,4 private: | |||||
75 |
|
75 | |||
76 | QTCOMMERCIALCHART_END_NAMESPACE |
|
76 | QTCOMMERCIALCHART_END_NAMESPACE | |
77 |
|
77 | |||
78 |
#endif // QVALUE |
|
78 | #endif // QVALUEAXIS_H |
@@ -27,8 +27,8 | |||||
27 | // |
|
27 | // | |
28 | // We mean it. |
|
28 | // We mean it. | |
29 |
|
29 | |||
30 |
#ifndef QVALUE |
|
30 | #ifndef QVALUEAXIS_P_H | |
31 |
#define QVALUE |
|
31 | #define QVALUEAXIS_P_H | |
32 |
|
32 | |||
33 | #include "qvalueaxis.h" |
|
33 | #include "qvalueaxis.h" | |
34 | #include "qabstractaxis_p.h" |
|
34 | #include "qabstractaxis_p.h" | |
@@ -70,4 +70,4 private: | |||||
70 |
|
70 | |||
71 | QTCOMMERCIALCHART_END_NAMESPACE |
|
71 | QTCOMMERCIALCHART_END_NAMESPACE | |
72 |
|
72 | |||
73 |
#endif // QVALUE |
|
73 | #endif // QVALUEAXIS_P_H |
@@ -149,10 +149,10 void AbstractBarChartItem::handleDataStructureChanged() | |||||
149 | // Bars |
|
149 | // Bars | |
150 | Bar *bar = new Bar(set,c,this); |
|
150 | Bar *bar = new Bar(set,c,this); | |
151 | m_bars.append(bar); |
|
151 | m_bars.append(bar); | |
152 |
connect(bar, SIGNAL(clicked(int, |
|
152 | connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*))); | |
153 |
connect(bar, SIGNAL(hovered(bool, |
|
153 | connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*))); | |
154 |
connect(bar, SIGNAL(clicked(int, |
|
154 | connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int))); | |
155 |
connect(bar, SIGNAL(hovered(bool, |
|
155 | connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool))); | |
156 | m_layout.append(QRectF(0, 0, 0, 0)); |
|
156 | m_layout.append(QRectF(0, 0, 0, 0)); | |
157 |
|
157 | |||
158 | // Labels |
|
158 | // Labels |
@@ -287,7 +287,7 bool QAbstractBarSeries::take(QBarSet *set) | |||||
287 |
|
287 | |||
288 | /*! |
|
288 | /*! | |
289 | Adds a list of barsets to series. Takes ownership of \a sets. |
|
289 | Adds a list of barsets to series. Takes ownership of \a sets. | |
290 | Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series, |
|
290 | Returns true, if all sets were appended successfully. If any of the sets is null or is already appended to series, | |
291 | nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended |
|
291 | nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended | |
292 | and function returns false. |
|
292 | and function returns false. | |
293 | */ |
|
293 | */ |
@@ -550,8 +550,8 void QBarModelMapperPrivate::initializeBarFromModel() | |||||
550 | posInBar++; |
|
550 | posInBar++; | |
551 | barIndex = barModelIndex(i, posInBar); |
|
551 | barIndex = barModelIndex(i, posInBar); | |
552 | } |
|
552 | } | |
553 |
connect(barSet, SIGNAL(valuesAdded(int, |
|
553 | connect(barSet, SIGNAL(valuesAdded(int,int)), this, SLOT(valuesAdded(int,int))); | |
554 |
connect(barSet, SIGNAL(valuesRemoved(int, |
|
554 | connect(barSet, SIGNAL(valuesRemoved(int,int)), this, SLOT(valuesRemoved(int,int))); | |
555 | connect(barSet, SIGNAL(valueChanged(int)), this, SLOT(barValueChanged(int))); |
|
555 | connect(barSet, SIGNAL(valueChanged(int)), this, SLOT(barValueChanged(int))); | |
556 | connect(barSet, SIGNAL(labelChanged()), this, SLOT(barLabelChanged())); |
|
556 | connect(barSet, SIGNAL(labelChanged()), this, SLOT(barLabelChanged())); | |
557 | m_series->append(barSet); |
|
557 | m_series->append(barSet); |
@@ -20,7 +20,6 | |||||
20 |
|
20 | |||
21 | #include "barchartitem_p.h" |
|
21 | #include "barchartitem_p.h" | |
22 | #include "bar_p.h" |
|
22 | #include "bar_p.h" | |
23 | #include "qbarset_p.h" |
|
|||
24 | #include "qabstractbarseries_p.h" |
|
23 | #include "qabstractbarseries_p.h" | |
25 | #include "qbarset.h" |
|
24 | #include "qbarset.h" | |
26 | #include "qbarset_p.h" |
|
25 | #include "qbarset_p.h" |
@@ -61,6 +61,6 private: | |||||
61 |
|
61 | |||
62 | QTCOMMERCIALCHART_END_NAMESPACE |
|
62 | QTCOMMERCIALCHART_END_NAMESPACE | |
63 |
|
63 | |||
64 |
#endif /* CHARTBACKGROUND_H |
|
64 | #endif /* CHARTBACKGROUND_H */ | |
65 |
|
65 | |||
66 |
|
66 |
@@ -95,4 +95,4 private: | |||||
95 |
|
95 | |||
96 | QTCOMMERCIALCHART_END_NAMESPACE |
|
96 | QTCOMMERCIALCHART_END_NAMESPACE | |
97 |
|
97 | |||
98 |
#endif /* CHARTENGINE_P_H |
|
98 | #endif /* CHARTENGINE_P_H */ |
@@ -45,4 +45,4 public: | |||||
45 |
|
45 | |||
46 | QTCOMMERCIALCHART_END_NAMESPACE |
|
46 | QTCOMMERCIALCHART_END_NAMESPACE | |
47 |
|
47 | |||
48 |
#endif /* CHARTITEM_H |
|
48 | #endif /* CHARTITEM_H */ |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef CHARTLAYOUT_H |
|
21 | #ifndef CHARTLAYOUT_H | |
22 |
#define CHARTLAYOUT_H |
|
22 | #define CHARTLAYOUT_H | |
23 | #include <QGraphicsLayout> |
|
23 | #include <QGraphicsLayout> | |
24 | #include <QMargins> |
|
24 | #include <QMargins> | |
25 | #include "qchartglobal.h" |
|
25 | #include "qchartglobal.h" |
@@ -174,4 +174,4 private: | |||||
174 |
|
174 | |||
175 | QTCOMMERCIALCHART_END_NAMESPACE |
|
175 | QTCOMMERCIALCHART_END_NAMESPACE | |
176 |
|
176 | |||
177 |
#endif /* CHARTPRESENTER_H |
|
177 | #endif /* CHARTPRESENTER_H */ |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #ifndef MACROINCLUDE_H_ |
|
21 | #ifndef CHARTSNAMESPACE_H | |
22 |
#define MACROINCLUDE_H |
|
22 | #define MACROINCLUDE_H | |
23 |
|
23 | |||
24 | // this is needed by the designer plugin. |
|
24 | // this is needed by the designer plugin. | |
25 |
|
25 | |||
26 | QTCOMMERCIALCHART_USE_NAMESPACE |
|
26 | QTCOMMERCIALCHART_USE_NAMESPACE | |
27 |
|
27 | |||
28 |
#endif /* |
|
28 | #endif /* CHARTSNAMESPACE_H */ |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#ifndef LEGENDLAYOUT_H |
|
21 | #ifndef LEGENDLAYOUT_H | |
22 |
#define LEGENDLAYOUT_H |
|
22 | #define LEGENDLAYOUT_H | |
23 | #include <QGraphicsLayout> |
|
23 | #include <QGraphicsLayout> | |
24 | #include "qchartglobal.h" |
|
24 | #include "qchartglobal.h" | |
25 |
|
25 |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qpiemodelmapper_p.h" |
|
|||
22 | #include "qpiemodelmapper.h" |
|
21 | #include "qpiemodelmapper.h" | |
|
22 | #include "qpiemodelmapper_p.h" | |||
23 | #include "qpieseries.h" |
|
23 | #include "qpieseries.h" | |
24 | #include "qpieslice.h" |
|
24 | #include "qpieslice.h" | |
25 | #include <QAbstractItemModel> |
|
25 | #include <QAbstractItemModel> |
@@ -43,7 +43,7 class QChartView; | |||||
43 | class QChartViewPrivate { |
|
43 | class QChartViewPrivate { | |
44 |
|
44 | |||
45 | public: |
|
45 | public: | |
46 | QChartViewPrivate(QChartView *q,QChart *chart = 0); |
|
46 | explicit QChartViewPrivate(QChartView *q, QChart *chart = 0); | |
47 | ~QChartViewPrivate(); |
|
47 | ~QChartViewPrivate(); | |
48 |
|
48 | |||
49 | protected: |
|
49 | protected: |
General Comments 0
You need to be logged in to leave comments.
Login now