HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r360:6630f89603b4

Rename QChartSeries to QSeries

Michal Klocek -

r360:6630f89603b4

parent child

Context file:

r360:6630f89603b4

Expand all files

example/presenterchart/chartview.h +1 -1

             private:
                 QTimer m_timer;
-                QList<QChartSeries*> m_series;
+                QList<QSeries*> m_series;
                 int m_index;
             };

src/barchart/qbarseries.cpp +3 -3

             */
             /*!
-                \fn virtual QChartSeriesType QBarSeries::type() const
+                \fn virtual QSeriesType QBarSeries::type() const
                 \brief Returns type of series.
-                \sa QChartSeries, QChartSeriesType
+                \sa QSeries, QSeriesType
             */
             /*!
                 \fn void QBarSeries::changed(int index)
                 QBarSeries is QObject which is a child of a \a parent.
             */
             QBarSeries::QBarSeries(QBarCategory *category, QObject *parent)
-                : QChartSeries(parent)
+                : QSeries(parent)
                 ,mModel(new BarChartModel(category, this))
             {
             }

src/barchart/qbarseries.h +3 -3

             #ifndef BARSERIES_H
             #define BARSERIES_H
-            #include "qchartseries.h"
+            #include "qseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class BarChartModel;
             // Container for series
-            class QTCOMMERCIALCHART_EXPORT QBarSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QBarSeries : public QSeries
             {
                 Q_OBJECT
             public:
                 QBarSeries(QBarCategory *category, QObject* parent=0);
-                virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
+                virtual QSeriesType type() const { return QSeries::SeriesTypeBar; }
                 void addBarSet(QBarSet *set);               // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set

src/barchart/qpercentbarseries.cpp +2 -2

             */
             /*!
-                \fn virtual QChartSeriesType QPercentBarSeries::type() const
+                \fn virtual QSeriesType QPercentBarSeries::type() const
                 \brief Returns type of series.
-                \sa QChartSeries, QChartSeriesType
+                \sa QSeries, QSeriesType
             */
             /*!

src/barchart/qpercentbarseries.h +1 -1

             public:
                 QPercentBarSeries(QBarCategory *category, QObject* parent=0);
-                virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
+                virtual QSeriesType type() const { return QSeries::SeriesTypePercentBar; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qstackedbarseries.cpp +2 -2

             */
             /*!
-                \fn virtual QChartSeriesType QStackedBarSeries::type() const
+                \fn virtual QSeriesType QStackedBarSeries::type() const
                 \brief Returns type of series.
-                \sa QChartSeries, QChartSeriesType
+                \sa QSeries, QSeriesType
             */
             /*!

src/barchart/qstackedbarseries.h +1 -1

             public:
                 QStackedBarSeries(QBarCategory *category, QObject* parent=0);
-                virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
+                virtual QSeriesType type() const { return QSeries::SeriesTypeStackedBar; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartdataset.cpp +15 -15

                 return m_domainMap.values(axisY).at(i);
             }
-            void ChartDataSet::addSeries(QChartSeries* series, QChartAxis *axisY)
+            void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)
             {
                 // TODO: we should check the series not already added
                 if(axisY==0) axisY = m_axisY;
                 axisY->setParent(this); // take ownership
-                QList<QChartSeries*>  seriesList = m_seriesMap.values(axisY);
+                QList<QSeries*>  seriesList = m_seriesMap.values(axisY);
                 QList<Domain> domainList = m_domainMap.values(axisY);
                 switch(series->type())
                 {
-                    case QChartSeries::SeriesTypeLine: {
+                    case QSeries::SeriesTypeLine: {
                         QLineSeries* xyseries = static_cast<QLineSeries*>(series);
                         }
                         break;
                     }
-                    case QChartSeries::SeriesTypeBar: {
+                    case QSeries::SeriesTypeBar: {
                     qDebug() << "QChartSeries::SeriesTypeBar";
                         QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                         qreal x = barSeries->countCategories();
                         domain.m_maxY = qMax(domain.m_maxY,y);
                         break;
                     }
-                    case QChartSeries::SeriesTypeStackedBar: {
+                    case QSeries::SeriesTypeStackedBar: {
                     qDebug() << "QChartSeries::SeriesTypeStackedBar";
                         QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                         domain.m_maxY = qMax(domain.m_maxY,y);
                         break;
                     }
-                    case QChartSeries::SeriesTypePercentBar: {
+                    case QSeries::SeriesTypePercentBar: {
                     qDebug() << "QChartSeries::SeriesTypePercentBar";
                         QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                         break;
                     }
-                    case QChartSeries::SeriesTypePie: {
+                    case QSeries::SeriesTypePie: {
                         QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
                         // TODO: domain stuff
                         break;
                     }
-                    case QChartSeries::SeriesTypeScatter: {
+                    case QSeries::SeriesTypeScatter: {
                         QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                         Q_ASSERT(scatterSeries);
                         foreach (QPointF point, scatterSeries->data()) {
             }
-            void ChartDataSet::removeSeries(QChartSeries* series)
+            void ChartDataSet::removeSeries(QSeries* series)
             {
                 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                 foreach(QChartAxis* axis , keys) {
             {
                 QList<QChartAxis*> keys = m_seriesMap.uniqueKeys();
                 foreach(QChartAxis* axis , keys) {
-                    QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
+                    QList<QSeries*> seriesList = m_seriesMap.values(axis);
                     for(int i =0 ; i < seriesList.size();i++ )
                     {
                         emit seriesRemoved(seriesList.at(i));
                     Q_ASSERT(i>=0);
                     domain = m_domainMap.values(axis).at(i);
                     QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-                    QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
+                    QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                    foreach(QChartSeries* series, seriesList) {
+                    foreach(QSeries* series, seriesList) {
                         emit seriesDomainChanged(series,domain);
                     }
                     emit axisLabelsChanged(axis,labels);
                 foreach (QChartAxis* axis , domainList){
                     domain = m_domainMap.value(axis).subDomain(rect,viewport.width(),viewport.height());
                     QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
-                    QList<QChartSeries*> seriesList = m_seriesMap.values(axis);
+                    QList<QSeries*> seriesList = m_seriesMap.values(axis);
-                    foreach(QChartSeries* series, seriesList){
+                    foreach(QSeries* series, seriesList){
                         emit seriesDomainChanged(series,domain);
                     }
                     emit axisLabelsChanged(axis,labels);
                 m_domainIndex++;
             }
-            QChartAxis* ChartDataSet::axisY(QChartSeries* series) const
+            QChartAxis* ChartDataSet::axisY(QSeries* series) const
             {
                 if(series == 0) return m_axisY;

src/chartdataset_p.h +8 -8

             #ifndef CHARTDATASET_P_H_
             #define CHARTDATASET_P_H_
-            #include "qchartseries.h"
+            #include "qseries.h"
             #include "domain_p.h"
             #include <QVector>
                 ChartDataSet(QObject* parent=0);
                 virtual ~ChartDataSet();
-                void addSeries(QChartSeries* series,QChartAxis *axisY = 0);
+                void addSeries(QSeries* series,QChartAxis *axisY = 0);
-                void removeSeries(QChartSeries* series);
+                void removeSeries(QSeries* series);
                 void removeAllSeries();
                 void addDomain(const QRectF& rect, const QRectF& viewport);
                 bool nextDomain();
                 void setDomain(int index);
                 QChartAxis* axisX() const { return m_axisX;};
-                QChartAxis* axisY(QChartSeries* series = 0) const;
+                QChartAxis* axisY(QSeries* series = 0) const;
             signals:
-                void seriesAdded(QChartSeries* series);
+                void seriesAdded(QSeries* series);
-                void seriesRemoved(QChartSeries* series);
+                void seriesRemoved(QSeries* series);
                 void axisAdded(QChartAxis* axis);
                 void axisRemoved(QChartAxis* axis);
                 void axisLabelsChanged(QChartAxis* axis, const QStringList& labels);
-                void seriesDomainChanged(QChartSeries* series,const Domain& domain);
+                void seriesDomainChanged(QSeries* series,const Domain& domain);
             private slots:
             	void handleMinChanged(qreal min);
             private:
                 QMultiMap<QChartAxis*, Domain> m_domainMap;
-                QMultiMap<QChartAxis*, QChartSeries*> m_seriesMap;
+                QMultiMap<QChartAxis*, QSeries*> m_seriesMap;
                 QChartAxis* m_axisX;
                 QChartAxis* m_axisY;
                 int m_domainIndex;

src/chartpresenter.cpp +16 -16

             void ChartPresenter::createConnections()
             {
                 QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
-                QObject::connect(m_dataset,SIGNAL(seriesAdded(QChartSeries*)),this,SLOT(handleSeriesAdded(QChartSeries*)));
+                QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*)),this,SLOT(handleSeriesAdded(QSeries*)));
-                QObject::connect(m_dataset,SIGNAL(seriesRemoved(QChartSeries*)),this,SLOT(handleSeriesRemoved(QChartSeries*)));
+                QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
                 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*)),this,SLOT(handleAxisAdded(QChartAxis*)));
                 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
-                QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QChartSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QChartSeries*,const Domain&)));
+                QObject::connect(m_dataset,SIGNAL(seriesDomainChanged(QSeries*,const Domain&)),this,SLOT(handleSeriesDomainChanged(QSeries*,const Domain&)));
                 QObject::connect(m_dataset,SIGNAL(axisLabelsChanged(QChartAxis*,const QStringList&)),this,SLOT(handleAxisLabelsChanged(QChartAxis*,const QStringList&)));
             }
             }
-            void ChartPresenter::handleSeriesAdded(QChartSeries* series)
+            void ChartPresenter::handleSeriesAdded(QSeries* series)
             {
                 switch(series->type())
                 {
-                    case QChartSeries::SeriesTypeLine: {
+                    case QSeries::SeriesTypeLine: {
                         QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
                         LineChartItem* item;
                         if(m_options.testFlag(QChart::SeriesAnimations)){
                         break;
                     }
-                    case QChartSeries::SeriesTypeBar: {
+                    case QSeries::SeriesTypeBar: {
                         QBarSeries* barSeries = static_cast<QBarSeries*>(series);
                         BarPresenter* item = new BarPresenter(barSeries,m_chart);
                         m_chartTheme->decorate(item,barSeries,m_chartItems.count());
                         break;
                     }
-                    case QChartSeries::SeriesTypeStackedBar: {
+                    case QSeries::SeriesTypeStackedBar: {
                         QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
                         StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
                         break;
                     }
-                    case QChartSeries::SeriesTypePercentBar: {
+                    case QSeries::SeriesTypePercentBar: {
                         QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
                         PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
                         m_chartItems.insert(series,item);
                         break;
                     }
-                    case QChartSeries::SeriesTypeScatter: {
+                    case QSeries::SeriesTypeScatter: {
                         QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                         ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
                         QObject::connect(scatterPresenter, SIGNAL(clicked()), scatterSeries, SIGNAL(clicked()));
                         m_chartItems.insert(scatterSeries, scatterPresenter);
                         break;
                     }
-                    case QChartSeries::SeriesTypePie: {
+                    case QSeries::SeriesTypePie: {
                         QPieSeries *s = qobject_cast<QPieSeries *>(series);
                         PiePresenter* pie = new PiePresenter(m_chart, s);
                         m_chartTheme->decorate(pie, s, m_chartItems.count());
                 if(m_rect.isValid()) emit geometryChanged(m_rect);
             }
-            void ChartPresenter::handleSeriesRemoved(QChartSeries* series)
+            void ChartPresenter::handleSeriesRemoved(QSeries* series)
             {
             	ChartItem* item = m_chartItems.take(series);
             	delete item;
             }
-            void ChartPresenter::handleSeriesChanged(QChartSeries* series)
+            void ChartPresenter::handleSeriesChanged(QSeries* series)
             {
                 //TODO:
             }
-            void ChartPresenter::handleSeriesDomainChanged(QChartSeries* series, const Domain& domain)
+            void ChartPresenter::handleSeriesDomainChanged(QSeries* series, const Domain& domain)
             {
                 m_chartItems.value(series)->handleDomainChanged(domain);
             }
                 m_chartTheme = ChartTheme::createTheme(theme);
                 m_chartTheme->decorate(m_chart);
-                QMapIterator<QChartSeries*,ChartItem*> i(m_chartItems);
+                QMapIterator<QSeries*,ChartItem*> i(m_chartItems);
                 int index=0;
                 while (i.hasNext()) {
                     //recreate elements
                     QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
-                    QList<QChartSeries*> seriesList = m_chartItems.uniqueKeys();
+                    QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
                     foreach(QChartAxis* axis, axisList) {
                         handleAxisRemoved(axis);
                         handleAxisAdded(axis);
                     }
-                    foreach(QChartSeries* series, seriesList) {
+                    foreach(QSeries* series, seriesList) {
                         handleSeriesRemoved(series);
                         handleSeriesAdded(series);
                     }

src/chartpresenter_p.h +6 -6

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
-            class QChartSeries;
+            class QSeries;
             class ChartDataSet;
             //class QChart;
             class Domain;
                 void createConnections();
             public slots:
-                void handleSeriesAdded(QChartSeries* series);
+                void handleSeriesAdded(QSeries* series);
-                void handleSeriesRemoved(QChartSeries* series);
+                void handleSeriesRemoved(QSeries* series);
                 void handleAxisAdded(QChartAxis* axis);
                 void handleAxisRemoved(QChartAxis* axis);
-                void handleSeriesDomainChanged(QChartSeries* series, const Domain& domain);
+                void handleSeriesDomainChanged(QSeries* series, const Domain& domain);
                 void handleAxisLabelsChanged(QChartAxis* axis, const QStringList& labels);
-                void handleSeriesChanged(QChartSeries* series);
+                void handleSeriesChanged(QSeries* series);
                 void handleGeometryChanged();
             signals:
                 void geometryChanged(const QRectF& rect);
             private:
-                QMap<QChartSeries*,ChartItem*> m_chartItems;
+                QMap<QSeries*,ChartItem*> m_chartItems;
                 QMap<QChartAxis*,AxisItem*> m_axisItems;
                 QChart* m_chart;
                 ChartDataSet* m_dataset;

src/charttheme.cpp +7 -7

                 chart->setChartBackgroundBrush(backgroundGradient);
             }
             //TODO helper to by removed later
-            void ChartTheme::decorate(ChartItem* item, QChartSeries* series,int count)
+            void ChartTheme::decorate(ChartItem* item, QSeries* series,int count)
             {
                 switch(series->type())
                 {
-                    case QChartSeries::SeriesTypeLine: {
+                    case QSeries::SeriesTypeLine: {
                         QLineSeries* s = static_cast<QLineSeries*>(series);
                         LineChartItem* i = static_cast<LineChartItem*>(item);
                         decorate(i,s,count);
                         break;
                     }
-                    case QChartSeries::SeriesTypeBar: {
+                    case QSeries::SeriesTypeBar: {
                         QBarSeries* b = static_cast<QBarSeries*>(series);
                         BarPresenter* i = static_cast<BarPresenter*>(item);
                         decorate(i,b,count);
                         break;
                     }
-                    case QChartSeries::SeriesTypeStackedBar: {
+                    case QSeries::SeriesTypeStackedBar: {
                         QStackedBarSeries* s = static_cast<QStackedBarSeries*>(series);
                         StackedBarPresenter* i = static_cast<StackedBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
-                    case QChartSeries::SeriesTypePercentBar: {
+                    case QSeries::SeriesTypePercentBar: {
                         QPercentBarSeries* s = static_cast<QPercentBarSeries*>(series);
                         PercentBarPresenter* i = static_cast<PercentBarPresenter*>(item);
                         decorate(i,s,count);
                         break;
                     }
-                    case QChartSeries::SeriesTypeScatter: {
+                    case QSeries::SeriesTypeScatter: {
                         QScatterSeries* s = qobject_cast<QScatterSeries*>(series);
                         Q_ASSERT(s);
                         ScatterPresenter* i = static_cast<ScatterPresenter*>(item);
                         decorate(i, s, count);
                         break;
                     }
-                    case QChartSeries::SeriesTypePie: {
+                    case QSeries::SeriesTypePie: {
                         QPieSeries* s = static_cast<QPieSeries*>(series);
                         PiePresenter* i = static_cast<PiePresenter*>(item);
                         decorate(i,s,count);

src/charttheme_p.h +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
-            class QChartSeries;
+            class QSeries;
             class LineChartItem;
             class QLineSeries;
             class BarPresenter;
                 static ChartTheme* createTheme(QChart::ChartTheme theme);
                 QChart::ChartTheme id() const {return m_id;}
                 void decorate(QChart* chart);
-                void decorate(ChartItem* item, QChartSeries* series,int count);
+                void decorate(ChartItem* item, QSeries* series,int count);
                 void decorate(BarPresenter* item, QBarSeries* series,int count);
                 void decorate(StackedBarPresenter* item, QStackedBarSeries* series,int count);
                 void decorate(PercentBarPresenter* item, QPercentBarSeries* series,int count);

src/linechart/qlineseries.cpp +3 -3

             */
             /*!
-                \fn virtual QChartSeriesType QLineSeries::type() const
+                \fn virtual QSeriesType QLineSeries::type() const
                 \brief Returns type of series.
-                \sa QChartSeries, QChartSeriesType
+                \sa QSeries, QSeriesType
             */
             /*!
                 Constructs empty series object which is a child of \a parent.
                 When series object is added to QChartView or QChart instance ownerships is transfered.
             */
-            QLineSeries::QLineSeries(QObject* parent):QChartSeries(parent),
+            QLineSeries::QLineSeries(QObject* parent):QSeries(parent),
             m_pointsVisible(false)
             {
             }

src/linechart/qlineseries.h +5 -5

-            #ifndef QLINECHARTSERIES_H_
+            #ifndef QLINESERIES_H_
-            #define QLINECHARTSERIES_H_
+            #define QLINESERIES_H_
             #include "qchartglobal.h"
-            #include "qchartseries.h"
+            #include "qseries.h"
             #include <QDebug>
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QTCOMMERCIALCHART_EXPORT QLineSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QLineSeries : public QSeries
             {
                 Q_OBJECT
             public:
                 virtual ~QLineSeries();
             public: // from QChartSeries
-                virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeLine;}
+                virtual QSeriesType type() const { return QSeries::SeriesTypeLine;}
                 void add(qreal x, qreal y);
                 void add(const QPointF& point);
                 void replace(qreal x,qreal y);

src/piechart/qpieseries.cpp +3 -3

                 Constructs a series object which is a child of \a parent.
             */
             QPieSeries::QPieSeries(QObject *parent) :
-                QChartSeries(parent),
+                QSeries(parent),
                 m_sizeFactor(1.0),
                 m_position(PiePositionMaximized),
                 m_pieStartAngle(0),
             /*!
                 Returns QChartSeries::SeriesTypePie.
             */
-            QChartSeries::QChartSeriesType QPieSeries::type() const
+            QSeries::QSeriesType QPieSeries::type() const
             {
-                return QChartSeries::SeriesTypePie;
+                return QSeries::SeriesTypePie;
             }
             /*!

src/piechart/qpieseries.h +3 -3

             #ifndef PIESERIES_H
             #define PIESERIES_H
-            #include "qchartseries.h"
+            #include "qseries.h"
             #include <QObject>
             #include <QRectF>
             #include <QColor>
             class PieSlice;
             class QPieSlice;
-            class QTCOMMERCIALCHART_EXPORT QPieSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QPieSeries : public QSeries
             {
                 Q_OBJECT
                 virtual ~QPieSeries();
             public: // from QChartSeries
-                QChartSeriesType type() const;
+                QSeriesType type() const;
                 virtual bool setData(QList<qreal> data);  // TODO: remove this
             public:

src/qchart.cpp +2 -2

                 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
                 the y axis).
             */
-            void QChart::addSeries(QChartSeries* series, QChartAxis* axisY)
+            void QChart::addSeries(QSeries* series, QChartAxis* axisY)
             {
                 m_dataset->addSeries(series, axisY);
             }
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
-            void QChart::removeSeries(QChartSeries* series)
+            void QChart::removeSeries(QSeries* series)
             {
                 m_dataset->removeSeries(series);
             }

src/qchart.h +4 -4

             #define QCHART_H
             #include <qchartglobal.h>
-            #include <qchartseries.h>
+            #include <qseries.h>
             #include <QGraphicsWidget>
             #include <QLinearGradient>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
-            class QChartSeries;
+            class QSeries;
             class PlotDomain;
             class BarPresenter;
             class QChartAxis;
                 QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
-                void addSeries(QChartSeries* series, QChartAxis* axisY = 0);
+                void addSeries(QSeries* series, QChartAxis* axisY = 0);
-                void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
+                void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 void setMargin(int margin);

src/qchartview.cpp +2 -2

                 the y axis).
                 \sa removeSeries(), removeAllSeries()
             */
