HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2358:9d5a354692be

Docs update

Marek Rosa -

r2358:9d5a354692be

parent child

Context file:

r2358:9d5a354692be

Collapse all files

doc/src/demos-audio.qdoc created 644 +8 0

@@ -0,0 +1,8
	1	/*!
	2	\example demos/audio
	3	\title Audio demo
	4	\subtitle
	5
	6	This demos shows drawing of the dynamic data (microphon input)
	7	\image demos_audio.png
	8	*/

doc/src/demos-callout.qdoc created 644 +12 0

@@ -0,0 +1,12
	1	/*!
	2	\example demos/callout
	3	\title Callout demo
	4	\subtitle
	5
	6	This demo shows how to draw an additional element (a callout) on top of the chart.
	7	\image demos_callout.png
	8
	9	QChart class provides two methods that map between the scene coordinates and the series' domain (defines by the axes ranges).
	10	QPointF QChart::mapToPosition(const QPointF &value, QAbstractSeries *series)
	11	QPointF QChart::mapToValue(const QPointF &position, QAbstractSeries *series)
	12	*/

demos/callout/callout.cpp ~~examples/callout/callout.cpp~~ renamed 0 0

NO CONTENT: file renamed from examples/callout/callout.cpp to demos/callout/callout.cpp

demos/callout/callout.h ~~examples/callout/callout.h~~ renamed 0 0

NO CONTENT: file renamed from examples/callout/callout.h to demos/callout/callout.h

demos/callout/callout.pro ~~examples/callout/callout.pro~~ renamed +1 -1

