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/barchart/vertical/stacked/qstackedbarseries.cpp | |
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/barchart/vertical/stacked/qstackedbarseries.cpp')
-rw-r--r-- | src/barchart/vertical/stacked/qstackedbarseries.cpp | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/src/barchart/vertical/stacked/qstackedbarseries.cpp b/src/barchart/vertical/stacked/qstackedbarseries.cpp deleted file mode 100644 index 6ca42806..00000000 --- a/src/barchart/vertical/stacked/qstackedbarseries.cpp +++ /dev/null @@ -1,122 +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$ -** -****************************************************************************/ - -#include "qstackedbarseries.h" -#include "qstackedbarseries_p.h" -#include "stackedbarchartitem_p.h" -#include "chartdataset_p.h" -#include "charttheme_p.h" -#include "qvalueaxis.h" - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -/*! - \class QStackedBarSeries - \inmodule Qt Charts - \brief Series for creating stacked bar chart. - \mainclass - - QStackedBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars - as stacks, where bars in same category are stacked on top of each other. - QStackedBarSeries groups the data from sets to categories, which are defined by QStringList. - - See the \l {StackedbarChart Example} {stacked bar chart example} to learn how to create a stacked bar chart. - \image examples_stackedbarchart.png - - \sa QBarSet, QPercentBarSeries, QAbstractBarSeries -*/ - -#ifdef QDOC_QT5 -/*! - \qmltype StackedBarSeries - \instantiates QStackedBarSeries - \inqmlmodule QtCommercial.Chart - - \include doc/src/stackedbarseries.qdocinc -*/ -#else -/*! - \qmlclass StackedBarSeries QStackedBarSeries - - \include ../doc/src/stackedbarseries.qdocinc -*/ -#endif - -/*! - Constructs empty QStackedBarSeries. - QStackedBarSeries is QObject which is a child of a \a parent. -*/ -QStackedBarSeries::QStackedBarSeries(QObject *parent) - : QAbstractBarSeries(*new QStackedBarSeriesPrivate(this), parent) -{ -} - -/*! - Destructor. Removes series from chart. -*/ -QStackedBarSeries::~QStackedBarSeries() -{ - Q_D(QStackedBarSeries); - if (d->m_chart) - d->m_chart->removeSeries(this); -} -/*! - Returns QAbstractSeries::SeriesTypeStackedBar. -*/ -QAbstractSeries::SeriesType QStackedBarSeries::type() const -{ - return QAbstractSeries::SeriesTypeStackedBar; -} - -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QStackedBarSeries *q) : QAbstractBarSeriesPrivate(q) -{ - -} - -void QStackedBarSeriesPrivate::initializeDomain() -{ - qreal minX(domain()->minX()); - qreal minY(domain()->minY()); - qreal maxX(domain()->maxX()); - qreal maxY(domain()->maxY()); - - qreal x = categoryCount(); - minX = qMin(minX, - (qreal)0.5); - minY = qMin(minY, bottom()); - maxX = qMax(maxX, x - (qreal)0.5); - maxY = qMax(maxY, top()); - - domain()->setRange(minX, maxX, minY, maxY); -} - -void QStackedBarSeriesPrivate::initializeGraphics(QGraphicsItem* parent) -{ - Q_Q(QStackedBarSeries); - StackedBarChartItem *bar = new StackedBarChartItem(q,parent); - m_item.reset(bar); - QAbstractSeriesPrivate::initializeGraphics(parent); -} - -#include "moc_qstackedbarseries.cpp" - -QTCOMMERCIALCHART_END_NAMESPACE - |