HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2780:740f4f94adf8

Added possibility to set labels position for QCategoryAxis...

Titta Heikkala -

r2780:740f4f94adf8

parent child

Context file:

r2780:740f4f94adf8

Collapse all files

src/charts/axis/categoryaxis/qcategoryaxis.cpp +36 -1

@@ -99,6 +99,25 QT_CHARTS_BEGIN_NAMESPACE
99	Axis emits signal when the categories of the axis have changed.	99	Axis emits signal when the categories of the axis have changed.
100	*/	100	*/
101		101
		102	/*!
		103	\enum QCategoryAxis::AxisLabelsPosition
		104
		105	This enum describes the position of the category labels.
		106
		107	\value AxisLabelsPositionCenter Labels are centered to category.
		108	\value AxisLabelsPositionOnValue Labels are positioned to the high end limit of the category.
		109	*/
		110	/*!
		111	\property QCategoryAxis::labelsPosition
		112	Defines the position of the category labels. The labels in the beginning and in the end of the
		113	axes may overlap other axes labels when positioned on value.
		114	*/
		115	/*!
		116	\qmlproperty AxisLabelsPosition CategoryAxis::labelsPosition
		117	Defines the position of the category labels. The labels in the beginning and in the end of the
		118	axes may overlap other axes labels when positioned on value.
		119	*/
		120
