HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · plugins/declarative/declarativexyseries.cpp

Minor fix: Unused parameter warning

Marek Rosa - - Load All Authors

File last commit:

r1252:4e92004ccd6b


                r1253:c7489d5d3599

Download file

             declarativexyseries.cpp
        
                    87 lines
            
             | 2.8 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / plugins / declarative / declarativexyseries.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add/modify license headers

              r830
            
      /****************************************************************************

      **

      ** Copyright (C) 2012 Digia Plc

      ** All rights reserved.

      ** For any questions to Digia, please use contact form at http://qt.digia.com

      **

      ** This file is part of the Qt Commercial Charts Add-on.

      **

      ** $QT_BEGIN_LICENSE$

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

      ** accordance with the Qt Commercial License Agreement provided with the

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

      ** a written agreement between you and Digia.

      **

      ** If you have questions regarding the use of this file, please use

      ** contact form at http://qt.digia.com

      ** $QT_END_LICENSE$

      **

      ****************************************************************************/

        Marek Rosa
    
Changed include to small letter first becasue it didn't build on Linux

              r736
            
      //#include "DeclarativeXySeries.h"

      #include "declarativexyseries.h"

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      #include "declarativechart.h"

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      #include <QXYSeries>

      #include <QXYModelMapper>

        Tero Ahola
    
QML and static data in pie and xy series

              r1186
            
      #include <QDeclarativeListProperty>

        Tero Ahola
    
Spline to QML API

              r732
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Tero Ahola
    
Declarative series classed now derived from QSeries childs

              r789
            
      DeclarativeXySeries::DeclarativeXySeries()

        Tero Ahola
    
Spline to QML API

              r732
            
      {

        Marek Rosa
    
Added Vertical and Horizontal QXYModelMapper

              r1252
            
          // TODO: XYModelMapper implementation has changed, this code has to be updated

        Tero Ahola
    
Now using only one declarative model

              r1169
            
          // All the inherited objects must be of type QXYSeries, so it is safe to cast

        Marek Rosa
    
Added Vertical and Horizontal QXYModelMapper

              r1252
            
      //    QXYSeries *series = reinterpret_cast<QXYSeries *>(this);

      //    // TODO: mapper should be available on the series by default

      //    QXYModelMapper *mapper = new QXYModelMapper(series);

      //    mapper->setMapX(0);

      //    mapper->setMapY(1);

      //    mapper->setFirst(0);

      //    mapper->setCount(-1);

      //    mapper->setOrientation(Qt::Vertical);

        Marek Rosa
    
All model related methods and members removed from the series. QML stuff commented out where complaining

              r1230
            
      //    series->setModelMapper(mapper);

        Tero Ahola
    
Spline to QML API

              r732
            
      }

      DeclarativeXySeries::~DeclarativeXySeries()

      {

      }

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      bool DeclarativeXySeries::setDeclarativeModel(DeclarativeTableModel *model)

        Tero Ahola
    
Spline to QML API

              r732
            
      {

        Tero Ahola
    
Draft for QML demo that shows weather forecasts

              r1139
            
          QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);

          bool value(false);

          if (m) {

              // All the inherited objects must be of type QXYSeries, so it is safe to cast

        Marek Rosa
    
All model related methods and members removed from the series. QML stuff commented out where complaining

              r1230
            
      //        QXYSeries *series = reinterpret_cast<QXYSeries *>(this);

      //        series->setModel(m);

        Tero Ahola
    
Draft for QML demo that shows weather forecasts

              r1139
            
          } else {

              qWarning("DeclarativeXySeries: Illegal model");

          }

          return value;

      }

        Tero Ahola
    
Now using only one declarative model

              r1169
            
      DeclarativeTableModel *DeclarativeXySeries::declarativeModel()

        Tero Ahola
    
Draft for QML demo that shows weather forecasts

              r1139
            
      {

          // All the inherited objects must be of type QXYSeries, so it is safe to cast

        Marek Rosa
    
All model related methods and members removed from the series. QML stuff commented out where complaining

              r1230
            
      //    QXYSeries *series = reinterpret_cast<QXYSeries *>(this);

          return 0; //qobject_cast<DeclarativeTableModel *>(series->model());

        Tero Ahola
    
Spline to QML API

              r732
            
      }

        Tero Ahola
    
QML demo with dynamic data

              r1240
            
      QColor DeclarativeXySeries::color()

      {

          // All the inherited objects must be of type QXYSeries, so it is safe to cast

          QXYSeries *series = reinterpret_cast<QXYSeries *>(this);

          return series->pen().color();

      }

      void DeclarativeXySeries::setColor(QColor color)

      {

          QXYSeries *series = reinterpret_cast<QXYSeries *>(this);

          QPen pen = series->pen();

          pen.setColor(color);

          series->setPen(pen);

      }

        Tero Ahola
    
