Merge branch 'master' of github.com:collin80/SavvyCAN

README.md

@@ -48,15 +48,14 @@ http://www.qcustomplot.com/
 However, this source code is integrated into the source for SavvyCAN and one isn't required 
 to download it separately.
 
-This project requires 5.10.0 or higher because of a dependency on QtSerialBus. However, you will get
-even more SerialBus goodness if you use QT 5.11 or higher.
+This project requires 5.13.0 or higher because of a dependency on QtSerialBus and other new additions to QT. 
 
 NOTE: QT6 currently lacks support for QtSerialBus and many other QT sub-features. At this time you cannot
 use QT6 to compile SavvyCAN. Support for QT6 should be possible around QT6.2.
 
 ## Instructions for compiling:
 
-[Download the newest stable version of Qt directly from qt.io](https://www.qt.io/download/) (You need 5.10.x or newer)
+[Download the newest stable version of Qt directly from qt.io](https://www.qt.io/download/) (You need 5.13.x or newer)
 
 ```sh
 cd ~
@@ -65,7 +64,7 @@ git clone https://github.com/collin80/SavvyCAN.git
 
 cd SavvyCAN
 
-~/Qt/5.10/gcc_64/bin/qmake
+~/Qt/5.13/gcc_64/bin/qmake
 
 make
 ```

framefileio.cpp

@@ -1585,7 +1585,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()