diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /examples/charts/audio | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'examples/charts/audio')
-rw-r--r-- | examples/charts/audio/audio.pro | 15 | ||||
-rw-r--r-- | examples/charts/audio/main.cpp | 31 | ||||
-rw-r--r-- | examples/charts/audio/widget.cpp | 82 | ||||
-rw-r--r-- | examples/charts/audio/widget.h | 52 | ||||
-rw-r--r-- | examples/charts/audio/xyseriesiodevice.cpp | 57 | ||||
-rw-r--r-- | examples/charts/audio/xyseriesiodevice.h | 47 |
6 files changed, 284 insertions, 0 deletions
diff --git a/examples/charts/audio/audio.pro b/examples/charts/audio/audio.pro new file mode 100644 index 00000000..6a3b6917 --- /dev/null +++ b/examples/charts/audio/audio.pro @@ -0,0 +1,15 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +QT += multimedia + +TARGET = audio +TEMPLATE = app + +SOURCES += main.cpp\ + widget.cpp \ + xyseriesiodevice.cpp + +HEADERS += widget.h \ + xyseriesiodevice.h diff --git a/examples/charts/audio/main.cpp b/examples/charts/audio/main.cpp new file mode 100644 index 00000000..dd9069df --- /dev/null +++ b/examples/charts/audio/main.cpp @@ -0,0 +1,31 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise 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 "widget.h" + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + Widget w; + w.show(); + + return a.exec(); +} diff --git a/examples/charts/audio/widget.cpp b/examples/charts/audio/widget.cpp new file mode 100644 index 00000000..6cd5d442 --- /dev/null +++ b/examples/charts/audio/widget.cpp @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise 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 "widget.h" +#include <QAudioDeviceInfo> +#include <QAudioInput> +#include <QChartView> +#include <QLineSeries> +#include <QChart> +#include <QVBoxLayout> +#include <QValueAxis> +#include "xyseriesiodevice.h" + +QT_CHARTS_USE_NAMESPACE + +Widget::Widget(QWidget *parent) + : QWidget(parent), + m_device(0), + m_chart(0), + m_series(0), + m_audioInput(0) +{ + m_chart = new QChart; + QChartView *chartView = new QChartView(m_chart); + chartView->setMinimumSize(800, 600); + m_series = new QLineSeries; + m_chart->addSeries(m_series); + QValueAxis *axisX = new QValueAxis; + axisX->setRange(0, 2000); + axisX->setLabelFormat("%g"); + axisX->setTitleText("Samples"); + QValueAxis *axisY = new QValueAxis; + axisY->setRange(-1, 1); + axisY->setTitleText("Audio level"); + m_chart->setAxisX(axisX, m_series); + m_chart->setAxisY(axisY, m_series); + m_chart->legend()->hide(); + m_chart->setTitle("Data from the microphone"); + + QVBoxLayout *mainLayout = new QVBoxLayout; + mainLayout->addWidget(chartView); + setLayout(mainLayout); + + QAudioFormat formatAudio; + formatAudio.setSampleRate(8000); + formatAudio.setChannelCount(1); + formatAudio.setSampleSize(8); + formatAudio.setCodec("audio/pcm"); + formatAudio.setByteOrder(QAudioFormat::LittleEndian); + formatAudio.setSampleType(QAudioFormat::UnSignedInt); + + QAudioDeviceInfo inputDevices = QAudioDeviceInfo::defaultInputDevice(); + m_audioInput = new QAudioInput(inputDevices,formatAudio, this); + + m_device = new XYSeriesIODevice(m_series, this); + m_device->open(QIODevice::WriteOnly); + + m_audioInput->start(m_device); +} + +Widget::~Widget() +{ + m_audioInput->stop(); + m_device->close(); +} diff --git a/examples/charts/audio/widget.h b/examples/charts/audio/widget.h new file mode 100644 index 00000000..6f745069 --- /dev/null +++ b/examples/charts/audio/widget.h @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise 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$ +** +****************************************************************************/ + +#ifndef WIDGET_H +#define WIDGET_H + +#include <QWidget> +#include <QChartGlobal> + +QT_CHARTS_BEGIN_NAMESPACE +class QLineSeries; +class QChart; +QT_CHARTS_END_NAMESPACE + +QT_CHARTS_USE_NAMESPACE + +class XYSeriesIODevice; +class QAudioInput; + +class Widget : public QWidget +{ + Q_OBJECT + +public: + Widget(QWidget *parent = 0); + ~Widget(); + +private: + XYSeriesIODevice *m_device; + QChart *m_chart; + QLineSeries *m_series; + QAudioInput *m_audioInput; +}; + +#endif // WIDGET_H diff --git a/examples/charts/audio/xyseriesiodevice.cpp b/examples/charts/audio/xyseriesiodevice.cpp new file mode 100644 index 00000000..5440771f --- /dev/null +++ b/examples/charts/audio/xyseriesiodevice.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise 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 "xyseriesiodevice.h" +#include <QXYSeries> + +XYSeriesIODevice::XYSeriesIODevice(QXYSeries * series, QObject *parent) : + QIODevice(parent), + m_series(series) +{ +} + +qint64 XYSeriesIODevice::readData(char * data, qint64 maxSize) +{ + Q_UNUSED(data) + Q_UNUSED(maxSize) + return -1; +} + +qint64 XYSeriesIODevice::writeData(const char * data, qint64 maxSize) +{ + qint64 range = 2000; + QList<QPointF> oldPoints = m_series->points(); + QList<QPointF> points; + int resolution = 4; + + if (oldPoints.count() < range) { + points = m_series->points(); + } else { + for (int i = maxSize/resolution; i < oldPoints.count(); i++) + points.append(QPointF(i - maxSize/resolution, oldPoints.at(i).y())); + } + + qint64 size = points.count(); + for (int k = 0; k < maxSize/resolution; k++) + points.append(QPointF(k + size, ((quint8)data[resolution * k] - 128)/128.0)); + + m_series->replace(points); + return maxSize; +} diff --git a/examples/charts/audio/xyseriesiodevice.h b/examples/charts/audio/xyseriesiodevice.h new file mode 100644 index 00000000..6e504b08 --- /dev/null +++ b/examples/charts/audio/xyseriesiodevice.h @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise 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$ +** +****************************************************************************/ + +#ifndef XYSERIESIODEVICE_H +#define XYSERIESIODEVICE_H + +#include <QIODevice> +#include <QChartGlobal> + +QT_CHARTS_BEGIN_NAMESPACE +class QXYSeries; +QT_CHARTS_END_NAMESPACE + +QT_CHARTS_USE_NAMESPACE + +class XYSeriesIODevice : public QIODevice +{ + Q_OBJECT +public: + explicit XYSeriesIODevice(QXYSeries * series, QObject *parent = 0); + +protected: + qint64 readData(char * data, qint64 maxSize); + qint64 writeData(const char * data, qint64 maxSize); + +private: + QXYSeries *m_series; +}; + +#endif // XYSERIESIODEVICE_H |