##// END OF EJS Templates
Fix include issues
Jani Honkonen -
r1949:39b74020ad7b
parent child
Show More
@@ -18,12 +18,10
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "chart.h"
21 #include <QValueAxis>
22 #include <QValueAxis>
22 #include <QAbstractAxis>
23 #include <QAbstractAxis>
23 #include <cmath>
24 #include <cmath>
24 #include <QDebug>
25
26 #include "chart.h"
27
25
28 Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series)
26 Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series)
29 : QChart(parent, wFlags), m_series(series)
27 : QChart(parent, wFlags), m_series(series)
@@ -18,8 +18,8
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include <QMouseEvent>
22 #include "chartview.h"
21 #include "chartview.h"
22 #include <QMouseEvent>
23 #include "chart.h"
23 #include "chart.h"
24
24
25 ChartView::ChartView(Chart *chart, QWidget *parent) :
25 ChartView::ChartView(Chart *chart, QWidget *parent) :
@@ -18,8 +18,9
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef THEMEWINDOW_H
21 #ifndef THEMEWIDGET_H
22 #define THEMEWINDOW_H
22 #define THEMEWIDGET_H
23
23 #include <QWidget>
24 #include <QWidget>
24 #include <QChartGlobal>
25 #include <QChartGlobal>
25
26
@@ -73,4 +74,4 private:
73 QComboBox *m_legendComboBox;
74 QComboBox *m_legendComboBox;
74 };
75 };
75
76
76 #endif /* THEMEWINDOW_H */
77 #endif /* THEMEWIDGET_H */
@@ -18,8 +18,8
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef XYPOINTSMODEL_H
21 #ifndef CUSTOMTABLEMODEL_H
22 #define XYPOINTSMODEL_H
22 #define CUSTOMTABLEMODEL_H
23
23
24 #include <QAbstractTableModel>
24 #include <QAbstractTableModel>
25 #include <QHash>
25 #include <QHash>
@@ -48,4 +48,4 private:
48 int m_rowCount;
48 int m_rowCount;
49 };
49 };
50
50
51 #endif // XYPOINTSMODEL_H
51 #endif // CUSTOMTABLEMODEL_H
@@ -18,8 +18,8
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef XYPOINTSMODEL_H
21 #ifndef CUSTOMTABLEMODEL_H
22 #define XYPOINTSMODEL_H
22 #define CUSTOMTABLEMODEL_H
23
23
24 #include <QAbstractTableModel>
24 #include <QAbstractTableModel>
25 #include <QHash>
25 #include <QHash>
@@ -48,4 +48,4 private:
48 int m_rowCount;
48 int m_rowCount;
49 };
49 };
50
50
51 #endif // XYPOINTSMODEL_H
51 #endif // CUSTOMTABLEMODEL_H
@@ -18,8 +18,8
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef MAINWINDOW_H
21 #ifndef CHARTVIEW_H
22 #define MAINWINDOW_H
22 #define CHARTVIEW_H
23
23
24 #include <QChartGlobal>
24 #include <QChartGlobal>
25 #include <QChartView>
25 #include <QChartView>
@@ -43,4 +43,4 private:
43 QScatterSeries *m_scatter2;
43 QScatterSeries *m_scatter2;
44 };
44 };
45
45
46 #endif // MAINWINDOW_H
46 #endif // CHARTVIEW_H
@@ -18,8 +18,8
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef TST_QABSTRACTSERIES_H
21 #ifndef TST_QABSTRACTAXIS_H
22 #define TST_QABSTRACTSERIES_H
22 #define TST_QABSTRACTAXIS_H
23
23
24 #include <QtTest/QtTest>
24 #include <QtTest/QtTest>
25 #include <tst_definitions.h>
25 #include <tst_definitions.h>
@@ -18,8 +18,8
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef ENGINE_H_
21 #ifndef ENGINE_H
22 #define ENGINE_H_
22 #define ENGINE_H
23
23
24 #include <QObject>
24 #include <QObject>
25 #include <QAbstractSeries>
25 #include <QAbstractSeries>
@@ -73,4 +73,4 private:
73 QMap<QAbstractSeries*, QList<QModelIndex> > m_seriesModelIndex;
73 QMap<QAbstractSeries*, QList<QModelIndex> > m_seriesModelIndex;
74 };
74 };
75
75
76 #endif /* ENGINE_H_ */
76 #endif /* ENGINE_H */
@@ -53,9 +53,7 WaveChart::WaveChart(QChart* chart, QWidget* parent) :
53 QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
53 QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
54 m_timer.setInterval(5000);
54 m_timer.setInterval(5000);
55 m_timer.start();
55 m_timer.start();
56
57 }
56 }
58 ;
59
57
60 void WaveChart::update()
58 void WaveChart::update()
61 {
59 {
@@ -18,6 +18,9
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef WAVECHART_H
22 #define WAVECHART_H
23
21 #include <QTimer>
24 #include <QTimer>
22 #include <QTime>
25 #include <QTime>
23 #include <QObject>
26 #include <QObject>
@@ -42,3 +45,5 private:
42 qreal m_step;
45 qreal m_step;
43 QTimer m_timer;
46 QTimer m_timer;
44 };
47 };
48
49 #endif
General Comments 0
You need to be logged in to leave comments. Login now