#3421 template_creaPatientsSystem

diff --git a/appli/template_creaPatientsSystem/.DS_Store b/appli/template_creaPatientsSystem/.DS_Store
index dec77e85e3b6f460c1a24159d74e92fcb542a25e..091f5ad282c980ceba734ea2d49506e54d6f4e89 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 343fcf7d60e05d8870709c0101e6de6d4b93eb84..409ae5af13d58a5139023f601c98be457a6e701e 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbg
+++ b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbg
@@ -22,19 +22,19 @@ BOX
 creaMaracasVisu:ViewerNV:Box00
 ISEXEC:FALSE
 -22.662651:6.681054:-900.000000
-41.057349:-3.318946:-900.000000
+66.800000:-3.318946:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box02
 ISEXEC:FALSE
 -85.681966:7.897228:-900.000000
--28.121966:-2.102772:-900.000000
+57.560000:-2.102772:-900.000000
 FIN_BOX
 BOX
 creaVtk:OutputWindow:Box03
 ISEXEC:TRUE
 -55.344612:-298.769669:-900.000000
--14.744612:-308.769669:-900.000000
+8.280000:-308.769669:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box04
@@ -48,7 +48,7 @@ BOX
 wx:CommandButton:Box06
 ISEXEC:FALSE
 -98.584170:89.556276:-900.000000
--55.809170:79.556276:-900.000000
+36.000000:79.556276:-900.000000
 PORT
 Label:"Read Camera  Image RGB (*.PNG)"
 FIN_BOX
@@ -62,13 +62,13 @@ BOX
 wx:FileSelector:Box09
 ISEXEC:FALSE
 -46.606859:61.540248:-900.000000
--9.231859:51.540248:-900.000000
+26.760000:51.540248:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box11
 ISEXEC:TRUE
 24.459413:-298.080906:-900.000000
-63.539413:-308.080906:-900.000000
+61.134413:-308.080906:-900.000000
 PORT
 Proportion:"90"
 PORT
@@ -78,7 +78,7 @@ BOX
 wx:LayoutLine:Box12
 ISEXEC:FALSE
 3.317046:-139.075768:-900.000000
-60.877046:-149.075768:-900.000000
+57.560000:-149.075768:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -202,7 +202,7 @@ ISEXEC:FALSE
 -28.620672:-41.504892:-900.000000
 16.619328:-51.504892:-900.000000
 PORT
-In:"Study_A  Study_B  Study_C"
+In:"VOID Study_A  Study_B  Study_C"
 FIN_BOX
 BOX
 std:ReplaceCleanString:Box31
@@ -228,7 +228,7 @@ BOX
 wx:OutputText:Box34
 ISEXEC:FALSE
 -55.710392:29.763540:-900.000000
--18.935392:19.763540:-900.000000
+32.920000:19.763540:-900.000000
 FIN_BOX
 BOX
 wx:InputText:Box35
@@ -254,7 +254,7 @@ BOX
 std:StringWriter:Box37
 ISEXEC:FALSE
 136.823103:-229.930463:-900.000000
-178.983103:-239.930463:-900.000000
+173.898103:-239.930463:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box38

diff --git a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs
index ed47a911456644b2590032a8f62e3b545aac45f0..5c98a17091de97a6090d64da46a99f9bb3b6b898 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs
+++ b/appli/template_creaPatientsSystem/scripts/00100_InsertDataA.bbs
@@ -86,7 +86,7 @@ new wx:LayoutLine Box28
 new std:Exit Box29
 
 new wx:ComboBox Box30
-  set Box30.In "Study_A  Study_B  Study_C"
+  set Box30.In "VOID Study_A  Study_B  Study_C"
 
 new std:ReplaceCleanString Box31
   set Box31.Search "<CORE>"

diff --git a/appli/template_creaPatientsSystem/scripts/Comments.bbg b/appli/template_creaPatientsSystem/scripts/Comments.bbg
index feff11eef6e28764981dce18efbe9fbfae1ccbd0..ee0d4acda3f55d437f5ffe8cd68d8cbad054c4a8 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/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/Comments.bbg
+# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/creaPatientsSystem_MG/scripts/Comments.bbg
 # ----------------------------------
 
 APP_START
@@ -25,7 +25,7 @@ COMPLEX_PORT
 creaUser
 231.460156:46.861703:-900.000000
 FIN_COMPLEX_PORT
-BOXES:32
+BOXES:35
 BOX
 std:ConcatStrings:Box15
 ISEXEC:FALSE
@@ -231,8 +231,8 @@ FIN_BOX
 BOX
 std:StringWriter:Box42
 ISEXEC:FALSE
