HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r392:938f3d3eaf7c

Adds updated handling for line series

Michal Klocek -

r392:938f3d3eaf7c

parent child

Context file:

r392:938f3d3eaf7c

src/chartpresenter.cpp +2 0

                          QObject::connect(lineSeries,SIGNAL(pointReplaced(int)),item,SLOT(handlePointReplaced(int)));
                          QObject::connect(lineSeries,SIGNAL(pointAdded(int)),item,SLOT(handlePointAdded(int)));
                          QObject::connect(lineSeries,SIGNAL(pointRemoved(int)),item,SLOT(handlePointRemoved(int)));
+                         QObject::connect(lineSeries,SIGNAL(updated()),item,SLOT(handleUpdated()));
                          m_chartItems.insert(series,item);
                          if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
+                         item->handleUpdated();
                          break;
                      }

src/linechart/linechartitem.cpp +1 -3

              	update();
              }
-             void LineChartItem::handleSeriesUpdated()
+             void LineChartItem::handleUpdated()
              {
-                 if(m_points.count()==0) return;
                  m_items.setVisible(m_series->pointsVisible());
                  setPen(m_series->pen());
                  update();

src/linechart/linechartitem_p.h +2 -2

                  void handlePointAdded(int index);
                  void handlePointRemoved(int index);
                  void handlePointReplaced(int index);
-                 void handleSeriesUpdated();
+                 void handleUpdated();
                  void handleDomainChanged(const Domain& domain);
                  void handleGeometryChanged(const QRectF& size);
              private:
                  ChartPresenter* m_presenter;
                  QPainterPath m_path;
+                 QLineSeries* m_series;
                  QSizeF m_size;
                  QRectF m_rect;
                  QRectF m_clipRect;
                  Domain m_domain;
                  QGraphicsItemGroup m_items;
                  QVector<QPointF> m_points;
-                 QLineSeries* m_series;
                  QPen m_pen;
              };

src/linechart/qlineseries.cpp +11 0

              */
              /*!
+                 \fn void QLineSeries::updated(int index)
+                 \brief \internal
+             */
+             /*!
                  Constructs empty series object which is a child of \a parent.
                  When series object is added to QChartView or QChart instance ownerships is transfered.
              */
              */
              void QLineSeries::setPen(const QPen& pen)
              {
+                 if(pen!=m_pen){
                  m_pen=pen;
+                 emit updated();
+                 }
              }
              /*!
              */
              void QLineSeries::setPointsVisible(bool visible)
              {
+                 if(m_pointsVisible!=visible){
                  m_pointsVisible=visible;
+                 emit updated();
+                 }
              }
              QDebug operator<< (QDebug debug, const QLineSeries series)

src/linechart/qlineseries.h +1 0

                  void pointReplaced(int index);
                  void pointRemoved(int index);
                  void pointAdded(int index);
+                 void updated();
              private:
                  QVector<qreal> m_x;

General Comments 0

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

No TODOs yet

	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