Fixes #6533
This commit is contained in:
@@ -41,6 +41,7 @@ class RadioSwitchWidget : public RadioWidget
|
|||||||
{
|
{
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
explicit RadioSwitchWidget(Board::SwitchType type, const QString & labelText, int value = 0, QWidget * parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()) :
|
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),
|
RadioWidget(labelText, value, parent, f),
|
||||||
swType(type)
|
swType(type)
|
||||||
@@ -96,15 +97,24 @@ class RadioSwitchWidget : public RadioWidget
|
|||||||
setWidget(m_slider);
|
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);
|
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);
|
if (swType == Board::SWITCH_3POS)
|
||||||
return val;
|
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)
|
void setToggleLocked(bool lock)
|
||||||
@@ -139,7 +149,4 @@ class RadioSwitchWidget : public RadioWidget
|
|||||||
QSlider * m_slider;
|
QSlider * m_slider;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // _RADIOSWITCHWIDGET_H_
|
#endif // _RADIOSWITCHWIDGET_H_
|
||||||
|
|||||||
Reference in New Issue
Block a user