HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r980:29373936de0b

barchart: doc update for hover signals

sauimone -

r980:29373936de0b

parent child

Context file:

r980:29373936de0b

Collapse all files

src/barchart/qbarseries.cpp +19 0

             /****************************************************************************
             **
             ** 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 virtual QSeriesType QBarSeries::type() const
                 \brief Returns type of series.
                 \sa QSeries, QSeriesType
             */
             /*!
                 \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) :
                 QSeries(*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) :
                 QSeries(d,parent)
             {
             }
+            /*!
+                Returns the type of series. Derived classes override this.
+            */
             QSeries::QSeriesType QBarSeries::type() const
             {
                 return QSeries::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));
                 }
                 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) : QSeriesPrivate(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) {
                     m_mapCount = m_model->rowCount() - m_mapFirst;
                     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++)
                         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++)
                             *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++)
                         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++)
                             *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)
                         barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row() - m_mapFirst, 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)
                         barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column() - m_mapFirst, 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 +1 0

             /****************************************************************************
             **
             ** 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 <qseries.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 QSeries
             {
                 Q_OBJECT
             public:
                 explicit QBarSeries(QBarCategories categories, QObject *parent = 0);
+                virtual ~QBarSeries();
                 QSeries::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/qbarset.cpp +12 -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$
             **
             ****************************************************************************/
             #include "qbarset.h"
             #include "qbarset_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBarSet
                 \brief part of QtCommercial chart API.
                 QBarSet represents one set of bars. Set of bars contains one data value for each category.
                 First value of set is assumed to belong to first category, second to second category and so on.
                 If set has fewer values than there are categories, then the missing values are assumed to be
                 at the end of set. For missing values in middle of a set, numerical value of zero is used.
                 \mainclass
                 \sa QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \fn void QBarSet::clicked(QString category, Qt::MouseButtons button)
                 \brief signals that set has been clicked
                 Parameter \a category describes on which category was clicked
                 Parameter \a button mouse button
             */
             /*!
+                \fn void QBarSet::selected()
+                \brief signals that set has been selected
+            */
+            /*!
                 \fn void QBarSet::hovered(bool status)
                 \brief signals that mouse has hovered over the set. If \a status is true, then mouse was entered. If \a status is false, then mouse was left.
+                The signal is emitted if mouse is hovered on top of set
+                Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
                 Constructs QBarSet with a name of \a name and with parent of \a parent
             */
             QBarSet::QBarSet(QString name, QObject *parent)
                 : QObject(parent)
                 ,d_ptr(new QBarSetPrivate(name,this))
             {
             }
