rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-19 09:54:15 +01:00
Code Issues Releases Activity

OP-1245 Uncrustify

Browse Source
This commit is contained in:
m_thread 2014-03-20 22:59:27 +01:00
parent 77f9294548
commit f95e6833e3
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ground/openpilotgcs/src/plugins/flightlog/flightlogmanager.cpp
View File

@ -50,19 +50,19 @@ FlightLogManager::FlightLogManager(QObject *parent) :
Q_ASSERT(pluginManager);
m_objectManager = pluginManager->getObject<UAVObjectManager>();
m_objectManager = pluginManager->getObject<UAVObjectManager>();
Q_ASSERT(m_objectManager);
m_telemtryManager = pluginManager->getObject<TelemetryManager>();
m_telemtryManager = pluginManager->getObject<TelemetryManager>();
Q_ASSERT(m_telemtryManager);
m_objectUtilManager = pluginManager->getObject<UAVObjectUtilManager>();
Q_ASSERT(m_objectUtilManager);
m_flightLogControl = DebugLogControl::GetInstance(m_objectManager);
m_flightLogControl = DebugLogControl::GetInstance(m_objectManager);
Q_ASSERT(m_flightLogControl);
m_flightLogStatus = DebugLogStatus::GetInstance(m_objectManager);
m_flightLogStatus = DebugLogStatus::GetInstance(m_objectManager);
Q_ASSERT(m_flightLogStatus);
connect(m_flightLogStatus, SIGNAL(FlightChanged(quint16)), this, SLOT(updateFlightEntries(quint16)));
@ -544,6 +544,7 @@ void FlightLogManager::setupUAVOWrappers()
{
foreach(QList<UAVObject *> objectList, m_objectManager->getObjects()) {
UAVObject *object = objectList.at(0);
if (!object->isMetaDataObject() && !object->isSettingsObject()) {
UAVOLogSettingsWrapper *wrapper = new UAVOLogSettingsWrapper(qobject_cast<UAVDataObject *>(object));
m_uavoEntries.append(wrapper);
@ -680,7 +681,7 @@ void UAVOLogSettingsWrapper::reset(bool clear)
setPeriod(m_object->getMetadata().loggingUpdatePeriod);
if (clear) {
int oldSetting = setting();
int oldPeriod = period();
int oldPeriod = period();
setSetting(0);
setPeriod(0);
setDirty(oldSetting != setting() || oldPeriod != period());
@ -694,12 +695,16 @@ UAVObject::UpdateMode UAVOLogSettingsWrapper::settingAsUpdateMode()
switch (m_setting) {
case 0:
return UAVObject::UPDATEMODE_MANUAL;
case 1:
return UAVObject::UPDATEMODE_PERIODIC;
case 2:
return UAVObject::UPDATEMODE_ONCHANGE;
case 3:
return UAVObject::UPDATEMODE_THROTTLED;
default:
return UAVObject::UPDATEMODE_MANUAL;
}

10
ground/openpilotgcs/src/plugins/flightlog/flightlogmanager.h
View File

@ -46,8 +46,7 @@
#include "uavtalk/telemetrymanager.h"
class UAVOLogSettingsWrapper : public QObject {
Q_OBJECT
Q_PROPERTY(UAVDataObject *object READ object NOTIFY objectChanged)
Q_OBJECT Q_PROPERTY(UAVDataObject *object READ object NOTIFY objectChanged)
Q_PROPERTY(QString name READ name NOTIFY nameChanged)
Q_PROPERTY(int setting READ setting WRITE setSetting NOTIFY settingChanged)
Q_PROPERTY(int period READ period WRITE setPeriod NOTIFY periodChanged)
@ -91,7 +90,7 @@ public slots:
void setSetting(int setting)
{
if (m_setting != setting) {
m_setting = setting;
m_setting = setting;
setDirty(true);
if (m_setting != 1 && m_setting != 3) {
setPeriod(0);
@ -122,8 +121,8 @@ public slots:
signals:
void settingChanged(int setting);
void nameChanged(QString name);
void periodChanged(int period);
void objectChanged(UAVDataObject * arg);
void periodChanged(int period);
void objectChanged(UAVDataObject *arg);
void dirtyChanged(bool arg);
@ -132,7 +131,6 @@ private:
int m_setting;
int m_period;
bool m_dirty;
};
class ExtendedDebugLogEntry : public DebugLogEntry {