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>

5 files changed, 453 insertions, 0 deletions

diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
new file mode 100644
index 00000000..1e0bbbae
--- /dev/null
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
+** 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 "percentbarchartitem_p.h"
+#include "bar_p.h"
+#include "qabstractbarseries_p.h"
+#include "qbarset.h"
+#include "qbarset_p.h"
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item) :
+    AbstractBarChartItem(series, item)
+{
+    connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
+            this, SLOT(handleLabelsPositionChanged()));
+    connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
+}
+
+void PercentBarChartItem::initializeLayout()
+{
+    qreal categoryCount = m_series->d_func()->categoryCount();
+    qreal setCount = m_series->count();
+    qreal barWidth = m_series->d_func()->barWidth();
+
+    m_layout.clear();
+    for(int category = 0; category < categoryCount; category++) {
+        for (int set = 0; set < setCount; set++) {
+            QRectF rect;
+            QPointF topLeft;
+            QPointF bottomRight;
+
+            if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, domain()->minY()), m_validData);
+                bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, domain()->minY()), m_validData);
+            } else {
+                topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, 0), m_validData);
+                bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, 0), m_validData);
+            }
+
+            if (!m_validData)
+                 return;
+
+            rect.setTopLeft(topLeft);
+            rect.setBottomRight(bottomRight);
+            m_layout.append(rect.normalized());
+        }
+    }
+}
+
+QVector<QRectF> PercentBarChartItem::calculateLayout()
+{
+    QVector<QRectF> layout;
+
+    // Use temporary qreals for accuracy
+    qreal categoryCount = m_series->d_func()->categoryCount();
+    qreal setCount = m_series->count();
+    qreal barWidth = m_series->d_func()->barWidth();
+
+    for(int category = 0; category < categoryCount; category++) {
+        qreal sum = 0;
+        qreal categorySum = m_series->d_func()->categorySum(category);
+        for (int set = 0; set < setCount; set++) {
+            qreal value = m_series->barSets().at(set)->at(category);
+            QRectF rect;
+            qreal topY = 0;
+            qreal newSum = value + sum;
+            if (newSum > 0)
+                topY = 100 * newSum / categorySum;
+            qreal bottomY = 0;
+            if (sum > 0)
+                bottomY = 100 * sum / categorySum;
+            QPointF topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth/2, topY), m_validData);
+            QPointF bottomRight;
+            if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
+                bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? bottomY : domain()->minY()), m_validData);
+            else
+                bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? bottomY : 0), m_validData);
+
+            rect.setTopLeft(topLeft);
+            rect.setBottomRight(bottomRight);
+            layout.append(rect.normalized());
+            sum = newSum;
+        }
+    }
+    return layout;
+}
+
+void PercentBarChartItem::handleUpdatedBars()
+{
+    // Handle changes in pen, brush, labels etc.
+    int categoryCount = m_series->d_func()->categoryCount();
+    int setCount = m_series->count();
+    int itemIndex(0);
+    static const QString valueTag(QLatin1String("@value"));
+
+    for (int category = 0; category < categoryCount; category++) {
+        for (int set = 0; set < setCount; set++) {
+            QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
+            Bar *bar = m_bars.at(itemIndex);
+            bar->setPen(barSet->m_pen);
+            bar->setBrush(barSet->m_brush);
+            bar->update();
+
+            QGraphicsTextItem *label = m_labels.at(itemIndex);
+            qreal p = m_series->d_func()->percentageAt(set, category) * 100.0;
+            QString vString(presenter()->numberToString(p, 'f', 0));
+            QString valueLabel;
+            if (m_series->labelsFormat().isEmpty()) {
+                vString.append(QStringLiteral("%"));
+                valueLabel = vString;
+            } else {
+                valueLabel = m_series->labelsFormat();
+                valueLabel.replace(valueTag, vString);
+            }
+            label->setHtml(valueLabel);
+            label->setFont(barSet->m_labelFont);
+            label->setDefaultTextColor(barSet->m_labelBrush.color());
+            label->update();
+            itemIndex++;
+        }
+    }
+}
+
+void PercentBarChartItem::handleLabelsPositionChanged()
+{
+    positionLabels();
+}
+
+void PercentBarChartItem::positionLabels()
+{
+    for (int i = 0; i < m_layout.count(); i++) {
+        QGraphicsTextItem *label = m_labels.at(i);
+        qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
+        qreal yPos = 0;
+
+        int offset = m_bars.at(i)->pen().width() / 2 + 2;
+        if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
+            yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
+        else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
+            yPos = m_layout.at(i).top() - offset;
+        else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
+            yPos = m_layout.at(i).bottom() - label->boundingRect().height() + offset;
+        else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
+            yPos = m_layout.at(i).top() - label->boundingRect().height() + offset;
+
+        label->setPos(xPos, yPos);
+        label->setZValue(zValue() + 1);
+    }
+}
+
+#include "moc_percentbarchartitem_p.cpp"
+
+QT_CHARTS_END_NAMESPACE
diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
new file mode 100644
index 00000000..4293d875
--- /dev/null
+++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 PERCENTBARCHARTITEM_H
+#define PERCENTBARCHARTITEM_H
+
+#include "abstractbarchartitem_p.h"
+#include <QGraphicsItem>
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+class QAbstractBarSeries;
+
+class PercentBarChartItem : public AbstractBarChartItem
+{
+    Q_OBJECT
+public:
+    PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
+    void handleUpdatedBars();
+
+private slots:
+    void handleLabelsPositionChanged();
+    void positionLabels();
+
+private:
+    virtual QVector<QRectF> calculateLayout();
+    void initializeLayout();
+};
+
+QT_CHARTS_END_NAMESPACE
+
+#endif // PERCENTBARCHARTITEM_H
diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp
new file mode 100644
index 00000000..7899899b
--- /dev/null
+++ b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** 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 "qpercentbarseries.h"
+#include "qpercentbarseries_p.h"
+#include "percentbarchartitem_p.h"
+#include "chartdataset_p.h"
+#include "charttheme_p.h"
+#include "qvalueaxis.h"
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+/*!
+    \class QPercentBarSeries
+    \inmodule Qt Charts
+    \brief Series for creating percent bar chart.
+    \mainclass
+
+    QPercentBarSeries represents a series of data shown as bars. The purpose of this class is to
+    draw bars as stacks, where each bar is shown as percentage of all bars in that category.
+    QPercentBarSeries groups the data from sets to categories, which are defined by a QStringList.
+    Bars with zero value are not drawn.
+
+    See the \l {PercentbarChart Example} {percent bar chart example} to learn how to create a
+    percent bar chart.
+    \image examples_percentbarchart.png
+
+    \sa QBarSet, QStackedBarSeries, QAbstractBarSeries
+*/
+/*!
+    \qmltype PercentBarSeries
+    \instantiates QPercentBarSeries
+    \inqmlmodule QtCharts
+
+    \inherits AbstractBarSeries
+
+    \brief Series for creating persent bar chart.
+
+    The following QML shows how to create a simple percent bar chart:
+    \snippet qmlchart/qml/qmlchart/View8.qml 1
+    \beginfloatleft
+    \image examples_qmlchart8.png
+    \endfloat
+    \clearfloat
+*/
+
+/*!
+    Constructs empty QPercentBarSeries.
+    QPercentBarSeries is QObject which is a child of a \a parent.
+*/
+QPercentBarSeries::QPercentBarSeries(QObject *parent)
+    : QAbstractBarSeries(*new QPercentBarSeriesPrivate(this), parent)
+{
+}
+
+/*!
+    Destructor. Removes series from chart.
+*/
+QPercentBarSeries::~QPercentBarSeries()
+{
+    Q_D(QPercentBarSeries);
+    if (d->m_chart)
+        d->m_chart->removeSeries(this);
+}
+
+/*!
+    Returns QAbstractSeries::SeriesTypePercentBar.
+*/
+QAbstractSeries::SeriesType QPercentBarSeries::type() const
+{
+    return QAbstractSeries::SeriesTypePercentBar;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QPercentBarSeries *q) : QAbstractBarSeriesPrivate(q)
+{
+
+}
+
+void QPercentBarSeriesPrivate::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);
+    maxX = qMax(maxX, x - (qreal)0.5);
+    minY = 0;
+    maxY = 100;
+
+    domain()->setRange(minX, maxX, minY, maxY);
+}
+
+
+void QPercentBarSeriesPrivate::initializeGraphics(QGraphicsItem* parent)
+{
+    Q_Q(QPercentBarSeries);
+    PercentBarChartItem *bar = new PercentBarChartItem(q,parent);
+    m_item.reset(bar);
+    QAbstractSeriesPrivate::initializeGraphics(parent);
+}
+
+#include "moc_qpercentbarseries.cpp"
+
+QT_CHARTS_END_NAMESPACE
+
diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h
new file mode 100644
index 00000000..5f9ce140
--- /dev/null
+++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 QPERCENTBARSERIES_H
+#define QPERCENTBARSERIES_H
+
+#include <QStringList>
+#include <QtCharts/qabstractbarseries.h>
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+class QPercentBarSeriesPrivate;
+
+class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries
+{
+    Q_OBJECT
+public:
+    explicit QPercentBarSeries(QObject *parent = 0);
+    ~QPercentBarSeries();
+    QAbstractSeries::SeriesType type() const;
+
+private:
+    Q_DECLARE_PRIVATE(QPercentBarSeries)
+    Q_DISABLE_COPY(QPercentBarSeries)
+};
+
+QT_CHARTS_END_NAMESPACE
+
+#endif // QPERCENTBARSERIES_H
diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h
new file mode 100644
index 00000000..f31c9638
--- /dev/null
+++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** 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 QPERCENTBARSERIES_P_H
+#define QPERCENTBARSERIES_P_H
+
+#include "qabstractbarseries_p.h"
+#include "abstractdomain_p.h"
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+
+class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate
+{
+public:
+    QPercentBarSeriesPrivate(QPercentBarSeries *q);
+    void initializeDomain();
+    void initializeGraphics(QGraphicsItem* parent);
+private:
+    Q_DECLARE_PUBLIC(QPercentBarSeries)
+};
+
+QT_CHARTS_END_NAMESPACE
+
+#endif