switch to signed values for items

This commit is contained in:
2022-02-01 22:36:24 +01:00
parent 1f36522492
commit 6a9ad7f855
12 changed files with 39 additions and 36 deletions

View File

@ -71,7 +71,7 @@ void ItemWidget::deleteItem()
}
}
void ItemWidget::setValue(uint8_t value)
void ItemWidget::setValue(int8_t value)
{
moveToValue(value);
if(auto workingItem = item_.lock())
@ -80,13 +80,13 @@ void ItemWidget::setValue(uint8_t value)
disable();
}
void ItemWidget::moveToValue(uint8_t value)
void ItemWidget::moveToValue(int8_t value)
{
ui->slider->blockSignals(true);
ui->radioButton_left->blockSignals(true);
ui->radioButton_right->blockSignals(true);
ui->pushButton_reverse->setDisabled(value != 0);
ui->pushButton_reverse->setText(value == 0 ? "Reverse" : "Stop");
ui->slider->setValue(value);
ui->radioButton_left->setChecked(!value);
ui->radioButton_right->setChecked(value);
@ -133,8 +133,7 @@ void ItemWidget::reverse()
if(train && workingItem->getValue() == 0)
train->reverse();
else
{
qDebug()<<"!((bool)workingItem->getValue()) "<<!((bool)workingItem->getValue());
{
setValue(!((bool)workingItem->getValue()));
}
}
@ -171,11 +170,6 @@ void ItemWidget::stepUp()
void ItemWidget::stepDown()
{
if(ui->slider->value() == 0)
{
setValue(0);
return;
}
setValue(ui->slider->value()-1);
}

View File

@ -26,8 +26,8 @@ signals:
void deleteRequest(const ItemData& item);
private slots:
void setValue(uint8_t value);
void moveToValue(uint8_t value);
void setValue(int8_t value);
void moveToValue(int8_t value);
void deleteItem();
void stepUp();

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>280</width>
<height>83</height>
<width>312</width>
<height>78</height>
</rect>
</property>
<property name="sizePolicy">
@ -53,6 +53,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSlider" name="slider">
<property name="minimum">
<number>-14</number>
</property>
<property name="maximum">
<number>14</number>
</property>
@ -65,6 +68,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
</widget>
</item>
<item>