Merge pull request #298 from bigoulours/bugfix/bigoulours1

Bugfix/bigoulours1

framefileio.cpp

@@ -1584,7 +1584,7 @@ bool FrameFileIO::loadCanalyzerASC(QString filename, QVector<CANFrame>* 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();

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++)
         {

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;

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()