HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1572:739f255d74df

fixed bug in category range handling in categoryaxis

sauimone -

r1572:739f255d74df

parent child

Context file:

r1572:739f255d74df

Collapse all files

examples/stackedbarchart/main.cpp +3 0

                 QCategoriesAxis* axis = new QCategoriesAxis();
                 axis->append(categories);
                 chart->setAxisX(series,axis);
+            //    axis->setMinCategory(QString("Feb"));
+            //    axis->setMaxCategory(QString("May"));
+            //    axis->setRange(QString("Feb"), QString("Apr"));
             //![4]
             //![5]

src/axis/qcategoriesaxis.cpp +17 -4

             #include "qcategoriesaxis_p.h"
             #include "chartcategoriesaxisx_p.h"
             #include "chartcategoriesaxisy_p.h"
+            #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 if (minIndex == -1) {
                     return;
                 }
-                setRange(minIndex,m_max);
+                int maxIndex = m_max;
+                if (minIndex > maxIndex) {
+                    maxIndex = m_categories.count()-1;
+                }
+                setRange(minIndex - 0.5, maxIndex + 0.5);
             }
             void QCategoriesAxisPrivate::setMaxCategory(const QString& maxCategory)
                 if (maxIndex == -1) {
                     return;
                 }
-                setRange(m_min,maxIndex);
+                if (maxIndex < m_min) {
+                    m_min = 0;
+                }
+                setRange(m_min - 0.5, maxIndex + 0.5);
             }
             void QCategoriesAxisPrivate::setRangeCategory(const QString& minCategory, const QString& maxCategory)
                 if (maxIndex == -1) {
                     return;
                 }
-                setRange(minIndex,maxIndex);
+                setRange(minIndex -0.5, maxIndex + 0.5);
             }
             void QCategoriesAxisPrivate::setMin(const qreal min)
             void QCategoriesAxisPrivate::setRange(const qreal min, const qreal max)
             {
+                if (max <= min) {
+                    // max must be greater than min
+                    return;
+                }
                 Q_Q(QCategoriesAxis);
                 bool changed = false;
                 if (!qFuzzyIsNull(m_min - min)) {
                 }
                 if (changed) {
-                    emit this->changed(m_min, m_max, m_ticksCount, false);
+                    emit this->changed(m_min, m_max, qCeil(m_max) -qCeil(m_min) +1, false);
                     emit q->categoriesChanged();
                 }
             }

src/chartdataset.cpp +1 0

             		oldAxis->deleteLater();
             	}
+                // TODO: should we take domain from axis (if it has min and max already defined)
                 Domain* domain = m_seriesDomainMap.value(series);
                 Q_ASSERT(domain);

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