HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/charts/xychart/glxyseriesdata.cpp

Fix version numbers...

Fix version numbers QML API version was only updated to what it actually is, it doesn't need to follow the module version. Change-Id: I5c26da72b03a1e6858327a8a08f933998991c39e Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

Miikka Heikkinen - - Load All Authors

File last commit:

r2854:46147b040d06


                r2858:18b5962194a7

Download file

             glxyseriesdata.cpp
        
                    189 lines
            
             | 6.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / charts / xychart / glxyseriesdata.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Miikka Heikkinen
    
Updated license...

              r2854
            
      /****************************************************************************

        Titta Heikkala
    
Updated license headers...

              r2845
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** Copyright (C) 2016 The Qt Company Ltd.

      ** Contact: https://www.qt.io/licensing/

        Titta Heikkala
    
Updated license headers...

              r2845
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** This file is part of the Qt Charts module of the Qt Toolkit.

        Titta Heikkala
    
Updated license headers...

              r2845
            
      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** $QT_BEGIN_LICENSE:GPL$

        Titta Heikkala
    
Updated license headers...

              r2845
            
      ** Commercial License Usage

      ** Licensees holding valid commercial Qt licenses may use this file in

      ** accordance with the commercial license agreement provided with the

      ** Software or, alternatively, in accordance with the terms contained in

      ** a written agreement between you and The Qt Company. For licensing terms

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ** and conditions see https://www.qt.io/terms-conditions. For further

      ** information use the contact form at https://www.qt.io/contact-us.

      **

      ** GNU General Public License Usage

      ** Alternatively, this file may be used under the terms of the GNU

      ** General Public License version 3 or (at your option) any later version

      ** approved by the KDE Free Qt Foundation. The licenses are as published by

      ** the Free Software Foundation and appearing in the file LICENSE.GPL3

      ** included in the packaging of this file. Please review the following

      ** information to ensure the GNU General Public License requirements will

      ** be met: https://www.gnu.org/licenses/gpl-3.0.html.

        Titta Heikkala
    
Updated license headers...

              r2845
            
      **

      ** $QT_END_LICENSE$

      **

        Miikka Heikkinen
    
Updated license...

              r2854
            
      ****************************************************************************/

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
      #include "private/glxyseriesdata_p.h"

      #include "private/abstractdomain_p.h"

      #include <QtCharts/QScatterSeries>

      QT_CHARTS_BEGIN_NAMESPACE

      GLXYSeriesDataManager::GLXYSeriesDataManager(QObject *parent)

          : QObject(parent),

            m_mapDirty(false)

      {

      }

      GLXYSeriesDataManager::~GLXYSeriesDataManager()

      {

          cleanup();

      }

      void GLXYSeriesDataManager::setPoints(QXYSeries *series, const AbstractDomain *domain)

      {

          GLXYSeriesData *data = m_seriesDataMap.value(series);

          if (!data) {

              data = new GLXYSeriesData;

              data->type = series->type();

              QColor sc;

              if (data->type == QAbstractSeries::SeriesTypeScatter) {

                  QScatterSeries *scatter = static_cast<QScatterSeries *>(series);

                  data->width = float(scatter->markerSize());

                  sc = scatter->color(); // Scatter overwrites color property

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

              r2829
            
                  connect(scatter, &QScatterSeries::colorChanged, this,

                          &GLXYSeriesDataManager::handleScatterColorChange);

                  connect(scatter, &QScatterSeries::markerSizeChanged, this,

                          &GLXYSeriesDataManager::handleScatterMarkerSizeChange);

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
              } else {

                  data->width = float(series->pen().widthF());

                  sc = series->color();

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

              r2829
            
                  connect(series, &QXYSeries::penChanged, this,

                          &GLXYSeriesDataManager::handleSeriesPenChange);

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
              }

              data->color = QVector3D(float(sc.redF()), float(sc.greenF()), float(sc.blueF()));

              connect(series, &QXYSeries::useOpenGLChanged, this,

                      &GLXYSeriesDataManager::handleSeriesOpenGLChange);

              m_seriesDataMap.insert(series, data);

              m_mapDirty = true;

          }

          QVector<float> &array = data->array;

          bool logAxis = false;

          foreach (QAbstractAxis* axis, series->attachedAxes()) {

              if (axis->type() == QAbstractAxis::AxisTypeLogValue) {

                  logAxis = true;

                  break;

              }

          }

          int count = series->count();

          int index = 0;

          array.resize(count * 2);

          if (logAxis) {

              // Use domain to resolve geometry points. Not as fast as shaders, but simpler that way

              QVector<QPointF> geometryPoints = domain->calculateGeometryPoints(series->pointsVector());

              const float height = domain->size().height();

              if (geometryPoints.size()) {

                  for (int i = 0; i < count; i++) {

                      const QPointF &point = geometryPoints.at(i);

                      array[index++] = float(point.x());

                      array[index++] = float(height - point.y());

                  }

              } else {

                  // If there are invalid log values, geometry points generation fails

                  for (int i = 0; i < count; i++) {

                      array[index++] = 0.0f;

                      array[index++] = 0.0f;

                  }

              }

              data->min = QVector2D(0, 0);

              data->delta = QVector2D(domain->size().width() / 2.0f, domain->size().height() / 2.0f);

          } else {

              // Regular value axes, so we can do the math easily on shaders.

              QVector<QPointF> seriesPoints = series->pointsVector();

              for (int i = 0; i < count; i++) {

                  const QPointF &point = seriesPoints.at(i);

                  array[index++] = float(point.x());

                  array[index++] = float(point.y());

              }

              data->min = QVector2D(domain->minX(), domain->minY());

              data->delta = QVector2D((domain->maxX() - domain->minX()) / 2.0f,

                                      (domain->maxY() - domain->minY()) / 2.0f);

          }

          data->dirty = true;

      }

      void GLXYSeriesDataManager::removeSeries(const QXYSeries *series)

      {

          GLXYSeriesData *data = m_seriesDataMap.take(series);

          if (data) {

              disconnect(series, 0, this, 0);

              delete data;

              emit seriesRemoved(series);

              m_mapDirty = true;

          }

      }

      void GLXYSeriesDataManager::cleanup()

      {

          foreach (GLXYSeriesData *data, m_seriesDataMap.values())

              delete data;

          m_seriesDataMap.clear();

          m_mapDirty = true;

          // Signal all series removal by using zero as parameter

          emit seriesRemoved(0);

      }

      void GLXYSeriesDataManager::handleSeriesPenChange()

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(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->width = float(series->pen().widthF());

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

              r2829
            
                  data->dirty = true;

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
              }

          }

      }

      void GLXYSeriesDataManager::handleSeriesOpenGLChange()

      {

          QXYSeries *series = qobject_cast<QXYSeries *>(sender());

          if (!series->useOpenGL())

              removeSeries(series);

      }

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

              r2829
            
      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;

              }

          }

      }

        Miikka Heikkinen
    
