HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r776:2e4d7bdf36a4

const to getters, renamed addBarset to appendBarset

sauimone -

r776:2e4d7bdf36a4

parent child

Context file:

r776:2e4d7bdf36a4

Collapse all files

demos/chartthemes/themewidget.cpp +1 -1

                         QBarSet *set = new QBarSet("Set" + QString::number(i));
                         foreach (Data data, m_dataTable[i])
                             *set << data.first.y();
-                        series->addBarSet(set);
+                        series->appendBarSet(set);
                     }
                     chart->addSeries(series);
                 }

examples/barchart/main.cpp +5 -5

             //![2]
             //![3]
                 QBarSeries* series = new QBarSeries(categories);
-                series->addBarSet(set0);
+                series->appendBarSet(set0);
-                series->addBarSet(set1);
+                series->appendBarSet(set1);
-                series->addBarSet(set2);
+                series->appendBarSet(set2);
-                series->addBarSet(set3);
+                series->appendBarSet(set3);
-                series->addBarSet(set4);
+                series->appendBarSet(set4);
             //![3]
             //![4]
                 QChart* chart = new QChart();

examples/percentbarchart/main.cpp +5 -5

             //![2]
             //![3]
                 QPercentBarSeries* series = new QPercentBarSeries(categories);
-                series->addBarSet(set0);
+                series->appendBarSet(set0);
-                series->addBarSet(set1);
+                series->appendBarSet(set1);
-                series->addBarSet(set2);
+                series->appendBarSet(set2);
-                series->addBarSet(set3);
+                series->appendBarSet(set3);
-                series->addBarSet(set4);
+                series->appendBarSet(set4);
             //![3]
             //![4]
                 QChart* chart = new QChart();

examples/stackedbarchart/main.cpp +5 -5

             //![2]
             //![3]
                 QStackedBarSeries* series = new QStackedBarSeries(categories);
-                series->addBarSet(set0);
+                series->appendBarSet(set0);
-                series->addBarSet(set1);
+                series->appendBarSet(set1);
-                series->addBarSet(set2);
+                series->appendBarSet(set2);
-                series->addBarSet(set3);
+                series->appendBarSet(set3);
-                series->addBarSet(set4);
+                series->appendBarSet(set4);
             //![3]
             //![4]
                 QChart* chart = new QChart();

qmlplugin/declarativebarseries.cpp +3 -3

                         *set1 << 5 << 0 << 0 << 4 << 0 << 7;
                         *set2 << 3 << 5 << 8 << 13 << 8 << 5;
-                        m_series->addBarSet(set0);
+                        m_series->appendBarSet(set0);
-                        m_series->addBarSet(set1);
+                        m_series->appendBarSet(set1);
-                        m_series->addBarSet(set2);
+                        m_series->appendBarSet(set2);
                         chart->addSeries(m_series);
                     }

src/barchart/barchartitem.cpp +2 -2

                         value->setPen(barSet->floatingValuePen());
                         if (!qFuzzyIsNull(m_series->valueAt(set,category))) {
-                            value->setValueString(QString::number(m_series->valueAt(set, category)));
+                            value->setText(QString::number(m_series->valueAt(set, category)));
                         } else {
-                            value->setValueString(QString(""));
+                            value->setText(QString(""));
                         }
                         itemIndex++;

src/barchart/barchartmodel.cpp +11 -11

                 return m_category;
             }
-            void BarChartModel::addBarSet(QBarSet *set)
+            void BarChartModel::appendBarSet(QBarSet *set)
             {
                 m_dataModel.append(set);
             }
                 m_category.removeAt(i);
             }
-            QBarSet* BarChartModel::setAt(int index)
+            QBarSet* BarChartModel::barsetAt(int index) const
             {
                 return m_dataModel.at(index);
             }
-            QList<QBarSet*> BarChartModel::barSets()
+            QList<QBarSet*> BarChartModel::barSets() const
             {
                 return m_dataModel;
             }
-            int BarChartModel::barsetCount()
+            int BarChartModel::barsetCount() const
             {
                 return m_dataModel.count();
             }
-            int BarChartModel::categoryCount()
+            int BarChartModel::categoryCount() const
             {
                 return m_category.count();
             }
-            qreal BarChartModel::min()
+            qreal BarChartModel::min() const
             {
                 Q_ASSERT(m_dataModel.count() > 0);
                 // TODO: make min and max members and update them when data changes.
                 return min;
             }
-            qreal BarChartModel::max()
+            qreal BarChartModel::max() const
             {
                 Q_ASSERT(m_dataModel.count() > 0);
                 return max;
             }
