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/axis/categoryaxis/chartcategoryaxisx.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/axis/categoryaxis/chartcategoryaxisx.cpp')
-rw-r--r-- | src/axis/categoryaxis/chartcategoryaxisx.cpp | 117 |
1 files changed, 0 insertions, 117 deletions
diff --git a/src/axis/categoryaxis/chartcategoryaxisx.cpp b/src/axis/categoryaxis/chartcategoryaxisx.cpp deleted file mode 100644 index 9d9a72c6..00000000 --- a/src/axis/categoryaxis/chartcategoryaxisx.cpp +++ /dev/null @@ -1,117 +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 "chartcategoryaxisx_p.h" -#include "qcategoryaxis.h" -#include "qabstractaxis.h" -#include "chartpresenter_p.h" -#include "abstractchartlayout_p.h" -#include <QGraphicsLayout> -#include <qmath.h> - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -ChartCategoryAxisX::ChartCategoryAxisX(QCategoryAxis *axis, QGraphicsItem* item) - : HorizontalAxis(axis, item, true), - m_axis(axis) -{ - QObject::connect(axis, SIGNAL(categoriesChanged()), this, SLOT(handleCategoriesChanged())); -} - -ChartCategoryAxisX::~ChartCategoryAxisX() -{ -} - -QVector<qreal> ChartCategoryAxisX::calculateLayout() const -{ - int tickCount = m_axis->categoriesLabels().count() + 1; - QVector<qreal> points; - - if (tickCount < 2) - return points; - - const QRectF &gridRect = gridGeometry(); - qreal range = max() - min(); - if (range > 0) { - points.resize(tickCount); - qreal scale = gridRect.width() / range; - for (int i = 0; i < tickCount; ++i) { - if (i < tickCount - 1) { - qreal x = (m_axis->startValue(m_axis->categoriesLabels().at(i)) - min()) * scale + gridRect.left(); - points[i] = x; - } else { - qreal x = (m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - min()) * scale + gridRect.left(); - points[i] = x; - } - } - } - - return points; -} - -void ChartCategoryAxisX::updateGeometry() -{ - setLabels(m_axis->categoriesLabels() << ""); - HorizontalAxis::updateGeometry(); -} - -QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const -{ - Q_UNUSED(constraint) - - QSizeF sh; - QSizeF base = HorizontalAxis::sizeHint(which, constraint); - QStringList ticksList = m_axis->categoriesLabels(); - qreal width = 0; // Width is irrelevant for X axes with interval labels - qreal height = 0; - - switch (which) { - case Qt::MinimumSize: { - QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle()); - height = boundingRect.height() + labelPadding() + base.height() + 1.0; - sh = QSizeF(width, height); - break; - } - case Qt::PreferredSize: { - qreal labelHeight = 0.0; - foreach (const QString& s, ticksList) { - QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle()); - labelHeight = qMax(rect.height(), labelHeight); - } - height = labelHeight + labelPadding() + base.height() + 1.0; - sh = QSizeF(width, height); - break; - } - default: - break; - } - - return sh; -} - -void ChartCategoryAxisX::handleCategoriesChanged() -{ - QGraphicsLayoutItem::updateGeometry(); - presenter()->layout()->invalidate(); -} - -#include "moc_chartcategoryaxisx_p.cpp" - -QTCOMMERCIALCHART_END_NAMESPACE |