HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1854:4846aebc38ef

QValueAxis: added posibility to specify label format

Marek Rosa -

r1854:4846aebc38ef

parent child

Context file:

r1854:4846aebc38ef

src/axis/chartaxis.cpp +6 -1

             #include "domain_p.h"
             #include <qmath.h>
             #include <QDateTime>
+            #include <QValueAxis>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 int n = qMax(int(-qFloor(log10((max-min)/(ticks-1)))),0);
                 n++;
+                QValueAxis *axis = qobject_cast<QValueAxis *>(m_chartAxis);
+                QByteArray array = axis->labelFormat().toAscii();
                 for (int i=0; i< ticks; i++) {
                     qreal value = min + (i * (max - min)/ (ticks-1));
-                    labels << QString::number(value,'f',n);
+                    QString label;
+                    labels << label.sprintf(array, value);;
                 }
             }

src/axis/valueaxis/qvalueaxis.cpp +14 -1

                 return d->m_niceNumbers;
             }
+            void QValueAxis::setLabelFormat(const QString &format)
+            {
+                Q_D(QValueAxis);
+                d->m_format = format;
+            }
+            QString QValueAxis::labelFormat() const
+            {
+                Q_D(const QValueAxis);
+                return d->m_format;
+            }
             /*!
               Returns the type of the axis
             */
                 m_min(0),
                 m_max(0),
                 m_tickCount(5),
-                m_niceNumbers(false)
+                m_niceNumbers(false),
+                m_format("%g")
             {
             }

src/axis/valueaxis/qvalueaxis.h +3 0

                 void setTickCount(int count);
                 int tickCount() const;
+                void setLabelFormat(const QString &format);
+                QString labelFormat() const;
                 void setNiceNumbersEnabled(bool enable = true);
                 bool niceNumbersEnabled() const;

src/axis/valueaxis/qvalueaxis_p.h +1 0

                 qreal m_max;
                 int m_tickCount;
                 bool m_niceNumbers;
+                QString m_format;
                 Q_DECLARE_PUBLIC(QValueAxis)
             };

General Comments 0

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

No TODOs yet

	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