From 3afa7fe3450dec0d5bda013d2076fa306f327c43 Mon Sep 17 00:00:00 2001 From: Mario Fink Date: Thu, 11 Feb 2021 17:21:39 +0100 Subject: [PATCH] channel: add origin NO --- lib/imc_channel.hpp | 11 ++++++++++- src/main.cpp | 12 ++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/imc_channel.hpp b/lib/imc_channel.hpp index 83cb7cc..01637ef 100644 --- a/lib/imc_channel.hpp +++ b/lib/imc_channel.hpp @@ -119,7 +119,8 @@ namespace imc // collect meta-data of channels according to env, // just everything valueable in here std::string uuid_; - std::string name_, comment_, origin_, text_; + std::string name_, comment_; + std::string origin_, origin_comment_, text_; std::string yname_, yunit_; std::string xname_, xunit_; double xstepwidth_; @@ -214,6 +215,14 @@ namespace imc comment_ = blocks->at(chnenv_.CNuuid_).get_parameter(prms[8]); // group_index_ = std::stoi(blocks->at(chnenv_.CNuuid_).get_parameter(prms[2])); } + + // extract associated NO data + if ( blocks->count(chnenv_.NOuuid_) == 1 ) + { + prms = blocks->at(chnenv_.NOuuid_).get_parameters(); + origin_ = blocks->at(chnenv_.NOuuid_).get_parameter(prms[4]); + origin_comment_ = blocks->at(chnenv_.NOuuid_).get_parameter(prms[6]); + } } // get info string diff --git a/src/main.cpp b/src/main.cpp index 9f30ac2..80b0bfb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -170,12 +170,12 @@ int main(int argc, char* argv[]) return 1; } - // list blocks - for ( imc::block blk: imcraw.blocks() ) - { - // std::cout<