3421 template_creaPatientsSystem

diff --git a/appli/template_creaPatientsSystem/.DS_Store b/appli/template_creaPatientsSystem/.DS_Store
index 70f4d952bc3b27d467072c251b8166c359b00f9a..dec77e85e3b6f460c1a24159d74e92fcb542a25e 100644 (file)
Binary files a/appli/template_creaPatientsSystem/.DS_Store and b/appli/template_creaPatientsSystem/.DS_Store differ

diff --git a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbg b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbg
index 86b8edebac7f22fe39eed75844ba6de5871cef14..343fcf7d60e05d8870709c0101e6de6d4b93eb84 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbg
@@ -291,8 +291,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box43
 ISEXEC:FALSE
-263.147717:-126.675242:-900.000000
-302.872717:-136.675242:-900.000000
+268.811199:-159.323550:-900.000000
+308.536199:-169.323550:-900.000000
 PORT
 In2:"/Step01_Insert_Data.txt"
 FIN_BOX
@@ -448,9 +448,9 @@ CONNECTION
 Box17:Out:Box43:In1
 NumberOfControlPoints:0
 CONNECTION
-Box43:Out:Box42:FileState
+Box41:Out:Box42:User
 NumberOfControlPoints:0
 CONNECTION
-Box41:Out:Box42:User
+Box43:Out:Box42:Filename
 NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs
index 58f7adb0d8c89326ae26bbb28775e264a28a0a18..ed47a911456644b2590032a8f62e3b545aac45f0 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs
@@ -221,10 +221,10 @@ connect Box29.BoxChange Box33.In9
 
 connect Box17.Out Box43.In1
 
-connect Box43.Out Box42.FileState
-
 connect Box41.Out Box42.User
 
+connect Box43.Out Box42.Filename
+
 
 
 # Complex input ports

diff --git a/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbg b/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbg
index 36350a4825d31a11b98806d82189feeb82f65a5f..eae436943f43708fda078da765e918d62306286d 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00200_InitialParameters.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbg
 # ----------------------------------
 
 APP_START
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BaseDir
 -91.690455:72.272902:-900.000000
@@ -21,7 +21,11 @@ COMPLEX_PORT
 CoreID
 42.320546:69.785207:-900.000000
 FIN_COMPLEX_PORT
-BOXES:31
+COMPLEX_PORT
+creaUser
+121.475124:68.037715:-900.000000
+FIN_COMPLEX_PORT
+BOXES:34
 BOX
 std:ConcatStrings:Box01
 ISEXEC:FALSE
@@ -85,8 +89,8 @@ FIN_BOX
 BOX
 std:ReplaceCleanString:Box11
 ISEXEC:FALSE
-7.654345:4.973777:-900.000000
-53.204345:-5.026223:-900.000000
+12.825178:1.871277:-900.000000
+58.375178:-8.128723:-900.000000
 PORT
 Search:"<CORE>"
 FIN_BOX
@@ -146,7 +150,7 @@ Upper:"10000"
 FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box18
-ISEXEC:TRUE
+ISEXEC:FALSE
 -46.828520:-202.703694:-900.000000
 23.051480:-212.703694:-900.000000
 PORT
@@ -158,7 +162,7 @@ ISEXEC:FALSE
 46.873920:-180.707139:-900.000000
 89.648920:-190.707139:-900.000000
 PORT
-Label:"Save & Exit"
+Label:"Save and Close"
 FIN_BOX
 BOX
 std:MultipleInputs:Box20
@@ -169,8 +173,8 @@ FIN_BOX
 BOX
 std:Exit:Box22
 ISEXEC:FALSE
-120.564338:-245.948130:-900.000000
-150.139338:-255.948130:-900.000000
+144.756940:-266.386708:-900.000000
+174.331940:-276.386708:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box23
@@ -178,7 +182,7 @@ ISEXEC:FALSE
 146.580055:-57.123511:-900.000000
 186.305055:-67.123511:-900.000000
 PORT
-In2:"/InitialValues.txt"
+In2:"/InitialParameters.txt"
 FIN_BOX
 BOX
 std:StringWriter:Box24
@@ -256,7 +260,29 @@ ISEXEC:FALSE
 PORT
 I:"1"
 FIN_BOX
-CONNECTIONS:44
+BOX
+creaMiniTools:WriteStatePatientSystem:Box35
+ISEXEC:FALSE
+112.112275:-252.739816:-900.000000
+161.512275:-262.739816:-900.000000
+PORT
+State:"Finish"
+FIN_BOX
+BOX
+std:ConcatStrings:Box36
+ISEXEC:FALSE
+218.846271:-56.454851:-900.000000
+258.571271:-66.454851:-900.000000
+PORT
+In2:"/Step02_InitialParameters.txt"
+FIN_BOX
+BOX
+std:MagicBox:Box37
+ISEXEC:FALSE
+116.821283:43.694547:-900.000000
+152.896283:33.694547:-900.000000
+FIN_BOX
+CONNECTIONS:49
 CONNECTION
 BaseDir:BaseDir:Box01:In1
 NumberOfControlPoints:0
@@ -389,4 +415,19 @@ NumberOfControlPoints:0
 CONNECTION
 Box34:Out:Box16:Max
 NumberOfControlPoints:0
+CONNECTION
+Box35:boxChange:Box20:In4
+NumberOfControlPoints:0
+CONNECTION
+Box29:Out:Box36:In1
+NumberOfControlPoints:0
+CONNECTION
+creaUser:creaUser:Box37:In
+NumberOfControlPoints:0
+CONNECTION
+Box37:Out:Box35:User
+NumberOfControlPoints:0
+CONNECTION
+Box36:Out:Box35:Filename
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbs b/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbs
index fa5ba55ae0b8e7e981416e04f3cc448ce850dae8..1a188cca307c56f1c06ae70e32f50777b6004292 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00200_InitialParameters.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00200_InitialParameters.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -13,6 +13,7 @@ include wx
 include creaVtk
 include vtk
 include creaMaracasVisu
+include creaMiniTools
 
 author "Author ??"
 description "Description ??"
@@ -67,14 +68,14 @@ new creaMaracasVisu:ColorLayerImageView Box18
   set Box18.TypeControlsInterface "2"
 
 new wx:CommandButton Box19
-  set Box19.Label "Save & Exit"
+  set Box19.Label "Save and Close"
 
 new std:MultipleInputs Box20
 
 new std:Exit Box22
 
 new std:ConcatStrings Box23
-  set Box23.In2 "/InitialValues.txt"
+  set Box23.In2 "/InitialParameters.txt"
 
 new std:StringWriter Box24
 
@@ -104,6 +105,14 @@ new vtk:ImageVtkProperties Box33
 new std:GetVectorDoubleElement Box34
   set Box34.I "1"
 
+new creaMiniTools:WriteStatePatientSystem Box35
+  set Box35.State "Finish"
+
+new std:ConcatStrings Box36
+  set Box36.In2 "/Step02_InitialParameters.txt"
+
+new std:MagicBox Box37
+
 
 
 
@@ -190,12 +199,21 @@ connect Box33.MinMax Box34.In
 
 connect Box34.Out Box16.Max
 
+connect Box35.boxChange Box20.In4
+
+connect Box29.Out Box36.In1
+
+
+connect Box37.Out Box35.User
+
+connect Box36.Out Box35.Filename
+
 
 
 # Complex input ports
 input BaseDir Box01.In1 " "
 input PatientID Box02.In1 " "
 input CoreID Box10.In1 " "
+input creaUser Box37.In " "
 exec Box05
 exec Box15
-exec Box18

diff --git a/appli/template_creaPatientsSystem/scripts/00300_Filter.bbg b/appli/template_creaPatientsSystem/scripts/00300_Filter.bbg
index 1fc2522fc92133cdc1099a129c28320949d05826..c39a38f7cb97e9832177f08dc1277f36113429e6 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00300_Filter.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00300_Filter.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00300_Filter.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00300_Filter.bbg
 # ----------------------------------
 
 APP_START
@@ -8,20 +8,24 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BaseDir
--91.690455:72.272902:-900.000000
+-103.845220:70.725932:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 PatientID
-3.380993:69.680090:-900.000000
+11.115844:69.238099:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 CoreID
-42.320546:69.785207:-900.000000
+68.177047:70.669190:-900.000000
 FIN_COMPLEX_PORT
-BOXES:17
+COMPLEX_PORT
+creaUser
+138.249751:72.945953:-900.000000
+FIN_COMPLEX_PORT
+BOXES:18
 BOX
 std:ConcatStrings:Box01
 ISEXEC:FALSE
@@ -38,19 +42,19 @@ BOX
 wx:LayoutLine:Box04
 ISEXEC:FALSE
 -37.138798:-270.209598:-900.000000
-20.421202:-280.209598:-900.000000
+57.560000:-280.209598:-900.000000
 FIN_BOX
 BOX
 creaVtk:OutputWindow:Box05
 ISEXEC:TRUE
 -96.112314:-300.405293:-900.000000
--55.512314:-310.405293:-900.000000
+8.280000:-310.405293:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box06
 ISEXEC:FALSE
--49.168998:48.345830:-900.000000
--9.443998:38.345830:-900.000000
+-49.975883:48.345830:-900.000000
+-10.250883:38.345830:-900.000000
 PORT
 In1:"<CORE>/davila/00100_OriginalImages/Test_01/<PATIENT>/Condition_01"
 FIN_BOX
@@ -58,7 +62,7 @@ BOX
 wx:OutputText:Box07
 ISEXEC:FALSE
 -108.582946:-120.802608:-900.000000
--71.807946:-130.802608:-900.000000
+32.920000:-130.802608:-900.000000
 PORT
 Title:"Patient "
 FIN_BOX
@@ -81,8 +85,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box10
 ISEXEC:FALSE
-56.762632:42.006833:-900.000000
-96.487632:32.006833:-900.000000
+61.872901:41.737871:-900.000000
+101.597901:31.737871:-900.000000
 FIN_BOX
 BOX
 std:ReplaceCleanString:Box11
@@ -116,7 +120,7 @@ BOX
 wx:LayoutLine:Box35
 ISEXEC:TRUE
 -25.243909:-300.804300:-900.000000
-32.316091:-310.804300:-900.000000
+57.560000:-310.804300:-900.000000
 PORT
 WinHeight:"300"
 PORT
@@ -137,6 +141,8 @@ PORT
 In5:"  "
 PORT
 In7:"  "
+PORT
+In9:"  "
 FIN_BOX
 BOX
 std:ExecSystemCommand:Box37
@@ -150,7 +156,13 @@ ISEXEC:FALSE
 -4.647886:-240.897954:-900.000000
 34.652114:-250.897954:-900.000000
 FIN_BOX
