HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r877:26b0fc7673b6

BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include

Marek Rosa -

r877:26b0fc7673b6

parent child

Context file:

r877:26b0fc7673b6

Collapse all files

examples/tablemodelchart/tablewidget.cpp +1 0

                 QPushButton* removeRowButton = new QPushButton("Remove row");
                 connect(removeRowButton, SIGNAL(clicked()), this, SLOT(removeRow()));
+                // spin box for setting number of affected items (add, remove)
                 m_linesCountSpinBox = new QSpinBox;
                 m_linesCountSpinBox->setRange(1, 10);
                 m_linesCountSpinBox->setValue(1);

src/barchart/qbarseries.cpp +2 -1

             #include "qbarset.h"
             #include "barchartmodel_p.h"
             #include <QAbstractItemModel>
+            #include <QModelIndex>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \internal
             */
-            BarChartModel& QBarSeries::model()
+            BarChartModel& QBarSeries::modelInternal()
             {
                 return *m_internalModel;
             }

src/barchart/qbarseries.h +5 -3

             #include <qseries.h>
             #include <QStringList>
+            class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             typedef QStringList QBarCategories;
                 void setLabelsVisible(bool visible = true);
                 bool setModel(QAbstractItemModel *model);
-                QAbstractItemModel *modelExt() { return m_model; }
+            //    QAbstractItemModel *modelExt() { return m_model; }
                 void setModelMapping(int categories, int bottomBoundry, int topBoundry, Qt::Orientation orientation = Qt::Vertical);
                 void setModelMappingShift(int first, int count);
                 qreal categorySum(int category);
                 qreal absoluteCategorySum(int category);
                 qreal maxCategorySum();
-                BarChartModel& model();
+                BarChartModel& modelInternal();
                 // <--- TO PIMPL
             Q_SIGNALS:
             protected:
                 BarChartModel *m_internalModel;     // TODO: this may change... current "2 models" situation doesn't look good.
-                QAbstractItemModel* m_model;
+            //    QAbstractItemModel* m_model;
                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;

src/piechart/qpieseries.cpp 0 -2

                 if (m_mapOrientation == Qt::Vertical)
                 {
-                    //        slices().at(topLeft.row())->setValue(m_model->data(m_model->index(topLeft.row(), topLeft.column()), Qt::DisplayRole).toDouble());
                     if (topLeft.column() == m_mapValues)
                         if (m_mapValues == m_mapLabels)
                         {
                 }
                 else
                 {
-                    //        slices().at(topLeft.column())->setValue(m_model->data(m_model->index(topLeft.row(), topLeft.column()), Qt::DisplayRole).toDouble());
                     if (topLeft.row() == m_mapValues)
                         if (m_mapValues == m_mapLabels)
                         {

src/piechart/qpieseriesprivate_p.h +2 0

             #include "qpieseries.h"
+            class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSeriesPrivate : public QObject

src/qseries.h +1 -1

             #include <QPen>
             class QAbstractItemModel;
-            class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 virtual QSeriesType type() const = 0;
                 // TODO
                 virtual bool setModel(QAbstractItemModel* /*model*/) { return false; }
+                QAbstractItemModel* model() const { return m_model; }
                 void setName(QString name) { m_name = name; }
                 QString name() const { return m_name; }

src/xychart/qxyseries.cpp +24 -1

                 return *this;
             }
+            /*!
+               \internal
+             */
             void QXYSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 Q_UNUSED(bottomRight)
                 }
             }
+            /*!
+               \internal
+             */
             void QXYSeries::modelDataAboutToBeAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent)
                 }
             }
+            /*!
+               \internal
+             */
             void QXYSeries::modelDataAdded(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent)
                 }
             }
+            /*!
+               \internal
+             */
             void QXYSeries::modelDataAboutToBeRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent)
                 }
             }
+            /*!
+               \internal
+             */
             void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
             {
                 Q_UNUSED(parent)
                 }
             }
+            /*!
+                \fn QAbstractItemModel* QXYSeries::model()
+                Returns the model from which the series takes its data.
+             */
+            /*!
+                 \fn bool QXYSeries::setModel(QAbstractItemModel *model)
+                 Sets the \a model to be used as a data source
+             */
             bool QXYSeries::setModel(QAbstractItemModel *model) {
                 // disconnect signals from old model

src/xychart/qxyseries.h +3 -1

             #include <QPen>
             #include <QBrush>
+            class QModelIndex;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QXYSeries : public QSeries
                 QBrush brush() const {return m_brush;}
                 bool setModel(QAbstractItemModel *model);
-                QAbstractItemModel* model() const { return m_model; }
+            //    QAbstractItemModel* model() const { return m_model; }
                 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
                 virtual void setModelMappingRange(int first, int count = 0);

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