Merge lp:~unity-team/libusermetrics/minimum-maximum-qml into lp:libusermetrics

[Pete Woods]

Support minimum and maximum properties in the QML API

Support minimum and maximum properties in the QML API

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2013-10-01 10:22:38 +0000
+++ po/en_GB.po	2013-10-02 09:46:27 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libusermetrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-01 11:14+0100\n"
+"POT-Creation-Date: 2013-10-02 10:29+0100\n"
 "PO-Revision-Date: 2013-07-05 15:09+0100\n"
 "Last-Translator: Pete Woods <[e-mail]>\n"
 "Language-Team: British English <[e-mail]>\n"
@@ -25,7 +25,7 @@
 msgid "Attempt to create data set owned by another user"
 msgstr "Attempt to create data set owned by another user"
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:239
+#: src/usermetricsservice/DBusUserMetrics.cpp:250
 #, fuzzy
 msgid "Attempt to create user data owned by another user"
 msgstr "Attempt to create user data owned by another user"
@@ -73,11 +73,11 @@
 #: src/usermetricsservice/DBusDataSource.cpp:190
 #: src/usermetricsservice/DBusDataSource.cpp:216
 #: src/usermetricsservice/DBusDataSource.cpp:234
-#: src/usermetricsservice/DBusUserMetrics.cpp:177
+#: src/usermetricsservice/DBusUserMetrics.cpp:188
 msgid "Could not save data source"
 msgstr "Couldn't save data source"
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:257
+#: src/usermetricsservice/DBusUserMetrics.cpp:268
 msgid "Could not save user data"
 msgstr "Couldn't save user data"
 
@@ -98,23 +98,24 @@
 msgid "Data source not found"
 msgstr "Data source not found"
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:143
+#: src/usermetricsservice/DBusUserMetrics.cpp:142
+#: src/usermetricsservice/DBusUserMetrics.cpp:154
 msgid "Data source query failed"
 msgstr "Data source query failed"
 
-#: src/modules/UserMetrics/Metric.cpp:28
+#: src/modules/UserMetrics/Metric.cpp:30
 msgid "Failed to connect to metrics service:"
 msgstr "Failed to connect to metrics service:"
 
-#: src/modules/UserMetrics/Metric.cpp:115
+#: src/modules/UserMetrics/Metric.cpp:154
 msgid "Failed to increment metric:"
 msgstr ""
 
-#: src/modules/UserMetrics/Metric.cpp:102
+#: src/modules/UserMetrics/Metric.cpp:141
 msgid "Failed to register user metric:"
 msgstr "Failed to register user metric:"
 
-#: src/modules/UserMetrics/Metric.cpp:127
+#: src/modules/UserMetrics/Metric.cpp:166
 msgid "Failed to update metric:"
 msgstr "Failed to update metric:"
 
@@ -151,7 +152,7 @@
 msgid "Usage: "
 msgstr "Usage: "
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:248
+#: src/usermetricsservice/DBusUserMetrics.cpp:259
 msgid "User data query failed"
 msgstr "User data query failed"
 
 
=== modified file 'po/libusermetrics.pot'
--- po/libusermetrics.pot	2013-10-01 10:22:38 +0000
+++ po/libusermetrics.pot	2013-10-02 09:46:27 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libusermetrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-01 11:16+0100\n"
+"POT-Creation-Date: 2013-10-02 10:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -38,7 +38,7 @@
 #: src/usermetricsservice/DBusDataSource.cpp:190
 #: src/usermetricsservice/DBusDataSource.cpp:216
 #: src/usermetricsservice/DBusDataSource.cpp:234
-#: src/usermetricsservice/DBusUserMetrics.cpp:177
+#: src/usermetricsservice/DBusUserMetrics.cpp:188
 msgid "Could not save data source"
 msgstr ""
 
@@ -46,19 +46,20 @@
 msgid "Unable to register user metrics object on DBus"
 msgstr ""
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:143
+#: src/usermetricsservice/DBusUserMetrics.cpp:142
+#: src/usermetricsservice/DBusUserMetrics.cpp:154
 msgid "Data source query failed"
 msgstr ""
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:239
+#: src/usermetricsservice/DBusUserMetrics.cpp:250
 msgid "Attempt to create user data owned by another user"
 msgstr ""
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:248
+#: src/usermetricsservice/DBusUserMetrics.cpp:259
 msgid "User data query failed"
 msgstr ""
 
