HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · qmlplugin/declarativeseries.cpp

Work-around for QML drawing issue

Tero Ahola - - Load All Authors

File last commit:

r180:6a67b4477dab


                r199:12a66e29cabc

Download file

             declarativeseries.cpp
        
                    100 lines
            
             | 2.9 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / qmlplugin / declarativeseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      #include "declarativeseries.h"

      #include "declarativechart.h"

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
      #include <qscatterseries.h>

        Michal Klocek
    
Fix previous broken commit

              r145
            
      #include <qlinechartseries.h>

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      #include <cmath>

      #include <QDebug>

      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      DeclarativeSeries::DeclarativeSeries(QDeclarativeItem *parent) :

          QDeclarativeItem(parent),

          m_seriesType(SeriesTypeInvalid), // TODO: default type?

          m_chart(0),

          m_series(0)

      {

          setFlag(QGraphicsItem::ItemHasNoContents, false);

          connect(this, SIGNAL(parentChanged()),

                  this, SLOT(setParentForSeries()));

      }

      void DeclarativeSeries::setSeriesType(SeriesType type)

      {

          if (!m_series || type != m_seriesType) {

              m_seriesType = type;

              initSeries();

        Tero Ahola
    
added stream operator to scatter series

              r180
            
          } else {

              m_seriesType = type;

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
          }

      }

      void DeclarativeSeries::setParentForSeries()

      {

        Tero Ahola
    
added stream operator to scatter series

              r180
            
          if (!m_series)

              initSeries();

          else if (m_series->type() != m_seriesType)

              initSeries();

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
      }

      void DeclarativeSeries::initSeries()

      {

          DeclarativeChart *declarativeChart = qobject_cast<DeclarativeChart *>(parent());

          if (declarativeChart && m_seriesType != SeriesTypeInvalid) {

              delete m_series;

              m_series = 0;

              QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);

              qDebug() << "creating series for chart: " << chart;

              Q_ASSERT(chart);

              switch (m_seriesType) {

              case SeriesTypeLine: {

        Tero Ahola
    
Integrated scatter again. Missing functionality....

              r158
            
                  m_series = new QLineChartSeries(this);

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
                  for (qreal i(0.0); i < 100.0; i += 1.0)

        Michal Klocek
    
Fix previous broken commit

              r145
            
                      ((QLineChartSeries *)m_series)->add(i, i);

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
                  chart->addSeries(m_series);

                  break;

              }

              case SeriesTypeBar:

                  // fallthrough; bar and scatter use the same test data

              case SeriesTypeScatter: {

                  m_series = chart->createSeries((QChartSeries::QChartSeriesType) m_seriesType);

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
                  QScatterSeries *scatter = qobject_cast<QScatterSeries *>(m_series);

                  Q_ASSERT(scatter);

                  for (qreal i = 0; i < 100; i += 0.1)

                      scatter->addData(QPointF(i + (rand() % 5),

                                               abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)));

        Tero Ahola
    
Proof-of-concept for QML api...

              r120
            
                  break;

              }

              case SeriesTypeStackedBar:

                  break;

              case SeriesTypePercentBar:

                  break;

              case SeriesTypePie: {

                  m_series = chart->createSeries((QChartSeries::QChartSeriesType) m_seriesType);

                  QList<qreal> data;

                  data << 1.0;

                  data << 12.0;

                  data << 4.0;

                  Q_ASSERT(m_series->setData(data));

                  break;

              }

              default:

                  break;

              }

          }

      }

      QVariant DeclarativeSeries::itemChange(GraphicsItemChange change,

                                             const QVariant &value)

      {

          // For debugging purposes only:

      //    qDebug() << QString::number(change) << " : " << value.toString();

          return QGraphicsItem::itemChange(change, value);

      }

      #include "moc_declarativeseries.cpp"

      QTCOMMERCIALCHART_END_NAMESPACE

	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

Tero Ahola Proof-of-concept for QML api...	r120	#include "declarativeseries.h"
		#include "declarativechart.h"
Tero Ahola Modifying QScatterSeries API	r179	#include <qscatterseries.h>
Michal Klocek Fix previous broken commit	r145	#include <qlinechartseries.h>
Tero Ahola Proof-of-concept for QML api...	r120	#include <cmath>
		#include <QDebug>

		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		DeclarativeSeries::DeclarativeSeries(QDeclarativeItem *parent) :
		QDeclarativeItem(parent),
		m_seriesType(SeriesTypeInvalid), // TODO: default type?
		m_chart(0),
		m_series(0)
		{
		setFlag(QGraphicsItem::ItemHasNoContents, false);
		connect(this, SIGNAL(parentChanged()),
		this, SLOT(setParentForSeries()));
		}

		void DeclarativeSeries::setSeriesType(SeriesType type)
		{
		if (!m_series \|\| type != m_seriesType) {
		m_seriesType = type;
		initSeries();
Tero Ahola added stream operator to scatter series	r180	} else {
		m_seriesType = type;
Tero Ahola Proof-of-concept for QML api...	r120	}
		}

		void DeclarativeSeries::setParentForSeries()
		{
Tero Ahola added stream operator to scatter series	r180	if (!m_series)
		initSeries();
		else if (m_series->type() != m_seriesType)
		initSeries();
Tero Ahola Proof-of-concept for QML api...	r120	}

		void DeclarativeSeries::initSeries()
		{
		DeclarativeChart declarativeChart = qobject_cast<DeclarativeChart >(parent());

		if (declarativeChart && m_seriesType != SeriesTypeInvalid) {
		delete m_series;
		m_series = 0;

		QChart chart = qobject_cast<QChart >(declarativeChart->m_chart);
		qDebug() << "creating series for chart: " << chart;
		Q_ASSERT(chart);

		switch (m_seriesType) {
		case SeriesTypeLine: {
Tero Ahola Integrated scatter again. Missing functionality....	r158	m_series = new QLineChartSeries(this);
Tero Ahola Proof-of-concept for QML api...	r120	for (qreal i(0.0); i < 100.0; i += 1.0)
Michal Klocek Fix previous broken commit	r145	((QLineChartSeries *)m_series)->add(i, i);
Tero Ahola Proof-of-concept for QML api...	r120	chart->addSeries(m_series);
		break;
		}
		case SeriesTypeBar:
		// fallthrough; bar and scatter use the same test data
		case SeriesTypeScatter: {
		m_series = chart->createSeries((QChartSeries::QChartSeriesType) m_seriesType);
Tero Ahola Modifying QScatterSeries API	r179	QScatterSeries scatter = qobject_cast<QScatterSeries >(m_series);
		Q_ASSERT(scatter);
		for (qreal i = 0; i < 100; i += 0.1)
		scatter->addData(QPointF(i + (rand() % 5),
		abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)));
Tero Ahola Proof-of-concept for QML api...	r120	break;
		}
		case SeriesTypeStackedBar:
		break;
		case SeriesTypePercentBar:
		break;
		case SeriesTypePie: {
		m_series = chart->createSeries((QChartSeries::QChartSeriesType) m_seriesType);
		QList<qreal> data;
		data << 1.0;
		data << 12.0;
		data << 4.0;
		Q_ASSERT(m_series->setData(data));
		break;
		}
		default:
		break;
		}
		}
		}

		QVariant DeclarativeSeries::itemChange(GraphicsItemChange change,
		const QVariant &value)
		{
		// For debugging purposes only:
		// qDebug() << QString::number(change) << " : " << value.toString();
		return QGraphicsItem::itemChange(change, value);
		}


		#include "moc_declarativeseries.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE