HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1720:79d9101394e5

Fixes rounding issue with labels numbering

Michal Klocek -

r1720:79d9101394e5

parent child

Context file:

r1720:79d9101394e5

Collapse all files

src/axis/categoriesaxis/chartcategoriesaxisx.cpp +35 -18

             #include "chartcategoriesaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoriesaxis_p.h"
-            #include <cmath>
+            #include <QDebug>
+            #include <qmath.h>
             static int label_padding = 5;
                 Q_ASSERT(m_categoriesAxis->categories().count()>=1);
                 QVector<qreal> points;
-                points.resize(m_categoriesAxis->categories().count()+1);
+                points.resize(m_categoriesAxis->categories().count()+2);
                 const qreal delta = m_rect.width()/(m_categoriesAxis->categories().count());
-                const qreal min = m_categoriesAxis->d_ptr->min();
+                qreal offset =-m_min-0.5;
-                const qreal max = m_categoriesAxis->d_ptr->max();
-                qreal start =-min-0.5;
+                if(offset<=0) {
-                if(start<=0) {
+                    offset = int(offset * m_rect.width()/(m_max - m_min))%int(delta) + delta;
-                    start = fmod(start * m_rect.width()/(max - min),delta) + delta;
                 }
                 else {
-                    start = fmod(start * m_rect.width()/(max - min),delta);
+                    offset = int(offset * m_rect.width()/(m_max - m_min))%int(delta);
                 }
-                points[m_categoriesAxis->categories().count()] = m_rect.left() + m_rect.width();
+                points[0] = m_rect.left();
+                points[m_categoriesAxis->categories().count()+1] = m_rect.right();
                 for (int i = 0; i < m_categoriesAxis->categories().count(); ++i) {
-                    qreal x = start + i * delta + m_rect.left();
+                    qreal x = offset + i * delta + m_rect.left();
-                    points[i] = x;
+                    points[i+1] = x;
                 }
                 return points;
             }
+            QStringList ChartCategoriesAxisX::createCategoryLabels(const QVector<qreal>& layout) const
+            {
+                QStringList result;
+                qreal d = (m_max - m_min)/m_rect.width();
+                for (int i = 0;i < layout.count()-1; ++i) {
+                    qreal x = qFloor((((layout[i+1] + layout[i])/2-m_rect.left())*d + m_min+0.5));
+                    if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
+                        result << m_categoriesAxis->categories().at(x);
+                    }
+                    else {
+                        // No label for x coordinate
+                        result << "";
+                    }
+                }
+                result << "";
+                return result;
+            }
             void ChartCategoriesAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if(layout.isEmpty()) return;
-                QStringList ticksList;
+                QStringList ticksList = createCategoryLabels(layout);
-                createCategoryLabels(ticksList,m_min,m_max,m_categoriesAxis->categories());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
-                    if(i==layout.size()-1){
+                    if(i==0){
-                        labelItem->setPos(layout[i-1] + (delta)/2 - center.x(), m_rect.bottom() + label_padding);
+                        labelItem->setPos(layout[i+1] - (delta)/2 - center.x(), m_rect.bottom() + label_padding);
                     }else{
-                        labelItem->setPos(layout[i] - (delta)/2 - center.x(), m_rect.bottom() + label_padding);
+                        labelItem->setPos(layout[i] + (delta)/2 - center.x(), m_rect.bottom() + label_padding);
                     }
                     if(labelItem->pos().x()<=width || labelItem->pos().x()+ rect.width()>m_rect.right()) {

src/axis/categoriesaxis/chartcategoriesaxisx_p.h +2 0

             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private:
+                QStringList createCategoryLabels(const QVector<qreal>& layout) const;
             Q_SLOTS
                 void handleAxisUpdated();

src/axis/categoriesaxis/chartcategoriesaxisy.cpp +37 -23

             #include "chartcategoriesaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoriesaxis_p.h"
-            #include <QDebug>
+            #include <qmath.h>
-            #include <cmath>
             static int label_padding = 5;
                 Q_ASSERT(m_categoriesAxis->categories().count()>=1);
                 QVector<qreal> points;
-                points.resize(m_categoriesAxis->categories().count()+1);
+                points.resize(m_categoriesAxis->categories().count()+2);
-                qreal delta = m_rect.height()/(m_categoriesAxis->categories().count());
+                const qreal delta = m_rect.height()/(m_categoriesAxis->categories().count());
+                qreal offset = - m_min - 0.5;
-                const qreal min = m_categoriesAxis->d_ptr->min();
-                const qreal max = m_categoriesAxis->d_ptr->max();
-                qreal start =-min-0.5;
-                if(start<=0) {
+                if(offset<=0) {
-                    start = fmod(start * m_rect.height()/(max - min),delta) + delta;
+                    offset = int(offset * m_rect.height()/(m_max - m_min))%int(delta) + delta;
                 }
                 else {
-                    start = fmod(start * m_rect.height()/(max - min),delta);
+                    offset = int(offset * m_rect.height()/(m_max - m_min))%int(delta);
                 }
-                points[m_categoriesAxis->categories().count()] = m_rect.top();
+                points[0] = m_rect.bottom();
+                points[m_categoriesAxis->categories().count()+1] = m_rect.top();
                 for (int i = 0; i < m_categoriesAxis->categories().count(); ++i) {
-                    int y = m_rect.bottom() - i * delta - start;
+                    int y = m_rect.bottom() - i * delta - offset;
-                    points[i] = y;
+                    points[i+1] = y;
                 }
                 return points;
             }
+            QStringList ChartCategoriesAxisY::createCategoryLabels(const QVector<qreal>& layout) const
+            {
+                QStringList result;
+                qreal d = (m_max - m_min)/m_rect.height();
+                for (int i = 0;i < layout.count()-1; ++i) {
+                    qreal x = qFloor(((m_rect.height()- (layout[i+1] + layout[i])/2 + m_rect.top())*d + m_min+0.5));
+                    if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
+                        result << m_categoriesAxis->categories().at(x);
+                    }
+                    else {
+                        // No label for x coordinate
+                        result << "";
+                    }
+                }
+                result << "";
+                return result;
+            }
             void ChartCategoriesAxisY::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if(layout.isEmpty()) return;
-                QStringList ticksList;
+                QStringList ticksList = createCategoryLabels(layout);
-                createCategoryLabels(ticksList,m_min,m_max,m_categoriesAxis->categories());
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
-                    if(i==layout.size()-1) {
+                    if(i==0) {
-                        labelItem->setPos(m_rect.left() - rect.width() - label_padding ,layout[i-1] - (delta)/2 - center.y());
+                       labelItem->setPos(m_rect.left() - rect.width() - label_padding ,layout[i+1] + (delta)/2 - center.y());
                     }
                     else {
-                        labelItem->setPos(m_rect.left() - rect.width() - label_padding ,layout[i] + (delta)/2 - center.y());
+                        labelItem->setPos(m_rect.left() - rect.width() - label_padding ,layout[i] - (delta)/2 - center.y());
                     }
                     if(labelItem->pos().y()+rect.height()>= height || labelItem->pos().y() < m_rect.top()) {
                 if(m_categoriesAxis->categories()!=m_categories)
                 {
                     m_categories=m_categoriesAxis->categories();
-                    if(ChartAxis::layout().count()==m_categories.size()+1) updateGeometry();
+                    if(ChartAxis::layout().count()==m_categories.size()+1) {
+                        updateGeometry();
+                    }
                 }
                 ChartAxis::handleAxisUpdated();
             }

src/axis/categoriesaxis/chartcategoriesaxisy_p.h +3 0

             protected:
                 QVector<qreal> calculateLayout() const;
                 void updateGeometry();
+            private:
+                QStringList createCategoryLabels(const QVector<qreal>& layout) const;
             Q_SLOTS
                     void handleAxisUpdated();
             private:
                 QStringList m_categories;
+                QVector<int> m_labelIndex;
                 QBarCategoriesAxis *m_categoriesAxis;
             };

src/axis/chartaxis.cpp +1 -24

             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include "domain_p.h"
-            #include <QPainter>
-            #include <QDebug>
             #include <qmath.h>
             #include <QDateTime>
                 Q_ASSERT(max>min);
                 Q_ASSERT(ticks>1);
-                int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
+                int n = qMax(int(-qFloor(log10((max-min)/(ticks-1)))),0);
                 n++;
                 for (int i=0; i< ticks; i++) {
                     qreal value = min + (i * (max - min)/ (ticks-1));
                 }
             }
-            void ChartAxis::createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const
-                Q_ASSERT(max>min);
-                Q_UNUSED(max);
-                int x = qFloor(min+0.5);
-                int count = 0;
-                // Try to find category for x coordinate
-                while (count < categories.count()+1) {
-                    if ((x < categories.count()) && (x >= 0)) {
-                        labels << categories.at(x);
-                    } else {
-                        // No label for x coordinate
-                        labels << "";
-                    x++;
-                    count++;
             #include "moc_chartaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/chartaxis_p.h 0 -1

                 virtual void updateGeometry() = 0;
                 virtual QVector<qreal> calculateLayout() const = 0;
                 void createNumberLabels(QStringList &labels,qreal min, qreal max,int ticks) const;
-                void createCategoryLabels(QStringList &labels,qreal min, qreal max,const QStringList &categories) const;
             public Q_SLOTS:
                 virtual void handleAxisUpdated();

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