--174.714855:-167.885818:-900.000000
--132.554855:-177.885818:-900.000000
+-168.414270:-164.735526:-900.000000
+-126.254270:-174.735526:-900.000000
 FIN_BOX
 BOX
 creaMiniTools:WriteStatePatientSystem:Box43
@@ -259,10 +259,30 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box46
 ISEXEC:FALSE
-42.254674:-231.721366:-900.000000
-81.954674:-241.721366:-900.000000
+55.159937:-243.188907:-900.000000
+94.859937:-253.188907:-900.000000
 FIN_BOX
-CONNECTIONS:45
+BOX
+std:SplitFilePathVector:Box47
+ISEXEC:FALSE
+-272.018022:-134.421970:-900.000000
+-227.868022:-144.421970:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box48
+ISEXEC:FALSE
+-252.328694:-191.700014:-900.000000
+-212.603694:-201.700014:-900.000000
+PORT
+In1:"mkdir -p  "
+FIN_BOX
+BOX
+std:ExecSystemCommand:Box49
+ISEXEC:FALSE
+-223.331684:-221.770988:-900.000000
+-175.031684:-231.770988:-900.000000
+FIN_BOX
+CONNECTIONS:49
 CONNECTION
 Box32:Widget:Box31:Widget1
 NumberOfControlPoints:0
@@ -381,21 +401,33 @@ CONNECTION
 Box45:Out:Box43:Filename
 NumberOfControlPoints:0
 CONNECTION
-Box42:BoxChange:Box46:In1
+Box34:BoxChange:Box46:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box21:BoxChange:Box46:In9
 NumberOfControlPoints:0
 CONNECTION
-Box37:BoxChange:Box46:In2
+Box41:Out:Box47:In
 NumberOfControlPoints:0
 CONNECTION
-Box20:BoxChange:Box46:In3
+Box47:Path:Box48:In2
 NumberOfControlPoints:0
 CONNECTION
-Box43:boxChange:Box46:In4
+Box48:Out:Box49:In
 NumberOfControlPoints:0
 CONNECTION
-Box34:BoxChange:Box46:BoxExecute
+Box43:boxChange:Box46:In7
 NumberOfControlPoints:0
 CONNECTION
-Box21:BoxChange:Box46:In9
+Box20:BoxChange:Box46:In5
+NumberOfControlPoints:0
+CONNECTION
+Box37:BoxChange:Box46:In4
+NumberOfControlPoints:0
+CONNECTION
+Box42:BoxChange:Box46:In2
+NumberOfControlPoints:0
+CONNECTION
+Box49:BoxChange:Box46:In1
 NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/Comments.bbs b/appli/template_creaPatientsSystem/scripts/Comments.bbs
index 4ebf2bee5d3c9ddce17f311a362c151d0ae5f060..5b344a15dd7b8c4ce1fe990ff4ed82a6ce3bba01 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/Creatis/C11/creatools_source/creaMiniTools/appli/template_creaPatientsSystem/scripts/Comments.bbs
+# - /Users/davila/CreatisWork/tmpCharly/creaBrainGrayMatter/appli/creaPatientsSystem_MG/scripts/Comments.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -102,6 +102,13 @@ new std:ConcatStrings Box45
 
 new std:MultipleInputs Box46
 
+new std:SplitFilePathVector Box47
+
+new std:ConcatStrings Box48
+  set Box48.In1 "mkdir -p  "
+
+new std:ExecSystemCommand Box49
+
 
 connect Box32.Widget Box31.Widget1
 
@@ -177,17 +184,25 @@ connect Box27.Out Box45.In1
 
 connect Box45.Out Box43.Filename
 
-connect Box42.BoxChange Box46.In1
+connect Box34.BoxChange Box46.BoxExecute
 
-connect Box37.BoxChange Box46.In2
+connect Box21.BoxChange Box46.In9
 
-connect Box20.BoxChange Box46.In3
+connect Box41.Out Box47.In
 
-connect Box43.boxChange Box46.In4
+connect Box47.Path Box48.In2
 
-connect Box34.BoxChange Box46.BoxExecute
+connect Box48.Out Box49.In
 
-connect Box21.BoxChange Box46.In9
+connect Box43.boxChange Box46.In7
+
+connect Box20.BoxChange Box46.In5
+
+connect Box37.BoxChange Box46.In4
+
+connect Box42.BoxChange Box46.In2
+
+connect Box49.BoxChange Box46.In1
 
 
 

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbg b/appli/template_creaPatientsSystem/scripts/Report.bbg
index 3ec0766a2f5e0997614f6060abbd8829299a71d0..8b7207fd7d97db02e6143680e24c89239780e8eb 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbg
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbg
@@ -106,7 +106,7 @@ BOX
 creaMiniTools:CreateReport01:Box15
 ISEXEC:FALSE
 170.028508:-181.659487:-900.000000
