HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2718:ec8b39fe3792

Fix axis attachments in QML....

Miikka Heikkinen -

r2718:ec8b39fe3792

parent child

Context file:

r2718:ec8b39fe3792

Collapse all files

src/chartsqml2/declarativechart.cpp +39 -35

                 QQuickItem::componentComplete();
             }
+            void DeclarativeChart::seriesAxisAttachHelper(QAbstractSeries *series, QAbstractAxis *axis,
+                                                          Qt::Orientations orientation,
+                                                          Qt::Alignment alignment)
+            {
+                if (!series->attachedAxes().contains(axis)) {
+                    // Remove & delete old axes that are not attached to any other series
+                    foreach (QAbstractAxis* oldAxis, m_chart->axes(orientation, series)) {
+                        bool otherAttachments = false;
+                        if (oldAxis != axis) {
+                            foreach (QAbstractSeries *oldSeries, m_chart->series()) {
+                                if (oldSeries != series && oldSeries->attachedAxes().contains(oldAxis)) {
+                                    otherAttachments = true;
+                                    break;
+                                }
+                            }
+                            if (!otherAttachments) {
+                                m_chart->removeAxis(oldAxis);
+                                delete oldAxis;
+                            }
+                        }
+                    }
+                    if (!m_chart->axes(orientation).contains(axis))
+                        m_chart->addAxis(axis, alignment);
+                    series->attachAxis(axis);
+                }
+            }
             void DeclarativeChart::handleAxisXSet(QAbstractAxis *axis)
             {
                 QAbstractSeries *s = qobject_cast<QAbstractSeries *>(sender());
                 if (axis && s) {
-                    if (!m_chart->axes(Qt::Horizontal).contains(axis))
+                    seriesAxisAttachHelper(s, axis, Qt::Horizontal, Qt::AlignBottom);
-                        m_chart->setAxisX(axis, s);
-                    if (!s->attachedAxes().contains(axis))
-                        s->attachAxis(axis);
                 } else {
                     qWarning() << "Trying to set axisX to null.";
                 }
             {
                 QAbstractSeries *s = qobject_cast<QAbstractSeries *>(sender());
                 if (axis && s) {
-                    if (!m_chart->axes(Qt::Horizontal).contains(axis)) {
+                    seriesAxisAttachHelper(s, axis, Qt::Horizontal, Qt::AlignTop);
-                        QList<QAbstractAxis *> oldAxes = m_chart->axes(Qt::Horizontal, s);
-                        foreach (QAbstractAxis* a, oldAxes) {
-                                m_chart->removeAxis(a);
-                                delete a;
-                        m_chart->addAxis(axis, Qt::AlignTop);
-                    if (!s->attachedAxes().contains(axis))
-                        s->attachAxis(axis);
                 } else {
                     qWarning() << "Trying to set axisXTop to null.";
                 }
             {
                 QAbstractSeries *s = qobject_cast<QAbstractSeries *>(sender());
                 if (axis && s) {
-                    if (!m_chart->axes(Qt::Vertical).contains(axis))
+                    seriesAxisAttachHelper(s, axis, Qt::Vertical, Qt::AlignLeft);
-                        m_chart->setAxisY(axis, s);
-                    if (!s->attachedAxes().contains(axis))
-                        s->attachAxis(axis);
                 } else {
                     qWarning() << "Trying to set axisY to null.";
                 }
             {
                 QAbstractSeries *s = qobject_cast<QAbstractSeries *>(sender());
                 if (axis && s) {
-                    if (!m_chart->axes(Qt::Vertical).contains(axis)) {
+                    seriesAxisAttachHelper(s, axis, Qt::Vertical, Qt::AlignRight);
-                        QList<QAbstractAxis *> oldAxes = m_chart->axes((Qt::Vertical), s);
-                        foreach (QAbstractAxis* a, oldAxes) {
-                            m_chart->removeAxis(a);
-                            delete a;
-                        m_chart->addAxis(axis, Qt::AlignRight);
-                    if (!s->attachedAxes().contains(axis))
-                        s->attachAxis(axis);
                 } else {
                     qWarning() << "Trying to set axisYRight to null.";
                 }
                     series->setName(name);
                     m_chart->addSeries(series);
+                    if (!axisX || !axisY)
+                        initializeAxes(series);
                     if (axisX)
                         setAxisX(axisX, series);
                     if (axisY)
                         setAxisY(axisY, series);
-                    if (series->attachedAxes().count() < 2)
-                        initializeAxes(series);
                 }
                 return series;
             void DeclarativeChart::setAxisX(QAbstractAxis *axis, QAbstractSeries *series)
             {
-                if (axis)
+                if (axis && series)
-                    m_chart->setAxisX(axis, series);
+                    seriesAxisAttachHelper(series, axis, Qt::Horizontal, Qt::AlignBottom);
             }
             void DeclarativeChart::setAxisY(QAbstractAxis *axis, QAbstractSeries *series)
             {
-                if (axis)
+                if (axis && series)
-                    m_chart->setAxisY(axis, series);
+                    seriesAxisAttachHelper(series, axis, Qt::Vertical, Qt::AlignLeft);
             }
             void DeclarativeChart::createDefaultAxes()

src/chartsqml2/declarativechart.h +2 0

             private:
                 void initChart(QChart::ChartType type);
+                void seriesAxisAttachHelper(QAbstractSeries *series, QAbstractAxis *axis,
+                                            Qt::Orientations orientation, Qt::Alignment alignment);
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;

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