HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r678:e39e59ad9161

Adds loosenumber algorithm...

Michal Klocek -

r678:e39e59ad9161

parent child

Context file:

r678:e39e59ad9161

Collapse all files

src/axis/axisitem.cpp +5 -2

             #include "chartanimator_p.h"
             #include <QPainter>
             #include <QDebug>
+            #include <cmath>
             static int label_padding = 5;
             QStringList Axis::createLabels(int ticks, qreal min, qreal max) const
             {
                 Q_ASSERT(max>=min);
-                Q_ASSERT(ticks>0);
+                Q_ASSERT(ticks>1);
                 QStringList labels;
+                int n =  qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
                 QChartAxisCategories* categories = m_chartAxis->categories();
                 for(int i=0; i< ticks; i++) {
                     qreal value = min + (i * (max - min)/ (ticks-1));
                     if(categories->count()==0) {
-                        labels << QString::number(value);
+                        labels << QString::number(value,'f',n);
                     }
                     else {

src/axis/qchartaxis.cpp +11 -4

             m_shadesOpacity(1.0),
             m_min(0),
             m_max(0),
-            m_ticksCount(5)
+            m_ticksCount(5),
+            m_selection(NativeLabelsSelection)
             {
             }
                 if(changed) {
                     emit rangeChanged(m_min,m_max);
+                    emit this->changed(m_min, m_max, m_ticksCount, m_selection);
                 }
             }
             	if(m_ticksCount!=count) {
             		m_ticksCount=count;
             		emit ticksCountChanged(count);
+            		emit changed(m_min, m_max, m_ticksCount, m_selection);
             	}
             }
                 emit updated();
             }
-            void QChartAxis::handleAxisRangeChanged(qreal min, qreal max)
+            void QChartAxis::handleAxisRangeChanged(qreal min, qreal max,int count)
             {
                setRange(min,max);
+               setTicksCount(count);
             }
-            void QChartAxis::handleAxisTicksChanged(int count)
+            void QChartAxis::setLabelsSelectionMode(LabelsSelection mode)
             {
-                setTicksCount(count);
+                if(m_selection!=mode){
+                    m_selection=mode;
+                    emit changed(m_min, m_max, m_ticksCount, m_selection);
+                }
             }
             #include "moc_qchartaxis.cpp"

src/axis/qchartaxis.h +11 -4

             #ifndef QCHARTAXIS_H_
             #define QCHARTAXIS_H_
-            #include <qchartaxiscategories.h>
+            #include "qchartglobal.h"
+            #include "qchartaxiscategories.h"
             #include <QPen>
             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QChartAxis : public QObject
             {
             	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);
+                LabelsSelection labelsSelectionMode() const { return m_selection;}
                 QChartAxisCategories* categories() { return &m_category; }
                 void show();
             //interal signal
             	void updated();
+            	void changed(qreal min, qreal max, int tickCount,QChartAxis::LabelsSelection mode);
             //internal slot
             public slots:
-            	void handleAxisRangeChanged(qreal min, qreal max);
+            	void handleAxisRangeChanged(qreal min, qreal max,int count);
-                void handleAxisTicksChanged(int count);
             private:
                 bool m_axisVisible;
                 int m_ticksCount;
                 QChartAxisCategories m_category;
+                LabelsSelection m_selection;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartdataset.cpp +4 -6

                 if(!domain) {
                     domain = new Domain();
-                    QObject::connect(axisY,SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeYChanged(qreal,qreal)));
+                    QObject::connect(axisY,SIGNAL(changed(qreal,qreal,int,QChartAxis::LabelsSelection)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,QChartAxis::LabelsSelection)));
-                    QObject::connect(axisX(),SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeXChanged(qreal,qreal)));
+                    QObject::connect(axisX(),SIGNAL(changed(qreal,qreal,int,QChartAxis::LabelsSelection)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,QChartAxis::LabelsSelection)));
-                    QObject::connect(axisY,SIGNAL(ticksCountChanged(int)),domain,SLOT(handleAxisYTicksCountChanged(int)));
+                    QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY,SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                    QObject::connect(axisX(),SIGNAL(ticksCountChanged(int)),domain,SLOT(handleAxisXTicksCountChanged(int)));
+                    QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axisX(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
-                    QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY,SLOT(handleAxisRangeChanged(qreal,qreal)));
-                    QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axisX(),SLOT(handleAxisRangeChanged(qreal,qreal)));
                     //initialize
                     m_axisDomainMap.insert(axisY,domain);
                     emit axisAdded(axisY,domain);

