diff --git a/src/items/itemstore.cpp b/src/items/itemstore.cpp index db0d139..61b41eb 100644 --- a/src/items/itemstore.cpp +++ b/src/items/itemstore.cpp @@ -46,8 +46,6 @@ void ItemStore::jsReqNewItem() if(items_.empty()) return; - qDebug()<<__func__<<"new item requested"; - std::vector> joysticks = TrainJs::getJsDevices(); for(auto joystick: joysticks) { diff --git a/src/microcontroller.cpp b/src/microcontroller.cpp index 039db20..093be50 100644 --- a/src/microcontroller.cpp +++ b/src/microcontroller.cpp @@ -105,7 +105,7 @@ std::shared_ptr Microcontroller::processTrainLine(const QString& buffer) QStringList bufferList = buffer.split(' '); if(bufferList.size() >= 14 && buffer.startsWith("TRAIN NUMBER:")) { - return std::shared_ptr(new Train(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[13].toInt(), bufferList[9].toInt())); + return std::shared_ptr(new Train(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[13].toInt(nullptr, 2), bufferList[9].toInt())); } return nullptr; } @@ -115,7 +115,7 @@ std::shared_ptr Microcontroller::processTurnoutLine(const QString& buffer) QStringList bufferList = buffer.split(' '); if(bufferList.size() >= 11 && buffer.startsWith("TURNOUT NUMBER:")) { - return std::shared_ptr(new Turnout(bufferList[2].toInt(), bufferList[2].toInt(), bufferList[6].toInt(), bufferList[11].toInt())); + return std::shared_ptr(new Turnout(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[6].toInt(), bufferList[11].toInt())); } return nullptr; } diff --git a/src/ui/itemwidget.cpp b/src/ui/itemwidget.cpp index 1a2747b..af6426e 100644 --- a/src/ui/itemwidget.cpp +++ b/src/ui/itemwidget.cpp @@ -50,6 +50,7 @@ ItemWidget::ItemWidget(std::weak_ptr item, QWidget *parent) : ui->radioButton_left->hide(); ui->radioButton_right->hide(); uint8_t functionMask = train->getFunctionMask(); + qDebug()<<"functionMask: "<<(int)functionMask; if(!(functionMask & (1 << 0))) ui->checkBox_f1->hide(); if(!(functionMask & (1 << 1)))