rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

OP-1351 minor cleanups

Browse Source
This commit is contained in:
Philippe Renon 2014-06-14 18:14:10 +02:00
parent 6e43858f50
commit 48978b523c
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.h
View File

@ -68,26 +68,20 @@ public:
void setStartEnabled(bool status)
{
if (m_startEnabled != status) {
m_startEnabled = status;
emit startEnabledChanged(status);
}
m_startEnabled = status;
emit startEnabledChanged(status);
}
void setEndEnabled(bool status)
{
if (m_endEnabled != status) {
m_endEnabled = status;
emit endEnabledChanged(status);
}
m_endEnabled = status;
emit endEnabledChanged(status);
}
void setCancelEnabled(bool status)
{
if (m_cancelEnabled != status) {
m_cancelEnabled = status;
emit cancelEnabledChanged(status);
}
m_cancelEnabled = status;
emit cancelEnabledChanged(status);
}
float temperature()
@ -125,6 +119,10 @@ public slots:
void setTemperatureRange(float temperatureRange)
{
emit temperatureRangeChanged(temperatureRange);
if (m_helper->range() >= ThermalCalibrationHelper::TargetTempDelta) {
setEndEnabled(true);
}
}
int progress()
@ -222,7 +220,7 @@ public slots:
{
m_dirty = false;
setStartEnabled(false);
setEndEnabled(true);
setEndEnabled(false);
setCancelEnabled(true);
wizardStarted();
}

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

@ -50,13 +50,13 @@
#include <QMessageBox>
#include <QThread>
#include <QErrorMessage>
#include <iostream>
#include <QDesktopServices>
#include <QUrl>
#include <iostream>
#include <math.h>
//#define DEBUG
// #define DEBUG
// Uncomment this to enable 6 point calibration on the accels
#define NOISE_SAMPLES 50
@ -88,11 +88,7 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
// Must set up the UI (above) before setting up the UAVO mappings or refreshWidgetValues
// will be dealing with some null pointers
// addUAVObject("RevoCalibration");
addUAVObject("HomeLocation");
// addUAVObject("AttitudeSettings");
// addUAVObject("RevoSettings");
// addUAVObject("AccelGyroSettings");
autoLoadWidgets();
// accel calibration

11
ground/openpilotgcs/src/plugins/config/configrevowidget.h
View File

@ -32,18 +32,19 @@
#include "extensionsystem/pluginmanager.h"
#include "uavobjectmanager.h"
#include "uavobject.h"
#include "calibration/thermal/thermalcalibrationmodel.h"
#include "calibration/sixpointcalibrationmodel.h"
#include "calibration/levelcalibrationmodel.h"
#include "calibration/gyrobiascalibrationmodel.h"
#include <QWidget>
#include <QtSvg/QSvgRenderer>
#include <QtSvg/QGraphicsSvgItem>
#include <QList>
#include <QTimer>
#include <QMutex>
#include "calibration/thermal/thermalcalibrationmodel.h"
#include "calibration/sixpointcalibrationmodel.h"
#include "calibration/levelcalibrationmodel.h"
#include "calibration/gyrobiascalibrationmodel.h"
class Ui_Widget;
class Ui_Widget;
class ConfigRevoWidget : public ConfigTaskWidget {
Q_OBJECT