d-ronin · mlyle · Dec 29, 2015 · Dec 23, 2015 · Dec 23, 2015 · Dec 24, 2015
diff --git a/ground/gcs/src/plugins/plugins.pro b/ground/gcs/src/plugins/plugins.pro
@@ -280,6 +280,13 @@ plugin_sysalarmsmessaging.depends += plugin_uavobjects
 plugin_sysalarmsmessaging.depends += plugin_uavtalk
 SUBDIRS += plugin_sysalarmsmessaging
 
+# Usage Statistics plugin
+plugin_usagestatsgadget.subdir = usagestatsgadget
+plugin_usagestatsgadget.depends = plugin_coreplugin
+plugin_usagestatsgadget.depends += plugin_uploader
+plugin_usagestatsgadget.depends += plugin_uavobjectutil
+SUBDIRS += plugin_usagestatsgadget
+
 ############################
 #  Board plugins
 # Those plugins define supported board models: each board manufacturer

diff --git a/ground/gcs/src/plugins/uploader/uploader.pri b/ground/gcs/src/plugins/uploader/uploader.pri
@@ -1,3 +1,3 @@
-include(uploaderng_dependencies.pri)
+include(uploader_dependencies.pri)
 
-LIBS *= -l$$qtLibraryName(Uploaderng)
+LIBS *= -l$$qtLibraryName(Uploader)
diff --git a/ground/gcs/src/plugins/uploader/uploader_global.h b/ground/gcs/src/plugins/uploader/uploader_global.h
@@ -30,10 +30,22 @@
 #define UPLOADER_GLOBAL_H
 
 #include <QtCore/qglobal.h>
+#include <QPointer>
+#include <coreplugin/boardmanager.h>
+
 namespace uploader
 {
 typedef enum { WAITING_CONNECT, WAITING_DISCONNECT, FAILURE, FAILURE_FILENOTFOUND, LOADING_FW, SUCCESS, DISCONNECTED, BOOTING, HALTING, RESCUING, BL_FROM_HALT, BL_FROM_RESCUE, CONNECTED_TO_TELEMETRY, UPLOADING_FW, UPLOADING_DESC, DOWNLOADING_PARTITION, UPLOADING_PARTITION, DOWNLOADING_PARTITION_BUNDLE, UPLOADING_PARTITION_BUNDLE} UploaderStatus;
 }
+struct deviceInfo
+{
+    QPointer<Core::IBoardType> board;
+    QString bl_version;
+    QString max_code_size;
+    QString cpu_serial;
+    QString hw_revision;
+};
+
 #if defined(UPLOADER_LIBRARY)
 #  define UPLOADER_EXPORT Q_DECL_EXPORT
 #else

diff --git a/ground/gcs/src/plugins/uploader/uploadergadgetfactory.cpp b/ground/gcs/src/plugins/uploader/uploadergadgetfactory.cpp
@@ -48,6 +48,7 @@ Core::IUAVGadget* UploaderGadgetFactory::createGadget(QWidget *parent)
     isautocapable=gadgetWidget->autoUpdateCapable();
     connect(this,SIGNAL(autoUpdate()),gadgetWidget,SLOT(autoUpdate()));
     connect(gadgetWidget,SIGNAL(autoUpdateSignal(UploaderStatus, QVariant)),this,SIGNAL(autoUpdateSignal(UploaderStatus ,QVariant)));
+    connect(gadgetWidget, SIGNAL(newBoardSeen(deviceInfo,deviceDescriptorStruct)), this, SIGNAL(newBoardSeen(deviceInfo,deviceDescriptorStruct)));
     return new UploaderGadget(QString("Uploader"), gadgetWidget, parent);
 }
 

diff --git a/ground/gcs/src/plugins/uploader/uploadergadgetfactory.h b/ground/gcs/src/plugins/uploader/uploadergadgetfactory.h
@@ -30,6 +30,7 @@
 
 #include <coreplugin/iuavgadgetfactory.h>
 #include "uploader_global.h"
