HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r859:e87be6f0a1e1

Adds ScrolledQLegend...

Michal Klocek -

r859:e87be6f0a1e1

parent child

Context file:

r859:e87be6f0a1e1

Collapse all files

src/qchart.cpp +1 -1

              QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
              d_ptr(new QChartPrivate())
              {
-                 d_ptr->m_legend = new QLegend(this);
+                 d_ptr->m_legend = new  ScrolledQLegend(this);
                  d_ptr->m_dataset = new ChartDataSet(this);
                  d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                  d_ptr->m_presenter->setTheme(QChart::ChartThemeLight, false);

src/qlegend.cpp +1 -18

                  m_width(0),
                  m_height(0),
                  m_visible(false),
-                 m_dirty(false),
-                 m_scroller(new Scroller(this))
+                 m_dirty(false)
              {
                  setZValue(ChartPresenter::LegendZValue);
                  setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                  updateLayout();
              }
-             void QLegend::mousePressEvent(QGraphicsSceneMouseEvent* event)
+             {
-                 //Q_UNUSED(event);
-                 m_scroller->mousePressEvent(event);
+             }
-             void QLegend::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
+             {
-                 //Q_UNUSED(event);
-                 m_scroller->mouseMoveEvent(event);
+             }
-             void QLegend::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+             {
-                 //Q_UNUSED(event);
-                 m_scroller->mouseReleaseEvent(event);
+             }
              #include "moc_qlegend.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/qlegend.h +33 -6

              #include <QGraphicsWidget>
              #include <QPen>
              #include <QBrush>
+             #include "scroller_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              class LegendScrollButton;
              class QSeries;
              class QChart;
-             class Scroller;
              class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsWidget
              {
                  void resizeEvent(QGraphicsSceneResizeEvent *event);
                  void hideEvent(QHideEvent *event);
                  void showEvent(QShowEvent *event);
-                 void mousePressEvent(QGraphicsSceneMouseEvent* event);
-                 void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
-                 void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
              public Q_SLOTS:
                  // PIMPL --->
                  qreal m_height;
                  bool m_visible;
                  bool m_dirty;
-                 Scroller* m_scroller;
-                 friend class QChart;
+                 friend class ScrolledQLegend;
                  // <--- PIMPL
              };
+             class ScrolledQLegend: public QLegend, public Scroller
+             {
+             public:
+                 ScrolledQLegend(QChart *chart):QLegend(chart)
+                 {
+                 }
+                 void setOffset(const QPointF& point)
+                 {
+                     QLegend::setOffset(point);
+                 }
+                 QPointF offset() const
+                 {
+                     return QLegend::offset();
+                 }
+                 void mousePressEvent(QGraphicsSceneMouseEvent* event){
+                     Scroller::mousePressEvent(event);
+                     //QLegend::mousePressEvent(event);
+                 }
+                 void mouseMoveEvent(QGraphicsSceneMouseEvent* event){
+                     Scroller::mouseMoveEvent(event);
+                     //QLegend::mouseMoveEvent(event);
+                 }
+                 void mouseReleaseEvent(QGraphicsSceneMouseEvent* event){
+                     Scroller::mouseReleaseEvent(event);
+                     //QLegend::mouseReleaseEvent(event);
+                 }
+             };
              QTCOMMERCIALCHART_END_NAMESPACE
              #endif // QLEGEND_H

src/scroller.cpp +2 -13

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             Scroller::Scroller(QLegend* legend):
+             Scroller::Scroller():
              m_ticker(this),
              m_state(Idle),
              m_moveThreshold(10),
-             m_timeTreshold(50),
-             m_legend(legend)
+             m_timeTreshold(50)
              {
              }
                  }
              }
-             void Scroller::setOffset(const QPointF& point)
+             {
-                 m_legend->setOffset(point);
+             }
-             QPointF Scroller::offset() const
+             {
-                 return m_legend->offset();
+             }
              /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
              ScrollTicker::ScrollTicker(Scroller *scroller,QObject* parent):QObject(parent),

src/scroller_p.h +3 -4

                      Stop
                  };
-                 explicit Scroller(QLegend* legend);
+                 Scroller();
                  virtual ~Scroller();
-                 virtual void setOffset(const QPointF& point);
-                 virtual QPointF offset() const;
+                 virtual void setOffset(const QPointF& point) = 0;
+                 virtual QPointF offset() const = 0;
              public:
                  void scrollTick();
                  QPointF m_fraction;
                  int m_moveThreshold;
                  int m_timeTreshold;
-                 QLegend* m_legend;
              };

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