##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

ChartViewer moved to tests
Marek Rosa -
r2398:1e18d6a3f6b0
parent child
Show More
Side by Side Unified
Context file:
r2398:1e18d6a3f6b0 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,32 +1,31
1 CURRENTLY_BUILDING_COMPONENTS = "demos"
1 CURRENTLY_BUILDING_COMPONENTS = "demos"
2 !include( ../config.pri ) {
2 !include( ../config.pri ) {
3 error( "Couldn't find the config.pri file!" )
3 error( "Couldn't find the config.pri file!" )
4 }
4 }
5
5
6 TEMPLATE = subdirs
6 TEMPLATE = subdirs
7 SUBDIRS += piechartcustomization \
7 SUBDIRS += piechartcustomization \
8 dynamicspline \
8 dynamicspline \
9 nesteddonuts \
9 nesteddonuts \
10 qmlchart \
10 qmlchart \
11 qmlweather \
11 qmlweather \
12 qmlf1legends \
12 qmlf1legends \
13 qmlcustomizations \
13 qmlcustomizations \
14 qmlcustommodel \
14 qmlcustommodel \
15 chartinteractions \
15 chartinteractions \
16 qmlaxes \
16 qmlaxes \
17 qmlcustomlegend \
17 qmlcustomlegend \
18 callout
18 callout
19
19
20 contains(QT_CONFIG, opengl) {
20 contains(QT_CONFIG, opengl) {
21 SUBDIRS += chartthemes \
21 SUBDIRS += chartthemes \
22 qmloscilloscope \
22 qmloscilloscope
23 chartviewer
24 } else {
23 } else {
25 message("OpenGL not available. Some demos are disabled")
24 message("OpenGL not available. Some demos are disabled")
26 }
25 }
27
26
28 contains(QT_CONFIG, multimedia) {
27 contains(QT_CONFIG, multimedia) {
29 SUBDIRS += audio
28 SUBDIRS += audio
30 } else {
29 } else {
31 message("QtMultimedia library not available. Some demos are disabled")
30 message("QtMultimedia library not available. Some demos are disabled")
32 }
31 }
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts.h to tests/chartviewer/charts.h
NO CONTENT: file renamed from demos/chartviewer/charts.h to tests/chartviewer/charts.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisx.cpp to tests/chartviewer/charts/axis/barcategoryaxisx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisx.cpp to tests/chartviewer/charts/axis/barcategoryaxisx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisxlogy.cpp to tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisxlogy.cpp to tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisy.cpp to tests/chartviewer/charts/axis/barcategoryaxisy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisy.cpp to tests/chartviewer/charts/axis/barcategoryaxisy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisylogx.cpp to tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisylogx.cpp to tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/categoryaxis.cpp to tests/chartviewer/charts/axis/categoryaxis.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/categoryaxis.cpp to tests/chartviewer/charts/axis/categoryaxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/datetimeaxisx.cpp to tests/chartviewer/charts/axis/datetimeaxisx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/datetimeaxisx.cpp to tests/chartviewer/charts/axis/datetimeaxisx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/datetimeaxisy.cpp to tests/chartviewer/charts/axis/datetimeaxisy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/datetimeaxisy.cpp to tests/chartviewer/charts/axis/datetimeaxisy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/logvalueaxisx.cpp to tests/chartviewer/charts/axis/logvalueaxisx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/logvalueaxisx.cpp to tests/chartviewer/charts/axis/logvalueaxisx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/logvalueaxisy.cpp to tests/chartviewer/charts/axis/logvalueaxisy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/logvalueaxisy.cpp to tests/chartviewer/charts/axis/logvalueaxisy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/axis/valueaxis.cpp to tests/chartviewer/charts/axis/valueaxis.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/axis/valueaxis.cpp to tests/chartviewer/charts/axis/valueaxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalbarchart.cpp to tests/chartviewer/charts/barseries/horizontalbarchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalbarchart.cpp to tests/chartviewer/charts/barseries/horizontalbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp to tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp to tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp to tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp to tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalbarchart.cpp to tests/chartviewer/charts/barseries/verticalbarchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalbarchart.cpp to tests/chartviewer/charts/barseries/verticalbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp to tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp to tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp to tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp to tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/charts.pri to tests/chartviewer/charts/charts.pri
NO CONTENT: file renamed from demos/chartviewer/charts/charts.pri to tests/chartviewer/charts/charts.pri
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/barlogx.cpp to tests/chartviewer/charts/domain/barlogx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/barlogx.cpp to tests/chartviewer/charts/domain/barlogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/barlogy.cpp to tests/chartviewer/charts/domain/barlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/barlogy.cpp to tests/chartviewer/charts/domain/barlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/barpercentlogx.cpp to tests/chartviewer/charts/domain/barpercentlogx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/barpercentlogx.cpp to tests/chartviewer/charts/domain/barpercentlogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/barpercentlogy.cpp to tests/chartviewer/charts/domain/barpercentlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/barpercentlogy.cpp to tests/chartviewer/charts/domain/barpercentlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/barstackedlogx.cpp to tests/chartviewer/charts/domain/barstackedlogx.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/barstackedlogx.cpp to tests/chartviewer/charts/domain/barstackedlogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/barstackedlogy.cpp to tests/chartviewer/charts/domain/barstackedlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/barstackedlogy.cpp to tests/chartviewer/charts/domain/barstackedlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/linelogxlogy.cpp to tests/chartviewer/charts/domain/linelogxlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/linelogxlogy.cpp to tests/chartviewer/charts/domain/linelogxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/linelogxy.cpp to tests/chartviewer/charts/domain/linelogxy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/linelogxy.cpp to tests/chartviewer/charts/domain/linelogxy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/linexlogy.cpp to tests/chartviewer/charts/domain/linexlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/linexlogy.cpp to tests/chartviewer/charts/domain/linexlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterlogxlogy.cpp to tests/chartviewer/charts/domain/scatterlogxlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterlogxlogy.cpp to tests/chartviewer/charts/domain/scatterlogxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterlogxy.cpp to tests/chartviewer/charts/domain/scatterlogxy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterlogxy.cpp to tests/chartviewer/charts/domain/scatterlogxy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterxlogy.cpp to tests/chartviewer/charts/domain/scatterxlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterxlogy.cpp to tests/chartviewer/charts/domain/scatterxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinelogxlogy.cpp to tests/chartviewer/charts/domain/splinelogxlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinelogxlogy.cpp to tests/chartviewer/charts/domain/splinelogxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinelogxy.cpp to tests/chartviewer/charts/domain/splinelogxy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinelogxy.cpp to tests/chartviewer/charts/domain/splinelogxy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinexlogy.cpp to tests/chartviewer/charts/domain/splinexlogy.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinexlogy.cpp to tests/chartviewer/charts/domain/splinexlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/font/font.cpp to tests/chartviewer/charts/font/font.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/font/font.cpp to tests/chartviewer/charts/font/font.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp to tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp to tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/pieseries/donutchart.cpp to tests/chartviewer/charts/pieseries/donutchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/pieseries/donutchart.cpp to tests/chartviewer/charts/pieseries/donutchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/pieseries/piechart.cpp to tests/chartviewer/charts/pieseries/piechart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/pieseries/piechart.cpp to tests/chartviewer/charts/pieseries/piechart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/size/sizecharts.cpp to tests/chartviewer/charts/size/sizecharts.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/size/sizecharts.cpp to tests/chartviewer/charts/size/sizecharts.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/areachart.cpp to tests/chartviewer/charts/xyseries/areachart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/areachart.cpp to tests/chartviewer/charts/xyseries/areachart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/linechart.cpp to tests/chartviewer/charts/xyseries/linechart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/linechart.cpp to tests/chartviewer/charts/xyseries/linechart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/scatterchart.cpp to tests/chartviewer/charts/xyseries/scatterchart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/scatterchart.cpp to tests/chartviewer/charts/xyseries/scatterchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/splinechart.cpp to tests/chartviewer/charts/xyseries/splinechart.cpp
NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/splinechart.cpp to tests/chartviewer/charts/xyseries/splinechart.cpp
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
1 !include( ../tests.pri ):error( "Couldn't find the demos.pri file!" )
2 include(charts/charts.pri)
2 include(charts/charts.pri)
3 TARGET = chartviewer
3 TARGET = chartviewer
4 QT += opengl
4 QT += opengl
5 INCLUDEPATH += .
5 INCLUDEPATH += .
6 SOURCES += main.cpp window.cpp view.cpp grid.cpp
6 SOURCES += main.cpp window.cpp view.cpp grid.cpp
7 HEADERS += window.h view.h charts.h model.h grid.h
7 HEADERS += window.h view.h charts.h model.h grid.h
8
8
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/grid.cpp to tests/chartviewer/grid.cpp
NO CONTENT: file renamed from demos/chartviewer/grid.cpp to tests/chartviewer/grid.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/grid.h to tests/chartviewer/grid.h
NO CONTENT: file renamed from demos/chartviewer/grid.h to tests/chartviewer/grid.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/main.cpp to tests/chartviewer/main.cpp
NO CONTENT: file renamed from demos/chartviewer/main.cpp to tests/chartviewer/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/model.h to tests/chartviewer/model.h
NO CONTENT: file renamed from demos/chartviewer/model.h to tests/chartviewer/model.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/view.cpp to tests/chartviewer/view.cpp
NO CONTENT: file renamed from demos/chartviewer/view.cpp to tests/chartviewer/view.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/view.h to tests/chartviewer/view.h
NO CONTENT: file renamed from demos/chartviewer/view.h to tests/chartviewer/view.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/window.cpp to tests/chartviewer/window.cpp
NO CONTENT: file renamed from demos/chartviewer/window.cpp to tests/chartviewer/window.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from demos/chartviewer/window.h to tests/chartviewer/window.h
NO CONTENT: file renamed from demos/chartviewer/window.h to tests/chartviewer/window.h
Show file before | Show file after | Hide comments
@@ -1,17 +1,18
1 !include( ../config.pri ) {
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
2 error( "Couldn't find the config.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS += \
6 SUBDIRS += \
7 auto \
7 auto \
8 qmlchartproperties \
8 qmlchartproperties \
9 qmlchartaxis \
9 qmlchartaxis \
10 presenterchart
10 presenterchart
11
11
12 contains(QT_CONFIG, opengl) {
12 contains(QT_CONFIG, opengl) {
13 SUBDIRS += chartwidgettest \
13 SUBDIRS += chartwidgettest \
14 wavechart
14 wavechart \
15 chartviewer
15 } else {
16 } else {
16 message("OpenGL not available. Some test apps are disabled")
17 message("OpenGL not available. Some test apps are disabled")
17 }
18 }
General Comments 0
You need to be logged in to leave comments. Login now