From 544c7fcddca5b03ba3c5f923de47ced5f44aa543 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Mon, 29 Nov 2021 17:17:27 +0100 Subject: [PATCH] #3421 template_creaPatientsSystem --- .../Run_Application.sh | 6 +- .../scripts/00000_User.bbg | 57 +++++-- .../scripts/00000_User.bbs | 17 ++- .../scripts/00010_Menu.bbg | 143 +++++++++++++----- .../scripts/00010_Menu.bbs | 57 +++++-- .../scripts/Run_Application.bat | 1 - .../scripts/Run_Application.sh | 4 - 7 files changed, 208 insertions(+), 77 deletions(-) delete mode 100644 appli/template_creaPatientsSystem/scripts/Run_Application.bat delete mode 100644 appli/template_creaPatientsSystem/scripts/Run_Application.sh diff --git a/appli/template_creaPatientsSystem/Run_Application.sh b/appli/template_creaPatientsSystem/Run_Application.sh index 5f793c3..9388120 100644 --- a/appli/template_creaPatientsSystem/Run_Application.sh +++ b/appli/template_creaPatientsSystem/Run_Application.sh @@ -1,4 +1,4 @@ cd scripts - -source Run_Application.sh - +BaseDir=/Users/davila/Borrame/tmpCreaPatientsSystem +source Run_Menu.sh $BaseDir +cd .. diff --git a/appli/template_creaPatientsSystem/scripts/00000_User.bbg b/appli/template_creaPatientsSystem/scripts/00000_User.bbg index cc59b5c..c254c66 100644 --- a/appli/template_creaPatientsSystem/scripts/00000_User.bbg +++ b/appli/template_creaPatientsSystem/scripts/00000_User.bbg @@ -8,8 +8,12 @@ CATEGORY: DESCRIPTION:Description ?? AUTHOR:Author ?? COMPLEXBOX:FALSE -COMPLEXINPUTS:0 -BOXES:12 +COMPLEXINPUTS:1 +COMPLEX_PORT +BaseDir +72.621492:119.282550:-900.000000 +FIN_COMPLEX_PORT +BOXES:14 BOX wx:LayoutCenter:Box02 ISEXEC:FALSE @@ -20,7 +24,7 @@ BOX wx:LayoutLine:Box03 ISEXEC:FALSE -19.114938:-36.307483:-900.000000 -57.560000:-46.307483:-900.000000 +38.445062:-46.307483:-900.000000 FIN_BOX BOX wx:OutputText:Box04 @@ -42,13 +46,13 @@ BOX creaVtk:OutputWindow:Box06 ISEXEC:TRUE -71.668631:-88.633263:-900.000000 -8.280000:-98.633263:-900.000000 +-31.068631:-98.633263:-900.000000 FIN_BOX BOX wx:LayoutLine:Box07 ISEXEC:TRUE 2.398699:-89.100813:-900.000000 -57.560000:-99.100813:-900.000000 +59.958699:-99.100813:-900.000000 PORT WinHeight:"400" PORT @@ -59,8 +63,8 @@ FIN_BOX BOX wx:CommandButton:Box08 ISEXEC:FALSE -20.056317:9.547560:-900.000000 -62.831317:-0.452440:-900.000000 +20.056317:6.683658:-900.000000 +62.831317:-3.316342:-900.000000 PORT Label:"Next" FIN_BOX @@ -73,10 +77,10 @@ FIN_BOX BOX std:ConcatStrings:Box10 ISEXEC:FALSE -79.496937:44.769980:-900.000000 -119.221937:34.769980:-900.000000 +103.972435:49.342326:-900.000000 +143.697435:39.342326:-900.000000 PORT -In1:"creaUser=" +In1:" creaUser=" FIN_BOX BOX std:ConcatStrings:Box11 @@ -97,10 +101,24 @@ FIN_BOX BOX std:Exit:Box13 ISEXEC:FALSE -151.363754:7.986853:-900.000000 -180.938754:-2.013147:-900.000000 +147.783876:6.196914:-900.000000 +177.358876:-3.803086:-900.000000 FIN_BOX -CONNECTIONS:11 +BOX +std:ConcatStrings:Box14 +ISEXEC:FALSE +58.345825:49.439174:-900.000000 +98.070825:39.439174:-900.000000 +PORT +In1:" BaseDir=" +FIN_BOX +BOX +std:ConcatStrings:Box15 +ISEXEC:FALSE +65.081450:98.375398:-900.000000 +104.806450:88.375398:-900.000000 +FIN_BOX +CONNECTIONS:14 CONNECTION Box04:Widget:Box03:Widget2 NumberOfControlPoints:0 @@ -129,9 +147,18 @@ CONNECTION Box13:BoxChange:Box12:In9 NumberOfControlPoints:0 CONNECTION -Box10:Out:Box11:In2 +Box11:Out:Box09:In NumberOfControlPoints:0 CONNECTION -Box11:Out:Box09:In +Box10:Out:Box11:In3 +NumberOfControlPoints:0 +CONNECTION +BaseDir:BaseDir:Box15:In1 +NumberOfControlPoints:0 +CONNECTION +Box15:Out:Box14:In2 +NumberOfControlPoints:0 +CONNECTION +Box14:Out:Box11:In2 NumberOfControlPoints:0 APP_END diff --git a/appli/template_creaPatientsSystem/scripts/00000_User.bbs b/appli/template_creaPatientsSystem/scripts/00000_User.bbs index 481e8e0..761249c 100644 --- a/appli/template_creaPatientsSystem/scripts/00000_User.bbs +++ b/appli/template_creaPatientsSystem/scripts/00000_User.bbs @@ -39,7 +39,7 @@ new wx:CommandButton Box08 new std:ExecSystemCommand Box09 new std:ConcatStrings Box10 - set Box10.In1 "creaUser=" + set Box10.In1 " creaUser=" new std:ConcatStrings Box11 set Box11.In1 "bbi 00010_Menu.bbs " @@ -49,6 +49,11 @@ new std:MultipleInputs Box12 new std:Exit Box13 +new std:ConcatStrings Box14 + set Box14.In1 " BaseDir=" + +new std:ConcatStrings Box15 + connect Box04.Widget Box03.Widget2 @@ -68,12 +73,18 @@ connect Box09.BoxChange Box12.In2 connect Box13.BoxChange Box12.In9 -connect Box10.Out Box11.In2 - connect Box11.Out Box09.In +connect Box10.Out Box11.In3 + + +connect Box15.Out Box14.In2 + +connect Box14.Out Box11.In2 + # Complex input ports +input BaseDir Box15.In1 " " exec Box06 exec Box07 diff --git a/appli/template_creaPatientsSystem/scripts/00010_Menu.bbg b/appli/template_creaPatientsSystem/scripts/00010_Menu.bbg index eafa54d..2810ff0 100644 --- a/appli/template_creaPatientsSystem/scripts/00010_Menu.bbg +++ b/appli/template_creaPatientsSystem/scripts/00010_Menu.bbg @@ -8,12 +8,16 @@ CATEGORY: DESCRIPTION:Description ?? AUTHOR:Author ?? COMPLEXBOX:FALSE -COMPLEXINPUTS:1 +COMPLEXINPUTS:2 COMPLEX_PORT creaUser -402.285778:497.890740:-900.000000 +422.619484:541.457853:-900.000000 FIN_COMPLEX_PORT -BOXES:106 +COMPLEX_PORT +BaseDir +349.447927:541.989785:-900.000000 +FIN_COMPLEX_PORT +BOXES:111 BOX wx:LayoutLine:Box00 ISEXEC:FALSE @@ -69,8 +73,8 @@ FIN_BOX BOX std:ExecSystemCommand:Box09 ISEXEC:TRUE -265.388095:-412.539335:-900.000000 -313.688095:-422.539335:-900.000000 +265.781882:-447.980125:-900.000000 +314.081882:-457.980125:-900.000000 FIN_BOX BOX std:ConcatStrings:Box10 @@ -83,8 +87,10 @@ FIN_BOX BOX std:ConcatStrings:Box11 ISEXEC:FALSE -320.399627:466.827531:-900.000000 -360.124627:456.827531:-900.000000 +316.855548:471.552970:-900.000000 +356.580548:461.552970:-900.000000 +PORT +In1:"../" FIN_BOX BOX std:ConcatStrings:Box12 @@ -707,22 +713,6 @@ ISEXEC:FALSE 533.677420:-264.189222:-900.000000 FIN_BOX BOX -std:ConcatStrings:Box138 -ISEXEC:FALSE -267.583709:494.688797:-900.000000 -308.433709:484.688797:-900.000000 -PORT -In1:"../" -FIN_BOX -BOX -std:ConcatStrings:Box140 -ISEXEC:FALSE -324.128283:493.929447:-900.000000 -364.978283:483.929447:-900.000000 -PORT -In1:"/Users/davila/CreatisWork/tmpCharly/" -FIN_BOX -BOX std:ConcatStrings:Box141 ISEXEC:FALSE 234.272291:305.487936:-900.000000 @@ -796,15 +786,13 @@ Search:"" FIN_BOX BOX wx:LayoutLine:Box150 -ISEXEC:TRUE -376.264702:-404.588291:-900.000000 -433.824702:-414.588291:-900.000000 +ISEXEC:FALSE +366.420038:-316.380102:-900.000000 +423.980038:-326.380102:-900.000000 PORT Orientation:"H" PORT -WinHeight:"600" -PORT -WinWidth:"900" +WinTitle:"Menu" FIN_BOX BOX std:ConcatStrings:Box151 @@ -815,8 +803,8 @@ FIN_BOX BOX std:ConcatStrings:Box152 ISEXEC:FALSE -439.247794:-377.419823:-900.000000 -480.097794:-387.419823:-900.000000 +442.256717:-407.630340:-900.000000 +483.106717:-417.630340:-900.000000 PORT In1:"00010_menu.bbg (v.1)" PORT @@ -870,7 +858,59 @@ In1:"creaUser=" PORT In3:" " FIN_BOX -CONNECTIONS:160 +BOX +wx:LayoutLine:Box158 +ISEXEC:TRUE +378.093973:-439.479105:-900.000000 +435.653973:-449.479105:-900.000000 +PORT +WinHeight:"600" +PORT +WinWidth:"900" +FIN_BOX +BOX +wx:LayoutTab:Box159 +ISEXEC:FALSE +373.807472:-411.231192:-900.000000 +431.367472:-421.231192:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box160 +ISEXEC:FALSE +482.098775:-356.494861:-900.000000 +539.658775:-366.494861:-900.000000 +PORT +WinTitle:"Config" +FIN_BOX +BOX +wx:InputText:Box161 +ISEXEC:FALSE +346.763786:502.220518:-900.000000 +382.938786:492.220518:-900.000000 +PORT +Title:"BaseDir" +FIN_BOX +BOX +wx:OutputText:Box162 +ISEXEC:FALSE +474.616830:-315.147273:-900.000000 +512.516830:-325.147273:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box163 +ISEXEC:FALSE +476.502649:446.352812:-900.000000 +514.402649:436.352812:-900.000000 +PORT +Title:"User" +FIN_BOX +BOX +std:ConcatStrings:Box164 +ISEXEC:FALSE +341.151401:525.203821:-900.000000 +382.001401:515.203821:-900.000000 +FIN_BOX +CONNECTIONS:169 CONNECTION Box06:Out:Box05:In NumberOfControlPoints:0 @@ -1217,9 +1257,6 @@ CONNECTION Box98:Widget:Box137:BoxContent NumberOfControlPoints:0 CONNECTION -Box140:Out:Box11:In1 -NumberOfControlPoints:0 -CONNECTION Box05:Out:Box141:In3 NumberOfControlPoints:0 CONNECTION @@ -1292,9 +1329,6 @@ CONNECTION creaUser:creaUser:Box151:In1 NumberOfControlPoints:0 CONNECTION -Box152:Out:Box150:WinTitle -NumberOfControlPoints:0 -CONNECTION Box151:Out:Box152:In3 NumberOfControlPoints:0 CONNECTION @@ -1351,4 +1385,37 @@ NumberOfControlPoints:0 CONNECTION Box90:OutString:Box143:In2 NumberOfControlPoints:0 +CONNECTION +Box152:Out:Box158:WinTitle +NumberOfControlPoints:0 +CONNECTION +Box150:Widget:Box159:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box161:Widget:Box160:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box162:Widget:Box160:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box159:Widget:Box158:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box160:Widget:Box159:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box163:Widget:Box160:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box151:Out:Box163:In +NumberOfControlPoints:0 +CONNECTION +Box161:Out:Box11:In1 +NumberOfControlPoints:0 +CONNECTION +BaseDir:BaseDir:Box164:In1 +NumberOfControlPoints:0 +CONNECTION +Box164:Out:Box161:In +NumberOfControlPoints:0 APP_END diff --git a/appli/template_creaPatientsSystem/scripts/00010_Menu.bbs b/appli/template_creaPatientsSystem/scripts/00010_Menu.bbs index f739373..ec7c590 100644 --- a/appli/template_creaPatientsSystem/scripts/00010_Menu.bbs +++ b/appli/template_creaPatientsSystem/scripts/00010_Menu.bbs @@ -41,6 +41,7 @@ new std:ConcatStrings Box10 set Box10.In2 "results" new std:ConcatStrings Box11 + set Box11.In1 "../" new std:ConcatStrings Box12 set Box12.In1 "mkdir " @@ -273,12 +274,6 @@ new wx:StaticBox Box136 new wx:StaticBox Box137 -new std:ConcatStrings Box138 - set Box138.In1 "../" - -new std:ConcatStrings Box140 - set Box140.In1 "/Users/davila/CreatisWork/tmpCharly/" - new std:ConcatStrings Box141 set Box141.In1 "VOID" set Box141.In2 " " @@ -309,8 +304,7 @@ new std:ReplaceString Box149 new wx:LayoutLine Box150 set Box150.Orientation "H" - set Box150.WinHeight "600" - set Box150.WinWidth "900" + set Box150.WinTitle "Menu" new std:ConcatStrings Box151 @@ -337,6 +331,25 @@ new std:ConcatStrings Box157 set Box157.In1 "creaUser=" set Box157.In3 " " +new wx:LayoutLine Box158 + set Box158.WinHeight "600" + set Box158.WinWidth "900" + +new wx:LayoutTab Box159 + +new wx:LayoutLine Box160 + set Box160.WinTitle "Config" + +new wx:InputText Box161 + set Box161.Title "BaseDir" + +new wx:OutputText Box162 + +new wx:OutputText Box163 + set Box163.Title "User" + +new std:ConcatStrings Box164 + connect Box06.Out Box05.In @@ -568,8 +581,6 @@ connect Box33.Widget Box136.BoxContent connect Box98.Widget Box137.BoxContent -connect Box140.Out Box11.In1 - connect Box05.Out Box141.In3 connect Box141.Out Box112.In @@ -617,8 +628,6 @@ connect Box136.Widget Box150.Widget4 connect Box137.Widget Box150.Widget6 -connect Box152.Out Box150.WinTitle - connect Box151.Out Box152.In3 connect Box65.Out Box66.In2 @@ -657,9 +666,31 @@ connect Box143.Out Box28.In3 connect Box90.OutString Box143.In2 +connect Box152.Out Box158.WinTitle + +connect Box150.Widget Box159.Widget1 + +connect Box161.Widget Box160.Widget2 + +connect Box162.Widget Box160.Widget1 + +connect Box159.Widget Box158.Widget2 + +connect Box160.Widget Box159.Widget2 + +connect Box163.Widget Box160.Widget3 + +connect Box151.Out Box163.In + +connect Box161.Out Box11.In1 + + +connect Box164.Out Box161.In + # Complex input ports input creaUser Box151.In1 " " +input BaseDir Box164.In1 " " exec Box09 -exec Box150 +exec Box158 diff --git a/appli/template_creaPatientsSystem/scripts/Run_Application.bat b/appli/template_creaPatientsSystem/scripts/Run_Application.bat deleted file mode 100644 index 42221cb..0000000 --- a/appli/template_creaPatientsSystem/scripts/Run_Application.bat +++ /dev/null @@ -1 +0,0 @@ -bbi menu.bbs diff --git a/appli/template_creaPatientsSystem/scripts/Run_Application.sh b/appli/template_creaPatientsSystem/scripts/Run_Application.sh deleted file mode 100644 index c66a20e..0000000 --- a/appli/template_creaPatientsSystem/scripts/Run_Application.sh +++ /dev/null @@ -1,4 +0,0 @@ -source ~/.bbtk/profile_creatools -PATH=$PATH:/Users/davila/Library/Python/3.8/bin - -bbi 00000_User.bbs -- 2.45.1