-#: src/usermetricsservice/DBusUserMetrics.cpp:257
+#: src/usermetricsservice/DBusUserMetrics.cpp:268
 msgid "Could not save user data"
 msgstr ""
 
@@ -107,19 +108,19 @@
 msgid "New data set could not be found"
 msgstr ""
 
-#: src/modules/UserMetrics/Metric.cpp:28
+#: src/modules/UserMetrics/Metric.cpp:30
 msgid "Failed to connect to metrics service:"
 msgstr ""
 
-#: src/modules/UserMetrics/Metric.cpp:102
+#: src/modules/UserMetrics/Metric.cpp:141
 msgid "Failed to register user metric:"
 msgstr ""
 
-#: src/modules/UserMetrics/Metric.cpp:115
+#: src/modules/UserMetrics/Metric.cpp:154
 msgid "Failed to increment metric:"
 msgstr ""
 
-#: src/modules/UserMetrics/Metric.cpp:127
+#: src/modules/UserMetrics/Metric.cpp:166
 msgid "Failed to update metric:"
 msgstr ""
 
 
=== modified file 'src/modules/UserMetrics/CMakeLists.txt'
--- src/modules/UserMetrics/CMakeLists.txt	2013-09-24 08:13:01 +0000
+++ src/modules/UserMetrics/CMakeLists.txt	2013-10-02 09:46:27 +0000
@@ -38,4 +38,7 @@
 install(FILES qmldir DESTINATION ${PLUGIN_DIR})
 
 # copy qmldir file to build dir so QML unit tests can use it to import the plugin
-file(COPY qmldir DESTINATION ${CMAKE_BINARY_DIR}/src/modules/UserMetrics)
+configure_file(
+	qmldir
+	qmldir
+)
 
=== modified file 'src/modules/UserMetrics/Metric.cpp'
--- src/modules/UserMetrics/Metric.cpp	2013-09-26 15:24:43 +0000
+++ src/modules/UserMetrics/Metric.cpp	2013-10-02 09:46:27 +0000
@@ -18,10 +18,12 @@
 #include <libusermetricscommon/Localisation.h>
 
 #include <stdexcept>
+#include <cmath>
 #include <QDebug>
 
 Metric::Metric(QObject *parent) :
