Docs update

12 files changed, 33 insertions, 3 deletions

diff --git a/examples/callout/callout.cpp b/demos/callout/callout.cpp
index 9f1de8cc..9f1de8cc 100644
--- a/examples/callout/callout.cpp
+++ b/demos/callout/callout.cpp
diff --git a/examples/callout/callout.h b/demos/callout/callout.h
index 90499f52..90499f52 100644
--- a/examples/callout/callout.h
+++ b/demos/callout/callout.h
diff --git a/examples/callout/callout.pro b/demos/callout/callout.pro
index b0da66d6..ebe7b466 100644
--- a/examples/callout/callout.pro
+++ b/demos/callout/callout.pro
@@ -1,4 +1,4 @@
-!include( ../examples.pri ) {
+!include( ../demos.pri ) {
  error( "Couldn't find the examples.pri file!" )
 }
 
diff --git a/examples/callout/main.cpp b/demos/callout/main.cpp
index 18858fd3..18858fd3 100644
--- a/examples/callout/main.cpp
+++ b/demos/callout/main.cpp
diff --git a/examples/callout/view.cpp b/demos/callout/view.cpp
index 9e2c3284..5dc3f989 100644
--- a/examples/callout/view.cpp
+++ b/demos/callout/view.cpp
@@ -89,6 +89,8 @@ void View::resizeEvent(QResizeEvent *event)
          m_chart->resize(event->size());
          m_coordX->setPos(m_chart->size().width()/2 - 50, m_chart->size().height() - 20);
          m_coordY->setPos(m_chart->size().width()/2 + 50, m_chart->size().height() - 20);
+//         for (int i = 0; i < children().count(); i++)
+//             if ()
     }
     QGraphicsView::resizeEvent(event);
 }
diff --git a/examples/callout/view.h b/demos/callout/view.h
index 06fe3c1a..06fe3c1a 100644
--- a/examples/callout/view.h
+++ b/demos/callout/view.h
diff --git a/demos/demos.pro b/demos/demos.pro
index 1af6225d..eb09747f 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -14,7 +14,8 @@ SUBDIRS += piechartcustomization \
            qmlcustommodel \
            chartinteractions \
            qmlaxes \
-           qmlcustomlegend
+           qmlcustomlegend \
+           callout
 
 contains(QT_CONFIG, opengl) {
         SUBDIRS +=  chartthemes \
diff --git a/doc/images/examples_callout.png b/doc/images/demos_callout.png
index 7c0519ca..7c0519ca 100644
--- a/doc/images/examples_callout.png
+++ b/doc/images/demos_callout.png
diff --git a/doc/src/demos-audio.qdoc b/doc/src/demos-audio.qdoc
new file mode 100644
index 00000000..feda61e1
--- /dev/null
+++ b/doc/src/demos-audio.qdoc
@@ -0,0 +1,8 @@
+/*!
+     \example demos/audio
+     \title Audio demo
+     \subtitle
+
+     This demos shows drawing of the dynamic data (microphon input)
+     \image demos_audio.png
+*/
diff --git a/doc/src/demos-callout.qdoc b/doc/src/demos-callout.qdoc
new file mode 100644
index 00000000..5f6bb420
--- /dev/null
+++ b/doc/src/demos-callout.qdoc
@@ -0,0 +1,12 @@
+/*!
+     \example demos/callout
+     \title Callout demo
+     \subtitle
+
+     This demo shows how to draw an additional element (a callout) on top of the chart.
+     \image demos_callout.png
+
+     QChart class provides two methods that map between the scene coordinates and the series' domain (defines by the axes ranges).
+     QPointF QChart::mapToPosition(const QPointF &value, QAbstractSeries *series)
+     QPointF QChart::mapToValue(const QPointF &position, QAbstractSeries *series)
+*/
diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc
index e448c64d..7c7a5681 100644
--- a/doc/src/demos.qdoc
+++ b/doc/src/demos.qdoc
@@ -59,6 +59,14 @@
             <td><a href="demos-qmlweather.html"><img src="images/demos_qmlweather.png" width="300" alt="Qml Weather" /></a></td>
             <td><a href="demos-qmlcustomlegend.html"><img src="images/demos-qmlcustomlegend1.png" width="300" alt="Qml Custom Legend" /></a></td>
         </tr>
+        <tr>
+            <td><a href="demos-callout.html">Callout</a></td>
+            <td><a href="demos-audio.html">Audio</a></td>
+        </tr>
+        <tr>
+            <td><a href="demos-callout.html"><img src="images/demos_callout.png" width="300" alt="Callout" /></a></td>
+            <td><a href="demos-audio.html"><img src="images/demos_audio.png" width="300" alt="Audio" /></a></td>
+        </tr>
 
     </table>
     </div>
diff --git a/examples/examples.pro b/examples/examples.pro
index 969f351a..ecc1b5fb 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -31,7 +31,6 @@ SUBDIRS += \
            temperaturerecords \
            donutchart \
            multiaxis \
-           callout \
            legendmarkers
 
 !linux-arm*: {