Add GUI react on action dropbox change

Author: zdanek

src/Joystick/Joystick.cc

@@ -372,7 +372,12 @@ void Joystick::_loadSettings()
     // Remap to stored TX mode in settings
     _remapAxes(2, _transmitterMode, _rgFunctionAxis);
 
+    while (_pwmVisibilities.length() < _totalButtonCount) {
+        _pwmVisibilities.push_back(false);
+    }
+
     for (int button = 0; button < _totalButtonCount; button++) {
+        _pwmVisibilities[button] = false;
         QString action = settings.value(QString(_buttonActionNameKey).arg(button), QString()).toString();
         if (!action.isEmpty() && action != _buttonActionNone) {
             if (_buttonActionArray[button]) {
@@ -381,6 +386,7 @@ void Joystick::_loadSettings()
 
             AssignedButtonAction *ap;
             if (assignableActionIsPwm(action)) {
+                _pwmVisibilities[button] = true;
                 int lowPwm = settings.value(QString(_buttonActionLowPwmValueKey).arg(button), -1).toInt();
                 int highPwm = settings.value(QString(_buttonActionHighPwmValueKey).arg(button), -1).toInt();
                 bool latch = settings.value(QString(_buttonActionLatchPwmValueKey).arg(button), false).toBool();
@@ -916,6 +922,7 @@ void Joystick::setButtonAction(int button, const QString& action)
     settings.beginGroup(_settingsGroup);
     settings.beginGroup(_name);
     if(action.isEmpty() || action == _buttonActionNone) {
+        _pwmVisibilities[button] = false;
         if(_buttonActionArray[button]) {
             //-- Clear from settings
             settings.remove(QString(_buttonActionNameKey).arg(button));
@@ -930,8 +937,10 @@ void Joystick::setButtonAction(int button, const QString& action)
         }
     } else {
         bool isPwmAction = assignableActionIsPwm(action);
+        _pwmVisibilities[button] = isPwmAction;
+        qCDebug(JoystickLog) << "setButtonAction: isPwmAction" << isPwmAction;
         AssignedButtonAction *ap;
-
+//TODO(bzd) rethink this section
         if(!_buttonActionArray[button]) {
             if (isPwmAction) {
                 ap = new AssignedButtonAction(this, action, 0, 0, false);
@@ -966,6 +975,7 @@ void Joystick::setButtonAction(int button, const QString& action)
             settings.setValue(QString(_buttonActionLatchPwmValueKey).arg(button), _buttonActionArray[button]->pwmLatchMode());
         }
     }
+    emit pwmVisibilitiesChanged();
     emit buttonActionsChanged();
 }
 

src/Joystick/Joystick.h

@@ -129,6 +129,7 @@ class Joystick : public QThread
     Q_PROPERTY(QmlObjectListModel* assignableActions    READ assignableActions          NOTIFY      assignableActionsChanged)
     Q_PROPERTY(QStringList assignableActionTitles       READ assignableActionTitles     NOTIFY      assignableActionsChanged)
     Q_PROPERTY(QString  disabledActionName              READ disabledActionName         CONSTANT)
+    Q_PROPERTY(QList<bool> pwmVisibilities             READ pwmVisibilities            NOTIFY      pwmVisibilitiesChanged)
 
     Q_PROPERTY(int      throttleMode            READ throttleMode           WRITE setThrottleMode       NOTIFY throttleModeChanged)
     Q_PROPERTY(float    axisFrequencyHz         READ axisFrequencyHz        WRITE setAxisFrequency      NOTIFY axisFrequencyHzChanged)
@@ -164,6 +165,7 @@ class Joystick : public QThread
     QmlObjectListModel* assignableActions   () { return &_assignableButtonActions; }
     QStringList assignableActionTitles      () { return _availableActionTitles; }
     QString     disabledActionName          () { return _buttonActionNone; }
+    QList<bool> pwmVisibilities             () { return _pwmVisibilities; }
 
     /// Start the polling thread which will in turn emit joystick signals
     void startPolling(Vehicle* vehicle);
@@ -226,6 +228,7 @@ class Joystick : public QThread
     void calibratedChanged          (bool calibrated);
     void buttonActionsChanged       ();
     void assignableActionsChanged   ();
+    void pwmVisibilitiesChanged     ();
     void throttleModeChanged        (int mode);
     void negativeThrustChanged      (bool allowNegative);
     void exponentialChanged         (float exponential);
@@ -339,6 +342,8 @@ class Joystick : public QThread
     QmlObjectListModel              _assignableButtonActions;
     QList<AssignedButtonAction*>    _buttonActionArray;
     QStringList                     _availableActionTitles;
+    //TODO(bzd) refactor name
+    QList<bool>                     _pwmVisibilities;
     MultiVehicleManager*            _multiVehicleManager = nullptr;
 
     QList<JoystickMavCommand>  _customMavCommands;

src/VehicleSetup/JoystickConfigButtons.qml

@@ -89,10 +89,6 @@ ColumnLayout {
                                 }
                             }
 
-                            function _isCurrentButtonActionPwm() {
-                                return _activeJoystick ? _activeJoystick.assignableActionIsPwm(modelData) : false
-                            }
-
                             Component.onCompleted:  _findCurrentButtonAction()
                             onModelChanged:         _findCurrentButtonAction()
                             onActivated:            _activeJoystick.setButtonAction(modelData, textAt(index))
@@ -119,9 +115,8 @@ ColumnLayout {
 
                     Row {
                         id: pwmSettings
-                        property bool pwmRowVisible: buttonActionCombo._isCurrentButtonActionPwm()
                         spacing:    ScreenTools.defaultFontPixelWidth
-                        visible: pwmRowVisible
+                        visible: _activeJoystick ? _activeJoystick.pwmVisibilities[modelData] : false
 
                         function _setButtonPwm(button, isLow, pwm) {
                             if(_activeJoystick) {