Properly hooked up multiplexed signals. They now show up correctly

when "Interpret Frames" is selected on the main screen. Fixed some bugs related to the new DBC code.
2016-01-10 21:54:33 -05:00
parent 81e97e8803
commit 62e168905a
5 changed files with 115 additions and 8 deletions
@@ -202,9 +202,12 @@ QVariant CANFrameModel::data(const QModelIndex &index, int role) const
                    tempString.append(msg->name + " " + msg->comment + "\r\n");
                    for (int j = 0; j < msg->msgSignals.length(); j++)
                    {
-
-                        tempString.append(dbcHandler->processSignal(thisFrame, msg->msgSignals.at(j)));
-                        tempString.append("\r\n");
+                        QString sigString = dbcHandler->processSignal(thisFrame, msg->msgSignals.at(j));
+                        if (sigString.length() > 1) //weeds out signals that don't actually exist in this message (due to multiplexing)
+                        {
+                            tempString.append(sigString);
+                            tempString.append("\r\n");
+                        }
                    }
                }
            }