+            /*!
+                Destroys the barset
+            */
             QBarSet::~QBarSet()
             {
+                // NOTE: d_ptr destroyed by QObject
             }
             /*!
                 Sets new \a name for set.
             */
             void QBarSet::setName(QString name)
             {
                 d_ptr->m_name = name;
             }
             /*!
                 Returns name of the set.
             */
             QString QBarSet::name() const
             {
                 return d_ptr->m_name;
             }
             /*!
                 Appends new value \a value to the end of set.
             */
             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 d_ptr->m_values.append(value);
                 emit d_ptr->structureChanged();
                 return *this;
             }
             /*!
                 Inserts new \a value on the \a i position.
                 The value that is currently at this postion is moved to postion i + 1
                 \sa removeValue()
             */
             void QBarSet::insertValue(int i, qreal value)
             {
                 d_ptr->m_values.insert(i, value);
             }
             /*!
                 Removes the value specified by \a i
                 \sa insertValue()
             */
             void QBarSet::removeValue(int i)
             {
                 d_ptr->m_values.removeAt(i);
             }
             /*!
                 Returns count of values in set.
             */
             int QBarSet::count() const
             {
                 return d_ptr->m_values.count();
             }
             /*!
                 Returns value of set indexed by \a index
             */
             qreal QBarSet::valueAt(int index) const
             {
                 return d_ptr->m_values.at(index);
             }
             /*!
                 Sets a new value \a value to set, indexed by \a index
             */
             void QBarSet::setValue(int index, qreal value)
             {
                 d_ptr->m_values.replace(index,value);
                 emit d_ptr->valueChanged();
             }
             /*!
                 Returns sum of all values in barset.
             */
             qreal QBarSet::sum() const
             {
                 qreal total(0);
                 for (int i=0; i < d_ptr->m_values.count(); i++) {
                     total += d_ptr->m_values.at(i);
                 }
                 return total;
             }
             /*!
                 Sets pen for set. Bars of this set are drawn using \a pen
             */
             void QBarSet::setPen(const QPen &pen)
             {
                   if(d_ptr->m_pen!=pen){
                       d_ptr->m_pen = pen;
                       emit d_ptr->valueChanged();
                   }
             }
             /*!
                 Returns pen of the set.
             */
             QPen QBarSet::pen() const
             {
                 return d_ptr->m_pen;
             }
             /*!
                 Sets brush for the set. Bars of this set are drawn using \a brush
             */
             void QBarSet::setBrush(const QBrush &brush)
             {
                 if(d_ptr->m_brush!=brush){
                   d_ptr->m_brush = brush;
                   emit d_ptr->valueChanged();
                 }
             }
             /*!
                 Returns brush of the set.
             */
             QBrush QBarSet::brush() const
             {
                 return d_ptr->m_brush;
             }
             /*!
                 Sets \a pen of the values that are drawn on top of this barset
             */
             void QBarSet::setLabelPen(const QPen &pen)
             {
                 if(d_ptr->m_labelPen!=pen){
                     d_ptr->m_labelPen = pen;
                     emit d_ptr->valueChanged();
                 }
             }
             /*!
                 Returns pen of the values that are drawn on top of this barset
             */
             QPen QBarSet::labelPen() const
             {
                 return d_ptr->m_labelPen;
             }
             /*!
                 Sets \a brush of the values that are drawn on top of this barset
             */
             void QBarSet::setLabelBrush(const QBrush &brush)
             {
                 if(d_ptr->m_labelBrush!=brush){
                     d_ptr->m_labelBrush = brush;
                     emit d_ptr->valueChanged();
                 }
             }
             /*!
                 Returns brush of the values that are drawn on top of this barset
             */
             QBrush QBarSet::labelBrush() const
             {
                 return d_ptr->m_labelBrush;
             }
             /*!
                 Sets the \a font for values that are drawn on top of this barset
             */
             void QBarSet::setLabelFont(const QFont &font)
             {
                 if(d_ptr->m_labelFont!=font) {
                     d_ptr->m_labelFont = font;
                     emit d_ptr->valueChanged();
                 }
             }
             /*!
                 Returns the pen for values that are drawn on top of this set
             */
             QFont QBarSet::labelFont() const
             {
                 return d_ptr->m_labelFont;
             }
             /*!
                 Sets visibility of bar labels. If \a visible is true, labels are drawn on top of barsets.
             */
             void QBarSet::setLabelsVisible(bool visible)
             {
                 if(d_ptr->m_labelsVisible!=visible) {
                     d_ptr->m_labelsVisible = visible;
                     emit d_ptr->labelsVisibleChanged(visible);
                 }
             }
             /*!
                 Returns the visibility of values
             */
             bool QBarSet::labelsVisible() const
             {
                 return d_ptr->m_labelsVisible;
             }
             ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBarSetPrivate::QBarSetPrivate(QString name, QBarSet *parent) : QObject(parent),
                 q_ptr(parent),
                 m_name(name),
                 m_labelsVisible(false)
             {
             }
             QBarSetPrivate::~QBarSetPrivate()
             {
             }
             #include "moc_qbarset.cpp"
             #include "moc_qbarset_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.h +1 -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 QBARSET_H
             #define QBARSET_H
             #include <qchartglobal.h>
             #include <QPen>
             #include <QBrush>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSetPrivate;
             class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
             {
                 Q_OBJECT
             public:
                 explicit QBarSet(QString name, QObject *parent = 0);
-                ~QBarSet();
+                virtual ~QBarSet();
                 void setName(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);
                 int count() const;                          // count of values in set
                 qreal valueAt(int index) const;             // for modifying individual values
                 void setValue(int index, qreal value);      // setter for individual value
                 qreal sum() const;                          // sum of all values in the set
                 void setPen(const QPen &pen);
                 QPen pen() const;
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setLabelPen(const QPen &pen);
                 QPen labelPen() const;
                 void setLabelBrush(const QBrush &brush);
                 QBrush labelBrush() const;
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void setLabelsVisible(bool visible = true);
                 bool labelsVisible() const;
             Q_SIGNALS:
                 void clicked(QString category, Qt::MouseButtons button);
                 void selected();
                 void hovered(bool status);
             private:
                 QScopedPointer<QBarSetPrivate> d_ptr;
                 Q_DISABLE_COPY(QBarSet)
                 friend class QBarSeries;
                 friend class BarLegendMarker;
                 friend class BarChartItem;
                 friend class QBarSeriesPrivate;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSET_H

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