-CONNECTIONS:21
+BOX
+std:MagicBox:Box19
+ISEXEC:FALSE
+129.908412:36.982208:-900.000000
+165.983412:26.982208:-900.000000
+FIN_BOX
+CONNECTIONS:23
 CONNECTION
 BaseDir:BaseDir:Box01:In1
 NumberOfControlPoints:0
@@ -214,4 +226,10 @@ NumberOfControlPoints:0
 CONNECTION
 Box18:Widget:Box04:Widget4
 NumberOfControlPoints:0
+CONNECTION
+creaUser:creaUser:Box19:In
+NumberOfControlPoints:0
+CONNECTION
+Box19:Out:Box36:In8
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00300_Filter.bbs b/appli/template_creaPatientsSystem/scripts/00300_Filter.bbs
index d698dd8d06f2e9fa31fd0352b3dbc764f531d7cb..57f66b442146feb781cee2d032a27fe2ce45cb9c 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00300_Filter.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00300_Filter.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00300_Filter.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00300_Filter.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -58,11 +58,14 @@ new std:ConcatStrings Box36
   set Box36.In3 "  "
   set Box36.In5 "  "
   set Box36.In7 "  "
+  set Box36.In9 "  "
 
 new std:ExecSystemCommand Box37
 
 new wx:LayoutCenter Box18
 
+new std:MagicBox Box19
+
 
 
 
@@ -104,10 +107,14 @@ connect Box33.Widget Box18.Widget2
 connect Box18.Widget Box04.Widget4
 
 
+connect Box19.Out Box36.In8
+
+
 
 # Complex input ports
 input BaseDir Box01.In1 " "
 input PatientID Box02.In1 " "
 input CoreID Box10.In1 " "
+input creaUser Box19.In " "
 exec Box05
 exec Box35

diff --git a/appli/template_creaPatientsSystem/scripts/00301_Filter.sh b/appli/template_creaPatientsSystem/scripts/00301_Filter.sh
index 648a84fd0c4835b83d3315b9ee39e319b16610c7..59a526e24844542451d99b900a022157889faa03 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00301_Filter.sh
+++ b/appli/template_creaPatientsSystem/scripts/00301_Filter.sh
@@ -1,10 +1,11 @@
 BASEDIR=$1
 CORE=$2
 PATIENTID=$3
+CREAUSER=$4
 
 InImage=$BASEDIR/results/$CORE/davila/00100_OriginalImages/Test_01/$PATIENTID/Condition_01/image.mha
-InitialValues=$BASEDIR/results/$CORE/davila/00200_InitialParameters/Test_01/$PATIENTID/Condition_01/InitialValues.txt
+InitialValues=$BASEDIR/results/$CORE/davila/00200_InitialParameters/Test_01/$PATIENTID/Condition_01/InitialParameters.txt
 OutImage=$BASEDIR/results/$CORE/davila/00300_Filter/Test_01/$PATIENTID/Condition_01/image.mha
 
-bbi 00302_Filter.bbs InImage=$InImage  InitialValues=$InitialValues OutImage=$OutImage
+bbi 00302_Filter.bbs InImage=$InImage  InitialValues=$InitialValues OutImage=$OutImage creaUser=$CREAUSER
 

diff --git a/appli/template_creaPatientsSystem/scripts/00302_Filter.bbg b/appli/template_creaPatientsSystem/scripts/00302_Filter.bbg
index 7879ec3981f9398e49481788e12c57e2f5994606..060886db39337c11f043a2c2f29e78b65d109e9c 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00302_Filter.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00302_Filter.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00302_Filter.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00302_Filter.bbg
 # ----------------------------------
 
 APP_START
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 InImage
 -51.602770:142.004681:-900.000000
@@ -19,9 +19,13 @@ OutImage
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 InitialValues
-21.813812:139.687198:-900.000000
+8.333072:142.118151:-900.000000
 FIN_COMPLEX_PORT
-BOXES:24
+COMPLEX_PORT
+creaUser
+148.163932:139.650870:-900.000000
+FIN_COMPLEX_PORT
+BOXES:27
 BOX
 creaVtk:OutputWindow:Box00
 ISEXEC:TRUE
@@ -31,20 +35,20 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box01
 ISEXEC:FALSE
--48.273945:112.233926:-900.000000
--8.548945:102.233926:-900.000000
+-58.218753:111.570939:-900.000000
+-18.493753:101.570939:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box02
 ISEXEC:FALSE
-9.382548:110.178455:-900.000000
-49.107548:100.178455:-900.000000
+2.531680:111.283434:-900.000000
+42.256680:101.283434:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box03
 ISEXEC:FALSE
-58.699353:110.275303:-900.000000
-98.424353:100.275303:-900.000000
+64.445242:110.496299:-900.000000
+104.170242:100.496299:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box05
@@ -83,8 +87,8 @@ FIN_BOX
 BOX
 vtk:MetaImageReader:Box10
 ISEXEC:FALSE
-42.465463:-0.982777:-900.000000
-87.140463:-10.982777:-900.000000
+39.371523:20.674805:-900.000000
+84.046523:10.674805:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box11
@@ -101,8 +105,8 @@ FIN_BOX
 BOX
 creaVtk:ImageThreshold:Box13
 ISEXEC:FALSE
-97.463754:-21.187773:-900.000000
-139.263754:-31.187773:-900.000000
+96.579771:-13.894914:-900.000000
+138.379771:-23.894914:-900.000000
 PORT
 InValue:"255"
 PORT
@@ -115,8 +119,8 @@ FIN_BOX
 BOX
 std:SplitFilePathVector:Box14
 ISEXEC:FALSE
-130.549967:55.894815:-900.000000
-174.699967:45.894815:-900.000000
+142.863944:60.093734:-900.000000
+187.013944:50.093734:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box15
@@ -149,20 +153,20 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box19
 ISEXEC:TRUE
-196.758891:-112.171249:-900.000000
-236.458891:-122.171249:-900.000000
+230.782523:-147.082454:-900.000000
+270.482523:-157.082454:-900.000000
 FIN_BOX
 BOX
 std:Exit:Box20
 ISEXEC:FALSE
-332.136297:-64.555299:-900.000000
-361.711297:-74.555299:-900.000000
+285.771613:-131.703599:-900.000000
+315.346613:-141.703599:-900.000000
 FIN_BOX
 BOX
 std:ReadColumnsString:Box23
 ISEXEC:FALSE
-205.261780:56.017309:-900.000000
-250.411780:46.017309:-900.000000
+211.228665:57.785275:-900.000000
+256.378665:47.785275:-900.000000
 PORT
 Dimension:"2"
 FIN_BOX
@@ -185,12 +189,34 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box26
 ISEXEC:FALSE
-223.367162:-17.129465:-900.000000
-263.092162:-27.129465:-900.000000
+213.201358:-18.897431:-900.000000
+252.926358:-28.897431:-900.000000
 PORT
 In2:".noCorrection.mha"
 FIN_BOX
-CONNECTIONS:32
+BOX
+creaMiniTools:WriteStatePatientSystem:Box27
+ISEXEC:FALSE
+305.210224:-68.520855:-900.000000
+354.610224:-78.520855:-900.000000
+PORT
+State:"Finish"
+FIN_BOX
+BOX
+std:ConcatStrings:Box29
+ISEXEC:FALSE
+299.885378:32.829819:-900.000000
+339.610378:22.829819:-900.000000
+PORT
+In2:"/Step03_Filter.txt"
+FIN_BOX
+BOX
+std:ConcatStrings:Box32
+ISEXEC:FALSE
+140.208813:111.649199:-900.000000
+179.933813:101.649199:-900.000000
+FIN_BOX
+CONNECTIONS:37
 CONNECTION
 InImage:InImage:Box01:In1
 NumberOfControlPoints:0
@@ -273,9 +299,6 @@ CONNECTION
 Box24:Out:Box13:Lower
 NumberOfControlPoints:0
 CONNECTION
-Box20:BoxChange:Box19:In9
-NumberOfControlPoints:0
-CONNECTION
 Box13:Out:Box25:In
 NumberOfControlPoints:0
 CONNECTION
@@ -287,4 +310,22 @@ NumberOfControlPoints:0
 CONNECTION
 Box26:Out:Box25:Filename
 NumberOfControlPoints:0
+CONNECTION
+Box27:boxChange:Box19:In8
+NumberOfControlPoints:0
+CONNECTION
+Box14:Path:Box29:In1
+NumberOfControlPoints:0
+CONNECTION
+Box29:Out:Box27:Filename
+NumberOfControlPoints:0
+CONNECTION
+creaUser:creaUser:Box32:In1
+NumberOfControlPoints:0
+CONNECTION
+Box32:Out:Box27:User
+NumberOfControlPoints:0
+CONNECTION
+Box20:BoxChange:Box19:In9
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00302_Filter.bbs b/appli/template_creaPatientsSystem/scripts/00302_Filter.bbs
index 33cc851c13d33028c8b2cca9d281c4e75e433d40..53110de0f91e115dca73701e7ff8e2ba2ad261fb 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00302_Filter.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00302_Filter.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00302_Filter.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00302_Filter.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -13,6 +13,7 @@ include std
 include wx
 include creaMaracasVisu
 include vtk
+include creaMiniTools
 
 author "Author ??"
 description "Description ??"
@@ -78,6 +79,14 @@ new vtk:MetaImageWriter Box25
 new std:ConcatStrings Box26
   set Box26.In2 ".noCorrection.mha"
 
+new creaMiniTools:WriteStatePatientSystem Box27
+  set Box27.State "Finish"
+
+new std:ConcatStrings Box29
+  set Box29.In2 "/Step03_Filter.txt"
+
+new std:ConcatStrings Box32
+
 
 
 
@@ -130,8 +139,6 @@ connect Box16.Widget Box07.Widget7
 
 connect Box24.Out Box13.Lower
 
-connect Box20.BoxChange Box19.In9
-
 connect Box13.Out Box25.In
 
 connect Box03.Out Box26.In1
@@ -140,11 +147,23 @@ connect Box25.BoxChange Box19.In6
 
 connect Box26.Out Box25.Filename
 
+connect Box27.boxChange Box19.In8
+
+connect Box14.Path Box29.In1
+
+connect Box29.Out Box27.Filename
+
+
+connect Box32.Out Box27.User
+
+connect Box20.BoxChange Box19.In9
+
 
 
 # Complex input ports
 input InImage Box01.In1 " "
 input OutImage Box03.In1 " "
 input InitialValues Box02.In1 " "
+input creaUser Box32.In1 " "
 exec Box00
 exec Box19

diff --git a/appli/template_creaPatientsSystem/scripts/00400_Correction.bbg b/appli/template_creaPatientsSystem/scripts/00400_Correction.bbg
index 2e52307aa707b753ec5f0cd7b5d146c883dbe1dc..f7a50ee6a2592836d3f6f083b1fc4f4df447100f 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00400_Correction.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00400_Correction.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00400_Correction.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00400_Correction.bbg
 # ----------------------------------
 
 APP_START
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BaseDir
 -79.627442:294.808491:-900.000000
@@ -21,12 +21,16 @@ COMPLEX_PORT
 CoreID
 -3.148596:299.252907:-900.000000
 FIN_COMPLEX_PORT
-BOXES:56
+COMPLEX_PORT
+creaUser
+97.775473:300.758395:-900.000000
+FIN_COMPLEX_PORT
+BOXES:59
 BOX
 creaMaracasVisu:ManualPaint2:Box00
 ISEXEC:FALSE
 46.854804:-104.452660:-900.000000
-86.354804:-114.452660:-900.000000
+95.174804:-114.452660:-900.000000
 PORT
 Active_ManualPaint_Model:"false         true       true      true"
 PORT
@@ -48,13 +52,13 @@ BOX
 creaMaracasVisu:ViewerNV:Box02
 ISEXEC:FALSE
 67.119441:61.238445:-900.000000
-102.994441:51.238445:-900.000000
+130.839441:51.238445:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box03
 ISEXEC:FALSE
 -8.472998:-249.201404:-900.000000
-39.080000:-259.201404:-900.000000
+30.607002:-259.201404:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -67,14 +71,14 @@ FIN_BOX
 BOX
 creaVtk:OutputWindow:Box08
 ISEXEC:TRUE
--76.303689:-272.635744:-900.000000
-8.280000:-282.635744:-900.000000
+-70.431078:-276.550818:-900.000000
+-29.831078:-286.550818:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box09
 ISEXEC:TRUE
--17.812273:-276.451816:-900.000000
-57.560000:-286.451816:-900.000000
+-14.288706:-276.060309:-900.000000
+43.271294:-286.060309:-900.000000
 PORT
 WinTitle:"00400_Correction.bbs"
 FIN_BOX
@@ -89,8 +93,8 @@ FIN_BOX
 BOX
 vtk:PolyDataToActor:Box14
 ISEXEC:FALSE
--85.068729:-97.742183:-900.000000
--39.828729:-107.742183:-900.000000
+-64.710343:-105.572331:-900.000000
+-19.470343:-115.572331:-900.000000
 PORT
 Colour:"1 1 1"
 FIN_BOX
@@ -114,7 +118,7 @@ BOX
 wx:LayoutLine:Box17
 ISEXEC:FALSE
 -3.274561:-215.194423:-900.000000
-57.560000:-225.194423:-900.000000
+54.285439:-225.194423:-900.000000
 FIN_BOX
 BOX
 std:Div:Box18
@@ -128,13 +132,13 @@ BOX
 std:MultipleInputs:Box19
 ISEXEC:FALSE
 -51.953901:-16.677330:-900.000000
-36.000000:-26.677330:-900.000000
+-12.253901:-26.677330:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box20
 ISEXEC:FALSE
--62.272523:-134.720633:-900.000000
-14.440000:-144.720633:-900.000000
+-54.442375:-133.937618:-900.000000
+-14.117375:-143.937618:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -194,7 +198,7 @@ BOX
 wx:LayoutLine:Box29
 ISEXEC:FALSE
 -186.545026:-17.256818:-900.000000
-57.560000:-27.256818:-900.000000
+-128.985026:-27.256818:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -216,7 +220,7 @@ BOX
 wx:LayoutLine:Box31
 ISEXEC:FALSE
 -2.106719:-71.020418:-900.000000
-57.560000:-81.020418:-900.000000
+55.453281:-81.020418:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -224,7 +228,7 @@ BOX
 creaMaracasVisu:SliderMinMax:Box35
 ISEXEC:FALSE
 -56.072022:15.097873:-900.000000
-54.480000:5.097873:-900.000000
+-1.592022:5.097873:-900.000000
 PORT
 InMinShow:"100"
 PORT
@@ -276,7 +280,7 @@ BOX
 std:ConcatStrings:Box41
 ISEXEC:FALSE
 -52.848925:192.313465:-900.000000
-39.080000:182.313465:-900.000000
+-13.123925:182.313465:-900.000000
 PORT
 In2:"/results/"
 FIN_BOX
@@ -396,7 +400,7 @@ BOX
 std:ConcatStrings:Box55
 ISEXEC:FALSE
 -291.286990:-32.198161:-900.000000
-39.080000:-42.198161:-900.000000
+-251.561990:-42.198161:-900.000000
 PORT
 In1:"-1"
 PORT
@@ -418,35 +422,35 @@ BOX
 wx:CommandButton:Box58
 ISEXEC:FALSE
 -294.644207:-175.245123:-900.000000
-36.000000:-185.245123:-900.000000
+-251.869207:-185.245123:-900.000000
 PORT
 Label:"Save & Exit"
 FIN_BOX
 BOX
 std:MultipleInputs:Box59
 ISEXEC:FALSE
--177.454498:-243.545502:-900.000000
-36.000000:-253.545502:-900.000000
+-182.544094:-263.120873:-900.000000
+-142.844094:-273.120873:-900.000000
 FIN_BOX
 BOX
 std:Exit:Box60
 ISEXEC:FALSE
--131.357970:-225.758003:-900.000000
-11.360000:-235.758003:-900.000000
+-113.505232:-223.526411:-900.000000
+-83.930232:-233.526411:-900.000000
 FIN_BOX
 BOX
 vtk:MetaImageWriter:Box61
 ISEXEC:FALSE
 -238.026726:-175.002591:-900.000000
-20.600000:-185.002591:-900.000000
+-194.901726:-185.002591:-900.000000
 PORT
 Compression:"true"
 FIN_BOX
 BOX
 wx:OutputText:Box62
 ISEXEC:FALSE
--22.624147:-116.453860:-900.000000
-32.920000:-126.453860:-900.000000
+-9.704402:-133.680186:-900.000000
+27.070598:-143.680186:-900.000000
 PORT
 Title:"Patient"
 FIN_BOX
@@ -464,7 +468,7 @@ BOX
 creaMaracasVisu:ColorLayerImageView:Box64
 ISEXEC:FALSE
 15.210185:-31.084989:-900.000000
-69.880000:-41.084989:-900.000000
+85.090185:-41.084989:-900.000000
 PORT
 ColorBarPosition:"-100 -100"
 PORT
@@ -486,7 +490,7 @@ BOX
 wx:LayoutLine:Box65
 ISEXEC:FALSE
 17.893281:-51.020418:-900.000000
-57.560000:-61.020418:-900.000000
+75.453281:-61.020418:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box66
@@ -500,15 +504,15 @@ BOX
 vtk:MetaImageWriter:Box67
 ISEXEC:FALSE
 -173.001652:-174.460842:-900.000000
-20.600000:-184.460842:-900.000000
+-129.876652:-184.460842:-900.000000
 PORT
 Compression:"true"
 FIN_BOX
 BOX
 creaVtk:ImageThreshold:Box68
 ISEXEC:FALSE
--110.316964:-151.356194:-900.000000
-23.680000:-161.356194:-900.000000
+-114.943870:-143.170130:-900.000000
+-73.143870:-153.170130:-900.000000
 PORT
 InValue:"255"
 PORT
@@ -518,7 +522,29 @@ OutValue:"0"
 PORT
 Upper:"256"
 FIN_BOX
-CONNECTIONS:98
+BOX
+std:ConcatStrings:Box69
+ISEXEC:FALSE
+89.196598:272.061664:-900.000000
+128.921598:262.061664:-900.000000
+FIN_BOX
+BOX
+creaMiniTools:WriteStatePatientSystem:Box70
+ISEXEC:FALSE
+-113.577645:-173.756539:-900.000000
+-64.177645:-183.756539:-900.000000
+PORT
+State:"Finish"
+FIN_BOX
+BOX
+std:ConcatStrings:Box72
+ISEXEC:FALSE
+-31.922138:134.810865:-900.000000
+7.802862:124.810865:-900.000000
+PORT
+In2:"/Step04_Correction.txt"
+FIN_BOX
+CONNECTIONS:103
 CONNECTION
 Box02:Widget:Box03:Widget2
 NumberOfControlPoints:0
@@ -733,9 +759,6 @@ CONNECTION
 Box55:Out:Box00:SizeDistance_ManualPaint_Model
 NumberOfControlPoints:0
 CONNECTION
-Box60:BoxChange:Box59:In9
-NumberOfControlPoints:0
-CONNECTION
 Box61:BoxChange:Box59:In1
 NumberOfControlPoints:0
 CONNECTION
@@ -813,4 +836,22 @@ NumberOfControlPoints:0
 CONNECTION
 Box68:Out:Box67:In
 NumberOfControlPoints:0
+CONNECTION
+creaUser:creaUser:Box69:In1
+NumberOfControlPoints:0
+CONNECTION
+Box69:Out:Box70:User
+NumberOfControlPoints:0
+CONNECTION
+Box70:boxChange:Box59:In7
+NumberOfControlPoints:0
+CONNECTION
+Box72:Out:Box70:Filename
+NumberOfControlPoints:0
+CONNECTION
+Box46:Out:Box72:In1
+NumberOfControlPoints:0
+CONNECTION
+Box60:BoxChange:Box59:In9
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00400_Correction.bbs b/appli/template_creaPatientsSystem/scripts/00400_Correction.bbs
index 47eb9084fbb890a98539a136a283693d720dcb0b..edf4919f52305bf6941867da250828b5de836f22 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00400_Correction.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00400_Correction.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00400_Correction.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00400_Correction.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -13,6 +13,7 @@ include wx
 include vtk
 include creaVtk
 include std
+include creaMiniTools
 
 author "Author ??"
 description "Description ??"
@@ -210,6 +211,14 @@ new creaVtk:ImageThreshold Box68
   set Box68.OutValue "0"
   set Box68.Upper "256"
 
+new std:ConcatStrings Box69
+
+new creaMiniTools:WriteStatePatientSystem Box70
+  set Box70.State "Finish"
+
+new std:ConcatStrings Box72
+  set Box72.In2 "/Step04_Correction.txt"
+
 
 connect Box02.Widget Box03.Widget2
 
@@ -350,8 +359,6 @@ connect Box54.Out Box55.In7
 
 connect Box55.Out Box00.SizeDistance_ManualPaint_Model
 
-connect Box60.BoxChange Box59.In9
-
 connect Box61.BoxChange Box59.In1
 
 connect Box47.Out Box61.In
@@ -405,10 +412,22 @@ connect Box67.BoxChange Box59.In3
 connect Box68.Out Box67.In
 
 
