@@ -212,12 +212,13 QChart* ThemeWidget::createBarChart(int valueCount) const | |||||
212 | chart->axisY()->setNiceNumbersEnabled(true); |
|
212 | chart->axisY()->setNiceNumbersEnabled(true); | |
213 | chart->setTitle("Bar chart"); |
|
213 | chart->setTitle("Bar chart"); | |
214 |
|
214 | |||
215 |
Q |
|
215 | QStringList categories; | |
216 | for (int i(0); i < valueCount; i++) |
|
216 | for (int i(0); i < valueCount; i++) | |
217 | categories << QString::number(i); |
|
217 | categories << QString::number(i); | |
218 |
|
218 | |||
|
219 | chart->axisX()->categories()->insert(categories); | |||
|
220 | ||||
219 | QStackedBarSeries* series = new QStackedBarSeries(chart); |
|
221 | QStackedBarSeries* series = new QStackedBarSeries(chart); | |
220 | series->setCategories(categories); |
|
|||
221 | for (int i(0); i < m_dataTable.count(); i++) { |
|
222 | for (int i(0); i < m_dataTable.count(); i++) { | |
222 | QBarSet *set = new QBarSet("Bar set " + QString::number(i)); |
|
223 | QBarSet *set = new QBarSet("Bar set " + QString::number(i)); | |
223 | foreach (Data data, m_dataTable[i]) |
|
224 | foreach (Data data, m_dataTable[i]) |
@@ -32,11 +32,6 int main(int argc, char *argv[]) | |||||
32 | QApplication a(argc, argv); |
|
32 | QApplication a(argc, argv); | |
33 |
|
33 | |||
34 | //![1] |
|
34 | //![1] | |
35 | QBarCategories categories; |
|
|||
36 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
|||
37 | //![1] |
|
|||
38 |
|
||||
39 | //![2] |
|
|||
40 | QBarSet *set0 = new QBarSet("Jane"); |
|
35 | QBarSet *set0 = new QBarSet("Jane"); | |
41 | QBarSet *set1 = new QBarSet("John"); |
|
36 | QBarSet *set1 = new QBarSet("John"); | |
42 | QBarSet *set2 = new QBarSet("Axel"); |
|
37 | QBarSet *set2 = new QBarSet("Axel"); | |
@@ -48,23 +43,29 int main(int argc, char *argv[]) | |||||
48 | *set2 << 3 << 5 << 8 << 13 << 8 << 5; |
|
43 | *set2 << 3 << 5 << 8 << 13 << 8 << 5; | |
49 | *set3 << 5 << 6 << 7 << 3 << 4 << 5; |
|
44 | *set3 << 5 << 6 << 7 << 3 << 4 << 5; | |
50 | *set4 << 9 << 7 << 5 << 3 << 1 << 2; |
|
45 | *set4 << 9 << 7 << 5 << 3 << 1 << 2; | |
51 |
//![ |
|
46 | //![1] | |
52 |
|
47 | |||
53 |
//![ |
|
48 | //![2] | |
54 | QGroupedBarSeries* series = new QGroupedBarSeries(); |
|
49 | QGroupedBarSeries* series = new QGroupedBarSeries(); | |
55 | series->setCategories(categories); |
|
50 | // series->setCategories(categories); | |
56 | series->append(set0); |
|
51 | series->append(set0); | |
57 | series->append(set1); |
|
52 | series->append(set1); | |
58 | series->append(set2); |
|
53 | series->append(set2); | |
59 | series->append(set3); |
|
54 | series->append(set3); | |
60 | series->append(set4); |
|
55 | series->append(set4); | |
61 |
|
56 | |||
62 |
//![ |
|
57 | //![2] | |
63 |
|
58 | |||
64 |
//![ |
|
59 | //![3] | |
65 | QChart* chart = new QChart(); |
|
60 | QChart* chart = new QChart(); | |
66 | chart->addSeries(series); |
|
61 | chart->addSeries(series); | |
67 | chart->setTitle("Simple grouped barchart example"); |
|
62 | chart->setTitle("Simple grouped barchart example"); | |
|
63 | //![3] | |||
|
64 | ||||
|
65 | //![4] | |||
|
66 | QStringList categories; | |||
|
67 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |||
|
68 | chart->axisX()->categories()->insert(categories); | |||
68 | //![4] |
|
69 | //![4] | |
69 |
|
70 | |||
70 | //![5] |
|
71 | //![5] |
@@ -12,7 +12,6 | |||||
12 | QTCOMMERCIALCHART_USE_NAMESPACE |
|
12 | QTCOMMERCIALCHART_USE_NAMESPACE | |
13 |
|
13 | |||
14 | class MainWidget : public QWidget |
|
14 | class MainWidget : public QWidget | |
15 | //class MainWidget : public QGraphicsWidget |
|
|||
16 | { |
|
15 | { | |
17 | Q_OBJECT |
|
16 | Q_OBJECT | |
18 | public: |
|
17 | public: |
@@ -32,11 +32,6 int main(int argc, char *argv[]) | |||||
32 | QApplication a(argc, argv); |
|
32 | QApplication a(argc, argv); | |
33 |
|
33 | |||
34 | //![1] |
|
34 | //![1] | |
35 | QBarCategories categories; |
|
|||
36 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
|||
37 | //![1] |
|
|||
38 |
|
||||
39 | //![2] |
|
|||
40 | QBarSet *set0 = new QBarSet("Jane"); |
|
35 | QBarSet *set0 = new QBarSet("Jane"); | |
41 | QBarSet *set1 = new QBarSet("John"); |
|
36 | QBarSet *set1 = new QBarSet("John"); | |
42 | QBarSet *set2 = new QBarSet("Axel"); |
|
37 | QBarSet *set2 = new QBarSet("Axel"); | |
@@ -48,22 +43,27 int main(int argc, char *argv[]) | |||||
48 | *set2 << 3 << 5 << 8 << 13 << 8 << 5; |
|
43 | *set2 << 3 << 5 << 8 << 13 << 8 << 5; | |
49 | *set3 << 5 << 6 << 7 << 3 << 4 << 5; |
|
44 | *set3 << 5 << 6 << 7 << 3 << 4 << 5; | |
50 | *set4 << 9 << 7 << 5 << 3 << 1 << 2; |
|
45 | *set4 << 9 << 7 << 5 << 3 << 1 << 2; | |
51 |
//![ |
|
46 | //![1] | |
52 |
|
47 | |||
53 |
//![ |
|
48 | //![2] | |
54 | QPercentBarSeries* series = new QPercentBarSeries(); |
|
49 | QPercentBarSeries* series = new QPercentBarSeries(); | |
55 | series->setCategories(categories); |
|
|||
56 | series->append(set0); |
|
50 | series->append(set0); | |
57 | series->append(set1); |
|
51 | series->append(set1); | |
58 | series->append(set2); |
|
52 | series->append(set2); | |
59 | series->append(set3); |
|
53 | series->append(set3); | |
60 | series->append(set4); |
|
54 | series->append(set4); | |
61 |
//![ |
|
55 | //![2] | |
62 |
|
56 | |||
63 |
//![ |
|
57 | //![3] | |
64 | QChart* chart = new QChart(); |
|
58 | QChart* chart = new QChart(); | |
65 | chart->addSeries(series); |
|
59 | chart->addSeries(series); | |
66 | chart->setTitle("Simple percentbarchart example"); |
|
60 | chart->setTitle("Simple percentbarchart example"); | |
|
61 | //![3] | |||
|
62 | ||||
|
63 | //![4] | |||
|
64 | QStringList categories; | |||
|
65 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |||
|
66 | chart->axisX()->categories()->insert(categories); | |||
67 | //![4] |
|
67 | //![4] | |
68 |
|
68 | |||
69 | //![5] |
|
69 | //![5] |
@@ -32,11 +32,6 int main(int argc, char *argv[]) | |||||
32 | QApplication a(argc, argv); |
|
32 | QApplication a(argc, argv); | |
33 |
|
33 | |||
34 | //![1] |
|
34 | //![1] | |
35 | QBarCategories categories; |
|
|||
36 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; |
|
|||
37 | //![1] |
|
|||
38 |
|
||||
39 | //![2] |
|
|||
40 | QBarSet *set0 = new QBarSet("Jane"); |
|
35 | QBarSet *set0 = new QBarSet("Jane"); | |
41 | QBarSet *set1 = new QBarSet("John"); |
|
36 | QBarSet *set1 = new QBarSet("John"); | |
42 | QBarSet *set2 = new QBarSet("Axel"); |
|
37 | QBarSet *set2 = new QBarSet("Axel"); | |
@@ -48,22 +43,27 int main(int argc, char *argv[]) | |||||
48 | *set2 << 3 << 5 << 8 << 13 << 8 << 5; |
|
43 | *set2 << 3 << 5 << 8 << 13 << 8 << 5; | |
49 | *set3 << 5 << 6 << 7 << 3 << 4 << 5; |
|
44 | *set3 << 5 << 6 << 7 << 3 << 4 << 5; | |
50 | *set4 << 9 << 7 << 5 << 3 << 1 << 2; |
|
45 | *set4 << 9 << 7 << 5 << 3 << 1 << 2; | |
51 |
//![ |
|
46 | //![1] | |
52 |
|
47 | |||
53 |
//![ |
|
48 | //![2] | |
54 | QStackedBarSeries* series = new QStackedBarSeries(); |
|
49 | QStackedBarSeries* series = new QStackedBarSeries(); | |
55 | series->setCategories(categories); |
|
|||
56 | series->append(set0); |
|
50 | series->append(set0); | |
57 | series->append(set1); |
|
51 | series->append(set1); | |
58 | series->append(set2); |
|
52 | series->append(set2); | |
59 | series->append(set3); |
|
53 | series->append(set3); | |
60 | series->append(set4); |
|
54 | series->append(set4); | |
61 |
//![ |
|
55 | //![2] | |
62 |
|
56 | |||
63 |
//![ |
|
57 | //![3] | |
64 | QChart* chart = new QChart(); |
|
58 | QChart* chart = new QChart(); | |
65 | chart->addSeries(series); |
|
59 | chart->addSeries(series); | |
66 | chart->setTitle("Simple stackedbarchart example"); |
|
60 | chart->setTitle("Simple stackedbarchart example"); | |
|
61 | //![3] | |||
|
62 | ||||
|
63 | //![4] | |||
|
64 | QStringList categories; | |||
|
65 | categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; | |||
|
66 | chart->axisX()->categories()->insert(categories); | |||
67 | //![4] |
|
67 | //![4] | |
68 |
|
68 | |||
69 | //![5] |
|
69 | //![5] |
@@ -39,11 +39,11 void DrilldownChart::changeSeries(QAbstractSeries *series) | |||||
39 | axisY()->setNiceNumbersEnabled(true); |
|
39 | axisY()->setNiceNumbersEnabled(true); | |
40 | } |
|
40 | } | |
41 |
|
41 | |||
42 |
void DrilldownChart::handleClicked(QBarSet *barset, |
|
42 | void DrilldownChart::handleClicked(QBarSet *barset, int index) | |
43 | { |
|
43 | { | |
44 | Q_UNUSED(barset) |
|
44 | Q_UNUSED(barset) | |
45 | DrilldownBarSeries* series = static_cast<DrilldownBarSeries*> (sender()); |
|
45 | DrilldownBarSeries* series = static_cast<DrilldownBarSeries*> (sender()); | |
46 |
changeSeries(series->drilldownSeries( |
|
46 | changeSeries(series->drilldownSeries(index)); | |
47 | } |
|
47 | } | |
48 |
|
48 | |||
49 | #include "moc_drilldownchart.cpp" |
|
49 | #include "moc_drilldownchart.cpp" |
@@ -36,7 +36,7 public: | |||||
36 | void changeSeries(QAbstractSeries *series); |
|
36 | void changeSeries(QAbstractSeries *series); | |
37 |
|
37 | |||
38 | public Q_SLOTS: |
|
38 | public Q_SLOTS: | |
39 |
void handleClicked(QBarSet *barset, |
|
39 | void handleClicked(QBarSet *barset, int index); | |
40 |
|
40 | |||
41 | private: |
|
41 | private: | |
42 | QAbstractSeries* m_currentSeries; |
|
42 | QAbstractSeries* m_currentSeries; |
@@ -25,17 +25,16 QTCOMMERCIALCHART_USE_NAMESPACE | |||||
25 | DrilldownBarSeries::DrilldownBarSeries(QStringList categories, QObject *parent) |
|
25 | DrilldownBarSeries::DrilldownBarSeries(QStringList categories, QObject *parent) | |
26 | : QStackedBarSeries(parent) |
|
26 | : QStackedBarSeries(parent) | |
27 | { |
|
27 | { | |
28 | setCategories(categories); |
|
|||
29 | } |
|
28 | } | |
30 |
|
29 | |||
31 |
void DrilldownBarSeries::mapDrilldownSeries( |
|
30 | void DrilldownBarSeries::mapDrilldownSeries(int index, DrilldownBarSeries* drilldownSeries) | |
32 | { |
|
31 | { | |
33 |
mDrilldownSeries[ |
|
32 | mDrilldownSeries[index] = drilldownSeries; | |
34 | } |
|
33 | } | |
35 |
|
34 | |||
36 |
DrilldownBarSeries* DrilldownBarSeries::drilldownSeries( |
|
35 | DrilldownBarSeries* DrilldownBarSeries::drilldownSeries(int index) | |
37 | { |
|
36 | { | |
38 |
return mDrilldownSeries[ |
|
37 | return mDrilldownSeries[index]; | |
39 | } |
|
38 | } | |
40 |
|
39 | |||
41 | #include "moc_drilldownseries.cpp" |
|
40 | #include "moc_drilldownseries.cpp" |
@@ -33,12 +33,12 class DrilldownBarSeries : public QStackedBarSeries | |||||
33 | public: |
|
33 | public: | |
34 | DrilldownBarSeries(QStringList categories, QObject *parent = 0); |
|
34 | DrilldownBarSeries(QStringList categories, QObject *parent = 0); | |
35 |
|
35 | |||
36 |
void mapDrilldownSeries( |
|
36 | void mapDrilldownSeries(int index, DrilldownBarSeries* drilldownSeries); | |
37 |
|
37 | |||
38 |
DrilldownBarSeries* drilldownSeries( |
|
38 | DrilldownBarSeries* drilldownSeries(int index); | |
39 |
|
39 | |||
40 | private: |
|
40 | private: | |
41 |
QMap< |
|
41 | QMap<int, DrilldownBarSeries*> mDrilldownSeries; | |
42 | }; |
|
42 | }; | |
43 | //! [1] |
|
43 | //! [1] | |
44 |
|
44 |
@@ -57,34 +57,35 int main(int argc, char *argv[]) | |||||
57 | seasonSeries->setName("Crop by month - Season"); |
|
57 | seasonSeries->setName("Crop by month - Season"); | |
58 |
|
58 | |||
59 | // Each month in season series has drilldown series for weekly data |
|
59 | // Each month in season series has drilldown series for weekly data | |
60 | foreach (QString month, months) { |
|
60 | for (int month=0; month < months.count(); month++) { | |
61 |
|
61 | |||
62 | // Create drilldown series for every week |
|
62 | // Create drilldown series for every week | |
63 | DrilldownBarSeries* weeklySeries = new DrilldownBarSeries(weeks, drilldownChart); |
|
63 | DrilldownBarSeries* weeklySeries = new DrilldownBarSeries(weeks, drilldownChart); | |
64 | seasonSeries->mapDrilldownSeries(month, weeklySeries); |
|
64 | seasonSeries->mapDrilldownSeries(month, weeklySeries); | |
65 |
|
65 | |||
66 | // Drilling down from weekly data brings us back to season data. |
|
66 | // Drilling down from weekly data brings us back to season data. | |
67 |
for |
|
67 | for (int week=0; week < weeks.count(); week++) { | |
68 | weeklySeries->mapDrilldownSeries(week, seasonSeries); |
|
68 | weeklySeries->mapDrilldownSeries(week, seasonSeries); | |
69 | weeklySeries->setName(QString("Crop by week - " + month)); |
|
69 | weeklySeries->setName(QString("Crop by week - " + months.at(month))); | |
70 | } |
|
70 | } | |
71 |
|
71 | |||
72 | // Use right click signal to implement drilldown |
|
72 | // Use right click signal to implement drilldown | |
73 |
QObject::connect(weeklySeries, SIGNAL(clicked(QBarSet*, |
|
73 | QObject::connect(weeklySeries, SIGNAL(clicked(QBarSet*,int)), drilldownChart, SLOT(handleClicked(QBarSet*,int))); | |
74 | } |
|
74 | } | |
75 |
|
75 | |||
76 | // Enable drilldown from season series using right click. |
|
76 | // Enable drilldown from season series using right click. | |
77 |
QObject::connect(seasonSeries, SIGNAL(clicked(QBarSet*, |
|
77 | QObject::connect(seasonSeries, SIGNAL(clicked(QBarSet*,int)), drilldownChart, SLOT(handleClicked(QBarSet*,int))); | |
78 | //! [4] |
|
78 | //! [4] | |
79 |
|
79 | |||
80 | //! [5] |
|
80 | //! [5] | |
81 | // Fill monthly and weekly series with data |
|
81 | // Fill monthly and weekly series with data | |
82 | foreach (QString plant, plants) { |
|
82 | foreach (QString plant, plants) { | |
83 | QBarSet* monthlyCrop = new QBarSet(plant); |
|
83 | QBarSet* monthlyCrop = new QBarSet(plant); | |
84 |
for |
|
84 | for (int month=0; month<months.count(); month++) { | |
85 | QBarSet* weeklyCrop = new QBarSet(plant); |
|
85 | QBarSet* weeklyCrop = new QBarSet(plant); | |
86 |
for |
|
86 | for (int week=0; week<weeks.count(); week++) { | |
87 | *weeklyCrop << (qrand() % 20); |
|
87 | *weeklyCrop << (qrand() % 20); | |
|
88 | } | |||
88 | // Get the drilldown series from season series and add crop to it. |
|
89 | // Get the drilldown series from season series and add crop to it. | |
89 | seasonSeries->drilldownSeries(month)->append(weeklyCrop); |
|
90 | seasonSeries->drilldownSeries(month)->append(weeklyCrop); | |
90 | *monthlyCrop << weeklyCrop->sum(); |
|
91 | *monthlyCrop << weeklyCrop->sum(); |
@@ -45,11 +45,11 QAxisCategories::~QAxisCategories() | |||||
45 | } |
|
45 | } | |
46 |
|
46 | |||
47 | /*! |
|
47 | /*! | |
48 | Inserts bar \a categories. |
|
48 | Inserts \a categories to axis. First item in list is assumed to be at x = 0, next at x = 1 and so on | |
49 | */ |
|
49 | */ | |
50 |
void QAxisCategories::insert(const Q |
|
50 | void QAxisCategories::insert(const QStringList &categories) | |
51 | { |
|
51 | { | |
52 |
int i= |
|
52 | int i=0; | |
53 | foreach (const QString& string , categories) { |
|
53 | foreach (const QString& string , categories) { | |
54 | d_ptr->m_map.insert(i,string); |
|
54 | d_ptr->m_map.insert(i,string); | |
55 | i++; |
|
55 | i++; | |
@@ -57,6 +57,7 void QAxisCategories::insert(const QBarCategories &categories) | |||||
57 | emit d_ptr->updated(); |
|
57 | emit d_ptr->updated(); | |
58 | } |
|
58 | } | |
59 |
|
59 | |||
|
60 | ||||
60 | /*! |
|
61 | /*! | |
61 | Inserts category, instead of \a value on axis a \a label will be shown. |
|
62 | Inserts category, instead of \a value on axis a \a label will be shown. | |
62 | */ |
|
63 | */ |
@@ -22,7 +22,7 | |||||
22 | #define QAXISCATEGORIES_H |
|
22 | #define QAXISCATEGORIES_H | |
23 |
|
23 | |||
24 | #include <qchartglobal.h> |
|
24 | #include <qchartglobal.h> | |
25 |
#include < |
|
25 | #include <QStringList> | |
26 |
|
26 | |||
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
28 |
|
28 | |||
@@ -36,7 +36,7 private: | |||||
36 | public: |
|
36 | public: | |
37 | ~QAxisCategories(); |
|
37 | ~QAxisCategories(); | |
38 |
|
38 | |||
39 |
void insert(const Q |
|
39 | void insert(const QStringList &category); | |
40 | void insert(qreal value,QString label); |
|
40 | void insert(qreal value,QString label); | |
41 | void remove(qreal value); |
|
41 | void remove(qreal value); | |
42 | QList<qreal> values() const; |
|
42 | QList<qreal> values() const; |
@@ -25,18 +25,18 | |||||
25 |
|
25 | |||
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
26 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
27 |
|
27 | |||
28 |
Bar::Bar(QBarSet *barset, |
|
28 | Bar::Bar(QBarSet *barset, int index, QGraphicsItem *parent) : QGraphicsRectItem(parent), | |
29 | m_category(category), |
|
29 | m_index(index), | |
30 | m_barset(barset) |
|
30 | m_barset(barset) | |
31 | { |
|
31 | { | |
32 |
setAcceptedMouseButtons(Qt::LeftButton |
|
32 | setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton); | |
33 | setAcceptHoverEvents(true); |
|
33 | setAcceptHoverEvents(true); | |
34 | } |
|
34 | } | |
35 |
|
35 | |||
36 | void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event) |
|
36 | void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event) | |
37 | { |
|
37 | { | |
38 | Q_UNUSED(event) |
|
38 | Q_UNUSED(event) | |
39 |
emit clicked(m_barset, m_ |
|
39 | emit clicked(m_barset, m_index); | |
40 | } |
|
40 | } | |
41 |
|
41 | |||
42 | void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) |
|
42 | void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) |
@@ -42,7 +42,7 class Bar : public QObject, public QGraphicsRectItem | |||||
42 | { |
|
42 | { | |
43 | Q_OBJECT |
|
43 | Q_OBJECT | |
44 | public: |
|
44 | public: | |
45 |
Bar(QBarSet *barset, |
|
45 | Bar(QBarSet *barset, int index, QGraphicsItem *parent = 0); | |
46 |
|
46 | |||
47 | public: |
|
47 | public: | |
48 | void mousePressEvent(QGraphicsSceneMouseEvent *event); |
|
48 | void mousePressEvent(QGraphicsSceneMouseEvent *event); | |
@@ -50,13 +50,11 public: | |||||
50 | void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); |
|
50 | void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); | |
51 |
|
51 | |||
52 | Q_SIGNALS: |
|
52 | Q_SIGNALS: | |
53 |
void clicked(QSt |
|
53 | void clicked(QBarSet *barset, int index); | |
54 | void clicked(QBarSet *barset, QString category); |
|
|||
55 | void hovered(bool status); |
|
|||
56 | void hovered(QBarSet *barset, bool status); |
|
54 | void hovered(QBarSet *barset, bool status); | |
57 |
|
55 | |||
58 | private: |
|
56 | private: | |
59 | QString m_category; |
|
57 | int m_index; | |
60 | QBarSet *m_barset; |
|
58 | QBarSet *m_barset; | |
61 | }; |
|
59 | }; | |
62 |
|
60 |
@@ -73,15 +73,14 void BarChartItem::dataChanged() | |||||
73 | bool labelsVisible = m_series->isLabelsVisible(); |
|
73 | bool labelsVisible = m_series->isLabelsVisible(); | |
74 |
|
74 | |||
75 | // Create new graphic items for bars |
|
75 | // Create new graphic items for bars | |
76 | for (int c = 0; c < m_series->categoryCount(); c++) { |
|
76 | for (int c = 0; c < m_series->d_func()->categoryCount(); c++) { | |
77 | QString category = m_series->d_func()->categoryName(c); |
|
|||
78 | for (int s = 0; s < m_series->barsetCount(); s++) { |
|
77 | for (int s = 0; s < m_series->barsetCount(); s++) { | |
79 | QBarSet *set = m_series->d_func()->barsetAt(s); |
|
78 | QBarSet *set = m_series->d_func()->barsetAt(s); | |
80 |
|
79 | |||
81 | // Bars |
|
80 | // Bars | |
82 |
Bar *bar = new Bar(set,c |
|
81 | Bar *bar = new Bar(set,c,this); | |
83 | m_bars.append(bar); |
|
82 | m_bars.append(bar); | |
84 |
connect(bar, SIGNAL(clicked(QBarSet*, |
|
83 | connect(bar, SIGNAL(clicked(QBarSet*,int)), m_series, SIGNAL(clicked(QBarSet*,int))); | |
85 | connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool))); |
|
84 | connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool))); | |
86 | m_layout.append(QRectF(0, 0, 0, 0)); |
|
85 | m_layout.append(QRectF(0, 0, 0, 0)); | |
87 |
|
86 | |||
@@ -100,8 +99,8 QVector<QRectF> BarChartItem::calculateLayout() | |||||
100 | { |
|
99 | { | |
101 | QVector<QRectF> layout; |
|
100 | QVector<QRectF> layout; | |
102 |
|
101 | |||
103 |
// Use temporary qreals for accura |
|
102 | // Use temporary qreals for accuracy | |
104 | qreal categoryCount = m_series->categoryCount(); |
|
103 | qreal categoryCount = m_series->d_func()->categoryCount(); | |
105 | qreal setCount = m_series->barsetCount(); |
|
104 | qreal setCount = m_series->barsetCount(); | |
106 | bool barsVisible = m_series->isVisible(); |
|
105 | bool barsVisible = m_series->isVisible(); | |
107 |
|
106 |
@@ -35,8 +35,8 QVector<QRectF> GroupedBarChartItem::calculateLayout() | |||||
35 | { |
|
35 | { | |
36 | QVector<QRectF> layout; |
|
36 | QVector<QRectF> layout; | |
37 |
|
37 | |||
38 |
// Use temporary qreals for accura |
|
38 | // Use temporary qreals for accuracy | |
39 | qreal categoryCount = m_series->categoryCount(); |
|
39 | qreal categoryCount = m_series->d_func()->categoryCount(); | |
40 | qreal setCount = m_series->barsetCount(); |
|
40 | qreal setCount = m_series->barsetCount(); | |
41 |
|
41 | |||
42 | // Domain: |
|
42 | // Domain: |
@@ -35,8 +35,8 QVector<QRectF> PercentBarChartItem::calculateLayout() | |||||
35 | { |
|
35 | { | |
36 | QVector<QRectF> layout; |
|
36 | QVector<QRectF> layout; | |
37 |
|
37 | |||
38 |
// Use temporary qreals for accura |
|
38 | // Use temporary qreals for accuracy | |
39 | qreal categoryCount = m_series->categoryCount(); |
|
39 | qreal categoryCount = m_series->d_func()->categoryCount(); | |
40 | qreal setCount = m_series->barsetCount(); |
|
40 | qreal setCount = m_series->barsetCount(); | |
41 |
|
41 | |||
42 | // Domain: |
|
42 | // Domain: |
@@ -412,7 +412,8 void QBarModelMapperPrivate::initializeBarFromModel() | |||||
412 | posInCategories++; |
|
412 | posInCategories++; | |
413 | categoriesIndex = categoriesModelIndex(posInCategories); |
|
413 | categoriesIndex = categoriesModelIndex(posInCategories); | |
414 | } |
|
414 | } | |
415 | m_series->setCategories(categories); |
|
415 | // TODO: set the categories to axis | |
|
416 | // m_series->setCategories(categories); | |||
416 | } |
|
417 | } | |
417 | blockSeriesSignals(false); |
|
418 | blockSeriesSignals(false); | |
418 | } |
|
419 | } |
@@ -47,10 +47,10 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||||
47 | */ |
|
47 | */ | |
48 |
|
48 | |||
49 | /*! |
|
49 | /*! | |
50 |
\fn void QBarSeries::clicked(QBarSet *barset, |
|
50 | \fn void QBarSeries::clicked(QBarSet *barset, int index) | |
51 |
|
51 | |||
52 |
The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset |
|
52 | The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset. | |
53 | contained by the series. |
|
53 | Clicked bar inside set is indexed by \a index | |
54 | */ |
|
54 | */ | |
55 |
|
55 | |||
56 | /*! |
|
56 | /*! | |
@@ -98,16 +98,6 QAbstractSeries::SeriesType QBarSeries::type() const | |||||
98 | } |
|
98 | } | |
99 |
|
99 | |||
100 | /*! |
|
100 | /*! | |
101 | Sets the \a categories, which are used to to group the data. |
|
|||
102 | */ |
|
|||
103 | void QBarSeries::setCategories(QBarCategories categories) |
|
|||
104 | { |
|
|||
105 | Q_D(QBarSeries); |
|
|||
106 | d->setCategories(categories); |
|
|||
107 | emit d->categoriesUpdated(); |
|
|||
108 | } |
|
|||
109 |
|
||||
110 | /*! |
|
|||
111 | Sets the margin around bars. Parameter \a margin is from 0 to 1 and represents |
|
101 | Sets the margin around bars. Parameter \a margin is from 0 to 1 and represents | |
112 | percentage of margin compared to bars |
|
102 | percentage of margin compared to bars | |
113 | */ |
|
103 | */ | |
@@ -172,7 +162,6 void QBarSeries::clear() | |||||
172 | { |
|
162 | { | |
173 | Q_D(QBarSeries); |
|
163 | Q_D(QBarSeries); | |
174 | d->m_barSets.clear(); |
|
164 | d->m_barSets.clear(); | |
175 | d->m_categories.clear(); |
|
|||
176 | } |
|
165 | } | |
177 |
|
166 | |||
178 | /*! |
|
167 | /*! | |
@@ -185,15 +174,6 int QBarSeries::barsetCount() const | |||||
185 | } |
|
174 | } | |
186 |
|
175 | |||
187 | /*! |
|
176 | /*! | |
188 | Returns number of categories in series |
|
|||
189 | */ |
|
|||
190 | int QBarSeries::categoryCount() const |
|
|||
191 | { |
|
|||
192 | Q_D(const QBarSeries); |
|
|||
193 | return d->categoryCount(); |
|
|||
194 | } |
|
|||
195 |
|
||||
196 | /*! |
|
|||
197 | Returns a list of sets in series. Keeps ownership of sets. |
|
177 | Returns a list of sets in series. Keeps ownership of sets. | |
198 | */ |
|
178 | */ | |
199 | QList<QBarSet*> QBarSeries::barSets() const |
|
179 | QList<QBarSet*> QBarSeries::barSets() const | |
@@ -203,15 +183,6 QList<QBarSet*> QBarSeries::barSets() const | |||||
203 | } |
|
183 | } | |
204 |
|
184 | |||
205 | /*! |
|
185 | /*! | |
206 | Returns the bar categories of the series. |
|
|||
207 | */ |
|
|||
208 | QBarCategories QBarSeries::categories() const |
|
|||
209 | { |
|
|||
210 | Q_D(const QBarSeries); |
|
|||
211 | return d->categories(); |
|
|||
212 | } |
|
|||
213 |
|
||||
214 | /*! |
|
|||
215 | Sets the visibility of series to \a visible |
|
186 | Sets the visibility of series to \a visible | |
216 | */ |
|
187 | */ | |
217 | void QBarSeries::setVisible(bool visible) |
|
188 | void QBarSeries::setVisible(bool visible) | |
@@ -260,7 +231,7 QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : | |||||
260 | { |
|
231 | { | |
261 | } |
|
232 | } | |
262 |
|
233 | |||
263 |
void QBarSeriesPrivate::setCategories(Q |
|
234 | void QBarSeriesPrivate::setCategories(QStringList categories) | |
264 | { |
|
235 | { | |
265 | m_categories = categories; |
|
236 | m_categories = categories; | |
266 | } |
|
237 | } | |
@@ -294,14 +265,14 int QBarSeriesPrivate::categoryCount() const | |||||
294 | return count; |
|
265 | return count; | |
295 | } |
|
266 | } | |
296 |
|
267 | |||
297 |
Q |
|
268 | QStringList QBarSeriesPrivate::categories() const | |
298 | { |
|
269 | { | |
299 | if (m_categories.count() > 0) { |
|
270 | if (m_categories.count() > 0) { | |
300 | return m_categories; |
|
271 | return m_categories; | |
301 | } |
|
272 | } | |
302 |
|
273 | |||
303 | // No categories defined. retun list of indices. |
|
274 | // No categories defined. retun list of indices. | |
304 |
Q |
|
275 | QStringList categories; | |
305 |
|
276 | |||
306 | int count = categoryCount(); |
|
277 | int count = categoryCount(); | |
307 | for (int i = 0; i < count; i++) { |
|
278 | for (int i = 0; i < count; i++) { |
@@ -26,10 +26,7 | |||||
26 |
|
26 | |||
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
27 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
28 |
|
28 | |||
29 | typedef QStringList QBarCategories; |
|
|||
30 |
|
||||
31 | class QBarSet; |
|
29 | class QBarSet; | |
32 | class BarCategory; |
|
|||
33 | class QBarSeriesPrivate; |
|
30 | class QBarSeriesPrivate; | |
34 |
|
31 | |||
35 | // Container for series |
|
32 | // Container for series | |
@@ -46,7 +43,6 public: | |||||
46 | virtual ~QBarSeries(); |
|
43 | virtual ~QBarSeries(); | |
47 |
|
44 | |||
48 | QAbstractSeries::SeriesType type() const; |
|
45 | QAbstractSeries::SeriesType type() const; | |
49 | void setCategories(QBarCategories categories); |
|
|||
50 |
|
46 | |||
51 | void setBarMargin(qreal margin); |
|
47 | void setBarMargin(qreal margin); | |
52 | qreal barMargin() const; |
|
48 | qreal barMargin() const; | |
@@ -56,9 +52,7 public: | |||||
56 | bool append(QList<QBarSet* > sets); |
|
52 | bool append(QList<QBarSet* > sets); | |
57 | bool remove(QList<QBarSet* > sets); |
|
53 | bool remove(QList<QBarSet* > sets); | |
58 | int barsetCount() const; |
|
54 | int barsetCount() const; | |
59 | int categoryCount() const; |
|
|||
60 | QList<QBarSet*> barSets() const; |
|
55 | QList<QBarSet*> barSets() const; | |
61 | QBarCategories categories() const; |
|
|||
62 | void clear(); |
|
56 | void clear(); | |
63 |
|
57 | |||
64 | void setVisible(bool visible = true); |
|
58 | void setVisible(bool visible = true); | |
@@ -70,7 +64,7 protected: | |||||
70 | explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0); |
|
64 | explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0); | |
71 |
|
65 | |||
72 | Q_SIGNALS: |
|
66 | Q_SIGNALS: | |
73 |
void clicked(QBarSet *barset, |
|
67 | void clicked(QBarSet *barset, int index); | |
74 | void hovered(QBarSet* barset, bool status); |
|
68 | void hovered(QBarSet* barset, bool status); | |
75 |
|
69 | |||
76 | protected: |
|
70 | protected: |
@@ -44,11 +44,12 class QBarSeriesPrivate : public QAbstractSeriesPrivate | |||||
44 | Q_OBJECT |
|
44 | Q_OBJECT | |
45 | public: |
|
45 | public: | |
46 | QBarSeriesPrivate(QBarSeries *parent); |
|
46 | QBarSeriesPrivate(QBarSeries *parent); | |
47 | void setCategories(QBarCategories categories); |
|
47 | // TODO: refactor/remove private category stuff | |
|
48 | void setCategories(QStringList categories); | |||
48 | void insertCategory(int index, const QString category); |
|
49 | void insertCategory(int index, const QString category); | |
49 | void removeCategory(int index); |
|
50 | void removeCategory(int index); | |
50 | int categoryCount() const; |
|
51 | int categoryCount() const; | |
51 |
Q |
|
52 | QStringList categories() const; | |
52 |
|
53 | |||
53 | void setBarMargin(qreal margin); |
|
54 | void setBarMargin(qreal margin); | |
54 | qreal barMargin() const; |
|
55 | qreal barMargin() const; | |
@@ -76,7 +77,7 public: | |||||
76 | qreal maxCategorySum(); |
|
77 | qreal maxCategorySum(); | |
77 |
|
78 | |||
78 | Q_SIGNALS: |
|
79 | Q_SIGNALS: | |
79 |
void clicked(QBarSet *barset, |
|
80 | void clicked(QBarSet *barset, int index); | |
80 | void updatedBars(); |
|
81 | void updatedBars(); | |
81 | void restructuredBars(); |
|
82 | void restructuredBars(); | |
82 | void categoriesUpdated(); |
|
83 | void categoriesUpdated(); | |
@@ -87,7 +88,7 private Q_SLOTS: | |||||
87 |
|
88 | |||
88 | protected: |
|
89 | protected: | |
89 | QList<QBarSet *> m_barSets; |
|
90 | QList<QBarSet *> m_barSets; | |
90 |
Q |
|
91 | QStringList m_categories; | |
91 | qreal m_barMargin; |
|
92 | qreal m_barMargin; | |
92 | bool m_labelsVisible; |
|
93 | bool m_labelsVisible; | |
93 | bool m_visible; |
|
94 | bool m_visible; |
@@ -38,20 +38,6 QTCOMMERCIALCHART_BEGIN_NAMESPACE | |||||
38 | */ |
|
38 | */ | |
39 |
|
39 | |||
40 | /*! |
|
40 | /*! | |
41 | \fn void QBarSet::clicked(QString category) |
|
|||
42 | \brief signals that set has been clicked |
|
|||
43 | Parameter \a category describes on which category was clicked |
|
|||
44 | */ |
|
|||
45 |
|
||||
46 | /*! |
|
|||
47 | \fn void QBarSet::hovered(bool status) |
|
|||
48 | \brief signals that mouse has hovered over the set. If \a status is true, then mouse was entered. If \a status is false, then mouse was left. |
|
|||
49 |
|
||||
50 | The signal is emitted if mouse is hovered on top of set |
|
|||
51 | Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series. |
|
|||
52 | */ |
|
|||
53 |
|
||||
54 | /*! |
|
|||
55 | Constructs QBarSet with a name of \a name and with parent of \a parent |
|
41 | Constructs QBarSet with a name of \a name and with parent of \a parent | |
56 | */ |
|
42 | */ | |
57 | QBarSet::QBarSet(const QString name, QObject *parent) |
|
43 | QBarSet::QBarSet(const QString name, QObject *parent) |
@@ -73,10 +73,6 public: | |||||
73 | void setLabelFont(const QFont &font); |
|
73 | void setLabelFont(const QFont &font); | |
74 | QFont labelFont() const; |
|
74 | QFont labelFont() const; | |
75 |
|
75 | |||
76 | //Q_SIGNALS: |
|
|||
77 | // void clicked(QString category); |
|
|||
78 | // void hovered(bool status); |
|
|||
79 |
|
||||
80 | private: |
|
76 | private: | |
81 | QScopedPointer<QBarSetPrivate> d_ptr; |
|
77 | QScopedPointer<QBarSetPrivate> d_ptr; | |
82 | Q_DISABLE_COPY(QBarSet) |
|
78 | Q_DISABLE_COPY(QBarSet) |
@@ -47,7 +47,6 public: | |||||
47 | ~QBarSetPrivate(); |
|
47 | ~QBarSetPrivate(); | |
48 |
|
48 | |||
49 | Q_SIGNALS: |
|
49 | Q_SIGNALS: | |
50 | void clicked(QString category); |
|
|||
51 | void restructuredBars(); |
|
50 | void restructuredBars(); | |
52 | void updatedBars(); |
|
51 | void updatedBars(); | |
53 |
|
52 |
@@ -71,7 +71,6 QGroupedBarSeriesPrivate::QGroupedBarSeriesPrivate(QGroupedBarSeries *q) : QBarS | |||||
71 |
|
71 | |||
72 | void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain) |
|
72 | void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain) | |
73 | { |
|
73 | { | |
74 | Q_Q(QGroupedBarSeries); |
|
|||
75 | qreal minX(domain.minX()); |
|
74 | qreal minX(domain.minX()); | |
76 | qreal minY(domain.minY()); |
|
75 | qreal minY(domain.minY()); | |
77 | qreal maxX(domain.maxX()); |
|
76 | qreal maxX(domain.maxX()); | |
@@ -79,7 +78,7 void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain) | |||||
79 | int tickXCount(domain.tickXCount()); |
|
78 | int tickXCount(domain.tickXCount()); | |
80 | int tickYCount(domain.tickYCount()); |
|
79 | int tickYCount(domain.tickYCount()); | |
81 |
|
80 | |||
82 |
qreal x = |
|
81 | qreal x = categoryCount(); | |
83 | qreal y = max(); |
|
82 | qreal y = max(); | |
84 | minX = qMin(minX, x) - 0.5; |
|
83 | minX = qMin(minX, x) - 0.5; | |
85 | minY = qMin(minY, y); |
|
84 | minY = qMin(minY, y); |
@@ -71,7 +71,6 QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QBarS | |||||
71 |
|
71 | |||
72 | void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) |
|
72 | void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) | |
73 | { |
|
73 | { | |
74 | Q_Q(QPercentBarSeries); |
|
|||
75 | qreal minX(domain.minX()); |
|
74 | qreal minX(domain.minX()); | |
76 | qreal minY(domain.minY()); |
|
75 | qreal minY(domain.minY()); | |
77 | qreal maxX(domain.maxX()); |
|
76 | qreal maxX(domain.maxX()); | |
@@ -79,7 +78,7 void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) | |||||
79 | int tickXCount(domain.tickXCount()); |
|
78 | int tickXCount(domain.tickXCount()); | |
80 | int tickYCount(domain.tickYCount()); |
|
79 | int tickYCount(domain.tickYCount()); | |
81 |
|
80 | |||
82 |
qreal x = |
|
81 | qreal x = categoryCount(); | |
83 | minX = qMin(minX, x) - 0.5; |
|
82 | minX = qMin(minX, x) - 0.5; | |
84 | maxX = qMax(maxX, x) - 0.5; |
|
83 | maxX = qMax(maxX, x) - 0.5; | |
85 | minY = 0; |
|
84 | minY = 0; |
@@ -71,7 +71,6 QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QBarS | |||||
71 |
|
71 | |||
72 | void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) |
|
72 | void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) | |
73 | { |
|
73 | { | |
74 | Q_Q(QStackedBarSeries); |
|
|||
75 | qreal minX(domain.minX()); |
|
74 | qreal minX(domain.minX()); | |
76 | qreal minY(domain.minY()); |
|
75 | qreal minY(domain.minY()); | |
77 | qreal maxX(domain.maxX()); |
|
76 | qreal maxX(domain.maxX()); | |
@@ -79,7 +78,7 void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) | |||||
79 | int tickXCount(domain.tickXCount()); |
|
78 | int tickXCount(domain.tickXCount()); | |
80 | int tickYCount(domain.tickYCount()); |
|
79 | int tickYCount(domain.tickYCount()); | |
81 |
|
80 | |||
82 |
qreal x = |
|
81 | qreal x = categoryCount(); | |
83 | qreal y = maxCategorySum(); |
|
82 | qreal y = maxCategorySum(); | |
84 | minX = qMin(minX, x) - 0.5; |
|
83 | minX = qMin(minX, x) - 0.5; | |
85 | minY = qMin(minY, y); |
|
84 | minY = qMin(minY, y); |
@@ -34,8 +34,8 StackedBarChartItem::StackedBarChartItem(QBarSeries *series, ChartPresenter *pre | |||||
34 | QVector<QRectF> StackedBarChartItem::calculateLayout() |
|
34 | QVector<QRectF> StackedBarChartItem::calculateLayout() | |
35 | { |
|
35 | { | |
36 | QVector<QRectF> layout; |
|
36 | QVector<QRectF> layout; | |
37 |
// Use temporary qreals for accura |
|
37 | // Use temporary qreals for accuracy | |
38 | qreal categoryCount = m_series->categoryCount(); |
|
38 | qreal categoryCount = m_series->d_func()->categoryCount(); | |
39 | qreal setCount = m_series->barsetCount(); |
|
39 | qreal setCount = m_series->barsetCount(); | |
40 |
|
40 | |||
41 | // Domain: |
|
41 | // Domain: |
@@ -89,14 +89,6 void ChartDataSet::addSeries(QAbstractSeries* series, QAxis *axisY) | |||||
89 |
|
89 | |||
90 | series->d_ptr->scaleDomain(*domain); |
|
90 | series->d_ptr->scaleDomain(*domain); | |
91 |
|
91 | |||
92 | // Note that with SeriesTypeBar we don't set up categories, but use real values on x-asis |
|
|||
93 | if(series->type() == QAbstractSeries::SeriesTypeGroupedBar |
|
|||
94 | || series->type() == QAbstractSeries::SeriesTypeStackedBar |
|
|||
95 | || series->type() == QAbstractSeries::SeriesTypePercentBar) { |
|
|||
96 | QBarSeries* barSeries = static_cast<QBarSeries*>(series); |
|
|||
97 | setupCategories(barSeries); |
|
|||
98 | } |
|
|||
99 |
|
||||
100 | if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisMap.count() == 0) { |
|
92 | if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisMap.count() == 0) { | |
101 | axisX()->hide(); |
|
93 | axisX()->hide(); | |
102 | this->axisY()->hide(); |
|
94 | this->axisY()->hide(); | |
@@ -190,13 +182,6 void ChartDataSet::removeAllSeries() | |||||
190 | qDeleteAll(axes); |
|
182 | qDeleteAll(axes); | |
191 | } |
|
183 | } | |
192 |
|
184 | |||
193 | void ChartDataSet::setupCategories(QBarSeries* series) |
|
|||
194 | { |
|
|||
195 | QAxisCategories* categories = axisX()->categories(); |
|
|||
196 | categories->clear(); |
|
|||
197 | categories->insert(series->categories()); |
|
|||
198 | } |
|
|||
199 |
|
||||
200 | void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size) |
|
185 | void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size) | |
201 | { |
|
186 | { | |
202 | QMapIterator<QAxis*, Domain*> i(m_axisDomainMap); |
|
187 | QMapIterator<QAxis*, Domain*> i(m_axisDomainMap); |
@@ -37,7 +37,6 | |||||
37 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
37 | QTCOMMERCIALCHART_BEGIN_NAMESPACE | |
38 |
|
38 | |||
39 | class QAxis; |
|
39 | class QAxis; | |
40 | class QBarSeries; |
|
|||
41 |
|
40 | |||
42 | class QTCOMMERCIALCHART_AUTOTEST_EXPORT ChartDataSet : public QObject |
|
41 | class QTCOMMERCIALCHART_AUTOTEST_EXPORT ChartDataSet : public QObject | |
43 | { |
|
42 | { | |
@@ -76,7 +75,6 Q_SIGNALS: | |||||
76 | private: |
|
75 | private: | |
77 | QStringList createLabels(QAxis* axis,qreal min, qreal max); |
|
76 | QStringList createLabels(QAxis* axis,qreal min, qreal max); | |
78 | void calculateDomain(QAbstractSeries* series,Domain* domain); |
|
77 | void calculateDomain(QAbstractSeries* series,Domain* domain); | |
79 | void setupCategories(QBarSeries* series); |
|
|||
80 |
|
78 | |||
81 | private: |
|
79 | private: | |
82 | QMap<QAbstractSeries *, QAxis *> m_seriesAxisMap; |
|
80 | QMap<QAbstractSeries *, QAxis *> m_seriesAxisMap; |
@@ -43,8 +43,6 private slots: | |||||
43 | void qbarseries(); |
|
43 | void qbarseries(); | |
44 | void type_data(); |
|
44 | void type_data(); | |
45 | void type(); |
|
45 | void type(); | |
46 | void setCategories_data(); |
|
|||
47 | void setCategories(); |
|
|||
48 | void append_data(); |
|
46 | void append_data(); | |
49 | void append(); |
|
47 | void append(); | |
50 | void remove_data(); |
|
48 | void remove_data(); | |
@@ -55,12 +53,8 private slots: | |||||
55 | void removeList(); |
|
53 | void removeList(); | |
56 | void barsetCount_data(); |
|
54 | void barsetCount_data(); | |
57 | void barsetCount(); |
|
55 | void barsetCount(); | |
58 | void categoryCount_data(); |
|
|||
59 | void categoryCount(); |
|
|||
60 | void barSets_data(); |
|
56 | void barSets_data(); | |
61 | void barSets(); |
|
57 | void barSets(); | |
62 | void categories_data(); |
|
|||
63 | void categories(); |
|
|||
64 | void setLabelsVisible_data(); |
|
58 | void setLabelsVisible_data(); | |
65 | void setLabelsVisible(); |
|
59 | void setLabelsVisible(); | |
66 | void mouseclicked_data(); |
|
60 | void mouseclicked_data(); | |
@@ -74,7 +68,6 private: | |||||
74 |
|
68 | |||
75 | QList<QBarSet*> m_testSets; |
|
69 | QList<QBarSet*> m_testSets; | |
76 |
|
70 | |||
77 | QBarCategories m_categories; |
|
|||
78 | }; |
|
71 | }; | |
79 |
|
72 | |||
80 | void tst_QBarSeries::initTestCase() |
|
73 | void tst_QBarSeries::initTestCase() | |
@@ -88,11 +81,8 void tst_QBarSeries::cleanupTestCase() | |||||
88 |
|
81 | |||
89 | void tst_QBarSeries::init() |
|
82 | void tst_QBarSeries::init() | |
90 | { |
|
83 | { | |
91 | m_categories << "category0" << "category1" << "category2"; |
|
|||
92 | m_barseries = new QBarSeries(); |
|
84 | m_barseries = new QBarSeries(); | |
93 | m_barseries->setCategories(m_categories); |
|
|||
94 | m_barseries_with_sets = new QBarSeries(); |
|
85 | m_barseries_with_sets = new QBarSeries(); | |
95 | m_barseries_with_sets->setCategories(m_categories); |
|
|||
96 |
|
86 | |||
97 | for (int i=0; i<5; i++) { |
|
87 | for (int i=0; i<5; i++) { | |
98 | m_testSets.append(new QBarSet("testset")); |
|
88 | m_testSets.append(new QBarSet("testset")); | |
@@ -112,29 +102,16 void tst_QBarSeries::cleanup() | |||||
112 | m_barseries = 0; |
|
102 | m_barseries = 0; | |
113 | delete m_barseries_with_sets; |
|
103 | delete m_barseries_with_sets; | |
114 | m_barseries_with_sets = 0; |
|
104 | m_barseries_with_sets = 0; | |
115 | m_categories.clear(); |
|
|||
116 | } |
|
105 | } | |
117 |
|
106 | |||
118 | void tst_QBarSeries::qbarseries_data() |
|
107 | void tst_QBarSeries::qbarseries_data() | |
119 | { |
|
108 | { | |
120 | QTest::addColumn<QBarCategories> ("categories"); |
|
|||
121 | QBarCategories c; |
|
|||
122 | c << "category0" << "category1" << "category2"; |
|
|||
123 | QTest::newRow("categories") << c; |
|
|||
124 | } |
|
109 | } | |
125 |
|
110 | |||
126 | void tst_QBarSeries::qbarseries() |
|
111 | void tst_QBarSeries::qbarseries() | |
127 | { |
|
112 | { | |
128 | QFETCH(QBarCategories, categories); |
|
|||
129 | QBarSeries *barseries = new QBarSeries(); |
|
113 | QBarSeries *barseries = new QBarSeries(); | |
130 | QVERIFY(barseries != 0); |
|
114 | QVERIFY(barseries != 0); | |
131 | barseries->setCategories(categories); |
|
|||
132 | QBarCategories verifyCategories = barseries->categories(); |
|
|||
133 |
|
||||
134 | QVERIFY(verifyCategories.count() == categories.count()); |
|
|||
135 | for (int i=0; i<categories.count(); i++) { |
|
|||
136 | QVERIFY(verifyCategories.at(i).compare(categories.at(i)) == 0); |
|
|||
137 | } |
|
|||
138 | } |
|
115 | } | |
139 |
|
116 | |||
140 | void tst_QBarSeries::type_data() |
|
117 | void tst_QBarSeries::type_data() | |
@@ -147,27 +124,6 void tst_QBarSeries::type() | |||||
147 | QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeBar); |
|
124 | QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeBar); | |
148 | } |
|
125 | } | |
149 |
|
126 | |||
150 | void tst_QBarSeries::setCategories_data() |
|
|||
151 | { |
|
|||
152 | QTest::addColumn<QBarCategories> ("categories"); |
|
|||
153 | QBarCategories categories; |
|
|||
154 | categories << "c1" << "c2" << "c3" << "c4" << "c5" << "c6"; |
|
|||
155 | QTest::newRow("cat") << categories; |
|
|||
156 | } |
|
|||
157 |
|
||||
158 | void tst_QBarSeries::setCategories() |
|
|||
159 | { |
|
|||
160 | QVERIFY(m_barseries->categories().count() == m_categories.count()); |
|
|||
161 |
|
||||
162 | QFETCH(QBarCategories, categories); |
|
|||
163 | m_barseries->setCategories(categories); |
|
|||
164 |
|
||||
165 | QVERIFY(m_barseries->categories().count() == categories.count()); |
|
|||
166 | for (int i=0; i<categories.count(); i++) { |
|
|||
167 | QVERIFY(m_barseries->categories().at(i).compare(categories.at(i)) == 0); |
|
|||
168 | } |
|
|||
169 | } |
|
|||
170 |
|
||||
171 | void tst_QBarSeries::append_data() |
|
127 | void tst_QBarSeries::append_data() | |
172 | { |
|
128 | { | |
173 | } |
|
129 | } | |
@@ -352,17 +308,6 void tst_QBarSeries::barsetCount() | |||||
352 | QVERIFY(m_barseries_with_sets->barsetCount() == m_testSets.count()); |
|
308 | QVERIFY(m_barseries_with_sets->barsetCount() == m_testSets.count()); | |
353 | } |
|
309 | } | |
354 |
|
310 | |||
355 | void tst_QBarSeries::categoryCount_data() |
|
|||
356 | { |
|
|||
357 |
|
||||
358 | } |
|
|||
359 |
|
||||
360 | void tst_QBarSeries::categoryCount() |
|
|||
361 | { |
|
|||
362 | QVERIFY(m_barseries->categoryCount() == m_categories.count()); |
|
|||
363 | QVERIFY(m_barseries_with_sets->categoryCount() == m_categories.count()); |
|
|||
364 | } |
|
|||
365 |
|
||||
366 | void tst_QBarSeries::barSets_data() |
|
311 | void tst_QBarSeries::barSets_data() | |
367 | { |
|
312 | { | |
368 |
|
313 | |||
@@ -380,21 +325,6 void tst_QBarSeries::barSets() | |||||
380 | } |
|
325 | } | |
381 | } |
|
326 | } | |
382 |
|
327 | |||
383 | void tst_QBarSeries::categories_data() |
|
|||
384 | { |
|
|||
385 |
|
||||
386 | } |
|
|||
387 |
|
||||
388 | void tst_QBarSeries::categories() |
|
|||
389 | { |
|
|||
390 | QBarCategories categories = m_barseries->categories(); |
|
|||
391 |
|
||||
392 | QVERIFY(categories.count() == m_categories.count()); |
|
|||
393 | for (int i=0; i<m_categories.count(); i++) { |
|
|||
394 | QVERIFY(categories.at(i).compare(m_categories.at(i)) == 0); |
|
|||
395 | } |
|
|||
396 | } |
|
|||
397 |
|
||||
398 | void tst_QBarSeries::setLabelsVisible_data() |
|
328 | void tst_QBarSeries::setLabelsVisible_data() | |
399 | { |
|
329 | { | |
400 |
|
330 | |||
@@ -430,9 +360,6 void tst_QBarSeries::mouseclicked_data() | |||||
430 | void tst_QBarSeries::mouseclicked() |
|
360 | void tst_QBarSeries::mouseclicked() | |
431 | { |
|
361 | { | |
432 | QBarSeries* series = new QBarSeries(); |
|
362 | QBarSeries* series = new QBarSeries(); | |
433 | QBarCategories categories; |
|
|||
434 | categories << "test1" << "test2" << "test3"; |
|
|||
435 | series->setCategories(categories); |
|
|||
436 |
|
363 | |||
437 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
364 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
438 | *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); |
|
365 | *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); | |
@@ -442,7 +369,7 void tst_QBarSeries::mouseclicked() | |||||
442 | *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10); |
|
369 | *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10); | |
443 | series->append(set2); |
|
370 | series->append(set2); | |
444 |
|
371 | |||
445 |
QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*, |
|
372 | QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); | |
446 |
|
373 | |||
447 | QChartView view(new QChart()); |
|
374 | QChartView view(new QChart()); | |
448 | view.resize(400,300); |
|
375 | view.resize(400,300); | |
@@ -459,8 +386,8 void tst_QBarSeries::mouseclicked() | |||||
459 |
|
386 | |||
460 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); |
|
387 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); | |
461 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
388 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
462 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
389 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
463 |
QVERIFY(seriesSpyArg.at(1).to |
|
390 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |
464 |
|
391 | |||
465 | //==================================================================================== |
|
392 | //==================================================================================== | |
466 | // barset 1, category test2 |
|
393 | // barset 1, category test2 | |
@@ -471,8 +398,8 void tst_QBarSeries::mouseclicked() | |||||
471 |
|
398 | |||
472 | seriesSpyArg = seriesSpy.takeFirst(); |
|
399 | seriesSpyArg = seriesSpy.takeFirst(); | |
473 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
400 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
474 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
401 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
475 |
QVERIFY(seriesSpyArg.at(1).to |
|
402 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |
476 |
|
403 | |||
477 | //==================================================================================== |
|
404 | //==================================================================================== | |
478 | // barset 1, category test3 |
|
405 | // barset 1, category test3 | |
@@ -483,8 +410,8 void tst_QBarSeries::mouseclicked() | |||||
483 |
|
410 | |||
484 | seriesSpyArg = seriesSpy.takeFirst(); |
|
411 | seriesSpyArg = seriesSpy.takeFirst(); | |
485 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
412 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
486 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
413 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
487 |
QVERIFY(seriesSpyArg.at(1).to |
|
414 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |
488 |
|
415 | |||
489 | //==================================================================================== |
|
416 | //==================================================================================== | |
490 | // barset 2, category test1 |
|
417 | // barset 2, category test1 | |
@@ -495,8 +422,8 void tst_QBarSeries::mouseclicked() | |||||
495 |
|
422 | |||
496 | seriesSpyArg = seriesSpy.takeFirst(); |
|
423 | seriesSpyArg = seriesSpy.takeFirst(); | |
497 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
424 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
498 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
425 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
499 |
QVERIFY(seriesSpyArg.at(1).to |
|
426 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |
500 |
|
427 | |||
501 | //==================================================================================== |
|
428 | //==================================================================================== | |
502 | // barset 2, category test2 |
|
429 | // barset 2, category test2 | |
@@ -507,8 +434,8 void tst_QBarSeries::mouseclicked() | |||||
507 |
|
434 | |||
508 | seriesSpyArg = seriesSpy.takeFirst(); |
|
435 | seriesSpyArg = seriesSpy.takeFirst(); | |
509 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
436 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
510 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
437 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
511 |
QVERIFY(seriesSpyArg.at(1).to |
|
438 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |
512 |
|
439 | |||
513 | //==================================================================================== |
|
440 | //==================================================================================== | |
514 | // barset 2, category test3 |
|
441 | // barset 2, category test3 | |
@@ -519,8 +446,8 void tst_QBarSeries::mouseclicked() | |||||
519 |
|
446 | |||
520 | seriesSpyArg = seriesSpy.takeFirst(); |
|
447 | seriesSpyArg = seriesSpy.takeFirst(); | |
521 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
448 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
522 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
449 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
523 |
QVERIFY(seriesSpyArg.at(1).to |
|
450 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |
524 | } |
|
451 | } | |
525 |
|
452 | |||
526 | void tst_QBarSeries::mousehovered_data() |
|
453 | void tst_QBarSeries::mousehovered_data() | |
@@ -531,9 +458,9 void tst_QBarSeries::mousehovered_data() | |||||
531 | void tst_QBarSeries::mousehovered() |
|
458 | void tst_QBarSeries::mousehovered() | |
532 | { |
|
459 | { | |
533 | QBarSeries* series = new QBarSeries(); |
|
460 | QBarSeries* series = new QBarSeries(); | |
534 |
Q |
|
461 | QStringList categories; | |
535 | categories << "test1" << "test2" << "test3"; |
|
462 | categories << "test1" << "test2" << "test3"; | |
536 | series->setCategories(categories); |
|
463 | // series->setCategories(categories); | |
537 |
|
464 | |||
538 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
465 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
539 | *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10); |
|
466 | *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10); |
@@ -168,13 +168,6 void tst_QChart::addSeries_data() | |||||
168 | QAbstractSeries* series6 = new QPercentBarSeries(this); |
|
168 | QAbstractSeries* series6 = new QPercentBarSeries(this); | |
169 | QAbstractSeries* series7 = new QStackedBarSeries(this); |
|
169 | QAbstractSeries* series7 = new QStackedBarSeries(this); | |
170 |
|
170 | |||
171 | QBarSeries* s5 = static_cast<QBarSeries*> (series5); |
|
|||
172 | s5->setCategories(QBarCategories()); |
|
|||
173 | QPercentBarSeries* s6 = static_cast<QPercentBarSeries*> (series6); |
|
|||
174 | s6->setCategories(QBarCategories()); |
|
|||
175 | QStackedBarSeries* s7 = static_cast<QStackedBarSeries*> (series7); |
|
|||
176 | s7->setCategories(QBarCategories()); |
|
|||
177 |
|
||||
178 | QAxis* axis = new QAxis(this); |
|
171 | QAxis* axis = new QAxis(this); | |
179 |
|
172 | |||
180 | QTest::newRow("default axis: lineSeries") << series0 << (QAxis*) 0; |
|
173 | QTest::newRow("default axis: lineSeries") << series0 << (QAxis*) 0; |
@@ -102,9 +102,6 void tst_QGroupedBarSeries::mouseclicked_data() | |||||
102 | void tst_QGroupedBarSeries::mouseclicked() |
|
102 | void tst_QGroupedBarSeries::mouseclicked() | |
103 | { |
|
103 | { | |
104 | QGroupedBarSeries* series = new QGroupedBarSeries(); |
|
104 | QGroupedBarSeries* series = new QGroupedBarSeries(); | |
105 | QBarCategories categories; |
|
|||
106 | categories << "test1" << "test2" << "test3"; |
|
|||
107 | series->setCategories(categories); |
|
|||
108 |
|
105 | |||
109 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
106 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
110 | *set1 << 10 << 10 << 10; |
|
107 | *set1 << 10 << 10 << 10; | |
@@ -114,7 +111,7 void tst_QGroupedBarSeries::mouseclicked() | |||||
114 | *set2 << 10 << 10 << 10; |
|
111 | *set2 << 10 << 10 << 10; | |
115 | series->append(set2); |
|
112 | series->append(set2); | |
116 |
|
113 | |||
117 |
QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*, |
|
114 | QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); | |
118 |
|
115 | |||
119 | QChartView view(new QChart()); |
|
116 | QChartView view(new QChart()); | |
120 | view.resize(400,300); |
|
117 | view.resize(400,300); | |
@@ -131,8 +128,8 void tst_QGroupedBarSeries::mouseclicked() | |||||
131 |
|
128 | |||
132 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); |
|
129 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); | |
133 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
130 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
134 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
131 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
135 |
QVERIFY(seriesSpyArg.at(1).to |
|
132 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |
136 |
|
133 | |||
137 | //==================================================================================== |
|
134 | //==================================================================================== | |
138 | // barset 1, category test2 |
|
135 | // barset 1, category test2 | |
@@ -143,8 +140,8 void tst_QGroupedBarSeries::mouseclicked() | |||||
143 |
|
140 | |||
144 | seriesSpyArg = seriesSpy.takeFirst(); |
|
141 | seriesSpyArg = seriesSpy.takeFirst(); | |
145 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
142 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
146 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
143 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
147 |
QVERIFY(seriesSpyArg.at(1).to |
|
144 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |
148 |
|
145 | |||
149 | //==================================================================================== |
|
146 | //==================================================================================== | |
150 | // barset 1, category test3 |
|
147 | // barset 1, category test3 | |
@@ -155,8 +152,8 void tst_QGroupedBarSeries::mouseclicked() | |||||
155 |
|
152 | |||
156 | seriesSpyArg = seriesSpy.takeFirst(); |
|
153 | seriesSpyArg = seriesSpy.takeFirst(); | |
157 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
154 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
158 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
155 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
159 |
QVERIFY(seriesSpyArg.at(1).to |
|
156 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |
160 |
|
157 | |||
161 | //==================================================================================== |
|
158 | //==================================================================================== | |
162 | // barset 2, category test1 |
|
159 | // barset 2, category test1 | |
@@ -167,8 +164,8 void tst_QGroupedBarSeries::mouseclicked() | |||||
167 |
|
164 | |||
168 | seriesSpyArg = seriesSpy.takeFirst(); |
|
165 | seriesSpyArg = seriesSpy.takeFirst(); | |
169 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
166 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
170 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
167 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
171 |
QVERIFY(seriesSpyArg.at(1).to |
|
168 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |
172 |
|
169 | |||
173 | //==================================================================================== |
|
170 | //==================================================================================== | |
174 | // barset 2, category test2 |
|
171 | // barset 2, category test2 | |
@@ -179,8 +176,8 void tst_QGroupedBarSeries::mouseclicked() | |||||
179 |
|
176 | |||
180 | seriesSpyArg = seriesSpy.takeFirst(); |
|
177 | seriesSpyArg = seriesSpy.takeFirst(); | |
181 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
178 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
182 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
179 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
183 |
QVERIFY(seriesSpyArg.at(1).to |
|
180 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |
184 |
|
181 | |||
185 | //==================================================================================== |
|
182 | //==================================================================================== | |
186 | // barset 2, category test3 |
|
183 | // barset 2, category test3 | |
@@ -191,8 +188,8 void tst_QGroupedBarSeries::mouseclicked() | |||||
191 |
|
188 | |||
192 | seriesSpyArg = seriesSpy.takeFirst(); |
|
189 | seriesSpyArg = seriesSpy.takeFirst(); | |
193 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
190 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
194 |
QVERIFY(seriesSpyArg.at(1).type() == QVariant:: |
|
191 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
195 |
QVERIFY(seriesSpyArg.at(1).to |
|
192 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |
196 | } |
|
193 | } | |
197 |
|
194 | |||
198 | void tst_QGroupedBarSeries::mousehovered_data() |
|
195 | void tst_QGroupedBarSeries::mousehovered_data() | |
@@ -203,9 +200,6 void tst_QGroupedBarSeries::mousehovered_data() | |||||
203 | void tst_QGroupedBarSeries::mousehovered() |
|
200 | void tst_QGroupedBarSeries::mousehovered() | |
204 | { |
|
201 | { | |
205 | QGroupedBarSeries* series = new QGroupedBarSeries(); |
|
202 | QGroupedBarSeries* series = new QGroupedBarSeries(); | |
206 | QBarCategories categories; |
|
|||
207 | categories << "test1" << "test2" << "test3"; |
|
|||
208 | series->setCategories(categories); |
|
|||
209 |
|
203 | |||
210 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
204 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
211 | *set1 << 10 << 10 << 10; |
|
205 | *set1 << 10 << 10 << 10; |
@@ -100,9 +100,6 void tst_QPercentBarSeries::mouseclicked_data() | |||||
100 | void tst_QPercentBarSeries::mouseclicked() |
|
100 | void tst_QPercentBarSeries::mouseclicked() | |
101 | { |
|
101 | { | |
102 | QPercentBarSeries* series = new QPercentBarSeries(); |
|
102 | QPercentBarSeries* series = new QPercentBarSeries(); | |
103 | QBarCategories categories; |
|
|||
104 | categories << "test1" << "test2" << "test3"; |
|
|||
105 | series->setCategories(categories); |
|
|||
106 |
|
103 | |||
107 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
104 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
108 | *set1 << 10 << 10 << 10; |
|
105 | *set1 << 10 << 10 << 10; | |
@@ -112,7 +109,7 void tst_QPercentBarSeries::mouseclicked() | |||||
112 | *set2 << 10 << 10 << 10; |
|
109 | *set2 << 10 << 10 << 10; | |
113 | series->append(set2); |
|
110 | series->append(set2); | |
114 |
|
111 | |||
115 |
QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*, |
|
112 | QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); | |
116 |
|
113 | |||
117 | QChartView view(new QChart()); |
|
114 | QChartView view(new QChart()); | |
118 | view.resize(400,300); |
|
115 | view.resize(400,300); | |
@@ -129,7 +126,8 void tst_QPercentBarSeries::mouseclicked() | |||||
129 |
|
126 | |||
130 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); |
|
127 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); | |
131 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
128 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
132 |
QVERIFY(seriesSpyArg.at(1).t |
|
129 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
130 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |||
133 |
|
131 | |||
134 | //==================================================================================== |
|
132 | //==================================================================================== | |
135 | // barset 1, category test2 |
|
133 | // barset 1, category test2 | |
@@ -140,7 +138,8 void tst_QPercentBarSeries::mouseclicked() | |||||
140 |
|
138 | |||
141 | seriesSpyArg = seriesSpy.takeFirst(); |
|
139 | seriesSpyArg = seriesSpy.takeFirst(); | |
142 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
140 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
143 |
QVERIFY(seriesSpyArg.at(1).t |
|
141 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
142 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |||
144 |
|
143 | |||
145 | //==================================================================================== |
|
144 | //==================================================================================== | |
146 | // barset 1, category test3 |
|
145 | // barset 1, category test3 | |
@@ -151,7 +150,8 void tst_QPercentBarSeries::mouseclicked() | |||||
151 |
|
150 | |||
152 | seriesSpyArg = seriesSpy.takeFirst(); |
|
151 | seriesSpyArg = seriesSpy.takeFirst(); | |
153 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
152 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
154 |
QVERIFY(seriesSpyArg.at(1).t |
|
153 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
154 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |||
155 |
|
155 | |||
156 | //==================================================================================== |
|
156 | //==================================================================================== | |
157 | // barset 2, category test1 |
|
157 | // barset 2, category test1 | |
@@ -162,7 +162,8 void tst_QPercentBarSeries::mouseclicked() | |||||
162 |
|
162 | |||
163 | seriesSpyArg = seriesSpy.takeFirst(); |
|
163 | seriesSpyArg = seriesSpy.takeFirst(); | |
164 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
164 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
165 |
QVERIFY(seriesSpyArg.at(1).t |
|
165 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
166 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |||
166 |
|
167 | |||
167 | //==================================================================================== |
|
168 | //==================================================================================== | |
168 | // barset 2, category test2 |
|
169 | // barset 2, category test2 | |
@@ -173,7 +174,8 void tst_QPercentBarSeries::mouseclicked() | |||||
173 |
|
174 | |||
174 | seriesSpyArg = seriesSpy.takeFirst(); |
|
175 | seriesSpyArg = seriesSpy.takeFirst(); | |
175 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
176 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
176 |
QVERIFY(seriesSpyArg.at(1).t |
|
177 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
178 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |||
177 |
|
179 | |||
178 | //==================================================================================== |
|
180 | //==================================================================================== | |
179 | // barset 2, category test3 |
|
181 | // barset 2, category test3 | |
@@ -184,7 +186,8 void tst_QPercentBarSeries::mouseclicked() | |||||
184 |
|
186 | |||
185 | seriesSpyArg = seriesSpy.takeFirst(); |
|
187 | seriesSpyArg = seriesSpy.takeFirst(); | |
186 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
188 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
187 |
QVERIFY(seriesSpyArg.at(1).t |
|
189 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
190 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |||
188 | } |
|
191 | } | |
189 |
|
192 | |||
190 | void tst_QPercentBarSeries::mousehovered_data() |
|
193 | void tst_QPercentBarSeries::mousehovered_data() | |
@@ -195,9 +198,6 void tst_QPercentBarSeries::mousehovered_data() | |||||
195 | void tst_QPercentBarSeries::mousehovered() |
|
198 | void tst_QPercentBarSeries::mousehovered() | |
196 | { |
|
199 | { | |
197 | QPercentBarSeries* series = new QPercentBarSeries(); |
|
200 | QPercentBarSeries* series = new QPercentBarSeries(); | |
198 | QBarCategories categories; |
|
|||
199 | categories << "test1" << "test2" << "test3"; |
|
|||
200 | series->setCategories(categories); |
|
|||
201 |
|
201 | |||
202 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
202 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
203 | *set1 << 10 << 10 << 10; |
|
203 | *set1 << 10 << 10 << 10; |
@@ -100,9 +100,6 void tst_QStackedBarSeries::mouseclicked_data() | |||||
100 | void tst_QStackedBarSeries::mouseclicked() |
|
100 | void tst_QStackedBarSeries::mouseclicked() | |
101 | { |
|
101 | { | |
102 | QStackedBarSeries* series = new QStackedBarSeries(); |
|
102 | QStackedBarSeries* series = new QStackedBarSeries(); | |
103 | QBarCategories categories; |
|
|||
104 | categories << "test1" << "test2" << "test3"; |
|
|||
105 | series->setCategories(categories); |
|
|||
106 |
|
103 | |||
107 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
104 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
108 | *set1 << 10 << 10 << 10; |
|
105 | *set1 << 10 << 10 << 10; | |
@@ -112,7 +109,7 void tst_QStackedBarSeries::mouseclicked() | |||||
112 | *set2 << 10 << 10 << 10; |
|
109 | *set2 << 10 << 10 << 10; | |
113 | series->append(set2); |
|
110 | series->append(set2); | |
114 |
|
111 | |||
115 |
QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*, |
|
112 | QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); | |
116 |
|
113 | |||
117 | QChartView view(new QChart()); |
|
114 | QChartView view(new QChart()); | |
118 | view.resize(400,300); |
|
115 | view.resize(400,300); | |
@@ -129,7 +126,8 void tst_QStackedBarSeries::mouseclicked() | |||||
129 |
|
126 | |||
130 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); |
|
127 | QList<QVariant> seriesSpyArg = seriesSpy.takeFirst(); | |
131 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
128 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
132 |
QVERIFY(seriesSpyArg.at(1).t |
|
129 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
130 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |||
133 |
|
131 | |||
134 | //==================================================================================== |
|
132 | //==================================================================================== | |
135 | // barset 1, category test2 |
|
133 | // barset 1, category test2 | |
@@ -140,7 +138,8 void tst_QStackedBarSeries::mouseclicked() | |||||
140 |
|
138 | |||
141 | seriesSpyArg = seriesSpy.takeFirst(); |
|
139 | seriesSpyArg = seriesSpy.takeFirst(); | |
142 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
140 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
143 |
QVERIFY(seriesSpyArg.at(1).t |
|
141 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
142 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |||
144 |
|
143 | |||
145 | //==================================================================================== |
|
144 | //==================================================================================== | |
146 | // barset 1, category test3 |
|
145 | // barset 1, category test3 | |
@@ -151,7 +150,8 void tst_QStackedBarSeries::mouseclicked() | |||||
151 |
|
150 | |||
152 | seriesSpyArg = seriesSpy.takeFirst(); |
|
151 | seriesSpyArg = seriesSpy.takeFirst(); | |
153 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); |
|
152 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1); | |
154 |
QVERIFY(seriesSpyArg.at(1).t |
|
153 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
154 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |||
155 |
|
155 | |||
156 | //==================================================================================== |
|
156 | //==================================================================================== | |
157 | // barset 2, category test1 |
|
157 | // barset 2, category test1 | |
@@ -162,7 +162,8 void tst_QStackedBarSeries::mouseclicked() | |||||
162 |
|
162 | |||
163 | seriesSpyArg = seriesSpy.takeFirst(); |
|
163 | seriesSpyArg = seriesSpy.takeFirst(); | |
164 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
164 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
165 |
QVERIFY(seriesSpyArg.at(1).t |
|
165 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
166 | QVERIFY(seriesSpyArg.at(1).toInt() == 0); | |||
166 |
|
167 | |||
167 | //==================================================================================== |
|
168 | //==================================================================================== | |
168 | // barset 2, category test2 |
|
169 | // barset 2, category test2 | |
@@ -173,7 +174,8 void tst_QStackedBarSeries::mouseclicked() | |||||
173 |
|
174 | |||
174 | seriesSpyArg = seriesSpy.takeFirst(); |
|
175 | seriesSpyArg = seriesSpy.takeFirst(); | |
175 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
176 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
176 |
QVERIFY(seriesSpyArg.at(1).t |
|
177 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
178 | QVERIFY(seriesSpyArg.at(1).toInt() == 1); | |||
177 |
|
179 | |||
178 | //==================================================================================== |
|
180 | //==================================================================================== | |
179 | // barset 2, category test3 |
|
181 | // barset 2, category test3 | |
@@ -184,7 +186,8 void tst_QStackedBarSeries::mouseclicked() | |||||
184 |
|
186 | |||
185 | seriesSpyArg = seriesSpy.takeFirst(); |
|
187 | seriesSpyArg = seriesSpy.takeFirst(); | |
186 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); |
|
188 | QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2); | |
187 |
QVERIFY(seriesSpyArg.at(1).t |
|
189 | QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); | |
|
190 | QVERIFY(seriesSpyArg.at(1).toInt() == 2); | |||
188 | } |
|
191 | } | |
189 |
|
192 | |||
190 | void tst_QStackedBarSeries::mousehovered_data() |
|
193 | void tst_QStackedBarSeries::mousehovered_data() | |
@@ -195,9 +198,6 void tst_QStackedBarSeries::mousehovered_data() | |||||
195 | void tst_QStackedBarSeries::mousehovered() |
|
198 | void tst_QStackedBarSeries::mousehovered() | |
196 | { |
|
199 | { | |
197 | QStackedBarSeries* series = new QStackedBarSeries(); |
|
200 | QStackedBarSeries* series = new QStackedBarSeries(); | |
198 | QBarCategories categories; |
|
|||
199 | categories << "test1" << "test2" << "test3"; |
|
|||
200 | series->setCategories(categories); |
|
|||
201 |
|
201 | |||
202 | QBarSet* set1 = new QBarSet(QString("set 1")); |
|
202 | QBarSet* set1 = new QBarSet(QString("set 1")); | |
203 | *set1 << 10 << 10 << 10; |
|
203 | *set1 << 10 << 10 << 10; |
@@ -276,16 +276,16 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS | |||||
276 | QBarSeries* series = 0; |
|
276 | QBarSeries* series = 0; | |
277 | if (seriesName == "Bar") { |
|
277 | if (seriesName == "Bar") { | |
278 | series = new QBarSeries(this); |
|
278 | series = new QBarSeries(this); | |
279 |
|
|
279 | m_chart->axisX()->categories()->insert(category); | |
280 | } else if (seriesName == "Grouped bar") { |
|
280 | } else if (seriesName == "Grouped bar") { | |
281 | series = new QGroupedBarSeries(this); |
|
281 | series = new QGroupedBarSeries(this); | |
282 |
|
|
282 | m_chart->axisX()->categories()->insert(category); | |
283 | } else if (seriesName == "Stacked bar") { |
|
283 | } else if (seriesName == "Stacked bar") { | |
284 | series = new QStackedBarSeries(this); |
|
284 | series = new QStackedBarSeries(this); | |
285 |
|
|
285 | m_chart->axisX()->categories()->insert(category); | |
286 | } else { |
|
286 | } else { | |
287 | series = new QPercentBarSeries(this); |
|
287 | series = new QPercentBarSeries(this); | |
288 |
|
|
288 | m_chart->axisX()->categories()->insert(category); | |
289 | } |
|
289 | } | |
290 |
|
290 | |||
291 | for (int j(0); j < data.count(); j++) { |
|
291 | for (int j(0); j < data.count(); j++) { |
@@ -141,8 +141,7 void Widget::refreshChart() | |||||
141 | for (int i = 0; i < selectedCountriesStrings.size(); i++) |
|
141 | for (int i = 0; i < selectedCountriesStrings.size(); i++) | |
142 | category << selectedCountriesStrings[i]; |
|
142 | category << selectedCountriesStrings[i]; | |
143 | QBarSeries* series0 = new QBarSeries(); |
|
143 | QBarSeries* series0 = new QBarSeries(); | |
144 |
|
|
144 | chartView->chart()->axisX()->categories()->insert(category); | |
145 | // series0 = new QBarSeries(category); |
|
|||
146 |
|
145 | |||
147 | // prepare the selected counries SQL query |
|
146 | // prepare the selected counries SQL query | |
148 | QString countriesQuery = "country IN ("; |
|
147 | QString countriesQuery = "country IN ("; |
General Comments 0
You need to be logged in to leave comments.
Login now