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

             #include "qchartaxis.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QChartAxis
                 \brief The QChartAxis class is used for manipulating chart's axis
                 and for adding optional axes to the chart.
                 \mainclass
                 There is only one x Axis, however there can be multiple y axes.
                 Each chart series can be bound to exactly one Y axis and the share common X axis.
                 Axis can be setup to show axis line with ticks, gird lines and shades.
             */
             /*!
                \fn bool QChartAxis::isAxisVisible() const
                \brief Returns if axis is visible
                \sa setAxisVisible()
             */
             /*!
                \fn QPen QChartAxis::axisPen() const
                \brief  Returns pen used to draw axis and ticks.
                 \sa setAxisPen()
             */
             /*!
                \fn bool QChartAxis::isGridLineVisible() const
                \brief Returns if grid is visible
                \sa setGridLineVisible()
             */
             /*!
                \fn QPen QChartAxis::gridLinePen() const
                \brief  Returns pen used to draw grid.
                 \sa setGridLinePen()
             */
             /*!
                \fn  bool QChartAxis::labelsVisible() const
                \brief Returns if grid is visible
                \sa setLabelsVisible()
             */
             /*!
                \fn QPen QChartAxis::labelsPen() const
                \brief Returns the pen used to labels.
                 \sa setLabelsPen()
             */
             /*!
                \fn QBrush QChartAxis::labelsBrush() const
                \brief Returns brush used to draw labels.
                 \sa setLabelsBrush()
             */
             /*!
                \fn QFont QChartAxis::labelsFont() const
                \brief Returns font used to draw labels.
                 \sa setLabelsFont()
             */
             /*!
                \fn QFont QChartAxis::labelsAngle() const
                \brief Returns angle used to draw labels.
                 \sa setLabelsAngle()
             */
             /*!
                \fn bool QChartAxis::shadesVisible() const
                \brief Returns if shades are visible.
                \sa setShadesVisible()
             */
             /*!
               \fn  qreal QChartAxis::shadesOpacity() const
               \brief Returns opacity of shades.
              */
             /*!
                \fn QPen QChartAxis::shadesPen() const
                \brief Returns pen used to draw shades.
                 \sa setShadesPen()
             */
             /*!
                \fn QBrush QChartAxis::shadesBrush() const
                \brief Returns brush used to draw shades.
                 \sa setShadesBrush()
             */
             /*!
                \fn qreal QChartAxis::min() const
                \brief Returns minimum value on the axis.
                \sa setMin()
             */
             /*!
                \fn qreal QChartAxis::max() const
                \brief Returns maximim value on the axis.
                \sa setMax()
             */
             /*!
                \fn void QChartAxis::minChanged(qreal min)
                \brief Axis emits signal when \a min of axis has changed.
             */
             /*!
                \fn void QChartAxis::maxChanged(qreal max)
                \brief Axis emits signal when \a max of axis has changed.
             */
             /*!
                \fn void QChartAxis::rangeChanged(qreal min, qreal max)
                \brief Axis emits signal when \a min or \a max of axis has changed.
             */
             /*!
                \fn int QChartAxis::ticksCount() const
                \brief Return number of ticks on the axis
                \sa setTicksCount()
             */
             /*!
                 \fn void QChartAxis::updated()
                 \brief \internal
             */
             /*!
                 \fn void QChartAxis::handleAxisRangeChanged(qreal min, qreal max)
                 \brief \internal \a min \a max
             */
             /*!
                 Constructs new axis object which is a child of \a parent. Ownership is taken by
                 QChatView or QChart when axis added.
             */
             QChartAxis::QChartAxis(QObject* parent):QObject(parent),
             m_axisVisible(true),
             m_gridLineVisible(true),
             m_labelsVisible(true),
             m_labelsAngle(0),
             m_shadesVisible(false),
             m_shadesOpacity(1.0),
             m_min(0),
             m_max(0),
             m_ticksCount(5),