-            !include( ../examples.pri ) {
+            !include( ../demos.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             TARGET = callout
             TEMPLATE = app
             SOURCES += \
                     main.cpp\
                     callout.cpp \
                     view.cpp
             HEADERS  += \
                     callout.h \
                     view.h

demos/callout/main.cpp ~~examples/callout/main.cpp~~ renamed 0 0

NO CONTENT: file renamed from examples/callout/main.cpp to demos/callout/main.cpp

demos/callout/view.cpp ~~examples/callout/view.cpp~~ renamed +2 0

             /****************************************************************************
              **
              ** 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 "view.h"
             #include <QResizeEvent>
             #include <QGraphicsScene>
             #include <QChart>
             #include <QLineSeries>
             #include <QSplineSeries>
             #include <QGraphicsTextItem>
             #include "callout.h"
             #include <QMouseEvent>
             View::View(QWidget *parent)
                 : QGraphicsView(new QGraphicsScene, parent),
                   m_coordX(0),
                   m_coordY(0),
                   m_chart(0),
                   m_tooltip(0)
             {
                 setDragMode(QGraphicsView::NoDrag);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 // chart
                 m_chart = new QChart;
                 m_chart->setMinimumSize(640, 480);
                 m_chart->setTitle("Hover the line to show callout. Click the line to make it stay");
                 m_chart->legend()->hide();
                 QLineSeries *series = new QLineSeries;
                 series->append(1, 3);
                 series->append(4, 5);
                 series->append(5, 4.5);
                 series->append(7, 1);
                 series->append(11, 2);
                 m_chart->addSeries(series);
                 QSplineSeries *series2 = new QSplineSeries;
                 series2->append(1.6, 1.4);
                 series2->append(2.4, 3.5);
                 series2->append(3.7, 2.5);
                 series2->append(7, 4);
                 series2->append(10, 2);
                 m_chart->addSeries(series2);
                 m_chart->createDefaultAxes();
                 m_chart->setAcceptHoverEvents(true);
                 setRenderHint(QPainter::Antialiasing);
                 scene()->addItem(m_chart);
                 m_coordX = new QGraphicsSimpleTextItem(m_chart);
                 m_coordX->setPos(m_chart->size().width()/2 - 50, m_chart->size().height());
                 m_coordX->setText("X: ");
                 m_coordY = new QGraphicsSimpleTextItem(m_chart);
                 m_coordY->setPos(m_chart->size().width()/2 + 50, m_chart->size().height());
                 m_coordY->setText("Y: ");
                 connect(series, SIGNAL(clicked(QPointF)), this, SLOT(keepCallout()));
                 connect(series, SIGNAL(hovered(QPointF, bool)), this, SLOT(tooltip(QPointF,bool)));
                 connect(series2, SIGNAL(clicked(QPointF)), this, SLOT(keepCallout()));
                 connect(series2, SIGNAL(hovered(QPointF, bool)), this, SLOT(tooltip(QPointF,bool)));
                 this->setMouseTracking(true);
             }
             void View::resizeEvent(QResizeEvent *event)
             {
                 if (scene()) {
                     scene()->setSceneRect(QRect(QPoint(0, 0), event->size()));
                      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);
             }
             void View::mouseMoveEvent(QMouseEvent *event)
             {
                 m_coordX->setText(QString("X: %1").arg(m_chart->mapToValue(event->pos()).x()));
                 m_coordY->setText(QString("Y: %1").arg(m_chart->mapToValue(event->pos()).y()));
                 QGraphicsView::mouseMoveEvent(event);
             }
             void View::keepCallout()
             {
                 m_tooltip = new Callout(m_chart);
             }
             void View::tooltip(QPointF point, bool state)
             {
                 if (m_tooltip == 0)
                     m_tooltip = new Callout(m_chart);
                 if (state) {
                     m_tooltip->setText(QString("X: %1 \nY: %2 ").arg(point.x()).arg(point.y()));
                     QXYSeries *series = qobject_cast<QXYSeries *>(sender());
                     m_tooltip->setAnchor(m_chart->mapToPosition(point, series));
                     m_tooltip->setPos(m_chart->mapToPosition(point, series) + QPoint(10, -50));
                     m_tooltip->setZValue(11);
                     m_tooltip->show();
                 } else {
                     m_tooltip->hide();
                 }
             }

demos/callout/view.h ~~examples/callout/view.h~~ renamed 0 0

NO CONTENT: file renamed from examples/callout/view.h to demos/callout/view.h

demos/demos.pro +2 -1

             CURRENTLY_BUILDING_COMPONENTS = "demos"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += piechartcustomization \
                        dynamicspline \
                        nesteddonuts \
                        qmlchart \
                        qmlweather \
                        qmlf1legends \
                        qmlcustomizations \
                        qmlcustommodel \
                        chartinteractions \
                        qmlaxes \
-                       qmlcustomlegend
+                       qmlcustomlegend \
+                       callout
             contains(QT_CONFIG, opengl) {
                     SUBDIRS +=  chartthemes \
                                 qmloscilloscope \
                                 chartviewer
             } else {
                 message("OpenGL not available. Some demos are disabled")
             }
             contains(QT_CONFIG, multimedia) {
                     SUBDIRS += audio
             } else {
                 message("QtMultimedia library not available. Some demos are disabled")
             }

doc/images/demos_callout.png ~~doc/images/examples_callout.png~~ renamed 0 0

NO CONTENT: file renamed from doc/images/examples_callout.png to doc/images/demos_callout.png

doc/src/demos.qdoc +8 0

             /*!
                 \page demos.html
                 \keyword Demos
                 \raw HTML
                 <div class="qchart">
                 <table>
                     <tr>
                         <td><a href="demos-chartthemes.html">Chart Themes</a></td>
                         <td><a href="demos-dynamicspline.html">Dynamic Spline Chart</a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-chartthemes.html"><img src="images/demo_chartthemes_blue_cerulean.png" width="300" alt="Chart Themes" /></a></td>
                         <td><a href="demos-dynamicspline.html"><img src="images/demos_dynamicspline2.png" width="300" alt="Dynamic Spline" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-nesteddonuts.html">Nested Donuts Chart</a></td>
                         <td><a href="demos-piechartcustomization.html">Pie Chart Customization</a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-nesteddonuts.html"><img src="images/demos_nesteddonuts.png" width="300" alt="Nested Donuts Chart" /></a></td>
                         <td><a href="demos-piechartcustomization.html"><img src="images/piechart_customization.png" width="300" alt="Pie Chart Customization" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlchart.html">Qml Basic Charts</a></td>
                         <td><a href="demos-qmlaxes.html">Qml Axes</a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlchart.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qml Basic Charts" /></a></td>
                         <td><a href="demos-qmlaxes.html"><img src="images/demos_qmlaxes1.png" width="300" alt="Qml Axes" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlcustomizations.html">Qml Customizations</a></td>
                         <td><a href="demos-qmlcustommodel.html">Qml Custom Model</a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlcustomizations.html"><img src="images/demos_qmlcustomizations.png" width="300" alt="Qml Customizations" /></a></td>
                         <td><a href="demos-qmlcustommodel.html"><img src="images/demos_qmlcustommodel.png" width="300" alt="Qml Custom Model" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlf1legends.html">Qml F1 Legends</a></td>
                         <td><a href="demos-qmloscilloscope.html">Qml Oscilloscope</a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlf1legends.html"><img src="images/demos_qmlf1legends.png" width="300" alt="Qml F1 Legends" /></a></td>
                         <td><a href="demos-qmloscilloscope.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="Qml Oscilloscope" /></a></td>
                     </tr>
                     <tr>
                         <td><a href="demos-qmlweather.html">Qml Weather</a></td>
                         <td><a href="demos-qmlcustomlegend.html">Qml Custom Legend</a></td>
                     </tr>
                     <tr>
                         <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>
                 \endraw
             */

examples/examples.pro 0 -1

             CURRENTLY_BUILDING_COMPONENTS = "examples"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
                        customchart \
                        linechart \
                        percentbarchart \
                        piechart \
                        piechartdrilldown \
                        presenterchart \
                        scatterchart \
                        scatterinteractions \
                        splinechart \
                        stackedbarchart \
                        stackedbarchartdrilldown \
                        zoomlinechart \
                        modeldata \
                        barchart \
                        legend \
                        barmodelmapper \
                        qmlpiechart \
                        lineandbar \
                        horizontalbarchart \
                        horizontalstackedbarchart \
                        horizontalpercentbarchart \
                        donutbreakdown \
                        temperaturerecords \
                        donutchart \
                        multiaxis \
-                       callout \
                        legendmarkers
             !linux-arm*: {
             SUBDIRS += \
                 datetimeaxis
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages