HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r295:698d88c3d4c1

Spline initial

Marek Rosa -

r295:698d88c3d4c1

parent child

Context file:

r295:698d88c3d4c1

src/splinechart/qsplineseries.cpp created 644 +6 0

			@@ -0,0 +1,6
		1	#include "qsplineseries.h"
		2
		3	QSplineSeries::QSplineSeries(QObject *parent) :
		4	QObject(parent)
		5	{
		6	}

src/splinechart/qsplineseries.h created 644 +24 0

			@@ -0,0 +1,24
		1	#ifndef QSPLINESERIES_H
		2	#define QSPLINESERIES_H
		3
		4	#include "qchartseries.h"
		5
		6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
		7
		8	class QSplineSeries : public QChartSeries
		9	{
		10	Q_OBJECT
		11	public:
		12	explicit QSplineSeries(QObject *parent = 0);
		13
		14	public: // from QChartSeries
		15	QChartSeriesType type() const { return QChartSeries::SeriesTypeSpline; }
		16	signals:
		17
		18	public slots:
		19
		20	};
		21
		22	QTCOMMERCIALCHART_END_NAMESPACE
		23
		24	#endif // QSPLINESERIES_H

src/splinechart/splinechart.pri created 644 +15 0

			@@ -0,0 +1,15
		1	INCLUDEPATH += $$PWD
		2	DEPENDPATH += $$PWD
		3
		4	SOURCES += \
		5	$$PWD/qsplineseries.cpp \
		6	splinechart/splinepresenter.cpp
		7
		8	PRIVATE_HEADERS +=
		9
		10	PUBLIC_HEADERS += \
		11	$$PWD/qsplineseries.h
		12
		13	HEADERS += \
		14	splinechart/qsplineseries.h \
		15	splinechart/splinepresenter_p.h

src/splinechart/splinepresenter.cpp created 644 +16 0

			@@ -0,0 +1,16
		1	#include "splinepresenter_p.h"
		2
		3	SplinePresenter::SplinePresenter(QObject *parent) :
		4	QObject(parent)
		5	{
		6	}
		7
		8	void SplinePresenter::handleGeometryChanged(const QRectF&)
		9	{
		10	//
		11	}
		12
		13	void SplinePresenter::handleDomainChanged(const Domain& domain)
		14	{
		15	//
		16	}

src/splinechart/splinepresenter_p.h created 644 +26 0

			@@ -0,0 +1,26
		1	#ifndef SPLINEPRESENTER_P_H
		2	#define SPLINEPRESENTER_P_H
		3
		4	#include "chartitem_p.h"
		5	#include <QObject>
		6
		7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
		8
		9	class SplinePresenter : public QObject, public ChartItem
		10	{
		11	Q_OBJECT
		12	public:
		13	SplinePresenter(QObject *parent = 0);
		14
		15	void handleGeometryChanged(const QRectF&);
		16	void handleDomainChanged(const Domain& domain);
		17
		18	signals:
		19
		20	public slots:
		21
		22	};
		23
		24	QTCOMMERCIALCHART_END_NAMESPACE
		25
		26	#endif // SPLINEPRESENTER_P_H

src/chartpresenter.cpp +7 0

              #include "qlinechartseries.h"
              #include "qpieseries.h"
              #include "qscatterseries.h"
+             #include "qsplineseries.h"
              //items
              #include "axisitem_p.h"
              #include "barpresenter.h"
              #include "linechartanimationitem_p.h"
              #include "piepresenter.h"
              #include "scatterpresenter_p.h"
+             #include "splinepresenter_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                          m_chartItems.insert(series, pie);
                          break;
                      }
+                 case QChartSeries::SeriesTypeSpline: {
+                     QSplineSeries* splineSeries = qobject_cast<QSplineSeries*>(series);
+                     SplinePresenter* splinePresenter = new SplinePresenter
+                     break;
+                 }
                      default: {
                          qDebug()<< "Series type" << series->type() << "not implemented.";
                          break;

src/qchartseries.h +2 -2

                      SeriesTypeStackedBar,
                      SeriesTypePercentBar,
                      SeriesTypePie,
-                     SeriesTypeScatter
-             //        SeriesTypeSpline
+                     SeriesTypeScatter,
+                     SeriesTypeSpline
                  };
              protected:

src/src.pro +3 -2

                  qchart.cpp \
                  qchartaxis.cpp \
                  qchartseries.cpp \
-                 qchartview.cpp
+                 qchartview.cpp
              PRIVATE_HEADERS += \
                  axisitem_p.h \
                  chartdataset_p.h \
              include(barchart/barchart.pri)
              include(piechart/piechart.pri)
              include(scatterseries/scatter.pri)
+             include(splinechart/splinechart.pri)
              THEMES += themes/chartthemeicy_p.h \
                  themes/chartthemegrayscale_p.h \
                  $$CHART_BUILD_LIB_DIR
              win32:QMAKE_DISTCLEAN += /Q \
                  $$CHART_BUILD_HEADER_DIR \
-                 $$CHART_BUILD_LIB_DIR
+                 $$CHART_BUILD_LIB_DIR

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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