+connect Box69.Out Box70.User
+
+connect Box70.boxChange Box59.In7
+
+connect Box72.Out Box70.Filename
+
+connect Box46.Out Box72.In1
+
+connect Box60.BoxChange Box59.In9
+
+
 
 # Complex input ports
 input BaseDir Box34.In1 " "
 input CoreID Box36.In1 " "
 input PatientID Box37.In1 " "
+input creaUser Box69.In1 " "
 exec Box08
 exec Box09

diff --git a/appli/template_creaPatientsSystem/scripts/00500_Validate.bbg b/appli/template_creaPatientsSystem/scripts/00500_Validate.bbg
index f5b0c677f821d9a64afcfc57896d34960cb64c9d..e7980e17c08160b94f00f70f0b5628d536f2f459 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00500_Validate.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00500_Validate.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00500_Validate.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00500_Validate.bbg
 # ----------------------------------
 
 APP_START
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BaseDir
 -79.627442:294.808491:-900.000000
@@ -21,12 +21,16 @@ COMPLEX_PORT
 CoreID
 -3.148596:299.252907:-900.000000
 FIN_COMPLEX_PORT
-BOXES:31
+COMPLEX_PORT
+creaUser
+223.890180:296.007259:-900.000000
+FIN_COMPLEX_PORT
+BOXES:34
 BOX
 creaMaracasVisu:ViewerNV:Box02
 ISEXEC:FALSE
-67.119441:61.238445:-900.000000
-130.839441:51.238445:-900.000000
+27.612783:66.221267:-900.000000
+91.332783:56.221267:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box03
@@ -81,8 +85,8 @@ FIN_BOX
 BOX
 std:Div:Box18
 ISEXEC:FALSE
--173.357758:-27.494515:-900.000000
--144.032758:-37.494515:-900.000000
+-113.057968:-22.788190:-900.000000
+-83.732968:-32.788190:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -177,16 +181,16 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box45
 ISEXEC:FALSE
-131.585916:142.131206:-900.000000
-171.310916:132.131206:-900.000000
+120.552525:143.554869:-900.000000
+160.277525:133.554869:-900.000000
 PORT
 In2:"/image.mha"
 FIN_BOX
 BOX
 std:ReplaceCleanString:Box46
 ISEXEC:FALSE
-128.866010:161.984810:-900.000000
-174.416010:151.984810:-900.000000
+134.204748:163.764389:-900.000000
+179.754748:153.764389:-900.000000
 PORT
 Replace:"00300_Filter"
 PORT
@@ -195,14 +199,14 @@ FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box47
 ISEXEC:FALSE
-126.258210:81.929630:-900.000000
-178.433210:71.929630:-900.000000
+117.360314:85.488788:-900.000000
+169.535314:75.488788:-900.000000
 FIN_BOX
 BOX
 vtk:MetaImageReader:Box48
 ISEXEC:FALSE
-132.109767:96.743451:-900.000000
-176.784767:86.743451:-900.000000
+120.720460:103.149936:-900.000000
+165.395460:93.149936:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box58
@@ -221,8 +225,8 @@ FIN_BOX
 BOX
 std:Exit:Box60
 ISEXEC:FALSE
--251.052988:-208.584370:-900.000000
--221.477988:-218.584370:-900.000000
+-210.312726:-217.585126:-900.000000
+-180.737726:-227.585126:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box62
@@ -235,8 +239,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box66
 ISEXEC:FALSE
-132.529543:121.572124:-900.000000
-172.254543:111.572124:-900.000000
+119.360657:122.639872:-900.000000
+159.085657:112.639872:-900.000000
 PORT
 In2:".final.mha"
 FIN_BOX
@@ -252,7 +256,29 @@ TypeControlsInterface:"2"
 PORT
 lstTransparenceBoundaries:"0"
 FIN_BOX
-CONNECTIONS:42
+BOX
+std:ConcatStrings:Box54
+ISEXEC:FALSE
+227.850819:270.599761:-900.000000
+267.575819:260.599761:-900.000000
+FIN_BOX
+BOX
+creaMiniTools:WriteStatePatientSystem:Box55
+ISEXEC:FALSE
+-271.291607:-217.833416:-900.000000
+-221.891607:-227.833416:-900.000000
+PORT
+State:"Finish"
+FIN_BOX
+BOX
+std:ConcatStrings:Box56
+ISEXEC:FALSE
+168.078644:144.558965:-900.000000
+207.803644:134.558965:-900.000000
+PORT
+In2:"/Step05_Validation.txt"
+FIN_BOX
+CONNECTIONS:47
 CONNECTION
 Box02:Widget:Box03:Widget2
 NumberOfControlPoints:0
@@ -379,4 +405,19 @@ NumberOfControlPoints:0
 CONNECTION
 Box69:OutOpacity:Box18:In1
 NumberOfControlPoints:0
+CONNECTION
+creaUser:creaUser:Box54:In1
+NumberOfControlPoints:0
+CONNECTION
+Box54:Out:Box55:User
+NumberOfControlPoints:0
+CONNECTION
+Box46:Out:Box56:In1
+NumberOfControlPoints:0
+CONNECTION
+Box56:Out:Box55:Filename
+NumberOfControlPoints:0
+CONNECTION
+Box55:boxChange:Box59:In2
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00500_Validate.bbs b/appli/template_creaPatientsSystem/scripts/00500_Validate.bbs
index 815ad6ddfdc6773c5a939c9b741441fc2d1cc6a4..f597d2b43583e6569ef675b23a55b7585b299015 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00500_Validate.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00500_Validate.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/00500_Validate.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00500_Validate.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -13,6 +13,7 @@ include wx
 include vtk
 include creaVtk
 include std
+include creaMiniTools
 
 author "Author ??"
 description "Description ??"
@@ -102,6 +103,14 @@ new creaMaracasVisu:ColorLayerImageView Box69
   set Box69.TypeControlsInterface "2"
   set Box69.lstTransparenceBoundaries "0"
 
+new std:ConcatStrings Box54
+
+new creaMiniTools:WriteStatePatientSystem Box55
+  set Box55.State "Finish"
+
+new std:ConcatStrings Box56
+  set Box56.In2 "/Step05_Validation.txt"
+
 
 connect Box02.Widget Box03.Widget2
 
@@ -185,10 +194,20 @@ connect Box69.Widget Box17.Widget5
 connect Box69.OutOpacity Box18.In1
 
 
+connect Box54.Out Box55.User
+
+connect Box46.Out Box56.In1
+
+connect Box56.Out Box55.Filename
+
+connect Box55.boxChange Box59.In2
+
+
 
 # Complex input ports
 input BaseDir Box34.In1 " "
 input CoreID Box36.In1 " "
 input PatientID Box37.In1 " "
+input creaUser Box54.In1 " "
 exec Box08
 exec Box09

diff --git a/appli/template_creaPatientsSystem/scripts/00600_PushData.bbg b/appli/template_creaPatientsSystem/scripts/00600_PushData.bbg
index 83a32c560544d0beeba89ef89ca14b4e19fe33bd..0edd25bbe0ece7f12f43d03efd0440adca0b4fda 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00600_PushData.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00600_PushData.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_creaGM/scripts/00600_PushData.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00600_PushData.bbg
 # ----------------------------------
 
 APP_START
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
-COMPLEXINPUTS:3
+COMPLEXINPUTS:4
 COMPLEX_PORT
 BaseDir
 42.707306:427.144102:-900.000000
@@ -21,7 +21,11 @@ COMPLEX_PORT
 PatientID
 224.766549:426.938901:-900.000000
 FIN_COMPLEX_PORT
-BOXES:54
+COMPLEX_PORT
+creaUser
+362.657647:422.219132:-900.000000
+FIN_COMPLEX_PORT
+BOXES:55
 BOX
 wx:CommandButton:Box01
 ISEXEC:FALSE
@@ -47,8 +51,8 @@ FIN_BOX
 BOX
 wx:LayoutCenter:Box06
 ISEXEC:FALSE
-19.164529:-38.156105:-900.000000
-58.464529:-48.156105:-900.000000
+-111.109565:-30.339659:-900.000000
+-71.809565:-40.339659:-900.000000
 PORT
 WinTitle:"With Proxy"
 FIN_BOX
@@ -69,8 +73,8 @@ FIN_BOX
 BOX
 std:ExecSystemCommand:Box08
 ISEXEC:FALSE
-295.116119:-227.942215:-900.000000
-343.416119:-237.942215:-900.000000
+323.589386:-197.689369:-900.000000
+371.889386:-207.689369:-900.000000
 FIN_BOX
 BOX
 std:Exit:Box09
@@ -87,8 +91,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box12
 ISEXEC:FALSE
-6.231283:-22.105122:-900.000000
-63.791283:-32.105122:-900.000000
+-108.409920:-3.866749:-900.000000
+-50.849920:-13.866749:-900.000000
 FIN_BOX
 BOX
 wx:InputText:Box13
@@ -109,8 +113,8 @@ FIN_BOX
 BOX
 wx:LayoutTab:Box15
 ISEXEC:FALSE
-7.496431:-126.475289:-900.000000
-65.056431:-136.475289:-900.000000
+-53.471845:-104.589241:-900.000000
+4.088155:-114.589241:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box17
@@ -143,8 +147,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box27
 ISEXEC:FALSE
-83.198444:-1.326259:-900.000000
-122.923444:-11.326259:-900.000000
+-36.653722:-3.931741:-900.000000
+3.071278:-13.931741:-900.000000
 PORT
 In1:" set https_proxy=https&&2P&&//"
 PORT
@@ -157,8 +161,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box30
 ISEXEC:FALSE
-29.779996:-176.534800:-900.000000
-69.504996:-186.534800:-900.000000
+23.005743:-155.169849:-900.000000
+62.730743:-165.169849:-900.000000
 PORT
 In1:"export  GIRDER_API_KEY=DJn22j9xJUMjcHeWLanPXRrHTqRpXd20UXtKaB9S  &&  "
 PORT
@@ -169,8 +173,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box32
 ISEXEC:FALSE
-143.031668:0.031704:-900.000000
-182.756668:-9.968296:-900.000000
+72.683657:-2.052682:-900.000000
+112.408657:-12.052682:-900.000000
 PORT
 In1:" upload "
 PORT
@@ -243,26 +247,18 @@ PORT
 Search:"\"
 FIN_BOX
 BOX
-std:StringWriter:Box47
-ISEXEC:FALSE
-359.317525:-245.699154:-900.000000
-401.477525:-255.699154:-900.000000
-PORT
-In0:"Push"
-FIN_BOX
-BOX
 std:ConcatStrings:Box48
 ISEXEC:FALSE
-167.208540:100.094828:-900.000000
-206.933540:90.094828:-900.000000
+283.467843:176.725251:-900.000000
+323.192843:166.725251:-900.000000
 PORT
-In2:"/Push.dat"
+In2:"/Step06_PushDB.txt"
 FIN_BOX
 BOX
 std:ConcatStrings:Box53
 ISEXEC:FALSE
