| @@ -0,0 +1,13 | |||
|
|
1 | INCLUDEPATH += $$PWD | |
|
|
2 | DEPENDPATH += $$PWD | |
|
|
3 | ||
|
|
4 | SOURCES += \ | |
|
|
5 | $$PWD/qscatterseries.cpp \ | |
|
|
6 | $$PWD/scatterpresenter.cpp | |
|
|
7 | ||
|
|
8 | PRIVATE_HEADERS += \ | |
|
|
9 | $$PWD/scatterpresenter_p.h \ | |
|
|
10 | $$PWD/scatterseries_p.h | |
|
|
11 | ||
|
|
12 | PUBLIC_HEADERS += \ | |
|
|
13 | $$PWD/qscatterseries.h | |
| @@ -18,7 +18,7 | |||
|
|
18 | 18 | #include "percentbargroup.h" |
|
|
19 | 19 | #include "linechartanimationitem_p.h" |
|
|
20 | 20 | #include "piepresenter.h" |
|
|
21 | #include "scatterpresenter.h" | |
|
|
21 | #include "scatterpresenter_p.h" | |
|
|
22 | 22 | |
|
|
23 | 23 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
|
24 | 24 | |
| @@ -17,7 +17,7 | |||
|
|
17 | 17 | #include "stackedbargroup.h" |
|
|
18 | 18 | #include "linechartitem_p.h" |
|
|
19 | 19 | #include "percentbargroup.h" |
|
|
20 | #include "scatterpresenter.h" | |
|
|
20 | #include "scatterpresenter_p.h" | |
|
|
21 | 21 | #include "piepresenter.h" |
|
|
22 | 22 | |
|
|
23 | 23 | //themes |
| @@ -1,7 +1,4 | |||
|
|
1 | 1 | #include "qchart.h" |
|
|
2 | #include "qscatterseries.h" | |
|
|
3 | #include "qscatterseries_p.h" | |
|
|
4 | #include "qpieseries.h" | |
|
|
5 | 2 | #include "qchartaxis.h" |
|
|
6 | 3 | #include "chartpresenter_p.h" |
|
|
7 | 4 | #include "chartdataset_p.h" |
| @@ -11,6 +8,9 | |||
|
|
11 | 8 | #include "stackedbarchartseries.h" |
|
|
12 | 9 | #include "percentbarchartseries.h" |
|
|
13 | 10 | #include "qlinechartseries.h" |
|
|
11 | #include "qscatterseries.h" | |
|
|
12 | //#include "scatterseries_p.h" | |
|
|
13 | #include "qpieseries.h" | |
|
|
14 | 14 | |
|
|
15 | 15 | #include <QGraphicsScene> |
|
|
16 | 16 | #include <QGraphicsSceneResizeEvent> |
| @@ -1,5 +1,5 | |||
|
|
1 | 1 | #include "qscatterseries.h" |
|
|
2 |
#include " |
|
|
|
2 | #include "scatterseries_p.h" | |
|
|
3 | 3 | #include "qchart.h" |
|
|
4 | 4 | |
|
|
5 | 5 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
|
1 | NO CONTENT: file renamed from src/qscatterseries.h to src/scatterseries/qscatterseries.h |
| @@ -1,4 +1,4 | |||
|
|
1 | #include "scatterpresenter.h" | |
|
|
1 | #include "scatterpresenter_p.h" | |
|
|
2 | 2 | #include "qscatterseries.h" |
|
|
3 | 3 | #include <QPen> |
|
|
4 | 4 | #include <QPainter> |
| @@ -89,6 +89,6 void ScatterPresenter::changeGeometry() | |||
|
|
89 | 89 | } |
|
|
90 | 90 | } |
|
|
91 | 91 | |
|
|
92 | #include "moc_scatterpresenter.cpp" | |
|
|
92 | #include "moc_scatterpresenter_p.cpp" | |
|
|
93 | 93 | |
|
|
94 | 94 | QTCOMMERCIALCHART_END_NAMESPACE |
|
|
1 | NO CONTENT: file renamed from src/scatterpresenter.h to src/scatterseries/scatterpresenter_p.h |
|
|
1 | NO CONTENT: file renamed from src/qscatterseries_p.h to src/scatterseries/scatterseries_p.h |
| @@ -22,8 +22,6 SOURCES += barchart/barchartseries.cpp \ | |||
|
|
22 | 22 | linechart/linechartanimationitem.cpp \ |
|
|
23 | 23 | linechart/linechartitem.cpp \ |
|
|
24 | 24 | linechart/qlinechartseries.cpp \ |
|
|
25 | qscatterseries.cpp \ | |
|
|
26 | #scatterpresentation.cpp \ | |
|
|
27 | 25 | qchart.cpp \ |
|
|
28 | 26 | axisitem.cpp \ |
|
|
29 | 27 | qchartview.cpp \ |
| @@ -32,16 +30,13 SOURCES += barchart/barchartseries.cpp \ | |||
|
|
32 | 30 | charttheme.cpp \ |
|
|
33 | 31 | chartdataset.cpp \ |
|
|
34 | 32 | chartpresenter.cpp \ |
|
|
35 |
domain.cpp |
|
|
|
36 | scatterpresenter.cpp | |
|
|
33 | domain.cpp | |
|
|
37 | 34 | PRIVATE_HEADERS += linechart/linechartitem_p.h \ |
|
|
38 | 35 | linechart/linechartanimationitem_p.h \ |
|
|
39 | 36 | barchart/barlabel_p.h \ |
|
|
40 | 37 | barchart/bar_p.h \ |
|
|
41 | 38 | barchart/separator_p.h \ |
|
|
42 | 39 | barchart/barchartmodel_p.h \ |
|
|
43 | qscatterseries_p.h \ | |
|
|
44 | #scatterpresentation.h \ | |
|
|
45 | 40 | axisitem_p.h \ |
|
|
46 | 41 | chartitem_p.h \ |
|
|
47 | 42 | charttheme_p.h \ |
| @@ -59,20 +54,19 PUBLIC_HEADERS += linechart/qlinechartseries.h \ | |||
|
|
59 | 54 | barchart/qbarset.h \ |
|
|
60 | 55 | barchart/qbarcategory.h \ |
|
|
61 | 56 | qchartseries.h \ |
|
|
62 | qscatterseries.h \ | |
|
|
63 | 57 | qchart.h \ |
|
|
64 | 58 | qchartglobal.h \ |
|
|
65 | 59 | qchartview.h \ |
|
|
66 | 60 | qchartaxis.h |
|
|
67 | 61 | |
|
|
68 | 62 | include(piechart/piechart.pri) |
|
|
69 | ||
|
|
63 | include(scatterseries/scatter.pri) | |
|
|
64 | ||
|
|
70 | 65 | THEMES += themes/chartthemeicy_p.h \ |
|
|
71 | 66 | themes/chartthemegrayscale_p.h \ |
|
|
72 | 67 | themes/chartthemescientific_p.h \ |
|
|
73 | 68 | themes/chartthemevanilla_p.h |
|
|
74 |
HEADERS += $$PUBLIC_HEADERS |
|
|
|
75 | scatterpresenter.h | |
|
|
69 | HEADERS += $$PUBLIC_HEADERS | |
|
|
76 | 70 | HEADERS += $$PRIVATE_HEADERS |
|
|
77 | 71 | HEADERS += $$THEMES |
|
|
78 | 72 | INCLUDEPATH += linechart \ |
| @@ -122,3 +116,4 unix:QMAKE_DISTCLEAN += -r \ | |||
|
|
122 | 116 | win32:QMAKE_DISTCLEAN += /Q \ |
|
|
123 | 117 | $$CHART_BUILD_HEADER_DIR \ |
|
|
124 | 118 | $$CHART_BUILD_LIB_DIR |
|
|
119 | ||
General Comments 0
You need to be logged in to leave comments.
Login now