HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1346:4fe424a18505

Fixed isVisible implementation in XY series

Tero Ahola -

r1346:4fe424a18505

parent child

Context file:

r1346:4fe424a18505

Collapse all files

src/areachart/areachartitem.cpp +12 -13

             void AreaChartItem::handleUpdated()
             {
+                setVisible(m_series->isVisible());
                 m_pointsVisible = m_series->pointsVisible();
                 m_linePen = m_series->pen();
                 m_brush = m_series->brush();
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
-                if (m_series->isVisible()) {
+                painter->save();
-                    painter->save();
+                painter->setPen(m_linePen);
-                    painter->setPen(m_linePen);
+                painter->setBrush(m_brush);
-                    painter->setBrush(m_brush);
+                painter->setClipRect(m_clipRect);
-                    painter->setClipRect(m_clipRect);
+                painter->drawPath(m_path);
-                    painter->drawPath(m_path);
+                if (m_pointsVisible) {
-                    if (m_pointsVisible) {
+                       painter->setPen(m_pointPen);
-                           painter->setPen(m_pointPen);
+                       painter->drawPoints(m_upper->geometryPoints());
-                           painter->drawPoints(m_upper->geometryPoints());
+                       if (m_lower)
-                           if (m_lower)
+                           painter->drawPoints(m_lower->geometryPoints());
-                               painter->drawPoints(m_lower->geometryPoints());
-                    painter->restore();
                 }
+                painter->restore();
             }
             void AreaChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

src/linechart/linechartitem.cpp +14 -14

             //TODO: optimize : remove points which are not visible
-            LineChartItem::LineChartItem(QLineSeries* series,ChartPresenter *presenter):XYChart(series,presenter),
+            LineChartItem::LineChartItem(QLineSeries* series,ChartPresenter *presenter):
-            QGraphicsItem(presenter ? presenter->rootItem() : 0),
+                XYChart(series, presenter),
-            m_series(series),
+                QGraphicsItem(presenter ? presenter->rootItem() : 0),
-            m_pointsVisible(false)
+                m_series(series),
+                m_pointsVisible(false)
             {
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series->d_func(),SIGNAL(updated()),this,SLOT(handleUpdated()));
             void LineChartItem::handleUpdated()
             {
+                setVisible(m_series->isVisible());
                 m_pointsVisible = m_series->pointsVisible();
                 m_linePen = m_series->pen();
                 m_pointPen = m_series->pen();
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
-                if (m_series->isVisible()) {
+                painter->save();
-                    painter->save();
+                painter->setPen(m_linePen);
-                    painter->setPen(m_linePen);
+                painter->setClipRect(clipRect());
-                    painter->setClipRect(clipRect());
+                painter->drawPath(m_path);
-                    painter->drawPath(m_path);
+                if (m_pointsVisible){
-                    if(m_pointsVisible){
+                    painter->setPen(m_pointPen);
-                        painter->setPen(m_pointPen);
+                    painter->drawPoints(geometryPoints());
-                        painter->drawPoints(geometryPoints());
-                    painter->restore();
                 }
+                painter->restore();
             }
             void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

src/scatterchart/scatterchartitem.cpp +6 -2

                 QGraphicsItem(presenter ? presenter->rootItem() : 0),
                 m_series(series),
                 m_items(this),
+                m_visible(true),
                 m_shape(QScatterSeries::MarkerShapeRectangle),
                 m_size(15)
             {
                     const QRectF& rect = item->boundingRect();
                     item->setPoint(point);
                     item->setPos(point.x()-rect.width()/2,point.y()-rect.height()/2);
-                    if(!clipRect().contains(point)) {
+                    if(!m_visible || !clipRect().contains(point)) {
                         item->setVisible(false);
                     }
                     else {
                 if(count==0) return;
-                bool recreate = m_size != m_series->markerSize() || m_shape != m_series->markerShape();
+                bool recreate = m_visible != m_series->isVisible()
+                        || m_size != m_series->markerSize()
+                        || m_shape != m_series->markerShape();
+                m_visible = m_series->isVisible();
                 m_size = m_series->markerSize();
                 m_shape = m_series->markerShape();

src/scatterchart/scatterchartitem_p.h +1 0

             private:
                 QScatterSeries *m_series;
                 QGraphicsItemGroup m_items;
+                bool m_visible;
                 int m_shape;
                 int m_size;
                 QRectF m_rect;

src/splinechart/splinechartitem.cpp +10 -10

             void SplineChartItem::handleUpdated()
             {
+                setVisible(m_series->isVisible());
                 m_pointsVisible = m_series->pointsVisible();
                 m_linePen = m_series->pen();
                 m_pointPen = m_series->pen();
             {
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
-                if (m_series->isVisible()) {
-                    painter->save();
+                painter->save();
-                    painter->setClipRect(clipRect());
+                painter->setClipRect(clipRect());
-                    painter->setPen(m_linePen);
+                painter->setPen(m_linePen);
-                    painter->drawPath(m_path);
+                painter->drawPath(m_path);
-                    if (m_pointsVisible) {
+                if (m_pointsVisible) {
-                        painter->setPen(m_pointPen);
+                    painter->setPen(m_pointPen);
-                        painter->drawPoints(geometryPoints());
+                    painter->drawPoints(geometryPoints());
-                    painter->restore();
                 }
+                painter->restore();
             }
             void SplineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

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