HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r975:b81e04837829

examples/stackedbarchartdrilldown/main.cpp 0 -1

                              *weeklyCrop << (qrand() % 20);
                          // Get the drilldown series from season series and add crop to it.
                          seasonSeries->drilldownSeries(month)->appendBarSet(weeklyCrop);
-                         seasonSeries->drilldownSeries(month)->setToolTipEnabled(true);
                          *monthlyCrop << weeklyCrop->sum();
                      }
                      seasonSeries->appendBarSet(monthlyCrop);

src/barchart/bar.cpp +4 -2

              void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
              {
-                 emit hoverEntered(event->lastScreenPos());
+                 emit hovered(true);
+                 emit hovered(m_barset, true);
              }
              void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
              {
                  Q_UNUSED(event)
-                 emit hoverLeaved();
+                 emit hovered(false);
+                 emit hovered(m_barset, false);
              }
              #include "moc_bar_p.cpp"

src/barchart/bar_p.h +2 -2

              Q_SIGNALS:
                  void clicked(QString category, Qt::MouseButtons button);
                  void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
-                 void hoverEntered(QPoint pos);
-                 void hoverLeaved();
+                 void hovered(bool status);
+                 void hovered(QBarSet *barset, bool status);
              private:
                  QString m_category;

src/barchart/barchartitem.cpp +2 -12

              #include "chartpresenter_p.h"
              #include "chartanimator_p.h"
              #include "chartdataset_p.h"
-             #include <QToolTip>
              #include <QPainter>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  m_series(series)
              {
                  setFlag(ItemClipsChildrenToShape);
-                 connect(series->d_func(), SIGNAL(showToolTip(QPoint,QString)), this, SLOT(showToolTip(QPoint,QString)));
                  connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged()));
                  connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleModelChanged()));
                  setZValue(ChartPresenter::BarSeriesZValue);
              BarChartItem::~BarChartItem()
              {
-                 disconnect(this,SLOT(showToolTip(QPoint,QString)));
              }
              void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
              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?
                  foreach(QGraphicsItem *item, childItems()) {
                      delete item;
                  }
                          m_bars.append(bar);
                          connect(bar, SIGNAL(clicked(QString,Qt::MouseButtons)), set, SIGNAL(clicked(QString,Qt::MouseButtons)));
                          connect(bar, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)), m_series, SIGNAL(clicked(QBarSet*,QString,Qt::MouseButtons)));
-                         connect(bar, SIGNAL(hoverEntered(QPoint)), set->d_ptr.data(), SLOT(barHoverEnterEvent(QPoint)));
-                         connect(bar, SIGNAL(hoverLeaved()), set->d_ptr.data(), SLOT(barHoverLeaveEvent()));
+                         connect(bar, SIGNAL(hovered(bool)), set, SIGNAL(hovered(bool)));
+                         connect(bar, SIGNAL(hovered(QBarSet*,bool)), m_series, SIGNAL(hovered(QBarSet*,bool)));
                          m_layout.append(QRectF(0, 0, 0, 0));
                      }
                  }
                  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 0 -3

                  void handleGeometryChanged(const QRectF &size);
                  void handleLayoutChanged();
-                 // Internal slots
-                 void showToolTip(QPoint pos, QString tip);      // shows tooltip (if enabled)
              protected:
                  // TODO: consider these.

src/barchart/qbarseries.cpp 0 -27

              }
              /*!
-                 Enables or disables tooltip depending on parameter \a enabled.
-                 Tooltip shows the name of set, when mouse is hovering on top of bar.
-                 Calling without parameter \a enabled, enables the tooltip
-             */
-             void QBarSeries::setToolTipEnabled(bool enabled)
+             {
-                 Q_D(QBarSeries);
-                 d->setToolTipEnabled(enabled);
+             }
-             /*!
                   \fn bool QBarSeries::setModel(QAbstractItemModel *model)
                   Sets the \a model to be used as a data source
               */
                  return m_internalModel->categoryName(category);
              }
