HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r467:bda5257e118d

Spline series windows compilation fix

Michal Klocek -

r467:bda5257e118d

parent child

Context file:

r467:bda5257e118d

Collapse all files

src/linechart/qlineseries.cpp +1 -24

@@ -66,8 +66,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
66	Constructs empty series object which is a child of \a parent.	66	Constructs empty series object which is a child of \a parent.
67	When series object is added to QChartView or QChart instance ownerships is transfered.	67	When series object is added to QChartView or QChart instance ownerships is transfered.
68	*/	68	*/
69	QLineSeries::QLineSeries(QObject* parent):QXYSeries(parent),	69	QLineSeries::QLineSeries(QObject* parent):QXYSeries(parent)
70	m_pointsVisible(false)
71	{	70	{
72	}	71	}
73	/*!	72	/*!
@@ -78,28 +77,6 QLineSeries::~QLineSeries()
78	{	77	{
79	}	78	}
80		79
81	/*!
82	Sets \a pen used for drawing given series..
83	*/
84	void QLineSeries::setPen(const QPen& pen)
85	{
86	if(pen!=m_pen){
87	m_pen=pen;
88	emit updated();
89	}
90	}
91
92	/*!
93	Sets if data points are \a visible and should be drawn on line.
94	*/
95	void QLineSeries::setPointsVisible(bool visible)
96	{
97	if(m_pointsVisible!=visible){
98	m_pointsVisible=visible;
99	emit updated();
100	}
101	}
102
103	QDebug operator<< (QDebug debug, const QLineSeries series)	80	QDebug operator<< (QDebug debug, const QLineSeries series)
104	{	81	{
105	Q_ASSERT(series.m_x.size() == series.m_y.size());	82	Q_ASSERT(series.m_x.size() == series.m_y.size());

src/linechart/qlineseries.h +1 -9

             public: // from QChartSeries
             	virtual QSeriesType type() const {return QSeries::SeriesTypeLine;}
-            	void setPen(const QPen& pen);
-            	QPen pen() const {return m_pen;}
-            	void setPointsVisible(bool visible);
-            	bool pointsVisible() const {return m_pointsVisible;}
                 friend QDebug operator<< (QDebug d, const QLineSeries series);
-            private:
-            	QPen m_pen;
-            	bool m_pointsVisible;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/qsplineseries.cpp +1 -1

               */
             QSplineSeries::QSplineSeries(QObject *parent) :
-                QLineSeries(parent)
+                QXYSeries(parent)
             {
                 connect(this,SIGNAL(pointAdded(int)), this, SLOT(updateControlPoints()));
                 connect(this,SIGNAL(pointRemoved(int)), this, SLOT(updateControlPoints()));

src/splinechart/qsplineseries.h +10 -9

             #include "qchartglobal.h"
             #include <QtGlobal>
-            #include "qlineseries.h"
+            #include "qxyseries.h"
             #include <QList>
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QSplineSeries : public QLineSeries
+            class QTCOMMERCIALCHART_EXPORT QSplineSeries : public QXYSeries
             {
                 Q_OBJECT
-                public:
+            public:
                 QSplineSeries(QObject *parent = 0);
-                QSeriesType type() const { return QSeries::SeriesTypeSpline; }
+                QSeriesType type() const {return QSeries::SeriesTypeSpline;}
             //    int count() const { return m_x.size(); }
-                QPointF controlPoint(int index) const { return m_controlPoints[index]; }
+                QPointF controlPoint(int index) const {return m_controlPoints[index];}
                 // TODO: allow the user to set custom control points
             //    void setCustomControlPoints(QList<QPointsF> controlPoints);
             //    bool calculateControlPointsAutomatically();
             //    void setCalculateControlPointsAutomatically();
-                private:
+            private:
                 void calculateControlPoints();
                 QList<qreal> getFirstControlPoints(QList<qreal> rhs);
-                private slots:
+            private slots:
                 void updateControlPoints();
-                private:
+            private:
                 QList<QPointF> m_controlPoints;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxyseries.cpp +25 -1

@@ -66,7 +66,8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
66	Constructs empty series object which is a child of \a parent.	66	Constructs empty series object which is a child of \a parent.
67	When series object is added to QChartView or QChart instance ownerships is transfered.	67	When series object is added to QChartView or QChart instance ownerships is transfered.
68	*/	68	*/
69	QXYSeries::QXYSeries(QObject* parent):QSeries(parent)	69	QXYSeries::QXYSeries(QObject* parent):QSeries(parent),
		70	m_pointsVisible(false)
70	{	71	{
71	}	72	}
72	/*!	73	/*!
@@ -173,6 +174,29 int QXYSeries::count() const
173	}	174	}
174		175
175	/*!	176	/*!
		177	Sets \a pen used for drawing given series..
		178	*/
		179	void QXYSeries::setPen(const QPen& pen)
		180	{
		181	if(pen!=m_pen){
		182	m_pen=pen;
		183	emit updated();
		184	}
		185	}
		186
		187	/*!
		188	Sets if data points are \a visible and should be drawn on line.
		189	*/
		190	void QXYSeries::setPointsVisible(bool visible)
		191	{
		192	if(m_pointsVisible!=visible){
		193	m_pointsVisible=visible;
		194	emit updated();
		195	}
		196	}
		197
		198
		199	/*!
176	Stream operator for adding a data \a point to the series.	200	Stream operator for adding a data \a point to the series.
177	\sa add()	201	\sa add()
178	*/	202	*/

src/xychart/qxyseries.h +9 0

             	QXYSeries& operator << (const QPointF &point);
+            	void setPen(const QPen& pen);
+            	QPen pen() const {return m_pen;}
+            	void setPointsVisible(bool visible);
+            	bool pointsVisible() const {return m_pointsVisible;}
             signals:
             	void updated();
             	void pointReplaced(int index);
             	QVector<qreal> m_x;
             	QVector<qreal> m_y;
+            	QPen m_pen;
+            	bool m_pointsVisible;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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