uvos/TrainControllerUi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix turnout line format

Browse Source 
add shortcuts for more turnouts
This commit is contained in:
uvos
2022-01-27 21:34:04 +01:00
parent 4ff73760e5
commit 840cec975d
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/microcontroller.cpp
View File

@ -116,7 +116,7 @@ std::shared_ptr<Item> Microcontroller::processTurnoutLine(const QString& buffer)
QStringList bufferList = buffer.split(' '); QStringList bufferList = buffer.split(' ');
if(bufferList.size() >= 6 && buffer.startsWith("NUMBER:")) if(bufferList.size() >= 6 && buffer.startsWith("NUMBER:"))
{ {
return std::shared_ptr<Item>(new Turnout(bufferList[1].toInt(), bufferList[5].toInt())); return std::shared_ptr<Item>(new Turnout(bufferList[1].toInt(), bufferList[1].toInt(), bufferList[5].toInt()));
} }
return nullptr; return nullptr;
} }

10
src/ui/itemscrollbox.cpp
View File

@ -50,6 +50,16 @@ void ItemScrollBox::addItem(std::weak_ptr<Item> item)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_4)); widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_4));
else if(turnout->getTurnoutId() == 4) else if(turnout->getTurnoutId() == 4)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_5)); widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_5));
else if(turnout->getTurnoutId() == 5)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_6));
else if(turnout->getTurnoutId() == 6)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_7));
else if(turnout->getTurnoutId() == 7)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_8));
else if(turnout->getTurnoutId() == 8)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_9));
else if(turnout->getTurnoutId() == 9)
widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_0));
} }
ui->relayWidgetVbox->addWidget(widgets_.back()); ui->relayWidgetVbox->addWidget(widgets_.back());
connect(widgets_.back(), &ItemWidget::deleteRequest, this, &ItemScrollBox::deleteRequest); connect(widgets_.back(), &ItemWidget::deleteRequest, this, &ItemScrollBox::deleteRequest);