Changeset 342 in pacpusframework

Timestamp:

03/12/15 17:12:51 (9 years ago)

Author:

phudelai

Message:

mise à jour du decriptor

Location:

branches/0.1.x/src/dbcDecriptor/src

Files:

• mainwindow.cpp (modified) (6 diffs)
• structure.h (modified) (2 diffs)

branches/0.1.x/src/dbcDecriptor/src/mainwindow.cpp

@@ -11 +11 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include <iostream>
-#include <math.h>
 
 #include <QString>
@@ -66 +64 @@
 
     if (!file.open(QIODevice::ReadOnly))
-    {
         ui->label_file_error->setText("<font color=\"#C80000\">Can not open the file</font>");
-    }
     else
     {
@@ -85 +81 @@
             if (frameFound)
             {
-                // " SG_" is the beginning if a line containing a signal information
-                if (dbcFiles_.content[i].startsWith(" SG_"))
+                // signalMnemo is the beginning if a line containing a signal information
+                if (dbcFiles_.content[i].startsWith(signalMnemo))
                 {
                     tmpFrame.numberOfSignals++;
@@ -96 +92 @@
 
             // "BO_" is the beginning of a line containing a frame information and all signals are following
-            if (dbcFiles_.content[i].startsWith("BO_"))
+            if (dbcFiles_.content[i].startsWith(signalInfoMnemo))
             {
                 int numberOfSpace = 0, j = 0;
@@ -126 +122 @@
                 tmpFrame.frameName = tmp;
             }
-            else if (dbcFiles_.content[i].startsWith("CM_"))
-            {
-                // Get the comment at the end of the DBC file
-                findComment(i);
-            }
-            else if (dbcFiles_.content[i].startsWith("VAL_"))
-            {
-                // Get the value descritpion at the end of the DBC file
-                findValueDescription(i);
-            }
+            else if (dbcFiles_.content[i].startsWith(commentMnemo))
+                findComment(i); // Get the comment at the end of the DBC file
+            else if (dbcFiles_.content[i].startsWith(valueInfoMnemo))                
+                findValueDescription(i); // Get the value descritpion at the end of the DBC file
 
             // If a hole frame has been treated it's registered in the vector
@@ -194 +184 @@
     {
         for (int j = 0; j < dbcFiles_.canFrames[i].signalsVector.size(); j++)
-        {
             printFrame(i, j);
-        }
     }
 }

branches/0.1.x/src/dbcDecriptor/src/structure.h

@@ -11 +11 @@
 #ifndef STRUCTURE_H
 #define STRUCTURE_H
-
-#include <QMap>
-#include <QFile>
 
 
@@ -48 +45 @@
     QStringList          content;   /// Content of the dbc file
 } StructDBCFile;
+
+
+/// define the mnemonique of each message to find
+#define signalMnemo " SG_"
+#define signalInfoMnemo "BO_"
+#define commentMnemo "CM_"
+#define valueInfoMnemo "VAL_"