HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r62:d89198258a93

Refactored series creation.

sauimone -

r62:d89198258a93

parent child

Context file:

r62:d89198258a93

src/qchartseries.cpp created 644 +32 0

			@@ -0,0 +1,32
		1	#include "qchartglobal.h"
		2	#include "qchartseries.h"
		3
		4	#include "barchartseries.h"
		5	#include "qxychartseries.h"
		6
		7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
		8
		9	QChartSeries* QChartSeries::create(QChartSeriesType type, QObject* parent)
		10	{
		11	// TODO: Other types
		12	switch (type) {
		13	case QChartSeries::SeriesTypeLine: {
		14	QXYChartSeries* s = QXYChartSeries::create(parent); // TODO: do we need create method for derived implementations?
		15	return s;
		16	}
		17	case QChartSeries::SeriesTypePie: {
		18	return 0;
		19	}
		20	case QChartSeries::SeriesTypeScatter: {
		21	return 0;
		22	}
		23	case QChartSeries::SeriesTypeBar: {
		24	BarChartSeries* s = new BarChartSeries(parent);
		25	return s;
		26	}
		27	default:
		28	return 0;
		29	}
		30	}
		31
		32	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.cpp +11 -2

              #include "barchartseries.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             BarChartSeries::BarChartSeries(QList<int> data, QObject *parent)
+             BarChartSeries::BarChartSeries(QObject *parent)
                  : QChartSeries(parent)
-                 , mData(data)
              {
              }
+             bool BarChartSeries::setData(QList<int> data)
+             {
+                 mData = data;
+                 return true;
+             }
              int BarChartSeries::min()
              {
+                 Q_ASSERT(mData.count() > 0);
                  // TODO: make min and max members and update them when data changes.
                  // This is slower since they are checked every time, even if data is same since previous call.
                  int min = mData.at(0);
              int BarChartSeries::max()
              {
+                 Q_ASSERT(mData.count() > 0);
                  int max = mData.at(0);
                  for (int i=0; i <mData.count(); i++) {

src/barchart/barchartseries.h +8 -3

              // Container for series
              class QTCOMMERCIALCHART_EXPORT BarChartSeries : public QChartSeries
              {
+                 // TODO:
+             //    Q_OBJECT
              public:
-                 BarChartSeries(QList<int> data, QObject* parent=0);
+                 BarChartSeries(QObject* parent=0);
                  // from QChartSeries
-                 static QChartSeries* create(QObject* parent = 0 );
                  virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
+                 virtual bool setData(QList<int> data);
+                 virtual bool setData(QList<qreal> data) {return false;}
+                 virtual bool setData(QList<qreal> x, QList<qreal> y) {return false;}
                  // Methods to find out minimum and maximum values of data
                  int min();
                  int max();

src/qchartseries.h +4 -2

              class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
              {
+                 //TODO:
+                 //Q_OBJECT
              public:
                  enum QChartSeriesType {
                      SeriesTypeLine = 0,
                  virtual ~QChartSeries(){};
                  // Factory method
-                 static QChartSeries* create(QObject* parent = 0 ){ return 0;}
+                 static QChartSeries* create(QChartSeriesType type, QObject* parent = 0 );
                  // Pure virtual
                  virtual QChartSeriesType type() const = 0;

src/src.pro +2 -1

                  axis.cpp \
                  qchartwidget.cpp \
                  pieslice.cpp \
-                 qchartview.cpp
+                 qchartview.cpp \
+                 qchartseries.cpp
              PRIVATE_HEADERS += \
                  xylinechart/xylinechartitem_p.h \

src/xylinechart/qxychartseries.h +2 0

              class QTCOMMERCIALCHART_EXPORT QXYChartSeries : public QChartSeries
              {
+                 //TODO:
+             //    Q_OBJECT
              private:
                  QXYChartSeries(QObject* parent=0);
              public:

test/chartwidgettest/mainwidget.cpp +17 0

              #include "qchartseries.h"
              #include "qpieseries.h"
              #include <qxychartseries.h>
+             #include <barchartseries.h>
              #include <QPushButton>
              #include <QComboBox>
              #include <QSpinBox>
                      // TODO
                  }
+                 // BarChart
+                 if (series == "Bar") {
+                     qDebug() << "Bar chart series";
+                     QChartSeries* barSeries = QChartSeries::create(QChartSeries::SeriesTypeBar, this);
+                     QList<int> barData;
+                     barData << 1;
+                     barData << 12;
+                     barData << 5;
+                     barData << 8;
+                     barData << 17;
+                     barData << 9;
+                     barSeries->setData(barData);
+                     m_chartWidget->addSeries(barSeries);
+                 }
                  setCurrentSeries(newSeries);
              }

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