diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /examples/charts/logvalueaxis | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'examples/charts/logvalueaxis')
-rw-r--r-- | examples/charts/logvalueaxis/logvalueaxis.pro | 5 | ||||
-rw-r--r-- | examples/charts/logvalueaxis/main.cpp | 75 |
2 files changed, 80 insertions, 0 deletions
diff --git a/examples/charts/logvalueaxis/logvalueaxis.pro b/examples/charts/logvalueaxis/logvalueaxis.pro new file mode 100644 index 00000000..ede43079 --- /dev/null +++ b/examples/charts/logvalueaxis/logvalueaxis.pro @@ -0,0 +1,5 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} +TARGET = logvalueaxis +SOURCES += main.cpp diff --git a/examples/charts/logvalueaxis/main.cpp b/examples/charts/logvalueaxis/main.cpp new file mode 100644 index 00000000..73591ae3 --- /dev/null +++ b/examples/charts/logvalueaxis/main.cpp @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** 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 <QApplication> +#include <QMainWindow> +#include <QChartView> +#include <QLineSeries> +#include <QValueAxis> +#include <QLogValueAxis> + +QT_CHARTS_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + + //![1] + QLineSeries *series = new QLineSeries(); + *series << QPointF(1, 1) << QPointF(2, 73) << QPointF(3, 268) << QPointF(4, 17) << QPointF(5, 4325) << QPointF(6, 723); + //![1] + + //![2] + QChart *chart = new QChart(); + chart->addSeries(series); + chart->legend()->hide(); + chart->setTitle("Logarithmic axis example"); + //![2] + + //![3] + QValueAxis *axisX = new QValueAxis; + axisX->setTitleText("Data point"); + axisX->setTickCount(6); + axisX->setLabelFormat("%i"); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); + + QLogValueAxis *axisY = new QLogValueAxis; + axisY->setLabelFormat("%g"); + axisY->setTitleText("Values"); + axisY->setBase(8); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); + //![3] + + //![4] + QChartView *chartView = new QChartView(chart); + chartView->setRenderHint(QPainter::Antialiasing); + //![4] + + //![5] + QMainWindow window; + window.setCentralWidget(chartView); + window.resize(400, 300); + window.show(); + //![5] + + return a.exec(); +} |