rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Commented out code and ui for usage data collection

Browse Source
This commit is contained in:
Paul Jewell 2015-08-28 06:13:03 +01:00
parent d207f848ee
commit 21702104d1
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ground/gcs/src/plugins/coreplugin/generalsettings.cpp
View File

@ -128,7 +128,8 @@ QWidget *GeneralSettings::createPage(QWidget *parent)
m_page->checkAutoSelect->setChecked(m_autoSelect);
m_page->cbUseUDPMirror->setChecked(m_useUDPMirror);
m_page->cbExpertMode->setChecked(m_useExpertMode);
m_page->cbUsageData->setChecked(m_collectUsageData);
// Usage data collection temporarily disabled
// m_page->cbUsageData->setChecked(m_collectUsageData);
m_page->colorButton->setColor(StyleHelper::baseColor());
connect(m_page->resetButton, SIGNAL(clicked()), this, SLOT(resetInterfaceColor()));
@ -149,7 +150,8 @@ void GeneralSettings::apply()
m_useExpertMode = m_page->cbExpertMode->isChecked();
m_autoConnect = m_page->checkAutoConnect->isChecked();
m_autoSelect = m_page->checkAutoSelect->isChecked();
setCollectUsageData(m_page->cbUsageData->isChecked());
// Usage data collection temporarily disabled
// setCollectUsageData(m_page->cbUsageData->isChecked());
}
void GeneralSettings::finish()
@ -166,8 +168,9 @@ void GeneralSettings::readSettings(QSettings *qs)
m_autoSelect = qs->value(QLatin1String("AutoSelect"), m_autoSelect).toBool();
m_useUDPMirror = qs->value(QLatin1String("UDPMirror"), m_useUDPMirror).toBool();
m_useExpertMode = qs->value(QLatin1String("ExpertMode"), m_useExpertMode).toBool();
m_collectUsageData = qs->value(QLatin1String("CollectUsageData"), m_collectUsageData).toBool();
m_showUsageDataDisclaimer = qs->value(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer).toBool();
// Usage data collection temporarily disabled
// m_collectUsageData = qs->value(QLatin1String("CollectUsageData"), m_collectUsageData).toBool();
// m_showUsageDataDisclaimer = qs->value(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer).toBool();
m_lastUsageHash = qs->value(QLatin1String("LastUsageHash"), m_lastUsageHash).toString();
qs->endGroup();
}
@ -187,8 +190,9 @@ void GeneralSettings::saveSettings(QSettings *qs)
qs->setValue(QLatin1String("AutoSelect"), m_autoSelect);
qs->setValue(QLatin1String("UDPMirror"), m_useUDPMirror);
qs->setValue(QLatin1String("ExpertMode"), m_useExpertMode);
qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData);
qs->setValue(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer);
// Usage data collection temporarily disabled
//qs->setValue(QLatin1String("CollectUsageData"), m_collectUsageData);
//qs->setValue(QLatin1String("ShowUsageDataDisclaimer"), m_showUsageDataDisclaimer);
qs->setValue(QLatin1String("LastUsageHash"), m_lastUsageHash);
qs->endGroup();
}
@ -260,16 +264,18 @@ bool GeneralSettings::useUDPMirror() const
return m_useUDPMirror;
}
/** Usage data collection temporarily disabled
bool GeneralSettings::collectUsageData() const
{
return m_collectUsageData;
}
bool GeneralSettings::showUsageDataDisclaimer() const
{
return m_showUsageDataDisclaimer;
}
********************/
QString GeneralSettings::lastUsageHash() const
{
return m_lastUsageHash;
@ -280,6 +286,7 @@ bool GeneralSettings::useExpertMode() const
return m_useExpertMode;
}
/** Usage data collection temporarily disabled
void GeneralSettings::setCollectUsageData(bool collect)
{
if (collect && collect != m_collectUsageData) {
@ -292,6 +299,7 @@ void GeneralSettings::setShowUsageDataDisclaimer(bool show)
{
m_showUsageDataDisclaimer = show;
}
********************/
void GeneralSettings::setLastUsageHash(QString hash)
{

8
ground/gcs/src/plugins/coreplugin/generalsettings.ui
View File

@ -154,13 +154,13 @@
</property>
</widget>
</item>
<item row="15" column="0">
<!-- <item row="15" column="0">
<widget class="QLabel" name="labelExpert_2">
<property name="text">
<string>Contribute usage statistics:</string>
</property>
</widget>
</item>
</item> -->
<item row="9" column="2">
<widget class="QWidget" name="widget_2" native="true">
<layout class="QGridLayout" name="gridLayout_3">
@ -243,7 +243,7 @@
</property>
</widget>
</item>
<item row="15" column="2">
<!--<item row="15" column="2">
<widget class="QCheckBox" name="cbUsageData">
<property name="text">
<string/>
@ -252,7 +252,7 @@
<bool>true</bool>
</property>
</widget>
</item>
</item> -->
</layout>
</widget>
</item>

3
ground/gcs/src/plugins/plugins.pro
View File

@ -253,10 +253,11 @@ plugin_flightlog.depends += plugin_uavtalk
SUBDIRS += plugin_flightlog
# Usage Tracker plugin
# Uncomment the following lines to re-enable the usagetracker plugin
plugin_usagetracker.subdir = usagetracker
plugin_usagetracker.depends = plugin_coreplugin
plugin_usagetracker.depends += plugin_uavobjects
plugin_usagetracker.depends += plugin_uavtalk
plugin_setupwizard.depends += plugin_uavobjectutil
SUBDIRS += plugin_usagetracker
# SUBDIRS += plugin_usagetracker