Logvalueaxis and multiaxis examples updated

2 files changed, 39 insertions, 31 deletions

diff --git a/examples/logvalueaxis/main.cpp b/examples/logvalueaxis/main.cpp
index d8502684..275e0340 100644
--- a/examples/logvalueaxis/main.cpp
+++ b/examples/logvalueaxis/main.cpp
@@ -33,13 +33,14 @@ int main(int argc, char *argv[])
 
     //![1]
     QLineSeries *series = new QLineSeries();
-    *series << QPointF(1, 7) << QPointF(2, 73) << QPointF(3, 268) << QPointF(4, 17) << QPointF(5, 4325) << QPointF(6, 723);
+    *series << QPointF(1, 1) << QPointF(2, 73) << QPointF(3, 268) << QPointF(4, 17) << QPointF(5, 4325) << QPointF(6, 723);
     //![1]
 
     //![3]
     QChart *chart = new QChart();
     chart->addSeries(series);
     chart->legend()->hide();
+    chart->setTitle("QLogValueAxis chart example");
     //![3]
 
     //![4]
@@ -51,7 +52,7 @@ int main(int argc, char *argv[])
     series->attachAxis(axisX);
 
     QLogValueAxis *axisY = new QLogValueAxis;
-    axisY->setBase(2);
+    axisY->setLabelFormat("%g");
     axisY->setTitleText("Values");
     chart->addAxis(axisY, Qt::AlignLeft);
     series->attachAxis(axisY);
@@ -65,7 +66,7 @@ int main(int argc, char *argv[])
     //![6]
     QMainWindow window;
     window.setCentralWidget(chartView);
-    window.resize(800, 600);
+    window.resize(400, 300);
     window.show();
     //![6]
 
diff --git a/examples/multiaxis/main.cpp b/examples/multiaxis/main.cpp
index e681d235..0f817760 100644
--- a/examples/multiaxis/main.cpp
+++ b/examples/multiaxis/main.cpp
@@ -22,9 +22,9 @@
 #include <QMainWindow>
 #include <QChartView>
 #include <QLineSeries>
+#include <QSplineSeries>
 #include <QValueAxis>
-#include <QTime>
-#include <QValueAxis>
+#include <QCategoryAxis>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
@@ -32,38 +32,44 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
-    qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
-
     //![1]
-    QLineSeries *series;
-    QValueAxis *axisX;
-    QValueAxis *axisY;
     QChart *chart = new QChart();
-    for (int i = 0; i < 5; i++) {
-        series = new QLineSeries;
-        for (int k(0); k < 8; k++)
-            series->append(i + k, qrand() % 20);
-        chart->addSeries(series);
-
-        axisX = new QValueAxis;
-        axisX->setTickCount(7 + i);
-        axisX->setLinePenColor(series->pen().color());
-
-        axisY = new QValueAxis;
-        axisY->setTickCount(7 + i);
-        axisY->setLinePenColor(series->pen().color());
-
-        chart->addAxis(axisX,i % 2?Qt::AlignTop:Qt::AlignBottom);
-        chart->addAxis(axisY,i % 2?Qt::AlignRight:Qt::AlignLeft);
-        series->attachAxis(axisX);
-        series->attachAxis(axisY);
-    }
+    QValueAxis *axisX = new QValueAxis;
+    axisX->setTickCount(10);
+
+    QSplineSeries *series = new QSplineSeries;
+    *series << QPointF(1, 5) << QPointF(3.5, 18) << QPointF(4.8, 7.5) << QPointF(10, 2.5);
+    chart->addSeries(series);
+
+    QValueAxis *axisY = new QValueAxis;
+    axisY->setLinePenColor(series->pen().color());
+
+    chart->addAxis(axisX, Qt::AlignBottom);
+    chart->addAxis(axisY, Qt::AlignLeft);
+    series->attachAxis(axisX);
+    series->attachAxis(axisY);
+
+    series = new QSplineSeries;
+    *series << QPointF(1, 0.5) << QPointF(1.5, 4.5) << QPointF(2.4, 2.5) << QPointF(4.3, 12.5)
+            << QPointF(5.2, 3.5) << QPointF(7.4, 16.5) << QPointF(8.3, 7.5) << QPointF(10, 17);
+    chart->addSeries(series);
+
+    QCategoryAxis *axisY3 = new QCategoryAxis;
+    axisY3->append("Low", 5);
+    axisY3->append("Medium", 12);
+    axisY3->append("High", 17);
+    axisY3->setLinePenColor(series->pen().color());
+    axisY3->setGridLinePen((series->pen()));
+
+    chart->addAxis(axisY3, Qt::AlignRight);
+    series->attachAxis(axisX);
+    series->attachAxis(axisY3);
+
     //![2]
 
     //![3]
     chart->legend()->hide();
-
-    chart->setTitle("Simple line chart example");
+    chart->setTitle("Multiaxis chart example");
     //![3]
 
     //![4]
@@ -81,3 +87,4 @@ int main(int argc, char *argv[])
 
     return a.exec();
 }
+