centralize and fixup example sources install targets
This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
committed by
The Qt Project
parent
90c8ba233b
commit
6b4994c265
@@ -0,0 +1,250 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "frequencymonitor.h"
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QElapsedTimer>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QTime>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
//#define VERBOSE_TRACE
|
||||
|
||||
inline QDebug qtTrace() { return qDebug() << "[frequencymonitor]"; }
|
||||
#ifdef VERBOSE_TRACE
|
||||
inline QDebug qtVerboseTrace() { return qtTrace(); }
|
||||
#else
|
||||
inline QNoDebug qtVerboseTrace() { return QNoDebug(); }
|
||||
#endif
|
||||
|
||||
static const int DefaultSamplingInterval = 100;
|
||||
static const int DefaultTraceInterval = 0;
|
||||
|
||||
class FrequencyMonitorPrivate : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
FrequencyMonitorPrivate(FrequencyMonitor *parent);
|
||||
void calculateInstantaneousFrequency();
|
||||
|
||||
private slots:
|
||||
void calculateAverageFrequency();
|
||||
void stalled();
|
||||
|
||||
public:
|
||||
FrequencyMonitor *const q_ptr;
|
||||
QString m_label;
|
||||
bool m_active;
|
||||
qreal m_instantaneousFrequency;
|
||||
QElapsedTimer m_instantaneousElapsed;
|
||||
QTimer *m_averageTimer;
|
||||
QElapsedTimer m_averageElapsed;
|
||||
int m_count;
|
||||
qreal m_averageFrequency;
|
||||
QTimer *m_traceTimer;
|
||||
QTimer *m_stalledTimer;
|
||||
};
|
||||
|
||||
FrequencyMonitorPrivate::FrequencyMonitorPrivate(FrequencyMonitor *parent)
|
||||
: QObject(parent)
|
||||
, q_ptr(parent)
|
||||
, m_active(false)
|
||||
, m_instantaneousFrequency(0)
|
||||
, m_averageTimer(new QTimer(this))
|
||||
, m_count(0)
|
||||
, m_averageFrequency(0)
|
||||
, m_traceTimer(new QTimer(this))
|
||||
, m_stalledTimer(new QTimer(this))
|
||||
{
|
||||
m_instantaneousElapsed.start();
|
||||
connect(m_averageTimer, SIGNAL(timeout()),
|
||||
this, SLOT(calculateAverageFrequency()));
|
||||
if (DefaultSamplingInterval)
|
||||
m_averageTimer->start(DefaultSamplingInterval);
|
||||
m_averageElapsed.start();
|
||||
connect(m_traceTimer, SIGNAL(timeout()),
|
||||
q_ptr, SLOT(trace()));
|
||||
if (DefaultTraceInterval)
|
||||
m_traceTimer->start(DefaultTraceInterval);
|
||||
m_stalledTimer->setSingleShot(true);
|
||||
connect(m_stalledTimer, SIGNAL(timeout()),
|
||||
this, SLOT(stalled()));
|
||||
}
|
||||
|
||||
void FrequencyMonitorPrivate::calculateInstantaneousFrequency()
|
||||
{
|
||||
const qint64 ms = m_instantaneousElapsed.restart();
|
||||
m_instantaneousFrequency = ms ? qreal(1000) / ms : 0;
|
||||
m_stalledTimer->start(3 * ms);
|
||||
if (m_instantaneousFrequency)
|
||||
q_ptr->setActive(true);
|
||||
q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
|
||||
q_ptr->emit frequencyChanged();
|
||||
}
|
||||
|
||||
void FrequencyMonitorPrivate::calculateAverageFrequency()
|
||||
{
|
||||
const qint64 ms = m_averageElapsed.restart();
|
||||
m_averageFrequency = qreal(m_count * 1000) / ms;
|
||||
q_ptr->emit averageFrequencyChanged(m_averageFrequency);
|
||||
q_ptr->emit frequencyChanged();
|
||||
m_count = 0;
|
||||
}
|
||||
|
||||
void FrequencyMonitorPrivate::stalled()
|
||||
{
|
||||
if (m_instantaneousFrequency) {
|
||||
qtVerboseTrace() << "FrequencyMonitor::stalled";
|
||||
m_instantaneousFrequency = 0;
|
||||
q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
|
||||
q_ptr->emit frequencyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
FrequencyMonitor::FrequencyMonitor(QObject *parent)
|
||||
: QObject(parent)
|
||||
, d_ptr(0)
|
||||
{
|
||||
d_ptr = new FrequencyMonitorPrivate(this);
|
||||
qtTrace() << "FrequencyMonitor::FrequencyMonitor";
|
||||
}
|
||||
|
||||
FrequencyMonitor::~FrequencyMonitor()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
const QString &FrequencyMonitor::label() const
|
||||
{
|
||||
return d_func()->m_label;
|
||||
}
|
||||
|
||||
bool FrequencyMonitor::active() const
|
||||
{
|
||||
return d_func()->m_active;
|
||||
}
|
||||
|
||||
int FrequencyMonitor::samplingInterval() const
|
||||
{
|
||||
return d_ptr->m_averageTimer->isActive() ? d_ptr->m_averageTimer->interval() : 0;
|
||||
}
|
||||
|
||||
int FrequencyMonitor::traceInterval() const
|
||||
{
|
||||
return d_ptr->m_traceTimer->isActive() ? d_ptr->m_traceTimer->interval() : 0;
|
||||
}
|
||||
|
||||
qreal FrequencyMonitor::instantaneousFrequency() const
|
||||
{
|
||||
return d_func()->m_instantaneousFrequency;
|
||||
}
|
||||
|
||||
qreal FrequencyMonitor::averageFrequency() const
|
||||
{
|
||||
return d_func()->m_averageFrequency;
|
||||
}
|
||||
|
||||
void FrequencyMonitor::notify()
|
||||
{
|
||||
Q_D(FrequencyMonitor);
|
||||
++(d->m_count);
|
||||
d->calculateInstantaneousFrequency();
|
||||
}
|
||||
|
||||
void FrequencyMonitor::trace()
|
||||
{
|
||||
Q_D(FrequencyMonitor);
|
||||
const QString value = QString::fromLatin1("instant %1 average %2")
|
||||
.arg(d->m_instantaneousFrequency, 0, 'f', 2)
|
||||
.arg(d->m_averageFrequency, 0, 'f', 2);
|
||||
if (d->m_label.isEmpty())
|
||||
qtTrace() << "FrequencyMonitor::trace" << value;
|
||||
else
|
||||
qtTrace() << "FrequencyMonitor::trace" << "label" << d->m_label << value;
|
||||
}
|
||||
|
||||
void FrequencyMonitor::setLabel(const QString &value)
|
||||
{
|
||||
Q_D(FrequencyMonitor);
|
||||
if (d->m_label != value) {
|
||||
d->m_label = value;
|
||||
emit labelChanged(d->m_label);
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyMonitor::setActive(bool value)
|
||||
{
|
||||
Q_D(FrequencyMonitor);
|
||||
if (d->m_active != value) {
|
||||
d->m_active = value;
|
||||
emit activeChanged(d->m_active);
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyMonitor::setSamplingInterval(int value)
|
||||
{
|
||||
Q_D(FrequencyMonitor);
|
||||
if (samplingInterval() != value) {
|
||||
if (value) {
|
||||
d->m_averageTimer->setInterval(value);
|
||||
d->m_averageTimer->start();
|
||||
} else {
|
||||
d->m_averageTimer->stop();
|
||||
}
|
||||
emit samplingIntervalChanged(value);
|
||||
}
|
||||
}
|
||||
|
||||
void FrequencyMonitor::setTraceInterval(int value)
|
||||
{
|
||||
Q_D(FrequencyMonitor);
|
||||
if (traceInterval() != value) {
|
||||
if (value) {
|
||||
d->m_traceTimer->setInterval(value);
|
||||
d->m_traceTimer->start();
|
||||
} else {
|
||||
d->m_traceTimer->stop();
|
||||
}
|
||||
emit traceIntervalChanged(value);
|
||||
}
|
||||
}
|
||||
|
||||
#include "frequencymonitor.moc"
|
||||
@@ -0,0 +1,101 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef FREQUENCYMONITOR_H
|
||||
#define FREQUENCYMONITOR_H
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
class FrequencyMonitorPrivate;
|
||||
|
||||
/**
|
||||
* Class for measuring frequency of events
|
||||
*
|
||||
* Occurrence of the event is notified by the client via the notify() slot.
|
||||
* On a regular interval, both an instantaneous and a rolling average
|
||||
* event frequency are calculated.
|
||||
*/
|
||||
class FrequencyMonitor : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DECLARE_PRIVATE(FrequencyMonitor)
|
||||
Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
|
||||
Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
|
||||
Q_PROPERTY(int samplingInterval READ samplingInterval WRITE setSamplingInterval NOTIFY samplingIntervalChanged)
|
||||
Q_PROPERTY(int traceInterval READ traceInterval WRITE setTraceInterval NOTIFY traceIntervalChanged)
|
||||
Q_PROPERTY(qreal instantaneousFrequency READ instantaneousFrequency NOTIFY instantaneousFrequencyChanged)
|
||||
Q_PROPERTY(qreal averageFrequency READ averageFrequency NOTIFY averageFrequencyChanged)
|
||||
public:
|
||||
FrequencyMonitor(QObject *parent = 0);
|
||||
~FrequencyMonitor();
|
||||
|
||||
static void qmlRegisterType();
|
||||
|
||||
const QString &label() const;
|
||||
bool active() const;
|
||||
int samplingInterval() const;
|
||||
int traceInterval() const;
|
||||
qreal instantaneousFrequency() const;
|
||||
qreal averageFrequency() const;
|
||||
|
||||
signals:
|
||||
void labelChanged(const QString &value);
|
||||
void activeChanged(bool);
|
||||
void samplingIntervalChanged(int value);
|
||||
void traceIntervalChanged(int value);
|
||||
void frequencyChanged();
|
||||
void instantaneousFrequencyChanged(qreal value);
|
||||
void averageFrequencyChanged(qreal value);
|
||||
|
||||
public slots:
|
||||
Q_INVOKABLE void notify();
|
||||
Q_INVOKABLE void trace();
|
||||
void setActive(bool value);
|
||||
void setLabel(const QString &value);
|
||||
void setSamplingInterval(int value);
|
||||
void setTraceInterval(int value);
|
||||
|
||||
private:
|
||||
FrequencyMonitorPrivate *d_ptr;
|
||||
};
|
||||
|
||||
#endif // FREQUENCYMONITOR_H
|
||||
@@ -0,0 +1,5 @@
|
||||
HEADERS += $$PWD/frequencymonitor.h
|
||||
SOURCES += $$PWD/frequencymonitor.cpp
|
||||
INCLUDEPATH += $$PWD
|
||||
DEFINES += FREQUENCYMONITOR_SUPPORT
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "frequencymonitor.h"
|
||||
#include <QtQml/qqml.h>
|
||||
|
||||
void FrequencyMonitor::qmlRegisterType()
|
||||
{
|
||||
::qmlRegisterType<FrequencyMonitor>("FrequencyMonitor", 1, 0, "FrequencyMonitor");
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
include($$PWD/frequencymonitor.pri)
|
||||
QT += qml
|
||||
SOURCES += $$PWD/frequencymonitordeclarative.cpp
|
||||
@@ -0,0 +1,105 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
import FrequencyMonitor 1.0
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
property bool logging: true
|
||||
property bool displayed: true
|
||||
property bool enabled: logging || displayed
|
||||
property alias active: monitor.active
|
||||
property int samplingInterval: 500
|
||||
property color textColor: "yellow"
|
||||
property int textSize: 20
|
||||
property alias label: monitor.label
|
||||
|
||||
border.width: 1
|
||||
border.color: "yellow"
|
||||
width: 5.5 * root.textSize
|
||||
height: 3.0 * root.textSize
|
||||
color: "black"
|
||||
opacity: 0.5
|
||||
radius: 10
|
||||
visible: displayed && active
|
||||
|
||||
// This should ensure that the monitor is on top of all other content
|
||||
z: 999
|
||||
|
||||
function notify() {
|
||||
monitor.notify()
|
||||
}
|
||||
|
||||
FrequencyMonitor {
|
||||
id: monitor
|
||||
samplingInterval: root.enabled ? root.samplingInterval : 0
|
||||
onAverageFrequencyChanged: {
|
||||
if (root.logging) trace()
|
||||
averageFrequencyText.text = monitor.averageFrequency.toFixed(2)
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
id: labelText
|
||||
anchors {
|
||||
left: parent.left
|
||||
top: parent.top
|
||||
margins: 10
|
||||
}
|
||||
color: root.textColor
|
||||
font.pixelSize: 0.6 * root.textSize
|
||||
text: root.label
|
||||
width: root.width - 2*anchors.margins
|
||||
elide: Text.ElideRight
|
||||
}
|
||||
|
||||
Text {
|
||||
id: averageFrequencyText
|
||||
anchors {
|
||||
right: parent.right
|
||||
bottom: parent.bottom
|
||||
margins: 10
|
||||
}
|
||||
color: root.textColor
|
||||
font.pixelSize: root.textSize
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
|
||||
bool parseArgument(const QString &arg, State &state)
|
||||
{
|
||||
bool result = false;
|
||||
if ("-log-perf" == arg) {
|
||||
state.logging = true;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-no-log-perf" == arg) {
|
||||
state.logging = false;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-show-perf" == arg) {
|
||||
state.visible = true;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
} else if ("-hide-perf" == arg) {
|
||||
state.visible = false;
|
||||
state.valid = true;
|
||||
result = true;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef PERFORMANCEMONITOR_H
|
||||
#define PERFORMANCEMONITOR_H
|
||||
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
struct State {
|
||||
bool valid;
|
||||
bool logging;
|
||||
bool visible;
|
||||
|
||||
State() : valid(true), logging(false), visible(true) { }
|
||||
State(bool l, bool v) : valid(true), logging(l), visible(v) { }
|
||||
bool operator==(const State &other) const
|
||||
{ return logging == other.logging && visible == other.visible; }
|
||||
bool operator!=(const State &other) const
|
||||
{ return logging != other.logging || visible != other.visible; }
|
||||
};
|
||||
|
||||
bool parseArgument(const QString &arg, State &state);
|
||||
}
|
||||
|
||||
#endif // PERFORMANCEMONITOR_H
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
HEADERS += $$PWD/performancemonitor.h
|
||||
SOURCES += $$PWD/performancemonitor.cpp
|
||||
DEFINES += PERFORMANCEMONITOR_SUPPORT
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "frequencymonitor.h"
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
|
||||
void qmlRegisterTypes()
|
||||
{
|
||||
FrequencyMonitor::qmlRegisterType();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef PERFORMANCEMONITORDECLARATIVE_H
|
||||
#define PERFORMANCEMONITORDECLARATIVE_H
|
||||
|
||||
#include "performancemonitor.h"
|
||||
|
||||
namespace PerformanceMonitor {
|
||||
void qmlRegisterTypes();
|
||||
}
|
||||
|
||||
#endif // PERFORMANCEMONITORDECLARATIVE_H
|
||||
@@ -0,0 +1,5 @@
|
||||
include($$PWD/../frequencymonitor/frequencymonitordeclarative.pri)
|
||||
include($$PWD/performancemonitor.pri)
|
||||
|
||||
HEADERS += $$PWD/performancemonitordeclarative.h
|
||||
SOURCES += $$PWD/performancemonitordeclarative.cpp
|
||||
@@ -0,0 +1,141 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the Qt Mobility Components.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
property bool logging: true
|
||||
property bool displayed: true
|
||||
property bool videoActive
|
||||
property int margins: 5
|
||||
property bool enabled: true
|
||||
|
||||
color: "transparent"
|
||||
|
||||
// This should ensure that the monitor is on top of all other content
|
||||
z: 999
|
||||
|
||||
Column {
|
||||
id: column
|
||||
anchors {
|
||||
fill: root
|
||||
margins: 10
|
||||
}
|
||||
spacing: 10
|
||||
}
|
||||
|
||||
QtObject {
|
||||
id: d
|
||||
property Item qmlFrameRateItem: null
|
||||
property Item videoFrameRateItem: null
|
||||
}
|
||||
|
||||
Connections {
|
||||
id: videoFrameRateActiveConnections
|
||||
ignoreUnknownSignals: true
|
||||
onActiveChanged: root.videoActive = videoFrameRateActiveConnections.target.active
|
||||
}
|
||||
|
||||
states: [
|
||||
State {
|
||||
name: "hidden"
|
||||
PropertyChanges {
|
||||
target: root
|
||||
opacity: 0
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
transitions: [
|
||||
Transition {
|
||||
from: "*"
|
||||
to: "*"
|
||||
NumberAnimation {
|
||||
properties: "opacity"
|
||||
easing.type: Easing.OutQuart
|
||||
duration: 500
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
state: enabled ? "baseState" : "hidden"
|
||||
|
||||
function createQmlFrameRateItem() {
|
||||
var component = Qt.createComponent("../frequencymonitor/FrequencyItem.qml")
|
||||
if (component.status == Component.Ready)
|
||||
d.qmlFrameRateItem = component.createObject(column, { label: "QML frame rate",
|
||||
displayed: root.displayed,
|
||||
logging: root.logging
|
||||
})
|
||||
}
|
||||
|
||||
function createVideoFrameRateItem() {
|
||||
var component = Qt.createComponent("../frequencymonitor/FrequencyItem.qml")
|
||||
if (component.status == Component.Ready)
|
||||
d.videoFrameRateItem = component.createObject(column, { label: "Video frame rate",
|
||||
displayed: root.displayed,
|
||||
logging: root.logging
|
||||
})
|
||||
videoFrameRateActiveConnections.target = d.videoFrameRateItem
|
||||
}
|
||||
|
||||
|
||||
function init() {
|
||||
createQmlFrameRateItem()
|
||||
createVideoFrameRateItem()
|
||||
}
|
||||
|
||||
function videoFramePainted() {
|
||||
if (d.videoFrameRateItem)
|
||||
d.videoFrameRateItem.notify()
|
||||
}
|
||||
|
||||
function qmlFramePainted() {
|
||||
if (d.qmlFrameRateItem)
|
||||
d.qmlFrameRateItem.notify()
|
||||
}
|
||||
|
||||
onVideoActiveChanged: {
|
||||
if (d.videoFrameRateItem)
|
||||
d.videoFrameRateItem.active = root.videoActive
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user