1 files changed, 140 insertions, 0 deletions
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
new file mode 100644
index 00000000..259cdaa9
--- /dev/null
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+ **
+ ** 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 "chartbarcategoryaxisx_p.h"
+#include "chartpresenter_p.h"
+#include "qbarcategoryaxis_p.h"
+#include "abstractchartlayout_p.h"
+#include <QDebug>
+#include <qmath.h>
+
+QT_CHARTS_BEGIN_NAMESPACE
+
+ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis, QGraphicsItem* item)
+    : HorizontalAxis(axis, item, true),
+      m_categoriesAxis(axis)
+{
+    QObject::connect(m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
+    handleCategoriesChanged();
+}
+
+ChartBarCategoryAxisX::~ChartBarCategoryAxisX()
+{
+}
+
+QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
+{
+    QVector<qreal> points;
+    const QRectF& gridRect = gridGeometry();
+    qreal range = max() - min();
+    const qreal delta = gridRect.width() / range;
+
+    if (delta < 2)
+        return points;
+
+    qreal adjustedMin = min() + 0.5;
+    qreal offset = (ceil(adjustedMin) - adjustedMin) * delta;
+
+    int count = qFloor(range);
+    if (count < 1)
+        return points;
+
+    points.resize(count + 2);
+
+    for (int i = 0; i < count + 2; ++i)
+        points[i] = offset + (qreal(i) * delta) + gridRect.left();
+
+    return points;
+}
+
+QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const
+{
+    QStringList result ;
+    const QRectF &gridRect = gridGeometry();
+    qreal d = (max() - min()) / gridRect.width();
+
+    for (int i = 0; i < layout.count() - 1; ++i) {
+        qreal x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5));
+        if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
+            result << m_categoriesAxis->categories().at(x);
+        } else {
+            // No label for x coordinate
+            result << QString();
+        }
+    }
+    result << QString();
+    return result;
+}
+
+
+void ChartBarCategoryAxisX::updateGeometry()
+{
+    const QVector<qreal>& layout = ChartAxisElement::layout();
+    if (layout.isEmpty())
+        return;
+    setLabels(createCategoryLabels(layout));
+    HorizontalAxis::updateGeometry();
+}
+
+void ChartBarCategoryAxisX::handleCategoriesChanged()
+{
+    QGraphicsLayoutItem::updateGeometry();
+    if(presenter()) presenter()->layout()->invalidate();
+}
+
+QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+    Q_UNUSED(constraint)
+
+    QSizeF sh;
+    QSizeF base = HorizontalAxis::sizeHint(which, constraint);
+    QStringList ticksList = m_categoriesAxis->categories();
+
+    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(),
+                                                                   QStringLiteral("..."),
+                                                                   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;
+}
+
+#include "moc_chartbarcategoryaxisx_p.cpp"
+
+QT_CHARTS_END_NAMESPACE