From d93bc79329607783e135f229883d1943d1b563bc Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Wed, 20 Nov 2019 20:41:59 +0100 Subject: [PATCH] jedparser: include previous Note. Usefull to determine area --- jedParser.cpp | 7 ++++++- jedParser.hpp | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jedParser.cpp b/jedParser.cpp index 34fda62..cd95829 100644 --- a/jedParser.cpp +++ b/jedParser.cpp @@ -175,6 +175,8 @@ void JedParser::parseLField(vector content) int JedParser::parse() { + string previousNote; + if (!_fd.is_open()) { _fd.open(_filename); if (!_fd.is_open()) { @@ -207,6 +209,7 @@ int JedParser::parse() switch (lines[0][0]) { case 'N': // note + previousNote = lines[0].substr(5); break; case 'Q': int count; @@ -242,6 +245,7 @@ int JedParser::parse() break; case 'L': // fuse offset parseLField(lines); + _data_list[_data_list.size()-1].associatedPrevNote = previousNote; break; default: printf("inconnu\n"); @@ -251,7 +255,8 @@ int JedParser::parse() int size = 0; for (size_t i = 0; i < _data_list.size(); i++) { - printf("area[%ld] %d %d\n", i, _data_list[i].offset, _data_list[i].len); + printf("area[%ld] %d %d ", i, _data_list[i].offset, _data_list[i].len); + printf("%s\n", _data_list[i].associatedPrevNote.c_str()); size += _data_list[i].len; } diff --git a/jedParser.hpp b/jedParser.hpp index b3bf02e..5fcbf64 100644 --- a/jedParser.hpp +++ b/jedParser.hpp @@ -32,6 +32,7 @@ class JedParser: public ConfigBitstreamParser { int offset; std::vector data; int len; + std::string associatedPrevNote; }; public: @@ -44,6 +45,7 @@ class JedParser: public ConfigBitstreamParser { std::vector data_for_section(int id) { return _data_list[id].data; } + std::string noteForSection(int id) {return _data_list[id].associatedPrevNote;} uint32_t feabits() {return _feabits;} uint64_t featuresRow() {return _featuresRow;}