HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r239:b700ad3a5165

signals and slots for bars and sets

sauimone -

r239:b700ad3a5165

parent child

Context file:

r239:b700ad3a5165

Collapse all files

src/barchart/bar.cpp +19 -16

             #include "bar_p.h"
             #include <QDebug>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Bar::Bar(QGraphicsItem *parent)
-                : ChartItem(parent)
+                : QGraphicsObject(parent)
             {
             }
-            void Bar::setSize(const QSizeF& size)
-                mWidth = size.width();
-                mHeight = size.height();
             void Bar::resize( qreal w, qreal h )
             {
             //    qDebug() << "bar::resize" << w << h;
                 mWidth = w;
                 mHeight = h;
             }
-            void Bar::setColor( QColor col )
-                mColor = col;
             void Bar::setPos(qreal x, qreal y)
             {
              //   qDebug() << "Bar::setpos" << x << y;
                 mXpos = x;
                 mYpos = y;
             }
             void Bar::setPen(QPen pen)
             {
                 mPen = pen;
             }
             void Bar::setBrush(QBrush brush)
             {
                 mBrush = brush;
             }
             void Bar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 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;
                 int x1 = (mXpos + mWidth);
                 int w = x1-x0;
                 int y0 = mYpos;
                 int y1 = (mYpos + mHeight);
                 int h = y1-y0;
                 painter->drawRect(x0, y0 ,w ,h);
             }
             QRectF Bar::boundingRect() const
             {
                 QRectF r(mXpos, mYpos, mXpos + mWidth, mYpos + mHeight);
                 return r;
             }
+            void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
+            {
+                emit hoverEnter();
+            }
+            void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
+            {
+                emit hoverLeave();
+            }
+            void Bar::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
+            {
+                emit clicked();
+            }
+            #include "moc_bar_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bar_p.h +15 -8

             #ifndef BAR_H
             #define BAR_H
-            #include "chartitem_p.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);
-            public: // from ChartItem
+            public:
-                void setSize(const QSizeF &size);
                 // Layout Stuff
                 void resize(qreal w, qreal h);   // Size of bar.
                 void setPos(qreal x, qreal y);
                 void setPen(QPen pen);
                 void setBrush(QBrush brush);
-                void setColor( QColor col);     // deprecated
             public:
-                // From QGraphicsItem
+                // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
+                void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+                void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+                void mousePressEvent(QGraphicsSceneMouseEvent *event);
+            Q_SIGNALS:
+                void clicked();
+                void hoverEnter();
+                void hoverLeave();
             private:
                 qreal mHeight;
                 qreal mWidth;
                 qreal mXpos;
                 qreal mYpos;
-                QColor mColor;
                 QBrush mBrush;
                 QPen mPen;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BAR_H

src/barchart/barpresenterbase.cpp +5 -2

             #include "barpresenterbase.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarPresenterBase::BarPresenterBase(BarChartModel& model, QGraphicsItem *parent)
                 : ChartItem(parent)
                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
                 ,mSeparatorsVisible(true)
                 ,mModel(model)
             {
                 dataChanged();
             }
             void BarPresenterBase::setSeparatorsVisible(bool visible)
             {
                 mSeparatorsVisible = visible;
             }
             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.";
                     return;
                 }
             //    if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
             //    }
             }
             QRectF BarPresenterBase::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
             void BarPresenterBase::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             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?
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 // Create new graphic items for bars
-                int totalItems = mModel.countTotalItems();
+                for (int s=0; s<mModel.countSets(); s++) {
-                for (int i=0; i<totalItems; i++) {
+                    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()));
+                    }
                 }
                 int count = mModel.countCategories();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     label->set(mModel.label(i));
                     childItems().append(label);
                 }
                 count = mModel.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
                     childItems().append(sep);
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
             //handlers
             void BarPresenterBase::handleModelChanged(int index)
             {
             //    qDebug() << "BarGroupBase::handleModelChanged" << index;
                 dataChanged();
             }
             void BarPresenterBase::handleDomainChanged(const Domain& domain)
             {
             //    qDebug() << "BarGroupBase::handleDomainChanged";
                 // TODO: Figure out the use case for this.
                 // Affects the size of visible item, so layout is changed.
             //    layoutChanged();
             }
             void BarPresenterBase::handleGeometryChanged(const QRectF& rect)
             {
                 mWidth = rect.width();
                 mHeight = rect.height();
                 layoutChanged();
                 mLayoutSet = true;
                 setPos(rect.topLeft());
             }
             #include "moc_barpresenterbase.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.cpp +8 -2

             #include "qbarset.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QBarSet::QBarSet()
             {
             }
             void QBarSet::setName(QString name)
             {
                 mName = name;
             }
             QString QBarSet::name()
             {
                 return mName;
             }
             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 mValues.append(value);
                 return *this;
             }
             int QBarSet::count()
             {
                 return mValues.count();
             }
             qreal QBarSet::valueAt(int index)
             {
                 return mValues.at(index);
             }
             void QBarSet::setValue(int index, qreal value)
             {
                 mValues.replace(index,value);
             }
             void QBarSet::setPen(const QPen& pen)
             {
                 mPen = pen;
             }
             const QPen& QBarSet::pen() const
             {
                 return mPen;
             }
             void QBarSet::setBrush(const QBrush& brush)
             {
                 mBrush = brush;
             }
             const QBrush& QBarSet::brush() const
             {
                 return mBrush;
             }
+            void QBarSet::barClicked()
+            {
+                // Some bar of this set has been clicked
+                // TODO: What happens then?
+                qDebug() << "bar Clicked";
+            }
-            //TODO?:
+            #include "moc_qbarset.cpp"
-            //#include "moc_qbarset.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.h +12 -2

             #ifndef QBARSET_H
             #define QBARSET_H
             #include "qchartglobal.h"
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QTCOMMERCIALCHART_EXPORT QBarSet // TODO? : public QObject
+            class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
             {
-                //Q_OBJECT;
+                Q_OBJECT;
             public:
                 QBarSet();
                 void setName(QString name);
                 QString name();
                 QBarSet& operator << (const qreal &value);  // appends new value to set
                 int count();                                // count of values in set
                 qreal valueAt(int index);                   // for modifying individual values
                 void setValue(int index, qreal value);      //
                 void setPen(const QPen& pen);
                 const QPen& pen() const;
                 void setBrush(const QBrush& brush);
                 const QBrush& brush() const;
+            //    void clicked();
+            /*
+                void hoverEnter();
+                void hoverLeave();
+            */
+            public Q_SLOTS:
+                void barClicked();
             private:
                 QString mName;
                 QList<qreal> mValues;
                 QPen mPen;
                 QBrush mBrush;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSET_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages