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/charttitle.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/charttitle.cpp')
-rw-r--r-- | src/charttitle.cpp | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/src/charttitle.cpp b/src/charttitle.cpp deleted file mode 100644 index a7a958ee..00000000 --- a/src/charttitle.cpp +++ /dev/null @@ -1,91 +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 "charttitle_p.h" -#include "chartpresenter_p.h" -#include <QFont> -#include <QFontMetrics> -#include <QDebug> -#include <QTextDocument> - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -ChartTitle::ChartTitle(QGraphicsItem *parent) - : QGraphicsTextItem(parent) -{ - document()->setDocumentMargin(ChartPresenter::textMargin()); -} - -ChartTitle::~ChartTitle() -{ - -} - -void ChartTitle::setText(const QString &text) -{ - m_text = text; -} - -QString ChartTitle::text() const -{ - return m_text; -} - -void ChartTitle::setGeometry(const QRectF &rect) -{ - QRectF truncatedRect; - QGraphicsTextItem::setHtml(ChartPresenter::truncatedText(font(), m_text, qreal(0.0), - rect.width(), rect.height(), - truncatedRect)); - QGraphicsTextItem::setTextWidth(truncatedRect.width()); - setPos(rect.topLeft()); -} - - -QSizeF ChartTitle::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const -{ - Q_UNUSED(constraint); - QSizeF sh; - - switch (which) { - case Qt::MinimumSize: { - QRectF titleRect = ChartPresenter::textBoundingRect(font(), "..."); - sh = QSizeF(titleRect.width(), titleRect.height()); - break; - } - case Qt::PreferredSize: - case Qt::MaximumSize: { - QRectF titleRect = ChartPresenter::textBoundingRect(font(), m_text); - sh = QSizeF(titleRect.width(), titleRect.height()); - break; - } - case Qt::MinimumDescent: { - QFontMetrics fn(font()); - sh = QSizeF(0, fn.descent()); - break; - } - default: - break; - } - - return sh; -} - -QTCOMMERCIALCHART_END_NAMESPACE |