diff --git a/framefileio.cpp b/framefileio.cpp index 87645b7..ea50a33 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -1584,7 +1584,7 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector* frames) else { thisFrame.setFrameId(tokens[2].toUInt(nullptr, 16)); - thisFrame.setExtendedFrameFormat(false); + thisFrame.setExtendedFrameFormat(thisFrame.frameId() > 0x7FF); //some .asc files have extended IDs without 'x' } int payloadLen = tokens[5].toInt(); diff --git a/framesenderwindow.cpp b/framesenderwindow.cpp index 49ce0d0..d887d33 100644 --- a/framesenderwindow.cpp +++ b/framesenderwindow.cpp @@ -430,7 +430,17 @@ void FrameSenderWindow::handleTick() for (int i = 0; i < sendingData.count(); i++) { sendData = &sendingData[i]; - if (!sendData->enabled) continue; //abort any processing on this if it is not enabled. + if (!sendData->enabled) + { + if (sendData->triggers.count() > 0) + { + for (int j = 0; j < sendData->triggers.count(); j++) //resetting currCount when line is disabled + { + sendData->triggers[j].currCount = 0; + } + } + continue; //abort any processing on this if it is not enabled. + } if (sendData->triggers.count() == 0) return; for (int j = 0; j < sendData->triggers.count(); j++) { diff --git a/re/newgraphdialog.cpp b/re/newgraphdialog.cpp index 87cd41d..f6c97c4 100644 --- a/re/newgraphdialog.cpp +++ b/re/newgraphdialog.cpp @@ -357,7 +357,15 @@ void NewGraphDialog::handleDataLenUpdate() void NewGraphDialog::copySignalToParamsUI() { - DBC_MESSAGE *msg = dbcHandler->getFileByIdx(0)->messageHandler->findMsgByName(ui->cbMessages->currentText()); + assocSignal = nullptr; + DBC_MESSAGE *msg = nullptr; + + for(int i = 0; i < dbcHandler->getFileCount(); i++) + { + msg = dbcHandler->getFileByIdx(i)->messageHandler->findMsgByName(ui->cbMessages->currentText()); + if (msg) break; + } + if (!msg) return; DBC_SIGNAL *sig = msg->sigHandler->findSignalByName(ui->cbSignals->currentText()); if (!sig) return; diff --git a/scriptingwindow.cpp b/scriptingwindow.cpp index 101bf6b..fb27b73 100644 --- a/scriptingwindow.cpp +++ b/scriptingwindow.cpp @@ -345,8 +345,11 @@ void ScriptingWindow::revertScript() void ScriptingWindow::recompileScript() { - currentScript->scriptText = editor->toPlainText(); - currentScript->compileScript(); + if (currentScript) + { + currentScript->scriptText = editor->toPlainText(); + currentScript->compileScript(); + } } void ScriptingWindow::clickedLogClear()