From 3245355f894100cf965e63f13f27fe0d059722ac 2012-07-25 11:42:34
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-07-25 11:42:34
Subject: [PATCH] Added DateTimeAxis Example

---

diff --git a/examples/datetimeaxis/datetimeaxis.pro b/examples/datetimeaxis/datetimeaxis.pro
new file mode 100644
index 0000000..19a1797
--- /dev/null
+++ b/examples/datetimeaxis/datetimeaxis.pro
@@ -0,0 +1,5 @@
+!include( ../examples.pri ) {
+ error( "Couldn't find the examples.pri file!" )
+}
+TARGET = datetimeaxis
+SOURCES += main.cpp
diff --git a/examples/datetimeaxis/main.cpp b/examples/datetimeaxis/main.cpp
new file mode 100644
index 0000000..3f540ef
--- /dev/null
+++ b/examples/datetimeaxis/main.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the Qt Commercial Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QMainWindow>
+#include <QChartView>
+#include <QLineSeries>
+#include <QDateTime>
+#include <QDateTimeAxis>
+
+QTCOMMERCIALCHART_USE_NAMESPACE
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
+
+    //![1]
+    QLineSeries* series = new QLineSeries();
+    //![1]
+
+    //![2]
+    QDateTime momentInTime;
+    for (int i = 0; i < 100; i++) {
+        momentInTime.setDate(QDate(2012, 1 , (1 + i / 9) % 28));
+        momentInTime.setTime(QTime(9 + i % 9, 0));
+        if (i > 0)
+            series->append(momentInTime.toMSecsSinceEpoch(), series->points().at(i - 1).y() *  (0.95 + (qrand() % 11) / 100.0));
+        else
+            series->append(momentInTime.toMSecsSinceEpoch(), 45);
+    }
+    //![2]
+
+    //![3]
+    QChart* chart = new QChart();
+    chart->legend()->hide();
+    chart->addSeries(series);
+    chart->createDefaultAxes();
+    QDateTimeAxis *axisX = new QDateTimeAxis;
+    axisX->setTicksCount(20);
+    momentInTime.setDate(QDate(2012,1,1));
+    momentInTime.setTime(QTime(6, 0));
+    axisX->setMin(momentInTime);
+    momentInTime.setDate(QDate(2012,1,7));
+    momentInTime.setTime(QTime(18, 0));
+    axisX->setMax(momentInTime);
+    chart->setAxisX(axisX, series);
+    chart->setTitle("Date and Time axis chart example");
+    //![3]
+
+    //![4]
+    QChartView* chartView = new QChartView(chart);
+    chartView->setRenderHint(QPainter::Antialiasing);
+    //![4]
+
+
+    //![5]
+    QMainWindow window;
+    window.setCentralWidget(chartView);
+    window.resize(800, 600);
+    window.show();
+    //![5]
+
+    return a.exec();
+}
diff --git a/examples/examples.pro b/examples/examples.pro
index 9d0d0cc..ba53bbd 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -29,4 +29,5 @@ SUBDIRS += \
            horizontalpercentbarchart \
            donut \
            donutdrilldown \
-           scrollchart
+           scrollchart \
+           datetimeaxis
diff --git a/src/axis/datetimeaxis/qdatetimeaxis.cpp b/src/axis/datetimeaxis/qdatetimeaxis.cpp
index 506b5c1..b8e0bea 100644
--- a/src/axis/datetimeaxis/qdatetimeaxis.cpp
+++ b/src/axis/datetimeaxis/qdatetimeaxis.cpp
@@ -255,7 +255,7 @@ QDateTimeAxisPrivate::QDateTimeAxisPrivate(QDateTimeAxis* q):
 {
     m_min = QDateTime::fromMSecsSinceEpoch(0);
     m_max = QDateTime::fromMSecsSinceEpoch(0);
-    m_format = "hh:mm:ss\ndd-mm-yyyy";
+    m_format = "dd-MMM-yy\nh:mm";
 }
 
 QDateTimeAxisPrivate::~QDateTimeAxisPrivate()