HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r554:7777ba21b3a6

Adds missing ticks hadnling

Michal Klocek -

r554:7777ba21b3a6

parent child

Context file:

r554:7777ba21b3a6

Collapse all files

src/axis/axisitem.cpp +4 -10

                          labels << QString::number(value);
                      }
                      else {
                          QString label = categories->label(value);
                          labels << label;
                      }
              void AxisItem::handleRangeChanged(qreal min, qreal max,int tickCount)
              {
+                 qDebug()<<min<<max<<tickCount;
+                 if(min==max || tickCount<2) return;
                  m_min = min;
                  m_max = max;
-                 m_ticksCount = tickCount;
-                 /*= qrand()%10;
-                 while(m_ticksCount<2){
-                     m_ticksCount = qrand()%10;
+                 }
-                 qDebug()<<"Warning : This is testing . Simulating new random ticks "<<  m_ticksCount;
-                 //m_chartAxis->setTicksCount(m_ticksCount);
-             */
                  if(isEmpty()) return;
                  QVector<qreal> layout = calculateLayout();
                  updateLayout(layout);

src/axis/qchartaxis.cpp +13 -7

                  }
                  if(changed) {
-                     emit rangeChanged(m_min,m_max,m_ticksCount);
+                     emit rangeChanged(m_min,m_max);
                  }
              }
-             void QChartAxis::handleAxisRangeChanged(qreal min, qreal max)
+             {
-                setRange(min,max);
+             }
              /*!
                Sets \a count for ticks on the axis.
               */
              {
              	if(m_ticksCount!=count) {
              		m_ticksCount=count;
-             		emit rangeChanged(m_min,m_max,m_ticksCount);
+             		emit ticksCountChanged(count);
              	}
              }
                  emit updated();
              }
+             void QChartAxis::handleAxisRangeChanged(qreal min, qreal max)
+             {
+                 qDebug()<<__FUNCTION__<<min<<max;
+                setRange(min,max);
+             }
+             void QChartAxis::handleAxisTicksChanged(int count)
+             {
+                 setTicksCount(count);
+             }
              #include "moc_qchartaxis.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/axis/qchartaxis.h +3 -1

              signals:
              	void minChanged(qreal min);
              	void maxChanged(qreal max);
-             	void rangeChanged(qreal min, qreal max,int ticksCount);
+             	void rangeChanged(qreal min, qreal max);
+             	void ticksCountChanged(int count);
              //interal signal
              	void updated();
              //internal slot
              public slots:
              	void handleAxisRangeChanged(qreal min, qreal max);
+                 void handleAxisTicksChanged(int count);
              private:
                  bool m_axisVisible;

src/chartdataset.cpp +6 -2

                  if(!domain) {
                      domain = new Domain();
-                     QObject::connect(axisY,SIGNAL(rangeChanged(qreal,qreal,int)),domain,SLOT(handleAxisRangeYChanged(qreal,qreal,int)));
-                     QObject::connect(axisX(),SIGNAL(rangeChanged(qreal,qreal,int)),domain,SLOT(handleAxisRangeXChanged(qreal,qreal,int)));
+                     QObject::connect(axisY,SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeYChanged(qreal,qreal)));
+                     QObject::connect(axisX(),SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeXChanged(qreal,qreal)));
+                     QObject::connect(axisY,SIGNAL(ticksCountChanged(int)),domain,SLOT(handleAxisYTicksCountChanged(int)));
+                     QObject::connect(axisX(),SIGNAL(ticksCountChanged(int)),domain,SLOT(handleAxisXTicksCountChanged(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/domain.cpp +22 -13

              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 changed = false;
-             	if(m_minX!=minX || m_maxX!=maxX || m_tickXCount!=tickXCount)
+             	if(m_minX!=minX || m_maxX!=maxX)
              	{
              		 m_minX=minX;
              		 m_maxX=maxX;
-             		 m_tickXCount=tickXCount;
              		 changed=true;
              		 emit rangeXChanged(minX,maxX, m_tickXCount);
              	}
-             	if(m_minY!=minY || m_maxY!=maxY || m_tickYCount!=tickYCount){
+             	if(m_minY!=minY || m_maxY!=maxY){
              		 m_minY=minY;
              		 m_maxY=maxY;
-             		 m_tickYCount=tickYCount;
              		 changed=true;
              		 emit rangeYChanged(minY,maxY, m_tickYCount);
              	}
                  emit domainChanged(m_minX, m_maxX, m_minY, m_maxY);
              }
-             void Domain::handleAxisRangeXChanged(qreal min,qreal max,int tickCount)
+             void Domain::handleAxisRangeXChanged(qreal min,qreal max)
+             {
+             	 setRange(min,max,m_minY, m_maxY);
+             }
+             void Domain::handleAxisRangeYChanged(qreal min,qreal max)
              {
-             	 setRange(min,max,m_minY, m_maxY,tickCount,m_tickYCount);
+             	 setRange(m_minX, m_maxX, min, max);
              }
-             void Domain::handleAxisRangeYChanged(qreal min,qreal max,int tickCount)
+             void Domain::handleAxisXTicksCountChanged(int tickCount)
              {
-             	 setRange(m_minX, m_maxX, min, max,m_tickXCount, tickCount);
+                 if(m_tickXCount!=tickCount){
+                     m_tickXCount=tickCount;
+                     emit rangeXChanged(m_minX,m_maxX, m_tickXCount);
+                 }
+             }
+             void Domain::handleAxisYTicksCountChanged(int tickCount)
+             {
+                 if(m_tickYCount!=tickCount){
+                     m_tickYCount=tickCount;
+                     emit rangeYChanged(m_minY,m_maxY, m_tickYCount);
+                 }
              }
              bool operator== (const Domain &domain1, const Domain &domain2)

src/domain_p.h +4 -3

                  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);
              public slots:
-             	void handleAxisRangeXChanged(qreal min,qreal max,int tickCount);
-             	void handleAxisRangeYChanged(qreal min,qreal max,int tickCount);
+                 void handleAxisRangeXChanged(qreal min,qreal max);
+                 void handleAxisRangeYChanged(qreal min,qreal max);
+                 void handleAxisXTicksCountChanged(int tickCount);
+                 void handleAxisYTicksCountChanged(int tickCount);
              private:
                  qreal m_minX;

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