-            void QChartView::addSeries(QChartSeries* series,QChartAxis *axisY)
+            void QChartView::addSeries(QSeries* series,QChartAxis *axisY)
             {
                 m_chart->addSeries(series,axisY);
             }
                 It does not delete the pointed QChartSeries data object
                 \sa addSeries(), removeAllSeries()
             */
-            void QChartView::removeSeries(QChartSeries* series)
+            void QChartView::removeSeries(QSeries* series)
             {
                 m_chart->removeSeries(series);
             }

src/qchartview.h +3 -3

             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
-            #include "qchartseries.h"
+            #include "qseries.h"
             #include "qchart.h"
             #include <QGraphicsView>
                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
-                void addSeries(QChartSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
+                void addSeries(QSeries* series,QChartAxis* axisY=0);// takes series ownership , takes axis ownership
-                void removeSeries(QChartSeries* series); //returns ownership , deletes axis if no series attached
+                void removeSeries(QSeries* series); //returns ownership , deletes axis if no series attached
                 void removeAllSeries(); // deletes series and axis
                 int margin() const;

src/qseries.cpp ~~src/qchartseries.cpp~~ renamed +8 -8

-            #include "qchartseries.h"
+            #include "qseries.h"
             /*!
-                \class QChartSeries
+                \class QSeries
                 \brief Base class for all QtCommercial Chart series.
                 \mainclass
             */
             /*!
-                \enum QChartSeries::QChartSeriesType
+                \enum QSeries::QSeriesType
                 The type of the series object.
             */
             /*!
-                \fn QChartSeries::QChartSeries(QObject *parent)
+                \fn QSeries::QSeries(QObject *parent)
                 \brief Constructs ChartSeries object with \a parent.
             */
             /*!
-                \fn QChartSeries::~QChartSeries()
+                \fn QSeries::~QSeries()
                 \brief Virtual destructor for the chart series.
             */
             /*!
-                \fn QChartSeriesType QChartSeries::type() const
+                \fn QSeriesType QSeries::type() const
                 \brief The type of the series.
             */
             /*!
-                \fn bool QChartSeries::setModel(QAbstractItemModel *model)
+                \fn bool QSeries::setModel(QAbstractItemModel *model)
                 \brief Use the \a model to provide data for the series. The model overrides possible user data
                 set with QChartSeries type specific data setters. For example if you call both
                 QScatterSeries::addData() and QScatterSeries::setModel, only the data provided by the model is
             */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            #include "moc_qchartseries.cpp"
+            #include "moc_qseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qseries.h ~~src/qchartseries.h~~ renamed +7 -7

-            #ifndef QCHARTSERIES_H
+            #ifndef QSERIES_H
-            #define QCHARTSERIES_H
+            #define QSERIES_H
             #include "qchartglobal.h"
             #include <QObject>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
+            class QTCOMMERCIALCHART_EXPORT QSeries : public QObject
             {
                 Q_OBJECT
             public:
-                enum QChartSeriesType {
+                enum QSeriesType {
                     SeriesTypeLine,
                     SeriesTypeArea,
                     SeriesTypeBar,
                 };
             protected:
-                QChartSeries(QObject *parent = 0) : QObject(parent) {}
+                QSeries(QObject *parent = 0) : QObject(parent) {}
             public:
-                virtual ~QChartSeries() {}
+                virtual ~QSeries() {}
-                virtual QChartSeriesType type() const = 0;
+                virtual QSeriesType type() const = 0;
                 // TODO
                 virtual bool setModel(QAbstractItemModel* /*model*/) { return false; }
             };

src/scatterseries/qscatterseries.cpp +1 -1

                 Constructs a series object which is a child of \a parent.
             */
             QScatterSeries::QScatterSeries(QObject *parent) :
-                QChartSeries(parent),
+                QSeries(parent),
                 d(new QScatterSeriesPrivate())
             {
             }

src/scatterseries/qscatterseries.h +3 -3

             #ifndef QSCATTERSERIES_H
             #define QSCATTERSERIES_H
-            #include "qchartseries.h"
+            #include "qseries.h"
             #include <QRectF>
             #include <QColor>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QScatterSeriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QSeries
             {
                 Q_OBJECT
                 ~QScatterSeries();
             public: // from QChartSeries
-                QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
+                QSeriesType type() const { return QSeries::SeriesTypeScatter; }
             public:
                 void add(qreal x, qreal y);

src/scatterseries/scatterseries_p.h +1 -1

             #define QSCATTERSERIESPRIVATE_H
             #include "qchartglobal.h"
-            #include "qchartseries.h"
+            #include "qseries.h"
             #include <QPen>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/src.pro +11 -16

                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
-            SOURCES += \
+            SOURCES += axisitem.cpp \
-                axisitem.cpp \
                 axisanimationitem.cpp \
                 chartdataset.cpp \
                 chartpresenter.cpp \
                 domain.cpp \
                 qchart.cpp \
                 qchartaxis.cpp \
-                qchartseries.cpp \
+                qchartview.cpp \
-                qchartview.cpp
+                qseries.cpp
-            PRIVATE_HEADERS += \
+            PRIVATE_HEADERS += axisitem_p.h \
-                axisitem_p.h \
                 axisanimationitem_p.h \
                 chartdataset_p.h \
                 chartitem_p.h \
                 chartpresenter_p.h \
                 charttheme_p.h \
                 domain_p.h
-            PUBLIC_HEADERS += \
+            PUBLIC_HEADERS += qchart.h \
-                qchart.h \
                 qchartaxis.h \
                 qchartglobal.h \
-                qchartseries.h \
+                qseries.h \
-                qchartview.h \
+                qchartview.h
+            include(linechart/linechart.pri)
-            include(linechart/linechart.pri)
+            include(barchart/barchart.pri)
-            include(barchart/barchart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             THEMES += themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
-            QMAKE_EXTRA_COMPILERS += install_build_public_headers install_build_private_headers
+            QMAKE_EXTRA_COMPILERS += install_build_public_headers \
+                install_build_private_headers
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo \
                 "build_time" \
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR

test/auto/chartdataset/tst_chartdataset.cpp +24 -25

             #include <QtTest/QtTest>
             #include <qchartaxis.h>
-            #include <qchartseries.h>
             #include <qlineseries.h>
             #include <private/chartdataset_p.h>
             #include <private/domain_p.h>
             Q_DECLARE_METATYPE(Domain)
             Q_DECLARE_METATYPE(QChartAxis*)
-            Q_DECLARE_METATYPE(QChartSeries*)
+            Q_DECLARE_METATYPE(QSeries*)
             Q_DECLARE_METATYPE(QLineSeries*)
             class tst_ChartDataSet: public QObject {
             {
             	qRegisterMetaType<Domain>("Domain");
             	qRegisterMetaType<QChartAxis*>();
-            	qRegisterMetaType<QChartSeries*>();
+            	qRegisterMetaType<QSeries*>();
             }
             void tst_ChartDataSet::cleanupTestCase()
             	QSignalSpy spy1(&dataSet,
             			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
             	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
             	QSignalSpy spy4(&dataSet,
-            			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+            			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
             	Domain domain2 = dataSet.domain(dataSet.axisY());
             	QVERIFY(domain1 == domain2);
             	QSignalSpy spy1(&dataSet,
             			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
             	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
             	QSignalSpy spy4(&dataSet,
-            			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+            			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
             	QList<QChartAxis*> axisList;
             	QSignalSpy spy1(&dataSet,
             			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
             	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
             	QSignalSpy spy4(&dataSet,
-            			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+            			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
             	dataSet.clearDomains(indexCount);
             	QSignalSpy spy1(&dataSet,
             			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
             	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
             	QSignalSpy spy4(&dataSet,
-            			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+            			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
             	dataSet.addSeries(series1);
             	dataSet.addSeries(series2);
             	QSignalSpy spy1(&dataSet,
             			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
             	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
             	QSignalSpy spy4(&dataSet,
-            			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+            			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
             	Domain domain;
             	ChartDataSet dataSet;
             	QList<QChartAxis*> axisList;
-            	QList<QChartSeries*> seriesList;
+            	QList<QSeries*> seriesList;
             	for (int i = 0; i < axisYCount; i++) {
             		QChartAxis* axis = new QChartAxis();
             	QSignalSpy spy1(&dataSet,
             			SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
             	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+            	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
             	QSignalSpy spy4(&dataSet,
-            			SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+            			SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+            	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
             	for (int i = 0; i < seriesCount; i++) {
             		dataSet.removeSeries(seriesList.at(i));
                 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*)));
                 QSignalSpy spy1(&dataSet, SIGNAL(axisLabelsChanged(QChartAxis*, QStringList const&)));
                 QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
-                QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QChartSeries*)));
+                QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
-                QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QChartSeries*, Domain const&)));
+                QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
-                QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QChartSeries*)));
+                QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
                 dataSet.removeAllSeries();
                 //default axis

test/chartwidgettest/mainwidget.cpp +7 -8

             #include "mainwidget.h"
             #include "dataseriedialog.h"
-            #include "qchartseries.h"
             #include "qpieseries.h"
             #include "qscatterseries.h"
             #include <qlineseries.h>
                 // TODO: spline and area
             }
-            void MainWidget::setCurrentSeries(QChartSeries *series)
+            void MainWidget::setCurrentSeries(QSeries *series)
             {
                 if (series) {
                     m_currentSeries = series;
                     switch (m_currentSeries->type()) {
-                    case QChartSeries::SeriesTypeLine:
+                    case QSeries::SeriesTypeLine:
                         break;
-                    case QChartSeries::SeriesTypeScatter:
+                    case QSeries::SeriesTypeScatter:
                         break;
-                    case QChartSeries::SeriesTypePie:
+                    case QSeries::SeriesTypePie:
                         break;
-                    case QChartSeries::SeriesTypeBar:
+                    case QSeries::SeriesTypeBar:
                         qDebug() << "setCurrentSeries (bar)";
                         break;
-                    case QChartSeries::SeriesTypeStackedBar:
+                    case QSeries::SeriesTypeStackedBar:
                         qDebug() << "setCurrentSeries (Stackedbar)";
                         break;
-                    case QChartSeries::SeriesTypePercentBar:
+                    case QSeries::SeriesTypePercentBar:
                         qDebug() << "setCurrentSeries (Percentbar)";
                         break;
                     default:

test/chartwidgettest/mainwidget.h +2 -2

                 void xMaxChanged(int value);
                 void yMinChanged(int value);
                 void yMaxChanged(int value);
-                void setCurrentSeries(QChartSeries *series);
+                void setCurrentSeries(QSeries *series);
                 void changeChartTheme(int themeIndex);
                 void setPieSizeFactor(double margin);
                 void setPiePosition(int position);
                 QSpinBox *m_yMinSpin;
                 QSpinBox *m_yMaxSpin;
                 QString m_defaultSeriesName;
-                QChartSeries *m_currentSeries;
+                QSeries *m_currentSeries;
                 QGridLayout *m_scatterLayout;
                 QGridLayout *m_pieLayout;
             };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages