From 840cec975d62ea234e920de35ff9ad350d52490b Mon Sep 17 00:00:00 2001 From: uvos Date: Thu, 27 Jan 2022 21:34:04 +0100 Subject: [PATCH] fix turnout line format add shortcuts for more turnouts --- src/microcontroller.cpp | 2 +- src/ui/itemscrollbox.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/microcontroller.cpp b/src/microcontroller.cpp index a5395f1..1ef28fd 100644 --- a/src/microcontroller.cpp +++ b/src/microcontroller.cpp @@ -116,7 +116,7 @@ std::shared_ptr Microcontroller::processTurnoutLine(const QString& buffer) QStringList bufferList = buffer.split(' '); if(bufferList.size() >= 6 && buffer.startsWith("NUMBER:")) { - return std::shared_ptr(new Turnout(bufferList[1].toInt(), bufferList[5].toInt())); + return std::shared_ptr(new Turnout(bufferList[1].toInt(), bufferList[1].toInt(), bufferList[5].toInt())); } return nullptr; } diff --git a/src/ui/itemscrollbox.cpp b/src/ui/itemscrollbox.cpp index 3e8a1a4..b1f52a5 100644 --- a/src/ui/itemscrollbox.cpp +++ b/src/ui/itemscrollbox.cpp @@ -50,6 +50,16 @@ void ItemScrollBox::addItem(std::weak_ptr item) widgets_.back()->setShortcuts(QKeySequence(), QKeySequence(), QKeySequence(Qt::Key_4)); else if(turnout->getTurnoutId() == 4) 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()); connect(widgets_.back(), &ItemWidget::deleteRequest, this, &ItemScrollBox::deleteRequest);