-            m_selection(NativeLabelsSelection)
+            m_niceNumbers(false)
             {
             }
             /*!
                 Destructor of the axis object. When axis is added to chart, chart object takes ownership.
             */
             QChartAxis::~QChartAxis()
             {
             }
             /*!
               Sets \a pen used to draw axis line and ticks.
              */
             void QChartAxis::setAxisPen(const QPen& pen)
             {
             	if (pen != m_axisPen) {
                 m_axisPen=pen;
                 emit updated();
             	}
             }
             /*!
               Sets if axis and ticks are \a visible.
              */
             void QChartAxis::setAxisVisible(bool visible)
             {
             	if (m_axisVisible!=visible) {
                 m_axisVisible=visible;
                 emit updated();
             	}
             }
             /*!
               Sets if grid line is \a visible.
              */
             void QChartAxis::setGridLineVisible(bool visible)
             {
             	if (m_gridLineVisible!=visible) {
                 m_gridLineVisible=visible;
                 emit updated();
             	}
             }
             /*!
               Sets \a pen used to draw grid line.
              */
             void QChartAxis::setGridLinePen(const QPen& pen)
             {
             	if (m_gridLinePen!=pen) {
                 m_gridLinePen=pen;
                 emit updated();
             	}
             }
             /*!
               Sets if axis' labels are \a visible.
              */
             void QChartAxis::setLabelsVisible(bool visible)
             {
             	if(m_labelsVisible!=visible) {
                 m_labelsVisible=visible;
                 emit updated();
             	}
             }
             /*!
               Sets \a pen used to draw labels.
              */
             void QChartAxis::setLabelsPen(const QPen& pen)
             {
             	if(m_labelsPen!=pen) {
                 m_labelsPen=pen;
                 emit updated();
             	}
             }
             /*!
               Sets \a brush used to draw labels.
              */
             void QChartAxis::setLabelsBrush(const QBrush& brush)
             {
             	if(m_labelsBrush!=brush) {
                 m_labelsBrush=brush;
                 emit updated();
             	}
             }
             /*!
               Sets \a font used to draw labels.
              */
             void QChartAxis::setLabelsFont(const QFont& font)
             {
             	if(m_labelsFont!=font) {
                 m_labelsFont=font;
                 emit updated();
             	}
             }
             /*!
               Sets \a angle for all the labels on given axis.
              */
             void QChartAxis::setLabelsAngle(int angle)
             {
             	if(m_labelsAngle!=angle) {
             	m_labelsAngle=angle;
             	emit updated();
             	}
             }
             /*!
               Sets if shades are \a visible.
              */
             void QChartAxis::setShadesVisible(bool visible)
             {
             	if(m_shadesVisible!=visible) {
                 m_shadesVisible=visible;
                 emit updated();
             	}
             }
             /*!
               Sets \a pen used to draw shades.
              */
             void QChartAxis::setShadesPen(const QPen& pen)
             {
             	if(m_shadesPen!=pen) {
             	m_shadesPen=pen;
             	emit updated();
             	}
             }
             /*!
               Sets \a brush used to draw shades.
              */
             void QChartAxis::setShadesBrush(const QBrush& brush)
             {
             	if(m_shadesBrush!=brush) {
                 m_shadesBrush=brush;
                 emit updated();
             	}
             }
             /*!
               Sets \a opacity of the shades.
              */
             void QChartAxis::setShadesOpacity(qreal opacity)
             {
             	if(m_shadesOpacity!=opacity) {
                 m_shadesOpacity=opacity;
                 emit updated();
             	}
             }
             /*!
              Sets \a min value on the axis.
              */
             void QChartAxis::setMin(qreal min)
             {
             	setRange(min,m_max);
             }
             /*!
              Sets \a max value on the axis.
              */
             void QChartAxis::setMax(qreal max)
             {
                 setRange(m_min,max);
             }
             /*!
               Sets range from \a min to \a max on the axis.
              */
             void QChartAxis::setRange(qreal min, qreal max)
             {
             	bool changed = false;
                 if(m_min!=min) {
                     m_min=min;
                     changed=true;
                     emit minChanged(min);
                 }
                 if(m_max!=max) {
                     m_max=max;
                     changed=true;
                     emit maxChanged(max);
                 }
                 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);
                 }
             }
             /*!
               Sets \a count for ticks on the axis.
              */
             void QChartAxis::setTicksCount(int count)
             {
             	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);
             	}
             }
             /*!
               Sets axis, shades, labels and grid lines to be visible.
              */
             void QChartAxis::show()
             {
                m_axisVisible=true;
                m_gridLineVisible=true;
                m_labelsVisible=true;
                m_shadesVisible=true;
                emit updated();
             }
             /*!
               Sets axis, shades, labels and grid lines to not be visible.
              */
             void QChartAxis::hide()
             {
                 m_axisVisible=false;
                 m_gridLineVisible=false;
                 m_labelsVisible=false;
                 m_shadesVisible=false;
                 emit updated();
             }
             void QChartAxis::handleAxisRangeChanged(qreal min, qreal max,int count)
             {
                setRange(min,max);
                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);
                 }
             }
             #include "moc_qchartaxis.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qchartaxis.h +4 -5

             #ifndef QCHARTAXIS_H_
             #define QCHARTAXIS_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();
                 //axis handling
                 bool isAxisVisible() const { return m_axisVisible;};
                 void setAxisVisible(bool visible);
                 void setAxisPen(const QPen& pen);
                 QPen axisPen() const { return m_axisPen;};
                 //grid handling
                 bool isGridLineVisible() const { return m_gridLineVisible;};
                 void setGridLineVisible(bool visible);
                 void setGridLinePen(const QPen& pen);
                 QPen gridLinePen() const {return m_gridLinePen;}
                 //labels handling
                 bool labelsVisible() const { return m_labelsVisible;};
                 void setLabelsVisible(bool visible);
                 void setLabelsPen(const QPen& pen);
                 QPen labelsPen() const { return m_labelsPen;}
                 void setLabelsBrush(const QBrush& brush);
                 QBrush labelsBrush() const { return m_labelsBrush;}
                 void setLabelsFont(const QFont& font);
                 QFont labelsFont() const { return m_labelsFont;}
                 void setLabelsAngle(int angle);
                 int labelsAngle() const { return m_labelsAngle;};
                 //shades handling
                 bool shadesVisible() const { return m_shadesVisible;};
                 void setShadesVisible(bool visible);
                 void setShadesPen(const QPen& pen);
                 QPen shadesPen() const { return m_shadesPen;}
                 void setShadesBrush(const QBrush& brush);
                 QBrush shadesBrush() const { return m_shadesBrush;}
                 void setShadesOpacity(qreal opacity);
                 qreal shadesOpacity() const { return m_shadesOpacity;}
                 //range handling
                 void setMin(qreal min);
                 qreal min() const { return m_min;};
                 void setMax(qreal max);
                 qreal max() const { return m_max;};
                 void setRange(qreal min, qreal max);
                 //ticks handling
                 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; }
                 void show();
                 void hide();
             signals:
             	void minChanged(qreal min);
             	void maxChanged(qreal max);
             	void rangeChanged(qreal min, qreal max);
             	void ticksCountChanged(int count);
             //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);
             private:
                 bool m_axisVisible;
                 QPen m_axisPen;
                 QBrush m_axisBrush;
                 bool m_gridLineVisible;
                 QPen m_gridLinePen;
                 bool m_labelsVisible;
                 QPen m_labelsPen;
                 QBrush m_labelsBrush;
                 QFont m_labelsFont;
                 int m_labelsAngle;
                 bool m_shadesVisible;
                 QPen m_shadesPen;
                 QBrush m_shadesBrush;
                 qreal m_shadesOpacity;
                 qreal m_min;
                 qreal m_max;
                 int m_ticksCount;
                 QChartAxisCategories m_category;
-                LabelsSelection m_selection;
+                bool m_niceNumbers;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* QCHARTAXIS_H_ */

src/domain.cpp +15 -17

             #include "domain_p.h"
             #include <cmath>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Domain::Domain(QObject* parent):QObject(parent),
             m_minX(0),
             m_maxX(0),
             m_minY(0),
             m_maxY(0),
             m_tickXCount(5),
             m_tickYCount(5),
-            m_selection(QChartAxis::NativeLabelsSelection)
+            m_niceNumbers(false)
             {
             }
             Domain::~Domain()
             {
             }
             void Domain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 setRange(minX, maxX, minY, maxY,m_tickXCount,m_tickYCount);
             }
             void Domain::setRange(qreal minX, qreal maxX, qreal minY, qreal maxY,int tickXCount,int tickYCount)
             {
                 bool domainChanged = false;
                 bool tickXChanged = false;
                 bool tickYChanged = false;
                 if(m_tickXCount!=tickXCount) {
                     m_tickXCount=tickXCount;
                     tickXChanged=true;
                 }
                 if(m_tickXCount!=tickYCount) {
                     m_tickYCount=tickYCount;
                     tickYChanged=true;
                 }
                 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;
                     tickXChanged=false;
                     emit rangeXChanged(minX,maxX, m_tickXCount);
                 }
                 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;
                     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::setRangeX(qreal min, qreal max, int tickCount)
             {
                 setRange(min,max,m_minY, m_maxY,tickCount,m_tickYCount);
             }
             void Domain::setRangeY(qreal min, qreal max)
             {
                 setRange(m_minX, m_maxX, min, max);
             }
             void Domain::setRangeY(qreal min, qreal max,int tickCount)
             {
                 setRange(m_minX, m_maxX, min, max,m_tickXCount,tickCount);
             }
             void Domain::setMinX(qreal min)
             {
                 setRange(min, m_maxX, m_minY, m_maxY);
             }
             void Domain::setMaxX(qreal max)
             {
                 setRange(m_minX, max, m_minY, m_maxY);
             }
             void Domain::setMinY(qreal min)
             {
                 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
             {
                 Q_ASSERT(m_maxX >= m_minX);
                 return m_maxX - m_minX;
             }
             qreal Domain::spanY() const
             {
                 Q_ASSERT(m_maxY >= m_minY);
                 return m_maxY - m_minY;
             }
             bool Domain::isEmpty() const
             {
                 return spanX()==0 || spanY()==0;
             }
             void Domain::zoomIn(const QRectF& rect, const QSizeF& size)
             {
                 qreal dx = spanX() / size.width();
                 qreal dy = spanY() / size.height();
                 m_maxX = m_minX + dx * rect.right();
                 m_minX = m_minX + dx * rect.left();
                 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);
                 emit rangeYChanged(m_minY, m_maxY, m_tickYCount);
             }
             void Domain::zoomOut(const QRectF& rect, const QSizeF& size)
             {
                 qreal dx = spanX() / rect.width();
                 qreal dy = spanY() / rect.height();
                 m_minX = m_maxX - dx * rect.right();
                 m_maxX = m_minX + dx * size.width();
                 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 rangeYChanged(m_minY, m_maxY, m_tickYCount);
             }
             void Domain::move(int dx,int dy,const QSizeF& size)
             {
                 qreal x = spanX() / size.width();
                 qreal y = spanY() / size.height();
                 if(dx!=0) {
                     m_minX = m_minX + x * dx;
                     m_maxX = m_maxX + x * dx;
                     emit rangeXChanged(m_minX, m_maxX, m_tickXCount);
                 }
                 if(dy!=0) {
                     m_minY = m_minY + y * dy;
                     m_maxY = m_maxY + y * dy;
                     emit rangeYChanged(m_minY, m_maxY, m_tickYCount);
                 }
                 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
                 qreal step = niceNumber(range/(ticksCount-1),false);
                 min = floor(min/step);
                 max = ceil(max/step);
                 ticksCount = int(max-min) +1;
                 min*=step;
                 max*=step;
             }
             //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)
             {
                 qreal z = pow(10,floor(log10(x))); //find corresponding number of the form of 10^n than is smaller than x
                 qreal q = x/z;//q<10 && q>=1;
                 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)
             {
                 return (domain1.m_maxX == domain2.m_maxX &&
                     domain1.m_maxY == domain2.m_maxY &&
                     domain1.m_minX == domain2.m_minX &&
                     domain1.m_minY == domain2.m_minY);
             }
             bool operator!= (const Domain &domain1, const Domain &domain2)
             {
                 return !(domain1 == domain2);
             }
             QDebug operator<<(QDebug dbg, const Domain &domain)
             {
                 dbg.nospace() << "Domain("<<domain.m_minX<<','<<domain.m_maxX<<','<<domain.m_minY<<','<<domain.m_maxY<<')' << domain.m_tickXCount << "," << domain.m_tickYCount ;
                 return dbg.maybeSpace();
             }
             #include "moc_domain_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/domain_p.h +3 -5

             #ifndef DOMAIN_H_
             #define DOMAIN_H_
             #include "qchartglobal.h"
