#3421 template_creaPatientsSystem

diff --git a/appli/template_creaPatientsSystem/scripts/Comments.bbg b/appli/template_creaPatientsSystem/scripts/Comments.bbg
index 4807dd134a0594a1084f9f6b2fcef17fd81a61c0..feff11eef6e28764981dce18efbe9fbfae1ccbd0 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Comments.bbg
+++ b/appli/template_creaPatientsSystem/scripts/Comments.bbg
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BaseDir
 18.679620:45.363699:-900.000000
@@ -21,7 +21,11 @@ COMPLEX_PORT
 CoreID
 138.987918:42.249773:-900.000000
 FIN_COMPLEX_PORT
-BOXES:29
+COMPLEX_PORT
+creaUser
+231.460156:46.861703:-900.000000
+FIN_COMPLEX_PORT
+BOXES:32
 BOX
 std:ConcatStrings:Box15
 ISEXEC:FALSE
@@ -31,8 +35,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box07
 ISEXEC:FALSE
--26.074222:-64.963286:-900.000000
-13.650778:-74.963286:-900.000000
+-25.403624:-67.310379:-900.000000
+14.321376:-77.310379:-900.000000
 PORT
 In2:"/Comment-Informatic.txt"
 FIN_BOX
@@ -66,7 +70,7 @@ ISEXEC:FALSE
 79.180309:-123.999177:-900.000000
 121.955309:-133.999177:-900.000000
 PORT
-Label:"Save"
+Label:"Save and Exit"
 FIN_BOX
 BOX
 std:ReadLinesString:Box11
@@ -97,14 +101,6 @@ ISEXEC:FALSE
 207.412189:-224.495947:-900.000000
 FIN_BOX
 BOX
-wx:CommandButton:Box24
-ISEXEC:FALSE
-141.068524:-121.336156:-900.000000
-183.843524:-131.336156:-900.000000
-PORT
-Label:"Exit"
-FIN_BOX
-BOX
 wx:LayoutCenter:Box25
 ISEXEC:FALSE
 110.184779:-182.381140:-900.000000
@@ -238,7 +234,35 @@ ISEXEC:FALSE
 -174.714855:-167.885818:-900.000000
 -132.554855:-177.885818:-900.000000
 FIN_BOX
-CONNECTIONS:40
+BOX
+creaMiniTools:WriteStatePatientSystem:Box43
+ISEXEC:FALSE
+230.408537:-165.473999:-900.000000
+279.808537:-175.473999:-900.000000
+PORT
+State:"Finish"
+FIN_BOX
+BOX
+std:ConcatStrings:Box44
+ISEXEC:FALSE
+220.817310:19.275847:-900.000000
+260.542310:9.275847:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box45
+ISEXEC:FALSE
+118.657000:-63.404730:-900.000000
+158.382000:-73.404730:-900.000000
+PORT
+In2:"/Step_Comment.txt"
+FIN_BOX
+BOX
+std:MultipleInputs:Box46
+ISEXEC:FALSE
+42.254674:-231.721366:-900.000000
+81.954674:-241.721366:-900.000000
+FIN_BOX
+CONNECTIONS:45
 CONNECTION
 Box32:Widget:Box31:Widget1
 NumberOfControlPoints:0
@@ -255,18 +279,9 @@ CONNECTION
 Box18:Out:Box20:FileName
 NumberOfControlPoints:0
 CONNECTION
-Box34:BoxChange:Box20:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box33:Out:Box20:In0
 NumberOfControlPoints:0
 CONNECTION
-Box24:BoxChange:Box21:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-Box24:Widget:Box26:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box34:Widget:Box26:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -354,9 +369,33 @@ CONNECTION
 Box33:Widget:Box32:Widget6
 NumberOfControlPoints:0
 CONNECTION