102		121
103	/*!	122	/*!
104	Constructs an axis object which is a child of \a parent.	123	Constructs an axis object which is a child of \a parent.
@@ -284,11 +303,27 QAbstractAxis::AxisType QCategoryAxis::type() const
284	return QAbstractAxis::AxisTypeCategory;	303	return QAbstractAxis::AxisTypeCategory;
285	}	304	}
286		305
		306	void QCategoryAxis::setLabelsPosition(QCategoryAxis::AxisLabelsPosition position)
		307	{
		308	Q_D(QCategoryAxis);
		309	if (d->m_labelsPosition != position) {
		310	d->m_labelsPosition = position;
		311	emit labelsPositionChanged(position);
		312	}
		313	}
		314
		315	QCategoryAxis::AxisLabelsPosition QCategoryAxis::labelsPosition() const
		316	{
		317	Q_D(const QCategoryAxis);
		318	return d->m_labelsPosition;
		319	}
		320
287	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	321	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
288		322
289	QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis *q)	323	QCategoryAxisPrivate::QCategoryAxisPrivate(QCategoryAxis *q)
290	: QValueAxisPrivate(q),	324	: QValueAxisPrivate(q),
291	m_categoryMinimum(0)	325	m_categoryMinimum(0),
		326	m_labelsPosition(QCategoryAxis::AxisLabelsPositionCenter)
292	{	327	{
293		328
294	}	329	}

src/charts/axis/categoryaxis/qcategoryaxis.h +12 0

                 Q_PROPERTY(qreal startValue READ startValue WRITE setStartValue)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QStringList categoriesLabels READ categoriesLabels)
+                Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged)
+                Q_ENUMS(AxisLabelsPosition)
             public:
+                enum AxisLabelsPosition {
+                    AxisLabelsPositionCenter = 0x0,
+                    AxisLabelsPositionOnValue = 0x1
+                };
                 explicit QCategoryAxis(QObject *parent = 0);
                 ~QCategoryAxis();
                 QStringList categoriesLabels();
                 int count() const;
+                QCategoryAxis::AxisLabelsPosition labelsPosition() const;
+                void setLabelsPosition(QCategoryAxis::AxisLabelsPosition position);
             Q_SIGNALS:
                 void categoriesChanged();
+                void labelsPositionChanged(QCategoryAxis::AxisLabelsPosition position);
             private:
                 Q_DECLARE_PRIVATE(QCategoryAxis)

src/charts/axis/categoryaxis/qcategoryaxis_p.h +1 0

                 QMap<QString , Range> m_categoriesMap;
                 QStringList m_categories;
                 qreal m_categoryMinimum;
+                QCategoryAxis::AxisLabelsPosition m_labelsPosition;
             private:
                 Q_DECLARE_PUBLIC(QCategoryAxis)

src/charts/axis/horizontalaxis.cpp +17 0

             #include <private/horizontalaxis_p.h>
             #include <private/qabstractaxis_p.h>
             #include <private/chartpresenter_p.h>
+            #include <QtCharts/QCategoryAxis>
             #include <QtCore/QtMath>
             #include <QtCore/QDebug>
                         qreal leftBound = qMax(layout[i], gridRect.left());
                         qreal rightBound = qMin(layout[i + 1], gridRect.right());
                         const qreal delta = rightBound - leftBound;
+                        if (axis()->type() != QAbstractAxis::AxisTypeCategory) {
                             // Hide label in case visible part of the category at the grid edge is too narrow
                             if (delta < boundingRect.width()
                                 && (leftBound == gridRect.left() || rightBound == gridRect.right())) {
                             } else {
                                 labelItem->setPos(leftBound + (delta / 2.0) - center.x(), labelItem->pos().y());
                             }
+                        } else {
+                            QCategoryAxis *categoryAxis = static_cast<QCategoryAxis *>(axis());
+                            if (categoryAxis->labelsPosition() == QCategoryAxis::AxisLabelsPositionCenter) {
+                                if (delta < boundingRect.width()
+                                    && (leftBound == gridRect.left() || rightBound == gridRect.right())) {
+                                    forceHide = true;
+                                } else {
+                                    labelItem->setPos(leftBound + (delta / 2.0) - center.x(),
+                                                      labelItem->pos().y());
+                                }
+                            } else if (categoryAxis->labelsPosition()
+                                       == QCategoryAxis::AxisLabelsPositionOnValue) {
+                                labelItem->setPos(rightBound - center.x(), labelItem->pos().y());
+                            }
+                        }
                     }
                     //label overlap detection - compensate one pixel for rounding errors

src/charts/axis/verticalaxis.cpp +24 -3

             #include <private/verticalaxis_p.h>
             #include <QtCharts/QAbstractAxis>
             #include <private/chartpresenter_p.h>
+            #include <QtCharts/QCategoryAxis>
             #include <QtCore/QDebug>
             QT_CHARTS_BEGIN_NAMESPACE
                     //label in between
                     bool forceHide = false;
+                    bool labelOnValue = false;
                     if (intervalAxis() && (i + 1) != layout.size()) {
                         qreal lowerBound = qMin(layout[i], gridRect.bottom());
                         qreal upperBound = qMax(layout[i + 1], gridRect.top());
                         const qreal delta = lowerBound - upperBound;
+                        if (axis()->type() != QAbstractAxis::AxisTypeCategory) {
                             // Hide label in case visible part of the category at the grid edge is too narrow
                             if (delta < boundingRect.height()
                                 && (lowerBound == gridRect.bottom() || upperBound == gridRect.top())) {
                                 forceHide = true;
                             } else {
-                            labelItem->setPos(labelItem->pos().x() , lowerBound - (delta / 2.0) - center.y());
+                                labelItem->setPos(labelItem->pos().x(),
+                                                  lowerBound - (delta / 2.0) - center.y());
+                            }
+                        } else {
+                            QCategoryAxis *categoryAxis = static_cast<QCategoryAxis *>(axis());
+                            if (categoryAxis->labelsPosition() == QCategoryAxis::AxisLabelsPositionCenter) {
+                                if (delta < boundingRect.height()
+                                    && (lowerBound == gridRect.bottom() || upperBound == gridRect.top())) {
+                                    forceHide = true;
+                                } else {
+                                    labelItem->setPos(labelItem->pos().x(),
+                                                      lowerBound - (delta / 2.0) - center.y());
+                                }
+                            } else if (categoryAxis->labelsPosition()
+                                       == QCategoryAxis::AxisLabelsPositionOnValue) {
+                                labelOnValue = true;
+                                labelItem->setPos(labelItem->pos().x(), upperBound - center.y());
+                            }
                         }
                     }
                     //label overlap detection - compensate one pixel for rounding errors
                     if (labelItem->pos().y() + boundingRect.height() > height || forceHide ||
-                        (labelItem->pos().y() + (heightDiff / 2.0) - 1.0) > axisRect.bottom() ||
+                        ((labelItem->pos().y() + (heightDiff / 2.0) - 1.0) > axisRect.bottom()
-                        labelItem->pos().y() + (heightDiff / 2.0) < (axisRect.top() - 1.0)) {
+                         && !labelOnValue) ||
+                        (labelItem->pos().y() + (heightDiff / 2.0) < (axisRect.top() - 1.0) && !labelOnValue)) {
                         labelItem->setVisible(false);
                     }
                     else {

src/chartsqml2/chartsqml2_plugin.cpp +4 0

                                                                 QLatin1String("Trying to create uncreatable: DeclarativeAxes."));
                     qmlRegisterUncreatableType<DeclarativeMargins>(uri, 2, 0, "Margins",
                                                                    QLatin1String("Trying to create uncreatable: Margins."));
+                    // QtCharts 2.1
+                    qmlRegisterType<DeclarativeCategoryAxis, 1>(uri, 2, 1, "CategoryAxis");
                 }
             };
             QT_CHARTS_END_NAMESPACE

src/chartsqml2/declarativecategoryaxis.cpp +14 0

@@ -93,6 +93,20 void DeclarativeCategoryAxis::appendAxisChildren(QQmlListProperty<QObject> *list
93	Q_UNUSED(element)	93	Q_UNUSED(element)
94	}	94	}
95		95
		96	DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosition() const
		97	{
		98	return (DeclarativeCategoryAxis::AxisLabelsPosition) QCategoryAxis::labelsPosition();
		99	}
		100
		101	void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position)
		102	{
		103	QCategoryAxis::AxisLabelsPosition labelsPosition = (QCategoryAxis::AxisLabelsPosition) position;
		104	if (labelsPosition != m_labelsPosition) {
		105	QCategoryAxis::setLabelsPosition(labelsPosition);
		106	emit labelsPositionChanged(position);
		107	}
		108	}
		109
96	#include "moc_declarativecategoryaxis.cpp"	110	#include "moc_declarativecategoryaxis.cpp"
97		111
98	QT_CHARTS_END_NAMESPACE	112	QT_CHARTS_END_NAMESPACE

src/chartsqml2/declarativecategoryaxis.h +19 0

                 Q_INTERFACES(QQmlParserStatus)
                 Q_PROPERTY(QQmlListProperty<QObject> axisChildren READ axisChildren)
                 Q_CLASSINFO("DefaultProperty", "axisChildren")
+                Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged REVISION 1)
+                Q_ENUMS(AxisLabelsPosition)
             public:
+                // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
+                enum AxisLabelsPosition {
+                    AxisLabelsPositionCenter = 0x0,
+                    AxisLabelsPositionOnValue = 0x1
+                };
                 explicit DeclarativeCategoryAxis(QObject *parent = 0);
                 QQmlListProperty<QObject> axisChildren();
             public: // from QDeclarativeParserStatus
                 void classBegin();
                 void componentComplete();
+            public:
+                AxisLabelsPosition labelsPosition() const;
+                void setLabelsPosition(AxisLabelsPosition position);
+            Q_SIGNALS:
+                Q_REVISION(1) void labelsPositionChanged(AxisLabelsPosition position);
             public Q_SLOTS:
                 Q_INVOKABLE void append(const QString &label, qreal categoryEndValue);
                 Q_INVOKABLE void remove(const QString &label);
             private:
                 static bool endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2);
+            private:
+                AxisLabelsPosition m_labelsPosition;
             };
             QT_CHARTS_END_NAMESPACE

src/chartsqml2/plugins.qmltypes +31 -2

@@ -430,9 +430,26 Module {
430	name: "QtCharts::DeclarativeCategoryAxis"	430	name: "QtCharts::DeclarativeCategoryAxis"
431	defaultProperty: "axisChildren"	431	defaultProperty: "axisChildren"
432	prototype: "QtCharts::QCategoryAxis"	432	prototype: "QtCharts::QCategoryAxis"
433	exports: ["QtCharts/CategoryAxis 1.1", "QtCharts/CategoryAxis 2.0"]	433	exports: [
434	exportMetaObjectRevisions: [0, 0]	434	"QtCharts/CategoryAxis 1.1",
		435	"QtCharts/CategoryAxis 2.0",
		436	"QtCharts/CategoryAxis 2.1"
		437	]
		438	exportMetaObjectRevisions: [0, 0, 1]
		439	Enum {
		440	name: "AxisLabelsPosition"
		441	values: {
		442	"AxisLabelsPositionCenter": 0,
		443	"AxisLabelsPositionOnValue": 1
		444	}
		445	}
435	Property { name: "axisChildren"; type: "QObject"; isList: true; isReadonly: true }	446	Property { name: "axisChildren"; type: "QObject"; isList: true; isReadonly: true }
		447	Property { name: "labelsPosition"; revision: 1; type: "AxisLabelsPosition" }
		448	Signal {
		449	name: "labelsPositionChanged"
		450	revision: 1
		451	Parameter { name: "position"; type: "AxisLabelsPosition" }
		452	}
436	Method {	453	Method {
437	name: "append"	454	name: "append"
438	Parameter { name: "label"; type: "string" }	455	Parameter { name: "label"; type: "string" }
@@ -1911,10 +1928,22 Module {
1911	Component {	1928	Component {
1912	name: "QtCharts::QCategoryAxis"	1929	name: "QtCharts::QCategoryAxis"
1913	prototype: "QtCharts::QValueAxis"	1930	prototype: "QtCharts::QValueAxis"
		1931	Enum {
		1932	name: "AxisLabelsPosition"
		1933	values: {
		1934	"AxisLabelsPositionCenter": 0,
		1935	"AxisLabelsPositionOnValue": 1
		1936	}
		1937	}
1914	Property { name: "startValue"; type: "double" }	1938	Property { name: "startValue"; type: "double" }
1915	Property { name: "count"; type: "int"; isReadonly: true }	1939	Property { name: "count"; type: "int"; isReadonly: true }
1916	Property { name: "categoriesLabels"; type: "QStringList"; isReadonly: true }	1940	Property { name: "categoriesLabels"; type: "QStringList"; isReadonly: true }
		1941	Property { name: "labelsPosition"; type: "AxisLabelsPosition" }
1917	Signal { name: "categoriesChanged" }	1942	Signal { name: "categoriesChanged" }
		1943	Signal {
		1944	name: "labelsPositionChanged"
		1945	Parameter { name: "position"; type: "QCategoryAxis::AxisLabelsPosition" }
		1946	}
1918	}	1947	}
1919	Component {	1948	Component {
1920	name: "QtCharts::QDateTimeAxis"	1949	name: "QtCharts::QDateTimeAxis"

tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +12 0

                 void range();
                 void range_animation_data();
                 void range_animation();
+                void labels_position();
                 void interval_data();
                 void interval();
             void tst_QCategoryAxis::initTestCase()
             {
+                qRegisterMetaType<QCategoryAxis::AxisLabelsPosition>("QCategoryAxis::AxisLabelsPosition");
             }
             void tst_QCategoryAxis::cleanupTestCase()
                 QVERIFY(qFuzzyCompare(m_categoryaxis->max(), 0));
                 QVERIFY(qFuzzyCompare(m_categoryaxis->min(), 0));
                 QCOMPARE(m_categoryaxis->type(), QAbstractAxis::AxisTypeCategory);
+                QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionCenter);
                 m_chart->setAxisX(m_categoryaxis, m_series);
                 m_view->show();
                 QCOMPARE(m_categoryaxis->endValue("replaced"), (qreal)75);
             }
+            void tst_QCategoryAxis::labels_position()
+            {
+                QSignalSpy spy(m_categoryaxis,
+                               SIGNAL(labelsPositionChanged(QCategoryAxis::AxisLabelsPosition)));
+                m_categoryaxis->setLabelsPosition(QCategoryAxis::AxisLabelsPositionOnValue);
+                QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionOnValue);
+                QCOMPARE(spy.count(), 1);
+            }
             QTEST_MAIN(tst_QCategoryAxis)
             #include "tst_qcategoryaxis.moc"

tests/auto/qml-qtquicktest/tst_categoryaxis.qml +16 -1

             import QtQuick 2.0
             import QtTest 1.0
-            import QtCharts 2.0
+            import QtCharts 2.1
             Rectangle {
                 width: 400
                         compare(lineSeries1.axisY.categoriesLabels[1], "label1", "AxisY categories labels");
                         compare(lineSeries1.axisY.categoriesLabels[2], "label2", "AxisY categories labels");
                     }
+                    function test_properties() {
+                        compare(lineSeries1.axisY.labelsPosition, CategoryAxis.AxisLabelsPositionCenter);
+                    }
+                    function test_signals() {
+                        axisLabelsPositionSpy.clear();
+                        lineSeries1.axisY.labelsPosition = CategoryAxis.AxisLabelsPositionOnValue;
+                        compare(axisLabelsPositionSpy.count, 1, "onLabelsPositionChanged")
+                    }
                 }
                 ChartView {
                                 label: "label2"
                                 endValue: 10
                             }
+                            SignalSpy {
+                                id: axisLabelsPositionSpy
+                                target: axisY
+                                signalName: "labelsPositionChanged"
+                            }
                         }
                         XYPoint { x: -1; y: -1 }
                         XYPoint { x: 0; y: 0 }

tests/auto/qml/tst_qml.cpp +9 0

                 QString imports_1_3();
                 QString imports_1_4();
                 QString imports_2_0();
+                QString imports_2_1();
             };
                        "import QtCharts 2.0 \n";
             }
+            QString tst_qml::imports_2_1()
+            {
+                return "import QtQuick 2.1 \n"
+                       "import QtCharts 2.1 \n";
+            }
             void tst_qml::initTestCase()
             {
             }
                 QTest::newRow("LogValueAxis_2_0") <<  imports_2_0() + "LogValueAxis{}";
                 QTest::newRow("BoxPlotSeries_2_0") <<  imports_2_0() + "BoxPlotSeries{}";
                 QTest::newRow("BoxSet_2_0") <<  imports_2_0() + "BoxSet{}";
+                QTest::newRow("CategoryAxis") << imports_2_1() + "CategoryAxis{}";
             }
             void tst_qml::checkPlugin()

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages