From f2951e50a7b877407d796e29c12cb51467b737b6 2012-07-16 14:32:58
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-07-16 14:32:58
Subject: [PATCH] Updated customchart example. Now it uses QIntervalsAxis

---

diff --git a/examples/customchart/main.cpp b/examples/customchart/main.cpp
index f63587b..e472f4c 100644
--- a/examples/customchart/main.cpp
+++ b/examples/customchart/main.cpp
@@ -22,8 +22,7 @@
 #include <QMainWindow>
 #include <QChartView>
 #include <QLineSeries>
-#include <QValuesAxis>
-#include <QBarCategoriesAxis>
+#include <QIntervalsAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
@@ -33,7 +32,7 @@ int main(int argc, char *argv[])
 
 //![1]
     QLineSeries* series = new QLineSeries();
-    *series << QPointF(0, 0.6) << QPointF(0.5, 0.4) << QPointF(1, 2) << QPointF(1.5, 1.2) << QPointF(2, 1.0);
+    *series << QPointF(0, 6) << QPointF(9, 4) << QPointF(15, 20) << QPointF(25, 12) << QPointF(29, 26);
     QChart* chart = new QChart();
     chart->legend()->hide();
     chart->addSeries(series);
@@ -63,8 +62,8 @@ int main(int argc, char *argv[])
 //![2]
 
 //![3]
-    QBarCategoriesAxis* axisX = new QBarCategoriesAxis();
-    QBarCategoriesAxis* axisY = new QBarCategoriesAxis();
+    QIntervalsAxis* axisX = new QIntervalsAxis();
+    QIntervalsAxis* axisY = new QIntervalsAxis();
 
     // Customize axis label font
     QFont labelsFont;
@@ -92,18 +91,22 @@ int main(int argc, char *argv[])
 //![3]
 
 //![4]
-    axisX->append("low");
-    axisX->append("optimal");
-    axisX->append("high");
-    axisX->setRange("low","high");
-
-    axisY->append("slow");
-    axisY->append("med");
-    axisY->append("fast");
-    axisY->setRange("slow","fast");
+    axisX->append("low", 10);
+    axisX->append("optimal", 20);
+    axisX->append("high", 30);
+    axisX->setRange(0, 30);
+//    axisX->setRange("low","high");
+
+    axisY->append("slow", 10);
+    axisY->append("med", 20);
+    axisY->append("fast", 30);
+    axisY->setRange(0, 30);
+//    axisY->setRange("slow","fast");
 
     chart->setAxisX(axisX, series);
     chart->setAxisY(axisY, series);
+    axisX->setRange(0, 30);
+    axisY->setRange(0, 30);
 //![4]
 
 //![5]
diff --git a/src/axis/intervalsaxis/chartintervalsaxisy.cpp b/src/axis/intervalsaxis/chartintervalsaxisy.cpp
index cbb7553..7658490 100644
--- a/src/axis/intervalsaxis/chartintervalsaxisy.cpp
+++ b/src/axis/intervalsaxis/chartintervalsaxisy.cpp
@@ -100,12 +100,9 @@ void ChartIntervalAxisY::updateGeometry()
 
         if (i < ticksList.count())
             labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i] + (layout[i + 1] - layout[i]) / 2 - center.y());
-//            labelItem->setPos(layout[i] + (layout[i + 1] - layout[i]) / 2 - center.x(), m_rect.bottom() + label_padding);
         else
             labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i]-center.y());
 
-//        labelItem->setPos(m_rect.left() - rect.width() - label_padding , layout[i]-center.y());
-
         if(labelItem->pos().y()+rect.height()>height) {
             labelItem->setVisible(false);
             lineItem->setVisible(false);