-Box34:BoxChange:Box37:BoxExecute
+creaUser:creaUser:Box44:In1
+NumberOfControlPoints:0
+CONNECTION
+Box44:Out:Box43:User
+NumberOfControlPoints:0
+CONNECTION
+Box27:Out:Box45:In1
+NumberOfControlPoints:0
+CONNECTION
+Box45:Out:Box43:Filename
+NumberOfControlPoints:0
+CONNECTION
+Box42:BoxChange:Box46:In1
+NumberOfControlPoints:0
+CONNECTION
+Box37:BoxChange:Box46:In2
+NumberOfControlPoints:0
+CONNECTION
+Box20:BoxChange:Box46:In3
+NumberOfControlPoints:0
+CONNECTION
+Box43:boxChange:Box46:In4
+NumberOfControlPoints:0
+CONNECTION
+Box34:BoxChange:Box46:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box34:BoxChange:Box42:BoxExecute
+Box21:BoxChange:Box46:In9
 NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/Comments.bbs b/appli/template_creaPatientsSystem/scripts/Comments.bbs
index 4030f0cdd26deace6fa5c836837ec35e654cb06f..4ebf2bee5d3c9ddce17f311a362c151d0ae5f060 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Comments.bbs
+++ b/appli/template_creaPatientsSystem/scripts/Comments.bbs
@@ -10,6 +10,7 @@ include std
 include itkvtk
 include std
 include wx
+include creaMiniTools
 
 author "Author ??"
 description "Description ??"
@@ -30,7 +31,7 @@ new wx:InputText Box33
   set Box33.Title "Informatic Comment"
 
 new wx:CommandButton Box34
-  set Box34.Label "Save"
+  set Box34.Label "Save and Exit"
 
 new std:ReadLinesString Box11
 
@@ -42,9 +43,6 @@ new std:StringWriter Box20
 
 new std:Exit Box21
 
-new wx:CommandButton Box24
-  set Box24.Label "Exit"
-
 new wx:LayoutCenter Box25
 
 new wx:LayoutLine Box26
@@ -94,6 +92,16 @@ new std:ReplaceString Box41
 
 new std:StringWriter Box42
 
+new creaMiniTools:WriteStatePatientSystem Box43
+  set Box43.State "Finish"
+
+new std:ConcatStrings Box44
+
+new std:ConcatStrings Box45
+  set Box45.In2 "/Step_Comment.txt"
+
+new std:MultipleInputs Box46
+
 
 connect Box32.Widget Box31.Widget1
 
@@ -105,14 +113,8 @@ connect Box18.Out Box11.FileName
 
 connect Box18.Out Box20.FileName
 
-connect Box34.BoxChange Box20.BoxExecute
-
 connect Box33.Out Box20.In0
 
-connect Box24.BoxChange Box21.BoxExecute
-
-connect Box24.Widget Box26.Widget2
-
 connect Box34.Widget Box26.Widget1
 
 connect Box26.Widget Box25.Widget2
@@ -168,9 +170,24 @@ connect Box30.Widget Box32.Widget4
 
 connect Box33.Widget Box32.Widget6
 
-connect Box34.BoxChange Box37.BoxExecute
 
-connect Box34.BoxChange Box42.BoxExecute
+connect Box44.Out Box43.User
+
+connect Box27.Out Box45.In1
+
+connect Box45.Out Box43.Filename
+
+connect Box42.BoxChange Box46.In1
+
+connect Box37.BoxChange Box46.In2
+
+connect Box20.BoxChange Box46.In3
+
+connect Box43.boxChange Box46.In4
+
+connect Box34.BoxChange Box46.BoxExecute
+
+connect Box21.BoxChange Box46.In9
 
 
 
@@ -178,4 +195,5 @@ connect Box34.BoxChange Box42.BoxExecute
 input BaseDir Box15.In1 " "
 input PatientID Box19.In1 " "
 input CoreID Box22.In1 " "
+input creaUser Box44.In1 " "
 exec Box31

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbg b/appli/template_creaPatientsSystem/scripts/Report.bbg
index 586e63946f68772059a0173868fc0eddd0d3fde2..3ec0766a2f5e0997614f6060abbd8829299a71d0 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbg
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbg
@@ -17,14 +17,14 @@ COMPLEX_PORT
 CoreID
 24.094628:190.118560:-900.000000
 FIN_COMPLEX_PORT