-281.322643:377.404931:-900.000000
-321.047643:367.404931:-900.000000
+280.254895:365.303793:-900.000000
+319.979895:355.303793:-900.000000
 PORT
 In1:"/<CORE>/davila/<ALGO>/Test_01/<PATIENT>/Condition_01"
 FIN_BOX
@@ -339,16 +335,16 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box67
 ISEXEC:FALSE
-371.896257:262.524323:-900.000000
-411.621257:252.524323:-900.000000
+391.115712:282.811526:-900.000000
+430.840712:272.811526:-900.000000
 PORT
 In2:"/.tmp/"
 FIN_BOX
 BOX
 std:ExecSystemCommand:Box69
 ISEXEC:FALSE
-392.992554:-271.544834:-900.000000
-441.292554:-281.544834:-900.000000
+453.854162:-197.158424:-900.000000
+502.154162:-207.158424:-900.000000
 FIN_BOX
 BOX
 std:Configuration:Box74
@@ -359,8 +355,8 @@ FIN_BOX
 BOX
 std:StringSelect:Box76
 ISEXEC:FALSE
-32.421321:-156.494151:-900.000000
-74.581321:-166.494151:-900.000000
+1.155538:-123.665079:-900.000000
+43.315538:-133.665079:-900.000000
 PORT
 In0:"  "
 FIN_BOX
@@ -373,8 +369,8 @@ FIN_BOX
 BOX
 std:ReplaceString:Box78
 ISEXEC:FALSE
-311.362034:295.598605:-900.000000
-351.087034:285.598605:-900.000000
+298.193148:293.107194:-900.000000
+337.918148:283.107194:-900.000000
 PORT
 Replace:"00300_Filter"
 PORT
@@ -383,8 +379,8 @@ FIN_BOX
 BOX
 std:ReplaceString:Box79
 ISEXEC:FALSE
-193.046715:292.385528:-900.000000
-232.771715:282.385528:-900.000000
+190.911220:290.605949:-900.000000
+230.636220:280.605949:-900.000000
 PORT
 Replace:"00100_OriginalImages"
 PORT
@@ -427,8 +423,8 @@ FIN_BOX
 BOX
 std:StringSelect:Box94
 ISEXEC:FALSE
-398.198732:-139.945967:-900.000000
-440.358732:-149.945967:-900.000000
+457.636677:-121.438344:-900.000000
+499.796677:-131.438344:-900.000000
 PORT
 In0:"rm -rf "
 PORT
@@ -439,8 +435,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box95
 ISEXEC:FALSE
-458.783385:-192.617792:-900.000000
-498.508385:-202.617792:-900.000000
+505.408359:-157.738040:-900.000000
+545.133359:-167.738040:-900.000000
 PORT
 In2:"  "
 FIN_BOX
@@ -453,8 +449,8 @@ FIN_BOX
 BOX
 std:StringSelect:Box98
 ISEXEC:FALSE
-206.283375:-154.105974:-900.000000
-248.443375:-164.105974:-900.000000
+277.110626:-133.106940:-900.000000
+319.270626:-143.106940:-900.000000
 PORT
 In0:"source 00610_CreateTmp.sh"
 PORT
@@ -465,8 +461,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box99
 ISEXEC:FALSE
-243.820262:-178.824074:-900.000000
-283.545262:-188.824074:-900.000000
+239.193356:-171.705757:-900.000000
+278.918356:-181.705757:-900.000000
 PORT
 In2:"  "
 PORT
@@ -474,7 +470,21 @@ In4:"  "
 PORT
 In6:"  "
 FIN_BOX
-CONNECTIONS:75
+BOX
+std:ConcatStrings:Box88
+ISEXEC:FALSE
+355.539330:387.695296:-900.000000
+395.264330:377.695296:-900.000000
+FIN_BOX
+BOX
+creaMiniTools:WriteStatePatientSystem:Box89
+ISEXEC:FALSE
+385.079597:-196.828520:-900.000000
+434.479597:-206.828520:-900.000000
+PORT
+State:"Finish"
+FIN_BOX
+CONNECTIONS:77
 CONNECTION
 Box12:Widget:Box06:Widget2
 NumberOfControlPoints:0
@@ -512,9 +522,6 @@ CONNECTION
 Box40:Out:Box46:In
 NumberOfControlPoints:0
 CONNECTION
-Box48:Out:Box47:FileName
-NumberOfControlPoints:0
-CONNECTION
 BaseDir:BaseDir:Box11:In
 NumberOfControlPoints:0
 CONNECTION
@@ -584,9 +591,6 @@ CONNECTION
 Box08:BoxChange:Box63:In3
 NumberOfControlPoints:0
 CONNECTION
-Box47:BoxChange:Box63:In5
-NumberOfControlPoints:0
-CONNECTION
 Box09:BoxChange:Box63:In9
 NumberOfControlPoints:0
 CONNECTION
@@ -700,4 +704,16 @@ NumberOfControlPoints:0
 CONNECTION
 Box99:Out:Box97:In
 NumberOfControlPoints:0
+CONNECTION
+creaUser:creaUser:Box88:In1
+NumberOfControlPoints:0
+CONNECTION
+Box88:Out:Box89:User
+NumberOfControlPoints:0
+CONNECTION
+Box48:Out:Box89:Filename
+NumberOfControlPoints:0
+CONNECTION
+Box89:boxChange:Box63:In4
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/00600_PushData.bbs b/appli/template_creaPatientsSystem/scripts/00600_PushData.bbs
index d9d6673091dead04abb4b14554ccebb8628eb3eb..5816ee7b7ff9a6e3de7b73909778a48ad6dbf0ee 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00600_PushData.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00600_PushData.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_creaGM/scripts/00600_PushData.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/00600_PushData.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -11,6 +11,7 @@ include itkvtk
 include wx
 include creaVtk
 include std
+include creaMiniTools
 
 author "Author ??"
 description "Description ??"
@@ -100,11 +101,8 @@ new std:ReplaceString Box46
   set Box46.Replace " "
   set Box46.Search "\"
 
-new std:StringWriter Box47
-  set Box47.In0 "Push"
-
 new std:ConcatStrings Box48
-  set Box48.In2 "/Push.dat"
+  set Box48.In2 "/Step06_PushDB.txt"
 
 new std:ConcatStrings Box53
   set Box53.In1 "/<CORE>/davila/<ALGO>/Test_01/<PATIENT>/Condition_01"
@@ -188,6 +186,11 @@ new std:ConcatStrings Box99
   set Box99.In4 "  "
   set Box99.In6 "  "
 
+new std:ConcatStrings Box88
+
+new creaMiniTools:WriteStatePatientSystem Box89
+  set Box89.State "Finish"
+
 
 connect Box12.Widget Box06.Widget2
 
@@ -213,8 +216,6 @@ connect Box45.Out Box37.In
 
 connect Box40.Out Box46.In
 
-connect Box48.Out Box47.FileName
-
 
 
 
@@ -258,8 +259,6 @@ connect Box39.Out Box32.In2
 
 connect Box08.BoxChange Box63.In3
 
-connect Box47.BoxChange Box63.In5
-
 connect Box09.BoxChange Box63.In9
 
 connect Box11.Out Box67.In1
@@ -337,10 +336,18 @@ connect Box35.Out Box99.In7
 connect Box99.Out Box97.In
 
 
+connect Box88.Out Box89.User
+
+connect Box48.Out Box89.Filename
+
+connect Box89.boxChange Box63.In4
+
+
 
 # Complex input ports
 input BaseDir Box11.In " "
 input CoreID Box40.In " "
 input PatientID Box35.In " "
+input creaUser Box88.In1 " "
 exec Box05
 exec Box07

diff --git a/appli/template_creaPatientsSystem/scripts/Comments.bbg b/appli/template_creaPatientsSystem/scripts/Comments.bbg
index 306e8cc251c165ca1d10a5b74c0de10ac06b0ff7..4807dd134a0594a1084f9f6b2fcef17fd81a61c0 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Comments.bbg
+++ b/appli/template_creaPatientsSystem/scripts/Comments.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/Comments.bbg
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/Comments.bbg
 # ----------------------------------
 
 APP_START
@@ -21,7 +21,7 @@ COMPLEX_PORT
 CoreID
 138.987918:42.249773:-900.000000
 FIN_COMPLEX_PORT
-BOXES:19
+BOXES:29
 BOX
 std:ConcatStrings:Box15
 ISEXEC:FALSE
@@ -31,16 +31,16 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box07
 ISEXEC:FALSE
-17.347510:-67.098781:-900.000000
-57.072510:-77.098781:-900.000000
+-26.074222:-64.963286:-900.000000
+13.650778:-74.963286:-900.000000
 PORT
-In2:"/Comments.txt"
+In2:"/Comment-Informatic.txt"
 FIN_BOX
 BOX
 wx:LayoutTab:Box31
 ISEXEC:TRUE
--23.100386:-221.417856:-900.000000
-34.459614:-231.417856:-900.000000
+-61.183380:-291.889191:-900.000000
+-3.623380:-301.889191:-900.000000
 PORT
 WinHeight:"500"
 PORT
@@ -49,16 +49,16 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box32
 ISEXEC:FALSE
--7.449319:-199.202559:-900.000000
-50.110681:-209.202559:-900.000000
+-77.979484:-250.098524:-900.000000
+-20.419484:-260.098524:-900.000000
 FIN_BOX
 BOX
 wx:InputText:Box33
 ISEXEC:FALSE
--33.502878:-140.093289:-900.000000
-2.497122:-150.093289:-900.000000
+-33.858794:-145.076111:-900.000000
+2.141206:-155.076111:-900.000000
 PORT
-Title:"Comment"
+Title:"Informatic Comment"
 FIN_BOX
 BOX
 wx:CommandButton:Box34
@@ -71,14 +71,14 @@ FIN_BOX
 BOX
 std:ReadLinesString:Box11
 ISEXEC:FALSE
--33.019832:-113.965106:-900.000000
-8.380168:-123.965106:-900.000000
+-31.952084:-120.015675:-900.000000
+9.447916:-130.015675:-900.000000
 FIN_BOX
 BOX
 std:ReplaceString:Box18
 ISEXEC:FALSE
-12.895088:-84.746325:-900.000000
-52.620088:-94.746325:-900.000000
+-26.967486:-94.356053:-900.000000
+12.757514:-104.356053:-900.000000
 PORT
 Replace:"/"
 PORT
@@ -87,8 +87,8 @@ FIN_BOX
 BOX
 std:StringWriter:Box20
 ISEXEC:FALSE
-47.203903:-158.181142:-900.000000
-89.363903:-168.181142:-900.000000
+8.088458:-169.802824:-900.000000
+50.248458:-179.802824:-900.000000
 FIN_BOX
 BOX
 std:Exit:Box21
