HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r74:5412c444e1e8

BarGroup and Bar as ChartItems instead of GraphicItems

sauimone -

r74:5412c444e1e8

parent child

Context file:

r74:5412c444e1e8

Collapse all files

src/barchart/bar.cpp +14 -2

             #include "bar.h"
             #include <QDebug>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            Bar::Bar(QGraphicsItem *parent)
+            Bar::Bar(ChartItem *parent)
-                : QGraphicsItem(parent)
+                : ChartItem(parent)
             {
             }
+            void Bar::setSize(const QSize& size)
+            {
+                //mSize = size;
+                mWidth = size.width();
+                mHeight = size.height();
+            }
+            void Bar::setPlotDomain(const PlotDomain& data)
+            {
+                mPlotDomain = data;
+            }
             void Bar::resize( int w, int h )
             {
                 mWidth = w;
                 mHeight = h;
             }
             void Bar::setColor( QColor col )
             {
                 mColor = col;
             }
             void Bar::setPos(qreal x, qreal y)
             {
                 mXpos = x;
                 mYpos = y;
             }
             void Bar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 // Set color for bar. TODO: gradients, textures etc
                 QPen pen = painter->pen();
                 pen.setColor( mColor );
                 pen.setWidth( mWidth );
                 painter->setPen(pen);
                 // Draw bar
                 // TODO: Pen width affects bar height for now. This should be rect
                 painter->drawLine(scenePos().x() + mXpos, scenePos().y() + mYpos + parentItem()->boundingRect().height() - mHeight - mWidth,
                                   scenePos().x() + mXpos, scenePos().y() + mYpos + parentItem()->boundingRect().height() - mWidth);
             }
             QRectF Bar::boundingRect() const
             {
                 // TODO: check validity of this (I suppose there is easier way, and currently this bit incorrect :)
             //    QRectF r(scenePos().x()+mXpos, scenePos().y()+mYpos, scenePos().x() + mWidth, scenePos().y() + mHeight );
                 QRectF r(mXpos, mYpos, mXpos + mWidth, mYpos + mHeight);
                 return r;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bar.h +9 -3

             #ifndef BAR_H
             #define BAR_H
-            #include <QGraphicsItem>
+            #include "chartitem_p.h"
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Single bar item of chart
-            class Bar : public QGraphicsItem
+            class Bar : public ChartItem
             {
             public:
-                Bar(QGraphicsItem *parent=0);
+                Bar(ChartItem *parent=0);
+                // From ChartItem
+                virtual void setSize(const QSize& size);
+                virtual void setPlotDomain(const PlotDomain& data);
                 // Layout Stuff
                 void resize( int w, int h );       // Size of bar. in screen coordinates.
                 void setColor( QColor col );       // Color of bar
                 void setPos(qreal x, qreal y);
             public:
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
             private:
                 int mHeight;
                 int mWidth;
                 qreal mXpos;
                 qreal mYpos;
                 QColor mColor;
+                PlotDomain mPlotDomain;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BAR_H

src/barchart/barchartseries.cpp +2 -2

             #include <QDebug>
             #include "barchartseries.h"
+            #include "bargroup.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartSeries::BarChartSeries(QObject *parent)
                 : QChartSeries(parent)
             {
             }
             bool BarChartSeries::setData(QAbstractItemModel* model)
             {
                 mModel = model;
             }
             int BarChartSeries::min()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 QModelIndex modelIndex = mModel->index(0,0);
                 int min = mModel->data(modelIndex).toInt();
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         modelIndex = mModel->index(i,j);
                         int temp = mModel->data(modelIndex).toInt();
                         if (temp < min) {
                             min = temp;
                         }
                     }
                 }
                 return min;
             }
             int BarChartSeries::max()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 Q_ASSERT(mModel->columnCount() > 0);
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
                 QModelIndex modelIndex = mModel->index(0,0);
                 int max = mModel->data(modelIndex).toInt();
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
                         modelIndex = mModel->index(i,j);
                         int temp = mModel->data(modelIndex).toInt();
                         if (temp > max) {
                             max = temp;
                         }
                     }
                 }
                 return max;
             }
             int BarChartSeries::countSeries()
             {
                 return mModel->rowCount();
             }
             int BarChartSeries::countItemsInSeries()
             {
                 return mModel->columnCount();
             }
             int BarChartSeries::countTotalItems()
             {
                 return mModel->rowCount() * mModel->columnCount();
             }
             int BarChartSeries::valueAt(int series, int item)
             {
                 QModelIndex index = mModel->index(series,item);
                 return mModel->data(index).toInt();
             }
             void BarChartSeries::chartSizeChanged(QRectF rect)
             {
                 qDebug() << "barchart size changed:" << rect;
+            //    mBarGroup->resize(rect.toRect().width(), rect.toRect().height());
             }
             #include "moc_barchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.h +4 -1

             #ifndef BARCHARTSERIES_H
             #define BARCHARTSERIES_H
             #include <QList>
             #include <QRectF>
             #include <QAbstractItemModel>
             #include "qchartseries.h"
             #include "qchartglobal.h"
