Only give train items to js

This commit is contained in:
2022-02-21 19:24:31 +01:00
parent c19810162a
commit 4a7082319f
3 changed files with 14 additions and 4 deletions

View File

@ -56,10 +56,15 @@ void ItemStore::jsReqNewItem()
{ {
if(!oldItem || *items_[i] == *oldItem) if(!oldItem || *items_[i] == *oldItem)
{ {
if(i+1 < items_.size()) for(size_t j = 1; j < items_.size(); ++j)
joystick->setItem(items_[i+1]); {
else std::shared_ptr<Item> item = items_[(i+j) % items_.size()];
joystick->setItem(items_[0]); if(dynamic_cast<Train*>(item.get()))
{
joystick->setItem(item);
break;
}
}
break; break;
} }
} }

View File

@ -25,6 +25,8 @@ MainWindow::MainWindow(Microcontroller * const micro, ItemStore* items, QWidget
} }
connect(ui->relayList, &ItemScrollBox::deleteRequest, items, &ItemStore::removeItem); connect(ui->relayList, &ItemScrollBox::deleteRequest, items, &ItemStore::removeItem);
ui->pushButton_addItem->hide();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()

View File

@ -34,6 +34,9 @@ SignalWidget::SignalWidget(std::weak_ptr<Item> item, QWidget *parent) :
}); });
connect(signal.get(), &Item::valueChanged, this, &SignalWidget::moveToValue); connect(signal.get(), &Item::valueChanged, this, &SignalWidget::moveToValue);
if(!signal->hasSlow())
ui->radioButton_slow->hide();
} }
} }
else else