HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/scatterseries/qscatterseries.h

Fixed bug in setting chart theme...

Fixed bug in setting chart theme The bug was that if you first add a series, then change theme and then restore the original theme, the color of the series was changed even though it should have been restored to match the original color.

Tero Ahola - - Load All Authors

File last commit:

r300:fbedbdf7642a


                r312:0677c9dd6d92

Download file

             qscatterseries.h
        
                    71 lines
            
             | 1.9 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / src / scatterseries / qscatterseries.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      #ifndef QSCATTERSERIES_H

      #define QSCATTERSERIES_H

      #include "qchartseries.h"

        Tero Ahola
    
Resizing of QGraphicItems now possible by resize signal from QChart

              r48
            
      #include <QRectF>

        Tero Ahola
    
Draft implementation for setting color themes for a chart

              r64
            
      #include <QColor>

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      class QScatterSeriesPrivate;

      class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries

      {

          Q_OBJECT

        Tero Ahola
    
Scatter series marker visuals

              r195
            
      public:

          enum MarkerShape {

              // TODO: to be defined by the graphics design

              // TODO: marker shapes: "x", star, rectangle, tilted rect, triangle, circle, dot

              MarkerShapeDefault = 0,

              MarkerShapePoint,

              MarkerShapeX,

              MarkerShapeRectangle,

              MarkerShapeTiltedRectangle,

              MarkerShapeTriangle,

              MarkerShapeCircle

          };

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      public:

        Tero Ahola
    
Refactored series creation with QChart

              r61
            
          QScatterSeries(QObject *parent = 0);

        Tero Ahola
    
Integrated scatter type series...

              r42
            
          ~QScatterSeries();

      public: // from QChartSeries

        Tero Ahola
    
Integrated draft version of pie series

              r51
            
          QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }

        Tero Ahola
    
Integrated scatter type series...

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

              r158
            
      public:

        Tero Ahola
    
added stream operator to scatter series

              r180
            
          void addData(QPointF value);

        Tero Ahola
    
Scatter series documentation; now uses snippets

              r300
            
          void addData(QList<QPointF> points);

          void setData(QList<QPointF> points);

        Tero Ahola
    
added stream operator to scatter series

              r180
            
          QScatterSeries& operator << (const QPointF &value);

        Tero Ahola
    
Scatter series documentation; now uses snippets

              r300
            
          QScatterSeries& operator << (QList<QPointF> points);

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

              r158
            
          QList<QPointF> data();

        Tero Ahola
    
Scatter series marker visuals

              r195
            
          //TODO: insertData?

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
          QPen markerPen();

        Tero Ahola
    
Scatter series marker visuals

              r195
            
          QBrush markerBrush();

          MarkerShape markerShape();

          // TODO: marker size?

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
        Tero Ahola
    
Scatter series documentation; now uses snippets

              r300
            
      public Q_SLOTS:

          void setMarkerPen(QPen pen);

          void setMarkerBrush(QBrush brush);

          void setMarkerShape(MarkerShape shape);

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

              r158
            
      Q_SIGNALS:

        Tero Ahola
    
Scatter series documentation; now uses snippets

              r300
            
          void clicked(/* TODO: parameters? */);

          void hoverEnter(/* TODO: parameters? */);

          void hoverLeave(/* TODO: parameters? */);

          // TODO: move to PIMPL for simplicity or does the user ever need changed signals?

        Tero Ahola
    
Modifying QScatterSeries API

              r179
            
          // TODO: more finegrained signaling for performance reasons

        Tero Ahola
    
Scatter series marker visuals

              r195
            
          // (check QPieSeries implementation with change sets)

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

              r158
            
          void changed();

        Tero Ahola
    
