HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r694:08035ff71c15

animations to stacked and percent barchart

sauimone -

r694:08035ff71c15

parent child

Context file:

r694:08035ff71c15

Collapse all files

src/barchart/barchartitem.cpp 0 -102

             #include "barchartitem_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             #include "qbarseries.h"
             #include "qchart.h"
             #include "qchartaxis.h"
             #include "qchartaxiscategories.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include "chartdataset_p.h"
             #include <QDebug>
             #include <QToolTip>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartItem::BarChartItem(QBarSeries *series, ChartPresenter *presenter) :
                 ChartItem(presenter),
                 mLayoutSet(false),
                 mSeries(series)
             {
                 connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
                 connect(series, SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
             //TODO:  connect(series,SIGNAL("position or size has changed"), this, SLOT(handleLayoutChanged()));
                 connect(series, SIGNAL(restructuredBar(int)), this, SLOT(handleModelChanged(int)));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 initAxisLabels();
                 dataChanged();
             }
             BarChartItem::~BarChartItem()
             {
                 disconnect(this,SLOT(showToolTip(QPoint,QString)));
             }
             void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
                     qDebug() << "BarChartItem::paint called without layout set. Aborting.";
                     return;
                 }
                 foreach(QGraphicsItem* i, childItems()) {
                     i->paint(painter,option,widget);
                 }
             }
             QRectF BarChartItem::boundingRect() const
             {
                 return m_rect;
             }
             void BarChartItem::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 mBars.clear();
                 mFloatingValues.clear();
                 mLayout.clear();
                 // Create new graphic items for bars
                 for (int c=0; c<mSeries->categoryCount(); c++) {
                     QString category = mSeries->categoryName(c);
                     for (int s=0; s<mSeries->barsetCount(); s++) {
                         QBarSet *set = mSeries->barsetAt(s);
                         Bar *bar = new Bar(category,this);
                         childItems().append(bar);
                         mBars.append(bar);
                         connect(bar,SIGNAL(clicked(QString)),set,SIGNAL(clicked(QString)));
                         connect(bar,SIGNAL(rightClicked(QString)),set,SIGNAL(rightClicked(QString)));
                         connect(bar,SIGNAL(hoverEntered(QPoint)),set,SLOT(barHoverEnterEvent(QPoint)));
                         connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaveEvent()));
                         mLayout.append(QRectF(0,0,0,0));
                     }
                 }
                 // Create floating values
                 for (int category=0; category<mSeries->categoryCount(); category++) {
                     for (int s=0; s<mSeries->barsetCount(); s++) {
                         QBarSet *set = mSeries->barsetAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
                         mFloatingValues.append(value);
                         connect(set,SIGNAL(toggleFloatingValues()),value,SLOT(toggleVisible()));
                     }
                 }
             }
