HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r145:251cad7c49ee

Fix previous broken commit

Michal Klocek -

r145:251cad7c49ee

parent child

Context file:

r145:251cad7c49ee

Expand all files

example/colorlinechart/main.cpp +3 -3

             #include <QApplication>
             #include <QMainWindow>
             #include <qchartview.h>
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             #include <qchart.h>
             #include <cmath>
                 QMainWindow window;
-                QXYChartSeries* series0 = QXYChartSeries::create();
+                QLineChartSeries* series0 = QLineChartSeries::create();
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
-                QXYChartSeries* series1 = QXYChartSeries::create();
+                QLineChartSeries* series1 = QLineChartSeries::create();
                 QPen red(Qt::red);
                 red.setWidth(3);
                 series1->setPen(red);

example/dynamiclinechart/dynamiclinechart.pro +1 -1

             TARGET = dynamicLineChart
             TEMPLATE = app
-            QT += core gui
+            QT += core gui opengl
             SOURCES += main.cpp
             HEADERS += wavegenerator.h

example/dynamiclinechart/main.cpp +5 -3

             #include <QApplication>
             #include <QMainWindow>
             #include <qchartview.h>
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             #include <qchart.h>
             #include <cmath>
             #include "wavegenerator.h"
+            #include <QGLWidget>
             int main(int argc, char *argv[])
             {
                 QMainWindow window;
-                QXYChartSeries* series0 = QXYChartSeries::create();
+                QLineChartSeries* series0 = QLineChartSeries::create();
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
-                QXYChartSeries* series1 = QXYChartSeries::create();
+                QLineChartSeries* series1 = QLineChartSeries::create();
                 QPen red(Qt::red);
                 red.setWidth(3);
                 series1->setPen(red);
                 QChartView* chartView =  new QChartView(&window);
+                chartView->setViewport( new QGLWidget() );
                 chartView->setRenderHint(QPainter::Antialiasing);
                 chartView->setTitle("This is wave generator buahha.");
                 chartView->addSeries(series0);

example/dynamiclinechart/wavegenerator.h +4 -4

             #include <QTime>
             #include <QObject>
             #include <cmath>
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 Q_OBJECT
             public:
-                WaveGenerator(QXYChartSeries* series1, QXYChartSeries* series2) :
+                WaveGenerator(QLineChartSeries* series1, QLineChartSeries* series2) :
                     m_series1(series1),
                     m_series2(series2),
                     m_wave(0),
                 }
             private:
-                QXYChartSeries* m_series1;
+                QLineChartSeries* m_series1;
-                QXYChartSeries* m_series2;
+                QLineChartSeries* m_series2;
                 int m_wave;
                 qreal m_step;
                 QTimer m_timer;

example/linechart/main.cpp +3 -3

             #include <QApplication>
             #include <QMainWindow>
             #include <qchartview.h>
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             #include <qchart.h>
             #include <cmath>
                 QMainWindow window;
-                QXYChartSeries* series0 = QXYChartSeries::create();
+                QLineChartSeries* series0 = QLineChartSeries::create();
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
-                QXYChartSeries* series1 = QXYChartSeries::create();
+                QLineChartSeries* series1 = QLineChartSeries::create();
                 QPen red(Qt::red);
                 red.setWidth(3);
                 series1->setPen(red);

example/zoomlinechart/main.cpp +3 -3

             #include "chartwidget.h"
             #include <QApplication>
             #include <QMainWindow>
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             #include <cmath>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QMainWindow window;
-                QXYChartSeries* series0 = QXYChartSeries::create();
+                QLineChartSeries* series0 = QLineChartSeries::create();
                 QPen blue(Qt::blue);
                 blue.setWidth(3);
                 series0->setPen(blue);
-                QXYChartSeries* series1 = QXYChartSeries::create();
+                QLineChartSeries* series1 = QLineChartSeries::create();
                 QPen red(Qt::red);
                 red.setWidth(3);
                 series1->setPen(red);

