piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #6533

Browse Source
This commit is contained in:
Bertrand Songis
2019-07-01 12:05:53 +02:00
parent bd7d45bb1a
commit 29acf1b80d
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/widgets/radioswitchwidget.h
+15 -8
View File
@@ -41,6 +41,7 @@ class RadioSwitchWidget : public RadioWidget
{
init();
}
explicit RadioSwitchWidget(Board::SwitchType type, const QString & labelText, int value = 0, QWidget * parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
RadioWidget(labelText, value, parent, f),
swType(type)
@@ -96,15 +97,24 @@ class RadioSwitchWidget : public RadioWidget
setWidget(m_slider);
}
connect(m_slider, &QSlider::valueChanged, this, &RadioWidget::setValue);
connect(m_slider, &QSlider::valueChanged, this, &RadioSwitchWidget::setValueFromSlider);
connect(this, &RadioWidget::valueChanged, m_slider, &QSlider::setValue);
}
int getValue() const
int getValue() const override
{
int val = m_slider->value() - (swType == Board::SWITCH_3POS || m_slider->value() == 1 ? 0 : 1);
return val;
if (swType == Board::SWITCH_3POS)
return m_slider->value();
else
return m_slider->value() > 0 ? 1 : 0;
}
void setValueFromSlider(const int & value)
{
if (swType == Board::SWITCH_3POS)
RadioWidget::setValue(value);
else
RadioWidget::setValue(value ? 1 : -1);
}
void setToggleLocked(bool lock)
@@ -139,7 +149,4 @@ class RadioSwitchWidget : public RadioWidget
QSlider * m_slider;
};
#endif // _RADIOSWITCHWIDGET_H_