@@ -99,28 +99,28 @@ FIN_BOX
 BOX
 wx:CommandButton:Box24
 ISEXEC:FALSE
-132.244164:-125.160045:-900.000000
-175.019164:-135.160045:-900.000000
+141.068524:-121.336156:-900.000000
+183.843524:-131.336156:-900.000000
 PORT
 Label:"Exit"
 FIN_BOX
 BOX
 wx:LayoutCenter:Box25
 ISEXEC:FALSE
-99.595548:-181.792849:-900.000000
-138.895548:-191.792849:-900.000000
+110.184779:-182.381140:-900.000000
+149.484779:-192.381140:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box26
 ISEXEC:FALSE
-107.119572:-161.677014:-900.000000
-164.679572:-171.677014:-900.000000
+119.179530:-160.500433:-900.000000
+176.739530:-170.500433:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box27
 ISEXEC:FALSE
-80.920150:-50.308706:-900.000000
-120.645150:-60.308706:-900.000000
+78.784655:-43.902221:-900.000000
+118.509655:-53.902221:-900.000000
 PORT
 In1:"Patient&&2P&&"
 PORT
@@ -162,14 +162,87 @@ ISEXEC:FALSE
 PORT
 Search:"<PATIENT>"
 FIN_BOX
-CONNECTIONS:24
+BOX
+std:ConcatStrings:Box29
+ISEXEC:FALSE
+-106.742461:-67.752259:-900.000000
+-67.017461:-77.752259:-900.000000
+PORT
+In2:"/Comment-Scientific.txt"
+FIN_BOX
+BOX
+wx:InputText:Box30
+ISEXEC:FALSE
+-127.395945:-140.380492:-900.000000
+-91.395945:-150.380492:-900.000000
+PORT
+Title:"Scientific Comment"
+FIN_BOX
+BOX
+std:ReadLinesString:Box35
+ISEXEC:FALSE
+-125.489236:-115.320056:-900.000000
+-84.089236:-125.320056:-900.000000
+FIN_BOX
+BOX
+std:ReplaceString:Box36
+ISEXEC:FALSE
+-120.504637:-89.660434:-900.000000
+-80.779637:-99.660434:-900.000000
+PORT
+Replace:"/"
+PORT
+Search:"\"
+FIN_BOX
+BOX
+std:StringWriter:Box37
+ISEXEC:FALSE
+-85.448693:-165.107204:-900.000000
+-43.288693:-175.107204:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box38
+ISEXEC:FALSE
+-201.378440:-68.024958:-900.000000
+-161.653440:-78.024958:-900.000000
+PORT
+In2:"/Comment-General.txt"
+FIN_BOX
+BOX
+wx:InputText:Box39
+ISEXEC:FALSE
+-216.662107:-143.159105:-900.000000
+-180.662107:-153.159105:-900.000000
+PORT
+Title:"General Comment"
+FIN_BOX
+BOX
+std:ReadLinesString:Box40
+ISEXEC:FALSE
+-214.755398:-118.098670:-900.000000
+-173.355398:-128.098670:-900.000000
+FIN_BOX
+BOX
+std:ReplaceString:Box41
+ISEXEC:FALSE
+-209.770799:-92.439047:-900.000000
+-170.045799:-102.439047:-900.000000
+PORT
+Replace:"/"
+PORT
+Search:"\"
+FIN_BOX
+BOX
+std:StringWriter:Box42
+ISEXEC:FALSE
+-174.714855:-167.885818:-900.000000
+-132.554855:-177.885818:-900.000000
+FIN_BOX
+CONNECTIONS:40
 CONNECTION
 Box32:Widget:Box31:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box33:Widget:Box32:Widget2
-NumberOfControlPoints:0
-CONNECTION
 Box11:Out:Box33:In
 NumberOfControlPoints:0
 CONNECTION
@@ -197,9 +270,6 @@ CONNECTION
 Box34:Widget:Box26:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box25:Widget:Box32:Widget3
-NumberOfControlPoints:0
-CONNECTION
 Box26:Widget:Box25:Widget2
 NumberOfControlPoints:0
 CONNECTION
@@ -235,4 +305,58 @@ NumberOfControlPoints:0
 CONNECTION
 Box28:Out:Box27:In3
 NumberOfControlPoints:0
+CONNECTION
+Box35:Out:Box30:In
+NumberOfControlPoints:0
+CONNECTION
+Box29:Out:Box36:In
+NumberOfControlPoints:0
+CONNECTION
+Box36:Out:Box35:FileName
+NumberOfControlPoints:0
+CONNECTION
+Box36:Out:Box37:FileName
+NumberOfControlPoints:0
+CONNECTION
+Box30:Out:Box37:In0
+NumberOfControlPoints:0
+CONNECTION
+Box40:Out:Box39:In
+NumberOfControlPoints:0
+CONNECTION
+Box38:Out:Box41:In
+NumberOfControlPoints:0
+CONNECTION
+Box41:Out:Box40:FileName
+NumberOfControlPoints:0
+CONNECTION
+Box41:Out:Box42:FileName
+NumberOfControlPoints:0
+CONNECTION
+Box39:Out:Box42:In0
+NumberOfControlPoints:0
+CONNECTION
+Box27:Out:Box29:In1
+NumberOfControlPoints:0
+CONNECTION
+Box27:Out:Box38:In1
+NumberOfControlPoints:0
+CONNECTION
+Box25:Widget:Box32:Widget8
+NumberOfControlPoints:0
+CONNECTION
+Box39:Widget:Box32:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box30:Widget:Box32:Widget4
+NumberOfControlPoints:0
+CONNECTION
+Box33:Widget:Box32:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box34:BoxChange:Box37:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box34:BoxChange:Box42:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/Comments.bbs b/appli/template_creaPatientsSystem/scripts/Comments.bbs
index fecc5737eae17172ec6fd389d7f9834903d06a14..4030f0cdd26deace6fa5c836837ec35e654cb06f 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Comments.bbs
+++ b/appli/template_creaPatientsSystem/scripts/Comments.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/Appli_ceraGM/scripts/Comments.bbs
+# - /Users/davila/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/Comments.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -18,7 +18,7 @@ category "<VOID>"
 new std:ConcatStrings Box15
 
 new std:ConcatStrings Box07
-  set Box07.In2 "/Comments.txt"
+  set Box07.In2 "/Comment-Informatic.txt"
 
 new wx:LayoutTab Box31
   set Box31.WinHeight "500"
@@ -27,7 +27,7 @@ new wx:LayoutTab Box31
 new wx:LayoutLine Box32
 
 new wx:InputText Box33
-  set Box33.Title "Comment"
+  set Box33.Title "Informatic Comment"
 
 new wx:CommandButton Box34
   set Box34.Label "Save"
@@ -66,10 +66,36 @@ new std:ReplaceCleanString Box23
 new std:ReplaceCleanString Box28
   set Box28.Search "<PATIENT>"
 
+new std:ConcatStrings Box29
+  set Box29.In2 "/Comment-Scientific.txt"
 
-connect Box32.Widget Box31.Widget1
+new wx:InputText Box30
+  set Box30.Title "Scientific Comment"
+
+new std:ReadLinesString Box35
+
+new std:ReplaceString Box36
+  set Box36.Replace "/"
+  set Box36.Search "\"
+
+new std:StringWriter Box37
+
+new std:ConcatStrings Box38
+  set Box38.In2 "/Comment-General.txt"
+
+new wx:InputText Box39
+  set Box39.Title "General Comment"
+
+new std:ReadLinesString Box40
+
+new std:ReplaceString Box41
+  set Box41.Replace "/"
+  set Box41.Search "\"
 
-connect Box33.Widget Box32.Widget2
+new std:StringWriter Box42
+
+
+connect Box32.Widget Box31.Widget1
 
 connect Box11.Out Box33.In
 
@@ -89,8 +115,6 @@ connect Box24.Widget Box26.Widget2
 
 connect Box34.Widget Box26.Widget1
 
-connect Box25.Widget Box32.Widget3
-
 connect Box26.Widget Box25.Widget2
 
 
@@ -112,6 +136,42 @@ connect Box19.Out Box28.Replace
 
 connect Box28.Out Box27.In3
 
+connect Box35.Out Box30.In
+
+connect Box29.Out Box36.In
+
+connect Box36.Out Box35.FileName
+
+connect Box36.Out Box37.FileName
+
+connect Box30.Out Box37.In0
+
+connect Box40.Out Box39.In
+
+connect Box38.Out Box41.In
+
+connect Box41.Out Box40.FileName
+
+connect Box41.Out Box42.FileName
+
+connect Box39.Out Box42.In0
+
+connect Box27.Out Box29.In1
+
+connect Box27.Out Box38.In1
+
+connect Box25.Widget Box32.Widget8
+
+connect Box39.Widget Box32.Widget2
+
+connect Box30.Widget Box32.Widget4
+
+connect Box33.Widget Box32.Widget6
+
+connect Box34.BoxChange Box37.BoxExecute
+
+connect Box34.BoxChange Box42.BoxExecute
+
 
 
 # Complex input ports

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbg b/appli/template_creaPatientsSystem/scripts/Report.bbg
index 2c8c53160271b14db22ba70108d12d9a8c767383..586e63946f68772059a0173868fc0eddd0d3fde2 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbg
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbg
@@ -17,12 +17,12 @@ COMPLEX_PORT
 CoreID
 24.094628:190.118560:-900.000000
 FIN_COMPLEX_PORT
-BOXES:35
+BOXES:34
 BOX
 wx:LayoutSplit:Box02
 ISEXEC:TRUE
-193.479311:-189.328262:-900.000000
-232.559311:-199.328262:-900.000000
+94.769135:-263.732917:-900.000000
+131.444135:-273.732917:-900.000000
 PORT
 Proportion:"90"
 PORT
@@ -32,13 +32,13 @@ BOX
 std:MagicBox:Box03
 ISEXEC:FALSE
 -65.709740:118.613442:-900.000000
--29.634740:108.613442:-900.000000
+14.440000:108.613442:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box04
 ISEXEC:FALSE
--73.700382:14.219829:-900.000000
--36.925382:4.219829:-900.000000
+-64.689922:-183.042665:-900.000000
+-27.914922:-193.042665:-900.000000
 FIN_BOX
 BOX
 wx:CommandButton:Box05
@@ -51,14 +51,14 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box06
 ISEXEC:FALSE
-305.366968:-140.349335:-900.000000
-362.926968:-150.349335:-900.000000
+-23.791461:-214.585345:-900.000000
+57.560000:-224.585345:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box08
 ISEXEC:FALSE
 364.651918:41.210239:-900.000000