src/chartpresenter.cpp +9 -15

                 m_animator(0),
                 m_dataset(dataset),
                 m_chartTheme(0),
-                m_zoomIndex(0),
                 m_rect(QRectF(QPoint(0,0),m_chart->size())),
                 m_options(QChart::NoAnimation),
                 m_themeForce(false)
                 rect.adjust(m_chart->padding(),m_chart->padding(), -m_chart->padding(), -m_chart->padding());
                 //rewrite zoom stack
+                /*
                 for(int i=0;i<m_zoomStack.count();i++){
                     QRectF r = m_zoomStack[i];
                     qreal w = rect.width()/m_rect.width();
                     r.setBottomRight(br);
                     m_zoomStack[i]=r;
                 }
+                */
                 m_rect = rect;
                 Q_ASSERT(m_rect.isValid());
                 emit geometryChanged(m_rect);
                 item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
                 if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
                 m_chartItems.insert(series,item);
-                zoomReset();
             }
             void ChartPresenter::handleSeriesRemoved(QSeries* series)
             		m_animator->setState(ChartAnimator::ZoomInState,point);
             	}
             	m_dataset->zoomInDomain(r,geometry().size());
-            	m_zoomStack<<r;
-            	m_zoomIndex++;
             	if(m_animator) {
             		m_animator->setState(ChartAnimator::ShowState);
             	}
             void ChartPresenter::zoomOut()
             {
-            	if(m_zoomIndex==0) return;
             	if(m_animator)
             	{
             		m_animator->setState(ChartAnimator::ZoomOutState);
             	}
-            	m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
-            	m_zoomIndex--;
+            	QSizeF size = geometry().size();
-            	m_zoomStack.resize(m_zoomIndex);
+            	QRectF rect = geometry();
+            	rect.translate(-m_chart->padding(), -m_chart->padding());
+            	m_dataset->zoomOutDomain(rect.adjusted(size.width()/4,size.height()/4,-size.width()/4,-size.height()/4),size);
+                //m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
             	if(m_animator){
             			m_animator->setState(ChartAnimator::ShowState);
             	}
             }