-             void QBarSeriesPrivate::setToolTipEnabled(bool enabled)
+             {
-                 // TODO: what if we add sets after call to this function? Those sets won't have tooltip enabled.
-                 if (enabled) {
-                     for (int i=0; i<m_internalModel->barsetCount(); i++) {
-                         QBarSet *set = m_internalModel->barsetAt(i);
-                         connect(set->d_ptr.data(), SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
+                     }
-                 } else {
-                     for (int i=0; i<m_internalModel->barsetCount(); i++) {
-                         QBarSet *set = m_internalModel->barsetAt(i);
-                         disconnect(set->d_ptr.data(), SIGNAL(showToolTip(QPoint,QString)), this, SIGNAL(showToolTip(QPoint,QString)));
+                     }
+                 }
+             }
              qreal QBarSeriesPrivate::min()
              {
                  return m_internalModel->min();

src/barchart/qbarseries.h +1 -3

              Q_SIGNALS:
                  void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                  void selected();
-             public Q_SLOTS:
-                 void setToolTipEnabled(bool enabled = true);           // enables tooltips
+                 void hovered(QBarSet* barset, bool status);
              protected:
                  Q_DECLARE_PRIVATE(QBarSeries)

src/barchart/qbarseries_p.h 0 -4

                  void selected();
                  void updatedBars();
                  void restructuredBars();
-                 void showToolTip(QPoint pos, QString tip);
-             public Q_SLOTS:
-                 void setToolTipEnabled(bool enabled = true);           // enables tooltips
              private Q_SLOTS:
                  // slots for updating bars when data in model changes

src/barchart/qbarset.cpp +5 -32

              #include "qbarset.h"
              #include "qbarset_p.h"
-             #include <QToolTip>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              */
              /*!
+                 \fn void QBarSet::hovered(bool status)
+                 \brief signals that mouse has hovered over the set. If \a status is true, then mouse was entered. If \a status is false, then mouse was left.
+             */
+             /*!
                  Constructs QBarSet with a name of \a name and with parent of \a parent
              */
              QBarSet::QBarSet(QString name, QObject *parent)
                  return d_ptr->m_labelsVisible;
              }
-             /*
-             void QBarSet::barHoverEnterEvent(QPoint pos)
+             {
-                 emit showToolTip(pos, m_name);
-                 emit hoverEnter(pos);
+             }
-             */
-             /*
-             void QBarSet::barHoverLeaveEvent()
+             {
-                 // Emit signal to user of charts
-                 emit hoverLeave();
+             }
-             */
              ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
              QBarSetPrivate::QBarSetPrivate(QString name, QBarSet *parent) : QObject(parent),
              {
              }
-             //TODO: fixme , refactor it and get rid of it
-             void QBarSetPrivate::barHoverEnterEvent(QPoint pos)
+             {
-                 emit showToolTip(pos, m_name);
-                 emit hoverEnter(pos);
+             }
-             //TODO: fixme , refactor it and get rid of it
-             void QBarSetPrivate::barHoverLeaveEvent()
+             {
-                 // Emit signal to user of charts
-                 emit hoverLeave();
+             }
              #include "moc_qbarset.cpp"
              #include "moc_qbarset_p.cpp"

src/barchart/qbarset.h +3 -1

                  bool labelsVisible() const;
              Q_SIGNALS:
-                 void clicked(QString category, Qt::MouseButtons button);                         // Clicked and hover signals exposed to user
+                 void clicked(QString category, Qt::MouseButtons button);
+                 void selected();
+                 void hovered(bool status);
              private:
                  QScopedPointer<QBarSetPrivate> d_ptr;

src/barchart/qbarset_p.h 0 -7

                  void clicked(QString category, Qt::MouseButtons button);
                  void structureChanged();
                  void valueChanged();
-                 void hoverEnter(QPoint pos);
-                 void hoverLeave();
-                 void showToolTip(QPoint pos, QString tip);
                  void labelsVisibleChanged(bool visible);
-             public Q_SLOTS:
-                 void barHoverEnterEvent(QPoint pos);
-                 void barHoverLeaveEvent();
              public:
                  QBarSet * const q_ptr;
                  QString m_name;

test/chartwidgettest/mainwidget.cpp 0 -3

                          series->appendBarSet(set);
                      }
-                     // TODO: new implementation of setFloatingValuesEnabled with signals
-                     //series->setFloatingValuesEnabled(true);
-                     series->setToolTipEnabled(true);
                      m_chart->addSeries(series);
                  } else if (seriesName == "Spline") {
                      for (int j(0); j < data.count(); j ++) {

test/tablemodelchart/tablewidget.cpp 0 -1

                          QBarSeries* barSeries = new QBarSeries(QStringList());
                          barSeries->setModel(m_model);
                          barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
-                         barSeries->setToolTipEnabled(true);
                          m_chart->addSeries(barSeries);
                          QList<QBarSet*> barsets = barSeries->barSets();
                          for (int i = 0; i < barsets.count(); i++) {

	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