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

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

Moved manual tests to separate directory....
Miikka Heikkinen -
r2734:69f73db4ec09
parent child
Show More
Side by Side Unified
Context file:
r2734:69f73db4ec09 Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,2
1 .gitattributes export-ignore
2 manual export-ignore
Show file before | Show file after | Hide comments
@@ -0,0 +1,18
1 TEMPLATE = subdirs
2 SUBDIRS += \
3 presenterchart \
4 polarcharttest \
5 boxplottester
6
7 contains(QT_CONFIG, opengl) {
8 SUBDIRS += chartwidgettest \
9 wavechart \
10 chartviewer
11 } else {
12 message("OpenGL not available. Some test apps are disabled")
13 }
14
15 qtHaveModule(quick) {
16 SUBDIRS += qmlchartproperties \
17 qmlchartaxis
18 }
Show file before | Show file after | Hide comments
@@ -1,6 +1,5
1 .tag export-subst
1 .tag export-subst
2 .gitignore export-ignore
2 .gitignore export-ignore
3 .gitattributes export-ignore
3 .gitattributes export-ignore
4 .commit-template export-ignore
4 .commit-template export-ignore
5 tests export-ignore
6 tools export-ignore
5 tools export-ignore
Show file before | Show file after | Hide comments
@@ -1,18 +1,18
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the test.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = app
5 TEMPLATE = app
6
6
7 QT += charts
7 QT += charts
8 QT += core gui widgets
8 QT += core gui widgets
9
9
10 SOURCES += main.cpp \
10 SOURCES += main.cpp \
11 mainwidget.cpp \
11 mainwidget.cpp \
12 customtablemodel.cpp \
12 customtablemodel.cpp \
13 pentool.cpp
13 pentool.cpp
14
14
15 HEADERS += \
15 HEADERS += \
16 mainwidget.h \
16 mainwidget.h \
17 customtablemodel.h \
17 customtablemodel.h \
18 pentool.h
18 pentool.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/customtablemodel.cpp to tests/manual/boxplottester/customtablemodel.cpp
NO CONTENT: file renamed from tests/boxplottester/customtablemodel.cpp to tests/manual/boxplottester/customtablemodel.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/customtablemodel.h to tests/manual/boxplottester/customtablemodel.h
NO CONTENT: file renamed from tests/boxplottester/customtablemodel.h to tests/manual/boxplottester/customtablemodel.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/main.cpp to tests/manual/boxplottester/main.cpp
NO CONTENT: file renamed from tests/boxplottester/main.cpp to tests/manual/boxplottester/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/mainwidget.cpp to tests/manual/boxplottester/mainwidget.cpp
NO CONTENT: file renamed from tests/boxplottester/mainwidget.cpp to tests/manual/boxplottester/mainwidget.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/mainwidget.h to tests/manual/boxplottester/mainwidget.h
NO CONTENT: file renamed from tests/boxplottester/mainwidget.h to tests/manual/boxplottester/mainwidget.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/pentool.cpp to tests/manual/boxplottester/pentool.cpp
NO CONTENT: file renamed from tests/boxplottester/pentool.cpp to tests/manual/boxplottester/pentool.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/boxplottester/pentool.h to tests/manual/boxplottester/pentool.h
NO CONTENT: file renamed from tests/boxplottester/pentool.h to tests/manual/boxplottester/pentool.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/brushwidget.cpp to tests/manual/chartdesigner/brushwidget.cpp
NO CONTENT: file renamed from tests/chartdesigner/brushwidget.cpp to tests/manual/chartdesigner/brushwidget.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/brushwidget.h to tests/manual/chartdesigner/brushwidget.h
NO CONTENT: file renamed from tests/chartdesigner/brushwidget.h to tests/manual/chartdesigner/brushwidget.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/chartdesigner.pro to tests/manual/chartdesigner/chartdesigner.pro
NO CONTENT: file renamed from tests/chartdesigner/chartdesigner.pro to tests/manual/chartdesigner/chartdesigner.pro
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/engine.cpp to tests/manual/chartdesigner/engine.cpp
NO CONTENT: file renamed from tests/chartdesigner/engine.cpp to tests/manual/chartdesigner/engine.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/engine.h to tests/manual/chartdesigner/engine.h
NO CONTENT: file renamed from tests/chartdesigner/engine.h to tests/manual/chartdesigner/engine.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/main.cpp to tests/manual/chartdesigner/main.cpp
NO CONTENT: file renamed from tests/chartdesigner/main.cpp to tests/manual/chartdesigner/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/mainwindow.cpp to tests/manual/chartdesigner/mainwindow.cpp
NO CONTENT: file renamed from tests/chartdesigner/mainwindow.cpp to tests/manual/chartdesigner/mainwindow.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/mainwindow.h to tests/manual/chartdesigner/mainwindow.h
NO CONTENT: file renamed from tests/chartdesigner/mainwindow.h to tests/manual/chartdesigner/mainwindow.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/objectinspectorwidget.cpp to tests/manual/chartdesigner/objectinspectorwidget.cpp
NO CONTENT: file renamed from tests/chartdesigner/objectinspectorwidget.cpp to tests/manual/chartdesigner/objectinspectorwidget.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/objectinspectorwidget.h to tests/manual/chartdesigner/objectinspectorwidget.h
NO CONTENT: file renamed from tests/chartdesigner/objectinspectorwidget.h to tests/manual/chartdesigner/objectinspectorwidget.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/penwidget.cpp to tests/manual/chartdesigner/penwidget.cpp
NO CONTENT: file renamed from tests/chartdesigner/penwidget.cpp to tests/manual/chartdesigner/penwidget.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartdesigner/penwidget.h to tests/manual/chartdesigner/penwidget.h
NO CONTENT: file renamed from tests/chartdesigner/penwidget.h to tests/manual/chartdesigner/penwidget.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts.h to tests/manual/chartviewer/charts.h
NO CONTENT: file renamed from tests/chartviewer/charts.h to tests/manual/chartviewer/charts.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisx.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisx.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisy.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisy.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp to tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/categoryaxis.cpp to tests/manual/chartviewer/charts/axis/categoryaxis.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/categoryaxis.cpp to tests/manual/chartviewer/charts/axis/categoryaxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/datetimeaxisx.cpp to tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/datetimeaxisx.cpp to tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/datetimeaxisy.cpp to tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/datetimeaxisy.cpp to tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/logvalueaxisx.cpp to tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/logvalueaxisx.cpp to tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/logvalueaxisy.cpp to tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/logvalueaxisy.cpp to tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/axis/valueaxis.cpp to tests/manual/chartviewer/charts/axis/valueaxis.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/axis/valueaxis.cpp to tests/manual/chartviewer/charts/axis/valueaxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/barseries/horizontalbarchart.cpp to tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/barseries/horizontalbarchart.cpp to tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp to tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp to tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp to tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp to tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/barseries/verticalbarchart.cpp to tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/barseries/verticalbarchart.cpp to tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp to tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp to tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp to tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp to tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/charts.pri to tests/manual/chartviewer/charts/charts.pri
NO CONTENT: file renamed from tests/chartviewer/charts/charts.pri to tests/manual/chartviewer/charts/charts.pri
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/barlogx.cpp to tests/manual/chartviewer/charts/domain/barlogx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/barlogx.cpp to tests/manual/chartviewer/charts/domain/barlogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/barlogy.cpp to tests/manual/chartviewer/charts/domain/barlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/barlogy.cpp to tests/manual/chartviewer/charts/domain/barlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/barpercentlogx.cpp to tests/manual/chartviewer/charts/domain/barpercentlogx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/barpercentlogx.cpp to tests/manual/chartviewer/charts/domain/barpercentlogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/barpercentlogy.cpp to tests/manual/chartviewer/charts/domain/barpercentlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/barpercentlogy.cpp to tests/manual/chartviewer/charts/domain/barpercentlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/barstackedlogx.cpp to tests/manual/chartviewer/charts/domain/barstackedlogx.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/barstackedlogx.cpp to tests/manual/chartviewer/charts/domain/barstackedlogx.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/barstackedlogy.cpp to tests/manual/chartviewer/charts/domain/barstackedlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/barstackedlogy.cpp to tests/manual/chartviewer/charts/domain/barstackedlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/linelogxlogy.cpp to tests/manual/chartviewer/charts/domain/linelogxlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/linelogxlogy.cpp to tests/manual/chartviewer/charts/domain/linelogxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/linelogxy.cpp to tests/manual/chartviewer/charts/domain/linelogxy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/linelogxy.cpp to tests/manual/chartviewer/charts/domain/linelogxy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/linexlogy.cpp to tests/manual/chartviewer/charts/domain/linexlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/linexlogy.cpp to tests/manual/chartviewer/charts/domain/linexlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/scatterlogxlogy.cpp to tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/scatterlogxlogy.cpp to tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/scatterlogxy.cpp to tests/manual/chartviewer/charts/domain/scatterlogxy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/scatterlogxy.cpp to tests/manual/chartviewer/charts/domain/scatterlogxy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/scatterxlogy.cpp to tests/manual/chartviewer/charts/domain/scatterxlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/scatterxlogy.cpp to tests/manual/chartviewer/charts/domain/scatterxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/splinelogxlogy.cpp to tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/splinelogxlogy.cpp to tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/splinelogxy.cpp to tests/manual/chartviewer/charts/domain/splinelogxy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/splinelogxy.cpp to tests/manual/chartviewer/charts/domain/splinelogxy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/domain/splinexlogy.cpp to tests/manual/chartviewer/charts/domain/splinexlogy.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/domain/splinexlogy.cpp to tests/manual/chartviewer/charts/domain/splinexlogy.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/font/font.cpp to tests/manual/chartviewer/charts/font/font.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/font/font.cpp to tests/manual/chartviewer/charts/font/font.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp to tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp to tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp to tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/pieseries/donutchart.cpp to tests/manual/chartviewer/charts/pieseries/donutchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/pieseries/donutchart.cpp to tests/manual/chartviewer/charts/pieseries/donutchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/pieseries/piechart.cpp to tests/manual/chartviewer/charts/pieseries/piechart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/pieseries/piechart.cpp to tests/manual/chartviewer/charts/pieseries/piechart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/size/sizecharts.cpp to tests/manual/chartviewer/charts/size/sizecharts.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/size/sizecharts.cpp to tests/manual/chartviewer/charts/size/sizecharts.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/areachart.cpp to tests/manual/chartviewer/charts/xyseries/areachart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/areachart.cpp to tests/manual/chartviewer/charts/xyseries/areachart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/linechart.cpp to tests/manual/chartviewer/charts/xyseries/linechart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/linechart.cpp to tests/manual/chartviewer/charts/xyseries/linechart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/scatterchart.cpp to tests/manual/chartviewer/charts/xyseries/scatterchart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/scatterchart.cpp to tests/manual/chartviewer/charts/xyseries/scatterchart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/splinechart.cpp to tests/manual/chartviewer/charts/xyseries/splinechart.cpp
NO CONTENT: file renamed from tests/chartviewer/charts/xyseries/splinechart.cpp to tests/manual/chartviewer/charts/xyseries/splinechart.cpp
Show file before | Show file after | Hide comments
@@ -1,8 +1,10
1 !include( ../tests.pri ):error( "Couldn't find the tests.pri file!" )
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the test.pri file!" )
3 }
2 include(charts/charts.pri)
4 include(charts/charts.pri)
3 TARGET = chartviewer
5 TARGET = chartviewer
4 QT += opengl
6 QT += opengl
5 INCLUDEPATH += .
7 INCLUDEPATH += .
6 SOURCES += main.cpp window.cpp view.cpp grid.cpp
8 SOURCES += main.cpp window.cpp view.cpp grid.cpp
7 HEADERS += window.h view.h charts.h model.h grid.h
9 HEADERS += window.h view.h charts.h model.h grid.h
8
10
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/grid.cpp to tests/manual/chartviewer/grid.cpp
NO CONTENT: file renamed from tests/chartviewer/grid.cpp to tests/manual/chartviewer/grid.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/grid.h to tests/manual/chartviewer/grid.h
NO CONTENT: file renamed from tests/chartviewer/grid.h to tests/manual/chartviewer/grid.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/main.cpp to tests/manual/chartviewer/main.cpp
NO CONTENT: file renamed from tests/chartviewer/main.cpp to tests/manual/chartviewer/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/model.h to tests/manual/chartviewer/model.h
NO CONTENT: file renamed from tests/chartviewer/model.h to tests/manual/chartviewer/model.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/view.cpp to tests/manual/chartviewer/view.cpp
NO CONTENT: file renamed from tests/chartviewer/view.cpp to tests/manual/chartviewer/view.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/view.h to tests/manual/chartviewer/view.h
NO CONTENT: file renamed from tests/chartviewer/view.h to tests/manual/chartviewer/view.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/window.cpp to tests/manual/chartviewer/window.cpp
NO CONTENT: file renamed from tests/chartviewer/window.cpp to tests/manual/chartviewer/window.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartviewer/window.h to tests/manual/chartviewer/window.h
NO CONTENT: file renamed from tests/chartviewer/window.h to tests/manual/chartviewer/window.h
Show file before | Show file after | Hide comments
@@ -1,15 +1,15
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the test.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = app
5 TEMPLATE = app
6
6
7 QT += core gui opengl widgets
7 QT += core gui opengl widgets
8
8
9 SOURCES += main.cpp \
9 SOURCES += main.cpp \
10 mainwidget.cpp \
10 mainwidget.cpp \
11 dataseriedialog.cpp
11 dataseriedialog.cpp
12
12
13 HEADERS += \
13 HEADERS += \
14 mainwidget.h \
14 mainwidget.h \
15 dataseriedialog.h
15 dataseriedialog.h
Show file before | Show file after | Hide comments
@@ -1,189 +1,189
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2014 Digia Plc
3 ** Copyright (C) 2014 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Enterprise Charts Add-on.
7 ** This file is part of the Qt Enterprise Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
11 ** accordance with the Qt Enterprise License Agreement provided with the
11 ** accordance with the Qt Enterprise License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "dataseriedialog.h"
21 #include "dataseriedialog.h"
22 #include <QtWidgets/QDialogButtonBox>
22 #include <QtWidgets/QDialogButtonBox>
23 #include <QtWidgets/QGridLayout>
23 #include <QtWidgets/QGridLayout>
24 #include <QtWidgets/QCheckBox>
24 #include <QtWidgets/QCheckBox>
25 #include <QtWidgets/QPushButton>
25 #include <QtWidgets/QPushButton>
26 #include <QtWidgets/QGroupBox>
26 #include <QtWidgets/QGroupBox>
27 #include <QtWidgets/QRadioButton>
27 #include <QtWidgets/QRadioButton>
28 #include <QtWidgets/QLabel>
28 #include <QtWidgets/QLabel>
29 #include <QtCore/QDebug>
29 #include <QtCore/QDebug>
30
30
31 DataSerieDialog::DataSerieDialog(QWidget *parent) :
31 DataSerieDialog::DataSerieDialog(QWidget *parent) :
32 QDialog(parent)
32 QDialog(parent)
33 {
33 {
34 QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
34 QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
35 QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
35 QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
36 connect(b, SIGNAL(clicked()), this, SLOT(accept()));
36 connect(b, SIGNAL(clicked()), this, SLOT(accept()));
37 b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
37 b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
38 connect(b, SIGNAL(clicked()), this, SLOT(reject()));
38 connect(b, SIGNAL(clicked()), this, SLOT(reject()));
39
39
40 QGridLayout *grid = new QGridLayout();
40 QGridLayout *grid = new QGridLayout();
41
41
42 m_seriesTypeSelector = seriesTypeSelector();
42 m_seriesTypeSelector = seriesTypeSelector();
43 m_columnCountSelector = columnCountSelector();
43 m_columnCountSelector = columnCountSelector();
44 m_rowCountSelector = rowCountSelector();
44 m_rowCountSelector = rowCountSelector();
45 m_dataCharacteristicsSelector = dataCharacteristicsSelector();
45 m_dataCharacteristicsSelector = dataCharacteristicsSelector();
46
46
47 grid->addWidget(m_seriesTypeSelector, 0, 0);
47 grid->addWidget(m_seriesTypeSelector, 0, 0);
48 grid->addWidget(m_columnCountSelector, 0, 1);
48 grid->addWidget(m_columnCountSelector, 0, 1);
49 grid->addWidget(m_rowCountSelector, 1, 1);
49 grid->addWidget(m_rowCountSelector, 1, 1);
50 grid->addWidget(m_dataCharacteristicsSelector, 1, 0);
50 grid->addWidget(m_dataCharacteristicsSelector, 1, 0);
51 m_labelsSelector = new QCheckBox("Labels defined");
51 m_labelsSelector = new QCheckBox("Labels defined");
52 m_labelsSelector->setChecked(true);
52 m_labelsSelector->setChecked(true);
53 grid->addWidget(m_labelsSelector, 2, 0);
53 grid->addWidget(m_labelsSelector, 2, 0);
54 grid->addWidget(addSeriesBox, 3, 1);
54 grid->addWidget(addSeriesBox, 3, 1);
55
55
56 setLayout(grid);
56 setLayout(grid);
57 }
57 }
58
58
59 QGroupBox *DataSerieDialog::seriesTypeSelector()
59 QGroupBox *DataSerieDialog::seriesTypeSelector()
60 {
60 {
61 QVBoxLayout *layout = new QVBoxLayout();
61 QVBoxLayout *layout = new QVBoxLayout();
62
62
63 QRadioButton *line = new QRadioButton("Line");
63 QRadioButton *line = new QRadioButton("Line");
64 line->setChecked(true);
64 line->setChecked(true);
65 layout->addWidget(line);
65 layout->addWidget(line);
66 layout->addWidget(new QRadioButton("Area"));
66 layout->addWidget(new QRadioButton("Area"));
67 layout->addWidget(new QRadioButton("Pie"));
67 layout->addWidget(new QRadioButton("Pie"));
68 layout->addWidget(new QRadioButton("Bar"));
68 layout->addWidget(new QRadioButton("Bar"));
69 layout->addWidget(new QRadioButton("Stacked bar"));
69 layout->addWidget(new QRadioButton("Stacked bar"));
70 layout->addWidget(new QRadioButton("Percent bar"));
70 layout->addWidget(new QRadioButton("Percent bar"));
71 layout->addWidget(new QRadioButton("Scatter"));
71 layout->addWidget(new QRadioButton("Scatter"));
72 layout->addWidget(new QRadioButton("Spline"));
72 layout->addWidget(new QRadioButton("Spline"));
73
73
74 QGroupBox *groupBox = new QGroupBox("Series type");
74 QGroupBox *groupBox = new QGroupBox("Series type");
75 groupBox->setLayout(layout);
75 groupBox->setLayout(layout);
76 selectRadio(groupBox, 0);
76 selectRadio(groupBox, 0);
77
77
78 return groupBox;
78 return groupBox;
79 }
79 }
80
80
81 QGroupBox *DataSerieDialog::columnCountSelector()
81 QGroupBox *DataSerieDialog::columnCountSelector()
82 {
82 {
83 QVBoxLayout *layout = new QVBoxLayout();
83 QVBoxLayout *layout = new QVBoxLayout();
84
84
85 QRadioButton *radio = new QRadioButton("1");
85 QRadioButton *radio = new QRadioButton("1");
86 radio->setChecked(true);
86 radio->setChecked(true);
87 layout->addWidget(radio);
87 layout->addWidget(radio);
88 layout->addWidget(new QRadioButton("2"));
88 layout->addWidget(new QRadioButton("2"));
89 layout->addWidget(new QRadioButton("3"));
89 layout->addWidget(new QRadioButton("3"));
90 layout->addWidget(new QRadioButton("4"));
90 layout->addWidget(new QRadioButton("4"));
91 layout->addWidget(new QRadioButton("5"));
91 layout->addWidget(new QRadioButton("5"));
92 layout->addWidget(new QRadioButton("8"));
92 layout->addWidget(new QRadioButton("8"));
93 layout->addWidget(new QRadioButton("10"));
93 layout->addWidget(new QRadioButton("10"));
94 layout->addWidget(new QRadioButton("100"));
94 layout->addWidget(new QRadioButton("100"));
95
95
96 QGroupBox *groupBox = new QGroupBox("Column count");
96 QGroupBox *groupBox = new QGroupBox("Column count");
97 groupBox->setLayout(layout);
97 groupBox->setLayout(layout);
98 selectRadio(groupBox, 0);
98 selectRadio(groupBox, 0);
99
99
100 return groupBox;
100 return groupBox;
101 }
101 }
102
102
103 QGroupBox *DataSerieDialog::rowCountSelector()
103 QGroupBox *DataSerieDialog::rowCountSelector()
104 {
104 {
105 QVBoxLayout *layout = new QVBoxLayout();
105 QVBoxLayout *layout = new QVBoxLayout();
106
106
107 layout->addWidget(new QRadioButton("1"));
107 layout->addWidget(new QRadioButton("1"));
108 QRadioButton *radio = new QRadioButton("10");
108 QRadioButton *radio = new QRadioButton("10");
109 radio->setChecked(true);
109 radio->setChecked(true);
110 layout->addWidget(radio);
110 layout->addWidget(radio);
111 layout->addWidget(new QRadioButton("50"));
111 layout->addWidget(new QRadioButton("50"));
112 layout->addWidget(new QRadioButton("100"));
112 layout->addWidget(new QRadioButton("100"));
113 layout->addWidget(new QRadioButton("1000"));
113 layout->addWidget(new QRadioButton("1000"));
114 layout->addWidget(new QRadioButton("10000"));
114 layout->addWidget(new QRadioButton("10000"));
115 layout->addWidget(new QRadioButton("100000"));
115 layout->addWidget(new QRadioButton("100000"));
116 layout->addWidget(new QRadioButton("1000000"));
116 layout->addWidget(new QRadioButton("1000000"));
117
117
118 QGroupBox *groupBox = new QGroupBox("Row count");
118 QGroupBox *groupBox = new QGroupBox("Row count");
119 groupBox->setLayout(layout);
119 groupBox->setLayout(layout);
120 selectRadio(groupBox, 0);
120 selectRadio(groupBox, 0);
121
121
122 return groupBox;
122 return groupBox;
123 }
123 }
124
124
125 QGroupBox *DataSerieDialog::dataCharacteristicsSelector()
125 QGroupBox *DataSerieDialog::dataCharacteristicsSelector()
126 {
126 {
127 QVBoxLayout *layout = new QVBoxLayout();
127 QVBoxLayout *layout = new QVBoxLayout();
128
128
129 layout->addWidget(new QRadioButton("Linear"));
129 layout->addWidget(new QRadioButton("Linear"));
130 layout->addWidget(new QRadioButton("Constant"));
130 layout->addWidget(new QRadioButton("Constant"));
131 layout->addWidget(new QRadioButton("Random"));
131 layout->addWidget(new QRadioButton("Random"));
132 layout->addWidget(new QRadioButton("Sin"));
132 layout->addWidget(new QRadioButton("Sin"));
133 layout->addWidget(new QRadioButton("Sin + random"));
133 layout->addWidget(new QRadioButton("Sin + random"));
134
134
135 QGroupBox *groupBox = new QGroupBox("Data Characteristics");
135 QGroupBox *groupBox = new QGroupBox("Data Characteristics");
136 groupBox->setLayout(layout);
136 groupBox->setLayout(layout);
137 selectRadio(groupBox, 0);
137 selectRadio(groupBox, 0);
138
138
139 return groupBox;
139 return groupBox;
140 }
140 }
141
141
142 void DataSerieDialog::accept()
142 void DataSerieDialog::accept()
143 {
143 {
144 accepted(radioSelection(m_seriesTypeSelector),
144 accepted(radioSelection(m_seriesTypeSelector),
145 radioSelection(m_columnCountSelector).toInt(),
145 radioSelection(m_columnCountSelector).toInt(),
146 radioSelection(m_rowCountSelector).toInt(),
146 radioSelection(m_rowCountSelector).toInt(),
147 radioSelection(m_dataCharacteristicsSelector),
147 radioSelection(m_dataCharacteristicsSelector),
148 m_labelsSelector->isChecked());
148 m_labelsSelector->isChecked());
149 QDialog::accept();
149 QDialog::accept();
150 }
150 }
151
151
152 void DataSerieDialog::selectRadio(QGroupBox *groupBox, int defaultSelection)
152 void DataSerieDialog::selectRadio(QGroupBox *groupBox, int defaultSelection)
153 {
153 {
154 QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
154 QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
155 Q_ASSERT(layout);
155 Q_ASSERT(layout);
156 Q_ASSERT(layout->count());
156 Q_ASSERT(layout->count());
157
157
158 QLayoutItem *item = 0;
158 QLayoutItem *item = 0;
159 if (defaultSelection == -1) {
159 if (defaultSelection == -1) {
160 item = layout->itemAt(0);
160 item = layout->itemAt(0);
161 } else if (layout->count() > defaultSelection) {
161 } else if (layout->count() > defaultSelection) {
162 item = layout->itemAt(defaultSelection);
162 item = layout->itemAt(defaultSelection);
163 }
163 }
164 Q_ASSERT(item);
164 Q_ASSERT(item);
165 QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
165 QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
166 Q_ASSERT(radio);
166 Q_ASSERT(radio);
167 radio->setChecked(true);
167 radio->setChecked(true);
168 }
168 }
169
169
170 QString DataSerieDialog::radioSelection(QGroupBox *groupBox)
170 QString DataSerieDialog::radioSelection(QGroupBox *groupBox)
171 {
171 {
172 QString selection;
172 QString selection;
173 QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
173 QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
174 Q_ASSERT(layout);
174 Q_ASSERT(layout);
175
175
176 for (int i(0); i < layout->count(); i++) {
176 for (int i(0); i < layout->count(); i++) {
177 QLayoutItem *item = layout->itemAt(i);
177 QLayoutItem *item = layout->itemAt(i);
178 Q_ASSERT(item);
178 Q_ASSERT(item);
179 QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
179 QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
180 Q_ASSERT(radio);
180 Q_ASSERT(radio);
181 if (radio->isChecked()) {
181 if (radio->isChecked()) {
182 selection = radio->text();
182 selection = radio->text();
183 break;
183 break;
184 }
184 }
185 }
185 }
186
186
187 qDebug() << "radioSelection: " << selection;
187 qDebug() << "radioSelection: " << selection;
188 return selection;
188 return selection;
189 }
189 }
Show file before | Show file after | Hide comments
@@ -1,55 +1,55
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2014 Digia Plc
3 ** Copyright (C) 2014 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Enterprise Charts Add-on.
7 ** This file is part of the Qt Enterprise Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
11 ** accordance with the Qt Enterprise License Agreement provided with the
11 ** accordance with the Qt Enterprise License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef DATASERIEDIALOG_H
21 #ifndef DATASERIEDIALOG_H
22 #define DATASERIEDIALOG_H
22 #define DATASERIEDIALOG_H
23
23
24 #include <QtWidgets/QDialog>
24 #include <QtWidgets/QDialog>
25
25
26 class QGroupBox;
26 class QGroupBox;
27 class QCheckBox;
27 class QCheckBox;
28
28
29 class DataSerieDialog : public QDialog
29 class DataSerieDialog : public QDialog
30 {
30 {
31 Q_OBJECT
31 Q_OBJECT
32 public:
32 public:
33 explicit DataSerieDialog(QWidget *parent = 0);
33 explicit DataSerieDialog(QWidget *parent = 0);
34
34
35 signals:
35 signals:
36 void accepted(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsDefined);
36 void accepted(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsDefined);
37
37
38 public slots:
38 public slots:
39 void accept();
39 void accept();
40
40
41 private:
41 private:
42 QGroupBox *seriesTypeSelector();
42 QGroupBox *seriesTypeSelector();
43 QGroupBox *columnCountSelector();
43 QGroupBox *columnCountSelector();
44 QGroupBox *rowCountSelector();
44 QGroupBox *rowCountSelector();
45 QGroupBox *dataCharacteristicsSelector();
45 QGroupBox *dataCharacteristicsSelector();
46 void selectRadio(QGroupBox *groupBox, int defaultSelection);
46 void selectRadio(QGroupBox *groupBox, int defaultSelection);
47 QString radioSelection(QGroupBox *groupBox);
47 QString radioSelection(QGroupBox *groupBox);
48 QGroupBox *m_seriesTypeSelector;
48 QGroupBox *m_seriesTypeSelector;
49 QGroupBox *m_columnCountSelector;
49 QGroupBox *m_columnCountSelector;
50 QGroupBox *m_rowCountSelector;
50 QGroupBox *m_rowCountSelector;
51 QCheckBox *m_labelsSelector;
51 QCheckBox *m_labelsSelector;
52 QGroupBox *m_dataCharacteristicsSelector;
52 QGroupBox *m_dataCharacteristicsSelector;
53 };
53 };
54
54
55 #endif // DATASERIEDIALOG_H
55 #endif // DATASERIEDIALOG_H
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/chartwidgettest/main.cpp to tests/manual/chartwidgettest/main.cpp
NO CONTENT: file renamed from tests/chartwidgettest/main.cpp to tests/manual/chartwidgettest/main.cpp
Show file before | Show file after | Hide comments
This diff has been collapsed as it changes many lines, (760 lines changed) Show them Hide them
@@ -1,380 +1,380
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2014 Digia Plc
3 ** Copyright (C) 2014 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Enterprise Charts Add-on.
7 ** This file is part of the Qt Enterprise Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
11 ** accordance with the Qt Enterprise License Agreement provided with the
11 ** accordance with the Qt Enterprise License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "mainwidget.h"
21 #include "mainwidget.h"
22 #include "dataseriedialog.h"
22 #include "dataseriedialog.h"
23 #include <QtCharts/QChartView>
23 #include <QtCharts/QChartView>
24 #include <QtCharts/QPieSeries>
24 #include <QtCharts/QPieSeries>
25 #include <QtCharts/QScatterSeries>
25 #include <QtCharts/QScatterSeries>
26 #include <QtCharts/QLineSeries>
26 #include <QtCharts/QLineSeries>
27 #include <QtCharts/QAreaSeries>
27 #include <QtCharts/QAreaSeries>
28 #include <QtCharts/QSplineSeries>
28 #include <QtCharts/QSplineSeries>
29 #include <QtCharts/QBarSet>
29 #include <QtCharts/QBarSet>
30 #include <QtCharts/QBarSeries>
30 #include <QtCharts/QBarSeries>
31 #include <QtCharts/QStackedBarSeries>
31 #include <QtCharts/QStackedBarSeries>
32 #include <QtCharts/QPercentBarSeries>
32 #include <QtCharts/QPercentBarSeries>
33 #include <QtWidgets/QPushButton>
33 #include <QtWidgets/QPushButton>
34 #include <QtWidgets/QComboBox>
34 #include <QtWidgets/QComboBox>
35 #include <QtWidgets/QSpinBox>
35 #include <QtWidgets/QSpinBox>
36 #include <QtWidgets/QCheckBox>
36 #include <QtWidgets/QCheckBox>
37 #include <QtWidgets/QGridLayout>
37 #include <QtWidgets/QGridLayout>
38 #include <QtWidgets/QHBoxLayout>
38 #include <QtWidgets/QHBoxLayout>
39 #include <QtWidgets/QLabel>
39 #include <QtWidgets/QLabel>
40 #include <QtWidgets/QSpacerItem>
40 #include <QtWidgets/QSpacerItem>
41 #include <QtWidgets/QMessageBox>
41 #include <QtWidgets/QMessageBox>
42 #include <cmath>
42 #include <cmath>
43 #include <QtCore/QDebug>
43 #include <QtCore/QDebug>
44 #include <QtGui/QStandardItemModel>
44 #include <QtGui/QStandardItemModel>
45 #include <QtCharts/QBarCategoryAxis>
45 #include <QtCharts/QBarCategoryAxis>
46 #include <QtOpenGL/QGLWidget>
46 #include <QtOpenGL/QGLWidget>
47
47
48 QT_CHARTS_USE_NAMESPACE
48 QT_CHARTS_USE_NAMESPACE
49
49
50 MainWidget::MainWidget(QWidget *parent) :
50 MainWidget::MainWidget(QWidget *parent) :
51 QWidget(parent),
51 QWidget(parent),
52 m_addSerieDialog(0),
52 m_addSerieDialog(0),
53 m_chart(0)
53 m_chart(0)
54 {
54 {
55 m_chart = new QChart();
55 m_chart = new QChart();
56
56
57 // Grid layout for the controls for configuring the chart widget
57 // Grid layout for the controls for configuring the chart widget
58 QGridLayout *grid = new QGridLayout();
58 QGridLayout *grid = new QGridLayout();
59 QPushButton *addSeriesButton = new QPushButton("Add series");
59 QPushButton *addSeriesButton = new QPushButton("Add series");
60 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
60 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
61 grid->addWidget(addSeriesButton, 0, 1);
61 grid->addWidget(addSeriesButton, 0, 1);
62 initBackroundCombo(grid);
62 initBackroundCombo(grid);
63 initScaleControls(grid);
63 initScaleControls(grid);
64 initThemeCombo(grid);
64 initThemeCombo(grid);
65 initCheckboxes(grid);
65 initCheckboxes(grid);
66
66
67 // add row with empty label to make all the other rows static
67 // add row with empty label to make all the other rows static
68 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
68 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
69 grid->setRowStretch(grid->rowCount() - 1, 1);
69 grid->setRowStretch(grid->rowCount() - 1, 1);
70
70
71 // Create chart view with the chart
71 // Create chart view with the chart
72 m_chartView = new QChartView(m_chart, this);
72 m_chartView = new QChartView(m_chart, this);
73 m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
73 m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
74
74
75 // Another grid layout as a main layout
75 // Another grid layout as a main layout
76 QGridLayout *mainLayout = new QGridLayout();
76 QGridLayout *mainLayout = new QGridLayout();
77 mainLayout->addLayout(grid, 0, 0);
77 mainLayout->addLayout(grid, 0, 0);
78 mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
78 mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
79 setLayout(mainLayout);
79 setLayout(mainLayout);
80 }
80 }
81
81
82 // Combo box for selecting the chart's background
82 // Combo box for selecting the chart's background
83 void MainWidget::initBackroundCombo(QGridLayout *grid)
83 void MainWidget::initBackroundCombo(QGridLayout *grid)
84 {
84 {
85 QComboBox *backgroundCombo = new QComboBox(this);
85 QComboBox *backgroundCombo = new QComboBox(this);
86 backgroundCombo->addItem("Color");
86 backgroundCombo->addItem("Color");
87 backgroundCombo->addItem("Gradient");
87 backgroundCombo->addItem("Gradient");
88 backgroundCombo->addItem("Image");
88 backgroundCombo->addItem("Image");
89 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
89 connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
90 this, SLOT(backgroundChanged(int)));
90 this, SLOT(backgroundChanged(int)));
91
91
92 grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
92 grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
93 grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
93 grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
94 }
94 }
95
95
96 // Scale related controls (auto-scale vs. manual min-max values)
96 // Scale related controls (auto-scale vs. manual min-max values)
97 void MainWidget::initScaleControls(QGridLayout *grid)
97 void MainWidget::initScaleControls(QGridLayout *grid)
98 {
98 {
99 m_autoScaleCheck = new QCheckBox("Automatic scaling");
99 m_autoScaleCheck = new QCheckBox("Automatic scaling");
100 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
100 connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
101 // Allow setting also non-sense values (like -2147483648 and 2147483647)
101 // Allow setting also non-sense values (like -2147483648 and 2147483647)
102 m_xMinSpin = new QSpinBox();
102 m_xMinSpin = new QSpinBox();
103 m_xMinSpin->setMinimum(INT_MIN);
103 m_xMinSpin->setMinimum(INT_MIN);
104 m_xMinSpin->setMaximum(INT_MAX);
104 m_xMinSpin->setMaximum(INT_MAX);
105 m_xMinSpin->setValue(0);
105 m_xMinSpin->setValue(0);
106 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
106 connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
107 m_xMaxSpin = new QSpinBox();
107 m_xMaxSpin = new QSpinBox();
108 m_xMaxSpin->setMinimum(INT_MIN);
108 m_xMaxSpin->setMinimum(INT_MIN);
109 m_xMaxSpin->setMaximum(INT_MAX);
109 m_xMaxSpin->setMaximum(INT_MAX);
110 m_xMaxSpin->setValue(10);
110 m_xMaxSpin->setValue(10);
111 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
111 connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
112 m_yMinSpin = new QSpinBox();
112 m_yMinSpin = new QSpinBox();
113 m_yMinSpin->setMinimum(INT_MIN);
113 m_yMinSpin->setMinimum(INT_MIN);
114 m_yMinSpin->setMaximum(INT_MAX);
114 m_yMinSpin->setMaximum(INT_MAX);
115 m_yMinSpin->setValue(0);
115 m_yMinSpin->setValue(0);
116 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
116 connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
117 m_yMaxSpin = new QSpinBox();
117 m_yMaxSpin = new QSpinBox();
118 m_yMaxSpin->setMinimum(INT_MIN);
118 m_yMaxSpin->setMinimum(INT_MIN);
119 m_yMaxSpin->setMaximum(INT_MAX);
119 m_yMaxSpin->setMaximum(INT_MAX);
120 m_yMaxSpin->setValue(10);
120 m_yMaxSpin->setValue(10);
121 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
121 connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
122
122
123 grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
123 grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
124 grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
124 grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
125 grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
125 grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
126 grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
126 grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
127 grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
127 grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
128 grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
128 grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
129 grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
129 grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
130 grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
130 grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
131 grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
131 grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
132
132
133 m_autoScaleCheck->setChecked(true);
133 m_autoScaleCheck->setChecked(true);
134 }
134 }
135
135
136 // Combo box for selecting theme
136 // Combo box for selecting theme
137 void MainWidget::initThemeCombo(QGridLayout *grid)
137 void MainWidget::initThemeCombo(QGridLayout *grid)
138 {
138 {
139 QComboBox *chartTheme = new QComboBox();
139 QComboBox *chartTheme = new QComboBox();
140 chartTheme->addItem("Default");
140 chartTheme->addItem("Default");
141 chartTheme->addItem("Light");
141 chartTheme->addItem("Light");
142 chartTheme->addItem("Blue Cerulean");
142 chartTheme->addItem("Blue Cerulean");
143 chartTheme->addItem("Dark");
143 chartTheme->addItem("Dark");
144 chartTheme->addItem("Brown Sand");
144 chartTheme->addItem("Brown Sand");
145 chartTheme->addItem("Blue NCS");
145 chartTheme->addItem("Blue NCS");
146 chartTheme->addItem("High Contrast");
146 chartTheme->addItem("High Contrast");
147 chartTheme->addItem("Blue Icy");
147 chartTheme->addItem("Blue Icy");
148 chartTheme->addItem("Qt");
148 chartTheme->addItem("Qt");
149 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
149 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
150 this, SLOT(changeChartTheme(int)));
150 this, SLOT(changeChartTheme(int)));
151 grid->addWidget(new QLabel("Chart theme:"), 8, 0);
151 grid->addWidget(new QLabel("Chart theme:"), 8, 0);
152 grid->addWidget(chartTheme, 8, 1);
152 grid->addWidget(chartTheme, 8, 1);
153 }
153 }
154
154
155 // Different check boxes for customizing chart
155 // Different check boxes for customizing chart
156 void MainWidget::initCheckboxes(QGridLayout *grid)
156 void MainWidget::initCheckboxes(QGridLayout *grid)
157 {
157 {
158 // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
158 // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
159 QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
159 QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
160 // connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
160 // connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
161 zoomCheckBox->setChecked(true);
161 zoomCheckBox->setChecked(true);
162 grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
162 grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
163
163
164 QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias");
164 QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias");
165 connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool)));
165 connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool)));
166 aliasCheckBox->setChecked(false);
166 aliasCheckBox->setChecked(false);
167 grid->addWidget(aliasCheckBox, grid->rowCount(), 0);
167 grid->addWidget(aliasCheckBox, grid->rowCount(), 0);
168
168
169 QCheckBox *openGLCheckBox = new QCheckBox("Use QGLWidget");
169 QCheckBox *openGLCheckBox = new QCheckBox("Use QGLWidget");
170 connect(openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(openGLToggled(bool)));
170 connect(openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(openGLToggled(bool)));
171 openGLCheckBox->setChecked(false);
171 openGLCheckBox->setChecked(false);
172 grid->addWidget(openGLCheckBox, grid->rowCount(), 0);
172 grid->addWidget(openGLCheckBox, grid->rowCount(), 0);
173 }
173 }
174
174
175 void MainWidget::antiAliasToggled(bool enabled)
175 void MainWidget::antiAliasToggled(bool enabled)
176 {
176 {
177 m_chartView->setRenderHint(QPainter::Antialiasing, enabled);
177 m_chartView->setRenderHint(QPainter::Antialiasing, enabled);
178 }
178 }
179
179
180 void MainWidget::openGLToggled(bool enabled)
180 void MainWidget::openGLToggled(bool enabled)
181 {
181 {
182 if (enabled) {
182 if (enabled) {
183 QGLFormat f = QGLFormat::defaultFormat();
183 QGLFormat f = QGLFormat::defaultFormat();
184 f.setSampleBuffers(true);
184 f.setSampleBuffers(true);
185 f.setSamples(4);
185 f.setSamples(4);
186 QGLFormat::setDefaultFormat(f);
186 QGLFormat::setDefaultFormat(f);
187 QGLWidget *g = new QGLWidget();
187 QGLWidget *g = new QGLWidget();
188 m_chartView->setViewport(g);
188 m_chartView->setViewport(g);
189 } else {
189 } else {
190 m_chartView->setViewport(0);
190 m_chartView->setViewport(0);
191 }
191 }
192 }
192 }
193
193
194 void MainWidget::addSeries()
194 void MainWidget::addSeries()
195 {
195 {
196 if (!m_addSerieDialog) {
196 if (!m_addSerieDialog) {
197 m_addSerieDialog = new DataSerieDialog(this);
197 m_addSerieDialog = new DataSerieDialog(this);
198 connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)),
198 connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)),
199 this, SLOT(addSeries(QString,int,int,QString,bool)));
199 this, SLOT(addSeries(QString,int,int,QString,bool)));
200 }
200 }
201 m_addSerieDialog->exec();
201 m_addSerieDialog->exec();
202 }
202 }
203
203
204 QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics)
204 QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics)
205 {
205 {
206 QList<RealList> testData;
206 QList<RealList> testData;
207 for (int j(0); j < columnCount; j++) {
207 for (int j(0); j < columnCount; j++) {
208 QList <qreal> newColumn;
208 QList <qreal> newColumn;
209 for (int i(0); i < rowCount; i++) {
209 for (int i(0); i < rowCount; i++) {
210 if (dataCharacteristics == "Sin") {
210 if (dataCharacteristics == "Sin") {
211 newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100));
211 newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100));
212 } else if (dataCharacteristics == "Sin + random") {
212 } else if (dataCharacteristics == "Sin + random") {
213 newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
213 newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
214 } else if (dataCharacteristics == "Random") {
214 } else if (dataCharacteristics == "Random") {
215 newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX);
215 newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX);
216 } else if (dataCharacteristics == "Linear") {
216 } else if (dataCharacteristics == "Linear") {
217 //newColumn.append(i * (j + 1.0));
217 //newColumn.append(i * (j + 1.0));
218 // TODO: temporary hack to make pie work; prevent zero values:
218 // TODO: temporary hack to make pie work; prevent zero values:
219 newColumn.append(i * (j + 1.0) + 0.1);
219 newColumn.append(i * (j + 1.0) + 0.1);
220 } else { // "constant"
220 } else { // "constant"
221 newColumn.append((j + 1.0));
221 newColumn.append((j + 1.0));
222 }
222 }
223 }
223 }
224 testData.append(newColumn);
224 testData.append(newColumn);
225 }
225 }
226 return testData;
226 return testData;
227 }
227 }
228
228
229 QStringList MainWidget::generateLabels(int count)
229 QStringList MainWidget::generateLabels(int count)
230 {
230 {
231 QStringList result;
231 QStringList result;
232 for (int i(0); i < count; i++)
232 for (int i(0); i < count; i++)
233 result.append("label" + QString::number(i));
233 result.append("label" + QString::number(i));
234 return result;
234 return result;
235 }
235 }
236
236
237 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled)
237 void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled)
238 {
238 {
239 qDebug() << "addSeries: " << seriesName
239 qDebug() << "addSeries: " << seriesName
240 << " columnCount: " << columnCount
240 << " columnCount: " << columnCount
241 << " rowCount: " << rowCount
241 << " rowCount: " << rowCount
242 << " dataCharacteristics: " << dataCharacteristics
242 << " dataCharacteristics: " << dataCharacteristics
243 << " labels enabled: " << labelsEnabled;
243 << " labels enabled: " << labelsEnabled;
244 m_defaultSeriesName = seriesName;
244 m_defaultSeriesName = seriesName;
245
245
246 QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
246 QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
247
247
248 // Line series and scatter series use similar data
248 // Line series and scatter series use similar data
249 if (seriesName == "Line") {
249 if (seriesName == "Line") {
250 for (int j(0); j < data.count(); j ++) {
250 for (int j(0); j < data.count(); j ++) {
251 QList<qreal> column = data.at(j);
251 QList<qreal> column = data.at(j);
252 QLineSeries *series = new QLineSeries();
252 QLineSeries *series = new QLineSeries();
253 series->setName("line" + QString::number(j));
253 series->setName("line" + QString::number(j));
254 for (int i(0); i < column.count(); i++)
254 for (int i(0); i < column.count(); i++)
255 series->append(i, column.at(i));
255 series->append(i, column.at(i));
256 m_chart->addSeries(series);
256 m_chart->addSeries(series);
257 }
257 }
258 } else if (seriesName == "Area") {
258 } else if (seriesName == "Area") {
259 // TODO: lower series for the area?
259 // TODO: lower series for the area?
260 for (int j(0); j < data.count(); j ++) {
260 for (int j(0); j < data.count(); j ++) {
261 QList<qreal> column = data.at(j);
261 QList<qreal> column = data.at(j);
262 QLineSeries *lineSeries = new QLineSeries();
262 QLineSeries *lineSeries = new QLineSeries();
263 for (int i(0); i < column.count(); i++)
263 for (int i(0); i < column.count(); i++)
264 lineSeries->append(i, column.at(i));
264 lineSeries->append(i, column.at(i));
265 QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
265 QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
266 areaSeries->setName("area" + QString::number(j));
266 areaSeries->setName("area" + QString::number(j));
267 m_chart->addSeries(areaSeries);
267 m_chart->addSeries(areaSeries);
268 }
268 }
269 } else if (seriesName == "Scatter") {
269 } else if (seriesName == "Scatter") {
270 for (int j(0); j < data.count(); j++) {
270 for (int j(0); j < data.count(); j++) {
271 QList<qreal> column = data.at(j);
271 QList<qreal> column = data.at(j);
272 QScatterSeries *series = new QScatterSeries();
272 QScatterSeries *series = new QScatterSeries();
273 series->setName("scatter" + QString::number(j));
273 series->setName("scatter" + QString::number(j));
274 for (int i(0); i < column.count(); i++)
274 for (int i(0); i < column.count(); i++)
275 series->append(i, column.at(i));
275 series->append(i, column.at(i));
276 m_chart->addSeries(series);
276 m_chart->addSeries(series);
277 }
277 }
278 } else if (seriesName == "Pie") {
278 } else if (seriesName == "Pie") {
279 QStringList labels = generateLabels(rowCount);
279 QStringList labels = generateLabels(rowCount);
280 for (int j(0); j < data.count(); j++) {
280 for (int j(0); j < data.count(); j++) {
281 QPieSeries *series = new QPieSeries();
281 QPieSeries *series = new QPieSeries();
282 QList<qreal> column = data.at(j);
282 QList<qreal> column = data.at(j);
283 for (int i(0); i < column.count(); i++)
283 for (int i(0); i < column.count(); i++)
284 series->append(labels.at(i), column.at(i));
284 series->append(labels.at(i), column.at(i));
285 m_chart->addSeries(series);
285 m_chart->addSeries(series);
286 }
286 }
287 } else if (seriesName == "Bar"
287 } else if (seriesName == "Bar"
288 || seriesName == "Stacked bar"
288 || seriesName == "Stacked bar"
289 || seriesName == "Percent bar") {
289 || seriesName == "Percent bar") {
290 QStringList category;
290 QStringList category;
291 QStringList labels = generateLabels(rowCount);
291 QStringList labels = generateLabels(rowCount);
292 foreach (QString label, labels)
292 foreach (QString label, labels)
293 category << label;
293 category << label;
294 QAbstractBarSeries* series = 0;
294 QAbstractBarSeries* series = 0;
295 if (seriesName == "Bar") {
295 if (seriesName == "Bar") {
296 series = new QBarSeries(this);
296 series = new QBarSeries(this);
297 QBarCategoryAxis* axis = new QBarCategoryAxis();
297 QBarCategoryAxis* axis = new QBarCategoryAxis();
298 axis->append(category);
298 axis->append(category);
299 m_chart->setAxisX(axis,series);
299 m_chart->setAxisX(axis,series);
300 } else if (seriesName == "Stacked bar") {
300 } else if (seriesName == "Stacked bar") {
301 series = new QStackedBarSeries(this);
301 series = new QStackedBarSeries(this);
302 QBarCategoryAxis* axis = new QBarCategoryAxis();
302 QBarCategoryAxis* axis = new QBarCategoryAxis();
303 axis->append(category);
303 axis->append(category);
304 m_chart->setAxisX(axis,series);
304 m_chart->setAxisX(axis,series);
305 } else {
305 } else {
306 series = new QPercentBarSeries(this);
306 series = new QPercentBarSeries(this);
307 QBarCategoryAxis* axis = new QBarCategoryAxis();
307 QBarCategoryAxis* axis = new QBarCategoryAxis();
308 axis->append(category);
308 axis->append(category);
309 m_chart->setAxisX(axis,series);
309 m_chart->setAxisX(axis,series);
310 }
310 }
311
311
312 for (int j(0); j < data.count(); j++) {
312 for (int j(0); j < data.count(); j++) {
313 QList<qreal> column = data.at(j);
313 QList<qreal> column = data.at(j);
314 QBarSet *set = new QBarSet("set" + QString::number(j));
314 QBarSet *set = new QBarSet("set" + QString::number(j));
315 for (int i(0); i < column.count(); i++)
315 for (int i(0); i < column.count(); i++)
316 *set << column.at(i);
316 *set << column.at(i);
317 series->append(set);
317 series->append(set);
318 }
318 }
319
319
320 m_chart->addSeries(series);
320 m_chart->addSeries(series);
321 } else if (seriesName == "Spline") {
321 } else if (seriesName == "Spline") {
322 for (int j(0); j < data.count(); j ++) {
322 for (int j(0); j < data.count(); j ++) {
323 QList<qreal> column = data.at(j);
323 QList<qreal> column = data.at(j);
324 QSplineSeries *series = new QSplineSeries();
324 QSplineSeries *series = new QSplineSeries();
325 series->setName("spline" + QString::number(j));
325 series->setName("spline" + QString::number(j));
326 for (int i(0); i < column.count(); i++)
326 for (int i(0); i < column.count(); i++)
327 series->append(i, column.at(i));
327 series->append(i, column.at(i));
328 m_chart->addSeries(series);
328 m_chart->addSeries(series);
329 }
329 }
330 }
330 }
331 m_chart->createDefaultAxes();
331 m_chart->createDefaultAxes();
332 }
332 }
333
333
334 void MainWidget::backgroundChanged(int itemIndex)
334 void MainWidget::backgroundChanged(int itemIndex)
335 {
335 {
336 qDebug() << "backgroundChanged: " << itemIndex;
336 qDebug() << "backgroundChanged: " << itemIndex;
337 }
337 }
338
338
339 void MainWidget::autoScaleChanged(int value)
339 void MainWidget::autoScaleChanged(int value)
340 {
340 {
341 if (value) {
341 if (value) {
342 // TODO: enable auto scaling
342 // TODO: enable auto scaling
343 } else {
343 } else {
344 // TODO: set scaling manually (and disable auto scaling)
344 // TODO: set scaling manually (and disable auto scaling)
345 }
345 }
346
346
347 m_xMinSpin->setEnabled(!value);
347 m_xMinSpin->setEnabled(!value);
348 m_xMaxSpin->setEnabled(!value);
348 m_xMaxSpin->setEnabled(!value);
349 m_yMinSpin->setEnabled(!value);
349 m_yMinSpin->setEnabled(!value);
350 m_yMaxSpin->setEnabled(!value);
350 m_yMaxSpin->setEnabled(!value);
351 }
351 }
352
352
353 void MainWidget::xMinChanged(int value)
353 void MainWidget::xMinChanged(int value)
354 {
354 {
355 qDebug() << "xMinChanged: " << value;
355 qDebug() << "xMinChanged: " << value;
356 }
356 }
357
357
358 void MainWidget::xMaxChanged(int value)
358 void MainWidget::xMaxChanged(int value)
359 {
359 {
360 qDebug() << "xMaxChanged: " << value;
360 qDebug() << "xMaxChanged: " << value;
361 }
361 }
362
362
363 void MainWidget::yMinChanged(int value)
363 void MainWidget::yMinChanged(int value)
364 {
364 {
365 qDebug() << "yMinChanged: " << value;
365 qDebug() << "yMinChanged: " << value;
366 }
366 }
367
367
368 void MainWidget::yMaxChanged(int value)
368 void MainWidget::yMaxChanged(int value)
369 {
369 {
370 qDebug() << "yMaxChanged: " << value;
370 qDebug() << "yMaxChanged: " << value;
371 }
371 }
372
372
373 void MainWidget::changeChartTheme(int themeIndex)
373 void MainWidget::changeChartTheme(int themeIndex)
374 {
374 {
375 qDebug() << "changeChartTheme: " << themeIndex;
375 qDebug() << "changeChartTheme: " << themeIndex;
376 if (themeIndex == 0)
376 if (themeIndex == 0)
377 m_chart->setTheme(QChart::ChartThemeLight);
377 m_chart->setTheme(QChart::ChartThemeLight);
378 else
378 else
379 m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
379 m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
380 }
380 }
Show file before | Show file after | Hide comments
@@ -1,80 +1,80
1 /****************************************************************************
1 /****************************************************************************
2 **
2 **
3 ** Copyright (C) 2014 Digia Plc
3 ** Copyright (C) 2014 Digia Plc
4 ** All rights reserved.
4 ** All rights reserved.
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
5 ** For any questions to Digia, please use contact form at http://qt.digia.com
6 **
6 **
7 ** This file is part of the Qt Enterprise Charts Add-on.
7 ** This file is part of the Qt Enterprise Charts Add-on.
8 **
8 **
9 ** $QT_BEGIN_LICENSE$
9 ** $QT_BEGIN_LICENSE$
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
10 ** Licensees holding valid Qt Enterprise licenses may use this file in
11 ** accordance with the Qt Enterprise License Agreement provided with the
11 ** accordance with the Qt Enterprise License Agreement provided with the
12 ** Software or, alternatively, in accordance with the terms contained in
12 ** Software or, alternatively, in accordance with the terms contained in
13 ** a written agreement between you and Digia.
13 ** a written agreement between you and Digia.
14 **
14 **
15 ** If you have questions regarding the use of this file, please use
15 ** If you have questions regarding the use of this file, please use
16 ** contact form at http://qt.digia.com
16 ** contact form at http://qt.digia.com
17 ** $QT_END_LICENSE$
17 ** $QT_END_LICENSE$
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #ifndef MAINWIDGET_H
21 #ifndef MAINWIDGET_H
22 #define MAINWIDGET_H
22 #define MAINWIDGET_H
23
23
24 #include <QtCharts/QChartGlobal>
24 #include <QtCharts/QChartGlobal>
25 #include <QtCharts/QChart>
25 #include <QtCharts/QChart>
26 #include <QtCharts/QChartView>
26 #include <QtCharts/QChartView>
27 #include <QtWidgets/QWidget>
27 #include <QtWidgets/QWidget>
28
28
29 class QSpinBox;
29 class QSpinBox;
30 class QCheckBox;
30 class QCheckBox;
31 class QGridLayout;
31 class QGridLayout;
32
32
33 QT_CHARTS_USE_NAMESPACE
33 QT_CHARTS_USE_NAMESPACE
34
34
35 #define RealList QList<qreal>
35 #define RealList QList<qreal>
36 class DataSerieDialog;
36 class DataSerieDialog;
37
37
38 class MainWidget : public QWidget
38 class MainWidget : public QWidget
39 {
39 {
40 Q_OBJECT
40 Q_OBJECT
41 public:
41 public:
42 explicit MainWidget(QWidget *parent = 0);
42 explicit MainWidget(QWidget *parent = 0);
43
43
44 signals:
44 signals:
45
45
46 private:
46 private:
47 void initBackroundCombo(QGridLayout *grid);
47 void initBackroundCombo(QGridLayout *grid);
48 void initScaleControls(QGridLayout *grid);
48 void initScaleControls(QGridLayout *grid);
49 void initThemeCombo(QGridLayout *grid);
49 void initThemeCombo(QGridLayout *grid);
50 void initCheckboxes(QGridLayout *grid);
50 void initCheckboxes(QGridLayout *grid);
51
51
52 private slots:
52 private slots:
53 void addSeries();
53 void addSeries();
54 void addSeries(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled);
54 void addSeries(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled);
55 void backgroundChanged(int itemIndex);
55 void backgroundChanged(int itemIndex);
56 void autoScaleChanged(int value);
56 void autoScaleChanged(int value);
57 void xMinChanged(int value);
57 void xMinChanged(int value);
58 void xMaxChanged(int value);
58 void xMaxChanged(int value);
59 void yMinChanged(int value);
59 void yMinChanged(int value);
60 void yMaxChanged(int value);
60 void yMaxChanged(int value);
61 void antiAliasToggled(bool enabled);
61 void antiAliasToggled(bool enabled);
62 void openGLToggled(bool enabled);
62 void openGLToggled(bool enabled);
63 void changeChartTheme(int themeIndex);
63 void changeChartTheme(int themeIndex);
64 QList<RealList> generateTestData(int columnCount, int rowCount, QString dataCharacteristics);
64 QList<RealList> generateTestData(int columnCount, int rowCount, QString dataCharacteristics);
65 QStringList generateLabels(int count);
65 QStringList generateLabels(int count);
66
66
67 private:
67 private:
68 DataSerieDialog *m_addSerieDialog;
68 DataSerieDialog *m_addSerieDialog;
69 QChart *m_chart;
69 QChart *m_chart;
70 QChartView *m_chartView;
70 QChartView *m_chartView;
71 QCheckBox *m_autoScaleCheck;
71 QCheckBox *m_autoScaleCheck;
72 QSpinBox *m_xMinSpin;
72 QSpinBox *m_xMinSpin;
73 QSpinBox *m_xMaxSpin;
73 QSpinBox *m_xMaxSpin;
74 QSpinBox *m_yMinSpin;
74 QSpinBox *m_yMinSpin;
75 QSpinBox *m_yMaxSpin;
75 QSpinBox *m_yMaxSpin;
76 QString m_defaultSeriesName;
76 QString m_defaultSeriesName;
77 QGridLayout *m_scatterLayout;
77 QGridLayout *m_scatterLayout;
78 };
78 };
79
79
80 #endif // MAINWIDGET_H
80 #endif // MAINWIDGET_H
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/polarcharttest/chartview.cpp to tests/manual/polarcharttest/chartview.cpp
NO CONTENT: file renamed from tests/polarcharttest/chartview.cpp to tests/manual/polarcharttest/chartview.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/polarcharttest/chartview.h to tests/manual/polarcharttest/chartview.h
NO CONTENT: file renamed from tests/polarcharttest/chartview.h to tests/manual/polarcharttest/chartview.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/polarcharttest/main.cpp to tests/manual/polarcharttest/main.cpp
NO CONTENT: file renamed from tests/polarcharttest/main.cpp to tests/manual/polarcharttest/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/polarcharttest/mainwindow.cpp to tests/manual/polarcharttest/mainwindow.cpp
NO CONTENT: file renamed from tests/polarcharttest/mainwindow.cpp to tests/manual/polarcharttest/mainwindow.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/polarcharttest/mainwindow.h to tests/manual/polarcharttest/mainwindow.h
NO CONTENT: file renamed from tests/polarcharttest/mainwindow.h to tests/manual/polarcharttest/mainwindow.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/polarcharttest/mainwindow.ui to tests/manual/polarcharttest/mainwindow.ui
NO CONTENT: file renamed from tests/polarcharttest/mainwindow.ui to tests/manual/polarcharttest/mainwindow.ui
Show file before | Show file after | Hide comments
@@ -1,19 +1,19
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the test.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4
5 QT += core gui widgets
5 QT += core gui widgets
6
6
7 TARGET = polarcharttest
7 TARGET = polarcharttest
8 TEMPLATE = app
8 TEMPLATE = app
9 INCLUDEPATH += .
9 INCLUDEPATH += .
10
10
11
11
12 SOURCES += main.cpp \
12 SOURCES += main.cpp \
13 mainwindow.cpp \
13 mainwindow.cpp \
14 chartview.cpp
14 chartview.cpp
15
15
16 HEADERS += mainwindow.h \
16 HEADERS += mainwindow.h \
17 chartview.h
17 chartview.h
18
18
19 FORMS += mainwindow.ui
19 FORMS += mainwindow.ui
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/presenterchart/chartview.cpp to tests/manual/presenterchart/chartview.cpp
NO CONTENT: file renamed from tests/presenterchart/chartview.cpp to tests/manual/presenterchart/chartview.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/presenterchart/chartview.h to tests/manual/presenterchart/chartview.h
NO CONTENT: file renamed from tests/presenterchart/chartview.h to tests/manual/presenterchart/chartview.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/presenterchart/main.cpp to tests/manual/presenterchart/main.cpp
NO CONTENT: file renamed from tests/presenterchart/main.cpp to tests/manual/presenterchart/main.cpp
Show file before | Show file after | Hide comments
@@ -1,8 +1,9
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the examples.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4 TARGET = presenterchart
5 TARGET = presenterchart
5 HEADERS += chartview.h
6 HEADERS += chartview.h
6 SOURCES += main.cpp chartview.cpp
7 SOURCES += main.cpp chartview.cpp
7
8
8 QT += widgets
9 QT += widgets
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/main.cpp to tests/manual/qmlchartaxis/main.cpp
NO CONTENT: file renamed from tests/qmlchartaxis/main.cpp to tests/manual/qmlchartaxis/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/Button.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/Button.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/Button.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/Button.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/Legacy.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/Legacy.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/main.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml
NO CONTENT: file renamed from tests/qmlchartaxis/qml/qmlchartaxis/main.qml to tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the test.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4
5 RESOURCES += resources.qrc
5 RESOURCES += resources.qrc
6 SOURCES += main.cpp
6 SOURCES += main.cpp
7 OTHER_FILES += qml/qmlchartaxis/*
7 OTHER_FILES += qml/qmlchartaxis/*
8
8
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartaxis/resources.qrc to tests/manual/qmlchartaxis/resources.qrc
NO CONTENT: file renamed from tests/qmlchartaxis/resources.qrc to tests/manual/qmlchartaxis/resources.qrc
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/main.cpp to tests/manual/qmlchartproperties/main.cpp
NO CONTENT: file renamed from tests/qmlchartproperties/main.cpp to tests/manual/qmlchartproperties/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/Button.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/Button.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/Button.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/Button.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/PieChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/PieChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/main.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml
NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/main.qml to tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the test.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4
5 RESOURCES += resources.qrc
5 RESOURCES += resources.qrc
6 SOURCES += main.cpp
6 SOURCES += main.cpp
7 OTHER_FILES += qml/qmlchartproperties/*
7 OTHER_FILES += qml/qmlchartproperties/*
8
8
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/qmlchartproperties/resources.qrc to tests/manual/qmlchartproperties/resources.qrc
NO CONTENT: file renamed from tests/qmlchartproperties/resources.qrc to tests/manual/qmlchartproperties/resources.qrc
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/wavechart/main.cpp to tests/manual/wavechart/main.cpp
NO CONTENT: file renamed from tests/wavechart/main.cpp to tests/manual/wavechart/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/wavechart/wavechart.cpp to tests/manual/wavechart/wavechart.cpp
NO CONTENT: file renamed from tests/wavechart/wavechart.cpp to tests/manual/wavechart/wavechart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from tests/wavechart/wavechart.h to tests/manual/wavechart/wavechart.h
NO CONTENT: file renamed from tests/wavechart/wavechart.h to tests/manual/wavechart/wavechart.h
Show file before | Show file after | Hide comments
@@ -1,7 +1,8
1 !include( ../tests.pri ) {
1 !include( ../../tests.pri ) {
2 error( "Couldn't find the examples.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4 QT+=opengl
5 QT+=opengl
5 TARGET = wavechart
6 TARGET = wavechart
6 SOURCES += main.cpp wavechart.cpp
7 SOURCES += main.cpp wavechart.cpp
7 HEADERS += wavechart.h
8 HEADERS += wavechart.h
Show file before | Show file after | Hide comments
@@ -1,19 +1,3
1 TEMPLATE = subdirs
1 TEMPLATE = subdirs
2 SUBDIRS += \
2 SUBDIRS += auto
3 auto \
3 exists(manual): SUBDIRS += manual
4 presenterchart \
5 polarcharttest \
6 boxplottester
7
8 contains(QT_CONFIG, opengl) {
9 SUBDIRS += chartwidgettest \
10 wavechart \
11 chartviewer
12 } else {
13 message("OpenGL not available. Some test apps are disabled")
14 }
15
16 qtHaveModule(quick) {
17 SUBDIRS += qmlchartproperties \
18 qmlchartaxis
19 }
General Comments 0
You need to be logged in to leave comments. Login now