-		QObject(parent), m_componentComplete(false) {
+		QObject(parent), m_componentComplete(false), m_minimum(NAN), m_maximum(
+		NAN) {
 	try {
 		m_metricManager.reset(UserMetricsInput::MetricManager::getInstance());
 	} catch (std::exception &e) {
@@ -80,6 +82,30 @@
 	}
 }
 
+double Metric::minimum() const {
+	return m_minimum;
+}
+
+void Metric::setMinimum(double minimum) {
+	if (m_minimum != minimum) {
+		m_minimum = minimum;
+		Q_EMIT minimumChanged();
+		registerMetric();
+	}
+}
+
+double Metric::maximum() const {
+	return m_maximum;
+}
+
+void Metric::setMaximum(double maximum) {
+	if (m_maximum != maximum) {
+		m_maximum = maximum;
+		Q_EMIT maximumChanged();
+		registerMetric();
+	}
+}
+
 void Metric::registerMetric() {
 	if (!m_componentComplete) {
 		return;
@@ -94,10 +120,23 @@
 	}
 
 	try {
-		m_metric = m_metricManager->add(
-				UserMetricsInput::MetricParameters(m_name).formatString(
-						m_format).emptyDataString(m_emptyFormat).textDomain(
-						m_domain));
+		UserMetricsInput::MetricParameters parameters(m_name);
+		parameters.formatString(m_format);
+
+		if (!m_emptyFormat.isEmpty()) {
+			parameters.emptyDataString(m_emptyFormat);
+		}
+		if (!m_domain.isEmpty()) {
+			parameters.textDomain(m_domain);
+		}
+		if (!isnan(m_minimum)) {
+			parameters.minimum(m_minimum);
+		}
+		if (!isnan(m_maximum)) {
+			parameters.maximum(m_maximum);
+		}
+
+		m_metric = m_metricManager->add(parameters);
 	} catch (std::exception &e) {
 		qWarning() << _("Failed to register user metric:") << m_name << "\""
 				<< m_format << "\": " << e.what();
 
=== modified file 'src/modules/UserMetrics/Metric.h'
--- src/modules/UserMetrics/Metric.h	2013-09-24 08:13:01 +0000
+++ src/modules/UserMetrics/Metric.h	2013-10-02 09:46:27 +0000
@@ -24,10 +24,14 @@
 class Metric: public QObject, public QQmlParserStatus {
 Q_OBJECT
 
-Q_INTERFACES (QQmlParserStatus)Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+Q_INTERFACES (QQmlParserStatus)
+
+Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)
 Q_PROPERTY(QString emptyFormat READ emptyFormat WRITE setEmptyFormat NOTIFY emptyFormatChanged)
 Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
+Q_PROPERTY(double minimum READ minimum WRITE setMinimum NOTIFY minimumChanged)
+Q_PROPERTY(double maximum READ maximum WRITE setMaximum NOTIFY maximumChanged)
 
 public:
 	explicit Metric(QObject *parent = 0);
@@ -50,6 +54,14 @@
 
 	void setDomain(const QString &domain);
 
+	double minimum() const;
+
+	void setMinimum(double minimum);
+
+	double maximum() const;
+
+	void setMaximum(double maximum);
+
 	void classBegin();
 
 	void componentComplete();
@@ -68,6 +80,10 @@
 
 	void domainChanged();
 
+	void minimumChanged();
+
+	void maximumChanged();
+
 protected:
 	void registerMetric();
 
@@ -84,6 +100,10 @@
 	QString m_emptyFormat;
 
 	QString m_domain;
+
+	double m_minimum;
+
+	double m_maximum;
 };
 
 #endif // MODULES_USERMETRICS_METRICSMANAGER_H
 
=== modified file 'src/modules/UserMetrics/qmldir'
--- src/modules/UserMetrics/qmldir	2013-09-17 11:03:34 +0000
+++ src/modules/UserMetrics/qmldir	2013-10-02 09:46:27 +0000
@@ -1,1 +1,2 @@
+module UserMetrics
 plugin usermetrics-qml
 
=== modified file 'tests/unit/qml/CMakeLists.txt'
--- tests/unit/qml/CMakeLists.txt	2013-09-18 15:13:02 +0000
+++ tests/unit/qml/CMakeLists.txt	2013-10-02 09:46:27 +0000
@@ -1,13 +1,13 @@
+
 add_executable(tst_QmlTests tst_QmlTests.cpp)
 qt5_use_modules(tst_QmlTests Core Qml Quick Test QuickTest)
 target_link_libraries(tst_QmlTests ${TPL_QT5_LIBRARIES})
-add_test(tst_QmlTests ${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests -import ${SOURCE_BINARY_DIR}/modules)
+
+add_test(tst_QmlTests
+	${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests
+	-input ${CMAKE_CURRENT_SOURCE_DIR}
+	-import ${SOURCE_BINARY_DIR}/modules
+)
 set_tests_properties(tst_QmlTests PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
-# copy qml test files to build dir
-file(GLOB qmlTestFiles RELATIVE ${CMAKE_SOURCE_DIR}/tests/unit/qml/ *qml)
-foreach(qmlTestFile ${qmlTestFiles})
-  file(COPY ${qmlTestFile} DESTINATION ${CMAKE_BINARY_DIR}/tests/unit/qml/)
-endforeach(qmlTestFile)
-
 add_subdirectory(UserMetricsTest)
 
=== modified file 'tests/unit/qml/UserMetricsTest/CMakeLists.txt'
--- tests/unit/qml/UserMetricsTest/CMakeLists.txt	2013-09-23 14:12:23 +0000
+++ tests/unit/qml/UserMetricsTest/CMakeLists.txt	2013-10-02 09:46:27 +0000
@@ -22,4 +22,7 @@
         )
 
 # copy qmldir file to build dir
-file(COPY qmldir DESTINATION ${CMAKE_BINARY_DIR}/tests/unit/qml/UserMetricsTest)
+configure_file(
+	qmldir
+	qmldir
+)
 
=== modified file 'tests/unit/qml/UserMetricsTest/DBusQuery.cpp'
--- tests/unit/qml/UserMetricsTest/DBusQuery.cpp	2013-09-26 11:35:49 +0000
+++ tests/unit/qml/UserMetricsTest/DBusQuery.cpp	2013-10-02 09:46:27 +0000
@@ -17,7 +17,7 @@
 #include <DBusQuery.h>
 #include <MetricInfo.h>
 
-#include <QDebug>
+#include <cmath>
 #include <QtDBus/QtDBus>
 #include <libqtdbustest/QProcessDBusService.h>
 #include <libqtdbustest/DBusService.h>
@@ -59,10 +59,20 @@
 	if (dataSourceInterface.name().isEmpty()) {
 		return 0;
 	} else {
+		double minimum(NAN);
+		double maximum(NAN);
+		QVariantMap options(dataSourceInterface.options());
+		if (options.contains("minimum")) {
+			minimum = options["minimum"].toDouble();
+		}
+		if (options.contains("maximum")) {
+			maximum = options["maximum"].toDouble();
+		}
+
 		return new MetricInfo(dataSourceInterface.name(),
 				dataSourceInterface.formatString(),
 				dataSourceInterface.emptyDataString(),
-				dataSourceInterface.textDomain(), this);
+				dataSourceInterface.textDomain(), minimum, maximum, this);
 	}
 }
 
 
=== modified file 'tests/unit/qml/UserMetricsTest/MetricInfo.cpp'
--- tests/unit/qml/UserMetricsTest/MetricInfo.cpp	2013-09-24 08:13:01 +0000
+++ tests/unit/qml/UserMetricsTest/MetricInfo.cpp	2013-10-02 09:46:27 +0000
@@ -17,9 +17,10 @@
 #include <MetricInfo.h>
 
 MetricInfo::MetricInfo(QString name, QString format, QString emptyFormat,
-		QString domain, QObject *parent) :
+		QString domain, double minimum, double maximum, QObject *parent) :
 		QObject(parent), m_name(name), m_format(format), m_emptyFormat(
-				emptyFormat), m_domain(domain) {
+				emptyFormat), m_domain(domain), m_minimum(minimum), m_maximum(
+				maximum) {
 }
 
 MetricInfo::~MetricInfo() {
@@ -40,3 +41,11 @@
 QString MetricInfo::domain() const {
 	return m_domain;
 }
+
+double MetricInfo::minimum() const {
+	return m_minimum;
+}
+
+double MetricInfo::maximum() const {
+	return m_maximum;
+}
 
=== modified file 'tests/unit/qml/UserMetricsTest/MetricInfo.h'
--- tests/unit/qml/UserMetricsTest/MetricInfo.h	2013-09-24 08:13:01 +0000
+++ tests/unit/qml/UserMetricsTest/MetricInfo.h	2013-10-02 09:46:27 +0000
@@ -26,10 +26,13 @@
 Q_PROPERTY(QString format READ format NOTIFY formatChanged)
 Q_PROPERTY(QString emptyFormat READ emptyFormat NOTIFY emptyFormatChanged)
 Q_PROPERTY(QString domain READ domain NOTIFY domainChanged)
+Q_PROPERTY(double minimum READ minimum NOTIFY minimumChanged)
+Q_PROPERTY(double maximum READ maximum NOTIFY maximumChanged)
 
 public:
 	explicit MetricInfo(QString name, QString format, QString emptyFormat,
-			QString domain, QObject *parent = 0);
+			QString domain, double minimum, double maximum,
+			QObject *parent = 0);
 
 	virtual ~MetricInfo();
 
@@ -42,6 +45,10 @@
 
 	QString domain() const;
 
+	double minimum() const;
+
+	double maximum() const;
+
 Q_SIGNALS:
 	void nameChanged();
 
@@ -51,6 +58,10 @@
 
 	void domainChanged();
 
+	void minimumChanged();
+
+	void maximumChanged();
+
 private:
 	QString m_name;
 
@@ -60,6 +71,10 @@
 
 	QString m_domain;
 
+	double m_minimum;
+
+	double m_maximum;
+
 };
 
 #endif // MODULES_USERMETRICSTEST_METRICINFO_H
 