Spline to QML API

              r732
            
      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

Jani Honkonen Add/modify license headers	r830	/****************************************************************************
		**
		** Copyright (C) 2012 Digia Plc
		** All rights reserved.
		** For any questions to Digia, please use contact form at http://qt.digia.com
		**
		** This file is part of the Qt Commercial Charts Add-on.
		**
		** $QT_BEGIN_LICENSE$
		** Licensees holding valid Qt Commercial licenses may use this file in
		** accordance with the Qt Commercial License Agreement provided with the
		** Software or, alternatively, in accordance with the terms contained in
		** a written agreement between you and Digia.
		**
		** If you have questions regarding the use of this file, please use
		** contact form at http://qt.digia.com
		** $QT_END_LICENSE$
		**
		****************************************************************************/

Marek Rosa Changed include to small letter first becasue it didn't build on Linux	r736	//#include "DeclarativeXySeries.h"
		#include "declarativexyseries.h"
Tero Ahola QML and static data in pie and xy series	r1186	#include "declarativechart.h"
Tero Ahola Now using only one declarative model	r1169	#include <QXYSeries>
		#include <QXYModelMapper>
Tero Ahola QML and static data in pie and xy series	r1186	#include <QDeclarativeListProperty>
Tero Ahola Spline to QML API	r732
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Tero Ahola Declarative series classed now derived from QSeries childs	r789	DeclarativeXySeries::DeclarativeXySeries()
Tero Ahola Spline to QML API	r732	{
Marek Rosa Added Vertical and Horizontal QXYModelMapper	r1252	// TODO: XYModelMapper implementation has changed, this code has to be updated

Tero Ahola Now using only one declarative model	r1169	// All the inherited objects must be of type QXYSeries, so it is safe to cast
Marek Rosa Added Vertical and Horizontal QXYModelMapper	r1252	// QXYSeries series = reinterpret_cast<QXYSeries >(this);
		// // TODO: mapper should be available on the series by default
		// QXYModelMapper *mapper = new QXYModelMapper(series);
		// mapper->setMapX(0);
		// mapper->setMapY(1);
		// mapper->setFirst(0);
		// mapper->setCount(-1);
		// mapper->setOrientation(Qt::Vertical);
Marek Rosa All model related methods and members removed from the series. QML stuff commented out where complaining	r1230	// series->setModelMapper(mapper);
Tero Ahola Spline to QML API	r732	}

		DeclarativeXySeries::~DeclarativeXySeries()
		{
		}

Tero Ahola Now using only one declarative model	r1169	bool DeclarativeXySeries::setDeclarativeModel(DeclarativeTableModel *model)
Tero Ahola Spline to QML API	r732	{
Tero Ahola Draft for QML demo that shows weather forecasts	r1139	QAbstractItemModel m = qobject_cast<QAbstractItemModel >(model);
		bool value(false);
		if (m) {
		// All the inherited objects must be of type QXYSeries, so it is safe to cast
Marek Rosa All model related methods and members removed from the series. QML stuff commented out where complaining	r1230	// QXYSeries series = reinterpret_cast<QXYSeries >(this);
		// series->setModel(m);
Tero Ahola Draft for QML demo that shows weather forecasts	r1139	} else {
		qWarning("DeclarativeXySeries: Illegal model");
		}
		return value;
		}

Tero Ahola Now using only one declarative model	r1169	DeclarativeTableModel *DeclarativeXySeries::declarativeModel()
Tero Ahola Draft for QML demo that shows weather forecasts	r1139	{
		// All the inherited objects must be of type QXYSeries, so it is safe to cast
Marek Rosa All model related methods and members removed from the series. QML stuff commented out where complaining	r1230	// QXYSeries series = reinterpret_cast<QXYSeries >(this);
		return 0; //qobject_cast<DeclarativeTableModel *>(series->model());
Tero Ahola Spline to QML API	r732	}

Tero Ahola QML demo with dynamic data	r1240	QColor DeclarativeXySeries::color()
		{
		// All the inherited objects must be of type QXYSeries, so it is safe to cast
		QXYSeries series = reinterpret_cast<QXYSeries >(this);
		return series->pen().color();
		}

		void DeclarativeXySeries::setColor(QColor color)
		{
		QXYSeries series = reinterpret_cast<QXYSeries >(this);
		QPen pen = series->pen();
		pen.setColor(color);
		series->setPen(pen);
		}


Tero Ahola Spline to QML API	r732	QTCOMMERCIALCHART_END_NAMESPACE