From 53377ec75b53469b4eccb9adb4b2d2095c533445 Mon Sep 17 00:00:00 2001 From: Mario Fink Date: Wed, 29 Jul 2020 17:17:01 +0200 Subject: [PATCH] fix get_unit with correct marker name, generalize example.py --- lib/raweat.hpp | 5 +++-- pyt/example.py | 35 +++++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/lib/raweat.hpp b/lib/raweat.hpp index 4e43295..3f656ac 100644 --- a/lib/raweat.hpp +++ b/lib/raweat.hpp @@ -529,8 +529,9 @@ public: std::string get_unit() { // assert ( segments_.size() > 0 ); - - if ( datasec_["punit"].size() > 0 ) + + if ( datasec_["punit marker"].size() > 0 + && segments_["punit marker"].size() > 6 ) { return valid_ ? segments_["punit marker"][7] : std::string("None"); } diff --git a/pyt/example.py b/pyt/example.py index bbfe5b8..8b6df97 100644 --- a/pyt/example.py +++ b/pyt/example.py @@ -1,15 +1,34 @@ import raw_eater -eatraw = raw_eater.raweater(b"sample/Rangerover_Evoque_F-RR534_2019-05-07/ABS_A_Port1.raw") -# eatraw = raw_eater.raweater(b"/home/mario/Downloads/FAMOS_Datenformat_ab61.pdf") +rawlist = [ "sample/Rangerover_Evoque_F-RR534_2019-05-07/ABS_A_Port1.raw", + "./pyt/example.py", + "sample/Rangerover_Evoque_F-RR534_2019-05-07/LateralAcceleration_HS.raw" ] -print(str(eatraw.validity())) +print("") -print(eatraw.channel_name()) -print(eatraw.unit()) +for rf in rawlist : -print(eatraw.get_time()) -print(eatraw.get_channel()) + print("converting " + str(rf) + "...\n") -eatraw.write_table(b"mycsv.csv",ord(' ')) + eatraw = raw_eater.raweater(rf.encode()) + + print(str(eatraw.validity())) + + if eatraw.validity() : + + print(eatraw.channel_name()) + print(eatraw.unit()) + + print(eatraw.get_time()) + print(eatraw.get_channel()) + + outname = rf.split('/')[-1].replace('raw','csv') + + eatraw.write_table(outname.encode(),ord(' ')) + + else : + + print("invalid/corrupt .raw file") + + print("\n")