qmlplugin/declarativeseries.cpp +3 -3

             #include "declarativeseries.h"
             #include "declarativechart.h"
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             #include <cmath>
             #include <QDebug>
                     switch (m_seriesType) {
                     case SeriesTypeLine: {
-                        m_series = QXYChartSeries::create(this);
+                        m_series = QLineChartSeries::create(this);
                         for (qreal i(0.0); i < 100.0; i += 1.0)
-                            ((QXYChartSeries *)m_series)->add(i, i);
+                            ((QLineChartSeries *)m_series)->add(i, i);
                         chart->addSeries(m_series);
                         break;
                     }

src/axisitem.cpp +38 -46

@@ -13,27 +13,14 AxisItem::AxisItem(QChartAxis* axis,AxisType type,QGraphicsItem* parent) :
13	m_ticks(4),	13	m_ticks(4),
14	m_type(type)	14	m_type(type)
15	{	15	{
		16	//initial initialization
		17	handleAxisChanged();
16	}	18	}
17		19
18	AxisItem::~AxisItem()	20	AxisItem::~AxisItem()
19	{	21	{
20	}	22	}
21		23
22	void AxisItem::setLength(int length)
23	{
24	QPainterPath path;
25	path.moveTo(QPointF(0,0));
26	path.lineTo(length,0);
27	// path.lineTo(length-4,0);
28	// path.lineTo(length,3);
29	// path.lineTo(length-4,6);
30	// path.lineTo(length-4,4);
31	// path.lineTo(0,4);
32	// path.lineTo(0,2);
33	m_path=path;
34	update();
35	}
36
37	QRectF AxisItem::boundingRect() const	24	QRectF AxisItem::boundingRect() const
38	{	25	{
39	return m_rect;	26	return m_rect;
@@ -97,49 +84,54 void AxisItem::createItems()
97		84
98	if(!m_rect.isValid()) return;	85	if(!m_rect.isValid()) return;
99		86
100	if(m_type==X_AXIS) {	87	switch (m_type)
101		88	{
102	const qreal deltaX = m_rect.width() / m_ticks;	89	case X_AXIS:
103		90	{
104	for (int i = 0; i <= m_ticks; ++i) {	91	const qreal deltaX = m_rect.width() / m_ticks;
105		92
106	int x = i * deltaX + m_rect.left();	93	for (int i = 0; i <= m_ticks; ++i) {
107		94
108	qreal label = m_domain.m_minX + (i * m_domain.spanX()/ m_ticks);	95	int x = i * deltaX + m_rect.left();
109		96
110	m_grid<<new QGraphicsLineItem(x, m_rect.top(), x, m_rect.bottom(),this);	97	qreal label = m_domain.m_minX + (i * m_domain.spanX()/ m_ticks);
111		98
112	QGraphicsSimpleTextItem* text = new QGraphicsSimpleTextItem(QString::number(label),this);	99	m_grid<<new QGraphicsLineItem(x, m_rect.top(), x, m_rect.bottom(),this);
113	QPointF center = text->boundingRect().center();
114	text->setPos(x - center.x(), m_rect.bottom() + LABEL_PADDING);
115	//text->rotate(-45);
116	m_labels<<text;
117	}
118	}
119		100
120	if(m_type==Y_AXIS) {	101	QGraphicsSimpleTextItem* text = new QGraphicsSimpleTextItem(QString::number(label),this);
121		102	QPointF center = text->boundingRect().center();
122	const qreal deltaY = m_rect.height()/ m_ticks;	103	text->setPos(x - center.x(), m_rect.bottom() + LABEL_PADDING);
		104	//text->rotate(-45);
		105	m_labels<<text;
		106	}
		107	}
		108	break;
123		109
124	for (int j = 0; j <= m_ticks; ++j) {	110	case Y_AXIS:
		111	{
		112	const qreal deltaY = m_rect.height()/ m_ticks;
125		113
126	int y = j * -deltaY + m_rect.bottom();	114	for (int j = 0; j <= m_ticks; ++j) {
127		115
128	qreal label = m_domain.m_minY + (j * m_domain.spanY()	116	int y = j * -deltaY + m_rect.bottom();
129	/ m_ticks);
130		117
131	m_grid<<new QGraphicsLineItem(m_rect.left() , y, m_rect.right(), y,this);	118	qreal label = m_domain.m_minY + (j * m_domain.spanY()
132	QGraphicsSimpleTextItem* text = new QGraphicsSimpleTextItem(QString::number(label),this);	119	/ m_ticks);
133	QPointF center = text->boundingRect().center();
134		120
135	text->setPos(m_rect.left() - text->boundingRect().width() - LABEL_PADDING , y-center.y());	121	m_grid<<new QGraphicsLineItem(m_rect.left() , y, m_rect.right(), y,this);
136	//text->rotate(-45);	122	QGraphicsSimpleTextItem* text = new QGraphicsSimpleTextItem(QString::number(label),this);
137	m_labels<<text;	123	QPointF center = text->boundingRect().center();
		124	text->setPos(m_rect.left() - text->boundingRect().width() - LABEL_PADDING , y-center.y());
138		125
139	}	126	m_labels<<text;
140	}
141		127
142	//painter->drawRect(m_rect.adjusted(0, 0, -1, -1));	128	}
		129	}
		130	break;
		131	default:
		132	qDebug()<<"Unknown axis type";
		133	break;
		134	}
143	}	135	}
144		136
145	void AxisItem::clear()	137	void AxisItem::clear()

src/axisitem_p.h 0 -5

                 void clear();
             public:
-                void setLength(int length);
-                void setWidth(int width);
                 AxisType axisType() const {return m_type;};
             protected:
                 AxisType m_type;
                 int m_ticks;
                 Domain m_domain;
                 QRectF m_rect;
                 QPainterPath m_path;

src/chartdataset.cpp +2 -2

             #include "chartdataset_p.h"
             //series
-            #include "qxychartseries.h"
+            #include "qlinechartseries.h"
             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
                 {
                     case QChartSeries::SeriesTypeLine: {
-                        QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
+                        QLineChartSeries* xyseries = static_cast<QLineChartSeries*>(series);
                         for (int i = 0; i < xyseries->count(); i++)
                         {

src/chartpresenter.cpp +4 -7

             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
-            #include "qxychartseries.h"
+            #include "qlinechartseries.h"
             #include "qpieseries.h"
             //items
             #include "axisitem_p.h"
             #include "bargroup.h"
             #include "stackedbargroup.h"
-            #include "xylinechartitem_p.h"
+            #include "linechartitem_p.h"
             #include "percentbargroup.h"
             #include "linechartanimationitem_p.h"
             #include "piepresentation.h"
-            #include <QAbstractAnimation>
-            #include <QPropertyAnimation>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
                 switch(series->type())
                 {
                     case QChartSeries::SeriesTypeLine: {
-                        QXYChartSeries* lineSeries = static_cast<QXYChartSeries*>(series);
+                        QLineChartSeries* lineSeries = static_cast<QLineChartSeries*>(series);
-                        XYLineChartItem* item = new LineChartAnimationItem(this,lineSeries,m_chart);
+                        LineChartItem* item = new LineChartAnimationItem(this,lineSeries,m_chart);
                         m_chartTheme->decorate(item,lineSeries,m_chartItems.count());
                         QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
                         QObject::connect(m_dataset,SIGNAL(domainChanged(const Domain&)),item,SLOT(handleDomainChanged(const Domain&)));

src/charttheme.cpp +5 -5

             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
-            #include "qxychartseries.h"
+            #include "qlinechartseries.h"
             //items
             #include "axisitem_p.h"
             #include "bargroup.h"
             #include "stackedbargroup.h"
-            #include "xylinechartitem_p.h"
+            #include "linechartitem_p.h"
             #include "percentbargroup.h"
             //themes
                 switch(series->type())
                 {
                     case QChartSeries::SeriesTypeLine: {
-                        QXYChartSeries* s = static_cast<QXYChartSeries*>(series);
+                        QLineChartSeries* s = static_cast<QLineChartSeries*>(series);
-                        XYLineChartItem* i = static_cast<XYLineChartItem*>(item);
+                        LineChartItem* i = static_cast<LineChartItem*>(item);
                         decorate(i,s,count);
                         break;
                     }
             }
-            void ChartTheme::decorate(XYLineChartItem* item, QXYChartSeries* series,int count)
+            void ChartTheme::decorate(LineChartItem* item, QLineChartSeries* series,int count)
             {
                 item->setPen(series->pen());
             }

src/charttheme_p.h +3 -3

             class ChartItem;
             class QChartSeries;
-            class XYLineChartItem;
+            class LineChartItem;
-            class QXYChartSeries;
+            class QLineChartSeries;
             class BarGroup;
             class BarChartSeries;
             class StackedBarGroup;
                 static ChartTheme* createTheme(QChart::ChartThemeId theme);
                 void decorate(QChart* chart);
                 void decorate(ChartItem* item, QChartSeries* series,int count);
-                void decorate(XYLineChartItem* item, QXYChartSeries*, int count);
+                void decorate(LineChartItem* item, QLineChartSeries*, int count);
                 void decorate(BarGroup* item, BarChartSeries* series,int count);
                 void decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count);
                 void decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count);

src/linechart/linechartanimationitem.cpp +5 -5

             #include "linechartanimationitem_p.h"
-            #include "xylinechartitem_p.h"
+            #include "linechartitem_p.h"
             #include <QPropertyAnimation>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             const static int duration = 500;
-            LineChartAnimationItem::LineChartAnimationItem(ChartPresenter* presenter, QXYChartSeries* series,QGraphicsItem *parent):
+            LineChartAnimationItem::LineChartAnimationItem(ChartPresenter* presenter, QLineChartSeries* series,QGraphicsItem *parent):
-            XYLineChartItem(presenter,series,parent)
+            LineChartItem(presenter,series,parent)
             {
             }
             {
                 int index = count();
                 for(int i = index;i< points ;i++){
-                    XYLineChartItem::addPoint(m_data.at(i));
+                    LineChartItem::addPoint(m_data.at(i));
                 }
                 updateGeometry();
                 update();
             void LineChartAnimationItem::aw_setPoint(int index,const QPointF& point)
             {
-                XYLineChartItem::setPoint(index,point);
+                LineChartItem::setPoint(index,point);
                 updateGeometry();
                 update();
             }

src/linechart/linechartanimationitem_p.h +7 -7

-            #ifndef XYLINEPRESENTER_P_H_
+            #ifndef LINECHARTANIMATIONITEM_P_H_
-            #define XYLINEPRESENTER_P_H_
+            #define LINECHARTANIMATIONITEM_P_H_
             #include "qchartglobal.h"
-            #include "xylinechartitem_p.h"
+            #include "linechartitem_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class XYLineChartItem;
+            class LineChartItem;
-            class LineChartAnimationItem : public XYLineChartItem {
+            class LineChartAnimationItem : public LineChartItem {
                 Q_OBJECT
                 Q_PROPERTY(int a_addPoints READ ar_addPoints WRITE aw_addPoints);
                // Q_PROPERTY(QPointF a_setPoint READ ar_setPoint WRITE aw_setPoint);
             public:
-            	LineChartAnimationItem(ChartPresenter* presenter, QXYChartSeries *series, QGraphicsItem *parent = 0);
+            	LineChartAnimationItem(ChartPresenter* presenter, QLineChartSeries *series, QGraphicsItem *parent = 0);
             	virtual ~LineChartAnimationItem();
             	void addPoints(const QVector<QPointF>& points);
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif /* XYLINEPRESENTER_P_H_ */
+            #endif

src/qchart.cpp +2 -2

             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
-            #include "qxychartseries.h"
+            #include "qlinechartseries.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
                 switch (type) {
                     case QChartSeries::SeriesTypeLine: {
-                        series = QXYChartSeries::create();
+                        series = QLineChartSeries::create();
                         break;
                     }
                     case QChartSeries::SeriesTypeBar: {

src/qchartseries.cpp +2 -2

             #include "qchartseries.h"
             #include "barchartseries.h"
-            #include "qxychartseries.h"
+            #include "qlinechartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 // TODO: Other types
                 switch (type) {
                 case QChartSeries::SeriesTypeLine: {
-                    QXYChartSeries* s = QXYChartSeries::create(parent); // TODO: do we need create method for derived implementations?
+                    QLineChartSeries* s = QLineChartSeries::create(parent); // TODO: do we need create method for derived implementations?
                     return s;
                 }
                 case QChartSeries::SeriesTypePie: {

src/src.pro +43 -70

-            !include( ../common.pri ) {
+            !include( ../common.pri ):error( Couldn't find the common.pri file! )
-            error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
+            SOURCES += barchart/barchartseries.cpp \
-            SOURCES += \
-                barchart/barchartseries.cpp \
                 barchart/bargroup.cpp \
                 barchart/bar.cpp \
                 barchart/stackedbarchartseries.cpp \
                 barchart/percentbarchartseries.cpp \
                 barchart/percentbargroup.cpp \
                 barchart/barlabel.cpp \
-                xylinechart/qxychartseries.cpp \
+                linechart/linechartanimationitem.cpp \
-                xylinechart/xylinechartitem.cpp \
+                linechart/linechartitem.cpp \
-                xylinechart/linechartanimationitem.cpp \
+                linechart/qlinechartseries.cpp \
                 piechart/qpieseries.cpp \
                 piechart/pieslice.cpp \
                 piechart/piepresentation.cpp \
+                barchart/separator.cpp \
+                barchart/bargroupbase.cpp \
+                barchart/barchartseriesbase.cpp \
                 plotdomain.cpp \
                 qscatterseries.cpp \
                 qchart.cpp \
                 qchartseries.cpp \
                 qchartaxis.cpp \
                 charttheme.cpp \
-                barchart/separator.cpp \
-                barchart/bargroupbase.cpp \
-                barchart/barchartseriesbase.cpp \
                 chartdataset.cpp \
                 chartpresenter.cpp \
                 domain.cpp
+            PRIVATE_HEADERS += linechart/linechartitem_p.h \
+                linechart/linechartanimationitem_p.h \
-            PRIVATE_HEADERS += \
-                xylinechart/xylinechartitem_p.h \
-                xylinechart/linechartanimationitem_p.h \
                 barchart/barlabel_p.h \
                 barchart/bar_p.h \
                 barchart/separator_p.h \
                 charttheme_p.h \
                 chartdataset_p.h \
                 chartpresenter_p.h \
                 domain_p.h
+            PUBLIC_HEADERS += linechart/qlinechartseries.h \
-            PUBLIC_HEADERS += \
-                qchartseries.h \
-                qscatterseries.h \
-                qchart.h \
-                qchartglobal.h \
-                xylinechart/qxychartseries.h \
                 barchart/barchartseries.h \
                 barchart/bargroup.h \
                 barchart/stackedbarchartseries.h \
                 barchart/barchartseriesbase.h \
                 barchart/bargroupbase.h \
                 piechart/qpieseries.h \
+                qchartseries.h \
+                qscatterseries.h \
+                qchart.h \
+                qchartglobal.h \
                 qchartview.h \
                 qchartaxis.h
+            THEMES += themes/chartthemeicy_p.h \
-            THEMES += \
-                themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
-                themes/chartthemevanilla_p.h \
+                themes/chartthemevanilla_p.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
+            INCLUDEPATH += linechart \
-            INCLUDEPATH += xylinechart \
+                barchart \
-                           barchart \
+                piechart \
-                           piechart \
+                themes \
-                           themes \
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
             install_build_headers.name = bild_headers
             install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_headers.input = PUBLIC_HEADERS
-            install_build_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} $$CHART_BUILD_HEADER_DIR
+            install_build_headers.commands = $$QMAKE_COPY \
-            install_build_headers.CONFIG += target_predeps no_link
+                ${QMAKE_FILE_NAME} \
+                $$CHART_BUILD_HEADER_DIR
+            install_build_headers.CONFIG += target_predeps \
+                no_link
             QMAKE_EXTRA_COMPILERS += install_build_headers
             chartversion.target = qchartversion_p.h
-            chartversion.commands = @echo "build_time" > $$chartversion.target;
+            chartversion.commands = @echo \
-            chartversion.depends = $$HEADERS $$SOURCES
+                "build_time" \
+                > \
+                $$chartversion.target;
+            chartversion.depends = $$HEADERS \
+                $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
-            QMAKE_CLEAN+= qchartversion_p.h
+            QMAKE_CLEAN += qchartversion_p.h
             QMAKE_EXTRA_TARGETS += chartversion
+            unix:QMAKE_DISTCLEAN += -r \
-            unix:QMAKE_DISTCLEAN += -r $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
+                $$CHART_BUILD_HEADER_DIR \
-            win32:QMAKE_DISTCLEAN += /Q $$CHART_BUILD_HEADER_DIR $$CHART_BUILD_LIB_DIR
+                $$CHART_BUILD_LIB_DIR
+            win32:QMAKE_DISTCLEAN += /Q \
+                $$CHART_BUILD_HEADER_DIR \
+                $$CHART_BUILD_LIB_DIR

test/chartwidgettest/mainwidget.cpp +2 -2

             #include "dataseriedialog.h"
             #include "qchartseries.h"
             #include "qpieseries.h"
-            #include <qxychartseries.h>
+            #include <qlinechartseries.h>
             #include <barchartseries.h>
             #include <QPushButton>
             #include <QComboBox>
             //            lineSeries->add(x.at(i), y.at(i));
             //        }
                     //Q_ASSERT(newSeries->setData(x, y));
-                    QXYChartSeries* series0 = QXYChartSeries::create();
+                    QLineChartSeries* series0 = QLineChartSeries::create();
                     for (int i(0); i < x.count() && i < y.count(); i++)
                         series0->add(x.at(i), y.at(i));
                     m_chartWidget->addSeries(series0);

src/linechart/qxychartseries.cpp removed 0 -77

NO CONTENT: file was removed

src/linechart/qxychartseries.h removed 0 -48

NO CONTENT: file was removed

src/linechart/xylinechartitem.cpp removed 0 -202

NO CONTENT: file was removed

src/linechart/xylinechartitem_p.h removed 0 -79

NO CONTENT: file was removed

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