-            /*
-            void BarChartItem::layoutChanged()
-                qDebug() << "Deprecated BarChartItem::layoutChanged called. aborting";
-                return;
-                // Scale bars to new layout
-                // Layout for bars:
-                if (mSeries->barsetCount() <= 0) {
-                    qDebug() << "No sets in model!";
-                    return;
-                if (childItems().count() == 0) {
-                    qDebug() << "WARNING: BarChartitem::layoutChanged called before graphics items are created!";
-                    return;
-                // Use temporary qreals for accurancy (we might get some compiler warnings... :)
-                qreal categoryCount = mSeries->categoryCount();
-                qreal setCount = mSeries->barsetCount();
-                qreal max = mSeries->max();
-                // Domain:
-                   if (mDomainMaxY > max) {
-                       max = mDomainMaxY;
-                qreal width = geometry().width();
-                qreal height = geometry().height();
-                qreal scale = (height/max);
-                qreal categoryWidth = width/categoryCount;
-                qreal barWidth = categoryWidth / (setCount+1);
-                BarLayout layout;
-                int itemIndex(0);
-                for (int category=0; category < categoryCount; category++) {
-                    qreal xPos = categoryWidth * category  + barWidth/2;
-                    qreal yPos = height;
-                    for (int set = 0; set < setCount; set++) {
-                        qreal barHeight = mSeries->valueAt(set,category) * scale;
-                        Bar* bar = mBars.at(itemIndex);
-                        QRectF rect(xPos,yPos-barHeight,mBarWidth,barHeight);
-                        layout.insert(bar,rect);
-                        // TODO: width settable per bar?
-                        bar->setRect(xPos, yPos-barHeight,barWidth, barHeight);
-                        bar->setPen(mSeries->barsetAt(set)->pen());
-                        bar->setBrush(mSeries->barsetAt(set)->brush());
-            //            bar->resize(mBarWidth, barHeight);
-            //            layout.insert(bar,QSizeF(mBarWidth,barHeight));
-                        bar->setPen(mSeries->barsetAt(set)->pen());
-                        bar->setBrush(mSeries->barsetAt(set)->brush());
-            //            bar->setPos(xPos, yPos-barHeight);
-                        itemIndex++;
-                        xPos += barWidth;
-                // Position floating values
-                itemIndex = 0;
-                for (int category=0; category < mSeries->categoryCount(); category++) {
-                    qreal xPos = categoryWidth * category + categoryWidth/2 + barWidth;
-                    qreal yPos = height;
-                    for (int set=0; set < mSeries->barsetCount(); set++) {
-                        qreal barHeight = mSeries->valueAt(set,category) * scale;
-                        BarValue* value = mFloatingValues.at(itemIndex);
-                        QBarSet* barSet = mSeries->barsetAt(set);
-                        value->resize(100,50);  // TODO: proper layout for this.
-                        value->setPos(xPos, yPos-barHeight/2);
-                        value->setPen(barSet->floatingValuePen());
-                        if (mSeries->valueAt(set,category) != 0) {
-                            value->setValueString(QString::number(mSeries->valueAt(set,category)));
-                        } else {
-                            value->setValueString(QString(""));
-                        itemIndex++;
-                        xPos += barWidth;
-            //    update();
-            */
             QVector<QRectF> BarChartItem::calculateLayout()
             {
-            //    layoutChanged();
-            /*
-                BarLayout layout;
-                foreach(Bar* bar, mBars) {
-                    layout.insert(bar,bar->boundingRect());
-            */
                 QVector<QRectF> layout;
                 // Use temporary qreals for accurancy (we might get some compiler warnings... :)
                 qreal categoryCount = mSeries->categoryCount();
                 qreal setCount = mSeries->barsetCount();
                 qreal width = geometry().width();
                 qreal height = geometry().height();
                 qreal max = mSeries->max();
                 // Domain:
                 if (mDomainMaxY > max) {
                     max = mDomainMaxY;
                 }
                 qreal scale = (height/max);
                 qreal categoryWidth = width/categoryCount;
                 qreal barWidth = categoryWidth / (setCount+1);
                 int itemIndex(0);
                 for (int category=0; category < categoryCount; category++) {
                     qreal xPos = categoryWidth * category + barWidth/2;
                     qreal yPos = height;
                     for (int set = 0; set < setCount; set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         QRectF rect(xPos,yPos-barHeight,barWidth,barHeight);
-                        //layout.insert(bar,rect);
                         layout.append(rect);
-                        // TODO: width settable per bar?
-            //            bar->resize(mBarWidth, barHeight);
-            //            layout.insert(bar,QSizeF(mBarWidth,barHeight));
                         bar->setPen(mSeries->barsetAt(set)->pen());
                         bar->setBrush(mSeries->barsetAt(set)->brush());
-            //            bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         xPos += barWidth;
                     }
                 }
                 // Position floating values
                 itemIndex = 0;
                 for (int category=0; category < mSeries->categoryCount(); category++) {
                     qreal xPos = categoryWidth * category  + barWidth;
                     qreal yPos = height;
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         QBarSet* barSet = mSeries->barsetAt(set);
                         value->resize(100,50);  // TODO: proper layout for this.
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(barSet->floatingValuePen());
                         if (mSeries->valueAt(set,category) != 0) {
                             value->setValueString(QString::number(mSeries->valueAt(set,category)));
                         } else {
                             value->setValueString(QString(""));
                         }
                         itemIndex++;
                         xPos += barWidth;
                     }
                 }
                 return layout;
             }
             void BarChartItem::applyLayout(const QVector<QRectF> &layout)
             {
                 if (animator())
                     animator()->updateLayout(this, mLayout, layout);
                 else
                     setLayout(layout);
             }
             void BarChartItem::setLayout(const QVector<QRectF> &layout)
             {
                 mLayout = layout;
                 for (int i=0; i<mBars.count(); i++) {
-                    //mBars.at(i)->setSize(layout.at(i).size());
-                    //mBars.at(i)->setPos(layout.at(i).topLeft());
                     mBars.at(i)->setRect(layout.at(i));
                 }
                 update();
             }
             void BarChartItem::initAxisLabels()
             {
                 int count = mSeries->categoryCount();
                 if (0 == count) {
                     return;
                 }
                 Domain* domain = presenter()->dataSet()->domain(mSeries);
                 qreal min = 0;
                 qreal max = count+1;
                 domain->setRangeX(min,max,count+1);
             }
             //handlers
             void BarChartItem::handleModelChanged(int index)
             {
                 Q_UNUSED(index)
                 dataChanged();
             }
             void BarChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 mDomainMinX = minX;
                 mDomainMaxX = maxX;
                 mDomainMinY = minY;
                 mDomainMaxY = maxY;
                 handleLayoutChanged();
                 /*
                 int count = mSeries->categoryCount();
                 if (0 == count) {
                     return;
                 }
                 // Position labels to domain
                 qreal min = domain.minX();
                 qreal max = domain.maxX();
                 qreal step = (max-min)/count;
                 QChartAxisCategories& categories = mChart->axisX()->categories();
                 categories.clear();
                 for (int i=0; i<count; i++) {
                     categories.insert(min,mSeries->categoryName(i));
                     min += step;
                 }
                 */
             }
             void BarChartItem::handleGeometryChanged(const QRectF& rect)
             {
                 m_rect=rect;
                 handleLayoutChanged();
                 mLayoutSet = true;
                 setPos(rect.topLeft());
             }
             void BarChartItem::handleLayoutChanged()
             {
                 qDebug() << "BarChartItem::handleLayoutChanged";
                 QVector<QRectF> layout = calculateLayout();
                 applyLayout(layout);
                 update();
             }
             void BarChartItem::showToolTip(QPoint pos, QString tip)
             {
                 // TODO: cool tooltip instead of default
                 QToolTip::showText(pos,tip);
             }
             #include "moc_barchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartitem_p.h +1 -2

             #ifndef BARCHARTITEM_H
             #define BARCHARTITEM_H
             #include "chartitem_p.h"
             #include "qbarseries.h"
             #include <QPen>
             #include <QBrush>
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Bar;
             class BarValue;
             class QChartAxisCategories;
             class QChart;
             //typedef QVector<QRectF> BarLayout;
             class BarChartItem : public ChartItem
             {
                 Q_OBJECT
             public:
                 BarChartItem(QBarSeries *series, ChartPresenter *presenter);
                 virtual ~BarChartItem();
             // Common implemantation of different presenters. Not to be instantiated.
             // TODO: combine this with BarPresenter and derive other presenters from it?
             public:
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
                 // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
             private slots:
-                //virtual void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             public:
-                QVector<QRectF> calculateLayout();
+                virtual QVector<QRectF> calculateLayout();
                 void applyLayout(const QVector<QRectF> &layout);
                 void setLayout(const QVector<QRectF> &layout);
                 void updateLayout(const QVector<QRectF> &layout);
                 QRectF geometry() const { return m_rect;}
             protected:
                 void initAxisLabels();
             public slots:
                 void handleModelChanged(int index);
                 void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF& size);
                 void handleLayoutChanged();
                 // Internal slots
                 void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)
             protected:
                 // TODO: consider these.
                 qreal mDomainMinX;
                 qreal mDomainMaxX;
                 qreal mDomainMinY;
                 qreal mDomainMaxY;
                 QRectF m_rect;
                 bool mLayoutSet;    // True, if component has been laid out.
                 QVector<QRectF> mLayout;
                 // Not owned.
                 QBarSeries* mSeries;
                 QList<Bar*> mBars;
                 QList<BarValue*> mFloatingValues;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTITEM_H

