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

OP-706 Uncrustify

Browse Source
This commit is contained in:
m_thread 2014-10-15 23:36:54 +02:00
parent 96ef61d281
commit 01344ac2c7
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/config/configstabilizationwidget.h
View File

@ -56,7 +56,7 @@ private:
static const int AUTOMATIC_UPDATE_RATE = 500;
static const int EXPO_CURVE_POINTS_COUNT = 100;
static const double EXPO_CURVE_CONSTANT = 1.00695;
static const double EXPO_CURVE_CONSTANT = 1.00695;
int boardModel;
int m_pidBankCount;

2
ground/openpilotgcs/src/plugins/uavobjectbrowser/treeitem.h
View File

@ -209,7 +209,7 @@ public:
void setKnown(bool known)
{
m_known = known;
foreach (TreeItem *child, m_children) {
foreach(TreeItem * child, m_children) {
child->setKnown(known);
}
updateHighlight(this);

2
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.cpp
View File

@ -45,7 +45,7 @@ UAVObjectBrowserConfiguration::UAVObjectBrowserConfiguration(QString classId, QS
int timeout = qSettings->value("recentlyUpdatedTimeout").toInt();
bool hilight = qSettings->value("onlyHilightChangedValues").toBool();
m_unknownObjectColor = qSettings->value("unknownObjectColor", QVariant(QColor(Qt::gray))).value<QColor>();
m_unknownObjectColor = qSettings->value("unknownObjectColor", QVariant(QColor(Qt::gray))).value<QColor>();
m_useCategorizedView = qSettings->value("CategorizedView").toBool();
m_useScientificView = qSettings->value("ScientificView").toBool();
m_showMetaData = qSettings->value("showMetaData").toBool();

3
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.h
View File

@ -34,8 +34,7 @@
using namespace Core;
class UAVObjectBrowserConfiguration : public IUAVGadgetConfiguration {
Q_OBJECT
Q_PROPERTY(QColor m_unknownObjectColor READ unknownObjectColor WRITE setUnknownObjectColor)
Q_OBJECT Q_PROPERTY(QColor m_unknownObjectColor READ unknownObjectColor WRITE setUnknownObjectColor)
Q_PROPERTY(QColor m_recentlyUpdatedColor READ recentlyUpdatedColor WRITE setRecentlyUpdatedColor)
Q_PROPERTY(QColor m_manuallyChangedColor READ manuallyChangedColor WRITE setManuallyChangedColor)
Q_PROPERTY(int m_recentlyUpdatedTimeout READ recentlyUpdatedTimeout WRITE setRecentlyUpdatedTimeout)

9
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
View File

@ -48,6 +48,7 @@ UAVObjectTreeModel::UAVObjectTreeModel(QObject *parent, bool categorize, bool us
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
Q_ASSERT(objManager);
// Create highlight manager, let it run every 300 ms.
@ -60,7 +61,7 @@ UAVObjectTreeModel::UAVObjectTreeModel(QObject *parent, bool categorize, bool us
TelemetryManager *telManager = pm->getObject<TelemetryManager>();
Q_ASSERT(telManager);
m_telemetryManager = telManager;
connect(m_telemetryManager, SIGNAL(knownObjectsChanged(UAVObject*,bool)), this, SLOT(knownObjectsChanged(UAVObject*,bool)));
connect(m_telemetryManager, SIGNAL(knownObjectsChanged(UAVObject *, bool)), this, SLOT(knownObjectsChanged(UAVObject *, bool)));
setupModelData(objManager);
}
@ -373,13 +374,13 @@ QVariant UAVObjectTreeModel::data(const QModelIndex &index, int role) const
}
if (role == Qt::ForegroundRole) {
if (!dynamic_cast<TopTreeItem*>(item) && !item->isKnown()) {
if (!dynamic_cast<TopTreeItem *>(item) && !item->isKnown()) {
return QVariant(m_unknownObjectColor);
}
}
if (index.column() == 0 && role == Qt::BackgroundRole) {
if(!dynamic_cast<TopTreeItem*>(item) && item->highlighted()) {
if (!dynamic_cast<TopTreeItem *>(item) && item->highlighted()) {
return QVariant(m_recentlyUpdatedColor);
}
}
@ -502,7 +503,7 @@ void UAVObjectTreeModel::updateHighlight(TreeItem *item)
void UAVObjectTreeModel::knownObjectsChanged(UAVObject *object, bool known)
{
if (object->isSettingsObject()) {
TreeItem * item;
TreeItem *item;
if (object->isMetaDataObject()) {
item = m_settingsTree->findMetaObjectTreeItemByObjectId(object->getObjID());
} else {

2
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
View File

@ -95,7 +95,7 @@ public slots:
private slots:
void highlightUpdatedObject(UAVObject *obj);
void updateHighlight(TreeItem *);
void knownObjectsChanged(UAVObject*object, bool known);
void knownObjectsChanged(UAVObject *object, bool known);
private:
void setupModelData(UAVObjectManager *objManager);

3
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
View File

@ -40,7 +40,7 @@ Telemetry::Telemetry(TelemetryManager *telemetryManager, UAVTalk *utalk, UAVObje
{
mutex = new QMutex(QMutex::Recursive);
connect(this, SIGNAL(onKnownObjectsChanged(UAVObject*,bool)), telemetryManager, SLOT(onKnownObjectsChanged(UAVObject*,bool)));
connect(this, SIGNAL(onKnownObjectsChanged(UAVObject *, bool)), telemetryManager, SLOT(onKnownObjectsChanged(UAVObject *, bool)));
// Register all objects in the list
QList< QList<UAVObject *> > objs = objMngr->getObjects();
@ -246,7 +246,6 @@ void Telemetry::transactionCompleted(UAVObject *obj, bool success)
#ifdef VERBOSE_TELEMETRY
qDebug() << "Telemetry - transaction successful for object" << obj->toStringBrief();
#endif
} else {
emit onKnownObjectsChanged(obj, false);
qWarning() << "Telemetry - !!! transaction failed for object" << obj->toStringBrief();

5
ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
View File

@ -93,7 +93,7 @@ void TelemetryManager::onStart()
connect(m_telemetryDevice, SIGNAL(readyRead()), m_uavTalk, SLOT(processInputStream()));
}
m_telemetry = new Telemetry(this, m_uavTalk, m_uavobjectManager);
m_telemetry = new Telemetry(this, m_uavTalk, m_uavobjectManager);
m_telemetryMonitor = new TelemetryMonitor(m_uavobjectManager, m_telemetry);
connect(m_telemetryMonitor, SIGNAL(connected()), this, SLOT(onConnect()));
@ -113,7 +113,7 @@ void TelemetryManager::stop()
void TelemetryManager::onStop()
{
foreach (UAVObject *object, m_knownObjects) {
foreach(UAVObject * object, m_knownObjects) {
onKnownObjectsChanged(object, false);
}
m_telemetryMonitor->disconnect(this);
@ -126,6 +126,7 @@ void TelemetryManager::onStop()
void TelemetryManager::onKnownObjectsChanged(UAVObject *object, bool known)
{
bool contains = m_knownObjects.contains(object);
if (known && !contains) {
m_knownObjects.insert(object);
emit knownObjectsChanged(object, known);

4
ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.h
View File

@ -47,7 +47,7 @@ public:
void start(QIODevice *dev);
void stop();
bool isConnected();
bool isObjectKnown(UAVObject* object) const;
bool isObjectKnown(UAVObject *object) const;
signals:
void connected();
@ -73,7 +73,7 @@ private:
QIODevice *m_telemetryDevice;
bool m_isAutopilotConnected;
QThread m_telemetryReaderThread;
QSet<UAVObject*> m_knownObjects;
QSet<UAVObject *> m_knownObjects;
};