+            // TODO: Can this class be combined with series?
+            class BarGroup;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Container for series
             class QTCOMMERCIALCHART_EXPORT BarChartSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 BarChartSeries(QObject* parent=0);
                 // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
                 // TODO: This as dataModel instead of n different setters. (data model itself can accept lists and whatnot)
                 virtual bool setData(QAbstractItemModel* model);
                 // Methods to find out minimum and maximum values of data
                 int min();
                 int max();
                 int countSeries();
                 int countItemsInSeries();     // Count items in one series.
                 int countTotalItems();
                 int valueAt(int series, int item);
             public Q_SLOTS:
                 void chartSizeChanged(QRectF rect);
             private:
-                //QList<int> mData;
                 QAbstractItemModel* mModel;
+                BarGroup* mBarGroup;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTSERIES_H

src/barchart/bargroup.cpp +2 -2

             #include "bargroup.h"
             #include "bar.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: singleton?
             //BarGroup* BarGroup::mBarGroupInstance = NULL;
             //BarGroup::BarGroup(QGraphicsItem *parent) :
             //    QGraphicsItem(parent)
             //    ,mSeries(series)
-            BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
+            BarGroup::BarGroup(BarChartSeries& series, ChartItem *parent) :
-              QGraphicsItem(parent)
+              ChartItem(parent)
               ,mSeries(series)
               ,mLayoutSet(false)
               ,mLayoutDirty(true)
             {
                 dataChanged();
             }
             void BarGroup::resize( int w, int h )
             {
                 qDebug() << "QBarChart::resize";
                 mWidth = w;
                 mHeight = h;
                 layoutChanged();
                 mLayoutSet = true;
             }
             void BarGroup::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             void BarGroup::setColor( QColor color )
             {
                 mColor = color;
             }
             void BarGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
                     qDebug() << "QBarChart::paint called without layout set. Aborting.";
                     return;
                 }
                 if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
                 }
             }
             QRectF BarGroup::boundingRect() const
             {
                 // TODO: correct this (currently ignores position)
                 return QRectF(0,0,mWidth,mHeight);
             }
             void BarGroup::dataChanged()
             {
                 qDebug() << "QBarChart::dataChanged mSeries";
                 // Find out maximum and minimum of all series
                 mMax = mSeries.max();
                 mMin = mSeries.min();
                 // Delete old bars
                 // Is this correct way to delete childItems?
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 // Create new graphic items for bars
                 int totalItems = mSeries.countTotalItems();
                 for (int i=0; i<totalItems; i++) {
                     Bar *bar = new Bar(this);
                     childItems().append(bar);
                 }
                 mLayoutDirty = true;
             }
             void BarGroup::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 int count = mSeries.countSeries();
                 if (count <= 0) {
                     // Nothing to do.
                     return;
                 }
                 // Align center
                 int posStep = (mWidth / (count));
                 int startPos = (mWidth / count+1);
                 qDebug() << "startpos" << startPos;
                 // Scaling. TODO: better one.
                 int itemIndex(0);
                 for (int series = 0; series < count; series++) {
                     for (int item=0; item < count; item++) {
                         int barHeight = mSeries.valueAt(series, item) * mHeight / mMax;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         bar->resize(mBarDefaultWidth, barHeight);        // TODO: width settable per bar
                         bar->setColor(mColor);
                         bar->setPos(itemIndex*posStep+startPos, 0);
                         itemIndex++;
                     }
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bargroup.h +3 -5

             #ifndef QBARCHART_H
             #define QBARCHART_H
-            #include <QGraphicsObject>
+            #include "chartitem_p.h"
             #include "bar.h"
-            //#include "qbarchartview.h"
             #include "barchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: Better name for this? The function of this class is to know where each bar in series is laid out.
             //class BarGroup : public QGraphicsItemGroup
-            class BarGroup : public QGraphicsItem
+            class BarGroup : public ChartItem
             {
             /* // TODO: implement as singleton?
             private:
                 static BarGroup* mBarGroupInstance;
             public:
                 static BarGroup* instance()
                 {
                     if (mBarGroupInstance == NULL) {
                         mBarGroupInstance = new BarGroup();
                     }
                     return mBarGroupInstance;
                 }
             private:
             */
             public:
-                explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
+                explicit BarGroup(BarChartSeries& series, ChartItem *parent = 0);
                 // Layout "api"
                 void resize( int w, int h );        // Size for whole series. Single bars are drawn inside this area
                 void setPos(qreal x, qreal y);
                 void setBarWidth( int w );          // Default width for each bar
                 void setColor( QColor color );      // Default color for each bar
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
             private:
                 void dataChanged();     // data of series has changed -> need to recalculate bar sizes
                 void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             private:
                 // Data
                 BarChartSeries& mSeries;
                 int mMin;                                   // Min and max values of data. (updated when data is changed, used when drawing)
                 int mMax;
                 int mHeight;        // Layout spesific
                 int mWidth;
                 int mBarDefaultWidth;
                 QColor mColor;
                 bool mLayoutSet;    // True, if component has been laid out.
                 bool mLayoutDirty;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARCHART_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