HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r993:f8e943006326

barset: unified insert/set/remove methods

sauimone -

r993:f8e943006326

parent child

Context file:

r993:f8e943006326

Collapse all files

src/barchart/barchartitem.cpp +3 -3

                     for (int set = 0; set < setCount; set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
-                        qreal barHeight = barSet->valueAt(category) * scale;
+                        qreal barHeight = barSet->at(category) * scale;
                         Bar* bar = m_bars.at(itemIndex);
                         QRectF rect(xPos, yPos - barHeight, barWidth, barHeight);
                         BarLabel* label = m_labels.at(itemIndex);
-                        if (!qFuzzyIsNull(barSet->valueAt(category))) {
+                        if (!qFuzzyIsNull(barSet->at(category))) {
-                            label->setText(QString::number(barSet->valueAt(category)));
+                            label->setText(QString::number(barSet->at(category)));
                         } else {
                             label->setText(QString(""));
                         }

src/barchart/barchartmodel.cpp +6 -6

                 for (int i = 0; i < m_dataModel.count(); i++) {
                     int itemCount = m_dataModel.at(i)->count();
                     for (int j = 0; j < itemCount; j++) {
-                        qreal temp = m_dataModel.at(i)->valueAt(j);
+                        qreal temp = m_dataModel.at(i)->at(j);
                         if (temp < min)
                             min = temp;
                     }
                 for (int i = 0; i < m_dataModel.count(); i++) {
                     int itemCount = m_dataModel.at(i)->count();
                     for (int j = 0; j < itemCount; j++) {
-                        qreal temp = m_dataModel.at(i)->valueAt(j);
+                        qreal temp = m_dataModel.at(i)->at(j);
                         if (temp > max)
                             max = temp;
                     }
                     return 0;
                 }
-                return m_dataModel.at(set)->valueAt(category);
+                return m_dataModel.at(set)->at(category);
             }
             qreal BarChartModel::percentageAt(int set, int category) const
                     return 0;
                 }
-                qreal value = m_dataModel.at(set)->valueAt(category);
+                qreal value = m_dataModel.at(set)->at(category);
                 qreal total = categorySum(category);
                 if ( qFuzzyCompare(total, 0) )
                     return 0;
                 for (int set = 0; set < count; set++) {
                     if (category < m_dataModel.at(set)->count())
-                        sum += m_dataModel.at(set)->valueAt(category);
+                        sum += m_dataModel.at(set)->at(category);
                 }
                 return sum;
             }
                 for (int set = 0; set < count; set++) {
                     if (category < m_dataModel.at(set)->count())
-                        sum += qAbs(m_dataModel.at(set)->valueAt(category));
+                        sum += qAbs(m_dataModel.at(set)->at(category));
                 }
                 return sum;
             }

src/barchart/percentbarchartitem.cpp +1 -1

                     qreal yPos = height + domainScale * m_domainMinY + geometry().topLeft().y();
                     for (int set=0; set < m_series->barsetCount(); set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
-                        qreal barHeight = barSet->valueAt(category) * percentage * domainScale;
+                        qreal barHeight = barSet->at(category) * percentage * domainScale;
                         Bar* bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());