-213.188508:-191.659487:-900.000000
+228.588508:-191.659487:-900.000000
 PORT
 LstTitles1:"+            Step01         Step02                Step03  Step04       Step05     Step06  Step           General    Scientific  Informatic"
 PORT
@@ -116,7 +116,7 @@ BOX
 wx:ListCtrl:Box17
 ISEXEC:FALSE
 171.110680:-216.008380:-900.000000
-234.830680:-226.008380:-900.000000
+250.230680:-226.008380:-900.000000
 FIN_BOX
 BOX
 std:ConcatStrings:Box18
@@ -211,16 +211,16 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box31
 ISEXEC:FALSE
-184.454830:10.982612:-900.000000
-224.179830:0.982612:-900.000000
+228.244432:10.982612:-900.000000
+267.969432:0.982612:-900.000000
 PORT
 In3:"/Comment-Informatic.txt  "
 FIN_BOX
 BOX
 std:ConcatStrings:Box32
 ISEXEC:FALSE
-234.898718:12.358116:-900.000000
-274.623718:2.358116:-900.000000
+185.107495:11.691269:-900.000000
+224.832495:1.691269:-900.000000
 PORT
 In3:"/Comment-Scientific.txt  "
 FIN_BOX
@@ -292,7 +292,7 @@ ISEXEC:FALSE
 PORT
 Title:"Core"
 FIN_BOX
-CONNECTIONS:72
+CONNECTIONS:77
 CONNECTION
 BaseDir:BaseDir:Box03:In
 NumberOfControlPoints:0
@@ -399,12 +399,6 @@ CONNECTION
 Box30:Out:Box33:In1
 NumberOfControlPoints:0
 CONNECTION
-Box31:Out:Box33:In2
-NumberOfControlPoints:0
-CONNECTION
-Box32:Out:Box33:In3
-NumberOfControlPoints:0
-CONNECTION
 Box33:Out:Box15:LstCommentsPath
 NumberOfControlPoints:0
 CONNECTION
@@ -509,4 +503,25 @@ NumberOfControlPoints:0
 CONNECTION
 Box08:Widget:Box06:Widget6
 NumberOfControlPoints:0
+CONNECTION
+Box32:Out:Box33:In2
+NumberOfControlPoints:0
+CONNECTION
+Box31:Out:Box33:In3
+NumberOfControlPoints:0
+CONNECTION
+Box15:Out11:Box17:Column11
+NumberOfControlPoints:0
+CONNECTION
+Box15:Out12:Box17:Column12
+NumberOfControlPoints:0
+CONNECTION
+Box15:Out13:Box17:Column13
+NumberOfControlPoints:0
+CONNECTION
+Box15:Out14:Box17:Column14
+NumberOfControlPoints:0
+CONNECTION
+Box15:Out15:Box17:Column15
+NumberOfControlPoints:0
 APP_END

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbs b/appli/template_creaPatientsSystem/scripts/Report.bbs
index 814e459f09faf85312af5e3a7f802a639929b9cb..d0285ef0e051d2052fa742c7f2c806ceb8ffd71b 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbs
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbs
@@ -186,10 +186,6 @@ connect Box24.Out Box32.In2
 
 connect Box30.Out Box33.In1
 
-connect Box31.Out Box33.In2
-
-connect Box32.Out Box33.In3
-
 connect Box33.Out Box15.LstCommentsPath
 
 connect Box13.Out Box34.In1
@@ -260,6 +256,20 @@ connect Box44.Widget Box06.Widget2
 
 connect Box08.Widget Box06.Widget6
 
+connect Box32.Out Box33.In2
+
+connect Box31.Out Box33.In3
+
+connect Box15.Out11 Box17.Column11
+
+connect Box15.Out12 Box17.Column12
+
+connect Box15.Out13 Box17.Column13
+
+connect Box15.Out14 Box17.Column14
+
+connect Box15.Out15 Box17.Column15
+
 
 
 # Complex input ports

diff --git a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
index 8827c1019d4496644db5f715a975fb8360d924f2..22b2b2f2a45a5ef026bcb7252ca638f26debb27f 100644 (file)
--- a/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
+++ b/bbtk_package_creaMiniTools/src/bbcreaMiniToolsCreateReport01.cxx
@@ -155,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