Accelerating lineseries with OpenGL...

              r2820
            
      QT_CHARTS_END_NAMESPACE

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

              r2829

	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

Miikka Heikkinen Updated license...	r2854	/****************************************************************************
Titta Heikkala Updated license headers...	r2845	**
Miikka Heikkinen Updated license...	r2854	** Copyright (C) 2016 The Qt Company Ltd.
		** Contact: https://www.qt.io/licensing/
Titta Heikkala Updated license headers...	r2845	**
Miikka Heikkinen Updated license...	r2854	** This file is part of the Qt Charts module of the Qt Toolkit.
Titta Heikkala Updated license headers...	r2845	**
Miikka Heikkinen Updated license...	r2854	** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala Updated license headers...	r2845	** Commercial License Usage
		** Licensees holding valid commercial Qt licenses may use this file in
		** accordance with the commercial license agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen Updated license...	r2854	** and conditions see https://www.qt.io/terms-conditions. For further
		** information use the contact form at https://www.qt.io/contact-us.
		**
		** GNU General Public License Usage
		** Alternatively, this file may be used under the terms of the GNU
		** General Public License version 3 or (at your option) any later version
		** approved by the KDE Free Qt Foundation. The licenses are as published by
		** the Free Software Foundation and appearing in the file LICENSE.GPL3
		** included in the packaging of this file. Please review the following
		** information to ensure the GNU General Public License requirements will
		** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Titta Heikkala Updated license headers...	r2845	**
		** $QT_END_LICENSE$
		**
Miikka Heikkinen Updated license...	r2854	****************************************************************************/
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820
		#include "private/glxyseriesdata_p.h"
		#include "private/abstractdomain_p.h"
		#include <QtCharts/QScatterSeries>

		QT_CHARTS_BEGIN_NAMESPACE

		GLXYSeriesDataManager::GLXYSeriesDataManager(QObject *parent)
		: QObject(parent),
		m_mapDirty(false)
		{
		}

		GLXYSeriesDataManager::~GLXYSeriesDataManager()
		{
		cleanup();
		}

		void GLXYSeriesDataManager::setPoints(QXYSeries series, const AbstractDomain domain)
		{
		GLXYSeriesData *data = m_seriesDataMap.value(series);
		if (!data) {
		data = new GLXYSeriesData;
		data->type = series->type();
		QColor sc;
		if (data->type == QAbstractSeries::SeriesTypeScatter) {
		QScatterSeries scatter = static_cast<QScatterSeries >(series);
		data->width = float(scatter->markerSize());
		sc = scatter->color(); // Scatter overwrites color property
Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829	connect(scatter, &QScatterSeries::colorChanged, this,
		&GLXYSeriesDataManager::handleScatterColorChange);
		connect(scatter, &QScatterSeries::markerSizeChanged, this,
		&GLXYSeriesDataManager::handleScatterMarkerSizeChange);
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820	} else {
		data->width = float(series->pen().widthF());
		sc = series->color();
Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829	connect(series, &QXYSeries::penChanged, this,
		&GLXYSeriesDataManager::handleSeriesPenChange);
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820	}
		data->color = QVector3D(float(sc.redF()), float(sc.greenF()), float(sc.blueF()));
		connect(series, &QXYSeries::useOpenGLChanged, this,
		&GLXYSeriesDataManager::handleSeriesOpenGLChange);
		m_seriesDataMap.insert(series, data);
		m_mapDirty = true;
		}
		QVector<float> &array = data->array;

		bool logAxis = false;
		foreach (QAbstractAxis* axis, series->attachedAxes()) {
		if (axis->type() == QAbstractAxis::AxisTypeLogValue) {
		logAxis = true;
		break;
		}
		}

		int count = series->count();
		int index = 0;
		array.resize(count * 2);
		if (logAxis) {
		// Use domain to resolve geometry points. Not as fast as shaders, but simpler that way
		QVector<QPointF> geometryPoints = domain->calculateGeometryPoints(series->pointsVector());
		const float height = domain->size().height();
		if (geometryPoints.size()) {
		for (int i = 0; i < count; i++) {
		const QPointF &point = geometryPoints.at(i);
		array[index++] = float(point.x());
		array[index++] = float(height - point.y());
		}
		} else {
		// If there are invalid log values, geometry points generation fails
		for (int i = 0; i < count; i++) {
		array[index++] = 0.0f;
		array[index++] = 0.0f;
		}
		}
		data->min = QVector2D(0, 0);
		data->delta = QVector2D(domain->size().width() / 2.0f, domain->size().height() / 2.0f);
		} else {
		// Regular value axes, so we can do the math easily on shaders.
		QVector<QPointF> seriesPoints = series->pointsVector();
		for (int i = 0; i < count; i++) {
		const QPointF &point = seriesPoints.at(i);
		array[index++] = float(point.x());
		array[index++] = float(point.y());
		}
		data->min = QVector2D(domain->minX(), domain->minY());
		data->delta = QVector2D((domain->maxX() - domain->minX()) / 2.0f,
		(domain->maxY() - domain->minY()) / 2.0f);
		}
		data->dirty = true;
		}

		void GLXYSeriesDataManager::removeSeries(const QXYSeries *series)
		{
		GLXYSeriesData *data = m_seriesDataMap.take(series);
		if (data) {
		disconnect(series, 0, this, 0);
		delete data;
		emit seriesRemoved(series);
		m_mapDirty = true;
		}
		}

		void GLXYSeriesDataManager::cleanup()
		{
		foreach (GLXYSeriesData *data, m_seriesDataMap.values())
		delete data;
		m_seriesDataMap.clear();
		m_mapDirty = true;
		// Signal all series removal by using zero as parameter
		emit seriesRemoved(0);
		}

		void GLXYSeriesDataManager::handleSeriesPenChange()
		{
		QXYSeries series = qobject_cast<QXYSeries >(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->width = float(series->pen().widthF());
Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829	data->dirty = true;
Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820	}
		}
		}

		void GLXYSeriesDataManager::handleSeriesOpenGLChange()
		{
		QXYSeries series = qobject_cast<QXYSeries >(sender());
		if (!series->useOpenGL())
		removeSeries(series);
		}

Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829	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;
		}
		}
		}

Miikka Heikkinen Accelerating lineseries with OpenGL...	r2820	QT_CHARTS_END_NAMESPACE
Miikka Heikkinen Made OpenGL series respond to scatter color and size changes...	r2829