From c4f4e0f381ad7977ad6c5764263e189684b23122 2012-05-31 11:04:28 From: sauimone Date: 2012-05-31 11:04:28 Subject: [PATCH] removed categories from barseries. categories are now only on axis --- diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp index 6f93a2f..e0fda98 100644 --- a/demos/chartthemes/themewidget.cpp +++ b/demos/chartthemes/themewidget.cpp @@ -212,12 +212,13 @@ QChart* ThemeWidget::createBarChart(int valueCount) const chart->axisY()->setNiceNumbersEnabled(true); chart->setTitle("Bar chart"); - QBarCategories categories; + QStringList categories; for (int i(0); i < valueCount; i++) categories << QString::number(i); + chart->axisX()->categories()->insert(categories); + QStackedBarSeries* series = new QStackedBarSeries(chart); - series->setCategories(categories); for (int i(0); i < m_dataTable.count(); i++) { QBarSet *set = new QBarSet("Bar set " + QString::number(i)); foreach (Data data, m_dataTable[i]) diff --git a/examples/groupedbarchart/main.cpp b/examples/groupedbarchart/main.cpp index 0453789..d6a8965 100644 --- a/examples/groupedbarchart/main.cpp +++ b/examples/groupedbarchart/main.cpp @@ -32,11 +32,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); //![1] - QBarCategories categories; - categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; -//![1] - -//![2] QBarSet *set0 = new QBarSet("Jane"); QBarSet *set1 = new QBarSet("John"); QBarSet *set2 = new QBarSet("Axel"); @@ -48,23 +43,29 @@ int main(int argc, char *argv[]) *set2 << 3 << 5 << 8 << 13 << 8 << 5; *set3 << 5 << 6 << 7 << 3 << 4 << 5; *set4 << 9 << 7 << 5 << 3 << 1 << 2; -//![2] +//![1] -//![3] +//![2] QGroupedBarSeries* series = new QGroupedBarSeries(); - series->setCategories(categories); +// series->setCategories(categories); series->append(set0); series->append(set1); series->append(set2); series->append(set3); series->append(set4); -//![3] +//![2] -//![4] +//![3] QChart* chart = new QChart(); chart->addSeries(series); chart->setTitle("Simple grouped barchart example"); +//![3] + +//![4] + QStringList categories; + categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; + chart->axisX()->categories()->insert(categories); //![4] //![5] diff --git a/examples/legend/mainwidget.h b/examples/legend/mainwidget.h index ab39527..5b5f717 100644 --- a/examples/legend/mainwidget.h +++ b/examples/legend/mainwidget.h @@ -12,7 +12,6 @@ QTCOMMERCIALCHART_USE_NAMESPACE class MainWidget : public QWidget -//class MainWidget : public QGraphicsWidget { Q_OBJECT public: diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp index 830cb37..0a6cdfa 100644 --- a/examples/percentbarchart/main.cpp +++ b/examples/percentbarchart/main.cpp @@ -32,11 +32,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); //![1] - QBarCategories categories; - categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; -//![1] - -//![2] QBarSet *set0 = new QBarSet("Jane"); QBarSet *set1 = new QBarSet("John"); QBarSet *set2 = new QBarSet("Axel"); @@ -48,22 +43,27 @@ int main(int argc, char *argv[]) *set2 << 3 << 5 << 8 << 13 << 8 << 5; *set3 << 5 << 6 << 7 << 3 << 4 << 5; *set4 << 9 << 7 << 5 << 3 << 1 << 2; -//![2] +//![1] -//![3] +//![2] QPercentBarSeries* series = new QPercentBarSeries(); - series->setCategories(categories); series->append(set0); series->append(set1); series->append(set2); series->append(set3); series->append(set4); -//![3] +//![2] -//![4] +//![3] QChart* chart = new QChart(); chart->addSeries(series); chart->setTitle("Simple percentbarchart example"); +//![3] + +//![4] + QStringList categories; + categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; + chart->axisX()->categories()->insert(categories); //![4] //![5] diff --git a/examples/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp index a6e265b..5d97b57 100644 --- a/examples/stackedbarchart/main.cpp +++ b/examples/stackedbarchart/main.cpp @@ -32,11 +32,6 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); //![1] - QBarCategories categories; - categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; -//![1] - -//![2] QBarSet *set0 = new QBarSet("Jane"); QBarSet *set1 = new QBarSet("John"); QBarSet *set2 = new QBarSet("Axel"); @@ -48,22 +43,27 @@ int main(int argc, char *argv[]) *set2 << 3 << 5 << 8 << 13 << 8 << 5; *set3 << 5 << 6 << 7 << 3 << 4 << 5; *set4 << 9 << 7 << 5 << 3 << 1 << 2; -//![2] +//![1] -//![3] +//![2] QStackedBarSeries* series = new QStackedBarSeries(); - series->setCategories(categories); series->append(set0); series->append(set1); series->append(set2); series->append(set3); series->append(set4); -//![3] +//![2] -//![4] +//![3] QChart* chart = new QChart(); chart->addSeries(series); chart->setTitle("Simple stackedbarchart example"); +//![3] + +//![4] + QStringList categories; + categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; + chart->axisX()->categories()->insert(categories); //![4] //![5] diff --git a/examples/stackedbarchartdrilldown/drilldownchart.cpp b/examples/stackedbarchartdrilldown/drilldownchart.cpp index 46ddf39..8465689 100644 --- a/examples/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/stackedbarchartdrilldown/drilldownchart.cpp @@ -39,11 +39,11 @@ void DrilldownChart::changeSeries(QAbstractSeries *series) axisY()->setNiceNumbersEnabled(true); } -void DrilldownChart::handleClicked(QBarSet *barset, QString category) +void DrilldownChart::handleClicked(QBarSet *barset, int index) { Q_UNUSED(barset) DrilldownBarSeries* series = static_cast (sender()); - changeSeries(series->drilldownSeries(category)); + changeSeries(series->drilldownSeries(index)); } #include "moc_drilldownchart.cpp" diff --git a/examples/stackedbarchartdrilldown/drilldownchart.h b/examples/stackedbarchartdrilldown/drilldownchart.h index 3011cd4..96e4a85 100644 --- a/examples/stackedbarchartdrilldown/drilldownchart.h +++ b/examples/stackedbarchartdrilldown/drilldownchart.h @@ -36,7 +36,7 @@ public: void changeSeries(QAbstractSeries *series); public Q_SLOTS: - void handleClicked(QBarSet *barset, QString category); + void handleClicked(QBarSet *barset, int index); private: QAbstractSeries* m_currentSeries; diff --git a/examples/stackedbarchartdrilldown/drilldownseries.cpp b/examples/stackedbarchartdrilldown/drilldownseries.cpp index f23413e..b767cb4 100644 --- a/examples/stackedbarchartdrilldown/drilldownseries.cpp +++ b/examples/stackedbarchartdrilldown/drilldownseries.cpp @@ -25,17 +25,16 @@ QTCOMMERCIALCHART_USE_NAMESPACE DrilldownBarSeries::DrilldownBarSeries(QStringList categories, QObject *parent) : QStackedBarSeries(parent) { - setCategories(categories); } -void DrilldownBarSeries::mapDrilldownSeries(QString category, DrilldownBarSeries* drilldownSeries) +void DrilldownBarSeries::mapDrilldownSeries(int index, DrilldownBarSeries* drilldownSeries) { - mDrilldownSeries[category] = drilldownSeries; + mDrilldownSeries[index] = drilldownSeries; } -DrilldownBarSeries* DrilldownBarSeries::drilldownSeries(QString category) +DrilldownBarSeries* DrilldownBarSeries::drilldownSeries(int index) { - return mDrilldownSeries[category]; + return mDrilldownSeries[index]; } #include "moc_drilldownseries.cpp" diff --git a/examples/stackedbarchartdrilldown/drilldownseries.h b/examples/stackedbarchartdrilldown/drilldownseries.h index 78acf9e..4301751 100644 --- a/examples/stackedbarchartdrilldown/drilldownseries.h +++ b/examples/stackedbarchartdrilldown/drilldownseries.h @@ -33,12 +33,12 @@ class DrilldownBarSeries : public QStackedBarSeries public: DrilldownBarSeries(QStringList categories, QObject *parent = 0); - void mapDrilldownSeries(QString category, DrilldownBarSeries* drilldownSeries); + void mapDrilldownSeries(int index, DrilldownBarSeries* drilldownSeries); - DrilldownBarSeries* drilldownSeries(QString category); + DrilldownBarSeries* drilldownSeries(int index); private: - QMap mDrilldownSeries; + QMap mDrilldownSeries; }; //! [1] diff --git a/examples/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp index 1b472f4..2a9f74a 100644 --- a/examples/stackedbarchartdrilldown/main.cpp +++ b/examples/stackedbarchartdrilldown/main.cpp @@ -57,34 +57,35 @@ int main(int argc, char *argv[]) seasonSeries->setName("Crop by month - Season"); // Each month in season series has drilldown series for weekly data - foreach (QString month, months) { + for (int month=0; month < months.count(); month++) { // Create drilldown series for every week DrilldownBarSeries* weeklySeries = new DrilldownBarSeries(weeks, drilldownChart); seasonSeries->mapDrilldownSeries(month, weeklySeries); // Drilling down from weekly data brings us back to season data. - foreach (QString week, weeks) { + for (int week=0; week < weeks.count(); week++) { weeklySeries->mapDrilldownSeries(week, seasonSeries); - weeklySeries->setName(QString("Crop by week - " + month)); + weeklySeries->setName(QString("Crop by week - " + months.at(month))); } // Use right click signal to implement drilldown - QObject::connect(weeklySeries, SIGNAL(clicked(QBarSet*,QString)), drilldownChart, SLOT(handleClicked(QBarSet*,QString))); + QObject::connect(weeklySeries, SIGNAL(clicked(QBarSet*,int)), drilldownChart, SLOT(handleClicked(QBarSet*,int))); } // Enable drilldown from season series using right click. - QObject::connect(seasonSeries, SIGNAL(clicked(QBarSet*,QString)), drilldownChart, SLOT(handleClicked(QBarSet*,QString))); + QObject::connect(seasonSeries, SIGNAL(clicked(QBarSet*,int)), drilldownChart, SLOT(handleClicked(QBarSet*,int))); //! [4] //! [5] // Fill monthly and weekly series with data foreach (QString plant, plants) { QBarSet* monthlyCrop = new QBarSet(plant); - foreach (QString month, months) { + for (int month=0; monthdrilldownSeries(month)->append(weeklyCrop); *monthlyCrop << weeklyCrop->sum(); diff --git a/src/axis/qaxiscategories.cpp b/src/axis/qaxiscategories.cpp index 6d198bd..943614d 100644 --- a/src/axis/qaxiscategories.cpp +++ b/src/axis/qaxiscategories.cpp @@ -45,11 +45,11 @@ QAxisCategories::~QAxisCategories() } /*! - Inserts bar \a categories. + Inserts \a categories to axis. First item in list is assumed to be at x = 0, next at x = 1 and so on */ -void QAxisCategories::insert(const QBarCategories &categories) +void QAxisCategories::insert(const QStringList &categories) { - int i=1; + int i=0; foreach (const QString& string , categories) { d_ptr->m_map.insert(i,string); i++; @@ -57,6 +57,7 @@ void QAxisCategories::insert(const QBarCategories &categories) emit d_ptr->updated(); } + /*! Inserts category, instead of \a value on axis a \a label will be shown. */ diff --git a/src/axis/qaxiscategories.h b/src/axis/qaxiscategories.h index bfae20c..f78cb83 100644 --- a/src/axis/qaxiscategories.h +++ b/src/axis/qaxiscategories.h @@ -22,7 +22,7 @@ #define QAXISCATEGORIES_H #include -#include +#include QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -36,7 +36,7 @@ private: public: ~QAxisCategories(); - void insert(const QBarCategories &category); + void insert(const QStringList &category); void insert(qreal value,QString label); void remove(qreal value); QList values() const; diff --git a/src/barchart/bar.cpp b/src/barchart/bar.cpp index b5fa86d..b7235ab 100644 --- a/src/barchart/bar.cpp +++ b/src/barchart/bar.cpp @@ -25,18 +25,18 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -Bar::Bar(QBarSet *barset, QString category, QGraphicsItem *parent) : QGraphicsRectItem(parent), - m_category(category), +Bar::Bar(QBarSet *barset, int index, QGraphicsItem *parent) : QGraphicsRectItem(parent), + m_index(index), m_barset(barset) { - setAcceptedMouseButtons(Qt::LeftButton /*| Qt::RightButton*/); + setAcceptedMouseButtons(Qt::LeftButton | Qt::RightButton); setAcceptHoverEvents(true); } void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) - emit clicked(m_barset, m_category); + emit clicked(m_barset, m_index); } void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) diff --git a/src/barchart/bar_p.h b/src/barchart/bar_p.h index 80f56de..b062e08 100644 --- a/src/barchart/bar_p.h +++ b/src/barchart/bar_p.h @@ -42,7 +42,7 @@ class Bar : public QObject, public QGraphicsRectItem { Q_OBJECT public: - Bar(QBarSet *barset, QString category, QGraphicsItem *parent = 0); + Bar(QBarSet *barset, int index, QGraphicsItem *parent = 0); public: void mousePressEvent(QGraphicsSceneMouseEvent *event); @@ -50,13 +50,11 @@ public: void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); Q_SIGNALS: - void clicked(QString category); - void clicked(QBarSet *barset, QString category); - void hovered(bool status); + void clicked(QBarSet *barset, int index); void hovered(QBarSet *barset, bool status); private: - QString m_category; + int m_index; QBarSet *m_barset; }; diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp index cd3a4a9..f12cf02 100644 --- a/src/barchart/barchartitem.cpp +++ b/src/barchart/barchartitem.cpp @@ -73,15 +73,14 @@ void BarChartItem::dataChanged() bool labelsVisible = m_series->isLabelsVisible(); // Create new graphic items for bars - for (int c = 0; c < m_series->categoryCount(); c++) { - QString category = m_series->d_func()->categoryName(c); + for (int c = 0; c < m_series->d_func()->categoryCount(); c++) { for (int s = 0; s < m_series->barsetCount(); s++) { QBarSet *set = m_series->d_func()->barsetAt(s); // Bars - Bar *bar = new Bar(set,category,this); + Bar *bar = new Bar(set,c,this); m_bars.append(bar); - connect(bar, SIGNAL(clicked(QBarSet*,QString)), m_series, SIGNAL(clicked(QBarSet*,QString))); + connect(bar, SIGNAL(clicked(QBarSet*,int)), m_series, SIGNAL(clicked(QBarSet*,int))); connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool))); m_layout.append(QRectF(0, 0, 0, 0)); @@ -100,8 +99,8 @@ QVector BarChartItem::calculateLayout() { QVector layout; - // Use temporary qreals for accurancy - qreal categoryCount = m_series->categoryCount(); + // Use temporary qreals for accuracy + qreal categoryCount = m_series->d_func()->categoryCount(); qreal setCount = m_series->barsetCount(); bool barsVisible = m_series->isVisible(); diff --git a/src/barchart/groupedbarchartitem.cpp b/src/barchart/groupedbarchartitem.cpp index 90999f6..53ee352 100644 --- a/src/barchart/groupedbarchartitem.cpp +++ b/src/barchart/groupedbarchartitem.cpp @@ -35,8 +35,8 @@ QVector GroupedBarChartItem::calculateLayout() { QVector layout; - // Use temporary qreals for accurancy - qreal categoryCount = m_series->categoryCount(); + // Use temporary qreals for accuracy + qreal categoryCount = m_series->d_func()->categoryCount(); qreal setCount = m_series->barsetCount(); // Domain: diff --git a/src/barchart/percentbarchartitem.cpp b/src/barchart/percentbarchartitem.cpp index e2a8b4f..7cb39e2 100644 --- a/src/barchart/percentbarchartitem.cpp +++ b/src/barchart/percentbarchartitem.cpp @@ -35,8 +35,8 @@ QVector PercentBarChartItem::calculateLayout() { QVector layout; - // Use temporary qreals for accurancy - qreal categoryCount = m_series->categoryCount(); + // Use temporary qreals for accuracy + qreal categoryCount = m_series->d_func()->categoryCount(); qreal setCount = m_series->barsetCount(); // Domain: diff --git a/src/barchart/qbarmodelmapper.cpp b/src/barchart/qbarmodelmapper.cpp index 7d35efb..919b98d 100644 --- a/src/barchart/qbarmodelmapper.cpp +++ b/src/barchart/qbarmodelmapper.cpp @@ -412,7 +412,8 @@ void QBarModelMapperPrivate::initializeBarFromModel() posInCategories++; categoriesIndex = categoriesModelIndex(posInCategories); } - m_series->setCategories(categories); + // TODO: set the categories to axis +// m_series->setCategories(categories); } blockSeriesSignals(false); } diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index 24256f7..f2ec941 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -47,10 +47,10 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn void QBarSeries::clicked(QBarSet *barset, QString category) + \fn void QBarSeries::clicked(QBarSet *barset, int index) - The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset of category \a category - contained by the series. + The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset. + Clicked bar inside set is indexed by \a index */ /*! @@ -98,16 +98,6 @@ QAbstractSeries::SeriesType QBarSeries::type() const } /*! - Sets the \a categories, which are used to to group the data. -*/ -void QBarSeries::setCategories(QBarCategories categories) -{ - Q_D(QBarSeries); - d->setCategories(categories); - emit d->categoriesUpdated(); -} - -/*! Sets the margin around bars. Parameter \a margin is from 0 to 1 and represents percentage of margin compared to bars */ @@ -172,7 +162,6 @@ void QBarSeries::clear() { Q_D(QBarSeries); d->m_barSets.clear(); - d->m_categories.clear(); } /*! @@ -185,15 +174,6 @@ int QBarSeries::barsetCount() const } /*! - Returns number of categories in series -*/ -int QBarSeries::categoryCount() const -{ - Q_D(const QBarSeries); - return d->categoryCount(); -} - -/*! Returns a list of sets in series. Keeps ownership of sets. */ QList QBarSeries::barSets() const @@ -203,15 +183,6 @@ QList QBarSeries::barSets() const } /*! - Returns the bar categories of the series. -*/ -QBarCategories QBarSeries::categories() const -{ - Q_D(const QBarSeries); - return d->categories(); -} - -/*! Sets the visibility of series to \a visible */ void QBarSeries::setVisible(bool visible) @@ -260,7 +231,7 @@ QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : { } -void QBarSeriesPrivate::setCategories(QBarCategories categories) +void QBarSeriesPrivate::setCategories(QStringList categories) { m_categories = categories; } @@ -294,14 +265,14 @@ int QBarSeriesPrivate::categoryCount() const return count; } -QBarCategories QBarSeriesPrivate::categories() const +QStringList QBarSeriesPrivate::categories() const { if (m_categories.count() > 0) { return m_categories; } // No categories defined. retun list of indices. - QBarCategories categories; + QStringList categories; int count = categoryCount(); for (int i = 0; i < count; i++) { diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h index ec66fa7..9f28bb1 100644 --- a/src/barchart/qbarseries.h +++ b/src/barchart/qbarseries.h @@ -26,10 +26,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -typedef QStringList QBarCategories; - class QBarSet; -class BarCategory; class QBarSeriesPrivate; // Container for series @@ -46,7 +43,6 @@ public: virtual ~QBarSeries(); QAbstractSeries::SeriesType type() const; - void setCategories(QBarCategories categories); void setBarMargin(qreal margin); qreal barMargin() const; @@ -56,9 +52,7 @@ public: bool append(QList sets); bool remove(QList sets); int barsetCount() const; - int categoryCount() const; QList barSets() const; - QBarCategories categories() const; void clear(); void setVisible(bool visible = true); @@ -70,7 +64,7 @@ protected: explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0); Q_SIGNALS: - void clicked(QBarSet *barset, QString category); + void clicked(QBarSet *barset, int index); void hovered(QBarSet* barset, bool status); protected: diff --git a/src/barchart/qbarseries_p.h b/src/barchart/qbarseries_p.h index 1f59508..b21d661 100644 --- a/src/barchart/qbarseries_p.h +++ b/src/barchart/qbarseries_p.h @@ -44,11 +44,12 @@ class QBarSeriesPrivate : public QAbstractSeriesPrivate Q_OBJECT public: QBarSeriesPrivate(QBarSeries *parent); - void setCategories(QBarCategories categories); + // TODO: refactor/remove private category stuff + void setCategories(QStringList categories); void insertCategory(int index, const QString category); void removeCategory(int index); int categoryCount() const; - QBarCategories categories() const; + QStringList categories() const; void setBarMargin(qreal margin); qreal barMargin() const; @@ -76,7 +77,7 @@ public: qreal maxCategorySum(); Q_SIGNALS: - void clicked(QBarSet *barset, QString category); + void clicked(QBarSet *barset, int index); void updatedBars(); void restructuredBars(); void categoriesUpdated(); @@ -87,7 +88,7 @@ private Q_SLOTS: protected: QList m_barSets; - QBarCategories m_categories; + QStringList m_categories; qreal m_barMargin; bool m_labelsVisible; bool m_visible; diff --git a/src/barchart/qbarset.cpp b/src/barchart/qbarset.cpp index 06f6cf6..119d8c4 100644 --- a/src/barchart/qbarset.cpp +++ b/src/barchart/qbarset.cpp @@ -38,20 +38,6 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \fn void QBarSet::clicked(QString category) - \brief signals that set has been clicked - Parameter \a category describes on which category was clicked -*/ - -/*! - \fn void QBarSet::hovered(bool status) - \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. - - The signal is emitted if mouse is hovered on top of set - Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series. -*/ - -/*! Constructs QBarSet with a name of \a name and with parent of \a parent */ QBarSet::QBarSet(const QString name, QObject *parent) diff --git a/src/barchart/qbarset.h b/src/barchart/qbarset.h index 21ac9a4..8fad337 100644 --- a/src/barchart/qbarset.h +++ b/src/barchart/qbarset.h @@ -73,10 +73,6 @@ public: void setLabelFont(const QFont &font); QFont labelFont() const; -//Q_SIGNALS: -// void clicked(QString category); -// void hovered(bool status); - private: QScopedPointer d_ptr; Q_DISABLE_COPY(QBarSet) diff --git a/src/barchart/qbarset_p.h b/src/barchart/qbarset_p.h index 83393c2..4fa3aa0 100644 --- a/src/barchart/qbarset_p.h +++ b/src/barchart/qbarset_p.h @@ -47,7 +47,6 @@ public: ~QBarSetPrivate(); Q_SIGNALS: - void clicked(QString category); void restructuredBars(); void updatedBars(); diff --git a/src/barchart/qgroupedbarseries.cpp b/src/barchart/qgroupedbarseries.cpp index d576737..564e833 100644 --- a/src/barchart/qgroupedbarseries.cpp +++ b/src/barchart/qgroupedbarseries.cpp @@ -71,7 +71,6 @@ QGroupedBarSeriesPrivate::QGroupedBarSeriesPrivate(QGroupedBarSeries *q) : QBarS void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain) { - Q_Q(QGroupedBarSeries); qreal minX(domain.minX()); qreal minY(domain.minY()); qreal maxX(domain.maxX()); @@ -79,7 +78,7 @@ void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain) int tickXCount(domain.tickXCount()); int tickYCount(domain.tickYCount()); - qreal x = q->categoryCount(); + qreal x = categoryCount(); qreal y = max(); minX = qMin(minX, x) - 0.5; minY = qMin(minY, y); diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp index 13d04e0..64f33ae 100644 --- a/src/barchart/qpercentbarseries.cpp +++ b/src/barchart/qpercentbarseries.cpp @@ -71,7 +71,6 @@ QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QBarS void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) { - Q_Q(QPercentBarSeries); qreal minX(domain.minX()); qreal minY(domain.minY()); qreal maxX(domain.maxX()); @@ -79,7 +78,7 @@ void QPercentBarSeriesPrivate::scaleDomain(Domain& domain) int tickXCount(domain.tickXCount()); int tickYCount(domain.tickYCount()); - qreal x = q->categoryCount(); + qreal x = categoryCount(); minX = qMin(minX, x) - 0.5; maxX = qMax(maxX, x) - 0.5; minY = 0; diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp index a6c3326..3353a2a 100644 --- a/src/barchart/qstackedbarseries.cpp +++ b/src/barchart/qstackedbarseries.cpp @@ -71,7 +71,6 @@ QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QBarS void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) { - Q_Q(QStackedBarSeries); qreal minX(domain.minX()); qreal minY(domain.minY()); qreal maxX(domain.maxX()); @@ -79,7 +78,7 @@ void QStackedBarSeriesPrivate::scaleDomain(Domain& domain) int tickXCount(domain.tickXCount()); int tickYCount(domain.tickYCount()); - qreal x = q->categoryCount(); + qreal x = categoryCount(); qreal y = maxCategorySum(); minX = qMin(minX, x) - 0.5; minY = qMin(minY, y); diff --git a/src/barchart/stackedbarchartitem.cpp b/src/barchart/stackedbarchartitem.cpp index 5bb0395..d82901e 100644 --- a/src/barchart/stackedbarchartitem.cpp +++ b/src/barchart/stackedbarchartitem.cpp @@ -34,8 +34,8 @@ StackedBarChartItem::StackedBarChartItem(QBarSeries *series, ChartPresenter *pre QVector StackedBarChartItem::calculateLayout() { QVector layout; - // Use temporary qreals for accurancy - qreal categoryCount = m_series->categoryCount(); + // Use temporary qreals for accuracy + qreal categoryCount = m_series->d_func()->categoryCount(); qreal setCount = m_series->barsetCount(); // Domain: diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp index c46b053..ceda6c6 100644 --- a/src/chartdataset.cpp +++ b/src/chartdataset.cpp @@ -89,14 +89,6 @@ void ChartDataSet::addSeries(QAbstractSeries* series, QAxis *axisY) series->d_ptr->scaleDomain(*domain); - // Note that with SeriesTypeBar we don't set up categories, but use real values on x-asis - if(series->type() == QAbstractSeries::SeriesTypeGroupedBar - || series->type() == QAbstractSeries::SeriesTypeStackedBar - || series->type() == QAbstractSeries::SeriesTypePercentBar) { - QBarSeries* barSeries = static_cast(series); - setupCategories(barSeries); - } - if (series->type()== QAbstractSeries::SeriesTypePie && m_seriesAxisMap.count() == 0) { axisX()->hide(); this->axisY()->hide(); @@ -190,13 +182,6 @@ void ChartDataSet::removeAllSeries() qDeleteAll(axes); } -void ChartDataSet::setupCategories(QBarSeries* series) -{ - QAxisCategories* categories = axisX()->categories(); - categories->clear(); - categories->insert(series->categories()); -} - void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size) { QMapIterator i(m_axisDomainMap); diff --git a/src/chartdataset_p.h b/src/chartdataset_p.h index 42095fa..2438129 100644 --- a/src/chartdataset_p.h +++ b/src/chartdataset_p.h @@ -37,7 +37,6 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QAxis; -class QBarSeries; class QTCOMMERCIALCHART_AUTOTEST_EXPORT ChartDataSet : public QObject { @@ -76,7 +75,6 @@ Q_SIGNALS: private: QStringList createLabels(QAxis* axis,qreal min, qreal max); void calculateDomain(QAbstractSeries* series,Domain* domain); - void setupCategories(QBarSeries* series); private: QMap m_seriesAxisMap; diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 92ed62a..47c41dd 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -43,8 +43,6 @@ private slots: void qbarseries(); void type_data(); void type(); - void setCategories_data(); - void setCategories(); void append_data(); void append(); void remove_data(); @@ -55,12 +53,8 @@ private slots: void removeList(); void barsetCount_data(); void barsetCount(); - void categoryCount_data(); - void categoryCount(); void barSets_data(); void barSets(); - void categories_data(); - void categories(); void setLabelsVisible_data(); void setLabelsVisible(); void mouseclicked_data(); @@ -74,7 +68,6 @@ private: QList m_testSets; - QBarCategories m_categories; }; void tst_QBarSeries::initTestCase() @@ -88,11 +81,8 @@ void tst_QBarSeries::cleanupTestCase() void tst_QBarSeries::init() { - m_categories << "category0" << "category1" << "category2"; m_barseries = new QBarSeries(); - m_barseries->setCategories(m_categories); m_barseries_with_sets = new QBarSeries(); - m_barseries_with_sets->setCategories(m_categories); for (int i=0; i<5; i++) { m_testSets.append(new QBarSet("testset")); @@ -112,29 +102,16 @@ void tst_QBarSeries::cleanup() m_barseries = 0; delete m_barseries_with_sets; m_barseries_with_sets = 0; - m_categories.clear(); } void tst_QBarSeries::qbarseries_data() { - QTest::addColumn ("categories"); - QBarCategories c; - c << "category0" << "category1" << "category2"; - QTest::newRow("categories") << c; } void tst_QBarSeries::qbarseries() { - QFETCH(QBarCategories, categories); QBarSeries *barseries = new QBarSeries(); QVERIFY(barseries != 0); - barseries->setCategories(categories); - QBarCategories verifyCategories = barseries->categories(); - - QVERIFY(verifyCategories.count() == categories.count()); - for (int i=0; itype() == QAbstractSeries::SeriesTypeBar); } -void tst_QBarSeries::setCategories_data() -{ - QTest::addColumn ("categories"); - QBarCategories categories; - categories << "c1" << "c2" << "c3" << "c4" << "c5" << "c6"; - QTest::newRow("cat") << categories; -} - -void tst_QBarSeries::setCategories() -{ - QVERIFY(m_barseries->categories().count() == m_categories.count()); - - QFETCH(QBarCategories, categories); - m_barseries->setCategories(categories); - - QVERIFY(m_barseries->categories().count() == categories.count()); - for (int i=0; icategories().at(i).compare(categories.at(i)) == 0); - } -} - void tst_QBarSeries::append_data() { } @@ -352,17 +308,6 @@ void tst_QBarSeries::barsetCount() QVERIFY(m_barseries_with_sets->barsetCount() == m_testSets.count()); } -void tst_QBarSeries::categoryCount_data() -{ - -} - -void tst_QBarSeries::categoryCount() -{ - QVERIFY(m_barseries->categoryCount() == m_categories.count()); - QVERIFY(m_barseries_with_sets->categoryCount() == m_categories.count()); -} - void tst_QBarSeries::barSets_data() { @@ -380,21 +325,6 @@ void tst_QBarSeries::barSets() } } -void tst_QBarSeries::categories_data() -{ - -} - -void tst_QBarSeries::categories() -{ - QBarCategories categories = m_barseries->categories(); - - QVERIFY(categories.count() == m_categories.count()); - for (int i=0; isetCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); @@ -442,7 +369,7 @@ void tst_QBarSeries::mouseclicked() *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10); series->append(set2); - QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,QString))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); QChartView view(new QChart()); view.resize(400,300); @@ -459,8 +386,8 @@ void tst_QBarSeries::mouseclicked() QList seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 1, category test2 @@ -471,8 +398,8 @@ void tst_QBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 1, category test3 @@ -483,8 +410,8 @@ void tst_QBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); //==================================================================================== // barset 2, category test1 @@ -495,8 +422,8 @@ void tst_QBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 2, category test2 @@ -507,8 +434,8 @@ void tst_QBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 2, category test3 @@ -519,8 +446,8 @@ void tst_QBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); } void tst_QBarSeries::mousehovered_data() @@ -531,9 +458,9 @@ void tst_QBarSeries::mousehovered_data() void tst_QBarSeries::mousehovered() { QBarSeries* series = new QBarSeries(); - QBarCategories categories; + QStringList categories; categories << "test1" << "test2" << "test3"; - series->setCategories(categories); +// series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << QPointF(0.1,10) << QPointF(1.1,10) << QPointF(2.1,10); diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 2fc6a62..49c8b00 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -168,13 +168,6 @@ void tst_QChart::addSeries_data() QAbstractSeries* series6 = new QPercentBarSeries(this); QAbstractSeries* series7 = new QStackedBarSeries(this); - QBarSeries* s5 = static_cast (series5); - s5->setCategories(QBarCategories()); - QPercentBarSeries* s6 = static_cast (series6); - s6->setCategories(QBarCategories()); - QStackedBarSeries* s7 = static_cast (series7); - s7->setCategories(QBarCategories()); - QAxis* axis = new QAxis(this); QTest::newRow("default axis: lineSeries") << series0 << (QAxis*) 0; diff --git a/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp b/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp index 224d7a7..73f0cb4 100644 --- a/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp +++ b/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp @@ -102,9 +102,6 @@ void tst_QGroupedBarSeries::mouseclicked_data() void tst_QGroupedBarSeries::mouseclicked() { QGroupedBarSeries* series = new QGroupedBarSeries(); - QBarCategories categories; - categories << "test1" << "test2" << "test3"; - series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; @@ -114,7 +111,7 @@ void tst_QGroupedBarSeries::mouseclicked() *set2 << 10 << 10 << 10; series->append(set2); - QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,QString))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); QChartView view(new QChart()); view.resize(400,300); @@ -131,8 +128,8 @@ void tst_QGroupedBarSeries::mouseclicked() QList seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 1, category test2 @@ -143,8 +140,8 @@ void tst_QGroupedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 1, category test3 @@ -155,8 +152,8 @@ void tst_QGroupedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); //==================================================================================== // barset 2, category test1 @@ -167,8 +164,8 @@ void tst_QGroupedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 2, category test2 @@ -179,8 +176,8 @@ void tst_QGroupedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 2, category test3 @@ -191,8 +188,8 @@ void tst_QGroupedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).type() == QVariant::String); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); } void tst_QGroupedBarSeries::mousehovered_data() @@ -203,9 +200,6 @@ void tst_QGroupedBarSeries::mousehovered_data() void tst_QGroupedBarSeries::mousehovered() { QGroupedBarSeries* series = new QGroupedBarSeries(); - QBarCategories categories; - categories << "test1" << "test2" << "test3"; - series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index 41d5b9b..b0165d8 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -100,9 +100,6 @@ void tst_QPercentBarSeries::mouseclicked_data() void tst_QPercentBarSeries::mouseclicked() { QPercentBarSeries* series = new QPercentBarSeries(); - QBarCategories categories; - categories << "test1" << "test2" << "test3"; - series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; @@ -112,7 +109,7 @@ void tst_QPercentBarSeries::mouseclicked() *set2 << 10 << 10 << 10; series->append(set2); - QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,QString))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); QChartView view(new QChart()); view.resize(400,300); @@ -129,7 +126,8 @@ void tst_QPercentBarSeries::mouseclicked() QList seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 1, category test2 @@ -140,7 +138,8 @@ void tst_QPercentBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 1, category test3 @@ -151,7 +150,8 @@ void tst_QPercentBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); //==================================================================================== // barset 2, category test1 @@ -162,7 +162,8 @@ void tst_QPercentBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 2, category test2 @@ -173,7 +174,8 @@ void tst_QPercentBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 2, category test3 @@ -184,7 +186,8 @@ void tst_QPercentBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); } void tst_QPercentBarSeries::mousehovered_data() @@ -195,9 +198,6 @@ void tst_QPercentBarSeries::mousehovered_data() void tst_QPercentBarSeries::mousehovered() { QPercentBarSeries* series = new QPercentBarSeries(); - QBarCategories categories; - categories << "test1" << "test2" << "test3"; - series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 58ab5f7..2192fb6 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -100,9 +100,6 @@ void tst_QStackedBarSeries::mouseclicked_data() void tst_QStackedBarSeries::mouseclicked() { QStackedBarSeries* series = new QStackedBarSeries(); - QBarCategories categories; - categories << "test1" << "test2" << "test3"; - series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; @@ -112,7 +109,7 @@ void tst_QStackedBarSeries::mouseclicked() *set2 << 10 << 10 << 10; series->append(set2); - QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,QString))); + QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int))); QChartView view(new QChart()); view.resize(400,300); @@ -129,7 +126,8 @@ void tst_QStackedBarSeries::mouseclicked() QList seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 1, category test2 @@ -140,7 +138,8 @@ void tst_QStackedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 1, category test3 @@ -151,7 +150,8 @@ void tst_QStackedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set1); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); //==================================================================================== // barset 2, category test1 @@ -162,7 +162,8 @@ void tst_QStackedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 0); //==================================================================================== // barset 2, category test2 @@ -173,7 +174,8 @@ void tst_QStackedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 1); //==================================================================================== // barset 2, category test3 @@ -184,7 +186,8 @@ void tst_QStackedBarSeries::mouseclicked() seriesSpyArg = seriesSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesSpyArg.at(0)), set2); - QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0); + QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int); + QVERIFY(seriesSpyArg.at(1).toInt() == 2); } void tst_QStackedBarSeries::mousehovered_data() @@ -195,9 +198,6 @@ void tst_QStackedBarSeries::mousehovered_data() void tst_QStackedBarSeries::mousehovered() { QStackedBarSeries* series = new QStackedBarSeries(); - QBarCategories categories; - categories << "test1" << "test2" << "test3"; - series->setCategories(categories); QBarSet* set1 = new QBarSet(QString("set 1")); *set1 << 10 << 10 << 10; diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index 34791e9..fea7d9b 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -276,16 +276,16 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS QBarSeries* series = 0; if (seriesName == "Bar") { series = new QBarSeries(this); - series->setCategories(category); + m_chart->axisX()->categories()->insert(category); } else if (seriesName == "Grouped bar") { series = new QGroupedBarSeries(this); - series->setCategories(category); + m_chart->axisX()->categories()->insert(category); } else if (seriesName == "Stacked bar") { series = new QStackedBarSeries(this); - series->setCategories(category); + m_chart->axisX()->categories()->insert(category); } else { series = new QPercentBarSeries(this); - series->setCategories(category); + m_chart->axisX()->categories()->insert(category); } for (int j(0); j < data.count(); j++) { diff --git a/tests/gdpbarchart/widget.cpp b/tests/gdpbarchart/widget.cpp index f19814f..2aae2de 100644 --- a/tests/gdpbarchart/widget.cpp +++ b/tests/gdpbarchart/widget.cpp @@ -141,8 +141,7 @@ void Widget::refreshChart() for (int i = 0; i < selectedCountriesStrings.size(); i++) category << selectedCountriesStrings[i]; QBarSeries* series0 = new QBarSeries(); - series0->setCategories(category); -// series0 = new QBarSeries(category); + chartView->chart()->axisX()->categories()->insert(category); // prepare the selected counries SQL query QString countriesQuery = "country IN (";