From d4edeacf459442a7eb289cb6732a7571c4a46e39 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Thu, 14 Nov 2024 15:15:32 +0100 Subject: [PATCH] #3473 Compare Images with color layers --- .../boxes/CompareImagesSwitcherWidget_3Dp.bbg | 123 ++++++++++++------ .../boxes/CompareImagesSwitcherWidget_3Dp.bbs | 32 +++-- .../CompareImages_3DwithPlanes_Widget.bbg | 18 ++- .../CompareImages_3DwithPlanes_Widget.bbs | 6 +- 4 files changed, 125 insertions(+), 54 deletions(-) diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg index 0d48937..fd05a8e 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg @@ -30,15 +30,15 @@ windowcolorlevel 26.116036:118.799900:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -_imageLayer -163.215250:118.793045:-900.000000 +_VecImageLayer +160.000262:115.179274:-900.000000 FIN_COMPLEX_PORT -BOXES:73 +BOXES:76 BOX PackRecalage:ImageSwitcherBox:switch ISEXEC:FALSE -18.613768:68.247673:-900.000000 -43.133768:65.747673:-900.000000 +19.450371:64.482961:-900.000000 +43.970371:61.982961:-900.000000 PORT Title:"200" FIN_BOX @@ -72,7 +72,7 @@ ISEXEC:FALSE 62.525871:-143.096719:-900.000000 85.285871:-145.596719:-900.000000 PORT -Proportion:"95" +Proportion:"75" PORT WinTitle:"Switcher" FIN_BOX @@ -93,8 +93,8 @@ FIN_BOX BOX creaMaracasVisu:ViewerNV:Box49 ISEXEC:FALSE --96.028458:-16.207341:-900.000000 --55.668458:-18.707341:-900.000000 +-97.929828:-15.343082:-900.000000 +-57.569828:-17.843082:-900.000000 PORT nTypeView:"-1" FIN_BOX @@ -289,24 +289,24 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box54 ISEXEC:FALSE --100.826476:-30.959645:-900.000000 --71.786476:-33.459645:-900.000000 +-98.435936:-27.329757:-900.000000 +-69.395936:-29.829757:-900.000000 PORT InteractionType:"12" FIN_BOX BOX std:GetVectorDoubleElement:Box55 ISEXEC:FALSE --120.262930:-53.254552:-900.000000 --97.137930:-55.754552:-900.000000 +-106.089083:-39.426409:-900.000000 +-82.964083:-41.926409:-900.000000 PORT I:"0" FIN_BOX BOX std:GetVectorDoubleElement:Box56 ISEXEC:FALSE --82.055993:-53.835490:-900.000000 --58.930993:-56.335490:-900.000000 +-74.104811:-40.007347:-900.000000 +-50.979811:-42.507347:-900.000000 PORT I:"1" FIN_BOX @@ -529,8 +529,8 @@ FIN_BOX BOX std:MagicBox:Box101 ISEXEC:FALSE -156.270180:108.612018:-900.000000 -177.980180:106.112018:-900.000000 +156.082342:100.335424:-900.000000 +177.792342:97.835424:-900.000000 FIN_BOX BOX creaMaracasVisu:ColorLayerImageView2:Box105 @@ -578,7 +578,27 @@ ISEXEC:FALSE -72.189319:-157.569493:-900.000000 -48.929319:-160.069493:-900.000000 FIN_BOX -CONNECTIONS:120 +BOX +vtk:GetVectorVtkImageDataElement:Box113 +ISEXEC:FALSE +-21.507773:-151.421217:-900.000000 +2.437227:-153.921217:-900.000000 +PORT +I:"3" +FIN_BOX +BOX +std:MultipleInputs:Box117 +ISEXEC:FALSE +-4.773573:-65.775602:-900.000000 +17.306427:-68.275602:-900.000000 +FIN_BOX +BOX +vtk:ImageVtkProperties:Box118 +ISEXEC:FALSE +-22.117352:-157.289903:-900.000000 +0.527648:-159.789903:-900.000000 +FIN_BOX +CONNECTIONS:127 CONNECTION checkS:Out:switch:On NumberOfControlPoints:0 @@ -694,12 +714,6 @@ CONNECTION Box54:WindowColorLevel:Box56:In NumberOfControlPoints:0 CONNECTION -Box55:Out:Box28:WindowLevel -NumberOfControlPoints:0 -CONNECTION -Box56:Out:Box28:ColorLevel -NumberOfControlPoints:0 -CONNECTION Box30:BoxChange:Box57:In1 NumberOfControlPoints:0 CONNECTION @@ -721,12 +735,6 @@ CONNECTION Box54:BoxChange:Box59:In2 NumberOfControlPoints:0 CONNECTION -Box56:Out:Box24:ColorLevel -NumberOfControlPoints:0 -CONNECTION -Box55:Out:Box24:WindowLevel -NumberOfControlPoints:0 -CONNECTION Box60:widget:Box52:Widget2 NumberOfControlPoints:0 CONNECTION @@ -886,24 +894,12 @@ CONNECTION Box99:Out:Box95:Opacity NumberOfControlPoints:0 CONNECTION -Box99:BoxChange:Box95:BoxExecute -NumberOfControlPoints:0 -CONNECTION Box99:Widget:Box48:Widget3 NumberOfControlPoints:0 CONNECTION -_imageLayer:_imageLayer:Box101:In -NumberOfControlPoints:0 -CONNECTION Box101:Out:Box100:In NumberOfControlPoints:0 CONNECTION -Box99:BoxChange:Box105:BoxExecute -NumberOfControlPoints:0 -CONNECTION -Box99:BoxChange:Box106:BoxExecute -NumberOfControlPoints:0 -CONNECTION Box99:Out:Box105:Opacity NumberOfControlPoints:0 CONNECTION @@ -939,4 +935,49 @@ NumberOfControlPoints:0 CONNECTION Box111:Out:Box106:In NumberOfControlPoints:0 +CONNECTION +_VecImageLayer:_VecImageLayer:Box101:In +NumberOfControlPoints:0 +CONNECTION +Box101:Out:Box113:In +NumberOfControlPoints:0 +CONNECTION +Box99:BoxChange:Box117:In2 +NumberOfControlPoints:0 +CONNECTION +Box117:BoxChange:Box95:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box117:BoxChange:Box105:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box117:BoxChange:Box106:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box113:Out:Box118:In +NumberOfControlPoints:0 +CONNECTION +Box118:MinMax:Box106:lstRangeForColorBar +NumberOfControlPoints:0 +CONNECTION +Box118:MinMax:Box105:lstRangeForColorBar +NumberOfControlPoints:0 +CONNECTION +Box118:MinMax:Box95:lstRangeForColorBar +NumberOfControlPoints:0 +CONNECTION +Box57:BoxChange:Box117:In3 +NumberOfControlPoints:0 +CONNECTION +Box55:Out:Box24:WindowLevel +NumberOfControlPoints:0 +CONNECTION +Box56:Out:Box24:ColorLevel +NumberOfControlPoints:0 +CONNECTION +Box55:Out:Box28:WindowLevel +NumberOfControlPoints:0 +CONNECTION +Box56:Out:Box28:ColorLevel +NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs index 4abd92a..f53cd70 100644 --- a/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs +++ b/PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs @@ -32,7 +32,7 @@ new wx:Slider sdrT set sdrT.ReactiveOnTrack "True" new wx:LayoutSplit switchWindow - set switchWindow.Proportion "95" + set switchWindow.Proportion "75" set switchWindow.WinTitle "Switcher" new wx:LayoutLine Box47 @@ -217,6 +217,13 @@ new creaMaracasVisu:ImageChangeInformation Box110 new creaMaracasVisu:ImageChangeInformation Box111 +new vtk:GetVectorVtkImageDataElement Box113 + set Box113.I "3" + +new std:MultipleInputs Box117 + +new vtk:ImageVtkProperties Box118 + connect checkS.Out switch.On connect sdrT.Out switch.Time @@ -253,8 +260,6 @@ connect Box46.Widget Box29.Widget1 connect Box51.Widget Box29.Widget2 connect Box54.WindowColorLevel Box55.In connect Box54.WindowColorLevel Box56.In -connect Box55.Out Box28.WindowLevel -connect Box56.Out Box28.ColorLevel connect Box30.BoxChange Box57.In1 connect Box57.BoxChange Box28.BoxExecute connect Box54.BoxChange Box57.In2 @@ -262,8 +267,6 @@ connect Box49.wxVtkBaseView1 Box54.wxVtkBaseView connect Box25.BoxChange Box59.In1 connect Box59.BoxChange Box24.BoxExecute connect Box54.BoxChange Box59.In2 -connect Box56.Out Box24.ColorLevel -connect Box55.Out Box24.WindowLevel connect Box60.widget Box52.Widget2 connect Box61.Out Box62.In connect Box61.Out Box63.In @@ -316,11 +319,8 @@ connect checkS.Out Box98.In1 connect Box98.Out Box96.In2 connect Box24.wxVtkBaseView1 Box95.WxVtkBaseView connect Box99.Out Box95.Opacity -connect Box99.BoxChange Box95.BoxExecute connect Box99.Widget Box48.Widget3 connect Box101.Out Box100.In -connect Box99.BoxChange Box105.BoxExecute -connect Box99.BoxChange Box106.BoxExecute connect Box99.Out Box105.Opacity connect Box99.Out Box106.Opacity connect Box101.Out Box107.In @@ -333,12 +333,26 @@ connect Box107.Out Box110.In connect Box110.Out Box105.In connect Box108.Out Box111.In connect Box111.Out Box106.In +connect Box101.Out Box113.In +connect Box99.BoxChange Box117.In2 +connect Box117.BoxChange Box95.BoxExecute +connect Box117.BoxChange Box105.BoxExecute +connect Box117.BoxChange Box106.BoxExecute +connect Box113.Out Box118.In +connect Box118.MinMax Box106.lstRangeForColorBar +connect Box118.MinMax Box105.lstRangeForColorBar +connect Box118.MinMax Box95.lstRangeForColorBar +connect Box57.BoxChange Box117.In3 +connect Box55.Out Box24.WindowLevel +connect Box56.Out Box24.ColorLevel +connect Box55.Out Box28.WindowLevel +connect Box56.Out Box28.ColorLevel # Complex input ports input ImageVector1 Box22.In " " input ImageVector2 Box23.In " " input windowcolorlevel Box61.In " " -input _imageLayer Box101.In " " +input _VecImageLayer Box101.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 a844c3d..373a4c6 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbg @@ -41,7 +41,7 @@ COMPLEX_PORT ImageLayer 54.597079:52.740503:-900.000000 FIN_COMPLEX_PORT -BOXES:19 +BOXES:20 BOX wx:LayoutTab:tabs ISEXEC:FALSE @@ -162,7 +162,13 @@ ISEXEC:FALSE 86.734580:-2.528407:-900.000000 110.969580:-5.028407:-900.000000 FIN_BOX -CONNECTIONS:55 +BOX +vtk:AddImageToVector:Box28 +ISEXEC:FALSE +77.283322:-8.356884:-900.000000 +101.803322:-10.856884:-900.000000 +FIN_BOX +CONNECTIONS:57 CONNECTION In2:In2:Box59:In NumberOfControlPoints:0 @@ -326,6 +332,12 @@ CONNECTION Box12:Out:Box27:Point NumberOfControlPoints:0 CONNECTION -Box27:Out:Box17:_imageLayer +Box27:Out:Box28:ImageVector +NumberOfControlPoints:0 +CONNECTION +Box26:Out:Box28:In0 +NumberOfControlPoints:0 +CONNECTION +Box28:Out:Box17:_VecImageLayer NumberOfControlPoints:0 APP_END diff --git a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs index 559f1a5..8931c50 100644 --- a/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs +++ b/PackRecalage/bbs/boxes/CompareImages_3DwithPlanes_Widget.bbs @@ -59,6 +59,8 @@ new vtk:vtkImageDataPointerRelay Box26 new PackRecalage:CompareImagesWidget_base_3Dp_B Box27 +new vtk:AddImageToVector Box28 + connect Box18.ConvolutionFactor Box13.ConvolutionFactor connect Box18.ConvolutionOnOff Box13.ConvolutionOnOff @@ -107,7 +109,9 @@ connect Box18.ConvolutionFactor Box27.ConvolutionFactor connect Box18.ConvolutionOnOff Box27.ConvolutionOnOff connect Box26.Out Box27.In connect Box12.Out Box27.Point -connect Box27.Out Box17._imageLayer +connect Box27.Out Box28.ImageVector +connect Box26.Out Box28.In0 +connect Box28.Out Box17._VecImageLayer # Complex input ports input In2 Box59.In " " -- 2.47.1