Integrated scatter type series...

              r42
            
      private:

          Q_DECLARE_PRIVATE(QScatterSeries)

          Q_DISABLE_COPY(QScatterSeries)

          QScatterSeriesPrivate *const d;

      };

      QTCOMMERCIALCHART_END_NAMESPACE

      #endif // QSCATTERSERIES_H

	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 Integrated scatter type series...	r42	#ifndef QSCATTERSERIES_H
		#define QSCATTERSERIES_H

		#include "qchartseries.h"
Tero Ahola Resizing of QGraphicItems now possible by resize signal from QChart	r48	#include <QRectF>
Tero Ahola Draft implementation for setting color themes for a chart	r64	#include <QColor>
Tero Ahola Integrated scatter type series...	r42
		QTCOMMERCIALCHART_BEGIN_NAMESPACE
		class QScatterSeriesPrivate;

		class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QChartSeries
		{
		Q_OBJECT
Tero Ahola Scatter series marker visuals	r195
		public:
		enum MarkerShape {
		// TODO: to be defined by the graphics design
		// TODO: marker shapes: "x", star, rectangle, tilted rect, triangle, circle, dot
		MarkerShapeDefault = 0,
		MarkerShapePoint,
		MarkerShapeX,
		MarkerShapeRectangle,
		MarkerShapeTiltedRectangle,
		MarkerShapeTriangle,
		MarkerShapeCircle
		};

Tero Ahola Integrated scatter type series...	r42	public:
Tero Ahola Refactored series creation with QChart	r61	QScatterSeries(QObject *parent = 0);
Tero Ahola Integrated scatter type series...	r42	~QScatterSeries();

		public: // from QChartSeries
Tero Ahola Integrated draft version of pie series	r51	QChartSeriesType type() const { return QChartSeries::SeriesTypeScatter; }
Tero Ahola Integrated scatter type series...	r42
Tero Ahola Integrated scatter again. Missing functionality....	r158	public:
Tero Ahola added stream operator to scatter series	r180	void addData(QPointF value);
Tero Ahola Scatter series documentation; now uses snippets	r300	void addData(QList<QPointF> points);
		void setData(QList<QPointF> points);
Tero Ahola added stream operator to scatter series	r180	QScatterSeries& operator << (const QPointF &value);
Tero Ahola Scatter series documentation; now uses snippets	r300	QScatterSeries& operator << (QList<QPointF> points);
Tero Ahola Integrated scatter again. Missing functionality....	r158	QList<QPointF> data();
Tero Ahola Scatter series marker visuals	r195	//TODO: insertData?
Tero Ahola Modifying QScatterSeries API	r179
		QPen markerPen();
Tero Ahola Scatter series marker visuals	r195	QBrush markerBrush();
		MarkerShape markerShape();
		// TODO: marker size?
Tero Ahola Modifying QScatterSeries API	r179
Tero Ahola Scatter series documentation; now uses snippets	r300	public Q_SLOTS:
		void setMarkerPen(QPen pen);
		void setMarkerBrush(QBrush brush);
		void setMarkerShape(MarkerShape shape);

Tero Ahola Integrated scatter again. Missing functionality....	r158	Q_SIGNALS:
Tero Ahola Scatter series documentation; now uses snippets	r300	void clicked(/* TODO: parameters? */);
		void hoverEnter(/* TODO: parameters? */);
		void hoverLeave(/* TODO: parameters? */);
		// TODO: move to PIMPL for simplicity or does the user ever need changed signals?
Tero Ahola Modifying QScatterSeries API	r179	// TODO: more finegrained signaling for performance reasons
Tero Ahola Scatter series marker visuals	r195	// (check QPieSeries implementation with change sets)
Tero Ahola Integrated scatter again. Missing functionality....	r158	void changed();

Tero Ahola Integrated scatter type series...	r42	private:
		Q_DECLARE_PRIVATE(QScatterSeries)
		Q_DISABLE_COPY(QScatterSeries)
		QScatterSeriesPrivate *const d;
		};

		QTCOMMERCIALCHART_END_NAMESPACE

		#endif // QSCATTERSERIES_H