From d459a99317af91354c8029af45f0e457aa99d554 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 13 May 2014 12:00:26 +0200 Subject: [PATCH] Updates to the DTSC analyser - not fully complete, but still nice. --- src/analysers/dtsc_analyser.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/analysers/dtsc_analyser.cpp b/src/analysers/dtsc_analyser.cpp index c3c46667..16356531 100644 --- a/src/analysers/dtsc_analyser.cpp +++ b/src/analysers/dtsc_analyser.cpp @@ -19,9 +19,7 @@ namespace Analysers { ///\return The return code of the analyser. int analyseDTSC(Util::Config conf){ DTSC::File F(conf.getString("filename")); - std::stringstream meta; - F.getMeta().toPrettyString(meta,0, 0x03); - std::cout << meta.str() << std::endl; + F.getMeta().toPrettyString(std::cout,0, 0x03); int bPos = 0; F.seek_bpos(0); @@ -29,16 +27,13 @@ namespace Analysers { JSON::Value tmp; std::string tmpStr; while (F.getPacket()){ - tmpStr = std::string(F.getPacket().getData(), F.getPacket().getDataLen()); switch (F.getPacket().getVersion()){ case DTSC::DTSC_V1: { - unsigned int i = 8; - JSON::fromDTMI((const unsigned char*)tmpStr.data(), tmpStr.size(), i, tmp); + std::cout << "DTSCv1 packet: " << F.getPacket().getScan().toPrettyString() << std::endl; break; } case DTSC::DTSC_V2: { - unsigned int i = 8; - JSON::fromDTMI2((const unsigned char*)tmpStr.data(), tmpStr.size(), i, tmp); + std::cout << "DTSCv2 packet: " << F.getPacket().getScan().toPrettyString() << std::endl; break; } default: