From 7777ba21b3a68c9e24f8f8977ce847802310341a 2012-03-13 12:57:53
From: Michal Klocek <michal.klocek@digia.com>
Date: 2012-03-13 12:57:53
Subject: [PATCH] Adds missing ticks hadnling

---

diff --git a/src/axis/axisitem.cpp b/src/axis/axisitem.cpp
index 367f95a..79b7281 100644
--- a/src/axis/axisitem.cpp
+++ b/src/axis/axisitem.cpp
@@ -95,6 +95,7 @@ QStringList AxisItem::createLabels(int ticks, qreal min, qreal max) const
             labels << QString::number(value);
         }
         else {
+
             QString label = categories->label(value);
             labels << label;
         }
@@ -370,19 +371,12 @@ void AxisItem::handleAxisUpdated()
 
 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);
-*/
+    m_ticksCount= tickCount;
 
     if(isEmpty()) return;
     QVector<qreal> layout = calculateLayout();
diff --git a/src/axis/qchartaxis.cpp b/src/axis/qchartaxis.cpp
index 6977158..c5f6222 100644
--- a/src/axis/qchartaxis.cpp
+++ b/src/axis/qchartaxis.cpp
@@ -342,15 +342,10 @@ void QChartAxis::setRange(qreal min, qreal max)
     }
 
     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.
  */
@@ -358,7 +353,7 @@ void QChartAxis::setTicksCount(int count)
 {
 	if(m_ticksCount!=count) {
 		m_ticksCount=count;
-		emit rangeChanged(m_min,m_max,m_ticksCount);
+		emit ticksCountChanged(count);
 	}
 }
 
@@ -386,6 +381,17 @@ void QChartAxis::hide()
     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
diff --git a/src/axis/qchartaxis.h b/src/axis/qchartaxis.h
index f63d668..5ad82ca 100644
--- a/src/axis/qchartaxis.h
+++ b/src/axis/qchartaxis.h
@@ -68,13 +68,15 @@ public:
 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;
diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp
index 8271f4b..27c0357 100644
--- a/src/chartdataset.cpp
+++ b/src/chartdataset.cpp
@@ -47,8 +47,12 @@ void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)
 
     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);
diff --git a/src/domain.cpp b/src/domain.cpp
index 9b458be..9eedc66 100644
--- a/src/domain.cpp
+++ b/src/domain.cpp
@@ -18,26 +18,19 @@ 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 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);
 	}
@@ -142,14 +135,30 @@ void Domain::move(int dx,int dy,const QSizeF& size)
     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)
diff --git a/src/domain_p.h b/src/domain_p.h
index 924ba5d..4f91e0a 100644
--- a/src/domain_p.h
+++ b/src/domain_p.h
@@ -13,7 +13,6 @@ public:
     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);
@@ -48,8 +47,10 @@ signals:
 
 
 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;