From ee984b5ab573377f9ad5e33db31268167452a773 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Fri, 5 Sep 2025 11:17:38 +0200 Subject: [PATCH] new options in ImagesSwitcher --- .../boxes/CompareImagesSwitcherWidget_3Dp.bbg | 228 ++++++++++++++---- .../boxes/CompareImagesSwitcherWidget_3Dp.bbs | 57 ++++- .../CompareImages_3DwithPlanes_Widget.bbg | 20 +- .../CompareImages_3DwithPlanes_Widget.bbs | 2 + 4 files changed, 257 insertions(+), 50 deletions(-) diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg index 5529ef6..8eab01e 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg @@ -16,7 +16,7 @@ COMPLEX_PORT Widget 61.252213:-169.894406:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:4 +COMPLEXINPUTS:6 COMPLEX_PORT ImageVector1 -116.863827:117.249315:-900.000000 @@ -33,12 +33,20 @@ COMPLEX_PORT _VecImageLayer 160.000262:115.179274:-900.000000 FIN_COMPLEX_PORT -BOXES:85 +COMPLEX_PORT +WidgetExtra01 +77.401767:117.169195:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +point +223.976367:118.338499:-900.000000 +FIN_COMPLEX_PORT +BOXES:95 BOX PackRecalage:ImageSwitcherBox:switch ISEXEC:FALSE 19.450371:64.482961:-900.000000 -43.970371:61.982961:-900.000000 +45.730371:61.982961:-900.000000 PORT Title:"200" FIN_BOX @@ -46,7 +54,7 @@ BOX wx:CheckBox:checkS ISEXEC:FALSE 107.667949:73.655113:-900.000000 -129.452949:71.155113:-900.000000 +130.427949:71.155113:-900.000000 PORT In:"true" PORT @@ -56,7 +64,7 @@ BOX wx:Slider:sdrT ISEXEC:FALSE 26.064277:72.980860:-900.000000 -55.864277:70.480860:-900.000000 +57.624277:70.480860:-900.000000 PORT In:"500" PORT @@ -70,7 +78,7 @@ BOX wx:LayoutSplit:switchWindow ISEXEC:FALSE 62.525871:-143.096719:-900.000000 -85.285871:-145.596719:-900.000000 +87.045871:-145.596719:-900.000000 PORT Proportion:"75" PORT @@ -80,7 +88,7 @@ BOX wx:LayoutLine:Box47 ISEXEC:FALSE 90.072707:7.231845:-900.000000 -123.392707:4.731845:-900.000000 +125.152707:4.731845:-900.000000 PORT Orientation:H FIN_BOX @@ -88,21 +96,21 @@ BOX wx:LayoutLine:Box48 ISEXEC:FALSE 78.929312:-18.043753:-900.000000 -112.249312:-20.543753:-900.000000 +114.009312:-20.543753:-900.000000 FIN_BOX BOX creaMaracasVisu:ViewerNV:Box49 ISEXEC:FALSE -97.929828:-15.343082:-900.000000 --57.569828:-17.843082:-900.000000 +-55.809828:-17.843082:-900.000000 PORT -nTypeView:"-1" +nTypeView:"0" FIN_BOX BOX wx:LayoutSplit:Box10 ISEXEC:FALSE -24.521668:-133.112159:-900.000000 --1.761668:-135.612159:-900.000000 +-0.001668:-135.612159:-900.000000 PORT Orientation:"H" FIN_BOX @@ -110,7 +118,7 @@ BOX wx:LayoutSplit:Box12 ISEXEC:FALSE -93.732506:-110.809616:-900.000000 --70.972506:-113.309616:-900.000000 +-69.212506:-113.309616:-900.000000 FIN_BOX BOX PackRecalage:ImageSwitcherFilter:Box17 @@ -150,9 +158,9 @@ BOX creaMaracasVisu:ViewerNV:Box24 ISEXEC:FALSE -174.713736:-75.272473:-900.000000 --134.353736:-77.772473:-900.000000 +-132.593736:-77.772473:-900.000000 PORT -nTypeView:"-1" +nTypeView:"0" FIN_BOX BOX PackRecalage:ImageSwitcherFilter:Box25 @@ -180,15 +188,15 @@ BOX creaMaracasVisu:ViewerNV:Box28 ISEXEC:FALSE -32.526980:-78.734192:-900.000000 -7.833020:-81.234192:-900.000000 +9.593020:-81.234192:-900.000000 PORT -nTypeView:"-1" +nTypeView:"0" FIN_BOX BOX wx:LayoutSplit:Box29 ISEXEC:FALSE 1.189206:-114.805770:-900.000000 -23.949206:-117.305770:-900.000000 +25.709206:-117.305770:-900.000000 FIN_BOX BOX PackRecalage:ImageSwitcherFilter:Box30 @@ -234,13 +242,13 @@ BOX wx:LayoutTab:Box41 ISEXEC:FALSE -83.157696:-100.808264:-900.000000 --49.837696:-103.308264:-900.000000 +-48.077696:-103.308264:-900.000000 FIN_BOX BOX wx:LayoutLine:Box42 ISEXEC:FALSE -74.350754:-87.220741:-900.000000 --41.030754:-89.720741:-900.000000 +-39.270754:-89.720741:-900.000000 PORT WinTitle:"Plane XZ (rotation/slice Y)" FIN_BOX @@ -248,13 +256,13 @@ BOX wx:LayoutTab:Box44 ISEXEC:FALSE -167.343844:-99.705676:-900.000000 --134.023844:-102.205676:-900.000000 +-132.263844:-102.205676:-900.000000 FIN_BOX BOX wx:LayoutLine:Box45 ISEXEC:FALSE -166.783749:-94.133492:-900.000000 --133.463749:-96.633492:-900.000000 +-131.703749:-96.633492:-900.000000 PORT WinTitle:"Plane XY (rotation/slice Z)" FIN_BOX @@ -262,13 +270,13 @@ BOX wx:LayoutTab:Box46 ISEXEC:FALSE -23.748311:-102.173738:-900.000000 -9.571689:-104.673738:-900.000000 +11.331689:-104.673738:-900.000000 FIN_BOX BOX wx:LayoutLine:Box50 ISEXEC:FALSE -23.381065:-97.324301:-900.000000 -9.938935:-99.824301:-900.000000 +11.698935:-99.824301:-900.000000 PORT WinTitle:"Plane YZ (rotation/slice X)" FIN_BOX @@ -276,13 +284,13 @@ BOX wx:LayoutTab:Box51 ISEXEC:FALSE 26.284837:-103.104775:-900.000000 -59.604837:-105.604775:-900.000000 +61.364837:-105.604775:-900.000000 FIN_BOX BOX wx:LayoutLine:Box52 ISEXEC:FALSE -32.382029:-96.042609:-900.000000 -65.702029:-98.542609:-900.000000 +55.801658:-92.970659:-900.000000 +90.881658:-95.470659:-900.000000 PORT WinTitle:"Viewer help" FIN_BOX @@ -325,8 +333,8 @@ FIN_BOX BOX creaMaracasVisu:HelpViewerNV:Box60 ISEXEC:FALSE -38.152994:-83.138636:-900.000000 -60.187994:-85.638636:-900.000000 +63.248807:-84.308907:-900.000000 +85.283807:-86.808907:-900.000000 FIN_BOX BOX std:MagicBox:Box61 @@ -354,7 +362,7 @@ BOX wx:CheckBox:Box64 ISEXEC:FALSE 134.633997:74.683788:-900.000000 -156.263997:72.183788:-900.000000 +157.393997:72.183788:-900.000000 PORT In:"true" PORT @@ -376,7 +384,7 @@ BOX wx:CommandButton:Box67 ISEXEC:FALSE 49.446402:55.767492:-900.000000 -71.721402:53.267492:-900.000000 +72.206402:53.267492:-900.000000 PORT Label:"Switch" FIN_BOX @@ -455,8 +463,8 @@ FIN_BOX BOX vtk:GetVectorVtkImageDataElement:Box91 ISEXEC:FALSE --69.995353:39.800866:-900.000000 --46.160353:37.300866:-900.000000 +-67.615639:38.753792:-900.000000 +-43.780639:36.253792:-900.000000 FIN_BOX BOX vtk:GetVectorVtkImageDataElement:Box94 @@ -504,7 +512,7 @@ BOX wx:Slider:Box99 ISEXEC:FALSE -82.487827:-53.561725:-900.000000 --52.687827:-56.061725:-900.000000 +-50.927827:-56.061725:-900.000000 PORT In:"0" PORT @@ -602,7 +610,7 @@ BOX wx:LayoutLine:Box116 ISEXEC:FALSE -76.532877:-80.237058:-900.000000 --43.212877:-82.737058:-900.000000 +-41.452877:-82.737058:-900.000000 PORT Orientation:"H" FIN_BOX @@ -648,7 +656,7 @@ BOX wx:LayoutLine:Box133 ISEXEC:FALSE -123.043494:-82.238461:-900.000000 --89.723494:-84.738461:-900.000000 +-87.963494:-84.738461:-900.000000 PORT Orientation:"V" FIN_BOX @@ -656,7 +664,7 @@ BOX wx:Slider:Box134 ISEXEC:FALSE -126.310102:-73.742981:-900.000000 --96.510102:-76.242981:-900.000000 +-94.750102:-76.242981:-900.000000 PORT Label:"true" PORT @@ -668,13 +676,91 @@ BOX wx:Slider:Box135 ISEXEC:FALSE -118.061111:-68.118047:-900.000000 --88.261111:-70.618047:-900.000000 +-86.501111:-70.618047:-900.000000 PORT ReactiveOnTrack:"true" PORT Title:"Max color table&&2P&&" FIN_BOX -CONNECTIONS:142 +BOX +std:MagicBox:Box128 +ISEXEC:FALSE +219.449475:103.406710:-900.000000 +241.159475:100.906710:-900.000000 +FIN_BOX +BOX +std:GetVectorIntElement:Box129 +ISEXEC:FALSE +187.364698:89.705745:-900.000000 +210.134698:87.205745:-900.000000 +PORT +I:"0" +FIN_BOX +BOX +std:GetVectorIntElement:Box130 +ISEXEC:FALSE +220.584383:90.397451:-900.000000 +243.354383:87.897451:-900.000000 +PORT +I:"1" +FIN_BOX +BOX +std:GetVectorIntElement:Box131 +ISEXEC:FALSE +254.353201:90.356979:-900.000000 +277.123201:87.856979:-900.000000 +PORT +I:"2" +FIN_BOX +BOX +std:ConcatStrings:Box132 +ISEXEC:FALSE +195.713959:76.647076:-900.000000 +218.473959:74.147076:-900.000000 +PORT +In2:" " +PORT +In4:" 0" +FIN_BOX +BOX +std:ConcatStrings:Box136 +ISEXEC:FALSE +227.898967:76.623292:-900.000000 +250.658967:74.123292:-900.000000 +PORT +In2:" " +PORT +In4:" 0" +FIN_BOX +BOX +std:ConcatStrings:Box137 +ISEXEC:FALSE +254.969442:76.940477:-900.000000 +277.729442:74.440477:-900.000000 +PORT +In2:" " +PORT +In4:" 0" +FIN_BOX +BOX +creaMaracasVisu:SetPosition:Box138 +ISEXEC:FALSE +107.121453:-99.697656:-900.000000 +128.891453:-102.197656:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:SetPosition:Box139 +ISEXEC:FALSE +135.457278:-101.205180:-900.000000 +157.227278:-103.705180:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:SetPosition:Box140 +ISEXEC:FALSE +157.906797:-100.502480:-900.000000 +179.676797:-103.002480:-900.000000 +FIN_BOX +CONNECTIONS:162 CONNECTION checkS:Out:switch:On NumberOfControlPoints:0 @@ -772,9 +858,6 @@ CONNECTION Box50:Widget:Box46:Widget1 NumberOfControlPoints:0 CONNECTION -Box52:Widget:Box51:Widget1 -NumberOfControlPoints:0 -CONNECTION Box28:Widget:Box50:Widget1 NumberOfControlPoints:0 CONNECTION @@ -1101,4 +1184,67 @@ NumberOfControlPoints:0 CONNECTION Box57:BoxChange:Box134:BoxExecute NumberOfControlPoints:0 +CONNECTION +Box52:Widget:Box51:Widget9 +NumberOfControlPoints:0 +CONNECTION +WidgetExtra01:WidgetExtra01:Box51:Widget3 +NumberOfControlPoints:0 +CONNECTION +point:point:Box128:In +NumberOfControlPoints:0 +CONNECTION +Box128:Out:Box129:In +NumberOfControlPoints:0 +CONNECTION +Box128:Out:Box130:In +NumberOfControlPoints:0 +CONNECTION +Box128:Out:Box131:In +NumberOfControlPoints:0 +CONNECTION +Box129:Out:Box132:In1 +NumberOfControlPoints:0 +CONNECTION +Box130:Out:Box132:In3 +NumberOfControlPoints:0 +CONNECTION +Box130:Out:Box136:In1 +NumberOfControlPoints:0 +CONNECTION +Box131:Out:Box136:In3 +NumberOfControlPoints:0 +CONNECTION +Box129:Out:Box137:In1 +NumberOfControlPoints:0 +CONNECTION +Box131:Out:Box137:In3 +NumberOfControlPoints:0 +CONNECTION +Box132:Out:Box138:Point +NumberOfControlPoints:0 +CONNECTION +Box136:Out:Box139:Point +NumberOfControlPoints:0 +CONNECTION +Box137:Out:Box140:Point +NumberOfControlPoints:0 +CONNECTION +Box24:wxVtkBaseView1:Box138:wxVtkBaseView +NumberOfControlPoints:0 +CONNECTION +Box49:wxVtkBaseView1:Box139:wxVtkBaseView +NumberOfControlPoints:0 +CONNECTION +Box59:BoxChange:Box138:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box59:BoxChange:Box139:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box59:BoxChange:Box140:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box28:wxVtkBaseView1:Box140:wxVtkBaseView +NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs index e7114b2..0725b1c 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs @@ -41,7 +41,7 @@ new wx:LayoutLine Box47 new wx:LayoutLine Box48 new creaMaracasVisu:ViewerNV Box49 - set Box49.nTypeView "-1" + set Box49.nTypeView "0" new wx:LayoutSplit Box10 set Box10.Orientation "H" @@ -61,7 +61,7 @@ new std:MagicBox Box22 new std:MagicBox Box23 new creaMaracasVisu:ViewerNV Box24 - set Box24.nTypeView "-1" + set Box24.nTypeView "0" new PackRecalage:ImageSwitcherFilter Box25 @@ -72,7 +72,7 @@ new vtk:GetVectorVtkImageDataElement Box27 set Box27.I "0" new creaMaracasVisu:ViewerNV Box28 - set Box28.nTypeView "-1" + set Box28.nTypeView "0" new wx:LayoutSplit Box29 @@ -253,6 +253,35 @@ new wx:Slider Box135 set Box135.ReactiveOnTrack "true" set Box135.Title "Max color table:" +new std:MagicBox Box128 + +new std:GetVectorIntElement Box129 + set Box129.I "0" + +new std:GetVectorIntElement Box130 + set Box130.I "1" + +new std:GetVectorIntElement Box131 + set Box131.I "2" + +new std:ConcatStrings Box132 + set Box132.In2 " " + set Box132.In4 " 0" + +new std:ConcatStrings Box136 + set Box136.In2 " " + set Box136.In4 " 0" + +new std:ConcatStrings Box137 + set Box137.In2 " " + set Box137.In4 " 0" + +new creaMaracasVisu:SetPosition Box138 + +new creaMaracasVisu:SetPosition Box139 + +new creaMaracasVisu:SetPosition Box140 + connect checkS.Out switch.On connect sdrT.Out switch.Time @@ -283,7 +312,6 @@ connect Box45.Widget Box44.Widget1 connect Box24.Widget Box45.Widget1 connect Box44.Widget Box12.Widget2 connect Box50.Widget Box46.Widget1 -connect Box52.Widget Box51.Widget1 connect Box28.Widget Box50.Widget1 connect Box46.Widget Box29.Widget1 connect Box51.Widget Box29.Widget2 @@ -391,12 +419,33 @@ connect Box134.Out Box123.In1 connect Box135.Out Box123.In3 connect Box57.BoxChange Box135.BoxExecute connect Box57.BoxChange Box134.BoxExecute +connect Box52.Widget Box51.Widget9 +connect Box128.Out Box129.In +connect Box128.Out Box130.In +connect Box128.Out Box131.In +connect Box129.Out Box132.In1 +connect Box130.Out Box132.In3 +connect Box130.Out Box136.In1 +connect Box131.Out Box136.In3 +connect Box129.Out Box137.In1 +connect Box131.Out Box137.In3 +connect Box132.Out Box138.Point +connect Box136.Out Box139.Point +connect Box137.Out Box140.Point +connect Box24.wxVtkBaseView1 Box138.wxVtkBaseView +connect Box49.wxVtkBaseView1 Box139.wxVtkBaseView +connect Box59.BoxChange Box138.BoxExecute +connect Box59.BoxChange Box139.BoxExecute +connect Box59.BoxChange Box140.BoxExecute +connect Box28.wxVtkBaseView1 Box140.wxVtkBaseView # Complex input ports input ImageVector1 Box22.In " " input ImageVector2 Box23.In " " input windowcolorlevel Box61.In " " input _VecImageLayer Box101.In " " +input WidgetExtra01 Box51.Widget3 " " +input point Box128.In " " # Complex output ports output Widget switchWindow.Widget " " diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg index 373a4c6..0367204 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg @@ -16,7 +16,7 @@ COMPLEX_PORT Widget 23.094658:-95.112277:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:6 +COMPLEXINPUTS:7 COMPLEX_PORT In2 9.912478:52.632655:-900.000000 @@ -41,12 +41,16 @@ COMPLEX_PORT ImageLayer 54.597079:52.740503:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +widgetExtra01 +-132.611090:50.312192:-900.000000 +FIN_COMPLEX_PORT BOXES:20 BOX wx:LayoutTab:tabs ISEXEC:FALSE -23.914520:-71.921963:-900.000000 -9.405480:-74.421963:-900.000000 +11.165480:-74.421963:-900.000000 PORT Orientation:V FIN_BOX @@ -108,7 +112,7 @@ BOX wx:LayoutSplit:Box16 ISEXEC:FALSE 21.136894:-84.718716:-900.000000 -43.896894:-87.218716:-900.000000 +45.656894:-87.218716:-900.000000 PORT Proportion:"5" FIN_BOX @@ -116,7 +120,7 @@ BOX wx:LayoutLine:Box20 ISEXEC:FALSE 13.366922:-41.578434:-900.000000 -46.686922:-44.078434:-900.000000 +48.446922:-44.078434:-900.000000 PORT WinTitle:"RGB" FIN_BOX @@ -168,7 +172,7 @@ ISEXEC:FALSE 77.283322:-8.356884:-900.000000 101.803322:-10.856884:-900.000000 FIN_BOX -CONNECTIONS:57 +CONNECTIONS:59 CONNECTION In2:In2:Box59:In NumberOfControlPoints:0 @@ -340,4 +344,10 @@ NumberOfControlPoints:0 CONNECTION Box28:Out:Box17:_VecImageLayer NumberOfControlPoints:0 +CONNECTION +widgetExtra01:widgetExtra01:Box17:WidgetExtra01 +NumberOfControlPoints:0 +CONNECTION +Box12:Out:Box17:point +NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs index 8931c50..e9a76fa 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs @@ -112,6 +112,7 @@ connect Box12.Out Box27.Point connect Box27.Out Box28.ImageVector connect Box26.Out Box28.In0 connect Box28.Out Box17._VecImageLayer +connect Box12.Out Box17.point # Complex input ports input In2 Box59.In " " @@ -120,6 +121,7 @@ input Point Box12.In " " input WinTitle Box16.WinTitle " " input BoxExecute Box21.BoxExecute " " input ImageLayer Box26.In " " +input widgetExtra01 Box17.WidgetExtra01 " " # Complex output ports output Widget Box16.Widget " " -- 2.51.0