diff --git a/src/Joystick/JoystickManager.cc b/src/Joystick/JoystickManager.cc index 2b29e0082a50ef5a36380d59c8b52a929d09ec4e..530b0573d80d821c56d0c08432c0696385ad2a87 100644 --- a/src/Joystick/JoystickManager.cc +++ b/src/Joystick/JoystickManager.cc @@ -106,14 +106,14 @@ void JoystickManager::_setActiveJoystickFromSettings(void) } QSettings settings; - + settings.beginGroup(_settingsGroup); QString name = settings.value(_settingsKeyActiveJoystick).toString(); - + if (name.isEmpty()) { name = _name2JoystickMap.first()->name(); } - + setActiveJoystick(_name2JoystickMap.value(name, _name2JoystickMap.first())); settings.setValue(_settingsKeyActiveJoystick, _activeJoystick->name()); } @@ -139,9 +139,9 @@ void JoystickManager::setActiveJoystick(Joystick* joystick) if (_activeJoystick) { _activeJoystick->stopPolling(); } - + _activeJoystick = joystick; - + if (_activeJoystick != nullptr) { qCDebug(JoystickManagerLog) << "Set active:" << _activeJoystick->name(); @@ -156,11 +156,11 @@ void JoystickManager::setActiveJoystick(Joystick* joystick) QVariantList JoystickManager::joysticks(void) { QVariantList list; - + for (const QString &name: _name2JoystickMap.keys()) { list += QVariant::fromValue(_name2JoystickMap[name]); } - + return list; } @@ -180,7 +180,7 @@ void JoystickManager::setActiveJoystickName(const QString& name) qCWarning(JoystickManagerLog) << "Set active not in map" << name; return; } - + setActiveJoystick(_name2JoystickMap[name]); } diff --git a/src/Joystick/JoystickManager.h b/src/Joystick/JoystickManager.h index 6547970e802acae6c3df7af307910d292dc5ada8..f4f939a8b671b6107746a1849d3d3679218b1f4d 100644 --- a/src/Joystick/JoystickManager.h +++ b/src/Joystick/JoystickManager.h @@ -25,27 +25,27 @@ Q_DECLARE_LOGGING_CATEGORY(JoystickManagerLog) class JoystickManager : public QGCTool { Q_OBJECT - + public: JoystickManager(QGCApplication* app, QGCToolbox* toolbox); ~JoystickManager(); Q_PROPERTY(QVariantList joysticks READ joysticks NOTIFY availableJoysticksChanged) Q_PROPERTY(QStringList joystickNames READ joystickNames NOTIFY availableJoysticksChanged) - + Q_PROPERTY(Joystick* activeJoystick READ activeJoystick WRITE setActiveJoystick NOTIFY activeJoystickChanged) Q_PROPERTY(QString activeJoystickName READ activeJoystickName WRITE setActiveJoystickName NOTIFY activeJoystickNameChanged) - + /// List of available joysticks QVariantList joysticks(); /// List of available joystick names QStringList joystickNames(void); - + /// Get active joystick Joystick* activeJoystick(void); /// Set active joystick void setActiveJoystick(Joystick* joystick); - + QString activeJoystickName(void); void setActiveJoystickName(const QString& name); @@ -65,15 +65,15 @@ signals: private slots: void _updateAvailableJoysticks(void); - + private: void _setActiveJoystickFromSettings(void); - + private: Joystick* _activeJoystick; QMap _name2JoystickMap; MultiVehicleManager* _multiVehicleManager; - + static const char * _settingsGroup; static const char * _settingsKeyActiveJoystick;