src/barchart/qbarseries.cpp +2 -2

                 {
                     // 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)
-                        barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                        barsetAt(topLeft.column() - m_mapBarBottom)->replace(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)
-                        barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                        barsetAt(topLeft.row() - m_mapBarBottom)->replace(topLeft.column(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
                 }
             }

src/barchart/qbarset.cpp +37 -21

             /*!
                 Constructs QBarSet with a name of \a name and with parent of \a parent
             */
-            QBarSet::QBarSet(QString name, QObject *parent)
+            QBarSet::QBarSet(const QString name, QObject *parent)
                 : QObject(parent)
                 ,d_ptr(new QBarSetPrivate(name,this))
             {
             /*!
                 Sets new \a name for set.
             */
-            void QBarSet::setName(QString name)
+            void QBarSet::setName(const QString name)
             {
                 d_ptr->m_name = name;
             }
             /*!
                 Appends new value \a value to the end of set.
             */
-            QBarSet& QBarSet::operator << (const qreal &value)
+            void QBarSet::append(const qreal value)
             {
                 d_ptr->m_values.append(value);
                 emit d_ptr->structureChanged();
+            }
+            /*!
+                Appends new value \a value to the end of set.
+            */
+            QBarSet& QBarSet::operator << (const qreal &value)
+            {
+                append(value);
                 return *this;
             }
             /*!
-                Inserts new \a value on the \a i position.
+                Inserts new \a value on the \a index position.
-                The value that is currently at this postion is moved to postion i + 1
+                The value that is currently at this postion is moved to postion index + 1
-                \sa removeValue()
+                \sa remove()
             */
-            void QBarSet::insertValue(int i, qreal value)
+            void QBarSet::insert(const int index, const qreal value)
             {
-                d_ptr->m_values.insert(i, value);
+                d_ptr->m_values.insert(index, value);
             }
             /*!
-                Removes the value specified by \a i
+                Removes the value specified by \a index
-                \sa insertValue()
+                \sa insert()
             */
-            void QBarSet::removeValue(int i)
+            void QBarSet::remove(const int index)
             {
-                d_ptr->m_values.removeAt(i);
+                d_ptr->m_values.removeAt(index);
             }
             /*!
-                Returns count of values in set.
+                Sets a new value \a value to set, indexed by \a index
             */
-            int QBarSet::count() const
+            void QBarSet::replace(const int index, const qreal value)
             {
-                return d_ptr->m_values.count();
+                d_ptr->m_values.replace(index,value);
+                emit d_ptr->valueChanged();
             }
             /*!
                 Returns value of set indexed by \a index
             */
-            qreal QBarSet::valueAt(int index) const
+            qreal QBarSet::at(const int index) const
             {
                 return d_ptr->m_values.at(index);
             }
             /*!
-                Sets a new value \a value to set, indexed by \a index
+                Returns value of set indexed by \a index
             */
-            void QBarSet::setValue(int index, qreal value)
+            qreal QBarSet::operator [] (int index) const
             {
-                d_ptr->m_values.replace(index,value);
+                return d_ptr->m_values.at(index);
-                emit d_ptr->valueChanged();
+            /*!
+                Returns count of values in set.
+            */
+            int QBarSet::count() const
+            {
+                return d_ptr->m_values.count();
             }
             /*!
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QBarSetPrivate::QBarSetPrivate(QString name, QBarSet *parent) : QObject(parent),
+            QBarSetPrivate::QBarSetPrivate(const QString name, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
                 m_name(name),
                 m_labelsVisible(false)

src/barchart/qbarset.h +11 -9

                 Q_OBJECT
             public:
-                explicit QBarSet(QString name, QObject *parent = 0);
+                explicit QBarSet(const QString name, QObject *parent = 0);
                 virtual ~QBarSet();
-                void setName(QString name);
+                void setName(const QString name);
                 QString name() const;
-                QBarSet& operator << (const qreal &value);  // appends new value to set
+                void append(const qreal value);
-                void insertValue(int i, qreal value);
+                QBarSet& operator << (const qreal &value);
-                void removeValue(int i);
+                void insert(const int index, const qreal value);
-                int count() const;                          // count of values in set
+                void remove(const int index);
-                qreal valueAt(int index) const;             // for modifying individual values
+                void replace(const int index, const qreal value);
-                void setValue(int index, qreal value);      // setter for individual value
+                qreal at(const int index) const;
-                qreal sum() const;                          // sum of all values in the set
+                qreal operator [] (int index) const;
+                int count() const;
+                qreal sum() const;
                 void setPen(const QPen &pen);
                 QPen pen() const;

src/barchart/qbarset_p.h +1 -1

                 Q_OBJECT
             public:
-                QBarSetPrivate(QString name, QBarSet *parent);
+                QBarSetPrivate(const QString name, QBarSet *parent);
                 ~QBarSetPrivate();
             Q_SIGNALS:

src/barchart/stackedbarchartitem.cpp +3 -3

                     for (int set=0; set < m_series->barsetCount(); set++) {
                         QBarSet* barSet = m_series->d_func()->barsetAt(set);
-                        qreal barHeight = barSet->valueAt(category) * scale;
+                        qreal barHeight = barSet->at(category) * scale;
                         Bar* bar = m_bars.at(itemIndex);
                         bar->setPen(barSet->pen());
                         bar->setBrush(barSet->brush());
                         BarLabel* label = m_labels.at(itemIndex);
-                        if (!qFuzzyIsNull(barSet->valueAt(category))) {
+                        if (!qFuzzyIsNull(barSet->at(category))) {
-                            label->setText(QString::number(barSet->valueAt(category)));
+                            label->setText(QString::number(barSet->at(category)));
                         } else {
                             label->setText(QString(""));
                         }

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