diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-11 12:17:45 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-11 12:44:27 +0200 |
commit | 69f73db4ec09826487454f85670f992cec1af51a (patch) | |
tree | 6275e8530475857ba6eec590b250ee320f2a72a5 | |
parent | c6ed50e68438e5558e7cda0e36c194a4b99f7f83 (diff) |
Moved manual tests to separate directory.
This allows publishing autotests. Git export attributes changed
accordingly.
Change-Id: I6db2eb52dabdb8f12e0bc2a992a873abfa15b1a5
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
-rw-r--r-- | .gitattributes | 1 | ||||
-rw-r--r-- | tests/.gitattributes | 2 | ||||
-rw-r--r-- | tests/manual/boxplottester/boxplottester.pro (renamed from tests/boxplottester/boxplottester.pro) | 2 | ||||
-rw-r--r-- | tests/manual/boxplottester/customtablemodel.cpp (renamed from tests/boxplottester/customtablemodel.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/boxplottester/customtablemodel.h (renamed from tests/boxplottester/customtablemodel.h) | 0 | ||||
-rw-r--r-- | tests/manual/boxplottester/main.cpp (renamed from tests/boxplottester/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/boxplottester/mainwidget.cpp (renamed from tests/boxplottester/mainwidget.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/boxplottester/mainwidget.h (renamed from tests/boxplottester/mainwidget.h) | 0 | ||||
-rw-r--r-- | tests/manual/boxplottester/pentool.cpp (renamed from tests/boxplottester/pentool.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/boxplottester/pentool.h (renamed from tests/boxplottester/pentool.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/brushwidget.cpp (renamed from tests/chartdesigner/brushwidget.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/brushwidget.h (renamed from tests/chartdesigner/brushwidget.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/chartdesigner.pro (renamed from tests/chartdesigner/chartdesigner.pro) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/engine.cpp (renamed from tests/chartdesigner/engine.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/engine.h (renamed from tests/chartdesigner/engine.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/main.cpp (renamed from tests/chartdesigner/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/mainwindow.cpp (renamed from tests/chartdesigner/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/mainwindow.h (renamed from tests/chartdesigner/mainwindow.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/objectinspectorwidget.cpp (renamed from tests/chartdesigner/objectinspectorwidget.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/objectinspectorwidget.h (renamed from tests/chartdesigner/objectinspectorwidget.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/penwidget.cpp (renamed from tests/chartdesigner/penwidget.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartdesigner/penwidget.h (renamed from tests/chartdesigner/penwidget.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts.h (renamed from tests/chartviewer/charts.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp (renamed from tests/chartviewer/charts/axis/barcategoryaxisx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp (renamed from tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp (renamed from tests/chartviewer/charts/axis/barcategoryaxisy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp (renamed from tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/categoryaxis.cpp (renamed from tests/chartviewer/charts/axis/categoryaxis.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp (renamed from tests/chartviewer/charts/axis/datetimeaxisx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp (renamed from tests/chartviewer/charts/axis/datetimeaxisy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp (renamed from tests/chartviewer/charts/axis/logvalueaxisx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp (renamed from tests/chartviewer/charts/axis/logvalueaxisy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/axis/valueaxis.cpp (renamed from tests/chartviewer/charts/axis/valueaxis.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp (renamed from tests/chartviewer/charts/barseries/horizontalbarchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp (renamed from tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp (renamed from tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp (renamed from tests/chartviewer/charts/barseries/verticalbarchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp (renamed from tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp (renamed from tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/charts.pri (renamed from tests/chartviewer/charts/charts.pri) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/barlogx.cpp (renamed from tests/chartviewer/charts/domain/barlogx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/barlogy.cpp (renamed from tests/chartviewer/charts/domain/barlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/barpercentlogx.cpp (renamed from tests/chartviewer/charts/domain/barpercentlogx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/barpercentlogy.cpp (renamed from tests/chartviewer/charts/domain/barpercentlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/barstackedlogx.cpp (renamed from tests/chartviewer/charts/domain/barstackedlogx.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/barstackedlogy.cpp (renamed from tests/chartviewer/charts/domain/barstackedlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/linelogxlogy.cpp (renamed from tests/chartviewer/charts/domain/linelogxlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/linelogxy.cpp (renamed from tests/chartviewer/charts/domain/linelogxy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/linexlogy.cpp (renamed from tests/chartviewer/charts/domain/linexlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp (renamed from tests/chartviewer/charts/domain/scatterlogxlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/scatterlogxy.cpp (renamed from tests/chartviewer/charts/domain/scatterlogxy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/scatterxlogy.cpp (renamed from tests/chartviewer/charts/domain/scatterxlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp (renamed from tests/chartviewer/charts/domain/splinelogxlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/splinelogxy.cpp (renamed from tests/chartviewer/charts/domain/splinelogxy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/domain/splinexlogy.cpp (renamed from tests/chartviewer/charts/domain/splinexlogy.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/font/font.cpp (renamed from tests/chartviewer/charts/font/font.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp (renamed from tests/chartviewer/charts/multiaxis/multivalueaxis.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp (renamed from tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp (renamed from tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp (renamed from tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp (renamed from tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/pieseries/donutchart.cpp (renamed from tests/chartviewer/charts/pieseries/donutchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/pieseries/piechart.cpp (renamed from tests/chartviewer/charts/pieseries/piechart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/size/sizecharts.cpp (renamed from tests/chartviewer/charts/size/sizecharts.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/xyseries/areachart.cpp (renamed from tests/chartviewer/charts/xyseries/areachart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/xyseries/linechart.cpp (renamed from tests/chartviewer/charts/xyseries/linechart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/xyseries/scatterchart.cpp (renamed from tests/chartviewer/charts/xyseries/scatterchart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/charts/xyseries/splinechart.cpp (renamed from tests/chartviewer/charts/xyseries/splinechart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/chartviewer.pro (renamed from tests/chartviewer/chartviewer.pro) | 4 | ||||
-rw-r--r-- | tests/manual/chartviewer/grid.cpp (renamed from tests/chartviewer/grid.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/grid.h (renamed from tests/chartviewer/grid.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/main.cpp (renamed from tests/chartviewer/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/model.h (renamed from tests/chartviewer/model.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/view.cpp (renamed from tests/chartviewer/view.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/view.h (renamed from tests/chartviewer/view.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/window.cpp (renamed from tests/chartviewer/window.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartviewer/window.h (renamed from tests/chartviewer/window.h) | 0 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/chartwidgettest.pro (renamed from tests/chartwidgettest/chartwidgettest.pro) | 2 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/dataseriedialog.cpp (renamed from tests/chartwidgettest/dataseriedialog.cpp) | 378 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/dataseriedialog.h (renamed from tests/chartwidgettest/dataseriedialog.h) | 110 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/main.cpp (renamed from tests/chartwidgettest/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/mainwidget.cpp (renamed from tests/chartwidgettest/mainwidget.cpp) | 760 | ||||
-rw-r--r-- | tests/manual/chartwidgettest/mainwidget.h (renamed from tests/chartwidgettest/mainwidget.h) | 160 | ||||
-rw-r--r-- | tests/manual/manual.pro | 18 | ||||
-rw-r--r-- | tests/manual/polarcharttest/chartview.cpp (renamed from tests/polarcharttest/chartview.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/polarcharttest/chartview.h (renamed from tests/polarcharttest/chartview.h) | 0 | ||||
-rw-r--r-- | tests/manual/polarcharttest/main.cpp (renamed from tests/polarcharttest/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/polarcharttest/mainwindow.cpp (renamed from tests/polarcharttest/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/polarcharttest/mainwindow.h (renamed from tests/polarcharttest/mainwindow.h) | 0 | ||||
-rw-r--r-- | tests/manual/polarcharttest/mainwindow.ui (renamed from tests/polarcharttest/mainwindow.ui) | 0 | ||||
-rw-r--r-- | tests/manual/polarcharttest/polarcharttest.pro (renamed from tests/polarcharttest/polarcharttest.pro) | 2 | ||||
-rw-r--r-- | tests/manual/presenterchart/chartview.cpp (renamed from tests/presenterchart/chartview.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/presenterchart/chartview.h (renamed from tests/presenterchart/chartview.h) | 0 | ||||
-rw-r--r-- | tests/manual/presenterchart/main.cpp (renamed from tests/presenterchart/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/presenterchart/presenterchart.pro (renamed from tests/presenterchart/presenterchart.pro) | 5 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/main.cpp (renamed from tests/qmlchartaxis/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/Button.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/Button.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/Legacy.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml (renamed from tests/qmlchartaxis/qml/qmlchartaxis/main.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/qmlchartaxis.pro (renamed from tests/qmlchartaxis/qmlchartaxis.pro) | 2 | ||||
-rw-r--r-- | tests/manual/qmlchartaxis/resources.qrc (renamed from tests/qmlchartaxis/resources.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/main.cpp (renamed from tests/qmlchartproperties/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/Button.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/Button.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/PieChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml (renamed from tests/qmlchartproperties/qml/qmlchartproperties/main.qml) | 0 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/qmlchartproperties.pro (renamed from tests/qmlchartproperties/qmlchartproperties.pro) | 2 | ||||
-rw-r--r-- | tests/manual/qmlchartproperties/resources.qrc (renamed from tests/qmlchartproperties/resources.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/wavechart/main.cpp (renamed from tests/wavechart/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/wavechart/wavechart.cpp (renamed from tests/wavechart/wavechart.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/wavechart/wavechart.h (renamed from tests/wavechart/wavechart.h) | 0 | ||||
-rw-r--r-- | tests/manual/wavechart/wavechart.pro (renamed from tests/wavechart/wavechart.pro) | 5 | ||||
-rw-r--r-- | tests/tests.pro | 20 |
146 files changed, 740 insertions, 733 deletions
diff --git a/.gitattributes b/.gitattributes index 26f7dd27..e4b9352a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,5 +2,4 @@ .gitignore export-ignore .gitattributes export-ignore .commit-template export-ignore -tests export-ignore tools export-ignore diff --git a/tests/.gitattributes b/tests/.gitattributes new file mode 100644 index 00000000..fbbe17a3 --- /dev/null +++ b/tests/.gitattributes @@ -0,0 +1,2 @@ +.gitattributes export-ignore +manual export-ignore diff --git a/tests/boxplottester/boxplottester.pro b/tests/manual/boxplottester/boxplottester.pro index 2568adc3..1a8681fe 100644 --- a/tests/boxplottester/boxplottester.pro +++ b/tests/manual/boxplottester/boxplottester.pro @@ -1,4 +1,4 @@ -!include( ../tests.pri ) { +!include( ../../tests.pri ) { error( "Couldn't find the test.pri file!" ) } diff --git a/tests/boxplottester/customtablemodel.cpp b/tests/manual/boxplottester/customtablemodel.cpp index 8724dd56..8724dd56 100644 --- a/tests/boxplottester/customtablemodel.cpp +++ b/tests/manual/boxplottester/customtablemodel.cpp diff --git a/tests/boxplottester/customtablemodel.h b/tests/manual/boxplottester/customtablemodel.h index 0f1fb9df..0f1fb9df 100644 --- a/tests/boxplottester/customtablemodel.h +++ b/tests/manual/boxplottester/customtablemodel.h diff --git a/tests/boxplottester/main.cpp b/tests/manual/boxplottester/main.cpp index 6d136669..6d136669 100644 --- a/tests/boxplottester/main.cpp +++ b/tests/manual/boxplottester/main.cpp diff --git a/tests/boxplottester/mainwidget.cpp b/tests/manual/boxplottester/mainwidget.cpp index 784512d3..784512d3 100644 --- a/tests/boxplottester/mainwidget.cpp +++ b/tests/manual/boxplottester/mainwidget.cpp diff --git a/tests/boxplottester/mainwidget.h b/tests/manual/boxplottester/mainwidget.h index cbb2cd38..cbb2cd38 100644 --- a/tests/boxplottester/mainwidget.h +++ b/tests/manual/boxplottester/mainwidget.h diff --git a/tests/boxplottester/pentool.cpp b/tests/manual/boxplottester/pentool.cpp index b827039f..b827039f 100644 --- a/tests/boxplottester/pentool.cpp +++ b/tests/manual/boxplottester/pentool.cpp diff --git a/tests/boxplottester/pentool.h b/tests/manual/boxplottester/pentool.h index 13b4064d..13b4064d 100644 --- a/tests/boxplottester/pentool.h +++ b/tests/manual/boxplottester/pentool.h diff --git a/tests/chartdesigner/brushwidget.cpp b/tests/manual/chartdesigner/brushwidget.cpp index 6e615001..6e615001 100644 --- a/tests/chartdesigner/brushwidget.cpp +++ b/tests/manual/chartdesigner/brushwidget.cpp diff --git a/tests/chartdesigner/brushwidget.h b/tests/manual/chartdesigner/brushwidget.h index 7f570cb5..7f570cb5 100644 --- a/tests/chartdesigner/brushwidget.h +++ b/tests/manual/chartdesigner/brushwidget.h diff --git a/tests/chartdesigner/chartdesigner.pro b/tests/manual/chartdesigner/chartdesigner.pro index 0594b37f..0594b37f 100644 --- a/tests/chartdesigner/chartdesigner.pro +++ b/tests/manual/chartdesigner/chartdesigner.pro diff --git a/tests/chartdesigner/engine.cpp b/tests/manual/chartdesigner/engine.cpp index b7ea9e93..b7ea9e93 100644 --- a/tests/chartdesigner/engine.cpp +++ b/tests/manual/chartdesigner/engine.cpp diff --git a/tests/chartdesigner/engine.h b/tests/manual/chartdesigner/engine.h index eef15dcf..eef15dcf 100644 --- a/tests/chartdesigner/engine.h +++ b/tests/manual/chartdesigner/engine.h diff --git a/tests/chartdesigner/main.cpp b/tests/manual/chartdesigner/main.cpp index 6b47caf5..6b47caf5 100644 --- a/tests/chartdesigner/main.cpp +++ b/tests/manual/chartdesigner/main.cpp diff --git a/tests/chartdesigner/mainwindow.cpp b/tests/manual/chartdesigner/mainwindow.cpp index 70588459..70588459 100644 --- a/tests/chartdesigner/mainwindow.cpp +++ b/tests/manual/chartdesigner/mainwindow.cpp diff --git a/tests/chartdesigner/mainwindow.h b/tests/manual/chartdesigner/mainwindow.h index d5ce5418..d5ce5418 100644 --- a/tests/chartdesigner/mainwindow.h +++ b/tests/manual/chartdesigner/mainwindow.h diff --git a/tests/chartdesigner/objectinspectorwidget.cpp b/tests/manual/chartdesigner/objectinspectorwidget.cpp index 64a89854..64a89854 100644 --- a/tests/chartdesigner/objectinspectorwidget.cpp +++ b/tests/manual/chartdesigner/objectinspectorwidget.cpp diff --git a/tests/chartdesigner/objectinspectorwidget.h b/tests/manual/chartdesigner/objectinspectorwidget.h index ba9deed4..ba9deed4 100644 --- a/tests/chartdesigner/objectinspectorwidget.h +++ b/tests/manual/chartdesigner/objectinspectorwidget.h diff --git a/tests/chartdesigner/penwidget.cpp b/tests/manual/chartdesigner/penwidget.cpp index e2b22f64..e2b22f64 100644 --- a/tests/chartdesigner/penwidget.cpp +++ b/tests/manual/chartdesigner/penwidget.cpp diff --git a/tests/chartdesigner/penwidget.h b/tests/manual/chartdesigner/penwidget.h index fe9998c0..fe9998c0 100644 --- a/tests/chartdesigner/penwidget.h +++ b/tests/manual/chartdesigner/penwidget.h diff --git a/tests/chartviewer/charts.h b/tests/manual/chartviewer/charts.h index 2d59a885..2d59a885 100644 --- a/tests/chartviewer/charts.h +++ b/tests/manual/chartviewer/charts.h diff --git a/tests/chartviewer/charts/axis/barcategoryaxisx.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp index 250576bb..250576bb 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisx.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisx.cpp diff --git a/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp index 516d0f49..516d0f49 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisxlogy.cpp diff --git a/tests/chartviewer/charts/axis/barcategoryaxisy.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp index d20442b2..d20442b2 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisy.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisy.cpp diff --git a/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp b/tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp index f38cf931..f38cf931 100644 --- a/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp +++ b/tests/manual/chartviewer/charts/axis/barcategoryaxisylogx.cpp diff --git a/tests/chartviewer/charts/axis/categoryaxis.cpp b/tests/manual/chartviewer/charts/axis/categoryaxis.cpp index dc025f6d..dc025f6d 100644 --- a/tests/chartviewer/charts/axis/categoryaxis.cpp +++ b/tests/manual/chartviewer/charts/axis/categoryaxis.cpp diff --git a/tests/chartviewer/charts/axis/datetimeaxisx.cpp b/tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp index 99154bbc..99154bbc 100644 --- a/tests/chartviewer/charts/axis/datetimeaxisx.cpp +++ b/tests/manual/chartviewer/charts/axis/datetimeaxisx.cpp diff --git a/tests/chartviewer/charts/axis/datetimeaxisy.cpp b/tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp index 0234eb6a..0234eb6a 100644 --- a/tests/chartviewer/charts/axis/datetimeaxisy.cpp +++ b/tests/manual/chartviewer/charts/axis/datetimeaxisy.cpp diff --git a/tests/chartviewer/charts/axis/logvalueaxisx.cpp b/tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp index d60a1f18..d60a1f18 100644 --- a/tests/chartviewer/charts/axis/logvalueaxisx.cpp +++ b/tests/manual/chartviewer/charts/axis/logvalueaxisx.cpp diff --git a/tests/chartviewer/charts/axis/logvalueaxisy.cpp b/tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp index cc631515..cc631515 100644 --- a/tests/chartviewer/charts/axis/logvalueaxisy.cpp +++ b/tests/manual/chartviewer/charts/axis/logvalueaxisy.cpp diff --git a/tests/chartviewer/charts/axis/valueaxis.cpp b/tests/manual/chartviewer/charts/axis/valueaxis.cpp index 9bbfb0c9..9bbfb0c9 100644 --- a/tests/chartviewer/charts/axis/valueaxis.cpp +++ b/tests/manual/chartviewer/charts/axis/valueaxis.cpp diff --git a/tests/chartviewer/charts/barseries/horizontalbarchart.cpp b/tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp index 3cc1887e..3cc1887e 100644 --- a/tests/chartviewer/charts/barseries/horizontalbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/horizontalbarchart.cpp diff --git a/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp b/tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp index 71cd14f0..71cd14f0 100644 --- a/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/horizontalpercentbarchart.cpp diff --git a/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp b/tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp index 7dab6791..7dab6791 100644 --- a/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/horizontalstackedbarchart.cpp diff --git a/tests/chartviewer/charts/barseries/verticalbarchart.cpp b/tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp index d7dbbaa0..d7dbbaa0 100644 --- a/tests/chartviewer/charts/barseries/verticalbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/verticalbarchart.cpp diff --git a/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp b/tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp index e219ebc0..e219ebc0 100644 --- a/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/verticalpercentbarchart.cpp diff --git a/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp b/tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp index 84986acc..84986acc 100644 --- a/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp +++ b/tests/manual/chartviewer/charts/barseries/verticalstackedbarchart.cpp diff --git a/tests/chartviewer/charts/charts.pri b/tests/manual/chartviewer/charts/charts.pri index 5bef427f..5bef427f 100644 --- a/tests/chartviewer/charts/charts.pri +++ b/tests/manual/chartviewer/charts/charts.pri diff --git a/tests/chartviewer/charts/domain/barlogx.cpp b/tests/manual/chartviewer/charts/domain/barlogx.cpp index 32a36755..32a36755 100644 --- a/tests/chartviewer/charts/domain/barlogx.cpp +++ b/tests/manual/chartviewer/charts/domain/barlogx.cpp diff --git a/tests/chartviewer/charts/domain/barlogy.cpp b/tests/manual/chartviewer/charts/domain/barlogy.cpp index e8c36acd..e8c36acd 100644 --- a/tests/chartviewer/charts/domain/barlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/barlogy.cpp diff --git a/tests/chartviewer/charts/domain/barpercentlogx.cpp b/tests/manual/chartviewer/charts/domain/barpercentlogx.cpp index ce61c5cc..ce61c5cc 100644 --- a/tests/chartviewer/charts/domain/barpercentlogx.cpp +++ b/tests/manual/chartviewer/charts/domain/barpercentlogx.cpp diff --git a/tests/chartviewer/charts/domain/barpercentlogy.cpp b/tests/manual/chartviewer/charts/domain/barpercentlogy.cpp index cf10e76c..cf10e76c 100644 --- a/tests/chartviewer/charts/domain/barpercentlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/barpercentlogy.cpp diff --git a/tests/chartviewer/charts/domain/barstackedlogx.cpp b/tests/manual/chartviewer/charts/domain/barstackedlogx.cpp index e10445f1..e10445f1 100644 --- a/tests/chartviewer/charts/domain/barstackedlogx.cpp +++ b/tests/manual/chartviewer/charts/domain/barstackedlogx.cpp diff --git a/tests/chartviewer/charts/domain/barstackedlogy.cpp b/tests/manual/chartviewer/charts/domain/barstackedlogy.cpp index 114252d9..114252d9 100644 --- a/tests/chartviewer/charts/domain/barstackedlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/barstackedlogy.cpp diff --git a/tests/chartviewer/charts/domain/linelogxlogy.cpp b/tests/manual/chartviewer/charts/domain/linelogxlogy.cpp index dea1ef04..dea1ef04 100644 --- a/tests/chartviewer/charts/domain/linelogxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/linelogxlogy.cpp diff --git a/tests/chartviewer/charts/domain/linelogxy.cpp b/tests/manual/chartviewer/charts/domain/linelogxy.cpp index ca0d7cf1..ca0d7cf1 100644 --- a/tests/chartviewer/charts/domain/linelogxy.cpp +++ b/tests/manual/chartviewer/charts/domain/linelogxy.cpp diff --git a/tests/chartviewer/charts/domain/linexlogy.cpp b/tests/manual/chartviewer/charts/domain/linexlogy.cpp index 16ec254d..16ec254d 100644 --- a/tests/chartviewer/charts/domain/linexlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/linexlogy.cpp diff --git a/tests/chartviewer/charts/domain/scatterlogxlogy.cpp b/tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp index c87def5c..c87def5c 100644 --- a/tests/chartviewer/charts/domain/scatterlogxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/scatterlogxlogy.cpp diff --git a/tests/chartviewer/charts/domain/scatterlogxy.cpp b/tests/manual/chartviewer/charts/domain/scatterlogxy.cpp index d7603616..d7603616 100644 --- a/tests/chartviewer/charts/domain/scatterlogxy.cpp +++ b/tests/manual/chartviewer/charts/domain/scatterlogxy.cpp diff --git a/tests/chartviewer/charts/domain/scatterxlogy.cpp b/tests/manual/chartviewer/charts/domain/scatterxlogy.cpp index bc09bf66..bc09bf66 100644 --- a/tests/chartviewer/charts/domain/scatterxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/scatterxlogy.cpp diff --git a/tests/chartviewer/charts/domain/splinelogxlogy.cpp b/tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp index b87a4bb7..b87a4bb7 100644 --- a/tests/chartviewer/charts/domain/splinelogxlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/splinelogxlogy.cpp diff --git a/tests/chartviewer/charts/domain/splinelogxy.cpp b/tests/manual/chartviewer/charts/domain/splinelogxy.cpp index 0354aadf..0354aadf 100644 --- a/tests/chartviewer/charts/domain/splinelogxy.cpp +++ b/tests/manual/chartviewer/charts/domain/splinelogxy.cpp diff --git a/tests/chartviewer/charts/domain/splinexlogy.cpp b/tests/manual/chartviewer/charts/domain/splinexlogy.cpp index 6a6d8210..6a6d8210 100644 --- a/tests/chartviewer/charts/domain/splinexlogy.cpp +++ b/tests/manual/chartviewer/charts/domain/splinexlogy.cpp diff --git a/tests/chartviewer/charts/font/font.cpp b/tests/manual/chartviewer/charts/font/font.cpp index b544ca94..b544ca94 100644 --- a/tests/chartviewer/charts/font/font.cpp +++ b/tests/manual/chartviewer/charts/font/font.cpp diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp index 960b9c6a..960b9c6a 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis.cpp diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp index 91e1d7a3..91e1d7a3 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis2.cpp diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp index 3d25169e..3d25169e 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis3.cpp diff --git a/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp index 5a69ec74..5a69ec74 100644 --- a/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivalueaxis4.cpp diff --git a/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp b/tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp index 300a0f4b..300a0f4b 100644 --- a/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp +++ b/tests/manual/chartviewer/charts/multiaxis/multivaluebaraxis.cpp diff --git a/tests/chartviewer/charts/pieseries/donutchart.cpp b/tests/manual/chartviewer/charts/pieseries/donutchart.cpp index 50026ecf..50026ecf 100644 --- a/tests/chartviewer/charts/pieseries/donutchart.cpp +++ b/tests/manual/chartviewer/charts/pieseries/donutchart.cpp diff --git a/tests/chartviewer/charts/pieseries/piechart.cpp b/tests/manual/chartviewer/charts/pieseries/piechart.cpp index f88e4657..f88e4657 100644 --- a/tests/chartviewer/charts/pieseries/piechart.cpp +++ b/tests/manual/chartviewer/charts/pieseries/piechart.cpp diff --git a/tests/chartviewer/charts/size/sizecharts.cpp b/tests/manual/chartviewer/charts/size/sizecharts.cpp index 6be59159..6be59159 100644 --- a/tests/chartviewer/charts/size/sizecharts.cpp +++ b/tests/manual/chartviewer/charts/size/sizecharts.cpp diff --git a/tests/chartviewer/charts/xyseries/areachart.cpp b/tests/manual/chartviewer/charts/xyseries/areachart.cpp index dc869c3b..dc869c3b 100644 --- a/tests/chartviewer/charts/xyseries/areachart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/areachart.cpp diff --git a/tests/chartviewer/charts/xyseries/linechart.cpp b/tests/manual/chartviewer/charts/xyseries/linechart.cpp index 4ef39e4c..4ef39e4c 100644 --- a/tests/chartviewer/charts/xyseries/linechart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/linechart.cpp diff --git a/tests/chartviewer/charts/xyseries/scatterchart.cpp b/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp index d49e7f49..d49e7f49 100644 --- a/tests/chartviewer/charts/xyseries/scatterchart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/scatterchart.cpp diff --git a/tests/chartviewer/charts/xyseries/splinechart.cpp b/tests/manual/chartviewer/charts/xyseries/splinechart.cpp index 38ffe340..38ffe340 100644 --- a/tests/chartviewer/charts/xyseries/splinechart.cpp +++ b/tests/manual/chartviewer/charts/xyseries/splinechart.cpp diff --git a/tests/chartviewer/chartviewer.pro b/tests/manual/chartviewer/chartviewer.pro index c306252a..693c1eab 100644 --- a/tests/chartviewer/chartviewer.pro +++ b/tests/manual/chartviewer/chartviewer.pro @@ -1,4 +1,6 @@ -!include( ../tests.pri ):error( "Couldn't find the tests.pri file!" ) +!include( ../../tests.pri ) { + error( "Couldn't find the test.pri file!" ) +} include(charts/charts.pri) TARGET = chartviewer QT += opengl diff --git a/tests/chartviewer/grid.cpp b/tests/manual/chartviewer/grid.cpp index f1619ab0..f1619ab0 100644 --- a/tests/chartviewer/grid.cpp +++ b/tests/manual/chartviewer/grid.cpp diff --git a/tests/chartviewer/grid.h b/tests/manual/chartviewer/grid.h index a519503d..a519503d 100644 --- a/tests/chartviewer/grid.h +++ b/tests/manual/chartviewer/grid.h diff --git a/tests/chartviewer/main.cpp b/tests/manual/chartviewer/main.cpp index 6a267632..6a267632 100644 --- a/tests/chartviewer/main.cpp +++ b/tests/manual/chartviewer/main.cpp diff --git a/tests/chartviewer/model.h b/tests/manual/chartviewer/model.h index 0400a631..0400a631 100644 --- a/tests/chartviewer/model.h +++ b/tests/manual/chartviewer/model.h diff --git a/tests/chartviewer/view.cpp b/tests/manual/chartviewer/view.cpp index 67ef7918..67ef7918 100644 --- a/tests/chartviewer/view.cpp +++ b/tests/manual/chartviewer/view.cpp diff --git a/tests/chartviewer/view.h b/tests/manual/chartviewer/view.h index c9c80860..c9c80860 100644 --- a/tests/chartviewer/view.h +++ b/tests/manual/chartviewer/view.h diff --git a/tests/chartviewer/window.cpp b/tests/manual/chartviewer/window.cpp index d535adf6..d535adf6 100644 --- a/tests/chartviewer/window.cpp +++ b/tests/manual/chartviewer/window.cpp diff --git a/tests/chartviewer/window.h b/tests/manual/chartviewer/window.h index 94d954ee..94d954ee 100644 --- a/tests/chartviewer/window.h +++ b/tests/manual/chartviewer/window.h diff --git a/tests/chartwidgettest/chartwidgettest.pro b/tests/manual/chartwidgettest/chartwidgettest.pro index db8416ba..3f4cdbb0 100644 --- a/tests/chartwidgettest/chartwidgettest.pro +++ b/tests/manual/chartwidgettest/chartwidgettest.pro @@ -1,4 +1,4 @@ -!include( ../tests.pri ) { +!include( ../../tests.pri ) { error( "Couldn't find the test.pri file!" ) } diff --git a/tests/chartwidgettest/dataseriedialog.cpp b/tests/manual/chartwidgettest/dataseriedialog.cpp index 622e975c..41ca56d9 100644 --- a/tests/chartwidgettest/dataseriedialog.cpp +++ b/tests/manual/chartwidgettest/dataseriedialog.cpp @@ -1,189 +1,189 @@ -/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "dataseriedialog.h"
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QRadioButton>
-#include <QtWidgets/QLabel>
-#include <QtCore/QDebug>
-
-DataSerieDialog::DataSerieDialog(QWidget *parent) :
- QDialog(parent)
-{
- QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal);
- QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok);
- connect(b, SIGNAL(clicked()), this, SLOT(accept()));
- b = addSeriesBox->addButton(QDialogButtonBox::Cancel);
- connect(b, SIGNAL(clicked()), this, SLOT(reject()));
-
- QGridLayout *grid = new QGridLayout();
-
- m_seriesTypeSelector = seriesTypeSelector();
- m_columnCountSelector = columnCountSelector();
- m_rowCountSelector = rowCountSelector();
- m_dataCharacteristicsSelector = dataCharacteristicsSelector();
-
- grid->addWidget(m_seriesTypeSelector, 0, 0);
- grid->addWidget(m_columnCountSelector, 0, 1);
- grid->addWidget(m_rowCountSelector, 1, 1);
- grid->addWidget(m_dataCharacteristicsSelector, 1, 0);
- m_labelsSelector = new QCheckBox("Labels defined");
- m_labelsSelector->setChecked(true);
- grid->addWidget(m_labelsSelector, 2, 0);
- grid->addWidget(addSeriesBox, 3, 1);
-
- setLayout(grid);
-}
-
-QGroupBox *DataSerieDialog::seriesTypeSelector()
-{
- QVBoxLayout *layout = new QVBoxLayout();
-
- QRadioButton *line = new QRadioButton("Line");
- line->setChecked(true);
- layout->addWidget(line);
- layout->addWidget(new QRadioButton("Area"));
- layout->addWidget(new QRadioButton("Pie"));
- layout->addWidget(new QRadioButton("Bar"));
- layout->addWidget(new QRadioButton("Stacked bar"));
- layout->addWidget(new QRadioButton("Percent bar"));
- layout->addWidget(new QRadioButton("Scatter"));
- layout->addWidget(new QRadioButton("Spline"));
-
- QGroupBox *groupBox = new QGroupBox("Series type");
- groupBox->setLayout(layout);
- selectRadio(groupBox, 0);
-
- return groupBox;
-}
-
-QGroupBox *DataSerieDialog::columnCountSelector()
-{
- QVBoxLayout *layout = new QVBoxLayout();
-
- QRadioButton *radio = new QRadioButton("1");
- radio->setChecked(true);
- layout->addWidget(radio);
- layout->addWidget(new QRadioButton("2"));
- layout->addWidget(new QRadioButton("3"));
- layout->addWidget(new QRadioButton("4"));
- layout->addWidget(new QRadioButton("5"));
- layout->addWidget(new QRadioButton("8"));
- layout->addWidget(new QRadioButton("10"));
- layout->addWidget(new QRadioButton("100"));
-
- QGroupBox *groupBox = new QGroupBox("Column count");
- groupBox->setLayout(layout);
- selectRadio(groupBox, 0);
-
- return groupBox;
-}
-
-QGroupBox *DataSerieDialog::rowCountSelector()
-{
- QVBoxLayout *layout = new QVBoxLayout();
-
- layout->addWidget(new QRadioButton("1"));
- QRadioButton *radio = new QRadioButton("10");
- radio->setChecked(true);
- layout->addWidget(radio);
- layout->addWidget(new QRadioButton("50"));
- layout->addWidget(new QRadioButton("100"));
- layout->addWidget(new QRadioButton("1000"));
- layout->addWidget(new QRadioButton("10000"));
- layout->addWidget(new QRadioButton("100000"));
- layout->addWidget(new QRadioButton("1000000"));
-
- QGroupBox *groupBox = new QGroupBox("Row count");
- groupBox->setLayout(layout);
- selectRadio(groupBox, 0);
-
- return groupBox;
-}
-
-QGroupBox *DataSerieDialog::dataCharacteristicsSelector()
-{
- QVBoxLayout *layout = new QVBoxLayout();
-
- layout->addWidget(new QRadioButton("Linear"));
- layout->addWidget(new QRadioButton("Constant"));
- layout->addWidget(new QRadioButton("Random"));
- layout->addWidget(new QRadioButton("Sin"));
- layout->addWidget(new QRadioButton("Sin + random"));
-
- QGroupBox *groupBox = new QGroupBox("Data Characteristics");
- groupBox->setLayout(layout);
- selectRadio(groupBox, 0);
-
- return groupBox;
-}
-
-void DataSerieDialog::accept()
-{
- accepted(radioSelection(m_seriesTypeSelector),
- radioSelection(m_columnCountSelector).toInt(),
- radioSelection(m_rowCountSelector).toInt(),
- radioSelection(m_dataCharacteristicsSelector),
- m_labelsSelector->isChecked());
- QDialog::accept();
-}
-
-void DataSerieDialog::selectRadio(QGroupBox *groupBox, int defaultSelection)
-{
- QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
- Q_ASSERT(layout);
- Q_ASSERT(layout->count());
-
- QLayoutItem *item = 0;
- if (defaultSelection == -1) {
- item = layout->itemAt(0);
- } else if (layout->count() > defaultSelection) {
- item = layout->itemAt(defaultSelection);
- }
- Q_ASSERT(item);
- QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
- Q_ASSERT(radio);
- radio->setChecked(true);
-}
-
-QString DataSerieDialog::radioSelection(QGroupBox *groupBox)
-{
- QString selection;
- QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout());
- Q_ASSERT(layout);
-
- for (int i(0); i < layout->count(); i++) {
- QLayoutItem *item = layout->itemAt(i);
- Q_ASSERT(item);
- QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget());
- Q_ASSERT(radio);
- if (radio->isChecked()) {
- selection = radio->text();
- break;
- }
- }
-
- qDebug() << "radioSelection: " << selection;
- return selection;
-}
+/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dataseriedialog.h" +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QRadioButton> +#include <QtWidgets/QLabel> +#include <QtCore/QDebug> + +DataSerieDialog::DataSerieDialog(QWidget *parent) : + QDialog(parent) +{ + QDialogButtonBox *addSeriesBox = new QDialogButtonBox(Qt::Horizontal); + QPushButton *b = addSeriesBox->addButton(QDialogButtonBox::Ok); + connect(b, SIGNAL(clicked()), this, SLOT(accept())); + b = addSeriesBox->addButton(QDialogButtonBox::Cancel); + connect(b, SIGNAL(clicked()), this, SLOT(reject())); + + QGridLayout *grid = new QGridLayout(); + + m_seriesTypeSelector = seriesTypeSelector(); + m_columnCountSelector = columnCountSelector(); + m_rowCountSelector = rowCountSelector(); + m_dataCharacteristicsSelector = dataCharacteristicsSelector(); + + grid->addWidget(m_seriesTypeSelector, 0, 0); + grid->addWidget(m_columnCountSelector, 0, 1); + grid->addWidget(m_rowCountSelector, 1, 1); + grid->addWidget(m_dataCharacteristicsSelector, 1, 0); + m_labelsSelector = new QCheckBox("Labels defined"); + m_labelsSelector->setChecked(true); + grid->addWidget(m_labelsSelector, 2, 0); + grid->addWidget(addSeriesBox, 3, 1); + + setLayout(grid); +} + +QGroupBox *DataSerieDialog::seriesTypeSelector() +{ + QVBoxLayout *layout = new QVBoxLayout(); + + QRadioButton *line = new QRadioButton("Line"); + line->setChecked(true); + layout->addWidget(line); + layout->addWidget(new QRadioButton("Area")); + layout->addWidget(new QRadioButton("Pie")); + layout->addWidget(new QRadioButton("Bar")); + layout->addWidget(new QRadioButton("Stacked bar")); + layout->addWidget(new QRadioButton("Percent bar")); + layout->addWidget(new QRadioButton("Scatter")); + layout->addWidget(new QRadioButton("Spline")); + + QGroupBox *groupBox = new QGroupBox("Series type"); + groupBox->setLayout(layout); + selectRadio(groupBox, 0); + + return groupBox; +} + +QGroupBox *DataSerieDialog::columnCountSelector() +{ + QVBoxLayout *layout = new QVBoxLayout(); + + QRadioButton *radio = new QRadioButton("1"); + radio->setChecked(true); + layout->addWidget(radio); + layout->addWidget(new QRadioButton("2")); + layout->addWidget(new QRadioButton("3")); + layout->addWidget(new QRadioButton("4")); + layout->addWidget(new QRadioButton("5")); + layout->addWidget(new QRadioButton("8")); + layout->addWidget(new QRadioButton("10")); + layout->addWidget(new QRadioButton("100")); + + QGroupBox *groupBox = new QGroupBox("Column count"); + groupBox->setLayout(layout); + selectRadio(groupBox, 0); + + return groupBox; +} + +QGroupBox *DataSerieDialog::rowCountSelector() +{ + QVBoxLayout *layout = new QVBoxLayout(); + + layout->addWidget(new QRadioButton("1")); + QRadioButton *radio = new QRadioButton("10"); + radio->setChecked(true); + layout->addWidget(radio); + layout->addWidget(new QRadioButton("50")); + layout->addWidget(new QRadioButton("100")); + layout->addWidget(new QRadioButton("1000")); + layout->addWidget(new QRadioButton("10000")); + layout->addWidget(new QRadioButton("100000")); + layout->addWidget(new QRadioButton("1000000")); + + QGroupBox *groupBox = new QGroupBox("Row count"); + groupBox->setLayout(layout); + selectRadio(groupBox, 0); + + return groupBox; +} + +QGroupBox *DataSerieDialog::dataCharacteristicsSelector() +{ + QVBoxLayout *layout = new QVBoxLayout(); + + layout->addWidget(new QRadioButton("Linear")); + layout->addWidget(new QRadioButton("Constant")); + layout->addWidget(new QRadioButton("Random")); + layout->addWidget(new QRadioButton("Sin")); + layout->addWidget(new QRadioButton("Sin + random")); + + QGroupBox *groupBox = new QGroupBox("Data Characteristics"); + groupBox->setLayout(layout); + selectRadio(groupBox, 0); + + return groupBox; +} + +void DataSerieDialog::accept() +{ + accepted(radioSelection(m_seriesTypeSelector), + radioSelection(m_columnCountSelector).toInt(), + radioSelection(m_rowCountSelector).toInt(), + radioSelection(m_dataCharacteristicsSelector), + m_labelsSelector->isChecked()); + QDialog::accept(); +} + +void DataSerieDialog::selectRadio(QGroupBox *groupBox, int defaultSelection) +{ + QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout()); + Q_ASSERT(layout); + Q_ASSERT(layout->count()); + + QLayoutItem *item = 0; + if (defaultSelection == -1) { + item = layout->itemAt(0); + } else if (layout->count() > defaultSelection) { + item = layout->itemAt(defaultSelection); + } + Q_ASSERT(item); + QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget()); + Q_ASSERT(radio); + radio->setChecked(true); +} + +QString DataSerieDialog::radioSelection(QGroupBox *groupBox) +{ + QString selection; + QVBoxLayout *layout = qobject_cast<QVBoxLayout *>(groupBox->layout()); + Q_ASSERT(layout); + + for (int i(0); i < layout->count(); i++) { + QLayoutItem *item = layout->itemAt(i); + Q_ASSERT(item); + QRadioButton *radio = qobject_cast<QRadioButton *>(item->widget()); + Q_ASSERT(radio); + if (radio->isChecked()) { + selection = radio->text(); + break; + } + } + + qDebug() << "radioSelection: " << selection; + return selection; +} diff --git a/tests/chartwidgettest/dataseriedialog.h b/tests/manual/chartwidgettest/dataseriedialog.h index 9fc8cf7c..5c0ee483 100644 --- a/tests/chartwidgettest/dataseriedialog.h +++ b/tests/manual/chartwidgettest/dataseriedialog.h @@ -1,55 +1,55 @@ -/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef DATASERIEDIALOG_H
-#define DATASERIEDIALOG_H
-
-#include <QtWidgets/QDialog>
-
-class QGroupBox;
-class QCheckBox;
-
-class DataSerieDialog : public QDialog
-{
- Q_OBJECT
-public:
- explicit DataSerieDialog(QWidget *parent = 0);
-
-signals:
- void accepted(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsDefined);
-
-public slots:
- void accept();
-
-private:
- QGroupBox *seriesTypeSelector();
- QGroupBox *columnCountSelector();
- QGroupBox *rowCountSelector();
- QGroupBox *dataCharacteristicsSelector();
- void selectRadio(QGroupBox *groupBox, int defaultSelection);
- QString radioSelection(QGroupBox *groupBox);
- QGroupBox *m_seriesTypeSelector;
- QGroupBox *m_columnCountSelector;
- QGroupBox *m_rowCountSelector;
- QCheckBox *m_labelsSelector;
- QGroupBox *m_dataCharacteristicsSelector;
-};
-
-#endif // DATASERIEDIALOG_H
+/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DATASERIEDIALOG_H +#define DATASERIEDIALOG_H + +#include <QtWidgets/QDialog> + +class QGroupBox; +class QCheckBox; + +class DataSerieDialog : public QDialog +{ + Q_OBJECT +public: + explicit DataSerieDialog(QWidget *parent = 0); + +signals: + void accepted(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsDefined); + +public slots: + void accept(); + +private: + QGroupBox *seriesTypeSelector(); + QGroupBox *columnCountSelector(); + QGroupBox *rowCountSelector(); + QGroupBox *dataCharacteristicsSelector(); + void selectRadio(QGroupBox *groupBox, int defaultSelection); + QString radioSelection(QGroupBox *groupBox); + QGroupBox *m_seriesTypeSelector; + QGroupBox *m_columnCountSelector; + QGroupBox *m_rowCountSelector; + QCheckBox *m_labelsSelector; + QGroupBox *m_dataCharacteristicsSelector; +}; + +#endif // DATASERIEDIALOG_H diff --git a/tests/chartwidgettest/main.cpp b/tests/manual/chartwidgettest/main.cpp index 6d136669..6d136669 100644 --- a/tests/chartwidgettest/main.cpp +++ b/tests/manual/chartwidgettest/main.cpp diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index eb263f90..97b1e792 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -1,380 +1,380 @@ -/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "mainwidget.h"
-#include "dataseriedialog.h"
-#include <QtCharts/QChartView>
-#include <QtCharts/QPieSeries>
-#include <QtCharts/QScatterSeries>
-#include <QtCharts/QLineSeries>
-#include <QtCharts/QAreaSeries>
-#include <QtCharts/QSplineSeries>
-#include <QtCharts/QBarSet>
-#include <QtCharts/QBarSeries>
-#include <QtCharts/QStackedBarSeries>
-#include <QtCharts/QPercentBarSeries>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QMessageBox>
-#include <cmath>
-#include <QtCore/QDebug>
-#include <QtGui/QStandardItemModel>
-#include <QtCharts/QBarCategoryAxis>
-#include <QtOpenGL/QGLWidget>
-
-QT_CHARTS_USE_NAMESPACE
-
-MainWidget::MainWidget(QWidget *parent) :
- QWidget(parent),
- m_addSerieDialog(0),
- m_chart(0)
-{
- m_chart = new QChart();
-
- // Grid layout for the controls for configuring the chart widget
- QGridLayout *grid = new QGridLayout();
- QPushButton *addSeriesButton = new QPushButton("Add series");
- connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
- grid->addWidget(addSeriesButton, 0, 1);
- initBackroundCombo(grid);
- initScaleControls(grid);
- initThemeCombo(grid);
- initCheckboxes(grid);
-
- // add row with empty label to make all the other rows static
- grid->addWidget(new QLabel(""), grid->rowCount(), 0);
- grid->setRowStretch(grid->rowCount() - 1, 1);
-
- // Create chart view with the chart
- m_chartView = new QChartView(m_chart, this);
- m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
-
- // Another grid layout as a main layout
- QGridLayout *mainLayout = new QGridLayout();
- mainLayout->addLayout(grid, 0, 0);
- mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
- setLayout(mainLayout);
-}
-
-// Combo box for selecting the chart's background
-void MainWidget::initBackroundCombo(QGridLayout *grid)
-{
- QComboBox *backgroundCombo = new QComboBox(this);
- backgroundCombo->addItem("Color");
- backgroundCombo->addItem("Gradient");
- backgroundCombo->addItem("Image");
- connect(backgroundCombo, SIGNAL(currentIndexChanged(int)),
- this, SLOT(backgroundChanged(int)));
-
- grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0);
- grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1);
-}
-
-// Scale related controls (auto-scale vs. manual min-max values)
-void MainWidget::initScaleControls(QGridLayout *grid)
-{
- m_autoScaleCheck = new QCheckBox("Automatic scaling");
- connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int)));
- // Allow setting also non-sense values (like -2147483648 and 2147483647)
- m_xMinSpin = new QSpinBox();
- m_xMinSpin->setMinimum(INT_MIN);
- m_xMinSpin->setMaximum(INT_MAX);
- m_xMinSpin->setValue(0);
- connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int)));
- m_xMaxSpin = new QSpinBox();
- m_xMaxSpin->setMinimum(INT_MIN);
- m_xMaxSpin->setMaximum(INT_MAX);
- m_xMaxSpin->setValue(10);
- connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int)));
- m_yMinSpin = new QSpinBox();
- m_yMinSpin->setMinimum(INT_MIN);
- m_yMinSpin->setMaximum(INT_MAX);
- m_yMinSpin->setValue(0);
- connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int)));
- m_yMaxSpin = new QSpinBox();
- m_yMaxSpin->setMinimum(INT_MIN);
- m_yMaxSpin->setMaximum(INT_MAX);
- m_yMaxSpin->setValue(10);
- connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int)));
-
- grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0);
- grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0);
- grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1);
- grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0);
- grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1);
- grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0);
- grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1);
- grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0);
- grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1);
-
- m_autoScaleCheck->setChecked(true);
-}
-
-// Combo box for selecting theme
-void MainWidget::initThemeCombo(QGridLayout *grid)
-{
- QComboBox *chartTheme = new QComboBox();
- chartTheme->addItem("Default");
- chartTheme->addItem("Light");
- chartTheme->addItem("Blue Cerulean");
- chartTheme->addItem("Dark");
- chartTheme->addItem("Brown Sand");
- chartTheme->addItem("Blue NCS");
- chartTheme->addItem("High Contrast");
- chartTheme->addItem("Blue Icy");
- chartTheme->addItem("Qt");
- connect(chartTheme, SIGNAL(currentIndexChanged(int)),
- this, SLOT(changeChartTheme(int)));
- grid->addWidget(new QLabel("Chart theme:"), 8, 0);
- grid->addWidget(chartTheme, 8, 1);
-}
-
-// Different check boxes for customizing chart
-void MainWidget::initCheckboxes(QGridLayout *grid)
-{
- // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off
- QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom");
-// connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool)));
- zoomCheckBox->setChecked(true);
- grid->addWidget(zoomCheckBox, grid->rowCount(), 0);
-
- QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias");
- connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool)));
- aliasCheckBox->setChecked(false);
- grid->addWidget(aliasCheckBox, grid->rowCount(), 0);
-
- QCheckBox *openGLCheckBox = new QCheckBox("Use QGLWidget");
- connect(openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(openGLToggled(bool)));
- openGLCheckBox->setChecked(false);
- grid->addWidget(openGLCheckBox, grid->rowCount(), 0);
-}
-
-void MainWidget::antiAliasToggled(bool enabled)
-{
- m_chartView->setRenderHint(QPainter::Antialiasing, enabled);
-}
-
-void MainWidget::openGLToggled(bool enabled)
-{
- if (enabled) {
- QGLFormat f = QGLFormat::defaultFormat();
- f.setSampleBuffers(true);
- f.setSamples(4);
- QGLFormat::setDefaultFormat(f);
- QGLWidget *g = new QGLWidget();
- m_chartView->setViewport(g);
- } else {
- m_chartView->setViewport(0);
- }
-}
-
-void MainWidget::addSeries()
-{
- if (!m_addSerieDialog) {
- m_addSerieDialog = new DataSerieDialog(this);
- connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)),
- this, SLOT(addSeries(QString,int,int,QString,bool)));
- }
- m_addSerieDialog->exec();
-}
-
-QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics)
-{
- QList<RealList> testData;
- for (int j(0); j < columnCount; j++) {
- QList <qreal> newColumn;
- for (int i(0); i < rowCount; i++) {
- if (dataCharacteristics == "Sin") {
- newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100));
- } else if (dataCharacteristics == "Sin + random") {
- newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5));
- } else if (dataCharacteristics == "Random") {
- newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX);
- } else if (dataCharacteristics == "Linear") {
- //newColumn.append(i * (j + 1.0));
- // TODO: temporary hack to make pie work; prevent zero values:
- newColumn.append(i * (j + 1.0) + 0.1);
- } else { // "constant"
- newColumn.append((j + 1.0));
- }
- }
- testData.append(newColumn);
- }
- return testData;
-}
-
-QStringList MainWidget::generateLabels(int count)
-{
- QStringList result;
- for (int i(0); i < count; i++)
- result.append("label" + QString::number(i));
- return result;
-}
-
-void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled)
-{
- qDebug() << "addSeries: " << seriesName
- << " columnCount: " << columnCount
- << " rowCount: " << rowCount
- << " dataCharacteristics: " << dataCharacteristics
- << " labels enabled: " << labelsEnabled;
- m_defaultSeriesName = seriesName;
-
- QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics);
-
- // Line series and scatter series use similar data
- if (seriesName == "Line") {
- for (int j(0); j < data.count(); j ++) {
- QList<qreal> column = data.at(j);
- QLineSeries *series = new QLineSeries();
- series->setName("line" + QString::number(j));
- for (int i(0); i < column.count(); i++)
- series->append(i, column.at(i));
- m_chart->addSeries(series);
- }
- } else if (seriesName == "Area") {
- // TODO: lower series for the area?
- for (int j(0); j < data.count(); j ++) {
- QList<qreal> column = data.at(j);
- QLineSeries *lineSeries = new QLineSeries();
- for (int i(0); i < column.count(); i++)
- lineSeries->append(i, column.at(i));
- QAreaSeries *areaSeries = new QAreaSeries(lineSeries);
- areaSeries->setName("area" + QString::number(j));
- m_chart->addSeries(areaSeries);
- }
- } else if (seriesName == "Scatter") {
- for (int j(0); j < data.count(); j++) {
- QList<qreal> column = data.at(j);
- QScatterSeries *series = new QScatterSeries();
- series->setName("scatter" + QString::number(j));
- for (int i(0); i < column.count(); i++)
- series->append(i, column.at(i));
- m_chart->addSeries(series);
- }
- } else if (seriesName == "Pie") {
- QStringList labels = generateLabels(rowCount);
- for (int j(0); j < data.count(); j++) {
- QPieSeries *series = new QPieSeries();
- QList<qreal> column = data.at(j);
- for (int i(0); i < column.count(); i++)
- series->append(labels.at(i), column.at(i));
- m_chart->addSeries(series);
- }
- } else if (seriesName == "Bar"
- || seriesName == "Stacked bar"
- || seriesName == "Percent bar") {
- QStringList category;
- QStringList labels = generateLabels(rowCount);
- foreach (QString label, labels)
- category << label;
- QAbstractBarSeries* series = 0;
- if (seriesName == "Bar") {
- series = new QBarSeries(this);
- QBarCategoryAxis* axis = new QBarCategoryAxis();
- axis->append(category);
- m_chart->setAxisX(axis,series);
- } else if (seriesName == "Stacked bar") {
- series = new QStackedBarSeries(this);
- QBarCategoryAxis* axis = new QBarCategoryAxis();
- axis->append(category);
- m_chart->setAxisX(axis,series);
- } else {
- series = new QPercentBarSeries(this);
- QBarCategoryAxis* axis = new QBarCategoryAxis();
- axis->append(category);
- m_chart->setAxisX(axis,series);
- }
-
- for (int j(0); j < data.count(); j++) {
- QList<qreal> column = data.at(j);
- QBarSet *set = new QBarSet("set" + QString::number(j));
- for (int i(0); i < column.count(); i++)
- *set << column.at(i);
- series->append(set);
- }
-
- m_chart->addSeries(series);
- } else if (seriesName == "Spline") {
- for (int j(0); j < data.count(); j ++) {
- QList<qreal> column = data.at(j);
- QSplineSeries *series = new QSplineSeries();
- series->setName("spline" + QString::number(j));
- for (int i(0); i < column.count(); i++)
- series->append(i, column.at(i));
- m_chart->addSeries(series);
- }
- }
- m_chart->createDefaultAxes();
-}
-
-void MainWidget::backgroundChanged(int itemIndex)
-{
- qDebug() << "backgroundChanged: " << itemIndex;
-}
-
-void MainWidget::autoScaleChanged(int value)
-{
- if (value) {
- // TODO: enable auto scaling
- } else {
- // TODO: set scaling manually (and disable auto scaling)
- }
-
- m_xMinSpin->setEnabled(!value);
- m_xMaxSpin->setEnabled(!value);
- m_yMinSpin->setEnabled(!value);
- m_yMaxSpin->setEnabled(!value);
-}
-
-void MainWidget::xMinChanged(int value)
-{
- qDebug() << "xMinChanged: " << value;
-}
-
-void MainWidget::xMaxChanged(int value)
-{
- qDebug() << "xMaxChanged: " << value;
-}
-
-void MainWidget::yMinChanged(int value)
-{
- qDebug() << "yMinChanged: " << value;
-}
-
-void MainWidget::yMaxChanged(int value)
-{
- qDebug() << "yMaxChanged: " << value;
-}
-
-void MainWidget::changeChartTheme(int themeIndex)
-{
- qDebug() << "changeChartTheme: " << themeIndex;
- if (themeIndex == 0)
- m_chart->setTheme(QChart::ChartThemeLight);
- else
- m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
-}
+/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mainwidget.h" +#include "dataseriedialog.h" +#include <QtCharts/QChartView> +#include <QtCharts/QPieSeries> +#include <QtCharts/QScatterSeries> +#include <QtCharts/QLineSeries> +#include <QtCharts/QAreaSeries> +#include <QtCharts/QSplineSeries> +#include <QtCharts/QBarSet> +#include <QtCharts/QBarSeries> +#include <QtCharts/QStackedBarSeries> +#include <QtCharts/QPercentBarSeries> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QMessageBox> +#include <cmath> +#include <QtCore/QDebug> +#include <QtGui/QStandardItemModel> +#include <QtCharts/QBarCategoryAxis> +#include <QtOpenGL/QGLWidget> + +QT_CHARTS_USE_NAMESPACE + +MainWidget::MainWidget(QWidget *parent) : + QWidget(parent), + m_addSerieDialog(0), + m_chart(0) +{ + m_chart = new QChart(); + + // Grid layout for the controls for configuring the chart widget + QGridLayout *grid = new QGridLayout(); + QPushButton *addSeriesButton = new QPushButton("Add series"); + connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries())); + grid->addWidget(addSeriesButton, 0, 1); + initBackroundCombo(grid); + initScaleControls(grid); + initThemeCombo(grid); + initCheckboxes(grid); + + // add row with empty label to make all the other rows static + grid->addWidget(new QLabel(""), grid->rowCount(), 0); + grid->setRowStretch(grid->rowCount() - 1, 1); + + // Create chart view with the chart + m_chartView = new QChartView(m_chart, this); + m_chartView->setRubberBand(QChartView::HorizonalRubberBand); + + // Another grid layout as a main layout + QGridLayout *mainLayout = new QGridLayout(); + mainLayout->addLayout(grid, 0, 0); + mainLayout->addWidget(m_chartView, 0, 1, 3, 1); + setLayout(mainLayout); +} + +// Combo box for selecting the chart's background +void MainWidget::initBackroundCombo(QGridLayout *grid) +{ + QComboBox *backgroundCombo = new QComboBox(this); + backgroundCombo->addItem("Color"); + backgroundCombo->addItem("Gradient"); + backgroundCombo->addItem("Image"); + connect(backgroundCombo, SIGNAL(currentIndexChanged(int)), + this, SLOT(backgroundChanged(int))); + + grid->addWidget(new QLabel("Background:"), grid->rowCount(), 0); + grid->addWidget(backgroundCombo, grid->rowCount() - 1, 1); +} + +// Scale related controls (auto-scale vs. manual min-max values) +void MainWidget::initScaleControls(QGridLayout *grid) +{ + m_autoScaleCheck = new QCheckBox("Automatic scaling"); + connect(m_autoScaleCheck, SIGNAL(stateChanged(int)), this, SLOT(autoScaleChanged(int))); + // Allow setting also non-sense values (like -2147483648 and 2147483647) + m_xMinSpin = new QSpinBox(); + m_xMinSpin->setMinimum(INT_MIN); + m_xMinSpin->setMaximum(INT_MAX); + m_xMinSpin->setValue(0); + connect(m_xMinSpin, SIGNAL(valueChanged(int)), this, SLOT(xMinChanged(int))); + m_xMaxSpin = new QSpinBox(); + m_xMaxSpin->setMinimum(INT_MIN); + m_xMaxSpin->setMaximum(INT_MAX); + m_xMaxSpin->setValue(10); + connect(m_xMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(xMaxChanged(int))); + m_yMinSpin = new QSpinBox(); + m_yMinSpin->setMinimum(INT_MIN); + m_yMinSpin->setMaximum(INT_MAX); + m_yMinSpin->setValue(0); + connect(m_yMinSpin, SIGNAL(valueChanged(int)), this, SLOT(yMinChanged(int))); + m_yMaxSpin = new QSpinBox(); + m_yMaxSpin->setMinimum(INT_MIN); + m_yMaxSpin->setMaximum(INT_MAX); + m_yMaxSpin->setValue(10); + connect(m_yMaxSpin, SIGNAL(valueChanged(int)), this, SLOT(yMaxChanged(int))); + + grid->addWidget(m_autoScaleCheck, grid->rowCount(), 0); + grid->addWidget(new QLabel("x min:"), grid->rowCount(), 0); + grid->addWidget(m_xMinSpin, grid->rowCount() - 1, 1); + grid->addWidget(new QLabel("x max:"), grid->rowCount(), 0); + grid->addWidget(m_xMaxSpin, grid->rowCount() - 1, 1); + grid->addWidget(new QLabel("y min:"), grid->rowCount(), 0); + grid->addWidget(m_yMinSpin, grid->rowCount() - 1, 1); + grid->addWidget(new QLabel("y max:"), grid->rowCount(), 0); + grid->addWidget(m_yMaxSpin, grid->rowCount() - 1, 1); + + m_autoScaleCheck->setChecked(true); +} + +// Combo box for selecting theme +void MainWidget::initThemeCombo(QGridLayout *grid) +{ + QComboBox *chartTheme = new QComboBox(); + chartTheme->addItem("Default"); + chartTheme->addItem("Light"); + chartTheme->addItem("Blue Cerulean"); + chartTheme->addItem("Dark"); + chartTheme->addItem("Brown Sand"); + chartTheme->addItem("Blue NCS"); + chartTheme->addItem("High Contrast"); + chartTheme->addItem("Blue Icy"); + chartTheme->addItem("Qt"); + connect(chartTheme, SIGNAL(currentIndexChanged(int)), + this, SLOT(changeChartTheme(int))); + grid->addWidget(new QLabel("Chart theme:"), 8, 0); + grid->addWidget(chartTheme, 8, 1); +} + +// Different check boxes for customizing chart +void MainWidget::initCheckboxes(QGridLayout *grid) +{ + // TODO: setZoomEnabled slot has been removed from QChartView -> Re-implement zoom on/off + QCheckBox *zoomCheckBox = new QCheckBox("Drag'n drop Zoom"); +// connect(zoomCheckBox, SIGNAL(toggled(bool)), m_chartView, SLOT(setZoomEnabled(bool))); + zoomCheckBox->setChecked(true); + grid->addWidget(zoomCheckBox, grid->rowCount(), 0); + + QCheckBox *aliasCheckBox = new QCheckBox("Anti-alias"); + connect(aliasCheckBox, SIGNAL(toggled(bool)), this, SLOT(antiAliasToggled(bool))); + aliasCheckBox->setChecked(false); + grid->addWidget(aliasCheckBox, grid->rowCount(), 0); + + QCheckBox *openGLCheckBox = new QCheckBox("Use QGLWidget"); + connect(openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(openGLToggled(bool))); + openGLCheckBox->setChecked(false); + grid->addWidget(openGLCheckBox, grid->rowCount(), 0); +} + +void MainWidget::antiAliasToggled(bool enabled) +{ + m_chartView->setRenderHint(QPainter::Antialiasing, enabled); +} + +void MainWidget::openGLToggled(bool enabled) +{ + if (enabled) { + QGLFormat f = QGLFormat::defaultFormat(); + f.setSampleBuffers(true); + f.setSamples(4); + QGLFormat::setDefaultFormat(f); + QGLWidget *g = new QGLWidget(); + m_chartView->setViewport(g); + } else { + m_chartView->setViewport(0); + } +} + +void MainWidget::addSeries() +{ + if (!m_addSerieDialog) { + m_addSerieDialog = new DataSerieDialog(this); + connect(m_addSerieDialog, SIGNAL(accepted(QString,int,int,QString,bool)), + this, SLOT(addSeries(QString,int,int,QString,bool))); + } + m_addSerieDialog->exec(); +} + +QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics) +{ + QList<RealList> testData; + for (int j(0); j < columnCount; j++) { + QList <qreal> newColumn; + for (int i(0); i < rowCount; i++) { + if (dataCharacteristics == "Sin") { + newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100)); + } else if (dataCharacteristics == "Sin + random") { + newColumn.append(abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); + } else if (dataCharacteristics == "Random") { + newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX); + } else if (dataCharacteristics == "Linear") { + //newColumn.append(i * (j + 1.0)); + // TODO: temporary hack to make pie work; prevent zero values: + newColumn.append(i * (j + 1.0) + 0.1); + } else { // "constant" + newColumn.append((j + 1.0)); + } + } + testData.append(newColumn); + } + return testData; +} + +QStringList MainWidget::generateLabels(int count) +{ + QStringList result; + for (int i(0); i < count; i++) + result.append("label" + QString::number(i)); + return result; +} + +void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled) +{ + qDebug() << "addSeries: " << seriesName + << " columnCount: " << columnCount + << " rowCount: " << rowCount + << " dataCharacteristics: " << dataCharacteristics + << " labels enabled: " << labelsEnabled; + m_defaultSeriesName = seriesName; + + QList<RealList> data = generateTestData(columnCount, rowCount, dataCharacteristics); + + // Line series and scatter series use similar data + if (seriesName == "Line") { + for (int j(0); j < data.count(); j ++) { + QList<qreal> column = data.at(j); + QLineSeries *series = new QLineSeries(); + series->setName("line" + QString::number(j)); + for (int i(0); i < column.count(); i++) + series->append(i, column.at(i)); + m_chart->addSeries(series); + } + } else if (seriesName == "Area") { + // TODO: lower series for the area? + for (int j(0); j < data.count(); j ++) { + QList<qreal> column = data.at(j); + QLineSeries *lineSeries = new QLineSeries(); + for (int i(0); i < column.count(); i++) + lineSeries->append(i, column.at(i)); + QAreaSeries *areaSeries = new QAreaSeries(lineSeries); + areaSeries->setName("area" + QString::number(j)); + m_chart->addSeries(areaSeries); + } + } else if (seriesName == "Scatter") { + for (int j(0); j < data.count(); j++) { + QList<qreal> column = data.at(j); + QScatterSeries *series = new QScatterSeries(); + series->setName("scatter" + QString::number(j)); + for (int i(0); i < column.count(); i++) + series->append(i, column.at(i)); + m_chart->addSeries(series); + } + } else if (seriesName == "Pie") { + QStringList labels = generateLabels(rowCount); + for (int j(0); j < data.count(); j++) { + QPieSeries *series = new QPieSeries(); + QList<qreal> column = data.at(j); + for (int i(0); i < column.count(); i++) + series->append(labels.at(i), column.at(i)); + m_chart->addSeries(series); + } + } else if (seriesName == "Bar" + || seriesName == "Stacked bar" + || seriesName == "Percent bar") { + QStringList category; + QStringList labels = generateLabels(rowCount); + foreach (QString label, labels) + category << label; + QAbstractBarSeries* series = 0; + if (seriesName == "Bar") { + series = new QBarSeries(this); + QBarCategoryAxis* axis = new QBarCategoryAxis(); + axis->append(category); + m_chart->setAxisX(axis,series); + } else if (seriesName == "Stacked bar") { + series = new QStackedBarSeries(this); + QBarCategoryAxis* axis = new QBarCategoryAxis(); + axis->append(category); + m_chart->setAxisX(axis,series); + } else { + series = new QPercentBarSeries(this); + QBarCategoryAxis* axis = new QBarCategoryAxis(); + axis->append(category); + m_chart->setAxisX(axis,series); + } + + for (int j(0); j < data.count(); j++) { + QList<qreal> column = data.at(j); + QBarSet *set = new QBarSet("set" + QString::number(j)); + for (int i(0); i < column.count(); i++) + *set << column.at(i); + series->append(set); + } + + m_chart->addSeries(series); + } else if (seriesName == "Spline") { + for (int j(0); j < data.count(); j ++) { + QList<qreal> column = data.at(j); + QSplineSeries *series = new QSplineSeries(); + series->setName("spline" + QString::number(j)); + for (int i(0); i < column.count(); i++) + series->append(i, column.at(i)); + m_chart->addSeries(series); + } + } + m_chart->createDefaultAxes(); +} + +void MainWidget::backgroundChanged(int itemIndex) +{ + qDebug() << "backgroundChanged: " << itemIndex; +} + +void MainWidget::autoScaleChanged(int value) +{ + if (value) { + // TODO: enable auto scaling + } else { + // TODO: set scaling manually (and disable auto scaling) + } + + m_xMinSpin->setEnabled(!value); + m_xMaxSpin->setEnabled(!value); + m_yMinSpin->setEnabled(!value); + m_yMaxSpin->setEnabled(!value); +} + +void MainWidget::xMinChanged(int value) +{ + qDebug() << "xMinChanged: " << value; +} + +void MainWidget::xMaxChanged(int value) +{ + qDebug() << "xMaxChanged: " << value; +} + +void MainWidget::yMinChanged(int value) +{ + qDebug() << "yMinChanged: " << value; +} + +void MainWidget::yMaxChanged(int value) +{ + qDebug() << "yMaxChanged: " << value; +} + +void MainWidget::changeChartTheme(int themeIndex) +{ + qDebug() << "changeChartTheme: " << themeIndex; + if (themeIndex == 0) + m_chart->setTheme(QChart::ChartThemeLight); + else + m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1)); +} diff --git a/tests/chartwidgettest/mainwidget.h b/tests/manual/chartwidgettest/mainwidget.h index 4549c0d4..82a710bb 100644 --- a/tests/chartwidgettest/mainwidget.h +++ b/tests/manual/chartwidgettest/mainwidget.h @@ -1,80 +1,80 @@ -/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MAINWIDGET_H
-#define MAINWIDGET_H
-
-#include <QtCharts/QChartGlobal>
-#include <QtCharts/QChart>
-#include <QtCharts/QChartView>
-#include <QtWidgets/QWidget>
-
-class QSpinBox;
-class QCheckBox;
-class QGridLayout;
-
-QT_CHARTS_USE_NAMESPACE
-
-#define RealList QList<qreal>
-class DataSerieDialog;
-
-class MainWidget : public QWidget
-{
- Q_OBJECT
-public:
- explicit MainWidget(QWidget *parent = 0);
-
-signals:
-
-private:
- void initBackroundCombo(QGridLayout *grid);
- void initScaleControls(QGridLayout *grid);
- void initThemeCombo(QGridLayout *grid);
- void initCheckboxes(QGridLayout *grid);
-
-private slots:
- void addSeries();
- void addSeries(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled);
- void backgroundChanged(int itemIndex);
- void autoScaleChanged(int value);
- void xMinChanged(int value);
- void xMaxChanged(int value);
- void yMinChanged(int value);
- void yMaxChanged(int value);
- void antiAliasToggled(bool enabled);
- void openGLToggled(bool enabled);
- void changeChartTheme(int themeIndex);
- QList<RealList> generateTestData(int columnCount, int rowCount, QString dataCharacteristics);
- QStringList generateLabels(int count);
-
-private:
- DataSerieDialog *m_addSerieDialog;
- QChart *m_chart;
- QChartView *m_chartView;
- QCheckBox *m_autoScaleCheck;
- QSpinBox *m_xMinSpin;
- QSpinBox *m_xMaxSpin;
- QSpinBox *m_yMinSpin;
- QSpinBox *m_yMaxSpin;
- QString m_defaultSeriesName;
- QGridLayout *m_scatterLayout;
-};
-
-#endif // MAINWIDGET_H
+/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWIDGET_H +#define MAINWIDGET_H + +#include <QtCharts/QChartGlobal> +#include <QtCharts/QChart> +#include <QtCharts/QChartView> +#include <QtWidgets/QWidget> + +class QSpinBox; +class QCheckBox; +class QGridLayout; + +QT_CHARTS_USE_NAMESPACE + +#define RealList QList<qreal> +class DataSerieDialog; + +class MainWidget : public QWidget +{ + Q_OBJECT +public: + explicit MainWidget(QWidget *parent = 0); + +signals: + +private: + void initBackroundCombo(QGridLayout *grid); + void initScaleControls(QGridLayout *grid); + void initThemeCombo(QGridLayout *grid); + void initCheckboxes(QGridLayout *grid); + +private slots: + void addSeries(); + void addSeries(QString series, int columnCount, int rowCount, QString dataCharacteristics, bool labelsEnabled); + void backgroundChanged(int itemIndex); + void autoScaleChanged(int value); + void xMinChanged(int value); + void xMaxChanged(int value); + void yMinChanged(int value); + void yMaxChanged(int value); + void antiAliasToggled(bool enabled); + void openGLToggled(bool enabled); + void changeChartTheme(int themeIndex); + QList<RealList> generateTestData(int columnCount, int rowCount, QString dataCharacteristics); + QStringList generateLabels(int count); + +private: + DataSerieDialog *m_addSerieDialog; + QChart *m_chart; + QChartView *m_chartView; + QCheckBox *m_autoScaleCheck; + QSpinBox *m_xMinSpin; + QSpinBox *m_xMaxSpin; + QSpinBox *m_yMinSpin; + QSpinBox *m_yMaxSpin; + QString m_defaultSeriesName; + QGridLayout *m_scatterLayout; +}; + +#endif // MAINWIDGET_H diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro new file mode 100644 index 00000000..5f2b85b1 --- /dev/null +++ b/tests/manual/manual.pro @@ -0,0 +1,18 @@ +TEMPLATE = subdirs +SUBDIRS += \ + presenterchart \ + polarcharttest \ + boxplottester + +contains(QT_CONFIG, opengl) { + SUBDIRS += chartwidgettest \ + wavechart \ + chartviewer +} else { + message("OpenGL not available. Some test apps are disabled") +} + +qtHaveModule(quick) { + SUBDIRS += qmlchartproperties \ + qmlchartaxis +} diff --git a/tests/polarcharttest/chartview.cpp b/tests/manual/polarcharttest/chartview.cpp index 37a25f8f..37a25f8f 100644 --- a/tests/polarcharttest/chartview.cpp +++ b/tests/manual/polarcharttest/chartview.cpp diff --git a/tests/polarcharttest/chartview.h b/tests/manual/polarcharttest/chartview.h index fb8b4ff9..fb8b4ff9 100644 --- a/tests/polarcharttest/chartview.h +++ b/tests/manual/polarcharttest/chartview.h diff --git a/tests/polarcharttest/main.cpp b/tests/manual/polarcharttest/main.cpp index 28203655..28203655 100644 --- a/tests/polarcharttest/main.cpp +++ b/tests/manual/polarcharttest/main.cpp diff --git a/tests/polarcharttest/mainwindow.cpp b/tests/manual/polarcharttest/mainwindow.cpp index 79c8918f..79c8918f 100644 --- a/tests/polarcharttest/mainwindow.cpp +++ b/tests/manual/polarcharttest/mainwindow.cpp diff --git a/tests/polarcharttest/mainwindow.h b/tests/manual/polarcharttest/mainwindow.h index 2257ef04..2257ef04 100644 --- a/tests/polarcharttest/mainwindow.h +++ b/tests/manual/polarcharttest/mainwindow.h diff --git a/tests/polarcharttest/mainwindow.ui b/tests/manual/polarcharttest/mainwindow.ui index cc4b1994..cc4b1994 100644 --- a/tests/polarcharttest/mainwindow.ui +++ b/tests/manual/polarcharttest/mainwindow.ui diff --git a/tests/polarcharttest/polarcharttest.pro b/tests/manual/polarcharttest/polarcharttest.pro index 0c892c84..a8409769 100644 --- a/tests/polarcharttest/polarcharttest.pro +++ b/tests/manual/polarcharttest/polarcharttest.pro @@ -1,4 +1,4 @@ -!include( ../tests.pri ) { +!include( ../../tests.pri ) { error( "Couldn't find the test.pri file!" ) } diff --git a/tests/presenterchart/chartview.cpp b/tests/manual/presenterchart/chartview.cpp index be01933c..be01933c 100644 --- a/tests/presenterchart/chartview.cpp +++ b/tests/manual/presenterchart/chartview.cpp diff --git a/tests/presenterchart/chartview.h b/tests/manual/presenterchart/chartview.h index 99d8c65a..99d8c65a 100644 --- a/tests/presenterchart/chartview.h +++ b/tests/manual/presenterchart/chartview.h diff --git a/tests/presenterchart/main.cpp b/tests/manual/presenterchart/main.cpp index 22a45025..22a45025 100644 --- a/tests/presenterchart/main.cpp +++ b/tests/manual/presenterchart/main.cpp diff --git a/tests/presenterchart/presenterchart.pro b/tests/manual/presenterchart/presenterchart.pro index bd3367d5..0269c6e7 100644 --- a/tests/presenterchart/presenterchart.pro +++ b/tests/manual/presenterchart/presenterchart.pro @@ -1,6 +1,7 @@ -!include( ../tests.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../../tests.pri ) { + error( "Couldn't find the test.pri file!" ) } + TARGET = presenterchart HEADERS += chartview.h SOURCES += main.cpp chartview.cpp diff --git a/tests/qmlchartaxis/main.cpp b/tests/manual/qmlchartaxis/main.cpp index 5c5923c7..5c5923c7 100644 --- a/tests/qmlchartaxis/main.cpp +++ b/tests/manual/qmlchartaxis/main.cpp diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Button.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/Button.qml index 61df081d..61df081d 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/Button.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/Button.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml index 69250a39..69250a39 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxes.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml index 524e3314..524e3314 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/ChartAxesRevert.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml index 9e24b47b..9e24b47b 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/ConfiguringDynamically.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml index 209ef372..209ef372 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/CreatingDynamically.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml index 2cab44fd..2cab44fd 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAndUserDefined.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml index f06dd7cf..f06dd7cf 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxes.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml index 67685082..67685082 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/DefaultAxesRevert.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/Legacy.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml index caafabb7..caafabb7 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/Legacy.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml index c9ac5d92..c9ac5d92 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/SeriesSpecificDynamic.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml index db11c9ee..db11c9ee 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/SwitchingDynamically.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml index f87c18cb..f87c18cb 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefined.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml index ea625c22..ea625c22 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/UserDefinedRevert.qml diff --git a/tests/qmlchartaxis/qml/qmlchartaxis/main.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml index f973bf7a..f973bf7a 100644 --- a/tests/qmlchartaxis/qml/qmlchartaxis/main.qml +++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml diff --git a/tests/qmlchartaxis/qmlchartaxis.pro b/tests/manual/qmlchartaxis/qmlchartaxis.pro index 0abc1d4a..aaf2a7a0 100644 --- a/tests/qmlchartaxis/qmlchartaxis.pro +++ b/tests/manual/qmlchartaxis/qmlchartaxis.pro @@ -1,4 +1,4 @@ -!include( ../tests.pri ) { +!include( ../../tests.pri ) { error( "Couldn't find the test.pri file!" ) } diff --git a/tests/qmlchartaxis/resources.qrc b/tests/manual/qmlchartaxis/resources.qrc index 2f9f4b67..2f9f4b67 100644 --- a/tests/qmlchartaxis/resources.qrc +++ b/tests/manual/qmlchartaxis/resources.qrc diff --git a/tests/qmlchartproperties/main.cpp b/tests/manual/qmlchartproperties/main.cpp index 752724be..752724be 100644 --- a/tests/qmlchartproperties/main.cpp +++ b/tests/manual/qmlchartproperties/main.cpp diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml index 069e17de..069e17de 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml index 168dc957..168dc957 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml index ad088646..ad088646 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml index cdd847a5..cdd847a5 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Button.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/Button.qml index 61df081d..61df081d 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/Button.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/Button.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml index 3f30ea44..3f30ea44 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml index 87139f35..87139f35 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml index 0c6d8dce..0c6d8dce 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml index 24ffd9ef..24ffd9ef 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml index d172e4d8..d172e4d8 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml index e7efc222..e7efc222 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml index 61b4365f..61b4365f 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml index 3531597f..3531597f 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/FontEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml index aedb26cb..aedb26cb 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml index c0d1b443..c0d1b443 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml index 3b94e89d..3b94e89d 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml index de3134a8..de3134a8 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml index 7960b4a1..7960b4a1 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml index 74c9b88f..74c9b88f 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PieChart.qml index 37a321ae..37a321ae 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PieChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml index 91eb0343..91eb0343 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml index d531ac32..d531ac32 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml index 23afdb75..23afdb75 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml index 3a182d19..3a182d19 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml index a59f0e12..a59f0e12 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml index 8265e1ae..8265e1ae 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/main.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/main.qml diff --git a/tests/qmlchartproperties/qmlchartproperties.pro b/tests/manual/qmlchartproperties/qmlchartproperties.pro index 6d148e8b..78c19300 100644 --- a/tests/qmlchartproperties/qmlchartproperties.pro +++ b/tests/manual/qmlchartproperties/qmlchartproperties.pro @@ -1,4 +1,4 @@ -!include( ../tests.pri ) { +!include( ../../tests.pri ) { error( "Couldn't find the test.pri file!" ) } diff --git a/tests/qmlchartproperties/resources.qrc b/tests/manual/qmlchartproperties/resources.qrc index e93f369e..e93f369e 100644 --- a/tests/qmlchartproperties/resources.qrc +++ b/tests/manual/qmlchartproperties/resources.qrc diff --git a/tests/wavechart/main.cpp b/tests/manual/wavechart/main.cpp index 58423319..58423319 100644 --- a/tests/wavechart/main.cpp +++ b/tests/manual/wavechart/main.cpp diff --git a/tests/wavechart/wavechart.cpp b/tests/manual/wavechart/wavechart.cpp index dc05d073..dc05d073 100644 --- a/tests/wavechart/wavechart.cpp +++ b/tests/manual/wavechart/wavechart.cpp diff --git a/tests/wavechart/wavechart.h b/tests/manual/wavechart/wavechart.h index 95978861..95978861 100644 --- a/tests/wavechart/wavechart.h +++ b/tests/manual/wavechart/wavechart.h diff --git a/tests/wavechart/wavechart.pro b/tests/manual/wavechart/wavechart.pro index aed0c39d..0da16ed4 100644 --- a/tests/wavechart/wavechart.pro +++ b/tests/manual/wavechart/wavechart.pro @@ -1,6 +1,7 @@ -!include( ../tests.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../../tests.pri ) { + error( "Couldn't find the test.pri file!" ) } + QT+=opengl TARGET = wavechart SOURCES += main.cpp wavechart.cpp diff --git a/tests/tests.pro b/tests/tests.pro index e6aa3561..ce8428e4 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,19 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += \ - auto \ - presenterchart \ - polarcharttest \ - boxplottester - -contains(QT_CONFIG, opengl) { - SUBDIRS += chartwidgettest \ - wavechart \ - chartviewer -} else { - message("OpenGL not available. Some test apps are disabled") -} - -qtHaveModule(quick) { - SUBDIRS += qmlchartproperties \ - qmlchartaxis -} +SUBDIRS += auto +exists(manual): SUBDIRS += manual |