-            #include "qchartaxis.h"
             #include <QRectF>
             #include <QSizeF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Domain: public QObject {
                 Q_OBJECT
             public:
                 explicit Domain(QObject* object=0);
                 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 setRangeX(qreal min, qreal max, int tickCount);
                 void setRangeY(qreal min, qreal max);
                 void setRangeY(qreal min, qreal max, int tickCount);
                 void setMinX(qreal min);
                 void setMaxX(qreal max);
                 void setMinY(qreal min);
                 void setMaxY(qreal max);
                 qreal minX() const {return m_minX;};
                 qreal maxX() const {return m_maxX;};
                 qreal minY() const {return m_minY;};
                 qreal maxY() const {return m_maxY;};
                 qreal spanX() const;
                 qreal spanY() const;
                 bool isEmpty() const;
                 int tickXCount() const {return m_tickXCount;}
                 int tickYCount() const {return m_tickYCount;}
                 friend bool operator== (const Domain &domain1, const Domain &domain2);
                 friend bool operator!= (const Domain &domain1, const Domain &domain2);
                 friend QDebug operator<<(QDebug dbg, const Domain &domain);
                 void zoomIn(const QRectF& rect, const QSizeF& size);
                 void zoomOut(const QRectF& rect, const QSizeF& size);
                 void move(int dx,int dy,const QSizeF& size);
             signals:
                 void domainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void rangeXChanged(qreal min, qreal max, int tickXCount);
                 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);
             private:
                 qreal m_minX;
                 qreal m_maxX;
                 qreal m_minY;
                 qreal m_maxY;
                 int m_tickXCount;
                 int m_tickYCount;
-                QChartAxis::LabelsSelection m_selection;
+                bool m_niceNumbers;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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