diff --git a/canframemodel.cpp b/canframemodel.cpp index 959dc5b..d8fbf94 100644 --- a/canframemodel.cpp +++ b/canframemodel.cpp @@ -294,7 +294,7 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const if (msg != NULL) { tempString.append("\n"); - tempString.append(msg->name + " " + msg->comment + "\n"); + tempString.append(msg->name + "\n" + msg->comment + "\n"); for (int j = 0; j < msg->sigHandler->getCount(); j++) { QString sigString; diff --git a/dbc/dbc_classes.cpp b/dbc/dbc_classes.cpp index 465b2b2..6f30c97 100644 --- a/dbc/dbc_classes.cpp +++ b/dbc/dbc_classes.cpp @@ -104,8 +104,8 @@ bool DBC_SIGNAL::processAsText(const CANFrame &frame, QString &outString) foundVal = true; break; } - if (!foundVal) outputString += QString::number(endResult) + unitName; } + if (!foundVal) outputString += QString::number(endResult) + unitName; } else //otherwise display the actual number and unit (if it exists) { diff --git a/motorcontrollerconfigwindow.cpp b/motorcontrollerconfigwindow.cpp index fc50fce..d8725fc 100644 --- a/motorcontrollerconfigwindow.cpp +++ b/motorcontrollerconfigwindow.cpp @@ -200,13 +200,13 @@ void MotorControllerConfigWindow::timerTick() } else //save current value of all data items { - uint16 thisValue; + uint16_t thisValue; qDebug() << "Transmission: " << QString::number(transmitStep); QString cellVal = ui->tableParams->item(transmitStep, 1)->text(); if (params[transmitStep].paramType != HEX) - thisValue = (uint16_t)QString::number(cellVal); + thisValue = (uint16_t)Utility::ParseStringToNum(cellVal); else thisValue = (uint16_t)Utility::ParseStringToNum(cellVal);