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/charts/piechart/pieslicedata_p.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/charts/piechart/pieslicedata_p.h')
-rw-r--r-- | src/charts/piechart/pieslicedata_p.h | 141 |
1 files changed, 141 insertions, 0 deletions
diff --git a/src/charts/piechart/pieslicedata_p.h b/src/charts/piechart/pieslicedata_p.h new file mode 100644 index 00000000..37985121 --- /dev/null +++ b/src/charts/piechart/pieslicedata_p.h @@ -0,0 +1,141 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Enterprise Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#ifndef PIESLICEDATA_P_H +#define PIESLICEDATA_P_H + +#include <qchartglobal.h> +#include <qpieslice.h> +#include <QPen> +#include <QBrush> + +QT_CHARTS_BEGIN_NAMESPACE + +template <class T> +class Themed : public T +{ +public: + Themed(): m_isThemed(true) {} + + inline T &operator=(const T &other) { return T::operator =(other); } + + inline bool operator!=(const T &other) const { return T::operator !=(other); } + inline bool operator!=(const Themed &other) const + { + if (T::operator !=(other)) + return true; + + if (m_isThemed != other.m_isThemed) + return true; + + return false; + } + + inline void setThemed(bool state) { m_isThemed = state; } + inline bool isThemed() const { return m_isThemed; } + +private: + bool m_isThemed; +}; + +class PieSliceData +{ +public: + PieSliceData() : + m_value(0), + m_isExploded(false), + m_explodeDistanceFactor(0.15), + m_isLabelVisible(false), + m_labelPosition(QPieSlice::LabelOutside), + m_labelArmLengthFactor(0.15), + m_percentage(0), + m_radius(0), + m_startAngle(0), + m_angleSpan(0), + m_holeRadius(0) + { + } + + bool operator!=(const PieSliceData &other) const { + if (!qFuzzyIsNull(m_value - other.m_value)) + return true; + + if (m_slicePen != other.m_slicePen || + m_sliceBrush != other.m_sliceBrush) + return true; + + if (m_isExploded != other.m_isExploded || + !qFuzzyIsNull(m_explodeDistanceFactor - other.m_explodeDistanceFactor)) + return true; + + if (m_isLabelVisible != other.m_isLabelVisible || + m_labelText != other.m_labelText || + m_labelFont != other.m_labelFont || + m_labelPosition != other.m_labelPosition || + !qFuzzyIsNull(m_labelArmLengthFactor - other.m_labelArmLengthFactor) || + m_labelBrush != other.m_labelBrush) + return true; + + if (!qFuzzyIsNull(m_percentage - other.m_percentage) || + m_center != other.m_center || + !qFuzzyIsNull(m_radius - other.m_radius) || + !qFuzzyIsNull(m_startAngle - other.m_startAngle) || + !qFuzzyIsNull(m_angleSpan - other.m_angleSpan)) + return true; + + return false; + } + + qreal m_value; + + Themed<QPen> m_slicePen; + Themed<QBrush> m_sliceBrush; + + bool m_isExploded; + qreal m_explodeDistanceFactor; + + bool m_isLabelVisible; + QString m_labelText; + Themed<QFont> m_labelFont; + QPieSlice::LabelPosition m_labelPosition; + qreal m_labelArmLengthFactor; + Themed<QBrush> m_labelBrush; + + qreal m_percentage; + QPointF m_center; + qreal m_radius; + qreal m_startAngle; + qreal m_angleSpan; + + qreal m_holeRadius; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // PIESLICEDATA_P_H |