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

                  Constructs empty series object which is a child of \a parent.
                  When series object is added to QChartView or QChart instance ownerships is transfered.
              */
-             QLineSeries::QLineSeries(QObject* parent):QXYSeries(parent),
-             m_pointsVisible(false)
+             QLineSeries::QLineSeries(QObject* parent):QXYSeries(parent)
              {
              }
              /*!
              {
              }
-             /*!
-                 Sets \a pen used for drawing given series..
-             */
-             void QLineSeries::setPen(const QPen& pen)
+             {
-                 if(pen!=m_pen){
-                 m_pen=pen;
-                 emit updated();
+                 }
+             }
-             /*!
-                 Sets if data points are \a visible and should be drawn on line.
-             */
-             void QLineSeries::setPointsVisible(bool visible)
+             {
-                 if(m_pointsVisible!=visible){
-                 m_pointsVisible=visible;
-                 emit updated();
+                 }
+             }
              QDebug operator<< (QDebug debug, const QLineSeries series)
              {
                  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

                  Constructs empty series object which is a child of \a parent.
                  When series object is added to QChartView or QChart instance ownerships is transfered.
              */
-             QXYSeries::QXYSeries(QObject* parent):QSeries(parent)
+             QXYSeries::QXYSeries(QObject* parent):QSeries(parent),
+             m_pointsVisible(false)
              {
              }
              /*!
              }
              /*!
+                 Sets \a pen used for drawing given series..
+             */
+             void QXYSeries::setPen(const QPen& pen)
+             {
+                 if(pen!=m_pen){
+                 m_pen=pen;
+                 emit updated();
+                 }
+             }
+             /*!
+                 Sets if data points are \a visible and should be drawn on line.
+             */
+             void QXYSeries::setPointsVisible(bool visible)
+             {
+                 if(m_pointsVisible!=visible){
+                 m_pointsVisible=visible;
+                 emit updated();
+                 }
+             }
+             /*!
                  Stream operator for adding a data \a point to the series.
                  \sa add()
              */

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