=== modified file 'tests/unit/qml/UserMetricsTest/TestPlugin.cpp'
--- tests/unit/qml/UserMetricsTest/TestPlugin.cpp	2013-09-24 08:13:01 +0000
+++ tests/unit/qml/UserMetricsTest/TestPlugin.cpp	2013-10-02 09:46:27 +0000
@@ -16,7 +16,6 @@
 
 #include <QtQuick/QtQuick>
 #include <TestPlugin.h>
-#include <DBusQuery.h>
 #include <MetricInfo.h>
 
 void Components::registerTypes(const char *uri) {
@@ -27,6 +26,7 @@
 }
 
 void Components::initializeEngine(QQmlEngine *engine, const char *uri) {
+	m_dbusQuery.reset(new DBusQuery());
 	QQmlExtensionPlugin::initializeEngine(engine, uri);
-	engine->rootContext()->setContextProperty("dbusQuery", new DBusQuery(this));
+	engine->rootContext()->setContextProperty("dbusQuery", m_dbusQuery.data());
 }
 
=== modified file 'tests/unit/qml/UserMetricsTest/TestPlugin.h'
--- tests/unit/qml/UserMetricsTest/TestPlugin.h	2013-09-23 14:32:44 +0000
+++ tests/unit/qml/UserMetricsTest/TestPlugin.h	2013-10-02 09:46:27 +0000
@@ -19,6 +19,7 @@
 
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQml/QQmlEngine>
+#include <DBusQuery.h>
 
 class Components : public QQmlExtensionPlugin
 {
@@ -28,6 +29,9 @@
 public:
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
+
+protected:
+    QScopedPointer<DBusQuery> m_dbusQuery;
 };
 
 #endif // MODULES_USERMETRICSTEST_TESTPLUGIN_H
 