src/barchart/percentbarchartitem.cpp +5 -18

             #include "percentbarchartitem_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarChartItem::PercentBarChartItem(QBarSeries *series, ChartPresenter* presenter) :
                 BarChartItem(series, presenter)
             {
             }
-            void PercentBarChartItem::layoutChanged()
+            QVector<QRectF> PercentBarChartItem::calculateLayout()
             {
-                // Scale bars to new layout
+                QVector<QRectF> layout;
-                // Layout for bars:
-                if (mSeries->barsetCount() <= 0) {
-                    qDebug() << "No sets in model!";
-                    // Nothing to do.
-                    return;
-                if (childItems().count() == 0) {
-                    qDebug() << "WARNING: PercentBarChartItem::layoutChanged called before graphics items are created!";
-                    return;
                 // Use temporary qreals for accurancy (we might get some compiler warnings... :)
                 qreal width = geometry().width();
                 qreal height = geometry().height();
                 qreal categoryCount = mSeries->categoryCount();
                 qreal barWidth = width / (mSeries->categoryCount() * 2);
                 qreal xStep = width/categoryCount;
                 qreal xPos =  xStep/2 - barWidth / 2;
                 int itemIndex(0);
                 for (int category = 0; category < categoryCount ; category++) {
                     qreal colSum = mSeries->categorySum(category);
                     qreal scale = (height / colSum);
                     qreal yPos = height;
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
-                        // TODO: width settable per bar?
                         bar->setPen(mSeries->barsetAt(set)->pen());
-                        bar->setRect(xPos, yPos-barHeight,barWidth, barHeight);
                         bar->setBrush(mSeries->barsetAt(set)->brush());
+                        QRectF rect(xPos, yPos-barHeight,barWidth, barHeight);
+                        layout.append(rect);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     xPos += xStep;
                 }
                 // Position floating values
                 itemIndex = 0;
                 xPos = (width/categoryCount);
                 for (int category=0; category < mSeries->categoryCount(); category++) {
                     qreal yPos = height;
                     qreal colSum = mSeries->categorySum(category);
                     qreal scale = (height / colSum);
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         QBarSet* barSet = mSeries->barsetAt(set);
                         value->resize(100,50);  // TODO: proper layout for this.
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(barSet->floatingValuePen());
                         if (mSeries->valueAt(set,category) != 0) {
                             int p = mSeries->percentageAt(set,category) * 100;
                             QString vString(QString::number(p));
                             vString.truncate(3);
                             vString.append("%");
                             value->setValueString(vString);
                         } else {
                             value->setValueString(QString(""));
                         }
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     xPos += xStep;
                 }
+                return layout;
             }
             #include "moc_percentbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartitem_p.h +1 -2

             #ifndef PERCENTBARCHARTITEM_H
             #define PERCENTBARCHARTITEM_H
             #include "barchartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSeries;
             class PercentBarChartItem : public BarChartItem
             {
                 Q_OBJECT
             public:
                 PercentBarChartItem(QBarSeries *series, ChartPresenter *presenter);
             private:
+                virtual QVector<QRectF> calculateLayout();
-                void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             private:
                 // Data
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PERCENTBARCHARTITEM_H

src/barchart/stackedbarchartitem.cpp +5 -22

             #include "stackedbarchartitem_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarChartItem::StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter) :
                 BarChartItem(series,presenter)
             {
             }
             StackedBarChartItem::~StackedBarChartItem()
             {
             }
-            void StackedBarChartItem::layoutChanged()
+            QVector<QRectF> StackedBarChartItem::calculateLayout()
             {
-                // Scale bars to new layout
+                QVector<QRectF> layout;
-                // Layout for bars:
-                if (mSeries->barsetCount() <= 0) {
-                    qDebug() << "No sets in model!";
-                    // Nothing to do.
-                    return;
-                if (mSeries->categoryCount() == 0) {
-                    qDebug() << "No categories in model!";
-                    // Nothing to do
-                    return;
-                if (childItems().count() == 0) {
-                    qDebug() << "WARNING: StackedBarChartItem::layoutChanged called before graphics items are created!";
-                    return;
                 // Use temporary qreals for accurancy (we might get some compiler warnings... :)
                 qreal maxSum = mSeries->maxCategorySum();
                 // Domain:
                 if (mDomainMaxY > maxSum) {
                     maxSum = mDomainMaxY;
                 }
                 qreal height = geometry().height();
                 qreal width = geometry().width();
                 qreal scale = (height /  mSeries->maxCategorySum());
                 qreal categotyCount = mSeries->categoryCount();
                 qreal barWidth = width / (categotyCount *2);
                 qreal xStep = width/categotyCount;
                 qreal xPos = xStep/2 - barWidth/2;
                 int itemIndex(0);
                 for (int category = 0; category < categotyCount; category++) {
                     qreal yPos = height;
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         bar->setPen(mSeries->barsetAt(set)->pen());
                         bar->setBrush(mSeries->barsetAt(set)->brush());
-                        bar->setRect(xPos, yPos-barHeight,barWidth, barHeight);
+                        QRectF rect(xPos,yPos-barHeight,barWidth,barHeight);
+                        layout.append(rect);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     xPos += xStep;
                 }
                 // Position floating values
                 itemIndex = 0;
                 xPos = (width/categotyCount);
                 for (int category=0; category < mSeries->categoryCount(); category++) {
                     qreal yPos = height;
                     for (int set=0; set < mSeries->barsetCount(); set++) {
                         qreal barHeight = mSeries->valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         QBarSet* barSet = mSeries->barsetAt(set);
                         value->resize(100,50);  // TODO: proper layout for this.
                         value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(barSet->floatingValuePen());
                         if (mSeries->valueAt(set,category) != 0) {
                             value->setValueString(QString::number(mSeries->valueAt(set,category)));
                         } else {
                             value->setValueString(QString(""));
                         }
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     xPos += xStep;
                 }
+                return layout;
             }
             #include "moc_stackedbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarchartitem_p.h +1 -1

             #ifndef STACKEDBARCHARTITEM_H
             #define STACKEDBARCHARTITEM_H
             #include "barchartitem_p.h"
             #include "qstackedbarseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class StackedBarChartItem : public BarChartItem
             {
                 Q_OBJECT
             public:
                 StackedBarChartItem(QBarSeries *series, ChartPresenter *presenter);
                 ~StackedBarChartItem();
             private:
                 // From BarChartItem
-                void layoutChanged();   // layout has changed -> need to recalculate bar sizes
+                virtual QVector<QRectF> calculateLayout();
             private:
                 // Data
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // STACKEDBARCHARTITEM_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