-422.211918:31.210239:-900.000000
+401.226918:31.210239:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -91,8 +91,8 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box13
 ISEXEC:FALSE
--78.505725:68.746123:-900.000000
--38.780725:58.746123:-900.000000
+-83.800341:61.686635:-900.000000
+-44.075341:51.686635:-900.000000
 PORT
 In2:"/results"
 FIN_BOX
@@ -105,26 +105,24 @@ FIN_BOX
 BOX
 creaMiniTools:CreateReport01:Box15
 ISEXEC:FALSE
-162.588042:-106.262770:-900.000000
-205.748042:-116.262770:-900.000000
+170.028508:-181.659487:-900.000000
+213.188508:-191.659487:-900.000000
 PORT
-LstPatientsID:"P01 P02 P03"
+LstTitles1:"+            Step01         Step02                Step03  Step04       Step05     Step06  General    Scientific  Informatic"
 PORT
-LstTitles1:"+            Step01         Step02     Step03  Step04       Step05     Step06  General    Scientific  Informatic"
-PORT
-LstTitles2:"Patient Insert_Data InitValues Filter      Correction Validation PushDB Comment Comment Comment"
+LstTitles2:"Patient Insert_Data InitialParameters  Filter      Correction Validation PushDB Comment Comment Comment"
 FIN_BOX
 BOX
 wx:ListCtrl:Box17
 ISEXEC:FALSE
-164.662277:-139.123569:-900.000000
-228.382277:-149.123569:-900.000000
+171.110680:-216.008380:-900.000000
+203.535680:-226.008380:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box18
 ISEXEC:FALSE
--0.712391:86.544740:-900.000000
-39.012609:76.544740:-900.000000
+-32.774231:85.368159:-900.000000
+6.950769:75.368159:-900.000000
 PORT
 In1:"/<CORE>/davila/<ALGO>/Test_01/<PATIENT>/Condition_01"
 FIN_BOX
@@ -145,8 +143,8 @@ FIN_BOX
 BOX
 std:ReplaceString:Box22
 ISEXEC:FALSE
--9.011234:35.628948:-900.000000
-30.713766:25.628948:-900.000000
+-18.070910:36.276068:-900.000000
+21.654090:26.276068:-900.000000
 PORT
 Replace:"00100_OriginalImages"
 PORT
@@ -155,8 +153,8 @@ FIN_BOX
 BOX
 std:ReplaceString:Box23
 ISEXEC:FALSE
-37.851020:35.929962:-900.000000
-77.576020:25.929962:-900.000000
+48.204935:37.871321:-900.000000
+87.929935:27.871321:-900.000000
 PORT
 Replace:"00200_InitialParameters"
 PORT
@@ -165,8 +163,8 @@ FIN_BOX
 BOX
 std:ReplaceString:Box24
 ISEXEC:FALSE
-87.220417:37.663629:-900.000000
-126.945417:27.663629:-900.000000
+115.046564:36.692949:-900.000000
+154.771564:26.692949:-900.000000
 PORT
 Replace:"00300_Filter"
 PORT
@@ -175,40 +173,32 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box25
 ISEXEC:FALSE
--8.724799:13.002027:-900.000000
-31.000201:3.002027:-900.000000
+-1.936565:10.492297:-900.000000
+37.788435:0.492297:-900.000000
 PORT
 In3:"/Step01_Insert_Data.txt  "
 FIN_BOX
 BOX
-std:ConcatStrings:Box26
-ISEXEC:FALSE
--76.772058:40.035902:-900.000000
--37.047058:30.035902:-900.000000
-PORT
-In2:"/results"
-FIN_BOX
-BOX
 std:ConcatStrings:Box27
 ISEXEC:FALSE
-41.002762:11.870388:-900.000000
-80.727762:1.870388:-900.000000
+41.326322:10.252589:-900.000000
+81.051322:0.252589:-900.000000
 PORT
-In3:"/Step002.txt  "
+In3:"/Step02_InitialParameters.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box28
 ISEXEC:FALSE
-87.865016:10.738748:-900.000000
-127.590016:0.738748:-900.000000
+86.570777:10.415188:-900.000000
+126.295777:0.415188:-900.000000
 PORT
-In3:"/Step03.txt  "
+In3:"/Step03_Filter.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box29
 ISEXEC:FALSE
-40.258944:-71.811510:-900.000000
-79.983944:-81.811510:-900.000000
+54.120231:-69.645684:-900.000000
+93.845231:-79.645684:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box30
@@ -216,7 +206,7 @@ ISEXEC:FALSE
 139.741557:10.323435:-900.000000
 179.466557:0.323435:-900.000000
 PORT
-In3:"/Comments_General.txt  "
+In3:"/Comment-General.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box31
@@ -224,7 +214,7 @@ ISEXEC:FALSE
 184.454830:10.982612:-900.000000
 224.179830:0.982612:-900.000000
 PORT
-In3:"/Comments_Informatic.txt  "
+In3:"/Comment-Informatic.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box32
@@ -232,7 +222,7 @@ ISEXEC:FALSE
 234.898718:12.358116:-900.000000
 274.623718:2.358116:-900.000000
 PORT
-In3:"/Comments_Scientific.txt  "
+In3:"/Comment-Scientific.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box33
@@ -246,7 +236,7 @@ ISEXEC:FALSE
 89.918541:-11.460690:-900.000000
 129.643541:-21.460690:-900.000000
 PORT
-In3:"/Step04.txt  "
+In3:"/Step04_Correction.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box35
@@ -254,7 +244,7 @@ ISEXEC:FALSE
 102.934029:-25.166353:-900.000000
 142.659029:-35.166353:-900.000000
 PORT
-In3:"/Step05.txt  "
+In3:"/Step05_Validation.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box36
@@ -262,27 +252,29 @@ ISEXEC:FALSE
 122.651825:-40.982692:-900.000000
 162.376825:-50.982692:-900.000000
 PORT
-In3:"/Step06.txt  "
+In3:"/Step06_PushDB.txt  "
 FIN_BOX
 BOX
 std:ReplaceString:Box38
 ISEXEC:FALSE
--17.011517:-31.937228:-900.000000
-22.713483:-41.937228:-900.000000
+-16.957819:-24.437384:-900.000000
+22.767181:-34.437384:-900.000000
 PORT
 Search:"<PATIENT>/Condition_01"
 FIN_BOX
 BOX
-wx:OutputText:Box39
+std:ConcatStrings:Box40
 ISEXEC:FALSE
-269.669745:-91.434748:-900.000000
-306.444745:-101.434748:-900.000000
+-31.617964:-54.154980:-900.000000
+39.080000:-64.154980:-900.000000
 FIN_BOX
 BOX
-std:ConcatStrings:Box40
+std:FilesFromDirectory:Box43
 ISEXEC:FALSE
--18.982535:-67.830006:-900.000000
-20.742465:-77.830006:-900.000000
+-21.837764:-71.665433:-900.000000
+26.760000:-81.665433:-900.000000
+PORT
+Type:"1"
 FIN_BOX
 CONNECTIONS:67
 CONNECTION
@@ -352,15 +344,6 @@ CONNECTION
 Box22:Out:Box25:In2
 NumberOfControlPoints:0
 CONNECTION
-Box13:Out:Box26:In1
-NumberOfControlPoints:0
-CONNECTION
-Box21:Out:Box26:In3
-NumberOfControlPoints:0
-CONNECTION
-Box26:Out:Box04:In
-NumberOfControlPoints:0
-CONNECTION
 Box23:Out:Box27:In2
 NumberOfControlPoints:0
 CONNECTION
@@ -475,15 +458,24 @@ CONNECTION
 Box22:Out:Box38:In
 NumberOfControlPoints:0
 CONNECTION
-Box38:Out:Box39:In
+Box40:Out:Box43:In
+NumberOfControlPoints:0
+CONNECTION
+Box43:OutSimple:Box15:LstPatientsID
 NumberOfControlPoints:0
 CONNECTION
-Box39:Widget:Box06:Widget5
+Box40:Out:Box04:In
 NumberOfControlPoints:0
 CONNECTION
-Box03:Out:Box40:In1
+Box13:Out:Box40:In1
 NumberOfControlPoints:0
 CONNECTION
 Box38:Out:Box40:In2
 NumberOfControlPoints:0
+CONNECTION
+Box05:BoxChange:Box17:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box05:BoxChange:Box15:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbs b/appli/template_creaPatientsSystem/scripts/Report.bbs
index ecae2f8fd560bd3dd2a1e86b4af3432cfee9245e..2293b0d8c175784d64fc57634f1b7c9a0017d286 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbs
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbs
@@ -47,9 +47,8 @@ new std:ConcatStrings Box13
 new wx:OutputText Box14
 
 new creaMiniTools:CreateReport01 Box15
-  set Box15.LstPatientsID "P01 P02 P03"
-  set Box15.LstTitles1 "+            Step01         Step02     Step03  Step04       Step05     Step06  General    Scientific  Informatic"
-  set Box15.LstTitles2 "Patient Insert_Data InitValues Filter      Correction Validation PushDB Comment Comment Comment"
+  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"
 
 new wx:ListCtrl Box17
 
@@ -76,44 +75,42 @@ new std:ReplaceString Box24
 new std:ConcatStrings Box25
   set Box25.In3 "/Step01_Insert_Data.txt  "
 
-new std:ConcatStrings Box26
-  set Box26.In2 "/results"
-
 new std:ConcatStrings Box27
-  set Box27.In3 "/Step002.txt  "
+  set Box27.In3 "/Step02_InitialParameters.txt  "
 
 new std:ConcatStrings Box28
-  set Box28.In3 "/Step03.txt  "
+  set Box28.In3 "/Step03_Filter.txt  "
 
 new std:ConcatStrings Box29
 
 new std:ConcatStrings Box30
-  set Box30.In3 "/Comments_General.txt  "
+  set Box30.In3 "/Comment-General.txt  "
 
 new std:ConcatStrings Box31
-  set Box31.In3 "/Comments_Informatic.txt  "
+  set Box31.In3 "/Comment-Informatic.txt  "
 
 new std:ConcatStrings Box32
-  set Box32.In3 "/Comments_Scientific.txt  "
+  set Box32.In3 "/Comment-Scientific.txt  "
 
 new std:ConcatStrings Box33
 
 new std:ConcatStrings Box34
-  set Box34.In3 "/Step04.txt  "
+  set Box34.In3 "/Step04_Correction.txt  "
 
 new std:ConcatStrings Box35
-  set Box35.In3 "/Step05.txt  "
+  set Box35.In3 "/Step05_Validation.txt  "
 
 new std:ConcatStrings Box36
-  set Box36.In3 "/Step06.txt  "
+  set Box36.In3 "/Step06_PushDB.txt  "
 
 new std:ReplaceString Box38
   set Box38.Search "<PATIENT>/Condition_01"
 
