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 /src/qchart.h | |
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 'src/qchart.h')
-rw-r--r-- | src/qchart.h | 183 |
1 files changed, 0 insertions, 183 deletions
diff --git a/src/qchart.h b/src/qchart.h deleted file mode 100644 index 337ad33a..00000000 --- a/src/qchart.h +++ /dev/null @@ -1,183 +0,0 @@ -/**************************************************************************** -** -** 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 QCHART_H -#define QCHART_H - -#include <QAbstractSeries> -#include <QLegend> -#include <QGraphicsWidget> -#include <QMargins> - -class QGraphicsSceneResizeEvent; - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -class QAbstractSeries; -class QAbstractAxis; -class QLegend; -class QChartPrivate; -class QBoxPlotSeries; - -class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget -{ - Q_OBJECT - Q_PROPERTY(QChart::ChartTheme theme READ theme WRITE setTheme) - Q_PROPERTY(QString title READ title WRITE setTitle) - Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible) - Q_PROPERTY(bool dropShadowEnabled READ isDropShadowEnabled WRITE setDropShadowEnabled) - Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness) - Q_PROPERTY(QChart::AnimationOptions animationOptions READ animationOptions WRITE setAnimationOptions) - Q_PROPERTY(QMargins minimumMargins READ minimumMargins WRITE setMinimumMargins) - Q_PROPERTY(QMargins margins READ margins WRITE setMargins) - Q_PROPERTY(QChart::ChartType chartType READ chartType) - Q_PROPERTY(bool plotAreaBackgroundVisible READ isPlotAreaBackgroundVisible WRITE setPlotAreaBackgroundVisible) - Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers) - Q_PROPERTY(QLocale locale READ locale WRITE setLocale) - Q_ENUMS(ChartTheme) - Q_ENUMS(AnimationOption) - Q_ENUMS(ChartType) - -public: - enum ChartType { - ChartTypeUndefined = 0, - ChartTypeCartesian, - ChartTypePolar - }; - - enum ChartTheme { - ChartThemeLight = 0, - ChartThemeBlueCerulean, - ChartThemeDark, - ChartThemeBrownSand, - ChartThemeBlueNcs, - ChartThemeHighContrast, - ChartThemeBlueIcy, - ChartThemeQt - }; - - enum AnimationOption { - NoAnimation = 0x0, - GridAxisAnimations = 0x1, - SeriesAnimations = 0x2, - AllAnimations = 0x3 - }; - - Q_DECLARE_FLAGS(AnimationOptions, AnimationOption) - -public: - explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); - ~QChart(); - - void addSeries(QAbstractSeries *series); - void removeSeries(QAbstractSeries *series); - void removeAllSeries(); - QList<QAbstractSeries *> series() const; - - // *** deprecated *** - void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0); - void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0); - QAbstractAxis *axisX(QAbstractSeries *series = 0) const; - QAbstractAxis *axisY(QAbstractSeries *series = 0) const; - // ****************** - - void addAxis(QAbstractAxis *axis, Qt::Alignment alignment); - void removeAxis(QAbstractAxis *axis); - QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = 0) const; - - void createDefaultAxes(); - - void setTheme(QChart::ChartTheme theme); - QChart::ChartTheme theme() const; - - void setTitle(const QString &title); - QString title() const; - void setTitleFont(const QFont &font); - QFont titleFont() const; - void setTitleBrush(const QBrush &brush); - QBrush titleBrush() const; - - void setBackgroundBrush(const QBrush &brush); - QBrush backgroundBrush() const; - void setBackgroundPen(const QPen &pen); - QPen backgroundPen() const; - void setBackgroundVisible(bool visible = true); - bool isBackgroundVisible() const; - - void setDropShadowEnabled(bool enabled = true); - bool isDropShadowEnabled() const; - void setBackgroundRoundness(qreal diameter); - qreal backgroundRoundness() const; - void setAnimationOptions(AnimationOptions options); - AnimationOptions animationOptions() const; - - void zoomIn(); - void zoomOut(); - - void zoomIn(const QRectF &rect); - void zoom(qreal factor); - void zoomReset(); - bool isZoomed(); - - void scroll(qreal dx, qreal dy); - - QLegend *legend() const; - - void setMinimumMargins(const QMargins& margins); - QMargins minimumMargins() const; - - void setMargins(const QMargins &margins); - QMargins margins() const; - - QRectF plotArea() const; - void setPlotAreaBackgroundBrush(const QBrush &brush); - QBrush plotAreaBackgroundBrush() const; - void setPlotAreaBackgroundPen(const QPen &pen); - QPen plotAreaBackgroundPen() const; - void setPlotAreaBackgroundVisible(bool visible = true); - bool isPlotAreaBackgroundVisible() const; - void setLocalizeNumbers(bool localize); - bool localizeNumbers() const; - void setLocale(const QLocale &locale); - QLocale locale() const; - - QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0); - QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0); - - ChartType chartType() const; - -protected: - explicit QChart(QChart::ChartType type, QGraphicsItem *parent, Qt::WindowFlags wFlags); - QScopedPointer<QChartPrivate> d_ptr; - friend class QLegend; - friend class DeclarativeChart; - friend class ChartDataSet; - friend class ChartPresenter; - friend class ChartThemeManager; - friend class QAbstractSeries; - friend class QBoxPlotSeriesPrivate; - Q_DISABLE_COPY(QChart) -}; - -QTCOMMERCIALCHART_END_NAMESPACE - -Q_DECLARE_OPERATORS_FOR_FLAGS(QTCOMMERCIALCHART_NAMESPACE::QChart::AnimationOptions) - -#endif // QCHART_H |