=== modified file 'tests/unit/qml/UserMetricsTest/qmldir'
--- tests/unit/qml/UserMetricsTest/qmldir	2013-09-18 15:13:02 +0000
+++ tests/unit/qml/UserMetricsTest/qmldir	2013-10-02 09:46:27 +0000
@@ -1,1 +1,2 @@
+module UserMetricsTest
 plugin usermetrics-qml-test
 
=== modified file 'tests/unit/qml/tst_Metrics.qml'
--- tests/unit/qml/tst_Metrics.qml	2013-09-23 14:44:47 +0000
+++ tests/unit/qml/tst_Metrics.qml	2013-10-02 09:46:27 +0000
@@ -26,6 +26,7 @@
     property string originalFormat: "Test Metric"
     property string originalEmptyFormat: "Nope, no data"
     property string originalDomain: "test-domain"
+    property double originalMinimum: 0.0
 
     Metric {
         id: metric
@@ -33,6 +34,7 @@
         format: originalFormat
         emptyFormat: originalEmptyFormat
         domain: originalDomain
+        minimum: originalMinimum
     }
 
     function test_metric() {
@@ -42,6 +44,14 @@
         compare(info.format, originalFormat, "Metric format was not set properly");
         compare(info.emptyFormat, originalEmptyFormat, "Metric emptyFormat was not set properly");
         compare(info.domain, originalDomain, "Metric domain was not set properly");
+        compare(info.minimum, originalMinimum, "Metric minimum was not set properly");
+        compare(info.maximum, NaN, "Metric maximum was not set properly");
+        
+        metric.minimum = 0.0
+        metric.maximum = 10.0
+        info = dbusQuery.queryMetricInfo(1);
+        compare(info.minimum, 0.0, "Metric minimum was not set properly");
+        compare(info.maximum, 10.0, "Metric maximum was not set properly");
 
         // Test update and increment with integers and floating point data
         metric.update(0);