HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r990:2f31b8379e5f

Removed all the unfinished model functionality from XYSeries and BarSeries

Marek Rosa -

r990:2f31b8379e5f

parent child

Context file:

r990:2f31b8379e5f

Collapse all files

qmlplugin/declarativebarseries.cpp +11 -11

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativebarseries.h"
             #include "declarativechart.h"
             #include "qchart.h"
             #include "qbarseries.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
                 QDeclarativeItem(parent)
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
             void DeclarativeBarSeries::componentComplete()
             {
                 if (!m_series) {
                     DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());
                     if (declarativeChart) {
                         QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
                         Q_ASSERT(chart);
             //            QStringList categories;
             //            categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
             //            m_series = new QBarSeries(categories);
             //            m_series = new QBarSeries(m_categories);
                         m_series = new QBarSeries(m_categories);
                         // TODO: use data from model
                         QBarSet *set0 = new QBarSet("Bub");
                         QBarSet *set1 = new QBarSet("Bob");
                         QBarSet *set2 = new QBarSet("Guybrush");
                         *set0 << 1 << 2 << 3 << 4 << 5 << 6;
                         *set1 << 5 << 1 << 2 << 4 << 1 << 7;
                         *set2 << 3 << 5 << 8 << 13 << 8 << 5;
                         m_series->appendBarSet(set0);
                         m_series->appendBarSet(set1);
                         m_series->appendBarSet(set2);
                         chart->addSeries(m_series);
                     }
                 }
             }