-BOXES:34
+BOXES:36
 BOX
 wx:LayoutSplit:Box02
 ISEXEC:TRUE
 94.769135:-263.732917:-900.000000
-131.444135:-273.732917:-900.000000
+133.849135:-273.732917:-900.000000
 PORT
-Proportion:"90"
+Proportion:"80"
 PORT
 WinWidth:"1000"
 FIN_BOX
@@ -32,7 +32,7 @@ BOX
 std:MagicBox:Box03
 ISEXEC:FALSE
 -65.709740:118.613442:-900.000000
-14.440000:108.613442:-900.000000
+-29.634740:108.613442:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box04
@@ -51,14 +51,14 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box06
 ISEXEC:FALSE
--23.791461:-214.585345:-900.000000
-57.560000:-224.585345:-900.000000
+-83.749558:-203.038922:-900.000000
+-26.189558:-213.038922:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 364.651918:41.210239:-900.000000
-401.226918:31.210239:-900.000000
+422.211918:31.210239:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -108,15 +108,15 @@ ISEXEC:FALSE
 170.028508:-181.659487:-900.000000
 213.188508:-191.659487:-900.000000
 PORT
-LstTitles1:"+            Step01         Step02                Step03  Step04       Step05     Step06  General    Scientific  Informatic"
+LstTitles1:"+            Step01         Step02                Step03  Step04       Step05     Step06  Step           General    Scientific  Informatic"
 PORT
-LstTitles2:"Patient Insert_Data InitialParameters  Filter      Correction Validation PushDB Comment Comment Comment"
+LstTitles2:"Patient Insert_Data InitialParameters  Filter      Correction Validation PushDB Comment  Comment Comment Comment"
 FIN_BOX
 BOX
 wx:ListCtrl:Box17
 ISEXEC:FALSE
 171.110680:-216.008380:-900.000000
-203.535680:-226.008380:-900.000000
+234.830680:-226.008380:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box18
@@ -197,8 +197,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box29
 ISEXEC:FALSE
-54.120231:-69.645684:-900.000000
-93.845231:-79.645684:-900.000000
+57.326423:-81.325384:-900.000000
+97.051423:-91.325384:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box30
@@ -266,30 +266,40 @@ BOX
 std:ConcatStrings:Box40
 ISEXEC:FALSE
 -31.617964:-54.154980:-900.000000
-39.080000:-64.154980:-900.000000
+8.107036:-64.154980:-900.000000
 FIN_BOX
 BOX
 std:FilesFromDirectory:Box43
 ISEXEC:FALSE
 -21.837764:-71.665433:-900.000000
-26.760000:-81.665433:-900.000000
+22.037236:-81.665433:-900.000000
 PORT
 Type:"1"
 FIN_BOX
-CONNECTIONS:67
+BOX
+std:ConcatStrings:Box42
+ISEXEC:FALSE
+123.643686:-58.769955:-900.000000
+163.368686:-68.769955:-900.000000
+PORT
+In3:"/Step_Comment.txt  "
+FIN_BOX
+BOX
+wx:OutputText:Box44
+ISEXEC:FALSE
+-92.783648:-85.393719:-900.000000
+-56.008648:-95.393719:-900.000000
+PORT
+Title:"Core"
+FIN_BOX
+CONNECTIONS:72
 CONNECTION
 BaseDir:BaseDir:Box03:In
 NumberOfControlPoints:0
 CONNECTION
-Box04:Widget:Box06:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box06:Widget:Box02:Widget2
 NumberOfControlPoints:0
 CONNECTION
-Box08:Widget:Box06:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box09:Widget:Box08:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -478,4 +488,25 @@ NumberOfControlPoints:0
 CONNECTION
 Box05:BoxChange:Box15:BoxExecute
 NumberOfControlPoints:0