-            void ChartPresenter::zoomReset()
-                m_zoomIndex=0;
-                m_zoomStack.resize(m_zoomIndex);
             void ChartPresenter::scroll(int dx,int dy)
             {
             	if(m_animator){

src/chartpresenter_p.h 0 -3

                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
-                void zoomReset();
                 void scroll(int dx,int dy);
             private:
                 ChartAnimator* m_animator;
                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
-                int m_zoomIndex;
                 QMap<QSeries*,Chart*> m_chartItems;
                 QMap<QChartAxis*,Axis*> m_axisItems;
-                QVector<QRectF> m_zoomStack;
                 QRectF m_rect;
                 QChart::AnimationOptions m_options;
                 bool m_themeForce;

src/domain.cpp +107 -44

             #include "domain_p.h"
+            #include <cmath>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             m_minY(0),
             m_maxY(0),
             m_tickXCount(5),
-            m_tickYCount(5)
+            m_tickYCount(5),
+            m_selection(QChartAxis::NativeLabelsSelection)
             {
             }
             void Domain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
-            	bool changed = false;
+                setRange(minX, maxX, minY, maxY,m_tickXCount,m_tickYCount);
+            }
-            	if(m_minX!=minX || m_maxX!=maxX)
+            void Domain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY,int tickXCount,int tickYCount)
+            {
-            		 m_minX=minX;
+                bool domainChanged = false;
-            		 m_maxX=maxX;
+                bool tickXChanged = false;
-            		 changed=true;
+                bool tickYChanged = false;
-            		 emit rangeXChanged(minX,maxX, m_tickXCount);
-            	if(m_minY!=minY || m_maxY!=maxY){
+                if(m_tickXCount!=tickXCount) {
-            		 m_minY=minY;
+                    m_tickXCount=tickXCount;
-            		 m_maxY=maxY;
+                    tickXChanged=true;
-            		 changed=true;
-            		 emit rangeYChanged(minY,maxY, m_tickYCount);
-              if(changed){
+                if(m_tickXCount!=tickYCount) {
-                emit domainChanged(m_minX, m_maxX, m_minY, m_maxY);
+                    m_tickXCount=tickYCount;
+                    tickYChanged=true;
+                }
+                if(m_minX!=minX || m_maxX!=maxX) {
+                    niceNumbers(minX, maxX, m_tickXCount);
+                    m_minX=minX;
+                    m_maxX=maxX;
+                    domainChanged=true;
+                    tickXChanged=false;
+                    emit rangeXChanged(minX,maxX, m_tickXCount);
+                }
+                if(m_minY!=minY || m_maxY!=maxY) {
+                    niceNumbers(minY, maxY, m_tickYCount);
+                    m_minY=minY;
+                    m_maxY=maxY;
+                    domainChanged=true;
+                    tickYChanged=false;
+                    emit rangeYChanged(minY,maxY, m_tickYCount);
+                }
+                if(domainChanged) {
+                    emit this->domainChanged(m_minX, m_maxX, m_minY, m_maxY);
+                }
+                if(tickXChanged) {
+                    emit rangeXChanged(minX,maxX, m_tickXCount);
+                }
+                if(tickYChanged) {
+                    emit rangeYChanged(minY,maxY, m_tickYCount);
+                }
             }
             void Domain::setRangeX(qreal min, qreal max)
             {
                 setRange(min,max,m_minY, m_maxY);
             }
             void Domain::setRangeY(qreal min, qreal max)
             {
-            	setRange(m_minX, m_maxX, min, max);
+                setRange(m_minX, m_maxX, min, max);
             }
             void Domain::setMinX(qreal min)
             {
-            	setRange(min, m_maxX, m_minY, m_maxY);
+                setRange(min, m_maxX, m_minY, m_maxY);
             }
             void Domain::setMaxX(qreal max)
             {
-            	setRange(m_minX, max, m_minY, m_maxY);
+                setRange(m_minX, max, m_minY, m_maxY);
             }
             void Domain::setMinY(qreal min)
             {
-            	setRange(m_minX, m_maxX, min, m_maxY);
+                setRange(m_minX, m_maxX, min, m_maxY);
             }
             void Domain::setMaxY(qreal max)
             {
                 setRange(m_minX, m_maxX, m_minY, max);
             }
             qreal Domain::spanX() const
                 m_minY = m_maxY - dy * rect.bottom();
                 m_maxY = m_maxY - dy * rect.top();
+                niceNumbers(m_minX, m_maxX, m_tickXCount);
+                niceNumbers(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 rangeYChanged(m_minY, m_maxY, m_tickYCount);
                 m_maxY = m_minY + dy * rect.bottom();
                 m_minY = m_maxY - dy * size.height();
+                niceNumbers(m_minX, m_maxX, m_tickXCount);
+                niceNumbers(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 rangeYChanged(m_minY, m_maxY, m_tickYCount);
                 qreal x = spanX() / size.width();
                 qreal y = spanY() / size.height();
-                if(dx!=0){
+                if(dx!=0) {
-                m_minX = m_minX + x * dx;
+                    m_minX = m_minX + x * dx;
-                m_maxX = m_maxX + x * dx;
+                    m_maxX = m_maxX + x * dx;
-                emit rangeXChanged(m_minX, m_maxX, m_tickXCount);
+                    emit rangeXChanged(m_minX, m_maxX, m_tickXCount);
                 }
-                if(dy!=0){
+                if(dy!=0) {
-                m_minY = m_minY + y * dy;
+                    m_minY = m_minY + y * dy;
-                m_maxY = m_maxY + y * dy;
+                    m_maxY = m_maxY + y * dy;
-                emit rangeYChanged(m_minY, m_maxY, m_tickYCount);
+                    emit rangeYChanged(m_minY, m_maxY, m_tickYCount);
                 }
                 emit domainChanged(m_minX, m_maxX, m_minY, m_maxY);
             }
-            void Domain::handleAxisRangeXChanged(qreal min,qreal max)
+            void Domain::handleAxisXChanged(qreal min,qreal max,int tickXCount,QChartAxis::LabelsSelection mode)
+            {
+                m_selection=mode;
+                setRange(min,max,m_minY, m_maxY,tickXCount,m_tickYCount);
+            }
+            void Domain::handleAxisYChanged(qreal min,qreal max,int tickYCount,QChartAxis::LabelsSelection mode)
             {
-            	 setRange(min,max,m_minY, m_maxY);
+                m_selection=mode;
+                setRange(m_minX, m_maxX, min, max,m_tickXCount,tickYCount);
             }
-            void Domain::handleAxisRangeYChanged(qreal min,qreal max)
+            //algorithm defined by Paul S.Heckbert GraphicalGems I
+            void Domain::niceNumbers(qreal &min, qreal &max, int &ticksCount)
             {
-            	 setRange(m_minX, m_maxX, min, max);
+                if(m_selection!=QChartAxis::NativeLabelsSelection)
+                looseNiceNumbers(min,max,ticksCount);
             }
-            void Domain::handleAxisXTicksCountChanged(int tickCount)
+            void Domain::looseNiceNumbers(qreal &min, qreal &max, int &ticksCount)
             {
-                if(m_tickXCount!=tickCount){
+                qreal range = niceNumber(max-min,true); //range with ceiling
-                    m_tickXCount=tickCount;
+                qreal step = niceNumber(range/(ticksCount-1),false);
-                    emit rangeXChanged(m_minX,m_maxX, m_tickXCount);
+                min = floor(min/step);
+                max = ceil(max/step);
+                ticksCount = int(max-min) +1;
+                min*=step;
+                max*=step;
             }
-            void Domain::handleAxisYTicksCountChanged(int tickCount)
+            //nice numbers can be expressed as form of 1*10^n, 2* 10^n or 5*10^n
+            qreal Domain::niceNumber(qreal x,bool ceiling)
             {
-                if(m_tickYCount!=tickCount){
+                qreal z = pow(10,floor(log10(x))); //find corresponding number of the form of 10^n than is smaller than x
-                    m_tickYCount=tickCount;
+                qreal q = x/z;//q<10 && q>=1;
-                    emit rangeYChanged(m_minY,m_maxY, m_tickYCount);
+                if(ceiling) {
+                    if(q <= 1.0) q=1;
+                    else if(q <= 2.0) q=2;
+                    else if(q <= 5.0) q=5;
+                    else q=10;
+                }
+                else {
+                    if(q < 1.5) q=1;
+                    else if(q < 3.0) q=2;
+                    else if(q < 7.0) q=5;
+                    else q=10;
                 }
+                return q*z;
             }
             bool operator== (const Domain &domain1, const Domain &domain2)

src/domain_p.h +10 -5

             #ifndef DOMAIN_H_
             #define DOMAIN_H_
             #include "qchartglobal.h"
+            #include "qchartaxis.h"
             #include <QRectF>
             #include <QSizeF>
                 virtual ~Domain();
                 void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY);
+                void setRange(qreal minX, qreal maxX, qreal minY, qreal maxY, int tickXCount, int tickYCount);
                 void setRangeX(qreal min, qreal max);
                 void setRangeY(qreal min, qreal max);
                 void setMinX(qreal min);
                 void rangeXChanged(qreal min, qreal max, int tickXCount);
                 void rangeYChanged(qreal min, qreal max, int tickYCount);
             public slots:
-                void handleAxisRangeXChanged(qreal min,qreal max);
+                void handleAxisXChanged(qreal min,qreal max,int tickXCount,QChartAxis::LabelsSelection mode);
-                void handleAxisRangeYChanged(qreal min,qreal max);
+                void handleAxisYChanged(qreal min,qreal max,int tickYCount,QChartAxis::LabelsSelection mode);
-                void handleAxisXTicksCountChanged(int tickCount);
-                void handleAxisYTicksCountChanged(int tickCount);
+            private:
+                void niceNumbers(qreal &min, qreal &max, int &ticksCount);
+                void looseNiceNumbers(qreal &min, qreal &max, int &ticksCount);
+                qreal niceNumber(qreal x,bool celing);
             private:
                 qreal m_minX;
                 qreal m_maxY;
                 int m_tickXCount;
                 int m_tickYCount;
+                QChartAxis::LabelsSelection m_selection;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.cpp 0 -8

             }
             /*!
-                Resets to the default view.
-            */
-            void QChart::zoomReset()
-                m_presenter->zoomReset();
-            /*!
                 Returns the pointer to the x axis object of the chart
             */
             QChartAxis* QChart::axisX() const

src/qchart.h 0 -1

                 void zoomIn();
                 void zoomIn(const QRectF& rect);
                 void zoomOut();
-                void zoomReset();
                 void scrollLeft();
                 void scrollRight();
                 void scrollUp();

src/qchartview.cpp +4 -2

                         event->accept();
                     }
-                    if(event->button()==Qt::RightButton)
+                    if(event->button()==Qt::RightButton){
-                    m_chart->zoomReset();
+                        m_chart->zoomOut();
+                        event->accept();
+                    }
                 }
                 else {
                     QGraphicsView::mouseReleaseEvent(event);

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