Merge pull request #720 from martonmiklos/do_not_add_extra_newline_to…

…_the_interpreted_frame_data Do not add extra trailing newline on the decoded message texts
collin80 · Jan 26, 2024 · 51ef3f9 · 51ef3f9
2 parents ff0fcb7 + b77b876
commit 51ef3f9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/dbc/dbc_classes.cpp b/dbc/dbc_classes.cpp
@@ -76,12 +76,16 @@ QString DBC_SIGNAL::processSignalTree(const CANFrame &frame)
             if (sig->processAsText(frame, sigString))
             {
                 qDebug() << "Returned value: " << sigString;
+                if (!build.isEmpty() && !sigString.isEmpty())
+                    build.append("\n");
                 build.append(sigString);
-                build.append("\n");
                 if (sig->isMultiplexor)
                 {
                     qDebug() << "Spelunkin!";
-                    build.append(sig->processSignalTree(frame));
+                    auto subTreeString = sig->processSignalTree(frame);
+                    if (!build.isEmpty() && !subTreeString.isEmpty())
+                        build.append("\n");
+                    build.append(subTreeString);
                 }
             }
         }