]> Creatis software - creaVtk.git/commitdiff
#3316 creaVtk Feature New Normal - VoiMPR box
authorEduardo DAVILA <davila@ei-ed-606.univ-lyon1.fr>
Tue, 29 Oct 2019 15:26:46 +0000 (16:26 +0100)
committerEduardo DAVILA <davila@ei-ed-606.univ-lyon1.fr>
Tue, 29 Oct 2019 15:26:46 +0000 (16:26 +0100)
bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbg
bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbs
bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbg
bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbs

index 6b12b16602b17d60617b3cdccaa5fe791c3cf41d..26b85e7959412b34611e0603f98fc8ac8af859e5 100644 (file)
@@ -31,16 +31,24 @@ COMPLEX_PORT
 boxchangeRender
 2.545632:-132.673333:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:2
+COMPLEXINPUTS:4
 COMPLEX_PORT
 Image
--165.967032:312.412587:-900.000000
+-168.187558:310.360283:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Execute
-120.347352:309.716369:-900.000000
+228.203173:299.936940:-900.000000
 FIN_COMPLEX_PORT
-BOXES:21
+COMPLEX_PORT
+voi_index
+-66.733674:307.314091:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+voi_size
+55.531289:304.814600:-900.000000
+FIN_COMPLEX_PORT
+BOXES:32
 BOX
 creaMaracasVisu:SliderMinMax:Box03
 ISEXEC:FALSE
@@ -138,24 +146,24 @@ FIN_BOX
 BOX
 std:GetVectorIntElement:Box32
 ISEXEC:FALSE
--176.463853:148.268737:-900.000000
--130.013853:138.268737:-900.000000
+-195.304681:222.622717:-900.000000
+-148.854681:212.622717:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 std:GetVectorIntElement:Box33
 ISEXEC:FALSE
--96.363202:149.019418:-900.000000
--49.913202:139.019418:-900.000000
+-179.801153:204.532571:-900.000000
+-133.351153:194.532571:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 std:GetVectorIntElement:Box34
 ISEXEC:FALSE
--25.459447:142.925896:-900.000000
-20.990553:132.925896:-900.000000
+-157.681683:187.336418:-900.000000
+-111.231683:177.336418:-900.000000
 PORT
 I:"2"
 FIN_BOX
@@ -175,7 +183,7 @@ In:"true"
 PORT
 ReactiveOnKeystroke:"true"
 PORT
-Title:"Active"
+Title:"VOI"
 FIN_BOX
 BOX
 wx:LayoutTab:Box21
@@ -219,7 +227,99 @@ ISEXEC:FALSE
 PORT
 WinTitle:"Z"
 FIN_BOX
-CONNECTIONS:37
+BOX
+std:MagicBox:Box28
+ISEXEC:FALSE
+-77.651260:276.041682:-900.000000
+-41.576260:266.041682:-900.000000
+FIN_BOX
+BOX
+std:GetVectorIntElement:Box29
+ISEXEC:FALSE
+-104.988021:245.650707:-900.000000
+-58.538021:235.650707:-900.000000
+PORT
+ErrorValue:"0"
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorIntElement:Box35
+ISEXEC:FALSE
+-93.858256:230.924994:-900.000000
+-47.408256:220.924994:-900.000000
+PORT
+ErrorValue:"0"
+PORT
+I:"1"
+FIN_BOX
+BOX
+std:GetVectorIntElement:Box36
+ISEXEC:FALSE
+-76.112550:216.420388:-900.000000
+-29.662550:206.420388:-900.000000
+PORT
+ErrorValue:"0"
+PORT
+I:"2"
+FIN_BOX
+BOX
+std:MagicBox:Box38
+ISEXEC:FALSE
+46.647627:278.729926:-900.000000
+82.722627:268.729926:-900.000000
+FIN_BOX
+BOX
+std:GetVectorIntElement:Box39
+ISEXEC:FALSE
+6.630210:191.808399:-900.000000
+53.080210:181.808399:-900.000000
+PORT
+ErrorValue:"0"
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorIntElement:Box41
+ISEXEC:FALSE
+16.775677:172.478119:-900.000000
+63.225677:162.478119:-900.000000
+PORT
+ErrorValue:"0"
+PORT
+I:"1"
+FIN_BOX
+BOX
+std:GetVectorIntElement:Box43
+ISEXEC:FALSE
+29.780635:150.315924:-900.000000
+76.230635:140.315924:-900.000000
+PORT
+ErrorValue:"0"
+PORT
+I:"2"
+FIN_BOX
+BOX
+std:MathOperationVector:Box44
+ISEXEC:FALSE
+43.734256:246.293026:-900.000000
+91.259256:236.293026:-900.000000
+PORT
+Type:"0"
+FIN_BOX
+BOX
+wx:OutputText:Box45
+ISEXEC:FALSE
+-293.423390:154.955039:-900.000000
+-256.648390:144.955039:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box46
+ISEXEC:FALSE
+-251.928697:138.682746:-900.000000
+-215.153697:128.682746:-900.000000
+FIN_BOX
+CONNECTIONS:60
 CONNECTION
 Box03:BoxChange:Box06:In1
 NumberOfControlPoints:0