-            void DeclarativeBarSeries::setBarCategories(QStringList categories)
+            void DeclarativeBarSeries::setBarCategories(QStringList /*categories*/)
             {
-                m_categories = categories;
+            //    m_categories = categories;
-                if (m_series) {
+            //    if (m_series) {
-                    // Replace categories of the QBarSeries with the new categories
+            //        // Replace categories of the QBarSeries with the new categories
-                    for (int i(0); i < m_categories.count(); i++) {
+            //        for (int i(0); i < m_categories.count(); i++) {
-                        if (m_series->categories().at(i) != m_categories.at(i))
+            //            if (m_series->categories().at(i) != m_categories.at(i))
-                            m_series->insertCategory(m_series->categoryCount(), m_categories.at(i));
+            //                m_series->insertCategory(m_series->categoryCount(), m_categories.at(i));
+            //        }
-                    while (m_series->categoryCount() > m_categories.count())
+            //        while (m_series->categoryCount() > m_categories.count())
-                        m_series->removeCategory(m_series->categoryCount() - 1);
+            //            m_series->removeCategory(m_series->categoryCount() - 1);
+            //    }
             }
             QStringList DeclarativeBarSeries::barCategories()
             {
                 return m_categories;
             }
             #include "moc_declarativebarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.cpp +11 -84

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qbarseries.h"
             #include "qbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "barchartmodel_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             #include <QAbstractItemModel>
             #include <QModelIndex>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSeries
                 \brief part of QtCommercial chart API.
                 QBarSeries represents a series of data shown as bars. One QBarSeries can contain multiple
                 QBarSet data sets. QBarSeries groups the data from sets to categories, which are defined
                 by QStringList.
                 \mainclass
                 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \fn void QBarSeries::clicked(QBarSet *barset, QString category, Qt::MouseButtons button)
                 The signal is emitted if the user clicks with a mouse \a button on top of QBarSet \a barset of category \a category
                 contained by the series.
             */
             /*!
                 \fn void QBarSeries::selected()
                 The signal is emitted if the user selects/deselects the series. The logic for storing selections should be
                 implemented by the user of QBarSeries API.
             */
             /*!
                 \fn void QBarSeries::hovered(QBarSet* barset, bool status)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 Constructs empty QBarSeries. Parameter \a categories defines the categories for chart.
                 QBarSeries is QObject which is a child of a \a parent.
             */
             QBarSeries::QBarSeries(QBarCategories categories, QObject *parent) :
                 QAbstractSeries(*new QBarSeriesPrivate(categories, this),parent)
             {
             }
             /*!
                 Destructs barseries and owned barsets.
             */
             QBarSeries::~QBarSeries()
             {
                 // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 \internal
             */
             QBarSeries::QBarSeries(QBarSeriesPrivate &d, QObject *parent) :
                 QAbstractSeries(d,parent)
             {
             }
             /*!
                 Returns the type of series. Derived classes override this.
             */
             QAbstractSeries::QSeriesType QBarSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeBar;
             }
             /*!
                 Adds a set of bars to series. Takes ownership of \a set.
                 Connects the clicked(QString, Qt::MouseButtons) signal
                 of \a set to this series
             */
             void QBarSeries::appendBarSet(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 d->m_internalModel->appendBarSet(set);
                 QObject::connect(set->d_ptr.data(), SIGNAL(valueChanged()), d, SLOT(barsetChanged()));
                 emit d->restructuredBars();
             }
             /*!
                 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
                 Disconnects the clicked(QString, Qt::MouseButtons) signal
                 of \a set from this series
             */
             void QBarSeries::removeBarSet(QBarSet *set)
             {
                 Q_D(QBarSeries);
                 d->m_internalModel->removeBarSet(set);
                 emit d->restructuredBars();
             }
             /*!
                 Adds a list of barsets to series. Takes ownership of \a sets.
                 Connects the clicked(QString, Qt::MouseButtons) signals
                 of \a sets to this series
             */
             void QBarSeries::appendBarSets(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                 foreach (QBarSet* barset, sets) {
                     d->m_internalModel->appendBarSet(barset);
                     QObject::connect(barset, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
                 }
                 emit d->restructuredBars();
             }
             /*!
                 Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
                 Disconnects the clicked(QString, Qt::MouseButtons) signal
                 of \a sets from this series
             */
             void QBarSeries::removeBarSets(QList<QBarSet* > sets)
             {
                 Q_D(QBarSeries);
                 foreach (QBarSet* barset, sets) {
                     d->m_internalModel->removeBarSet(barset);
                 }
                 emit d->restructuredBars();
             }
             /*!
                 Inserts new \a set on the \a i position.
                 The barset that is currently at this postion is moved to postion i + 1
             */
             void QBarSeries::insertBarSet(int i, QBarSet *set)
             {
                 Q_D(QBarSeries);
                 d->m_internalModel->insertBarSet(i, set);
                 emit d->barsetChanged();
             }
             /*!
-                Inserts new \a category on the \a i position.
-                The category that is currently at this postion is moved to postion i + 1
-                \sa removeCategory()
-            */
-            void QBarSeries::insertCategory(int i, QString category)
-                Q_D(QBarSeries);
-                d->m_internalModel->insertCategory(i, category);
-            /*!
-                Removes the category specified by \a i
-                \sa insertCategory()
-            */
-            void QBarSeries::removeCategory(int i)
-                Q_D(QBarSeries);
-                d->m_internalModel->removeCategory(i);
-            /*!
                 Returns number of sets in series.
             */
             int QBarSeries::barsetCount() const
             {
                 Q_D(const QBarSeries);
                 return d->m_internalModel->barsetCount();
             }
             /*!
                 Returns number of categories in series
             */
             int QBarSeries::categoryCount() const
             {
                 Q_D(const QBarSeries);
                 return d->m_internalModel->categoryCount();
             }
             /*!
                 Returns a list of sets in series. Keeps ownership of sets.
              */
             QList<QBarSet*> QBarSeries::barSets() const
             {
                 Q_D(const QBarSeries);
                 return d->m_internalModel->barSets();
             }
             /*!
                  \fn bool QBarSeries::setModel(QAbstractItemModel *model)
                  Sets the \a model to be used as a data source
              */
             bool QBarSeries::setModel(QAbstractItemModel *model)
             {
                 Q_D(QBarSeries);
                 return d->setModel(model);
             }
             /*!
                  \fn bool QBarSeries::setModelMapping(int categories, int bottomBoundry, int topBoundry, Qt::Orientation orientation)
                  Sets column/row specified by \a categories to be used as a list of bar series categories.
                  Parameter \a bottomBoundry indicates the column/row where the first bar set is located in the model.
                  Parameter \a topBoundry indicates the column/row where the last bar set is located in the model.
                  All the columns/rows inbetween those two values are also used as data for bar sets.
                  The \a orientation parameter specifies whether the data is in columns or in rows.
              */
             void QBarSeries::setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation)
             {
                 Q_D(QBarSeries);
                 d->setModelMapping(categories,bottomBoundary,topBoundary,orientation);
             }
             /*!
                 Returns the bar categories of the series.
             */
             QBarCategories QBarSeries::categories() const
             {
                 Q_D(const QBarSeries);
                 QBarCategories categories;
                 int count = d->m_internalModel->categoryCount();
                 for (int i=1; i <= count; i++) {
-                      categories.insert(i, d->m_internalModel->categoryName(i - 1));
+                    categories.insert(i, d->m_internalModel->categoryName(i - 1));
                 }
                 return categories;
             }
             /*!
                 Sets the visibility of labels in series to \a visible
             */
             void QBarSeries::setLabelsVisible(bool visible)
             {
                 foreach (QBarSet* s, barSets()) {
                     s->setLabelsVisible(visible);
                 }
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSeriesPrivate::QBarSeriesPrivate(QBarCategories categories, QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
                 m_internalModel(new BarChartModel(categories,this)),
                 m_model(0),
                 m_mapCategories(-1),
                 m_mapBarBottom(-1),
                 m_mapBarTop(-1),
-                m_mapFirst(0),
-                m_mapCount(0),
                 m_mapOrientation(Qt::Vertical)
             {
             }
             QBarSet* QBarSeriesPrivate::barsetAt(int index)
             {
                 return m_internalModel->barsetAt(index);
             }
             QString QBarSeriesPrivate::categoryName(int category)
             {
                 return m_internalModel->categoryName(category);
             }
             qreal QBarSeriesPrivate::min()
             {
                 return m_internalModel->min();
             }
             qreal QBarSeriesPrivate::max()
             {
                 return m_internalModel->max();
             }
             qreal QBarSeriesPrivate::valueAt(int set, int category)
             {
                 return m_internalModel->valueAt(set, category);
             }
             qreal QBarSeriesPrivate::percentageAt(int set, int category)
             {
                 return m_internalModel->percentageAt(set, category);
             }
             qreal QBarSeriesPrivate::categorySum(int category)
             {
                 return m_internalModel->categorySum(category);
             }
             qreal QBarSeriesPrivate::absoluteCategorySum(int category)
             {
                 return m_internalModel->absoluteCategorySum(category);
             }
             qreal QBarSeriesPrivate::maxCategorySum()
             {
                 return m_internalModel->maxCategorySum();
             }
             BarChartModel& QBarSeriesPrivate::modelInternal()
             {
                 return *m_internalModel;
             }
             bool QBarSeriesPrivate::setModel(QAbstractItemModel *model)
             {
                 // disconnect signals from old model
                 if(m_model)
                 {
                     disconnect(m_model, 0, this, 0);
                     m_mapCategories = -1;
                     m_mapBarBottom = -1;
                     m_mapBarTop = -1;
-                    m_mapFirst = 0;
-                    m_mapCount = 0;
                     m_mapOrientation = Qt::Vertical;
                 }
                 // set new model
                 if(model)
                 {
                     m_model = model;
                     return true;
                 }
                 else
                 {
                     m_model = 0;
                     return false;
                 }
             }
             void QBarSeriesPrivate::setModelMapping(int categories, int bottomBoundry, int topBoundry, Qt::Orientation orientation)
             {
                 Q_Q(QBarSeries);
                 if (m_model == 0)
                     return;
                 m_mapCategories = categories;
                 m_mapBarBottom = bottomBoundry;
                 m_mapBarTop = topBoundry;
-            //    m_mapFirst = 1;
                 m_mapOrientation = orientation;
                 // connect the signals
-                if (m_mapOrientation == Qt::Vertical) {
+                connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-                    m_mapCount = m_model->rowCount() - m_mapFirst;
+                        this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                    connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-                            this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                    connect(m_model,SIGNAL(rowsInserted(QModelIndex,int,int)),
-                            this, SLOT(modelDataAdded(QModelIndex,int,int)));
-                    connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
-                            this, SLOT(modelDataRemoved(QModelIndex,int,int)));
-                } else {
-                    m_mapCount = m_model->columnCount() - m_mapFirst;
-                    connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-                            this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                    connect(m_model,SIGNAL(columnsInserted(QModelIndex,int,int)),
-                            this, SLOT(modelDataAdded(QModelIndex,int,int)));
-                    connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
-                            this, SLOT(modelDataRemoved(QModelIndex,int,int)));
                 // create the initial bars
                 delete m_internalModel;
                 if (m_mapOrientation == Qt::Vertical) {
                     QStringList categories;
-                    for (int k = m_mapFirst; k < m_mapFirst + m_mapCount; k++)
+                    for (int k = 0; k < m_model->rowCount(); k++)
                         categories << m_model->data(m_model->index(k, m_mapCategories), Qt::DisplayRole).toString();
                     m_internalModel = new BarChartModel(categories, this);
                     for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
                         QBarSet* barSet = new QBarSet(QString("Column: %1").arg(i + 1));
-                        for(int m = m_mapFirst; m < m_mapFirst + m_mapCount; m++)
+                        for(int m = 0; m < m_model->rowCount(); m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
                         q->appendBarSet(barSet);
                     }
                 } else {
                     QStringList categories;
-                    for (int k = m_mapFirst; k < m_mapFirst + m_mapCount; k++)
+                    for (int k = 0; k < m_model->columnCount(); k++)
                         categories << m_model->data(m_model->index(m_mapCategories, k), Qt::DisplayRole).toString();
                     m_internalModel = new BarChartModel(categories, this);
                     for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
                         QBarSet* barSet = new QBarSet(QString("Row: %1").arg(i + 1));
-                        for(int m = m_mapFirst; m < m_mapFirst + m_mapCount; m++)
+                        for(int m = 0; m < m_model->columnCount(); m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
                         q->appendBarSet(barSet);
                     }
                 }
             }
             void QBarSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 Q_UNUSED(bottomRight)
                 if (m_mapOrientation == Qt::Vertical)
                 {
                     // model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
-                    if (topLeft.column() >= m_mapBarBottom && topLeft.column() <= m_mapBarTop && topLeft.row() >= m_mapFirst && topLeft.row() < m_mapFirst + m_mapCount)
+                    if (topLeft.column() >= m_mapBarBottom && topLeft.column() <= m_mapBarTop)
-                        barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row() - m_mapFirst, m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                        barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
                 }
                 else
                 {
                     // model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
-                    if (topLeft.row() >= m_mapBarBottom && topLeft.row() <= m_mapBarTop && topLeft.column() >= m_mapFirst && topLeft.column() < m_mapFirst + m_mapCount)
+                    if (topLeft.row() >= m_mapBarBottom && topLeft.row() <= m_mapBarTop)
-                        barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column() - m_mapFirst, m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                        barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
-            void QBarSeriesPrivate::modelDataAdded(QModelIndex /*parent*/, int start, int /*end*/)
-                Q_Q(QBarSeries);
-                if (m_mapOrientation == Qt::Vertical) {
-                    q->insertCategory(start - m_mapFirst, QString("Row: %1").arg(start + 1));
-                    for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++) {
-                        barsetAt(i)->insertValue(start - m_mapFirst, m_model->data(m_model->index(start, i), Qt::DisplayRole).toDouble());
-                } else {
-                    q->insertCategory(start - m_mapFirst, QString("Column: %1").arg(start + 1));
-                    for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++) {
-                        barsetAt(i)->insertValue(start - m_mapFirst, m_model->data(m_model->index(i, start), Qt::DisplayRole).toDouble());
-                emit restructuredBars();
-            void QBarSeriesPrivate::modelDataRemoved(QModelIndex parent, int start, int end)
-                Q_Q(QBarSeries);
-                Q_UNUSED(parent)
-                Q_UNUSED(end)
-                q->removeCategory(start - m_mapFirst);
-                for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
-                    barsetAt(i)->removeValue(start - m_mapFirst);
                 }
-                emit restructuredBars();
             }
             void QBarSeriesPrivate::barsetChanged()
             {
                 emit updatedBars();
             }
             void QBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 qreal x = m_internalModel->categoryCount();
                 qreal y = max();
                 minX = qMin(minX, x);
                 minY = qMin(minY, y);
                 maxX = qMax(maxX, x);
                 maxY = qMax(maxY, y);
                 tickXCount = x+1;
                 domain.setRangeX(minX,maxX,tickXCount);
                 domain.setRangeY(minY,maxY,tickYCount);
             }
             Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QBarSeries);
                 BarChartItem* bar = new BarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(bar);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return bar;
             }
             QList<LegendMarker*> QBarSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QBarSeries);
                 QList<LegendMarker*> markers;
                 foreach(QBarSet* set, q->barSets()) {
                     BarLegendMarker* marker = new BarLegendMarker(q,set,legend);
                     markers << marker;
                 }
                 return markers;
             }
             #include "moc_qbarseries.cpp"
             #include "moc_qbarseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef BARSERIES_H
             #define BARSERIES_H
             #include <qabstractseries.h>
             #include <QStringList>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             typedef QStringList QBarCategories;
             class QBarSet;
             class BarChartModel;
             class BarCategory;
             class QBarSeriesPrivate;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractSeries
             {
                 Q_OBJECT
             public:
                 explicit QBarSeries(QBarCategories categories, QObject *parent = 0);
                 virtual ~QBarSeries();
                 QAbstractSeries::QSeriesType type() const;
                 void appendBarSet(QBarSet *set);            // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 void appendBarSets(QList<QBarSet* > sets);
                 void removeBarSets(QList<QBarSet* > sets);
                 void insertBarSet(int i, QBarSet *set);
-                void insertCategory(int i, QString category);
-                void removeCategory(int i);
                 int barsetCount() const;
                 int categoryCount() const;
                 QList<QBarSet*> barSets() const;
                 QBarCategories categories() const;
                 void setLabelsVisible(bool visible = true);
                 bool setModel(QAbstractItemModel *model);
                 void setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical);
             protected:
                 explicit QBarSeries(QBarSeriesPrivate &d,QObject *parent = 0);
             Q_SIGNALS:
                 void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                 void selected();
                 void hovered(QBarSet* barset, bool status);
             protected:
                 Q_DECLARE_PRIVATE(QBarSeries)
                 friend class BarChartItem;
                 friend class PercentBarChartItem;
                 friend class StackedBarChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARSERIES_H

src/barchart/qbarseries_p.h 0 -4

             #ifndef QBARSERIES_P_H
             #define QBARSERIES_P_H
             #include "qbarseries.h"
             #include "qabstractseries_p.h"
             #include <QStringList>
             #include <QAbstractSeries>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Container for series
             class QBarSeriesPrivate : public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QBarSeriesPrivate(QBarCategories categories, QBarSeries *parent);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
                 bool setModel(QAbstractItemModel *model);
                 void setModelMapping(int categories, int bottomBoundry, int topBoundry, Qt::Orientation orientation = Qt::Vertical);
                 QBarSet* barsetAt(int index);
                 QString categoryName(int category);
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal percentageAt(int set, int category);
                 qreal categorySum(int category);
                 qreal absoluteCategorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& modelInternal();
             Q_SIGNALS:
                 void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                 void selected();
                 void updatedBars();
                 void restructuredBars();
             private Q_SLOTS:
                 // slots for updating bars when data in model changes
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
-                void modelDataAdded(QModelIndex parent, int start, int end);
-                void modelDataRemoved(QModelIndex parent, int start, int end);
                 void barsetChanged();
             protected:
                 BarChartModel *m_internalModel;     // TODO: this may change... current "2 models" situation doesn't look good.
                 QAbstractItemModel* m_model;
                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;
-                int m_mapFirst;
-                int m_mapCount;
                 Qt::Orientation m_mapOrientation;
             private:
                 Q_DECLARE_PUBLIC(QBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSERIESPRIVATE_P_H

src/splinechart/qsplineseries.cpp 0 -31

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qsplineseries.h"
             #include "qsplineseries_p.h"
             #include "splinechartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "chartanimator_p.h"
             /*!
                 \class QSplineSeries
                 \brief Series type used to store data needed to draw a spline.
                 QSplineSeries stores the data points along with the segment control points needed by QPainterPath to draw spline
                 Control points are automatically calculated when data changes. The algorithm computes the points so that the normal spline can be drawn.
             */
             /*!
               \fn QSeriesType QSplineSeries::type() const
               Returns the type of the series
               */
             /*!
               \fn QSeriesType QSplineSeries::controlPoint(int index) const
               Returns the control point specified by \a index
               */
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 Constructs empty series object which is a child of \a parent.
                 When series object is added to QChartView or QChart instance then the ownerships is transferred.
               */
             QSplineSeries::QSplineSeries(QObject *parent) :
                 QLineSeries(*new QSplineSeriesPrivate(this),parent)
             {
             }
             QAbstractSeries::QSeriesType QSplineSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeSpline;
             }
             QPointF QSplineSeries::controlPoint(int index) const
             {
                 Q_D(const QSplineSeries);
                 return d->m_controlPoints[index];
             }
-            void QSplineSeries::setModelMappingRange(int first, int count)
-                Q_D(QSplineSeries);
-                QLineSeries::setModelMappingRange(first, count);
-                d->calculateControlPoints();
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QSplineSeriesPrivate::QSplineSeriesPrivate(QSplineSeries* q):QLineSeriesPrivate(q)
             {
                 QObject::connect(this,SIGNAL(pointAdded(int)), this, SLOT(updateControlPoints()));
                 QObject::connect(this,SIGNAL(pointRemoved(int)), this, SLOT(updateControlPoints()));
                 QObject::connect(this,SIGNAL(pointReplaced(int)), this, SLOT(updateControlPoints()));
             };
             /*!
               \internal
               Calculates control points which are needed by QPainterPath.cubicTo function to draw the cubic Bezier cureve between two points.
               */
             void QSplineSeriesPrivate::calculateControlPoints()
             {
                 Q_Q(QSplineSeries);
                 // Based on http://www.codeproject.com/Articles/31859/Draw-a-Smooth-Curve-through-a-Set-of-2D-Points-wit
                 // CPOL License
                 int n = q->count() - 1;
                 if (n == 1)
                 { // Special case: Bezier curve should be a straight line.
                     //            firstControlPoints = new Point[1];
                     // 3P1 = 2P0 + P3
                     m_controlPoints.append(QPointF((2 * q->x(0) + q->x(1)) / 3, (2 * q->y(0) + q->y(1)) / 3));
                     // P2 = 2P1  P0
                     m_controlPoints.append(QPointF(2 * m_controlPoints[0].x() - q->x(0), 2 * m_controlPoints[0].y() - q->y(0)));
                     return;
                 }
                 // Calculate first Bezier control points
                 // Right hand side vector
                 //  Set of equations for P0 to Pn points.
                 //
                 //  |   2   1   0   0   ... 0   0   0   ... 0   0   0   |   |   P1_1    |   |   P0 + 2 * P1             |
                 //  |   1   4   1   0   ... 0   0   0   ... 0   0   0   |   |   P1_2    |   |   4 * P1 + 2 * P2         |
                 //  |   0   1   4   1   ... 0   0   0   ... 0   0   0   |   |   P1_3    |   |   4 * P2 + 2 * P3         |
                 //  |   .   .   .   .   .   .   .   .   .   .   .   .   |   |   ...     |   |   ...                     |
                 //  |   0   0   0   0   ... 1   4   1   ... 0   0   0   | * |   P1_i    | = |   4 * P(i-1) + 2 * Pi     |
                 //  |   .   .   .   .   .   .   .   .   .   .   .   .   |   |   ...     |   |   ...                     |
                 //  |   0   0   0   0   0   0   0   0   ... 1   4   1   |   |   P1_(n-1)|   |   4 * P(n-2) + 2 * P(n-1) |
                 //  |   0   0   0   0   0   0   0   0   ... 0   2   7   |   |   P1_n    |   |   8 * P(n-1) + Pn         |
                 //
                 QList<qreal> rhs;
                 rhs.append(q->x(0) + 2 * q->x(1));
                 // Set right hand side X values
                 for (int i = 1; i < n - 1; ++i)
                     rhs.append(4 * q->x(i) + 2 * q->x(i + 1));
                 rhs.append((8 * q->x(n - 1) + q->x(n)) / 2.0);
                 // Get first control points X-values
                 QList<qreal> xControl = getFirstControlPoints(rhs);
                 rhs[0] = q->y(0) + 2 * q->y(1);
                 // Set right hand side Y values
                 for (int i = 1; i < n - 1; ++i)
                     rhs[i] = 4 * q->y(i) + 2 * q->y(i + 1);
                 rhs[n - 1] = (8 * q->y(n - 1) + q->y(n)) / 2.0;
                 // Get first control points Y-values
                 QList<qreal> yControl = getFirstControlPoints(rhs);
                 // Fill output arrays.
                 for (int i = 0; i < n; ++i) {
                     // First control point
                     m_controlPoints.append(QPointF(xControl[i], yControl[i]));
                     // Second control point
                     if (i < n - 1)
                         m_controlPoints.append(QPointF(2 * q->x(i + 1) - xControl[i + 1], 2 * q->y(i + 1) - yControl[i + 1]));
                     else
                         m_controlPoints.append(QPointF((q->x(n) + xControl[n - 1]) / 2, (q->y(n) + yControl[n - 1]) / 2));
                 }
             }
             /*!
               \internal
               */
             QList<qreal> QSplineSeriesPrivate::getFirstControlPoints(QList<qreal> rhs)
             {
                 QList<qreal> x; // Solution vector.
                 QList<qreal> tmp; // Temp workspace.
                 qreal b = 2.0;
                 x.append(rhs[0] / b);
                 tmp.append(0);
                 for (int i = 1; i < rhs.size(); i++) {
                     // Decomposition and forward substitution.
                     tmp.append(1 / b);
                     b = (i < rhs.size() - 1 ? 4.0 : 3.5) - tmp[i];
                     x.append((rhs[i] - x[i - 1]) / b);
                 }
                 for (int i = 1; i < rhs.size(); i++)
                     x[rhs.size() - i - 1] -= tmp[rhs.size() - i] * x[rhs.size() - i]; // Backsubstitution.
                 return x;
             }
             /*!
               \internal
               Updates the control points, besed on currently avaiable knots.
               */
             void QSplineSeriesPrivate::updateControlPoints()
             {
                 Q_Q(QSplineSeries);
                 if (q->count() > 1) {
                     m_controlPoints.clear();
                     calculateControlPoints();
                 }
             }
