HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r288:5f68000bea7a

moved tooltip to presenter

sauimone -

r288:5f68000bea7a

parent child

Context file:

r288:5f68000bea7a

Collapse all files

src/barchart/barpresenter.cpp +16 -14

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenter::BarPresenter(BarChartModel& model, QGraphicsItem *parent) :
+            BarPresenter::BarPresenter(QBarChartSeries *series, QGraphicsItem *parent) :
-                BarPresenterBase(model,parent)
+                BarPresenterBase(series, parent)
             {
                 mBarDefaultWidth = 15;
             }
             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mModel.countSets() <= 0) {
+                if (mSeries->countSets() <= 0) {
                     qDebug() << "No sets in model!";
                     return;
                 }
                 // TODO: better way to auto-layout?
                 // Use reals for accurancy (we might get some compiler warnings... :)
-                int categoryCount = mModel.countCategories();
+                int categoryCount = mSeries->countCategories();
-                int setCount = mModel.countSets();
+                int setCount = mSeries->countSets();
                 qreal tW = mWidth;
                 qreal tH = mHeight;
-                qreal tM = mModel.max();
+                qreal tM = mSeries->max();
                 qreal scale = (tH/tM);
                 qreal tC = categoryCount+1;
                 qreal xStepPerSet = (tW/tC);
                     qreal xPos = xStepPerSet * category + ((tW + mBarDefaultWidth*setCount)/(categoryCount*2));
                     qreal yPos = mHeight;
                     for (int set = 0; set < setCount; set++) {
-                        qreal barHeight = mModel.valueAt(set, category) * scale;
+                        qreal barHeight = mSeries->valueAt(set,category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mModel.setAt(set)->brush());
+                        bar->setBrush(mSeries->setAt(set)->brush());
-                        bar->setPos(xPos, yPos-barHeight); // item*posStep+startPos + set * mBarDefaultWidth, mHeight);
+                        bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }
                 // Position floating values
                 itemIndex = 0;
-                for (int category=0; category < mModel.countCategories(); category++) {
+                for (int category=0; category < mSeries->countCategories(); category++) {
                     qreal xPos = xStepPerSet * category + ((tW + mBarDefaultWidth*setCount)/(categoryCount*2));
                     qreal yPos = mHeight;
-                    for (int set=0; set < mModel.countSets(); set++) {
+                    for (int set=0; set < mSeries->countSets(); set++) {
-                        qreal barHeight = mModel.valueAt(set,category) * scale;
+                        qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
-                        if (mModel.valueAt(set,category) != 0) {
+                        if (mSeries->valueAt(set,category) != 0) {
-                            value->setValueString(QString::number(mModel.valueAt(set,category)));
+                            value->setValueString(QString::number(mSeries->valueAt(set,category)));
                         } else {
                             value->setValueString(QString(""));
                         }
                 mLayoutDirty = true;
             }
+            #include "moc_barpresenter.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barpresenter.h +5 -2

             #ifndef BARPRESENTER_H
             #define BARPRESENTER_H
+            #include "qchartglobal.h"
             #include "barpresenterbase.h"
-            #include "qbarchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QBarChartSeries;
             // Presenter for parallel bars. Grouping of bars is done on category basis.
             class BarPresenter : public BarPresenterBase
             {
+                Q_OBJECT
             public:
-                explicit BarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
+                explicit BarPresenter(QBarChartSeries *series, QGraphicsItem *parent = 0);
             private:

src/barchart/barpresenterbase.cpp +39 -18

             #include "barlabel_p.h"
             #include "separator_p.h"
             #include "qbarset.h"
+            #include "qbarchartseries.h"
             #include <QDebug>
+            #include <QToolTip>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenterBase::BarPresenterBase(BarChartModel& model, QGraphicsItem *parent)
+            BarPresenterBase::BarPresenterBase(QBarChartSeries *series, QGraphicsItem *parent)
                 : ChartItem(parent)
                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
-                ,mSeparatorsVisible(false)
+                ,mSeries(series)
-                ,mModel(model)
             {
+                connect(series,SIGNAL(floatingValuesEnabled(bool)),this,SLOT(enableFloatingValues(bool)));
+                connect(series,SIGNAL(toolTipEnabled(bool)),this,SLOT(enableToolTip(bool)));
+                connect(series,SIGNAL(separatorsEnabled(bool)),this,SLOT(enableSeparators(bool)));
+                connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
                 dataChanged();
             }
-            void BarPresenterBase::setSeparatorsVisible(bool visible)
+            BarPresenterBase::~BarPresenterBase()
             {
-                mSeparatorsVisible = visible;
+                disconnect(this,SLOT(enableFloatingValues(bool)));
+                disconnect(this,SLOT(enableToolTip(bool)));
+                disconnect(this,SLOT(enableSeparators(bool)));
+                disconnect(this,SLOT(showToolTip(QPoint,QString)));
+                delete mSeries;
             }
             void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
                 mFloatingValues.clear();
                 // Create new graphic items for bars
-                for (int c=0; c<mModel.countCategories(); c++) {
+                for (int c=0; c<mSeries->countCategories(); c++) {
-                    for (int s=0; s<mModel.countSets(); s++) {
+                    for (int s=0; s<mSeries->countSets(); s++) {
-                        QBarSet *set = mModel.setAt(s);
+                        QBarSet *set = mSeries->setAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
                 }
                 // Create labels
-                int count = mModel.countCategories();
+                int count = mSeries->countCategories();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
-                    label->set(mModel.label(i));
+                    label->set(mSeries->label(i));
                     childItems().append(label);
                     mLabels.append(label);
                 }
                 // Create separators
-                count = mModel.countCategories() - 1;   // There is one less separator than columns
+                count = mSeries->countCategories() - 1;   // There is one less separator than columns
                 for (int i=0; i<count; i++) {
                     Separator* sep = new Separator(this);
                     sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
                 }
                 // Create floating values
-                for (int category=0; category<mModel.countCategories(); category++) {
+                for (int category=0; category<mSeries->countCategories(); category++) {
-                    for (int s=0; s<mModel.countSets(); s++) {
+                    for (int s=0; s<mSeries->countSets(); s++) {
-                        QBarSet *set = mModel.setAt(s);
+                        QBarSet *set = mSeries->setAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
                         mFloatingValues.append(value);
                 setPos(rect.topLeft());
             }
+            void BarPresenterBase::enableFloatingValues(bool enabled)
+            {
+                mFloatingValuesEnabled = enabled;
+            }
+            void BarPresenterBase::enableToolTip(bool enabled)
+            {
+                mToolTipEnabled = enabled;
+            }
-            void BarPresenterBase::barHoverEntered(QGraphicsSceneHoverEvent *event)
+            void BarPresenterBase::enableSeparators(bool enabled)
             {
-                //TODO: show tooltip (name of series, where bar belongs...)
+                mSeparatorsEnabled = enabled;
             }
-            void BarPresenterBase::barHoverLeaved(QGraphicsSceneHoverEvent *event)
+            void BarPresenterBase::showToolTip(QPoint pos, QString tip)
             {
-                //TODO: hide tooltip (name of series, where bar belongs...)
+                if (mToolTipEnabled) {
+                    // TODO: cool tooltip instead of default
+                    QToolTip::showText(pos,tip);
+                }
             }
             #include "moc_barpresenterbase.cpp"

src/barchart/barpresenterbase.h +15 -8

             #define BARPRESENTERBASE_H
             #include "chartitem_p.h"
-            #include "barchartmodel_p.h"
+            #include "qbarchartseries.h"
             #include <QPen>
             #include <QBrush>
             #include <QGraphicsItem>
             {
                 Q_OBJECT
             public:
-                BarPresenterBase(BarChartModel& model, QGraphicsItem *parent = 0);
+                BarPresenterBase(QBarChartSeries *series, QGraphicsItem *parent = 0);
-                void setSeparatorsVisible(bool visible = true);
+                ~BarPresenterBase();
             public:
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& size);
-                void barHoverEntered(QGraphicsSceneHoverEvent *event);  // Internal.
+                // Internal slots
-                void barHoverLeaved(QGraphicsSceneHoverEvent *event);
+                void enableFloatingValues(bool enabled=true);   // enables floating values on top of bars
+                void enableToolTip(bool enabled=true);          // enables tooltips
+                void enableSeparators(bool enabled=true);       // enables separators between categories
+                void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)
             protected:
                 bool mLayoutSet;    // True, if component has been laid out.
                 bool mLayoutDirty;
-                bool mSeparatorsVisible;
+                bool mFloatingValuesEnabled;
-                BarChartModel& mModel;
+                bool mToolTipEnabled;
+                bool mSeparatorsEnabled;
+                // Owned
+                QBarChartSeries* mSeries;
                 // Not owned.
                 QList<Bar*> mBars;
                 QList<BarLabel*> mLabels;
                 QList<Separator*> mSeparators;
                 QList<BarValue*> mFloatingValues;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarpresenter.cpp +18 -16

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PercentBarPresenter::PercentBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
+            PercentBarPresenter::PercentBarPresenter(QBarChartSeries *series, QGraphicsItem *parent) :
-                BarPresenterBase(model, parent)
+                BarPresenterBase(series, parent)
             {
             }
             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mModel.countSets() <= 0) {
+                if (mSeries->countSets() <= 0) {
                     qDebug() << "No sets in model!";
                     // Nothing to do.
                     return;
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
-                int count = mModel.countCategories();
+                int count = mSeries->countCategories();
                 int itemIndex(0);
                 int labelIndex(0);
                 qreal tW = mWidth;
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 qreal h = mHeight;
-                for (int category = 0; category < mModel.countCategories(); category++) {
+                for (int category = 0; category < mSeries->countCategories(); category++) {
-                    qreal colSum = mModel.categorySum(category);
+                    qreal colSum = mSeries->categorySum(category);
                     qreal scale = (h / colSum);
                     qreal yPos = h;
-                    for (int set=0; set < mModel.countSets(); set++) {
+                    for (int set=0; set < mSeries->countSets(); set++) {
-                        qreal barHeight = mModel.valueAt(set, category) * scale;
+                        qreal barHeight = mSeries->valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mModel.setAt(set)->brush());
+                        bar->setBrush(mSeries->setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                 // Position separators
                 xPos = xStep + xStep/2;
-                for (int s=0; s < mModel.countCategories() - 1; s++) {
+                for (int s=0; s < mSeries->countCategories() - 1; s++) {
                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                 // Position floating values
                 itemIndex = 0;
                 xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                for (int category=0; category < mModel.countCategories(); category++) {
+                for (int category=0; category < mSeries->countCategories(); category++) {
                     qreal yPos = h;
-                    qreal colSum = mModel.categorySum(category);
+                    qreal colSum = mSeries->categorySum(category);
                     qreal scale = (h / colSum);
-                    for (int set=0; set < mModel.countSets(); set++) {
+                    for (int set=0; set < mSeries->countSets(); set++) {
-                        qreal barHeight = mModel.valueAt(set,category) * scale;
+                        qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
-                        if (mModel.valueAt(set,category) != 0) {
+                        if (mSeries->valueAt(set,category) != 0) {
-                            int p = mModel.percentageAt(set,category) * 100;
+                            int p = mSeries->percentageAt(set,category) * 100;
                             QString vString(QString::number(p));
                             vString.truncate(3);
                             vString.append("%");
                 mLayoutDirty = true;
             }
+            #include "moc_percentbarpresenter.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarpresenter.h +2 -1

             class PercentBarPresenter : public BarPresenterBase
             {
+                Q_OBJECT
             public:
-                PercentBarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
+                PercentBarPresenter(QBarChartSeries *series, QGraphicsItem *parent = 0);
             private:

src/barchart/qbarchartseries.cpp +34 -6

             void QBarChartSeries::addBarSet(QBarSet *set)
             {
-            //    connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
+                connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
-            //    connect(this,SIGNAL(hoverNamesEnabled(bool)),set,SLOT(enableHoverNames(bool)));
+                connect(this,SIGNAL(separatorsEnabled(bool)),set,SLOT(enableSeparators(bool)));
+                connect(this,SIGNAL(toolTipEnabled(bool)),set,SLOT(enableToolTip(bool)));
+                connect(set,SIGNAL(showToolTip(QPoint,QString)),this,SIGNAL(showToolTip(QPoint,QString)));
                 mModel->addBarSet(set);
             }
             void QBarChartSeries::removeBarSet(QBarSet *set)
             {
-            //    disconnect(set,SLOT(enableFloatingValues(bool)));
+                disconnect(set,SLOT(enableFloatingValues(bool)));
-            //    disconnect(set,SLOT(enableHoverNames(bool)));
+                disconnect(set,SLOT(enableSeparators(bool)));
+                disconnect(set,SLOT(enableToolTip(bool)));
                 mModel->removeBarSet(set);
             }
                 return mModel->nextSet(getFirst);
             }
+            QBarSet* QBarChartSeries::setAt(int index)
+            {
+                return mModel->setAt(index);
+            }
             QList<QString> QBarChartSeries::legend()
             {
                 return mModel->legend();
             }
+            QString QBarChartSeries::label(int category)
+            {
+                return mModel->label(category);
+            }
             void QBarChartSeries::enableFloatingValues(bool enabled)
             {
                 emit floatingValuesEnabled(enabled);
             }
-            void QBarChartSeries::enableHoverNames(bool enabled)
+            void QBarChartSeries::enableToolTip(bool enabled)
             {
-                emit hoverNamesEnabled(enabled);
+                emit toolTipEnabled(enabled);
+            }
+            void QBarChartSeries::enableSeparators(bool enabled)
+            {
+                emit separatorsEnabled(enabled);
             }
             int QBarChartSeries::countCategories()
                 return mModel->valueAt(set,category);
             }
+            qreal QBarChartSeries::percentageAt(int set, int category)
+            {
+                return mModel->percentageAt(set,category);
+            }
+            qreal QBarChartSeries::categorySum(int category)
+            {
+                return mModel->categorySum(category);
+            }
             qreal QBarChartSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();

src/barchart/qbarchartseries.h +15 -8

                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool getFirst=false);     // Returns first set, if called with true
+                QBarSet *setAt(int index);
-                QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
+                QList<QString> legend();                    // Returns legend of series (ie. names of all sets in series)
+                QString label(int category);
+            public Q_SLOTS:
                 // Disabled by default. Call these to change behavior.
-                void enableFloatingValues(bool enabled=true);
+                void enableFloatingValues(bool enabled=true);    // enables floating values on top of bars
-                void enableHoverNames(bool enabled=true);
+                void enableToolTip(bool enabled=true);           // enables tooltips
+                void enableSeparators(bool enabled=true);        // enables separators between categories
+            public:
                 // TODO: Functions below this are not part of api and will be moved
                 // to private implementation, when we start using it (not part of api)
                 int countCategories();
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
+                qreal percentageAt(int set, int category);
+                qreal categorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
             signals:
                 void changed(int index);
-                // TODO: these to private implementation.
+                // TODO: internal signals, these to private implementation.
                 void floatingValuesEnabled(bool enabled);
-                void hoverNamesEnabled(bool enabled);
+                void toolTipEnabled(bool enabled);
+                void separatorsEnabled(bool enabled);
+                void showToolTip(QPoint pos, QString tip);
-            //public Q_SLOTS:
             protected:
                 BarChartModel* mModel;

src/barchart/qbarset.cpp +21 -13

             QBarSet::QBarSet(QString name, QObject *parent)
                 : QObject(parent)
                 ,mName(name)
-                ,mHoverNamesEnabled(true)       // TODO: these 2 as false by default, when implementation is ready
+                ,mToolTipEnabled(true)       // TODO: these 2 as false by default, when implementation is ready
                 ,mFloatingValuesEnabled(true)
             {
             }
             void QBarSet::enableFloatingValues(bool enabled)
             {
-                qDebug() << "QBarSet::enableFloatingValues" << enabled;
+                qDebug() << "QBarSet::enableFloatingValues";
                 mFloatingValuesEnabled = enabled;
             }
             void QBarSet::enableToolTip(bool enabled)
             {
-                qDebug() << "QBarSet::enableHoverNames" << enabled;
+                qDebug() << "QBarSet::enableToolTip";
-                mHoverNamesEnabled = enabled;
+                mToolTipEnabled = enabled;
+            }
+            void QBarSet::enableSeparators(bool enabled)
+            {
+                qDebug() << "QBarSet::enableSeparators";
+                mSeparatorsEnabled = enabled;
             }
             void QBarSet::barClicked()
             {
-                qDebug() << "QBarset::barClicked" << this;
+            //    qDebug() << "QBarset::barClicked" << this;
                 // Some bar of this set has been clicked
                 // TODO: What happens then?
                 emit clicked();     // Notify that set has been clicked
             void QBarSet::barHoverEntered(QPoint pos)
             {
-                qDebug() << "QBarset::barHoverEntered" << this << pos;
+                if (mToolTipEnabled) {
-                if (mHoverNamesEnabled) {
+                    emit showToolTip(pos, mName);
-                    QToolTip::showText(pos, mName);
-            //        emit hoverEnter();
                 }
+                // Emit signal to user of charts
+                emit hoverEnter(pos);
             }
             void QBarSet::barHoverLeaved()
             {
-                qDebug() << "QBarset::barHoverLeaved" << this;
+            //    qDebug() << "QBarset::barHoverLeaved" << this;
-                if (mHoverNamesEnabled) {
+            //    if (mToolTipEnabled) {
-            //        emit hoverLeave();
+                    // TODO: do what?
+            //    }
+                // Emit signal to user of charts
+                emit hoverLeave();
             }
             #include "moc_qbarset.cpp"

src/barchart/qbarset.h +6 -4

             Q_SIGNALS:
                 void clicked();                 // Clicked and hover signals exposed to user
-                void hoverEnter();
+                void hoverEnter(QPoint pos);
                 void hoverLeave();
-                void toggleFloatingValues();    // Private signal, TODO: move to private impl
+                void toggleFloatingValues();                // Private signal, TODO: move to private impl
+                void showToolTip(QPoint pos, QString tip);  // Private signal, TODO: move to private impl
             public Q_SLOTS:
-                // TODO: should these be in series instead?
                 void enableFloatingValues(bool enabled);    // enables floating values on top of bars
                 void enableToolTip(bool enabled);           // enables tooltips
+                void enableSeparators(bool enabled);        // enables separators between categories
                 // TODO: these slots belong to private implementation.
                 // These are for single bars to notify set about internal events
                 // TODO: to pimpl
                 bool mFloatingValuesEnabled;
-                bool mHoverNamesEnabled;
+                bool mToolTipEnabled;
+                bool mSeparatorsEnabled;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarpresenter.cpp +18 -16

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            StackedBarPresenter::StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
+            StackedBarPresenter::StackedBarPresenter(QBarChartSeries *series, QGraphicsItem *parent) :
-                BarPresenterBase(model,parent)
+                BarPresenterBase(series,parent)
             {
             }
             {
                 // Scale bars to new layout
                 // Layout for bars:
-                if (mModel.countSets() <= 0) {
+                if (mSeries->countSets() <= 0) {
                     qDebug() << "No sets in model!";
                     // Nothing to do.
                     return;
                 }
-                if (mModel.countCategories() == 0) {
+                if (mSeries->countCategories() == 0) {
                     qDebug() << "No categories in model!";
                     // Nothing to do
                     return;
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 // TODO: use temp variable for category count...
-                qreal maxSum = mModel.maxCategorySum();
+                qreal maxSum = mSeries->maxCategorySum();
                 qreal h = mHeight;
                 qreal scale = (h / maxSum);
                 int itemIndex(0);
                 int labelIndex(0);
                 qreal tW = mWidth;
-                qreal tC = mModel.countCategories() + 1;
+                qreal tC = mSeries->countCategories() + 1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                for (int category = 0; category < mModel.countCategories(); category++) {
+                for (int category = 0; category < mSeries->countCategories(); category++) {
                     qreal yPos = h;
-                    for (int set=0; set < mModel.countSets(); set++) {
+                    for (int set=0; set < mSeries->countSets(); set++) {
-                        qreal barHeight = mModel.valueAt(set, category) * scale;
+                        qreal barHeight = mSeries->valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         bar->resize(mBarDefaultWidth, barHeight);
-                        bar->setBrush(mModel.setAt(set)->brush());
+                        bar->setBrush(mSeries->setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                 // Position separators
                 xPos = xStep + xStep/2;
-                for (int s=0; s < mModel.countCategories() - 1; s++) {
+                for (int s=0; s < mSeries->countCategories() - 1; s++) {
                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                 // Position floating values
                 itemIndex = 0;
                 xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                for (int category=0; category < mModel.countCategories(); category++) {
+                for (int category=0; category < mSeries->countCategories(); category++) {
                     qreal yPos = h;
-                    for (int set=0; set < mModel.countSets(); set++) {
+                    for (int set=0; set < mSeries->countSets(); set++) {
-                        qreal barHeight = mModel.valueAt(set,category) * scale;
+                        qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
-                        if (mModel.valueAt(set,category) != 0) {
+                        if (mSeries->valueAt(set,category) != 0) {
-                            value->setValueString(QString::number(mModel.valueAt(set,category)));
+                            value->setValueString(QString::number(mSeries->valueAt(set,category)));
                         } else {
                             value->setValueString(QString(""));
                         }
                 mLayoutDirty = true;
             }
+            #include "moc_stackedbarpresenter.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarpresenter.h +2 -1

             class StackedBarPresenter : public BarPresenterBase
             {
+                Q_OBJECT
             public:
-                StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
+                StackedBarPresenter(QBarChartSeries *series, QGraphicsItem *parent = 0);
             private:
                 // From BarPresenterBase

src/chartpresenter.cpp +3 -3

                     case QChartSeries::SeriesTypeBar: {
                         QBarChartSeries* barSeries = static_cast<QBarChartSeries*>(series);
-                        BarPresenter* item = new BarPresenter(barSeries->model(),m_chart);
+                        BarPresenter* item = new BarPresenter(barSeries,m_chart);
                         m_chartTheme->decorate(item,barSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(barSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                     case QChartSeries::SeriesTypeStackedBar: {
                         QStackedBarChartSeries* stackedBarSeries = static_cast<QStackedBarChartSeries*>(series);
-                        StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries->model(),m_chart);
+                        StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
                         m_chartTheme->decorate(item,stackedBarSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(stackedBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
                     case QChartSeries::SeriesTypePercentBar: {
                         QPercentBarChartSeries* percentBarSeries = static_cast<QPercentBarChartSeries*>(series);
-                        PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries->model(),m_chart);
+                        PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
                         m_chartTheme->decorate(item,percentBarSeries ,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(percentBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));

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