@@ -266,15 +366,6 @@ CONNECTION
 Box30:Size:Box34:In
 NumberOfControlPoints:0
 CONNECTION
-Box32:Out:Box03:InMax
-NumberOfControlPoints:0
-CONNECTION
-Box33:Out:Box04:InMax
-NumberOfControlPoints:0
-CONNECTION
-Box34:Out:Box05:InMax
-NumberOfControlPoints:0
-CONNECTION
 Box06:BoxChange:Box40:In1
 NumberOfControlPoints:0
 CONNECTION
@@ -331,4 +422,82 @@ NumberOfControlPoints:0
 CONNECTION
 Box05:Widget:Box26:Widget1
 NumberOfControlPoints:0
+CONNECTION
+voi_index:voi_index:Box28:In
+NumberOfControlPoints:0
+CONNECTION
+Box28:Out:Box29:In
+NumberOfControlPoints:0
+CONNECTION
+Box28:Out:Box35:In
+NumberOfControlPoints:0
+CONNECTION
+Box28:Out:Box36:In
+NumberOfControlPoints:0
+CONNECTION
+voi_size:voi_size:Box38:In
+NumberOfControlPoints:0
+CONNECTION
+Box32:Out:Box39:ErrorValue
+NumberOfControlPoints:0
+CONNECTION
+Box33:Out:Box41:ErrorValue
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box43:ErrorValue
+NumberOfControlPoints:0
+CONNECTION
+Box38:Out:Box44:In0
+NumberOfControlPoints:0
+CONNECTION
+Box28:Out:Box44:In1
+NumberOfControlPoints:0
+CONNECTION
+Box44:Out:Box39:In
+NumberOfControlPoints:0
+CONNECTION
+Box44:Out:Box41:In
+NumberOfControlPoints:0
+CONNECTION
+Box44:Out:Box43:In
+NumberOfControlPoints:0
+CONNECTION
+Box29:Out:Box03:InMinShow
+NumberOfControlPoints:0
+CONNECTION
+Box35:Out:Box04:InMinShow
+NumberOfControlPoints:0
+CONNECTION
+Box36:Out:Box05:InMinShow
+NumberOfControlPoints:0
+CONNECTION
+Box39:Out:Box03:InMaxShow
+NumberOfControlPoints:0
+CONNECTION
+Box41:Out:Box04:InMaxShow
+NumberOfControlPoints:0
+CONNECTION
+Box43:Out:Box05:InMaxShow
+NumberOfControlPoints:0
+CONNECTION
+Box32:Out:Box03:InMax
+NumberOfControlPoints:0
+CONNECTION
+Box33:Out:Box04:InMax
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box05:InMax
+NumberOfControlPoints:0
+CONNECTION
+Box45:Widget:Box22:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box28:Out:Box45:In
+NumberOfControlPoints:0
+CONNECTION
+Box38:Out:Box46:In
+NumberOfControlPoints:0
+CONNECTION
+Box46:Widget:Box24:Widget3
+NumberOfControlPoints:0
 APP_END
index c9895552eab75fcd4292739dc868a9420b2deb21..252e66106002cc6c65526b28348c3f581b5a2512 100644 (file)
@@ -68,7 +68,7 @@ new std:MultipleInputs Box40
 new wx:CheckBox Box42
   set Box42.In "true"
   set Box42.ReactiveOnKeystroke "true"
-  set Box42.Title "Active"
+  set Box42.Title "VOI"
 
 new wx:LayoutTab Box21
 
@@ -85,6 +85,41 @@ new wx:LayoutTab Box25
 new wx:LayoutLine Box26
   set Box26.WinTitle "Z"
 
+new std:MagicBox Box28
+
+new std:GetVectorIntElement Box29
+  set Box29.ErrorValue "0"
+  set Box29.I "0"
+
+new std:GetVectorIntElement Box35
+  set Box35.ErrorValue "0"
+  set Box35.I "1"
+
+new std:GetVectorIntElement Box36
+  set Box36.ErrorValue "0"
+  set Box36.I "2"
+
+new std:MagicBox Box38
+
+new std:GetVectorIntElement Box39
+  set Box39.ErrorValue "0"
+  set Box39.I "0"
+
+new std:GetVectorIntElement Box41
+  set Box41.ErrorValue "0"
+  set Box41.I "1"
+
+new std:GetVectorIntElement Box43
+  set Box43.ErrorValue "0"
+  set Box43.I "2"
+
+new std:MathOperationVector Box44
+  set Box44.Type "0"
+
+new wx:OutputText Box45
+
+new wx:OutputText Box46
+
 
 connect Box03.BoxChange Box06.In1
 connect Box04.BoxChange Box06.In2
@@ -101,9 +136,6 @@ connect Box31.Out Box30.In
 connect Box30.Size Box32.In
 connect Box30.Size Box33.In
 connect Box30.Size Box34.In
-connect Box32.Out Box03.InMax
-connect Box33.Out Box04.InMax
-connect Box34.Out Box05.InMax
 connect Box06.BoxChange Box40.In1
 connect Box42.Widget Box11.Widget1
 connect Box42.BoxChange Box06.In4
@@ -116,10 +148,36 @@ connect Box23.Widget Box11.Widget5
 connect Box26.Widget Box25.Widget1
 connect Box25.Widget Box11.Widget8
 connect Box05.Widget Box26.Widget1
+connect Box28.Out Box29.In
+connect Box28.Out Box35.In
+connect Box28.Out Box36.In
+connect Box32.Out Box39.ErrorValue
+connect Box33.Out Box41.ErrorValue
+connect Box34.Out Box43.ErrorValue
+connect Box38.Out Box44.In0
+connect Box28.Out Box44.In1
+connect Box44.Out Box39.In
+connect Box44.Out Box41.In
+connect Box44.Out Box43.In
+connect Box29.Out Box03.InMinShow
+connect Box35.Out Box04.InMinShow
+connect Box36.Out Box05.InMinShow
+connect Box39.Out Box03.InMaxShow
+connect Box41.Out Box04.InMaxShow
+connect Box43.Out Box05.InMaxShow
+connect Box32.Out Box03.InMax
+connect Box33.Out Box04.InMax
+connect Box34.Out Box05.InMax
+connect Box45.Widget Box22.Widget3
+connect Box28.Out Box45.In
+connect Box38.Out Box46.In
+connect Box46.Widget Box24.Widget3
 
 # Complex input ports
 input Image Box31.In " "
 input Execute Box40.In2 " "
+input voi_index Box28.In " "
+input voi_size Box38.In " "
 
 # Complex output ports
 output widget Box11.Widget " "
index fde6a72f13c992e63e8d6a52650d9b95a2b467ab..27023b6967c530bd943a8a37632f731d755027ba 100644 (file)
@@ -31,7 +31,7 @@ COMPLEX_PORT
 size
 182.155431:-324.218825:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:6
+COMPLEXINPUTS:8
 COMPLEX_PORT
 execute
 202.846948:77.379235:-900.000000
@@ -56,6 +56,14 @@ COMPLEX_PORT
 RenderXZ
 66.284345:75.805900:-900.000000
 FIN_COMPLEX_PORT
+COMPLEX_PORT
+VoiIndex
+244.843857:77.603342:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+VoiSize
+262.608573:76.578085:-900.000000
+FIN_COMPLEX_PORT
 BOXES:21
 BOX
 creaVtk:VoiMPR-Interface:Box01
@@ -215,7 +223,7 @@ ISEXEC:FALSE
 -87.393532:-45.289394:-900.000000
 -42.043532:-55.289394:-900.000000
 FIN_BOX
-CONNECTIONS:44
+CONNECTIONS:46
 CONNECTION
 execute:execute:Box01:Execute
 NumberOfControlPoints:0
@@ -348,4 +356,10 @@ NumberOfControlPoints:0
 CONNECTION
 Box24:Spacing:Box02:Spacing
 NumberOfControlPoints:0
+CONNECTION
+VoiIndex:VoiIndex:Box01:voi_index
+NumberOfControlPoints:0
+CONNECTION
+VoiSize:VoiSize:Box01:voi_size
+NumberOfControlPoints:0
 APP_END
index caed524befb7dd16eb71136050465b1761484dc8..0de727b9f25c2bd41c4ef22624a0223e870d30b6 100644 (file)
@@ -116,6 +116,8 @@ input RenderXZ Box05.In " "
 input RenderYZ Box06.In " "
 input Point Box02.ActualPoint " "
 input image Box23.In " "
+input VoiIndex Box01.voi_index " "
+input VoiSize Box01.voi_size " "
 
 # Complex output ports
 output Widget Box01.widget " "