Changeset 78 in pacpussensors

Timestamp:

Mar 23, 2015, 12:24:04 PM (10 years ago)

Author:

DHERBOMEZ Gérald

Message:

• Usage of the new interface of win32serialport
• Correction of a bug in frames initialization

Location:

trunk/SpanCPTComponent

Files:

• CPTComponent.cpp (modified) (8 diffs)
• CPTComponent.h (modified) (2 diffs)

trunk/SpanCPTComponent/CPTComponent.cpp

@@ -57 +57 @@
 
     //decoding
-    currentDataFrame ="";
-    currentRoadtime = 0;
-    currentTimerange = 0;
+    currentDataFrame_ ="";
 
     frameToDecode = "";
@@ -89 +87 @@
     setPortCOM( xmlParameters().getProperty("port").toLatin1() );
 
-    if (!xmlParameters().getProperty("isRecording()").isNull()) {
-        setRecording ( (xmlParameters().getProperty("isRecording()") == "true" ? true : false) );
+    if (!xmlParameters().getProperty("recording").isNull()) {
+        setRecording ( (xmlParameters().getProperty("recording") == "true" ? true : false) );
     }
     if (!xmlParameters().getProperty("verbose").isNull()) {
@@ -148 +146 @@
 
     // get the frame and remove it in the list
-    FRAME * currentFrame = serialPort->firstFrame();
+    FRAME * currentFrame = serialPort->getNextFrame();
 
     char * currentDataFrame = new char[currentFrame->length];
@@ -154 +152 @@
     currentDataFrameLength_ = currentFrame->length;
     currentRoadtime_ = currentFrame->t;
-
-    serialPort->removeFirstFrame();
+        
+        // free memory
+        delete currentFrame;
 
     setState(ComponentBase::MONITOR_OK);
@@ -174 +173 @@
     memcpy(buffer, currentDataFrame, currentDataFrameLength_);
     buffer[currentDataFrameLength_] = '\0'; // add a \0 to convert for the conversion in QString
-
-    currentDataFrame = buffer;
-    currentRoadtime  = currentRoadtime_;
-    currentTimerange = currentRoadtime_;
+    currentDataFrame_ = QString::fromAscii(buffer);
+
+        delete[] buffer;
+    delete[] currentDataFrame;
 
     analyzeFrame();
@@ -319 +318 @@
         frameToDecode = "";
     }
-    delete[] buffer;
-    delete[] currentDataFrame;
 
     memcpy(mAllFramesBuffer, allFramesBuffer, AllFramesSize);
@@ -436 +433 @@
     //}
 
-    currentDataFrame = restOfFrame + currentDataFrame;
+    currentDataFrame_ = restOfFrame + currentDataFrame_;
     restOfFrame = "";
 
-    if (currentDataFrame.indexOf(QRegExp("[$#%]"),0)!=-1) {
-        sofIdx_ = currentDataFrame.indexOf(QRegExp("[$#%]"),0);
+    if (currentDataFrame_.indexOf(QRegExp("[$#%]"),0)!=-1) {
+        sofIdx_ = currentDataFrame_.indexOf(QRegExp("[$#%]"),0);
         startOfFrame = true;
-        timeOfFrameToDecode = currentRoadtime;
-
-        if (currentDataFrame.indexOf("\n",sofIdx_)!=-1) {
-            eofIdx_ = currentDataFrame.indexOf("\n",sofIdx_);
+        timeOfFrameToDecode = currentRoadtime_;
+
+        if (currentDataFrame_.indexOf("\n",sofIdx_)!=-1) {
+            eofIdx_ = currentDataFrame_.indexOf("\n",sofIdx_);
             endOfFrame = true;
-            timerangeOfFrameToDecode = currentTimerange;
+            timerangeOfFrameToDecode = currentTimerange_;
         }
         else
-            restOfFrame = currentDataFrame;
+            restOfFrame = currentDataFrame_;
     }
     else
-        restOfFrame = currentDataFrame;
+        restOfFrame = currentDataFrame_;
 
     if ( (startOfFrame) && (endOfFrame) )
@@ -459 +456 @@
         newFrameToDecode = true;
         for (int i=sofIdx_;i<eofIdx_;i++)
-            frameToDecode +=currentDataFrame.at(i);
-        for (int j=eofIdx_+1; j<currentDataFrame.size(); j++)
-            restOfFrame +=currentDataFrame.at(j);
+            frameToDecode +=currentDataFrame_.at(i);
+        for (int j=eofIdx_+1; j<currentDataFrame_.size(); j++)
+            restOfFrame +=currentDataFrame_.at(j);
         if (mVerbose) {
             LOG_DEBUG("[Frame:] " << frameToDecode);

trunk/SpanCPTComponent/CPTComponent.h

@@ -84 +84 @@
 #endif
 
-    road_time_t currentRoadtime_;
-    road_timerange_t currentTimerange_;
-    int currentDataFrameLength_;
+
+
 
     bool mVerbose;
@@ -111 +110 @@
 
     //Decoding
-    QString currentDataFrame;
-    road_time_t currentRoadtime;
-    road_timerange_t currentTimerange;
+    QString currentDataFrame_;
+    road_time_t currentRoadtime_;
+    road_timerange_t currentTimerange_;
+        int currentDataFrameLength_;
 
     QString frameToDecode;