+CONNECTION
+Box42:Out:Box29:In7
+NumberOfControlPoints:0
+CONNECTION
+Box24:Out:Box42:In2
+NumberOfControlPoints:0
+CONNECTION
+Box13:Out:Box42:In1
+NumberOfControlPoints:0
+CONNECTION
+Box21:Out:Box44:In
+NumberOfControlPoints:0
+CONNECTION
+Box04:Widget:Box06:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box44:Widget:Box06:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box08:Widget:Box06:Widget6
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbs b/appli/template_creaPatientsSystem/scripts/Report.bbs
index 2293b0d8c175784d64fc57634f1b7c9a0017d286..814e459f09faf85312af5e3a7f802a639929b9cb 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbs
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbs
@@ -17,7 +17,7 @@ description "Description ??"
 category "<VOID>"
 
 new wx:LayoutSplit Box02
-  set Box02.Proportion "90"
+  set Box02.Proportion "80"
   set Box02.WinWidth "1000"
 
 new std:MagicBox Box03
@@ -47,8 +47,8 @@ new std:ConcatStrings Box13
 new wx:OutputText Box14
 
 new creaMiniTools:CreateReport01 Box15
-  set Box15.LstTitles1 "+            Step01         Step02                Step03  Step04       Step05     Step06  General    Scientific  Informatic"
-  set Box15.LstTitles2 "Patient Insert_Data InitialParameters  Filter      Correction Validation PushDB Comment Comment Comment"
+  set Box15.LstTitles1 "+            Step01         Step02                Step03  Step04       Step05     Step06  Step           General    Scientific  Informatic"
+  set Box15.LstTitles2 "Patient Insert_Data InitialParameters  Filter      Correction Validation PushDB Comment  Comment Comment Comment"
 
 new wx:ListCtrl Box17
 
@@ -111,13 +111,15 @@ new std:ConcatStrings Box40
 new std:FilesFromDirectory Box43
   set Box43.Type "1"
 
+new std:ConcatStrings Box42
+  set Box42.In3 "/Step_Comment.txt  "
 
+new wx:OutputText Box44
+  set Box44.Title "Core"
 
-connect Box04.Widget Box06.Widget1
 
-connect Box06.Widget Box02.Widget2
 
-connect Box08.Widget Box06.Widget2
+connect Box06.Widget Box02.Widget2
 
 connect Box09.Widget Box08.Widget1
 
@@ -244,6 +246,20 @@ connect Box05.BoxChange Box17.BoxExecute
 
 connect Box05.BoxChange Box15.BoxExecute
 
+connect Box42.Out Box29.In7
+
+connect Box24.Out Box42.In2
+
+connect Box13.Out Box42.In1
+
+connect Box21.Out Box44.In
+
+connect Box04.Widget Box06.Widget4
+
+connect Box44.Widget Box06.Widget2
+
+connect Box08.Widget Box06.Widget6
+
 
 
 # Complex input ports

diff --git a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
index 385ac657bf7f76ee3efcbda47046db5228e6f096..cd2250cf18887ee4b30d3eaf52bc33f5c6f16c5a 100644 (file)
--- a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
+++ b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
@@ -142,27 +142,9 @@ void CreateReport01::Process()
                 pLstOut[id]->push_back( " " );
                 pLstOut[id]->push_back( " " );
                 pLstOut[id]->push_back( " " );
-
-                /*
-                fscanf(ff,"%s ",tmpTitle);                 // User
-                fscanf(ff,"%s ",tmpValue);                 //
-                pLstOut[id]->push_back( tmpValue );
-                fscanf(ff,"%s ",tmpTitle);                 // State
-                fscanf(ff,"%s ",tmpValue);                 //
-                pLstOut[id]->push_back( tmpValue );
-                fscanf(ff,"%s ",tmpTitle);                 // Date
-                fscanf(ff,"%s ",tmpValue);                 //
-                pLstOut[id]->push_back( tmpValue );
-                fscanf(ff,"%s ",tmpTitle);                 // Time
-                fscanf(ff,"%s ",tmpValue);                 //
-                pLstOut[id]->push_back( tmpValue );
-                pLstOut[id]->push_back( " " );
-                 
-                */
-                
                 fclose(ff);
             } else {
-                pLstOut[id]->push_back( "Error file name" );
+                pLstOut[id]->push_back( " " );
                 pLstOut[id]->push_back( " " );
                 pLstOut[id]->push_back( " " );
                 pLstOut[id]->push_back( " " );