From 630525d08c286edb73db54a0fdc0cd49ea843b14 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 23 Dec 2021 16:56:44 +0100 Subject: [PATCH] #3421 template_creaPatientsSystem --- .../src/bbcreaMiniToolsCreateReport01.cxx | 30 ++++++++++++++----- .../src/bbcreaMiniToolsCreateReport01.h | 10 +++++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx index cd2250c..8827c10 100644 --- a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx +++ b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx @@ -47,6 +47,11 @@ void CreateReport01::Process() std::vector lstOut08; std::vector lstOut09; std::vector lstOut10; + std::vector lstOut11; + std::vector lstOut12; + std::vector lstOut13; + std::vector lstOut14; + std::vector lstOut15; std::vector< std::vector* > pLstOut; @@ -61,6 +66,11 @@ void CreateReport01::Process() pLstOut.push_back( &lstOut08 ); pLstOut.push_back( &lstOut09 ); pLstOut.push_back( &lstOut10 ); + pLstOut.push_back( &lstOut11 ); + pLstOut.push_back( &lstOut12 ); + pLstOut.push_back( &lstOut13 ); + pLstOut.push_back( &lstOut14 ); + pLstOut.push_back( &lstOut15 ); int iTitle2,sizeTitles2 = lstTitles2.size(); @@ -95,7 +105,7 @@ void CreateReport01::Process() size_t pos = 0; pos = pathFile.find( stdPATIENT , pos); pathFile.replace(pos, stdPATIENT.length(), lstPatients[i] ); - printf("CreateReport01::Process %s \n", pathFile.c_str() ); + printf("CreateReport01::Process Steps %s \n", pathFile.c_str() ); ff=fopen(pathFile.c_str(), "r"); strcpy(tmpValue,"?EED?"); if (ff!=NULL) @@ -131,12 +141,13 @@ void CreateReport01::Process() size_t pos = 0; pos = pathFile.find( stdPATIENT , pos); pathFile.replace(pos, stdPATIENT.length(), lstPatients[i] ); - printf("CreateReport01::Process %s \n", pathFile.c_str() ); + printf("CreateReport01::Process comments %s \n", pathFile.c_str() ); ff=fopen(pathFile.c_str(), "r"); strcpy(tmpValue,"?EED?"); if (ff!=NULL) { fgets(tmpValue,255,ff); + printf("tmpValue %s \n",tmpValue); pLstOut[id]->push_back( tmpValue ); pLstOut[id]->push_back( " " ); pLstOut[id]->push_back( " " ); @@ -144,11 +155,11 @@ void CreateReport01::Process() pLstOut[id]->push_back( " " ); fclose(ff); } else { - pLstOut[id]->push_back( " " ); - pLstOut[id]->push_back( " " ); - pLstOut[id]->push_back( " " ); - pLstOut[id]->push_back( " " ); - pLstOut[id]->push_back( " " ); + pLstOut[id]->push_back( "? " ); + pLstOut[id]->push_back( "? " ); + pLstOut[id]->push_back( "? " ); + pLstOut[id]->push_back( "? " ); + pLstOut[id]->push_back( "? " ); }// if ff } // for j @@ -165,6 +176,11 @@ void CreateReport01::Process() bbSetOutputOut08( lstOut08 ); bbSetOutputOut09( lstOut09 ); bbSetOutputOut10( lstOut10 ); + bbSetOutputOut11( lstOut11 ); + bbSetOutputOut12( lstOut12 ); + bbSetOutputOut13( lstOut13 ); + bbSetOutputOut14( lstOut14 ); + bbSetOutputOut15( lstOut15 ); } //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) diff --git a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.h b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.h index b289743..3d58154 100644 --- a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.h +++ b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.h @@ -37,6 +37,11 @@ class bbcreaMiniTools_EXPORT CreateReport01 BBTK_DECLARE_OUTPUT(Out08,std::vector); BBTK_DECLARE_OUTPUT(Out09,std::vector); BBTK_DECLARE_OUTPUT(Out10,std::vector); + BBTK_DECLARE_OUTPUT(Out11,std::vector); + BBTK_DECLARE_OUTPUT(Out12,std::vector); + BBTK_DECLARE_OUTPUT(Out13,std::vector); + BBTK_DECLARE_OUTPUT(Out14,std::vector); + BBTK_DECLARE_OUTPUT(Out15,std::vector); BBTK_PROCESS(Process); void Process(); //===== @@ -67,6 +72,11 @@ BBTK_OUTPUT(CreateReport01,Out07,"Steps and then comments",std::vector,""); BBTK_OUTPUT(CreateReport01,Out09,"Steps and then comments",std::vector,""); BBTK_OUTPUT(CreateReport01,Out10,"Steps and then comments",std::vector,""); +BBTK_OUTPUT(CreateReport01,Out11,"Steps and then comments",std::vector,""); +BBTK_OUTPUT(CreateReport01,Out12,"Steps and then comments",std::vector,""); +BBTK_OUTPUT(CreateReport01,Out13,"Steps and then comments",std::vector,""); +BBTK_OUTPUT(CreateReport01,Out14,"Steps and then comments",std::vector,""); +BBTK_OUTPUT(CreateReport01,Out15,"Steps and then comments",std::vector,""); BBTK_END_DESCRIBE_BLACK_BOX(CreateReport01); //===== -- 2.45.1