+#include "uavobjectutil/devicedescriptorstruct.h"
 
 namespace Core {
 class IUAVGadget;
@@ -55,6 +56,7 @@ class UPLOADER_EXPORT UploaderGadgetFactory : public Core::IUAVGadgetFactory
 signals:
     void autoUpdateSignal(UploaderStatus ,QVariant);
     void autoUpdate();
+    void newBoardSeen(deviceInfo board, deviceDescriptorStruct device);
 };
 
 }

diff --git a/ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/gcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -350,6 +350,7 @@ void UploaderGadgetWidget::onAutopilotReady()
     deviceDescriptorStruct device;
     if(utilMngr->getBoardDescriptionStruct(device))
         FirmwareOnDeviceUpdate(device, QString::number(utilMngr->getFirmwareCRC(), 16));
+    emit newBoardSeen(board, device);
 }
 
 /**

diff --git a/ground/gcs/src/plugins/uploader/uploadergadgetwidget.h b/ground/gcs/src/plugins/uploader/uploadergadgetwidget.h
@@ -47,14 +47,7 @@ typedef enum { STATUSICON_OK, STATUSICON_RUNNING, STATUSICON_FAIL, STATUSICON_IN
 class UPLOADER_EXPORT UploaderGadgetWidget : public QWidget
 {
     Q_OBJECT
-    struct deviceInfo
-    {
-        QPointer<Core::IBoardType> board;
-        QString bl_version;
-        QString max_code_size;
-        QString cpu_serial;
-        QString hw_revision;
-    };
+
     struct partitionStruc
     {
         QByteArray partitionData;
@@ -74,6 +67,7 @@ public slots:
     void uploadFinish(bool);
     void uploadProgress(UploaderStatus, QVariant);
     void autoUpdateSignal(UploaderStatus, QVariant);
+    void newBoardSeen(deviceInfo board, deviceDescriptorStruct device);
 private slots:
     void onAutopilotConnect();
     void onAutopilotDisconnect();

diff --git a/ground/gcs/src/plugins/usagestatsgadget/UsageStats.json b/ground/gcs/src/plugins/usagestatsgadget/UsageStats.json
@@ -0,0 +1 @@
+{}
diff --git a/ground/gcs/src/plugins/usagestatsgadget/UsageStats.pluginspec b/ground/gcs/src/plugins/usagestatsgadget/UsageStats.pluginspec
@@ -0,0 +1,11 @@
+<plugin name="UsageStats" version="1.0.0" compatVersion="1.0.0">
+    <vendor>dRonin</vendor>
+    <copyright>(C) 2015 dRonin</copyright>
+    <license>The GNU Public License (GPL) Version 3</license>
+    <description>Usage statistics gadget</description>
+    <url>http://dronin.org</url>
+    <dependencyList>
+        <dependency name="Core" version="1.0.0"/>
+        <dependency name="Uploader" version="1.0.0"/>
+    </dependencyList>
+</plugin> 
diff --git a/ground/gcs/src/plugins/usagestatsgadget/usagestats_dependencies.pri b/ground/gcs/src/plugins/usagestatsgadget/usagestats_dependencies.pri
@@ -0,0 +1,2 @@
+include(../../plugins/uploader/uploader.pri)
+
diff --git a/ground/gcs/src/plugins/usagestatsgadget/usagestatsgadget.pro b/ground/gcs/src/plugins/usagestatsgadget/usagestatsgadget.pro
@@ -0,0 +1,17 @@
+QT += network
+TEMPLATE = lib
+TARGET = UsageStats
+DEFINES += USAGESTATS_LIBRARY
+include(usagestats_dependencies.pri)
+HEADERS += \
+    usagestatsplugin.h \
+    usagestatsoptionpage.h
+SOURCES += \
+    usagestatsplugin.cpp \
+    usagestatsoptionpage.cpp
+
+OTHER_FILES += UsageStats.pluginspec \
+    UsageStats.json
+
+FORMS += \
+    usagestatsoptionpage.ui
diff --git a/ground/gcs/src/plugins/usagestatsgadget/usagestatsoptionpage.cpp b/ground/gcs/src/plugins/usagestatsgadget/usagestatsoptionpage.cpp
@@ -0,0 +1,61 @@
+/**
+ ******************************************************************************
+ * @file       usagestatsoptionpage.cpp
+ * @author     dRonin, http://dRonin.org/, Copyright (C) 2015
+ * @addtogroup GCSPlugins GCS Plugins
+ * @{
+ * @addtogroup UsageStatsOptionPage
+ * @{
+ * @brief [Brief]
+ *****************************************************************************/
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "usagestatsoptionpage.h"
+#include "ui_usagestatsoptionpage.h"
+#include "usagestatsplugin.h"
+
+UsageStatsOptionPage::UsageStatsOptionPage(QObject *parent) :
+    IOptionsPage(parent)
+{
+    m_config=qobject_cast<UsageStatsPlugin *>(parent);
+    connect(this,SIGNAL(settingsUpdated()),m_config,SLOT(updateSettings()));
+}
+UsageStatsOptionPage::~UsageStatsOptionPage()
+{
+}
+QWidget *UsageStatsOptionPage::createPage(QWidget *parent)
+{
+
+    m_page = new Ui::UsageStatsOptionPage();
+    QWidget *w = new QWidget(parent);
+    m_page->setupUi(w);
+    m_page->cb_AllowSending->setChecked(m_config->getSendUsageStats());
+    m_page->cb_AllowPrivate->setChecked(m_config->getSendPrivateData());
+    return w;
+}
+
+void UsageStatsOptionPage::apply()
+{
+    m_config->setSendUsageStats(m_page->cb_AllowSending->isChecked());
+    m_config->setSendPrivateData(m_page->cb_AllowPrivate->isChecked());
+    emit settingsUpdated();
+}
+
+void UsageStatsOptionPage::finish()
+{
+    delete m_page;
+}
diff --git a/ground/gcs/src/plugins/usagestatsgadget/usagestatsoptionpage.h b/ground/gcs/src/plugins/usagestatsgadget/usagestatsoptionpage.h
@@ -0,0 +1,68 @@
+/**
+ ******************************************************************************
+ * @file       usagestatsoptionpage.h
+ * @author     dRonin, http://dRonin.org/, Copyright (C) 2015
+ * @addtogroup [Group]
+ * @{
+ * @addtogroup UsageStatsOptionPage
+ * @{
+ * @brief [Brief]
+ *****************************************************************************/
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef USAGESTATSOPTIONPAGE_H
+#define USAGESTATSOPTIONPAGE_H
+
+#include <QWidget>
+#include "coreplugin/dialogs/ioptionspage.h"
+#include <coreplugin/iconfigurableplugin.h>
+
+class UsageStatsPlugin;
+namespace Core {
+    class IUAVGadgetConfiguration;
+}
+
+namespace Ui {
+    class UsageStatsOptionPage;
+}
+
+using namespace Core;
+
+class UsageStatsOptionPage : public IOptionsPage
+{
+Q_OBJECT
+public:
+    UsageStatsOptionPage(QObject *parent = 0);
+    virtual ~UsageStatsOptionPage();
+
+    QString id() const { return QLatin1String("settings"); }
+    QString trName() const { return tr("settings"); }
+    QString category() const { return "Usage Statistics";}
+    QString trCategory() const { return "Usage Statistics"; }
+
+    QWidget *createPage(QWidget *parent);
+    void apply();
+    void finish();
+signals:
+    void settingsUpdated();
+private slots:
+private:
+    Ui::UsageStatsOptionPage *m_page;
+    UsageStatsPlugin * m_config;
+};
+
+#endif // USAGESTATSOPTIONPAGE_H
diff --git a/ground/gcs/src/plugins/usagestatsgadget/usagestatsoptionpage.ui b/ground/gcs/src/plugins/usagestatsgadget/usagestatsoptionpage.ui
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UsageStatsOptionPage</class>
+ <widget class="QWidget" name="UsageStatsOptionPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="1">
+    <widget class="QCheckBox" name="cb_AllowSending">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="cb_AllowPrivate">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_AllowSending">
+     <property name="text">
+      <string>Allow sending application usage statistics to the project authors:</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_AllowPrivate">
+     <property name="text">
+      <string>Allow sending private data (IP, FC CPU numbers):</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>cb_AllowSending</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>label_AllowPrivate</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>301</x>
+     <y>95</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>107</x>
+     <y>204</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_AllowSending</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>cb_AllowPrivate</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>301</x>
+     <y>95</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>301</x>
+     <y>204</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>