Fix signal viewer so that it handles multiplexed signals properly

collin80 · Mar 19, 2024 · 77f889e · 77f889e
1 parent 3018f84
commit 77f889e
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/signalviewerwindow.cpp b/signalviewerwindow.cpp
@@ -98,15 +98,18 @@ void SignalViewerWindow::processFrame(CANFrame &frame)
         if (!sig) return;
         if (sig->parentMessage->ID == frame.frameId())
         {
-            if (sig->processAsText(frame, sigString, false)) //if true we could interpret the signal so update it in the list
+            if (sig->isSignalInMessage(frame)) //filter out multiplexed signals that aren't in this message.
             {
-                QTableWidgetItem *item = ui->tableViewer->item(i, VALUE_COL);
-                if (!item)
+                if (sig->processAsText(frame, sigString, false)) //if true we could interpret the signal so update it in the list
                 {
-                    item = new QTableWidgetItem(sigString);
-                    ui->tableViewer->setItem(i, VALUE_COL, item);
+                    QTableWidgetItem *item = ui->tableViewer->item(i, VALUE_COL);
+                    if (!item)
+                    {
+                        item = new QTableWidgetItem(sigString);
+                        ui->tableViewer->setItem(i, VALUE_COL, item);
+                    }
+                    else item->setText(sigString);
                 }
-                else item->setText(sigString);
             }
         }
     }