From c943aeab204a9f067c6e1ae7b636a3e87aa1022c Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Tue, 23 Apr 2024 13:42:09 +0200 Subject: [PATCH] #3471 Add manual option to CompareImageSwitcherWidget --- .../boxes/CompareImagesSwitcherWidget_3Dp.bbg | 79 +++++++++++++------ .../boxes/CompareImagesSwitcherWidget_3Dp.bbs | 30 ++++--- 2 files changed, 73 insertions(+), 36 deletions(-) diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg index 6eb1472..8bbc79b 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg @@ -29,12 +29,12 @@ COMPLEX_PORT windowcolorlevel 26.116036:118.799900:-900.000000 FIN_COMPLEX_PORT -BOXES:60 +BOXES:62 BOX PackRecalage:ImageSwitcherBox:switch ISEXEC:FALSE -17.204325:54.153237:-900.000000 -41.724325:51.653237:-900.000000 +18.613768:68.247673:-900.000000 +43.133768:65.747673:-900.000000 PORT Title:"200" FIN_BOX @@ -371,8 +371,8 @@ FIN_BOX BOX wx:CommandButton:Box67 ISEXEC:FALSE -49.245053:54.559397:-900.000000 -71.520053:52.059397:-900.000000 +49.446402:55.767492:-900.000000 +71.721402:53.267492:-900.000000 PORT Label:"Switch" FIN_BOX @@ -394,23 +394,13 @@ ISEXEC:FALSE -94.572419:67.063936:-900.000000 -70.052419:64.563936:-900.000000 PORT -In0:"0 1" +In0:"0 0" PORT -In1:"0 0" +In1:"1 1" PORT -In2:"1 1" -FIN_BOX -BOX -wx:RadioButton:Box74 -ISEXEC:FALSE -66.506842:73.507107:-900.000000 -103.346842:71.007107:-900.000000 -PORT -In0:"A B" -PORT -In1:"A A" +In2:"0 1" PORT -In2:"B B" +In3:"0 1" FIN_BOX BOX std:GetVectorIntElement:Box75 @@ -470,7 +460,35 @@ ISEXEC:FALSE -33.444256:39.760394:-900.000000 -9.609256:37.260394:-900.000000 FIN_BOX -CONNECTIONS:97 +BOX +std:Add:Box96 +ISEXEC:FALSE +-15.039534:50.754661:-900.000000 +5.995466:48.254661:-900.000000 +FIN_BOX +BOX +std:Spin:Box97 +ISEXEC:FALSE +-18.865166:61.224813:-900.000000 +2.164834:58.724813:-900.000000 +PORT +End:"1" +PORT +Loop:"true" +PORT +Start:"0" +PORT +Step:"1" +FIN_BOX +BOX +std:Multiply:Box98 +ISEXEC:FALSE +0.464345:56.191086:-900.000000 +21.844345:53.691086:-900.000000 +PORT +In2:"2" +FIN_BOX +CONNECTIONS:100 CONNECTION checkS:Out:switch:On NumberOfControlPoints:0 @@ -688,12 +706,6 @@ CONNECTION Box70:Out:Box72:In NumberOfControlPoints:0 CONNECTION -Box74:Widget:Box47:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box74:Out:Box73:In -NumberOfControlPoints:0 -CONNECTION Box73:Out:Box75:In NumberOfControlPoints:0 CONNECTION @@ -762,4 +774,19 @@ NumberOfControlPoints:0 CONNECTION Box21:Out:Box84:In1 NumberOfControlPoints:0 +CONNECTION +Box97:Out:Box96:In1 +NumberOfControlPoints:0 +CONNECTION +Box96:Out:Box73:In +NumberOfControlPoints:0 +CONNECTION +Box66:BoxChange:Box97:BoxExecute +NumberOfControlPoints:0 +CONNECTION +checkS:Out:Box98:In1 +NumberOfControlPoints:0 +CONNECTION +Box98:Out:Box96:In2 +NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs index 40fb2a3..d89befd 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs @@ -149,14 +149,10 @@ new vtk:AddImageToVector Box70 new vtk:GetVectorVtkImageDataElement Box72 new std:StringSelect Box73 - set Box73.In0 "0 1" - set Box73.In1 "0 0" - set Box73.In2 "1 1" - -new wx:RadioButton Box74 - set Box74.In0 "A B" - set Box74.In1 "A A" - set Box74.In2 "B B" + set Box73.In0 "0 0" + set Box73.In1 "1 1" + set Box73.In2 "0 1" + set Box73.In3 "0 1" new std:GetVectorIntElement Box75 set Box75.I "0" @@ -178,6 +174,17 @@ new vtk:GetVectorVtkImageDataElement Box91 new vtk:GetVectorVtkImageDataElement Box94 +new std:Add Box96 + +new std:Spin Box97 + set Box97.End "1" + set Box97.Loop "true" + set Box97.Start "0" + set Box97.Step "1" + +new std:Multiply Box98 + set Box98.In2 "2" + connect checkS.Out switch.On connect sdrT.Out switch.Time @@ -247,8 +254,6 @@ connect Box66.BoxChange Box30.BoxExecute connect Box26.Out Box70.In0 connect Box27.Out Box70.In1 connect Box70.Out Box72.In -connect Box74.Widget Box47.Widget4 -connect Box74.Out Box73.In connect Box73.Out Box75.In connect Box75.Out Box72.I connect Box77.Out Box76.I @@ -272,6 +277,11 @@ connect Box85.Out Box17.In1 connect Box88.Out Box17.In2 connect Box19.Out Box84.In0 connect Box21.Out Box84.In1 +connect Box97.Out Box96.In1 +connect Box96.Out Box73.In +connect Box66.BoxChange Box97.BoxExecute +connect checkS.Out Box98.In1 +connect Box98.Out Box96.In2 # Complex input ports input ImageVector1 Box22.In " " -- 2.47.1