-            qreal BarChartModel::valueAt(int set, int category)
+            qreal BarChartModel::valueAt(int set, int category) const
             {
                 if ((set < 0) || (set >= m_dataModel.count())) {
                     // No set, no value.
                 return m_dataModel.at(set)->valueAt(category);
             }
-            qreal BarChartModel::percentageAt(int set, int category)
+            qreal BarChartModel::percentageAt(int set, int category) const
             {
                 if ((set < 0) || (set >= m_dataModel.count())) {
                     // No set, no value.
             }
-            qreal BarChartModel::categorySum(int category)
+            qreal BarChartModel::categorySum(int category) const
             {
                 qreal sum(0);
                 int count = m_dataModel.count(); // Count sets
                 return sum;
             }
-            qreal BarChartModel::maxCategorySum()
+            qreal BarChartModel::maxCategorySum() const
             {
                 qreal max = INT_MIN;
                 int count = categoryCount();

src/barchart/barchartmodel_p.h +11 -11

                 explicit BarChartModel(QStringList categories, QObject *parent = 0);
                 QStringList category();
-                void addBarSet(QBarSet *set);
+                void appendBarSet(QBarSet *set);
                 void removeBarSet(QBarSet *set);
                 void insertBarSet(int i, QBarSet *set);
                 void insertCategory(int i, QString category);
                 void removeCategory(int i);
-                QBarSet *setAt(int index);
+                QBarSet *barsetAt(int index) const;
-                QList<QBarSet *> barSets();
+                QList<QBarSet *> barSets() const;
-                int barsetCount();          // Number of sets in model
+                int barsetCount() const;          // Number of sets in model
-                int categoryCount();        // Number of categories
+                int categoryCount() const;        // Number of categories
-                qreal max();                // Maximum value of all sets
+                qreal max() const;                // Maximum value of all sets
-                qreal min();                // Minimum value of all sets
+                qreal min() const;                // Minimum value of all sets
-                qreal valueAt(int set, int category);
+                qreal valueAt(int set, int category) const;
-                qreal percentageAt(int set, int category);
+                qreal percentageAt(int set, int category) const;
-                qreal categorySum(int category);
+                qreal categorySum(int category) const;
-                qreal maxCategorySum();     // returns maximum sum of sets in all categories.
+                qreal maxCategorySum() const;     // returns maximum sum of sets in all categories.
                 QString categoryName(int category);

src/barchart/barvalue.cpp +3 -3

                 setVisible(false);
             }
-            void BarValue::setValueString(QString str)
+            void BarValue::setText(QString str)
             {
                 m_valueString = str;
             }
-            QString BarValue::valueString()
+            QString BarValue::text() const
             {
                 return m_valueString;
             }
-            void BarValue::setPen(const QPen pen)
+            void BarValue::setPen(const QPen &pen)
             {
                 m_pen = pen;
             }

src/barchart/barvalue_p.h +3 -3

             public:
                 BarValue(QBarSet &set, QGraphicsItem *parent = 0);
-                void setValueString(QString str);
+                void setText(QString str);
-                QString valueString();
+                QString text() const;
-                void setPen(const QPen pen);
+                void setPen(const QPen &pen);
                 QPen pen() const;
                 void resize(qreal w, qreal h);

src/barchart/percentbarchartitem.cpp +2 -2

                             QString vString(QString::number(p));
                             vString.truncate(3);
                             vString.append("%");
-                            value->setValueString(vString);
+                            value->setText(vString);
                         } else {
-                            value->setValueString(QString(""));
+                            value->setText(QString(""));
                         }
                         itemIndex++;

src/barchart/qbarseries.cpp +10 -10

                 Connects the clicked(QString) and rightClicked(QString) signals
                 of \a set to this series
             */
-            void QBarSeries::addBarSet(QBarSet *set)
+            void QBarSeries::appendBarSet(QBarSet *set)
             {
-                m_internalModel->addBarSet(set);
+                m_internalModel->appendBarSet(set);
                 connect(set, SIGNAL(clicked(QString)), this, SLOT(barsetClicked(QString)));
                 connect(set, SIGNAL(rightClicked(QString)), this, SLOT(barsetRightClicked(QString)));
                 connect(set, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
             /*!
                 Returns number of sets in series.
             */
-            int QBarSeries::barsetCount()
+            int QBarSeries::barsetCount() const
             {
                 //    if(m_model)
                 //        return m_mapBarTop - m_mapBarBottom;
             /*!
                 Returns number of categories in series
             */
-            int QBarSeries::categoryCount()
+            int QBarSeries::categoryCount() const
             {
                 return m_internalModel->categoryCount();
             }
             /*!
                 Returns a list of sets in series. Keeps ownership of sets.
              */
-            QList<QBarSet*> QBarSeries::barSets()
+            QList<QBarSet*> QBarSeries::barSets() const
             {
                 return m_internalModel->barSets();
             }
             */
             QBarSet* QBarSeries::barsetAt(int index)
             {
-                return m_internalModel->setAt(index);
+                return m_internalModel->barsetAt(index);
             }
             /*!
                 // TODO: what if we add sets after call to this function? Those sets won't have tooltip enabled.
                 if (enabled) {
                     for (int i=0; i<m_internalModel->barsetCount(); i++) {
-                        QBarSet *set = m_internalModel->setAt(i);
+                        QBarSet *set = m_internalModel->barsetAt(i);
                         connect(set, SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
                     }
                 } else {
                     for (int i=0; i<m_internalModel->barsetCount(); i++) {
-                        QBarSet *set = m_internalModel->setAt(i);
+                        QBarSet *set = m_internalModel->barsetAt(i);
                         disconnect(set, SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
                     }
                 }
                         QBarSet* barSet = new QBarSet(QString("Column: %1").arg(i + 1));
                         for(int m = m_mapFirst; m < m_mapFirst + m_mapCount; m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
-                        addBarSet(barSet);
+                        appendBarSet(barSet);
                     }
                 } else {
                     QStringList categories;
                         QBarSet* barSet = new QBarSet(QString("Row: %1").arg(i + 1));
                         for(int m = m_mapFirst; m < m_mapFirst + m_mapCount; m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
-                        addBarSet(barSet);
+                        appendBarSet(barSet);
                     }
                 }
             }

src/barchart/qbarseries.h +4 -4

                 virtual QSeriesType type() const { return QSeries::SeriesTypeBar; }
-                void addBarSet(QBarSet *set);               // Takes ownership of set
+                void appendBarSet(QBarSet *set);               // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 void insertBarSet(int i, QBarSet *set);
                 void insertCategory(int i, QString category);
                 void removeCategory(int i);
-                int barsetCount();
+                int barsetCount() const;
-                int categoryCount();
+                int categoryCount() const;
-                QList<QBarSet*> barSets();
+                QList<QBarSet*> barSets() const;
                 QBarCategories categories() const;
                 bool setModel(QAbstractItemModel *model);

src/barchart/qbarset.cpp +4 -4

             /*!
                 Returns name of the set.
             */
-            QString QBarSet::name()
+            QString QBarSet::name() const
             {
                 return m_name;
             }
             /*!
                 Returns count of values in set.
             */
-            int QBarSet::count()
+            int QBarSet::count() const
             {
                 return m_values.count();
             }
             /*!
                 Returns value of set indexed by \a index
             */
-            qreal QBarSet::valueAt(int index)
+            qreal QBarSet::valueAt(int index) const
             {
                 return m_values.at(index);
             }
             /*!
                 Returns total sum of all values in barset.
             */
-            qreal QBarSet::total()
+            qreal QBarSet::total() const
             {
                 qreal total(0);
                 for (int i=0; i < m_values.count(); i++) {

src/barchart/qbarset.h +4 -4

                 QBarSet(QString name, QObject *parent = 0);
                 void setName(QString name);
-                QString name();
+                QString name() const;
                 QBarSet& operator << (const qreal &value);  // appends new value to set
                 void insertValue(int i, qreal value);
                 void removeValue(int i);
                 // TODO: remove indices eventually. Use as internal?
-                int count();                                // count of values in set
+                int count() const;                          // count of values in set
-                qreal valueAt(int index);                   // for modifying individual values
+                qreal valueAt(int index) const;                   // for modifying individual values
                 void setValue(int index, qreal value);      // setter for individual value
-                qreal total();                              // total values in the set
+                qreal total() const;                              // total values in the set
                 // TODO:
                 //qreal value(QString category);

src/barchart/stackedbarchartitem.cpp +2 -2

                         value->setPen(barSet->floatingValuePen());
                         if (!qFuzzyIsNull(m_series->valueAt(set, category))) {
-                            value->setValueString(QString::number(m_series->valueAt(set,category)));
+                            value->setText(QString::number(m_series->valueAt(set,category)));
                         } else {
-                            value->setValueString(QString(""));
+                            value->setText(QString(""));
                         }
                         itemIndex++;

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