HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r256:bd68fc4fe7ab

Bug fix for bar presenters. It appears that order of childItems may change. Relying on order caused crash

sauimone -

r256:bd68fc4fe7ab

parent child

Context file:

r256:bd68fc4fe7ab

Collapse all files

src/barchart/bar.cpp +8 -7

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Bar::Bar(QGraphicsItem *parent)
-                : ChartItem(parent)
+                : QGraphicsObject(parent)
             {
+                setAcceptedMouseButtons(Qt::LeftButton);
             }
             void Bar::setSize(const QSizeF& size)
             void Bar::resize( qreal w, qreal h )
             {
-            //    qDebug() << "bar::resize" << w << h;
                 mWidth = w;
                 mHeight = h;
             }
             void Bar::setPos(qreal x, qreal y)
             {
-             //   qDebug() << "Bar::setpos" << x << y;
                 mXpos = x;
                 mYpos = y;
             }
                 if (0 == mHeight) {
                     return;
                 }
-                // TODO: accept brush instead of color
                 painter->setBrush(mBrush);
-            //    QBrush brush(mColor);
-            //    painter->setBrush(brush);
                 // This compensates for rounding errors. drawRect takes ints and cumulative error of pos + size may be over 1.
                 int x0 = mXpos;
                 return r;
             }
-            //#include "moc_bar_p.cpp"
+            void Bar::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
+            {
+                emit clicked();
+            }
+            #include "moc_bar_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bar_p.h +7 -3

             #ifndef BAR_H
             #define BAR_H
-            #include "chartitem_p.h"
             #include "qchartglobal.h"
-            #include <QGraphicsItem>
+            #include <QGraphicsObject>
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Single bar item of chart
-            class Bar : public ChartItem
+            class Bar : public QGraphicsObject
             {
+                Q_OBJECT
             public:
                 Bar(QGraphicsItem *parent=0);
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
+                void mousePressEvent(QGraphicsSceneMouseEvent *event);
+            Q_SIGNALS:
+                void clicked();
             private:

src/barchart/barpresenter.cpp +4 -5

             void BarPresenter::layoutChanged()
             {
-            //    qDebug() << "BarGroup::layoutChanged";
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countSets() <= 0) {
                 }
                 if (childItems().count() == 0) {
-                    qDebug() << "WARNING: BarGroup::layoutChanged called before graphics items are created!";
+                    qDebug() << "WARNING: BarPresenter::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // Scaling.
                 int itemIndex(0);
-                int labelIndex = itemCount * setCount;
+                int labelIndex(0);
                 for (int item=0; item < itemCount; item++) {
                     qreal xPos = xStepPerSet * item + ((tW + mBarDefaultWidth*setCount)/(itemCount*2));
                     qreal yPos = mHeight;
                     for (int set = 0; set < setCount; set++) {
                         qreal barHeight = mModel.valueAt(set, item) * scale;
-                        Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
+                        Bar* bar = mBars.at(itemIndex);
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                     // TODO: Layout for labels, remove magic number
                     xPos = xStepPerSet * item + ((tW + mBarDefaultWidth*setCount)/(itemCount*2));
-                    BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
+                    BarLabel* label = mLabels.at(labelIndex);
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                 }

src/barchart/barpresenter.h +1 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            // Base class for bar groups
+            // Presenter for parallel bars. Grouping of bars is done on category basis.
             class BarPresenter : public BarPresenterBase
             {
             public:

src/barchart/barpresenterbase.cpp +12 -6

             void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-            //    qDebug() << "BarGroupBase::paint" << childItems().count();
                 if (!mLayoutSet) {
-                    qDebug() << "BarGroupBase::paint called without layout set. Aborting.";
+                    qDebug() << "BarPresenterBase::paint called without layout set. Aborting.";
                     return;
                 }
             //    if (mLayoutDirty) {
             void BarPresenterBase::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
+                qDebug() << "datachanged";
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
+                mBars.clear();
+                mLabels.clear();
+                mSeparators.clear();
                 // Create new graphic items for bars
                 for (int s=0; s<mModel.countSets(); s++) {
                     QBarSet *set = mModel.nextSet(0==s);
                     for (int c=0; c<mModel.countCategories(); c++) {
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
-                        //connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
+                        mBars.append(bar);
+                        connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
                     }
                 }
                     BarLabel* label = new BarLabel(this);
                     label->set(mModel.label(i));
                     childItems().append(label);
+                    mLabels.append(label);
                 }
                 count = mModel.countCategories() - 1;   // There is one less separator than columns
                     Separator* sep = new Separator(this);
                     sep->setColor(QColor(255,0,0,255));     // TODO: color for separations from theme
                     childItems().append(sep);
+                    mSeparators.append(sep);
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
             void BarPresenterBase::handleModelChanged(int index)
             {
-            //    qDebug() << "BarGroupBase::handleModelChanged" << index;
+            //    qDebug() << "BarPresenterBase::handleModelChanged" << index;
                 dataChanged();
             }
             void BarPresenterBase::handleDomainChanged(const Domain& domain)
             {
-            //    qDebug() << "BarGroupBase::handleDomainChanged";
+            //    qDebug() << "BarPresenterBase::handleDomainChanged";
                 // TODO: Figure out the use case for this.
                 // Affects the size of visible item, so layout is changed.
             //    layoutChanged();

src/barchart/barpresenterbase.h +10 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            // Base Class for bar groups. Common implemantation of different groups. Not to be instantiated.
+            class Bar;
+            class BarLabel;
+            class Separator;
+            // Common implemantation of different presenters. Not to be instantiated.
             class BarPresenterBase : public QObject, public ChartItem
             {
                 Q_OBJECT
                 bool mLayoutSet;    // True, if component has been laid out.
                 bool mLayoutDirty;
-                QList<QColor> mColors;  // List of colors for series for now
                 bool mSeparatorsVisible;
                 BarChartModel& mModel;
+                // Not owned.
+                QList<Bar*> mBars;
+                QList<BarLabel*> mLabels;
+                QList<Separator*> mSeparators;
                 QPen mPen;
             };

src/barchart/percentbarpresenter.cpp +7 -8

             void PercentBarPresenter::layoutChanged()
             {
-            //    qDebug() << "PercentBarGroup::layoutChanged";
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countSets() <= 0) {
                 }
                 if (childItems().count() == 0) {
-                    qDebug() << "WARNING: PercentBarGroup::layoutChanged called before graphics items are created!";
+                    qDebug() << "WARNING: PercentBarPresenter::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 int count = mModel.countCategories();
                 int itemIndex(0);
+                int labelIndex(0);
                 qreal tW = mWidth;
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                int labelIndex = mModel.countCategories() * mModel.countSets();
                 for (int category = 0; category < mModel.countCategories(); category++) {
                     qreal colSum = mModel.categorySum(category);
                     qreal yPos = h;
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set, category) * scale;
-                        Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
+                        Bar* bar = mBars.at(itemIndex);
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                     }
                     // TODO: Layout for labels, remove magic number
-                    BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
+                    BarLabel* label = mLabels.at(labelIndex);
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
-                int separatorIndex = labelIndex;    // Separators are after labels in childItems(). TODO: better way to store these?
+                int separatorIndex(0);
-                xPos = xStep + xStep/2;             // Initial position is between first and second group. ie one and half steps from left.
+                xPos = xStep + xStep/2;
                 for (int s=0; s < mModel.countCategories() - 1; s++) {
-                    Separator* sep = reinterpret_cast<Separator*> (childItems().at(separatorIndex));
+                    Separator* sep = mSeparators.at(separatorIndex);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                     xPos += xStep;

src/barchart/stackedbarpresenter.cpp +7 -8

             void StackedBarPresenter::layoutChanged()
             {
-            //    qDebug() << "StackedBarGroup::layoutChanged";
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countSets() <= 0) {
                 }
                 if (childItems().count() == 0) {
-                    qDebug() << "WARNING: StackedBarGroup::layoutChanged called before graphics items are created!";
+                    qDebug() << "WARNING: StackedBarPresenter::layoutChanged called before graphics items are created!";
                     return;
                 }
                 qreal scale = (h / maxSum);
                 int itemIndex(0);
+                int labelIndex(0);
                 qreal tW = mWidth;
                 qreal tC = mModel.countCategories() + 1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
-                int labelIndex = mModel.countSets() * mModel.countCategories();
                 for (int category = 0; category < mModel.countCategories(); category++) {
                     qreal yPos = h;
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set, category) * scale;
-                        Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
+                        Bar* bar = mBars.at(itemIndex);
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setBrush(mModel.setAt(set).brush());
                     }
                     // TODO: Layout for labels, remove magic number
-                    BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
+                    BarLabel* label = mLabels.at(labelIndex);
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
-                int separatorIndex = labelIndex;    // Separators are after labels in childItems(). TODO: better way to store these?
+                int separatorIndex(0);
-                xPos = xStep + xStep/2;             // Initial position is between first and second group. ie one and half steps from left.
+                xPos = xStep + xStep/2;
                 for (int s=0; s < mModel.countCategories() - 1; s++) {
-                    Separator* sep = reinterpret_cast<Separator*> (childItems().at(separatorIndex));
+                    Separator* sep = mSeparators.at(separatorIndex);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                     xPos += xStep;

src/barchart/stackedbarpresenter.h +4 -4

-            #ifndef STACKEDBARGROUP_H
+            #ifndef STACKEDBARPRESENTER_H
-            #define STACKEDBARGROUP_H
+            #define STACKEDBARPRESENTER_H
             #include "barpresenterbase.h"
             #include "qstackedbarchartseries.h"
                 StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent = 0);
             private:
-                // From BarGroupBase
+                // From BarPresenterBase
                 void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             private:
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // STACKEDBARGROUP_H
+            #endif // STACKEDBARPRESENTER_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