-            /*//!
-                 \fn bool QSplineSeries::setModel(QAbstractItemModel *model)
-                 Sets the \a model to be used as a data source
-                 \sa setModelMapping(), setModelMappingRange()
-             */
-            //bool QSplineSeries::setModel(QAbstractItemModel* model)
-            //{
-            //    QXYSeries::setModel(model);
-            ////    calculateControlPoints();
-            //    return true;
-            //}
-            /*//!
-                 \fn bool QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
-                 Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
-                 as a data source for y coordinate. The \a orientation parameter specifies whether the data
-                 is in columns or in rows.
-             */
-            //void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
-            //{
-            //    QLineSeries::setModelMapping(modelX, modelY, orientation);
-            ////    calculateControlPoints();
-            //}
             /*!
                  \fn bool QSplineSeries::setModelMappingRange(int first, int count)
                  Allows limiting the model mapping.
                  Parameter \a first specifies which element of the model should be used as a first one of the series.
                  Parameter \a count specifies how many elements should be mapped. If count is not specified (defaults to -1)
                  then all the items following \a first item in a model are used.
                  \sa setModel(), setModelMapping()
              */
             Chart* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QSplineSeries);
                 SplineChartItem* spline  = new SplineChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
                     presenter->animator()->addAnimation(spline);
                 }
                 presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
                 return spline;
             }
             #include "moc_qsplineseries.cpp"
             #include "moc_qsplineseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/qsplineseries.h 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QSPLINESERIES_H
             #define QSPLINESERIES_H
             #include <qchartglobal.h>
             #include <qlineseries.h>
             #include <QList>
             #include <QPointF>
             #include <QtGlobal>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QSplineSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QSplineSeries : public QLineSeries
             {
                 Q_OBJECT
             public:
                 explicit QSplineSeries(QObject *parent = 0);
                 QAbstractSeries::QSeriesType type() const;
                 QPointF controlPoint(int index) const;
-                void setModelMappingRange(int first, int count);
             private:
                 Q_DECLARE_PRIVATE(QSplineSeries);
                 Q_DISABLE_COPY(QSplineSeries);
                 friend class SplineChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QSPLINESERIES_H

src/xychart/qxyseries.cpp +14 -219

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "domain_p.h"
             #include "legendmarker_p.h"
             #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QXYSeries
                 \brief The QXYSeries class is a base class for line, spline and scatter series.
             */
             /*!
                \fn QPen QXYSeries::pen() const
                \brief  Returns pen used to draw points for series.
                 \sa setPen()
             */
             /*!
                \fn QBrush QXYSeries::brush() const
                \brief  Returns brush used to draw points for series.
                 \sa setBrush()
             */
             /*!
                 \fn void QXYSeries::clicked(const QPointF& point)
                 \brief Signal is emitted when user clicks the \a point on chart.
             */
             /*!
                 \fn void QXYSeries::selected()
                 The signal is emitted if the user selects/deselects the XY series. The logic for maintaining selections should be
                 implemented by the user of QXYSeries API.
             */
             /*!
                 \fn void QXYSeriesPrivate::pointReplaced(int index)
                 \brief \internal \a index
             */
             /*!
                 \fn void QXYSeriesPrivate::pointAdded(int index)
                 \brief \internal \a index
             */
             /*!
                 \fn void QXYSeriesPrivate::pointRemoved(int index)
                 \brief \internal \a index
             */
             /*!
                 \fn void QXYSeriesPrivate::updated()
                 \brief \internal
             */
             /*!
-                \fn int QXYSeries::mapFirst() const
-                Returns the index of the model's item that is used as a first one for the series.
-                \sa mapCount()
-            */
-            /*!
-                \fn int QXYSeries::mapCount() const
-                Returns the number of the items that are taken from the model.
-                If -1 it means all the items of the model following the first one are used.
-                \sa mapFirst()
-            */
-            /*!
                 \internal
                 Constructs empty series object which is a child of \a parent.
                 When series object is added to QChartView or QChart instance ownerships is transferred.
             */
             QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent) : QAbstractSeries(d, parent)
             {
             }
             /*!
                 Destroys the object. Series added to QChartView or QChart instances are owned by those,
                 and are deleted when mentioned object are destroyed.
             */
             QXYSeries::~QXYSeries()
             {
             }
             /*!
                 Adds data point \a x \a y to the series. Points are connected with lines on the chart.
              */
             void QXYSeries::append(qreal x,qreal y)
             {
                 Q_D(QXYSeries);
                 Q_ASSERT(d->m_x.size() == d->m_y.size());
                 d->m_x<<x;
                 d->m_y<<y;
                 emit d->pointAdded(d->m_x.size()-1);
             }
             /*!
                This is an overloaded function.
                Adds data \a point to the series. Points are connected with lines on the chart.
              */
             void QXYSeries::append(const QPointF &point)
             {
                 append(point.x(),point.y());
             }
             /*!
                This is an overloaded function.
                Adds list of data \a points to the series. Points are connected with lines on the chart.
              */
             void QXYSeries::append(const QList<QPointF> points)
             {
                 foreach(const QPointF& point , points) {
                     append(point.x(),point.y());
                 }
             }
             /*!
               Modifies \a y value for given \a x a value.
             */
             void QXYSeries::replace(qreal x,qreal y)
             {
                 Q_D(QXYSeries);
                 int index = d->m_x.indexOf(x);
                 d->m_x[index] = x;
                 d->m_y[index] = y;
                 emit d->pointReplaced(index);
             }
             /*!
               This is an overloaded function.
               Replaces current y value of for given \a point x value with \a point y value.
             */
             void QXYSeries::replace(const QPointF &point)
             {
                 replace(point.x(),point.y());
             }
             /*!
               Removes first \a x value and related y value.
             */
             void QXYSeries::remove(qreal x)
             {
                 Q_D(QXYSeries);
                 int index = d->m_x.indexOf(x);
                 if (index == -1) return;
                 d->m_x.remove(index);
                 d->m_y.remove(index);
                 emit d->pointRemoved(index);
             }
             /*!
               Removes current \a x and \a y value.
             */
             void QXYSeries::remove(qreal x,qreal y)
             {
                 Q_D(QXYSeries);
                 int index =-1;
                 do {
                     index = d->m_x.indexOf(x,index+1);
                 } while (index !=-1 && d->m_y.at(index)!=y);
                 if (index==-1) return;
                 d->m_x.remove(index);
                 d->m_y.remove(index);
                 emit d->pointRemoved(index);
             }
             /*!
               Removes current \a point x value. Note \a point y value is ignored.
             */
             void QXYSeries::remove(const QPointF &point)
             {
                 remove(point.x(),point.y());
             }
             /*!
                Removes all data points from the series.
             */
             void QXYSeries::removeAll()
             {
                 Q_D(QXYSeries);
                 d->m_x.clear();
                 d->m_y.clear();
             }
             /*!
                 \internal \a pos
             */
             qreal QXYSeries::x(int pos) const
             {
                 Q_D(const QXYSeries);
                 if (d->m_model) {
                     if (d->m_mapOrientation == Qt::Vertical)
                         // consecutive data is read from model's column
-                        return d->m_model->data(d->m_model->index(pos + d->m_mapFirst, d->m_mapX), Qt::DisplayRole).toDouble();
+                        return d->m_model->data(d->m_model->index(pos, d->m_mapX), Qt::DisplayRole).toDouble();
                     else
                         // consecutive data is read from model's row
-                        return d->m_model->data(d->m_model->index(d->m_mapX, pos + d->m_mapFirst), Qt::DisplayRole).toDouble();
+                        return d->m_model->data(d->m_model->index(d->m_mapX, pos), Qt::DisplayRole).toDouble();
                 } else {
                     // model is not specified, return the data from series' internal data store
                     return d->m_x.at(pos);
                 }
             }
             /*!
                 \internal \a pos
             */
             qreal QXYSeries::y(int pos) const
             {
                 Q_D(const QXYSeries);
                 if (d->m_model) {
                     if (d->m_mapOrientation == Qt::Vertical)
                         // consecutive data is read from model's column
-                        return d->m_model->data(d->m_model->index(pos + d->m_mapFirst, d->m_mapY), Qt::DisplayRole).toDouble();
+                        return d->m_model->data(d->m_model->index(pos, d->m_mapY), Qt::DisplayRole).toDouble();
                     else
                         // consecutive data is read from model's row
-                        return d->m_model->data(d->m_model->index(d->m_mapY, pos + d->m_mapFirst), Qt::DisplayRole).toDouble();
+                        return d->m_model->data(d->m_model->index(d->m_mapY, pos), Qt::DisplayRole).toDouble();
                 } else {
                     // model is not specified, return the data from series' internal data store
                     return d->m_y.at(pos);
                 }
             }
             /*!
                 Returns number of data points within series.
             */
             int QXYSeries::count() const
             {
                 Q_D(const QXYSeries);
                 Q_ASSERT(d->m_x.size() == d->m_y.size());
                 if (d->m_model) {
                     if (d->m_mapOrientation == Qt::Vertical) {
-                        // data is in a column. Return the number of mapped items if the model's column have enough items
+                        // data is in a column. Return the number of mapped items
-                        // or the number of items that can be mapped
+                        return d->m_model->rowCount();
-                        if (d->m_mapLimited)
-                            return qMin(d->m_mapCount, qMax(d->m_model->rowCount() - d->m_mapFirst, 0));
-                        else
-                            return qMax(d->m_model->rowCount() - d->m_mapFirst, 0);
                     } else {
-                        // data is in a row. Return the number of mapped items if the model's row have enough items
+                        // data is in a row. Return the number of mapped items
-                        // or the number of items that can be mapped
+                        return d->m_model->columnCount();
-                        if (d->m_mapLimited)
-                            return qMin(d->m_mapCount, qMax(d->m_model->columnCount() - d->m_mapFirst, 0));
-                        else
-                            return qMax(d->m_model->columnCount() - d->m_mapFirst, 0);
                     }
                 }
                 // model is not specified, return the number of points in the series internal data store
                 return d->m_x.size();
             }
             /*!
                 Returns the data points of the series.
             */
             QList<QPointF> QXYSeries::data()
             {
                 Q_D(QXYSeries);
                 QList<QPointF> data;
                 for (int i(0); i < d->m_x.count() && i < d->m_y.count(); i++)
                     data.append(QPointF(d->m_x.at(i), d->m_y.at(i)));
                 return data;
             }
             /*!
                 Sets \a pen used for drawing points on the chart. If the pen is not defined, the
                 pen from chart theme is used.
                 \sa QChart::setTheme()
             */
             void QXYSeries::setPen(const QPen &pen)
             {
                 Q_D(QXYSeries);
                 if (d->m_pen!=pen) {
                     d->m_pen = pen;
                     emit d->updated();
                 }
             }
             QPen QXYSeries::pen() const
             {
                 Q_D(const QXYSeries);
                 return d->m_pen;
             }
             /*!
                 Sets \a brush used for drawing points on the chart. If the brush is not defined, brush
                 from chart theme setting is used.
                 \sa QChart::setTheme()
             */
             void QXYSeries::setBrush(const QBrush &brush)
             {
                 Q_D(QXYSeries);
                 if (d->m_brush!=brush) {
                     d->m_brush = brush;
                     emit d->updated();
                 }
             }
             QBrush QXYSeries::brush() const
             {
                 Q_D(const QXYSeries);
                 return d->m_brush;
             }
             /*!
                 Sets if data points are \a visible and should be drawn on line.
             */
             void QXYSeries::setPointsVisible(bool visible)
             {
                 Q_D(QXYSeries);
                 if (d->m_pointsVisible != visible){
                     d->m_pointsVisible = visible;
                     emit d->updated();
                 }
             }
             /*!
                 Returns true if drawing the data points of the series is enabled.
             */
             bool QXYSeries::pointsVisible() const
             {
                 Q_D(const QXYSeries);
                 return d->m_pointsVisible;
             }
             /*!
                 Stream operator for adding a data \a point to the series.
                 \sa append()
             */
             QXYSeries& QXYSeries::operator<< (const QPointF &point)
             {
                 append(point);
                 return *this;
             }
             /*!
                 Stream operator for adding a list of \a points to the series.
                 \sa append()
             */
             QXYSeries& QXYSeries::operator<< (const QList<QPointF> points)
             {
                 append(points);
                 return *this;
             }
             /*!
                \internal
              */
             void QXYSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 Q_UNUSED(bottomRight)
                 Q_D(QXYSeries);
                 if (d->m_mapOrientation == Qt::Vertical) {
-                    if (topLeft.row() >= d->m_mapFirst && (!d->m_mapLimited || topLeft.row() < d->m_mapFirst + d->m_mapCount))
+                    if (topLeft.column() == d->m_mapX || topLeft.column() == d->m_mapY)
-                        emit d->pointReplaced(topLeft.row() - d->m_mapFirst);
+                        emit d->pointReplaced(topLeft.row());
-                } else {
-                    if (topLeft.column() >= d->m_mapFirst && (!d->m_mapLimited || topLeft.column() < d->m_mapFirst + d->m_mapCount))
-                        emit d->pointReplaced(topLeft.column() - d->m_mapFirst);
-            /*!
-               \internal
-             */
-            void QXYSeries::modelDataAboutToBeAdded(QModelIndex parent, int start, int end)
-                Q_UNUSED(parent)
-                //    Q_UNUSED(end)
-                Q_D(QXYSeries);
-                if (d->m_mapLimited) {
-                    if (start >= d->m_mapFirst + d->m_mapCount) {
-                        // the added data is below mapped area
-                        // therefore it has no relevance
-                        return;
-                    } else {
-                        // the added data is in the mapped area or before it and update is needed
-                        // check how many mapped items there is currently (before new items are added)
-                        // if the number of items currently is equal the m_mapCount then some needs to be removed from xychartitem
-                        // internal storage before new ones can be added
-                        int itemsToRemove = qMin(count() - qMax(start - d->m_mapFirst, 0), end - start + 1);
-                        if (d->m_mapCount == count()) {
-                            for (int i = 0; i < itemsToRemove; i++)
-                                emit d->pointRemoved(qMin(end, count()) - i);
-                } else {
-                    // map is not limited (it includes all the items starting from m_mapFirst till the end of model)
-                    // nothing to do
-                    //        emit pointAdded(qMax(start - m_mapFirst, 0));
-            /*!
-               \internal
-             */
-            void QXYSeries::modelDataAdded(QModelIndex parent, int start, int end)
-                Q_UNUSED(parent)
-                //    Q_UNUSED(end)
-                Q_D(QXYSeries);
-                if (d->m_mapLimited) {
-                    if (start >= d->m_mapFirst + d->m_mapCount) {
-                        // the added data is below mapped area
-                        // therefore it has no relevance
-                        return;
-                    } else {
-                        // the added data is in the mapped area or before it
-                        // update needed
-                        if (count() > 0) {
-                            int toBeAdded = qMin(d->m_mapCount - (start - d->m_mapFirst), end - start + 1);
-                            for (int i = 0; i < toBeAdded; i++)
-                                if (start + i >= d->m_mapFirst)
-                                    emit d->pointAdded(start + i);
-                } else {
-                    // map is not limited (it included all the items starting from m_mapFirst till the end of model)
-                    for (int i = 0; i < end - start + 1; i++)
-                        emit d->pointAdded(start + i);
-            /*!
-               \internal
-             */
-            void QXYSeries::modelDataAboutToBeRemoved(QModelIndex parent, int start, int end)
-                Q_UNUSED(parent)
-                //    Q_UNUSED(end)
-                Q_D(QXYSeries);
-                if (d->m_mapLimited) {
-                    if (start >= d->m_mapFirst + d->m_mapCount) {
-                        // the removed data is below mapped area
-                        // therefore it has no relevance
-                        return;
-                    } else {
-                        // the removed data is in the mapped area or before it
-                        // update needed
-                        // check how many items need to be removed from the xychartitem storage
-                        // the number equals the number of items that are removed and that lay before
-                        // or in the mapped area. Items that lay beyond the map do not count
-                        // the max is the current number of items in storage (count())
-                        int itemsToRemove = qMin(count(), qMin(end, d->m_mapFirst + d->m_mapCount - 1) - start + 1);
-                        for (int i = 0; i < itemsToRemove; i++)
-                            emit d->pointRemoved(start);
-                } else {
-                    // map is not limited (it included all the items starting from m_mapFirst till the end of model)
-                    for (int i = 0; i < end - start + 1; i++)
-                        emit d->pointRemoved(start);
-            /*!
-               \internal
-             */
-            void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
-                Q_UNUSED(parent)
-                Q_UNUSED(end)
-                Q_D(QXYSeries);
-                // how many items there were before data was removed
-                //    int oldCount = count() - 1;
-                if (d->m_mapLimited) {
-                    if (start >= d->m_mapFirst + d->m_mapCount) {
-                        // the removed data is below mapped area
-                        // therefore it has no relevance
-                        return;
-                    } else {
-                        // if the current items count in the whole model is bigger than the index of the last item
-                        // that was removed than it means there are some extra items available
-                        int removedItemsCount = qMin(count(), qMin(end, d->m_mapFirst + d->m_mapCount - 1) - start + 1);
-                        int extraItemsAvailable = 0;
-                        if (d->m_mapOrientation == Qt::Vertical) {
-                            extraItemsAvailable = qMax(d->m_model->rowCount() + (end - start + 1) - qMax(end + 1, d->m_mapFirst + d->m_mapCount), 0);
-                        } else {
-                            extraItemsAvailable = qMax(d->m_model->columnCount() + (end - start + 1) - qMax(end + 1, d->m_mapFirst + d->m_mapCount), 0);
-                        // if there are excess items available (below the mapped area) use them to repopulate mapped area
-                        int toBeAdded = qMin(extraItemsAvailable, removedItemsCount);
-                        for (int k = 0; k < toBeAdded; k++)
-                            emit d->pointAdded(d->m_mapFirst + d->m_mapCount - removedItemsCount + k);
                 } else {
-                    // data was removed from XYSeries interal storage. Nothing more to do
+                    if (topLeft.row() == d->m_mapX || topLeft.row() == d->m_mapY)
+                        emit d->pointReplaced(topLeft.column());
                 }
             }
             /*!
                  \fn bool QXYSeries::setModel(QAbstractItemModel *model)
                  Sets the \a model to be used as a data source
                  \sa setModelMapping(), setModelMappingRange()
              */
             bool QXYSeries::setModel(QAbstractItemModel *model)
             {
                 Q_D(QXYSeries);
                 // disconnect signals from old model
                 if (d->m_model) {
                     QObject::disconnect(d->m_model, 0, this, 0);
                     d->m_mapX = -1;
                     d->m_mapY = -1;
-                    d->m_mapFirst = 0;
-                    d->m_mapCount = 0;
-                    d->m_mapLimited = false;
                     d->m_mapOrientation = Qt::Vertical;
                 }
                 // set new model
                 if (model) {
                     d->m_model = model;
                     return true;
                 } else {
                     d->m_model = 0;
                     return false;
                 }
             }
             /*!
                  \fn bool QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
                  Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
                  as a data source for y coordinate. The \a orientation parameter specifies whether the data
                  is in columns or in rows.
                  \sa setModel(), setModelMappingRange()
              */
             void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
             {
                 Q_D(QXYSeries);
                 if (d->m_model == 0)
                     return;
                 d->m_mapX = modelX;
                 d->m_mapY = modelY;
-                d->m_mapFirst = 0;
                 d->m_mapOrientation = orientation;
-                if (d->m_mapOrientation == Qt::Vertical) {
+                connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                    connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                    connect(d->m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
-                    connect(d->m_model,SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
-                    connect(d->m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
-                    connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
-                } else {
-                    connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
-                    connect(d->m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
-                    connect(d->m_model,SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
-                    connect(d->m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
-                    connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
-            /*!
-                 \fn bool QXYSeries::setModelMappingRange(int first, int count)
-                 Allows limiting the model mapping.
-                 Parameter \a first specifies which element of the model should be used as a first one of the series.
-                 Parameter \a count specifies how many elements should be mapped. If count is not specified (defaults to -1)
-                 then all the items following \a first item in a model are used.
-                 \sa setModel(), setModelMapping()
-             */
-            void QXYSeries::setModelMappingRange(int first, int count)
-                Q_D(QXYSeries);
-                d->m_mapFirst = first;
-                if (count == 0) {
-                    d->m_mapLimited = false;
-                } else {
-                    d->m_mapCount = count;
-                    d->m_mapLimited = true;
-            int QXYSeries::mapFirst() const
-                Q_D(const QXYSeries);
-                return d->m_mapFirst;
-            int QXYSeries::mapCount() const
-                Q_D(const QXYSeries);
-                return d->m_mapCount;
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) : QAbstractSeriesPrivate(q),
                 m_mapX(-1),
                 m_mapY(-1),
-                m_mapFirst(0),
-                m_mapCount(0),
-                m_mapLimited(false),
                 m_mapOrientation( Qt::Vertical),
                 m_pointsVisible(false)
             {
             }
             void QXYSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
                 qreal maxX(domain.maxX());
                 qreal maxY(domain.maxY());
                 int tickXCount(domain.tickXCount());
                 int tickYCount(domain.tickYCount());
                 Q_Q(QXYSeries);
                 for (int i = 0; i < q->count(); i++)
                 {
                     qreal x = q->x(i);
                     qreal y = q->y(i);
                     minX = qMin(minX, x);
                     minY = qMin(minY, y);
                     maxX = qMax(maxX, x);
                     maxY = qMax(maxY, y);
                 }
                 domain.setRangeX(minX,maxX,tickXCount);
                 domain.setRangeY(minY,maxY,tickYCount);
             }
             QList<LegendMarker*> QXYSeriesPrivate::createLegendMarker(QLegend* legend)
             {
                 Q_Q(QXYSeries);
                 QList<LegendMarker*> list;
                 return list << new XYLegendMarker(q,legend);
             }
             #include "moc_qxyseries.cpp"
             #include "moc_qxyseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxyseries.h 0 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QXYSERIES_H
             #define QXYSERIES_H
             #include <qchartglobal.h>
             #include <qabstractseries.h>
             #include <QPen>
             #include <QBrush>
             class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYSeriesPrivate;
             class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries
             {
                 Q_OBJECT
             protected:
                 explicit QXYSeries(QXYSeriesPrivate &d,QObject *parent = 0);
                 ~QXYSeries();
             public:
                 void append(qreal x, qreal y);
                 void append(const QPointF &point);
                 void append(const QList<QPointF> points);
                 void replace(qreal x,qreal y);
                 void replace(const QPointF &point);
                 void remove(qreal x);
                 void remove(qreal x, qreal y);
                 void remove(const QPointF &point);
                 void removeAll();
                 int count() const;
                 qreal x(int pos) const;
                 qreal y(int pos) const;
                 QList<QPointF> data();
                 QXYSeries& operator << (const QPointF &point);
                 QXYSeries& operator << (const QList<QPointF> points);
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setPointsVisible(bool visible = true);
                 bool pointsVisible() const;
                 bool setModel(QAbstractItemModel *model);
                 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
-                virtual void setModelMappingRange(int first, int count = 0);
-                int mapFirst() const;
-                int mapCount() const;
             private Q_SLOTS:
                 void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
-                void modelDataAboutToBeAdded(QModelIndex parent, int start, int end);
-                void modelDataAdded(QModelIndex parent, int start, int end);
-                void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end);
-                void modelDataRemoved(QModelIndex parent, int start, int end);
             Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void selected();
             private:
                 Q_DECLARE_PRIVATE(QXYSeries);
                 Q_DISABLE_COPY(QXYSeries);
                 friend class XYLegendMarker;
                 friend class XYChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/xychart/qxyseries_p.h 0 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef QXYSERIES_P_H
             #define QXYSERIES_P_H
             #include "qabstractseries_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYSeries;
             class QXYSeriesPrivate: public QAbstractSeriesPrivate
             {
                 Q_OBJECT
             public:
                 QXYSeriesPrivate(QXYSeries* q);
                 void scaleDomain(Domain& domain);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
             Q_SIGNALS:
                 void updated();
                 void pointReplaced(int index);
                 void pointRemoved(int index);
                 void pointAdded(int index);
             protected:
                 QVector<qreal> m_x;
                 QVector<qreal> m_y;
                 QPen m_pen;
                 QBrush m_brush;
                 int m_mapX;
                 int m_mapY;
-                int m_mapFirst;
-                int m_mapCount;
-                bool m_mapLimited;
                 Qt::Orientation m_mapOrientation;
-                int tempItemsRemoved;
                 bool m_pointsVisible;
             private:
                 Q_DECLARE_PUBLIC(QXYSeries);
                 friend class QScatterSeries;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/xychart/xychartitem.cpp +9 -33

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "xychartitem_p.h"
             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
             #include <QGraphicsSceneMouseEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             //TODO: optimize : remove points which are not visible
             XYChartItem::XYChartItem(QXYSeries *series, ChartPresenter *presenter):ChartItem(presenter),
                 m_minX(0),
                 m_maxX(0),
                 m_minY(0),
                 m_maxY(0),
                 m_series(series)
             {
                 connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
                 connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
                 connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
                 connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));
             }
             QPointF XYChartItem::calculateGeometryPoint(const QPointF &point) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 qreal x = (point.x() - m_minX)* deltaX;
                 qreal y = (point.y() - m_minY)*-deltaY + m_size.height();
                 return QPointF(x,y);
             }
             QPointF XYChartItem::calculateGeometryPoint(int index) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 qreal x = (m_series->x(index) - m_minX)* deltaX;
                 qreal y = (m_series->y(index) - m_minY)*-deltaY + m_size.height();
                 return QPointF(x,y);
             }
             QVector<QPointF> XYChartItem::calculateGeometryPoints() const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 QVector<QPointF> points;
                 points.reserve(m_series->count());
                 for (int i = 0; i < m_series->count(); ++i) {
                     qreal x = (m_series->x(i) - m_minX)* deltaX;
                     qreal y = (m_series->y(i) - m_minY)*-deltaY + m_size.height();
                     points << QPointF(x,y);
                 }
                 return points;
             }
             QPointF XYChartItem::calculateDomainPoint(const QPointF &point) const
             {
                 const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                 const qreal deltaY = m_size.height()/(m_maxY-m_minY);
                 qreal x = point.x()/deltaX +m_minX;
                 qreal y = (point.y()-m_size.height())/(-deltaY)+ m_minY;
                 return QPointF(x,y);
             }
             void XYChartItem::updateLayout(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)
             {
                 if (animator()) {
                     animator()->updateLayout(this,oldPoints,newPoints,index);
                 } else {
                     setLayout(newPoints);
                 }
             }
             void XYChartItem::setLayout(QVector<QPointF> &points)
             {
                 m_points = points;
                 update();
             }
             //handlers
             void XYChartItem::handlePointAdded(int index)
             {
                 QVector<QPointF> points = m_points;
                 QPointF point;
-                if (m_series->model()) {
+                Q_ASSERT(index<m_series->count());
-                    point = calculateGeometryPoint(index - m_series->mapFirst());
+                Q_ASSERT(index>=0);
-                    if (index < m_series->mapFirst()) {
+                point = calculateGeometryPoint(index);
-                        points.insert(0, point);
+                points.insert(index, point);
-                        updateLayout(m_points, points, 0);
+                updateLayout(m_points, points, index);
-                    else {
-                        points.insert(index - m_series->mapFirst(), point);
-                        updateLayout(m_points, points, index - m_series->mapFirst());
-                else {
-                    // this checks do not work correctly if model is set
-                    Q_ASSERT(index<m_series->count());
-                    Q_ASSERT(index>=0);
-                    point = calculateGeometryPoint(index);
-                    points.insert(index, point);
-                    updateLayout(m_points, points, index);
                 update();
             }
             void XYChartItem::handlePointRemoved(int index)
             {
                 QVector<QPointF> points = m_points;
-                if (m_series->model()) {
+                Q_ASSERT(index<m_series->count() + 1);
-                    if (index < m_series->mapFirst())
+                Q_ASSERT(index>=0);
-                        points.remove(0);
+                points.remove(index);
-                    else
+                updateLayout(m_points, points, index);
-                        points.remove(index - m_series->mapFirst());
-                    updateLayout(m_points, points, index - m_series->mapFirst());
-                else {
-                    // this checks do not work correctly if model is set
-                    Q_ASSERT(index<m_series->count() + 1);
-                    Q_ASSERT(index>=0);
-                    points.remove(index);
-                    updateLayout(m_points, points, index);
                 update();
             }
             void XYChartItem::handlePointReplaced(int index)
             {
                 Q_ASSERT(index<m_series->count());
                 Q_ASSERT(index>=0);
                 QPointF point = calculateGeometryPoint(index);
                 QVector<QPointF> points = m_points;
                 points.replace(index,point);
                 updateLayout(m_points,points,index);
                 update();
             }
             void XYChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 m_minX=minX;
                 m_maxX=maxX;
                 m_minY=minY;
                 m_maxY=maxY;
                 if (isEmpty()) return;
                 QVector<QPointF> points = calculateGeometryPoints();
                 updateLayout(m_points,points);
                 update();
             }
             void XYChartItem::handleGeometryChanged(const QRectF &rect)
             {
                 Q_ASSERT(rect.isValid());
                 m_size=rect.size();
                 m_clipRect=rect.translated(-rect.topLeft());
                 setPos(rect.topLeft());
                 if (isEmpty()) return;
                 QVector<QPointF> points = calculateGeometryPoints();
                 updateLayout(m_points,points);
                 update();
             }
             bool XYChartItem::isEmpty()
             {
                 return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY);
             }
             void XYChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
                 emit clicked(calculateDomainPoint(event->pos()));
             }
             #include "moc_xychartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

test/tablemodelchart/tablewidget.cpp +8 -8

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "tablewidget.h"
             #include <QGridLayout>
             #include <QTableView>
             #include <QStyledItemDelegate>
             #include <QLineSeries>
             #include <QSplineSeries>
             #include <QScatterSeries>
             #include "customtablemodel.h"
             #include <QPieSeries>
             #include <QPieSlice>
             #include <QAreaSeries>
             #include <QBarSeries>
             #include <QBarSet>
             #include <QPushButton>
             #include <QRadioButton>
             #include <QLabel>
             #include <QSpinBox>
             #include <QTime>
             TableWidget::TableWidget(QWidget *parent)
                 : QWidget(parent)
             {
                 setGeometry(100, 100, 1000, 600);
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 // create simple model for storing data
                 // user's table data model
                 m_model = new CustomTableModel;
                 m_tableView = new QTableView;
                 m_tableView->setModel(m_model);
                 m_tableView->setMinimumHeight(300);
                 //    tableView->setMinimumSize(340, 480);
                 //    tableView->setItemDelegate(new QStyledItemDelegate);
                 m_chart = new QChart;
                 m_chartView = new QChartView(m_chart);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
                 m_chartView->setMinimumSize(640, 480);
                 // add, remove data buttons
                 QPushButton* addRowAboveButton = new QPushButton("Add row above");
                 connect(addRowAboveButton, SIGNAL(clicked()), this, SLOT(addRowAbove()));
                 QPushButton* addRowBelowButton = new QPushButton("Add row below");
                 connect(addRowBelowButton, SIGNAL(clicked()), this, SLOT(addRowBelow()));
                 QPushButton* removeRowButton = new QPushButton("Remove row");
                 connect(removeRowButton, SIGNAL(clicked()), this, SLOT(removeRow()));
                 QLabel *spinBoxLabel = new QLabel("Rows affected:");
                 // spin box for setting number of affected items (add, remove)
                 m_linesCountSpinBox = new QSpinBox;
                 m_linesCountSpinBox->setRange(1, 10);
                 m_linesCountSpinBox->setValue(1);
                 // buttons layout
                 QVBoxLayout* buttonsLayout = new QVBoxLayout;
                 buttonsLayout->addWidget(spinBoxLabel);
                 buttonsLayout->addWidget(m_linesCountSpinBox);
                 buttonsLayout->addWidget(addRowAboveButton);
                 buttonsLayout->addWidget(addRowBelowButton);
                 buttonsLayout->addWidget(removeRowButton);
                 buttonsLayout->addStretch();
                 // chart type radio buttons
                 m_lineRadioButton = new QRadioButton("Line");
                 m_splineRadioButton = new QRadioButton("Spline");
                 m_scatterRadioButton = new QRadioButton("Scatter");
                 m_pieRadioButton = new QRadioButton("Pie");
                 m_areaRadioButton = new QRadioButton("Area");
                 m_barRadioButton = new QRadioButton("Bar");
                 connect(m_lineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_splineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_scatterRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_pieRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_areaRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_barRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 m_lineRadioButton->setChecked(true);
                 // radio buttons layout
                 QVBoxLayout* radioLayout = new QVBoxLayout;
                 radioLayout->addWidget(m_lineRadioButton);
                 radioLayout->addWidget(m_splineRadioButton);
                 radioLayout->addWidget(m_scatterRadioButton);
                 radioLayout->addWidget(m_pieRadioButton);
                 radioLayout->addWidget(m_areaRadioButton);
                 radioLayout->addWidget(m_barRadioButton);
                 radioLayout->addStretch();
                 // create main layout
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addLayout(buttonsLayout, 1, 1);
                 mainLayout->addLayout(radioLayout, 2, 1);
                 mainLayout->addWidget(m_tableView, 1, 0);
                 mainLayout->addWidget(m_chartView, 2, 0);
                 setLayout(mainLayout);
                 m_lineRadioButton->setFocus();
             }
             void TableWidget::addRowAbove()
             {
                 m_model->insertRows(m_tableView->currentIndex().row(), m_linesCountSpinBox->value());
             }
             void TableWidget::addRowBelow()
             {
                 m_model->insertRows(m_tableView->currentIndex().row() + 1, m_linesCountSpinBox->value());
             }
             void TableWidget::removeRow()
             {
                 m_model->removeRows(m_tableView->currentIndex().row(), qMin(m_model->rowCount() - m_tableView->currentIndex().row(), m_linesCountSpinBox->value()));
             }
             void TableWidget::updateChartType(bool toggle)
             {
                 // this if is needed, so that the function is only called once.
                 // For the radioButton that was enabled.
                 if (toggle) {
                     m_chart->removeAllSeries();
                     // renable axes of the chart (pie hides them)
                     // x axis
                     QChartAxis *axis = m_chart->axisX();
                     axis->setAxisVisible(true);
                     axis->setGridLineVisible(true);
                     axis->setLabelsVisible(true);
                     // y axis
                     axis = m_chart->axisY();
                     axis->setAxisVisible(true);
                     axis->setGridLineVisible(true);
                     axis->setLabelsVisible(true);
                     m_model->clearMapping();
                     QString seriesColorHex = "#000000";
                     QPen pen;
                     pen.setWidth(2);
                     if (m_lineRadioButton->isChecked())
                     {
                         // series 1
                         m_series = new QLineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(0,1, Qt::Vertical);
-                        m_series->setModelMappingRange(1, 4);
+            //            m_series->setModelMappingRange(1, 4);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 4));
                         // series 2
                         m_series = new QLineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(2,3, Qt::Vertical);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                         // series 3
                         m_series = new QLineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(4,5, Qt::Vertical);
-                        m_series->setModelMappingRange(2, 0);
+            //            m_series->setModelMappingRange(2, 0);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                     }
                     else if (m_splineRadioButton->isChecked())
                     {
                         // series 1
                         m_series = new QSplineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(0,1, Qt::Vertical);
-                        m_series->setModelMappingRange(1, 4);
+            //            m_series->setModelMappingRange(1, 4);
                         //        series->setModelMapping(0,1, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 4));
                         // series 2
                         m_series = new QSplineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(2,3, Qt::Vertical);
-                        m_series->setModelMappingRange(0, 0);
+            //            m_series->setModelMappingRange(0, 0);
                         //        series->setModelMapping(2,3, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                         // series 3
                         m_series = new QSplineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(4,5, Qt::Vertical);
-                        m_series->setModelMappingRange(2, 0);
+            //            m_series->setModelMappingRange(2, 0);
                         //        series->setModelMapping(4,5, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                     }
                     else if (m_scatterRadioButton->isChecked())
                     {
                         // series 1
                         m_series = new QScatterSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(0,1, Qt::Vertical);
-                        m_series->setModelMappingRange(2, 0);
+            //            m_series->setModelMappingRange(2, 0);
                         //        series->setModelMapping(0,1, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 1000));
                         // series 2
                         m_series = new QScatterSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(2,3, Qt::Vertical);
-                        m_series->setModelMappingRange(1, 6);
+            //            m_series->setModelMappingRange(1, 6);
                         //        series->setModelMapping(2,3, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 1, 2, 6));
                         // series 3
                         m_series = new QScatterSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(4,5, Qt::Vertical);
                         //        series->setModelMapping(4,5, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(4, 0, 2, 1000));
                     }
                     else if (m_pieRadioButton->isChecked())
                     {
                         // pie 1
                         QPieSeries* pieSeries = new QPieSeries;
                         pieSeries->setModel(m_model);
                         pieSeries->setModelMapping(0,0, Qt::Vertical);
                         pieSeries->setLabelsVisible(true);
                         pieSeries->setPieSize(0.4);
                         pieSeries->setHorizontalPosition(0.2);
                         pieSeries->setVerticalPosition(0.35);
                         m_chart->addSeries(pieSeries);
                         seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 0, 1, 1000));
                         // pie 2
                         pieSeries = new QPieSeries;
                         pieSeries->setModel(m_model);
                         pieSeries->setModelMapping(1,1, Qt::Vertical);
                         pieSeries->setLabelsVisible(true);
                         pieSeries->setPieSize(0.4);
                         pieSeries->setHorizontalPosition(0.8);
                         pieSeries->setVerticalPosition(0.35);
                         m_chart->addSeries(pieSeries);
                         seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(1, 0, 1, 1000));
                         // pie 3
                         pieSeries = new QPieSeries;
                         pieSeries->setModel(m_model);
                         pieSeries->setModelMapping(2,2, Qt::Vertical);
                         pieSeries->setLabelsVisible(true);
                         pieSeries->setPieSize(0.4);
                         pieSeries->setHorizontalPosition(0.5);
                         pieSeries->setVerticalPosition(0.65);
                         m_chart->addSeries(pieSeries);
                         seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 1, 1000));
                     }
                     else if (m_areaRadioButton->isChecked())
                     {
                         QLineSeries* upperLineSeries = new QLineSeries;
                         upperLineSeries->setModel(m_model);
                         upperLineSeries->setModelMapping(0, 1, Qt::Vertical);
-                        upperLineSeries->setModelMappingRange(1, 5);
+            //            upperLineSeries->setModelMappingRange(1, 5);
                         QLineSeries* lowerLineSeries = new QLineSeries;
                         lowerLineSeries->setModel(m_model);
                         lowerLineSeries->setModelMapping(2, 3, Qt::Vertical);
                         QAreaSeries* areaSeries = new QAreaSeries(upperLineSeries, lowerLineSeries);
                         m_chart->addSeries(areaSeries);
                         seriesColorHex = "#" + QString::number(areaSeries->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 5));
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                     }
                     else if (m_barRadioButton->isChecked())
                     {
                         QBarSeries* barSeries = new QBarSeries(QStringList());
                         barSeries->setModel(m_model);
                         barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                         m_chart->addSeries(barSeries);
                         QList<QBarSet*> barsets = barSeries->barSets();
                         for (int i = 0; i < barsets.count(); i++) {
                             seriesColorHex = "#" + QString::number(barsets.at(i)->brush().color().rgb(), 16).right(6).toUpper();
                             m_model->addMapping(seriesColorHex, QRect(2 + i, 0, 1, 1000));
                         }
                     }
                     m_chart->axisX()->setRange(0, 500);
                     m_chart->axisY()->setRange(0, 120);
                     // repaint table view colors
                     m_tableView->repaint();
                     m_tableView->setFocus();
                 }
             }
             TableWidget::~TableWidget()
             {
             }

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