Update CANMolinaroAnalyzer.cpp

Removing the first 3 lines of CANMolinaroAnalyzer::WorkerThread.

Author: pierremolinaro

src/CANMolinaroAnalyzer.cpp

@@ -15,7 +15,7 @@ Analyzer2 (),
 mSettings (new CANMolinaroAnalyzerSettings ()),
 mSimulationInitilized (false) {
   SetAnalyzerSettings (mSettings.get()) ;
-//  UseFrameV2 () ;
+  UseFrameV2 () ;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -42,9 +42,9 @@ void CANMolinaroAnalyzer::SetupResults () {
 //--------------------------------------------------------------------------------------------------
 
 void CANMolinaroAnalyzer::WorkerThread (void) {
-  mResults.reset (new CANMolinaroAnalyzerResults (this, mSettings.get ())) ;
-  SetAnalyzerResults (mResults.get ()) ;
-  mResults->AddChannelBubblesWillAppearOn (mSettings->mInputChannel) ;
+//   mResults.reset (new CANMolinaroAnalyzerResults (this, mSettings.get ())) ;
+//   SetAnalyzerResults (mResults.get ()) ;
+//   mResults->AddChannelBubblesWillAppearOn (mSettings->mInputChannel) ;
 //---
   const bool inverted = mSettings->inverted () ;
   mSampleRateHz = GetSampleRate () ;
@@ -462,66 +462,66 @@ void CANMolinaroAnalyzer::addBubble (const U8 inBubbleType,
   frame.mData2 = inData2 ;
   mResults->AddFrame (frame) ;
 
-//   FrameV2 frameV2 ;
-//   switch (inBubbleType) {
-//   case STANDARD_IDENTIFIER_FIELD_RESULT :
-//     { const U8 idf [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
-//       frameV2.AddByteArray ("Value", idf, 2) ;
-//       mResults->AddFrameV2 (frameV2, "Std Idf", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     }
-//     break ;
-//   case EXTENDED_IDENTIFIER_FIELD_RESULT :
-//     { const U8 idf [4] = {
-//         U8 (inData1 >> 24), U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1)
-//       } ;
-//       frameV2.AddByteArray ("Value", idf, 4) ;
-//       mResults->AddFrameV2 (frameV2, "Ext Idf", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     }
-//     break ;
-//   case CONTROL_FIELD_RESULT :
-//     frameV2.AddByte ("Value", inData1) ;
-//     mResults->AddFrameV2 (frameV2, "Ctrl", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     break ;
-//   case DATA_FIELD_RESULT :
-//     { frameV2.AddByte ("Value", inData1) ;
-//       std::stringstream str ;
-//       str << "D" << inData2 ;
-//       mResults->AddFrameV2 (frameV2, str.str ().c_str (), mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     }
-//     break ;
-//   case CRC_FIELD_RESULT :
-//     { const U8 crc [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
-//       frameV2.AddByteArray ("Value", crc, 2) ;
-//       mResults->AddFrameV2 (frameV2, "CRC", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     }
-//     break ;
-//   case ACK_FIELD_RESULT :
-//     mResults->AddFrameV2 (frameV2, "ACK", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     break ;
-//   case EOF_FIELD_RESULT :
-//     mResults->AddFrameV2 (frameV2, "EOF", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     break ;
-//   case INTERMISSION_FIELD_RESULT :
-//     { const U64 frameSampleCount = inData1 ;
-//       const U32 samplesPerBit = mSampleRateHz / mSettings->mBitRate ;
-//       const U64 length = (frameSampleCount + samplesPerBit / 2) / samplesPerBit ;
-//       const U64 stuffBitCount = inData2 ;
-//       const U64 durationMicroSeconds = frameSampleCount * 1000000 / mSampleRateHz ;
-//       std::stringstream str ;
-//       str << length << " bits, "
-//           << durationMicroSeconds << "µs, "
-//           << stuffBitCount << " stuff bit" << ((inData2 > 1) ? "s" : "") ;
-//       frameV2.AddString ("Value", str.str ().c_str ()) ;
-//       mResults->AddFrameV2 (frameV2, "IFS", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     }
-//     break ;
-//   case CAN_ERROR_RESULT :
-//     mResults->AddFrameV2 (frameV2, "Error", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     break ;
-//   default:
-//     mResults->AddFrameV2 (frameV2, "?", mStartOfFieldSampleNumber, inEndSampleNumber) ;
-//     break ;
-//   }
+  FrameV2 frameV2 ;
+  switch (inBubbleType) {
+  case STANDARD_IDENTIFIER_FIELD_RESULT :
+    { const U8 idf [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
+      frameV2.AddByteArray ("Value", idf, 2) ;
+      mResults->AddFrameV2 (frameV2, "Std Idf", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    }
+    break ;
+  case EXTENDED_IDENTIFIER_FIELD_RESULT :
+    { const U8 idf [4] = {
+        U8 (inData1 >> 24), U8 (inData1 >> 16), U8 (inData1 >> 8), U8 (inData1)
+      } ;
+      frameV2.AddByteArray ("Value", idf, 4) ;
+      mResults->AddFrameV2 (frameV2, "Ext Idf", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    }
+    break ;
+  case CONTROL_FIELD_RESULT :
+    frameV2.AddByte ("Value", inData1) ;
+    mResults->AddFrameV2 (frameV2, "Ctrl", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    break ;
+  case DATA_FIELD_RESULT :
+    { frameV2.AddByte ("Value", inData1) ;
+      std::stringstream str ;
+      str << "D" << inData2 ;
+      mResults->AddFrameV2 (frameV2, str.str ().c_str (), mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    }
+    break ;
+  case CRC_FIELD_RESULT :
+    { const U8 crc [2] = { U8 (inData1 >> 8), U8 (inData1) } ;
+      frameV2.AddByteArray ("Value", crc, 2) ;
+      mResults->AddFrameV2 (frameV2, "CRC", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    }
+    break ;
+  case ACK_FIELD_RESULT :
+    mResults->AddFrameV2 (frameV2, "ACK", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    break ;
+  case EOF_FIELD_RESULT :
+    mResults->AddFrameV2 (frameV2, "EOF", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    break ;
+  case INTERMISSION_FIELD_RESULT :
+    { const U64 frameSampleCount = inData1 ;
+      const U32 samplesPerBit = mSampleRateHz / mSettings->mBitRate ;
+      const U64 length = (frameSampleCount + samplesPerBit / 2) / samplesPerBit ;
+      const U64 stuffBitCount = inData2 ;
+      const U64 durationMicroSeconds = frameSampleCount * 1000000 / mSampleRateHz ;
+      std::stringstream str ;
+      str << length << " bits, "
+          << durationMicroSeconds << "µs, "
+          << stuffBitCount << " stuff bit" << ((inData2 > 1) ? "s" : "") ;
+      frameV2.AddString ("Value", str.str ().c_str ()) ;
+      mResults->AddFrameV2 (frameV2, "IFS", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    }
+    break ;
+  case CAN_ERROR_RESULT :
+    mResults->AddFrameV2 (frameV2, "Error", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    break ;
+  default:
+    mResults->AddFrameV2 (frameV2, "?", mStartOfFieldSampleNumber, inEndSampleNumber) ;
+    break ;
+  }
 
   mResults->CommitResults () ;
   ReportProgress (frame.mEndingSampleInclusive) ;