-new wx:OutputText Box39
-
 new std:ConcatStrings Box40
 
+new std:FilesFromDirectory Box43
+  set Box43.Type "1"
+
 
 
 connect Box04.Widget Box06.Widget1
@@ -157,12 +154,6 @@ connect Box13.Out Box25.In1
 
 connect Box22.Out Box25.In2
 
-connect Box13.Out Box26.In1
-
-connect Box21.Out Box26.In3
-
-connect Box26.Out Box04.In
-
 connect Box23.Out Box27.In2
 
 connect Box13.Out Box27.In1
@@ -239,14 +230,20 @@ connect Box13.Out Box36.In1
 
 connect Box22.Out Box38.In
 
-connect Box38.Out Box39.In
+connect Box40.Out Box43.In
+
+connect Box43.OutSimple Box15.LstPatientsID
 
-connect Box39.Widget Box06.Widget5
+connect Box40.Out Box04.In
 
-connect Box03.Out Box40.In1
+connect Box13.Out Box40.In1
 
 connect Box38.Out Box40.In2
 
+connect Box05.BoxChange Box17.BoxExecute
+
+connect Box05.BoxChange Box15.BoxExecute
+
 
 
 # Complex input ports

diff --git a/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbg b/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbg
index 4fb52a476356e2e79fd850a4221748e220f77142..e10e3229286bedaaa9a7548b65f819a4de22b245 100644 (file)
--- a/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbg
+++ b/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbg
@@ -13,57 +13,57 @@ PACKAGENAME:creaMiniTools
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 boxChange
--47.740669:-83.512551:-900.000000
+-51.504460:-84.014390:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:4
 COMPLEX_PORT
 User
--6.589557:76.250590:-900.000000
+-17.379090:73.992316:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 State
-35.099478:75.443705:-900.000000
+36.604994:75.443705:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
-FileState
--77.864359:74.636821:-900.000000
+boxExecute
+-119.333547:75.048449:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
-boxExecute
--108.794933:73.292013:-900.000000
+Filename
+-78.126639:75.893088:-900.000000
 FIN_COMPLEX_PORT
-BOXES:8
+BOXES:10
 BOX
 std:DateTime:Box00
 ISEXEC:FALSE
-43.308183:13.257113:-900.000000
-78.708183:3.257113:-900.000000
+36.540223:5.971117:-900.000000
+71.940223:-4.028883:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box02
 ISEXEC:FALSE
--16.003210:48.009631:-900.000000
-20.071790:38.009631:-900.000000
+-27.052997:47.346644:-900.000000
+9.022003:37.346644:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box03
 ISEXEC:FALSE
-29.817095:48.375440:-900.000000
-65.892095:38.375440:-900.000000
+33.353027:48.154444:-900.000000
+69.428027:38.154444:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box04
 ISEXEC:FALSE
--35.906362:-18.154902:-900.000000
-3.818638:-28.154902:-900.000000
+-39.168314:-22.420531:-900.000000
+0.556686:-32.420531:-900.000000
 PORT
 In1:"User State Date Time"
 FIN_BOX
 BOX
 std:ConcatStrings:Box05
 ISEXEC:FALSE
-9.913943:-17.251170:-900.000000
-49.638943:-27.251170:-900.000000
+10.415782:-19.509444:-900.000000
+50.140782:-29.509444:-900.000000
 PORT
 In2:" "
 PORT
@@ -80,8 +80,8 @@ FIN_BOX
 BOX
 std:MagicBox:Box07
 ISEXEC:FALSE
--87.891201:45.782673:-900.000000
--51.816201:35.782673:-900.000000
+-86.277432:44.706827:-900.000000
+-50.202432:34.706827:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box08
@@ -89,7 +89,27 @@ ISEXEC:FALSE
 -129.214427:46.417443:-900.000000
 -93.139427:36.417443:-900.000000
 FIN_BOX
-CONNECTIONS:13
+BOX
+std:GetVectorStringElement:Box09
+ISEXEC:FALSE
+-40.884210:25.635505:-900.000000
+17.520000:15.635505:-900.000000
+PORT
+ErrorValue:"?EED?"
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorStringElement:Box10
+ISEXEC:FALSE
+28.397838:25.966885:-900.000000
+77.797838:15.966885:-900.000000
+PORT
+ErrorValue:"?EED?"
+PORT
+I:"0"
+FIN_BOX
+CONNECTIONS:15
 CONNECTION
 User:User:Box02:In
 NumberOfControlPoints:0
@@ -97,12 +117,6 @@ CONNECTION
 State:State:Box03:In
 NumberOfControlPoints:0
 CONNECTION
-Box02:Out:Box05:In1
-NumberOfControlPoints:0
-CONNECTION
-Box03:Out:Box05:In3
-NumberOfControlPoints:0
-CONNECTION
 Box00:Date:Box05:In5
 NumberOfControlPoints:0
 CONNECTION
@@ -115,9 +129,6 @@ CONNECTION
 Box05:Out:Box06:lstData2
 NumberOfControlPoints:0
 CONNECTION
-FileState:FileState:Box07:In
-NumberOfControlPoints:0
-CONNECTION
 Box07:Out:Box06:FileName
 NumberOfControlPoints:0
 CONNECTION
@@ -129,4 +140,19 @@ NumberOfControlPoints:0
 CONNECTION
 Box06:BoxChange:boxChange:boxChange
 NumberOfControlPoints:0
+CONNECTION
+Filename:Filename:Box07:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Box09:In
+NumberOfControlPoints:0
+CONNECTION
+Box09:Out:Box05:In1
+NumberOfControlPoints:0
+CONNECTION
+Box03:Out:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box05:In3
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbs b/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbs
index 0a307a6a34e88f365d718b124ac245994a31965a..79350565788c0d6fb942d595d5e470c5fbe56bb5 100644 (file)
--- a/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbs
+++ b/bbtk_package_creaMiniTools/bbs/boxes/WriteStatePatientSystem.bbs
@@ -34,21 +34,31 @@ new std:MagicBox Box07
 
 new std:MagicBox Box08
 
+new std:GetVectorStringElement Box09
+  set Box09.ErrorValue "?EED?"
+  set Box09.I "0"
+
+new std:GetVectorStringElement Box10
+  set Box10.ErrorValue "?EED?"
+  set Box10.I "0"
+
 
-connect Box02.Out Box05.In1
-connect Box03.Out Box05.In3
 connect Box00.Date Box05.In5
 connect Box00.Time Box05.In7
 connect Box04.Out Box06.lstData1
 connect Box05.Out Box06.lstData2
 connect Box07.Out Box06.FileName
 connect Box08.BoxChange Box06.BoxExecute
+connect Box02.Out Box09.In
+connect Box09.Out Box05.In1
+connect Box03.Out Box10.In
+connect Box10.Out Box05.In3
 
 # Complex input ports
 input User Box02.In " "
 input State Box03.In " "
-input FileState Box07.In " "
 input boxExecute Box08.In " "
+input Filename Box07.In " "
 
 # Complex output ports
 output boxChange Box06.BoxChange " "

diff --git a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
index c5601579338753a662b7bbae52c6fdab55a4a636..385ac657bf7f76ee3efcbda47046db5228e6f096 100644 (file)
--- a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
+++ b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
@@ -67,7 +67,7 @@ void CreateReport01::Process()
     for (iTitle2=0 ; iTitle2<sizeTitles2 ; iTitle2++ )
     {
         pLstOut[iTitle2]->push_back( lstTitles2[iTitle2]  );
-        pLstOut[iTitle2]->push_back( " "  );
+        pLstOut[iTitle2]->push_back( " " );
     } // for iTitle2
     
 
@@ -75,32 +75,99 @@ void CreateReport01::Process()
     int i,sizeLstPatientsID     = lstPatients.size();
     int j,sizeLstStepsPath      = lstStepsPath.size();
     int jj,sizeLstCommentsPath  = lstCommentsPath.size();
+    std::string stdPATIENT("<PATIENT>");
+    std::string pathFile;
+    FILE *ff;
+    char tmpTitle[255];
+    char tmpValue[255];
     for ( i=0 ;  i<sizeLstPatientsID ; i++ )
     {
-        printf("EED CreateReport01::Process Patient:%s\n", lstPatients[i].c_str() );
         pLstOut[0]->push_back( lstPatients[i] );
         pLstOut[0]->push_back( " " );
         pLstOut[0]->push_back( " " );
         pLstOut[0]->push_back( " " );
-        
+        pLstOut[0]->push_back( " " );
+
         for (j=0; j<sizeLstStepsPath;j++)
         {
             id=j+1;
-            pLstOut[id]->push_back( "Step:"+std::to_string(j) );
-            pLstOut[id]->push_back( "2021/11/12" );
-            pLstOut[id]->push_back( "16h56" );
-            pLstOut[id]->push_back( " " );
-            printf("EED CreateReport01::Process Step:%s\n", lstStepsPath[j].c_str() );
+            pathFile    = lstStepsPath[j];
+            size_t pos  = 0;
+            pos         = pathFile.find( stdPATIENT , pos);
+            pathFile.replace(pos, stdPATIENT.length(), lstPatients[i] );
+            printf("CreateReport01::Process %s \n", pathFile.c_str() );
+            ff=fopen(pathFile.c_str(), "r");
+            strcpy(tmpValue,"?EED?");
+            if (ff!=NULL)
+            {
+                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( " " );
+                pLstOut[id]->push_back( " " );
+                pLstOut[id]->push_back( " " );
+                pLstOut[id]->push_back( " " );
+                pLstOut[id]->push_back( " " );
+            }// if ff
         } // for j
 
         for ( jj=0; jj<sizeLstCommentsPath ; jj++ )
         {
             id=jj+1+sizeLstStepsPath;
-            pLstOut[id]->push_back( "Comment:"+std::to_string(jj) );
-            pLstOut[id]->push_back( "2021/11/12" );
-            pLstOut[id]->push_back( "16h56" );
-            pLstOut[id]->push_back( " " );
-            printf("EED CreateReport01::Process Comment:%s\n", lstCommentsPath[jj].c_str() );
+
+            pathFile    = lstCommentsPath[jj];
+            size_t pos  = 0;
+            pos         = pathFile.find( stdPATIENT , pos);
+            pathFile.replace(pos, stdPATIENT.length(), lstPatients[i] );
+            printf("CreateReport01::Process %s \n", pathFile.c_str() );
+            ff=fopen(pathFile.c_str(), "r");
+            strcpy(tmpValue,"?EED?");
+            if (ff!=NULL)
+            {
+                fgets(tmpValue,255,ff);
+                pLstOut[id]->push_back( tmpValue );
+                pLstOut[id]->push_back( " " );
+                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( " " );
+            }// if ff
         } // for j
 
     } // for i