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

Merge remote-tracking branch 'origin/filnet/OP-1376_calibration_results_not_saved_to_SD' into next

Browse Source
This commit is contained in:
Philippe Renon 2014-06-29 21:40:50 +02:00
commit 0e1fd756ab
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
View File

@ -32,9 +32,11 @@
#include <accelgyrosettings.h> #include <accelgyrosettings.h>
#include <homelocation.h> #include <homelocation.h>
#include <accelstate.h> #include <accelstate.h>
#include <magstate.h> #include <magstate.h>
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/generalsettings.h>
#include "assertions.h" #include "assertions.h"
#include "calibration.h" #include "calibration.h"
#include "calibration/calibrationutils.h" #include "calibration/calibrationutils.h"
@ -79,6 +81,12 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
addApplySaveButtons(m_ui->revoCalSettingsSaveRAM, m_ui->revoCalSettingsSaveSD); addApplySaveButtons(m_ui->revoCalSettingsSaveRAM, m_ui->revoCalSettingsSaveSD);
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
Core::Internal::GeneralSettings *settings = pm->getObject<Core::Internal::GeneralSettings>();
if (!settings->useExpertMode()) {
m_ui->revoCalSettingsSaveRAM->setVisible(false);
}
// Initialization of the visual help // Initialization of the visual help
m_ui->calibrationVisualHelp->setScene(new QGraphicsScene(this)); m_ui->calibrationVisualHelp->setScene(new QGraphicsScene(this));
m_ui->calibrationVisualHelp->setRenderHint(QPainter::HighQualityAntialiasing, true); m_ui->calibrationVisualHelp->setRenderHint(QPainter::HighQualityAntialiasing, true);
@ -89,6 +97,10 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
// Must set up the UI (above) before setting up the UAVO mappings or refreshWidgetValues // Must set up the UI (above) before setting up the UAVO mappings or refreshWidgetValues
// will be dealing with some null pointers // will be dealing with some null pointers
addUAVObject("HomeLocation"); addUAVObject("HomeLocation");
addUAVObject("RevoCalibration");
addUAVObject("AttitudeSettings");
addUAVObject("RevoSettings");
addUAVObject("AccelGyroSettings");
autoLoadWidgets(); autoLoadWidgets();
// accel calibration // accel calibration