HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2829:473d62e0c63e

Made OpenGL series respond to scatter color and size changes...

Miikka Heikkinen -

r2829:473d62e0c63e

parent child

Context file:

r2829:473d62e0c63e

Collapse all files

src/charts/scatterchart/qscatterseries.cpp +24 -1

                  \fn void QScatterSeries::colorChanged(QColor color)
                  Signal is emitted when the fill (brush) color has changed to \a color.
              */
+             /*!
+                 \qmlsignal ScatterSeries::onColorChanged(color color)
+                 Signal is emitted when the fill (brush) color has changed to \a color.
+             */
              /*!
                  \fn void QScatterSeries::borderColorChanged(QColor color)
                  Signal is emitted when the line (pen) color has changed to \a color.
              */
              /*!
-                 \qmlsignal ScatterSeries::borderColorChanged(color color)
+                 \qmlsignal ScatterSeries::onBorderColorChanged(color color)
                  Signal is emitted when the line (pen) color has changed to \a color.
              */
                  \sa QAbstractSeries, SeriesType
              */
+             /*!
+                 \fn void QScatterSeries::markerShapeChanged(MarkerShape shape)
+                 Signal is emitted when the marker shape has changed to \a shape.
+             */
+             /*!
+                 \qmlsignal ScatterSeries::onMarkerShapeChanged(MarkerShape shape)
+                 Signal is emitted when the marker shape has changed to \a shape.
+             */
+             /*!
+                 \fn void QScatterSeries::markerSizeChanged(qreal size)
+                 Signal is emitted when the marker size has changed to \a size.
+             */
+             /*!
+                 \qmlsignal ScatterSeries::onMarkerSizeChanged(real size)
+                 Signal is emitted when the marker size has changed to \a size.
+             */
              QT_CHARTS_BEGIN_NAMESPACE
              /*!
                  if (d->m_shape != shape) {
                      d->m_shape = shape;
                      emit d->updated();
+                     emit markerShapeChanged(shape);
                  }
              }
                  if (!qFuzzyCompare(d->m_size, size)) {
                      d->m_size = size;
                      emit d->updated();
+                     emit markerSizeChanged(size);
                  }
              }

src/charts/scatterchart/qscatterseries.h +4 -2

                  Q_OBJECT
                  Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
                  Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
-                 Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape)
-                 Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize)
+                 Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape NOTIFY markerShapeChanged)
+                 Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize NOTIFY markerSizeChanged)
                  Q_PROPERTY(QBrush brush READ brush WRITE setBrush)
                  Q_ENUMS(MarkerShape)
              Q_SIGNALS:
                  void colorChanged(QColor color);
                  void borderColorChanged(QColor color);
+                 void markerShapeChanged(MarkerShape shape);
+                 void markerSizeChanged(qreal size);
              private:
                  Q_DECLARE_PRIVATE(QScatterSeries)

src/charts/xychart/glxyseriesdata.cpp +33 -2

                          QScatterSeries *scatter = static_cast<QScatterSeries *>(series);
                          data->width = float(scatter->markerSize());
                          sc = scatter->color(); // Scatter overwrites color property
+                         connect(scatter, &QScatterSeries::colorChanged, this,
+                                 &GLXYSeriesDataManager::handleScatterColorChange);
+                         connect(scatter, &QScatterSeries::markerSizeChanged, this,
+                                 &GLXYSeriesDataManager::handleScatterMarkerSizeChange);
                      } else {
                          data->width = float(series->pen().widthF());
                          sc = series->color();
+                         connect(series, &QXYSeries::penChanged, this,
+                                 &GLXYSeriesDataManager::handleSeriesPenChange);
                      }
                      data->color = QVector3D(float(sc.redF()), float(sc.greenF()), float(sc.blueF()));
-                     connect(series, &QXYSeries::penChanged, this,
-                             &GLXYSeriesDataManager::handleSeriesPenChange);
                      connect(series, &QXYSeries::useOpenGLChanged, this,
                              &GLXYSeriesDataManager::handleSeriesOpenGLChange);
                      m_seriesDataMap.insert(series, data);
                          QColor sc = series->color();
                          data->color = QVector3D(float(sc.redF()), float(sc.greenF()), float(sc.blueF()));
                          data->width = float(series->pen().widthF());
+                         data->dirty = true;
                      }
                  }
              }
                      removeSeries(series);
              }
+             void GLXYSeriesDataManager::handleScatterColorChange()
+             {
+                 QScatterSeries *series = qobject_cast<QScatterSeries *>(sender());
+                 if (series) {
+                     GLXYSeriesData *data = m_seriesDataMap.value(series);
+                     if (data) {
+                         QColor sc = series->color();
+                         data->color = QVector3D(float(sc.redF()), float(sc.greenF()), float(sc.blueF()));
+                         data->dirty = true;
+                     }
+                 }
+             }
+             void GLXYSeriesDataManager::handleScatterMarkerSizeChange()
+             {
+                 QScatterSeries *series = qobject_cast<QScatterSeries *>(sender());
+                 if (series) {
+                     GLXYSeriesData *data = m_seriesDataMap.value(series);
+                     if (data) {
+                         data->width =float(series->markerSize());
+                         data->dirty = true;
+                     }
+                 }
+             }
              QT_CHARTS_END_NAMESPACE

src/charts/xychart/glxyseriesdata_p.h +2 0

                  void cleanup();
                  void handleSeriesPenChange();
                  void handleSeriesOpenGLChange();
+                 void handleScatterColorChange();
+                 void handleScatterMarkerSizeChange();
              Q_SIGNALS:
                  void seriesRemoved(const QXYSeries *series);

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