HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r687:1855aba16ab8

Changes public API for nice nuumbers -> setNiceNumbers(bool enabled)

Michal Klocek -

r687:1855aba16ab8

parent child

Context file:

r687:1855aba16ab8

Collapse all files

src/axis/qchartaxis.cpp +7 -7

             m_min(0),
             m_max(0),
             m_ticksCount(5),
-            m_selection(NativeLabelsSelection)
+            m_niceNumbers(false)
             {
             }
                 if(changed) {
                     emit rangeChanged(m_min,m_max);
-                    emit this->changed(m_min, m_max, m_ticksCount, m_selection);
+                    emit this->changed(m_min, m_max, m_ticksCount, m_niceNumbers);
                 }
             }
             	if(m_ticksCount!=count) {
             		m_ticksCount=count;
             		emit ticksCountChanged(count);
-            		emit changed(m_min, m_max, m_ticksCount, m_selection);
+            		emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
             	}
             }
                setTicksCount(count);
             }
-            void QChartAxis::setLabelsSelectionMode(LabelsSelection mode)
+            void QChartAxis::setNiceNumbers(bool enabled)
             {
-                if(m_selection!=mode){
+                if(m_niceNumbers!=enabled){
-                    m_selection=mode;
+                    m_niceNumbers=enabled;
-                    emit changed(m_min, m_max, m_ticksCount, m_selection);
+                    emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
                 }
             }

src/axis/qchartaxis.h +4 -5

             {
             	Q_OBJECT
             public:
-            	enum LabelsSelection{ NativeLabelsSelection, LooseLabelsSelection};
                 QChartAxis(QObject* parent =0);
                 ~QChartAxis();
                 void setTicksCount(int count);
                 int ticksCount() const { return m_ticksCount;}
-                void setLabelsSelectionMode(LabelsSelection mode);
+                void setNiceNumbers(bool enabled);
-                LabelsSelection labelsSelectionMode() const { return m_selection;}
+                bool niceNumbers() const { return m_niceNumbers;}
                 QChartAxisCategories* categories() { return &m_category; }
             //interal signal
             	void updated();
-            	void changed(qreal min, qreal max, int tickCount,QChartAxis::LabelsSelection mode);
+            	void changed(qreal min, qreal max, int tickCount,bool niceNumbers);
             //internal slot
             public slots:
             	void handleAxisRangeChanged(qreal min, qreal max,int count);
                 int m_ticksCount;
                 QChartAxisCategories m_category;
-                LabelsSelection m_selection;
+                bool m_niceNumbers;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/domain.cpp +15 -17

             m_maxY(0),
             m_tickXCount(5),
             m_tickYCount(5),
-            m_selection(QChartAxis::NativeLabelsSelection)
+            m_niceNumbers(false)
             {
             }
                 }
                 if(m_minX!=minX || m_maxX!=maxX) {
-                    niceNumbers(minX, maxX, m_tickXCount);
+                    if(m_niceNumbers) looseNiceNumbers(minX, maxX, m_tickXCount);
                     m_minX=minX;
                     m_maxX=maxX;
                     domainChanged=true;
                 }
                 if(m_minY!=minY || m_maxY!=maxY) {
-                    niceNumbers(minY, maxY, m_tickYCount);
+                    if(m_niceNumbers) looseNiceNumbers(minY, maxY, m_tickYCount);
                     m_minY=minY;
                     m_maxY=maxY;
                     domainChanged=true;
                 m_minY = m_maxY - dy * rect.bottom();
                 m_maxY = m_maxY - dy * rect.top();
-                niceNumbers(m_minX, m_maxX, m_tickXCount);
+                if(m_niceNumbers) {
-                niceNumbers(m_minY, m_maxY, m_tickYCount);
+                    looseNiceNumbers(m_minX, m_maxX, m_tickXCount);
+                    looseNiceNumbers(m_minY, m_maxY, m_tickYCount);
+                }
                 emit domainChanged(m_minX, m_maxX, m_minY, m_maxY);
                 emit rangeXChanged(m_minX, m_maxX, m_tickXCount);
                 m_maxY = m_minY + dy * rect.bottom();
                 m_minY = m_maxY - dy * size.height();
-                niceNumbers(m_minX, m_maxX, m_tickXCount);
+                if(m_niceNumbers) {
-                niceNumbers(m_minY, m_maxY, m_tickYCount);
+                    looseNiceNumbers(m_minX, m_maxX, m_tickXCount);
+                    looseNiceNumbers(m_minY, m_maxY, m_tickYCount);
+                }
                 emit domainChanged(m_minX, m_maxX, m_minY, m_maxY);
                 emit rangeXChanged(m_minX, m_maxX, m_tickXCount);
                 emit domainChanged(m_minX, m_maxX, m_minY, m_maxY);
             }
-            void Domain::handleAxisXChanged(qreal min,qreal max,int tickXCount,QChartAxis::LabelsSelection mode)
+            void Domain::handleAxisXChanged(qreal min,qreal max,int tickXCount,bool niceNumbers)
             {
-                m_selection=mode;
+                m_niceNumbers=niceNumbers;
                 setRange(min,max,m_minY, m_maxY,tickXCount,m_tickYCount);
             }
-            void Domain::handleAxisYChanged(qreal min,qreal max,int tickYCount,QChartAxis::LabelsSelection mode)
+            void Domain::handleAxisYChanged(qreal min,qreal max,int tickYCount,bool niceNumbers)
             {
-                m_selection=mode;
+                m_niceNumbers=niceNumbers;
                 setRange(m_minX, m_maxX, min, max,m_tickXCount,tickYCount);
             }
             //algorithm defined by Paul S.Heckbert GraphicalGems I
-            void Domain::niceNumbers(qreal &min, qreal &max, int &ticksCount)
-                if(m_selection!=QChartAxis::NativeLabelsSelection)
-                looseNiceNumbers(min,max,ticksCount);
             void Domain::looseNiceNumbers(qreal &min, qreal &max, int &ticksCount)
             {
                 qreal range = niceNumber(max-min,true); //range with ceiling

src/domain_p.h +3 -5

             #ifndef DOMAIN_H_
             #define DOMAIN_H_
             #include "qchartglobal.h"
-            #include "qchartaxis.h"
             #include <QRectF>
             #include <QSizeF>
                 void rangeYChanged(qreal min, qreal max, int tickYCount);
             public slots:
-                void handleAxisXChanged(qreal min,qreal max,int tickXCount = 5,QChartAxis::LabelsSelection mode = QChartAxis::NativeLabelsSelection);
+                void handleAxisXChanged(qreal min,qreal max,int tickXCount = 5,bool niceNumbers = false);
-                void handleAxisYChanged(qreal min,qreal max,int tickYCount = 5,QChartAxis::LabelsSelection mode = QChartAxis::NativeLabelsSelection);
+                void handleAxisYChanged(qreal min,qreal max,int tickYCount = 5,bool niceNumbers = false);
             private:
-                void niceNumbers(qreal &min, qreal &max, int &ticksCount);
                 void looseNiceNumbers(qreal &min, qreal &max, int &ticksCount);
                 qreal niceNumber(qreal x,bool celing);
                 qreal m_maxY;
                 int m_tickXCount;
                 int m_tickYCount;
-                QChartAxis::LabelsSelection m_selection;
+                bool m_niceNumbers;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

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