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

              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;
                  mHeight = h;
              }
-             void Bar::setColor( QColor col )
+             {
-                 mColor = col;
+             }
              void Bar::setPos(qreal x, qreal y)
              {
               //   qDebug() << "Bar::setpos" << x << 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;
              }
+             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
-                 void setSize(const QSizeF &size);
+             public:
                  // 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 mWidth;
                  qreal mXpos;
                  qreal mYpos;
-                 QColor mColor;
                  QBrush mBrush;
                  QPen mPen;

src/barchart/barpresenterbase.cpp +5 -2

                  }
                  // Create new graphic items for bars
-                 int totalItems = mModel.countTotalItems();
-                 for (int i=0; i<totalItems; i++) {
+                 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()));
+                     }
                  }
                  int count = mModel.countCategories();

src/barchart/qbarset.cpp +8 -2

              #include "qbarset.h"
+             #include <QDebug>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  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

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             class QTCOMMERCIALCHART_EXPORT QBarSet // TODO? : public QObject
+             class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
              {
-                 //Q_OBJECT;
+                 Q_OBJECT;
              public:
                  QBarSet();
                  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

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