]> Creatis software - creaRigidRegistration.git/commitdiff
#3468 CompareImages new version
authoreduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Fri, 29 Mar 2024 14:36:09 +0000 (15:36 +0100)
committereduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Fri, 29 Mar 2024 14:36:09 +0000 (15:36 +0100)
PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbg
PackRecalage/bbs/boxes/CompareImagesParallelWidget.bbs
PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbg
PackRecalage/bbs/boxes/CompareImagesSwitcherWidget_3Dp.bbs
PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbg
PackRecalage/bbs/boxes/CompareImagesTransparencyWidget_3Dp.bbs

index 4c7bb2e1d9d1239008bac1a0693b869068f372ec..b14ade97f5f5c40fad6b9e60c96154ae9bfcc56d 100644 (file)
@@ -14,26 +14,26 @@ PACKAGENAME:PackRecalage
 COMPLEXOUTPUTS:1
 COMPLEX_PORT
 widget
-6.784998:-91.605139:-900.000000
+9.205423:-123.070660:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:4
 COMPLEX_PORT
 Image1
--49.024457:46.037536:-900.000000
+-52.939688:98.154892:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Image2
--12.142481:45.907670:-900.000000
+-16.057712:98.025026:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 point
-48.201847:46.777230:-900.000000
+44.286616:98.894586:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 boxExecute
--74.160296:46.101218:-900.000000
+-78.075527:98.218574:-900.000000
 FIN_COMPLEX_PORT
-BOXES:29
+BOXES:31
 BOX
 wx:LayoutLine:Box03
 ISEXEC:FALSE
@@ -47,22 +47,20 @@ FIN_BOX
 BOX
 std:MagicBox:Box04
 ISEXEC:FALSE
--51.362047:31.752264:-900.000000
--29.762047:29.252264:-900.000000
+-55.277278:83.869620:-900.000000
+-33.677278:81.369620:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box05
 ISEXEC:FALSE
--16.193871:31.648557:-900.000000
-5.406129:29.148557:-900.000000
+-20.109102:83.765913:-900.000000
+1.490898:81.265913:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box06
 ISEXEC:FALSE
--1.553731:-71.347377:-900.000000
-31.766269:-73.847377:-900.000000
-PORT
-WinTitle:"Parallel"
+-13.807131:-85.869925:-900.000000
+19.512869:-88.369925:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box07
@@ -207,8 +205,8 @@ FIN_BOX
 BOX
 std:MagicBox:Box25
 ISEXEC:FALSE
-45.244824:33.361102:-900.000000
-66.844824:30.861102:-900.000000
+41.329593:85.478458:-900.000000
+62.929593:82.978458:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:SetPosition:Box26
@@ -249,10 +247,30 @@ FIN_BOX
 BOX
 std:MagicBox:Box32
 ISEXEC:FALSE
--79.192176:32.827304:-900.000000
--57.592176:30.327304:-900.000000
+-83.107407:84.944660:-900.000000
+-61.507407:82.444660:-900.000000
 FIN_BOX
-CONNECTIONS:56
+BOX
+wx:LayoutSplit:Box33
+ISEXEC:FALSE
+1.388994:-105.611654:-900.000000
+24.148994:-108.111654:-900.000000
+PORT
+Proportion:"90"
+PORT
+WinTitle:"Parallel"
+FIN_BOX
+BOX
+wx:CheckBox:Box34
+ISEXEC:FALSE
+71.518200:51.705543:-900.000000
+93.148200:49.205543:-900.000000
+PORT
+In:"true"
+PORT
+Title:"Interpolate"
+FIN_BOX
+CONNECTIONS:64
 CONNECTION
 Image1:Image1:Box04:In
 NumberOfControlPoints:0
@@ -260,9 +278,6 @@ CONNECTION
 Image2:Image2:Box05:In
 NumberOfControlPoints:0
 CONNECTION
-Box06:Widget:widget:widget
-NumberOfControlPoints:0
-CONNECTION
 Box04:Out:Box07:In
 NumberOfControlPoints:0
 CONNECTION
@@ -421,4 +436,31 @@ NumberOfControlPoints:0
 CONNECTION
 Box13:Point:Box31:Point
 NumberOfControlPoints:0
+CONNECTION
+Box06:Widget:Box33:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box33:Widget:widget:widget
+NumberOfControlPoints:0
+CONNECTION
+Box34:Widget:Box33:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box08:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box07:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box10:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box11:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box13:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box34:Out:Box14:Interpolate
+NumberOfControlPoints:0
 APP_END
index 37f44f984884e54a0e17fdf1678d98d20e0e5cca..f764d5361523ae4ea14cb0d36886385f49f3d3b3 100644 (file)
@@ -25,7 +25,6 @@ new std:MagicBox Box04
 new std:MagicBox Box05
 
 new wx:LayoutTab Box06
-  set Box06.WinTitle "Parallel"
 
 new creaMaracasVisu:ViewerNV Box07
   set Box07.nTypeView "1"
@@ -96,6 +95,14 @@ new creaMaracasVisu:SetPosition Box31
 
 new std:MagicBox Box32
 
+new wx:LayoutSplit Box33
+  set Box33.Proportion "90"
+  set Box33.WinTitle "Parallel"
+
+new wx:CheckBox Box34
+  set Box34.In "true"
+  set Box34.Title "Interpolate"
+
 
 connect Box04.Out Box07.In
 connect Box05.Out Box08.In
@@ -148,6 +155,14 @@ connect Box10.BoxChange Box29.BoxExecute
 connect Box10.Point Box29.Point
 connect Box13.BoxChange Box31.BoxExecute
 connect Box13.Point Box31.Point
+connect Box06.Widget Box33.Widget1
+connect Box34.Widget Box33.Widget2
+connect Box34.Out Box08.Interpolate
+connect Box34.Out Box07.Interpolate
+connect Box34.Out Box10.Interpolate
+connect Box34.Out Box11.Interpolate
+connect Box34.Out Box13.Interpolate
+connect Box34.Out Box14.Interpolate
 
 # Complex input ports
 input Image1 Box04.In " "
@@ -156,7 +171,7 @@ input point Box25.In " "
 input boxExecute Box32.In " "
 
 # Complex output ports
-output widget Box06.Widget " "
+output widget Box33.Widget " "
 
 
 endefine
index 4d68f0523eb96037bfd2e1885cbac6838f5fb067..a1430ce4cd2dadea22f5245f94c5147e78594a98 100644 (file)
@@ -29,7 +29,7 @@ COMPLEX_PORT
 windowcolorlevel
 26.116036:118.799900:-900.000000
 FIN_COMPLEX_PORT
-BOXES:43
+BOXES:45
 BOX
 PackRecalage:ImageSwitcherBox:switch
 ISEXEC:FALSE
@@ -73,16 +73,16 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box47
 ISEXEC:FALSE
-90.737159:20.963852:-900.000000
-124.057159:18.463852:-900.000000
+90.072707:7.231845:-900.000000
+123.392707:4.731845:-900.000000
 PORT
 Orientation:H
 FIN_BOX
 BOX
 wx:LayoutLine:Box48
 ISEXEC:FALSE
-66.969177:-4.090262:-900.000000
-100.289177:-6.590262:-900.000000
+78.929312:-18.043753:-900.000000
+112.249312:-20.543753:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box49
@@ -344,7 +344,23 @@ ISEXEC:FALSE
 PORT
 I:"1"
 FIN_BOX
-CONNECTIONS:64
+BOX
+wx:CheckBox:Box64
+ISEXEC:FALSE
+126.816162:48.316211:-900.000000
+148.446162:45.816211:-900.000000
+PORT
+In:"true"
+PORT
+Title:"Interpolate"
+FIN_BOX
+BOX
+std:MultipleInputs:Box65
+ISEXEC:FALSE
+-114.976662:-4.084889:-900.000000
+-93.006662:-6.584889:-900.000000
+FIN_BOX
+CONNECTIONS:72
 CONNECTION
 checkS:Out:switch:On
 NumberOfControlPoints:0
@@ -508,9 +524,6 @@ CONNECTION
 Box49:wxVtkBaseView1:Box54:wxVtkBaseView
 NumberOfControlPoints:0
 CONNECTION
-Box17:BoxChange:Box49:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box25:BoxChange:Box59:In1
 NumberOfControlPoints:0
 CONNECTION
@@ -537,4 +550,31 @@ NumberOfControlPoints:0
 CONNECTION
 Box61:Out:Box63:In
 NumberOfControlPoints:0
+CONNECTION
+Box64:Widget:Box47:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box49:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box28:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box64:Out:Box24:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box64:BoxChange:Box57:In3
+NumberOfControlPoints:0
+CONNECTION
+Box64:BoxChange:Box59:In3
+NumberOfControlPoints:0
+CONNECTION
+Box17:BoxChange:Box65:In1
+NumberOfControlPoints:0
+CONNECTION
+Box65:BoxChange:Box49:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box64:BoxChange:Box65:In3
+NumberOfControlPoints:0
 APP_END
index 8b055edf1323627d4f2c0d89c570bfc1a635a385..7446abf92d9ea6debc4113628f8cb009a96d93a2 100644 (file)
@@ -132,6 +132,12 @@ new std:GetVectorDoubleElement Box62
 new std:GetVectorDoubleElement Box63
   set Box63.I "1"
 
+new wx:CheckBox Box64
+  set Box64.In "true"
+  set Box64.Title "Interpolate"
+
+new std:MultipleInputs Box65
+
 
 connect checkS.Out switch.On
 connect sdrT.Out switch.Time
@@ -184,7 +190,6 @@ connect Box30.BoxChange Box57.In1
 connect Box57.BoxChange Box28.BoxExecute
 connect Box54.BoxChange Box57.In2
 connect Box49.wxVtkBaseView1 Box54.wxVtkBaseView
-connect Box17.BoxChange Box49.BoxExecute
 connect Box25.BoxChange Box59.In1
 connect Box59.BoxChange Box24.BoxExecute
 connect Box54.BoxChange Box59.In2
@@ -193,6 +198,15 @@ connect Box55.Out Box24.WindowLevel
 connect Box60.widget Box52.Widget2
 connect Box61.Out Box62.In
 connect Box61.Out Box63.In
+connect Box64.Widget Box47.Widget3
+connect Box64.Out Box49.Interpolate
+connect Box64.Out Box28.Interpolate
+connect Box64.Out Box24.Interpolate
+connect Box64.BoxChange Box57.In3
+connect Box64.BoxChange Box59.In3
+connect Box17.BoxChange Box65.In1
+connect Box65.BoxChange Box49.BoxExecute
+connect Box64.BoxChange Box65.In3
 
 # Complex input ports
 input ImageVector1 Box22.In " "
index 6acfe843c587461b7418547e74a1e2690d2afa8a..bc527b4c9e0b71d047505b5eb051bbdc3318be53 100644 (file)
@@ -33,7 +33,7 @@ COMPLEX_PORT
 windowcolorlevel
 144.575419:54.925991:-900.000000
 FIN_COMPLEX_PORT
-BOXES:38
+BOXES:40
 BOX
 PackRecalage:TransparencyBox:Box00
 ISEXEC:FALSE
@@ -46,7 +46,7 @@ ISEXEC:FALSE
 89.697784:31.980528:-900.000000
 119.497784:29.480528:-900.000000
 PORT
-In:"50"
+In:"0"
 PORT
 Max:"100"
 PORT
@@ -81,8 +81,8 @@ FIN_BOX
 BOX
 PackRecalage:TransparencyBox:Box05
 ISEXEC:FALSE
-13.280289:-34.113803:-900.000000
-35.570289:-36.613803:-900.000000
+13.446693:-25.793593:-900.000000
+35.736693:-28.293593:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box06
@@ -231,14 +231,14 @@ FIN_BOX
 BOX
 wx:LayoutTab:Box34
 ISEXEC:FALSE
-120.181181:-123.095471:-900.000000
-153.501181:-125.595471:-900.000000
+128.501391:-123.594684:-900.000000
+161.821391:-126.094684:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box35
 ISEXEC:FALSE
-118.769433:-117.952674:-900.000000
-152.089433:-120.452674:-900.000000
+127.044260:-114.685101:-900.000000
+160.364260:-117.185101:-900.000000
 PORT
 WinTitle:"Viewer help"
 FIN_BOX
@@ -269,26 +269,20 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box40
 ISEXEC:FALSE
--60.783263:-50.656118:-900.000000
--38.813263:-53.156118:-900.000000
+-63.778539:-64.134858:-900.000000
+-41.808539:-66.634858:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box41
 ISEXEC:FALSE
-78.927543:-52.825051:-900.000000
-100.897543:-55.325051:-900.000000
-FIN_BOX
-BOX
-creaMaracasVisu:HelpViewerNV:Box42
-ISEXEC:FALSE
-43.932132:-80.106785:-900.000000
-65.967132:-82.606785:-900.000000
+77.429905:-66.137387:-900.000000
+99.399905:-68.637387:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:HelpViewerNV:Box43
 ISEXEC:FALSE
-117.757584:-108.111699:-900.000000
-139.792584:-110.611699:-900.000000
+126.032411:-104.844126:-900.000000
+148.067411:-107.344126:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box44
@@ -312,15 +306,37 @@ ISEXEC:FALSE
 PORT
 I:"1"
 FIN_BOX
-CONNECTIONS:60
+BOX
+wx:CheckBox:Box47
+ISEXEC:FALSE
+107.947197:6.615724:-900.000000
+129.577197:4.115724:-900.000000
+PORT
+In:"True"
+PORT
+Title:"Interpolate"
+FIN_BOX
+BOX
+wx:LayoutLine:Box49
+ISEXEC:FALSE
+105.978775:-22.025933:-900.000000
+139.298775:-24.525933:-900.000000
+PORT
+Orientation:"H"
+PORT
+WinTitle:"config"
+FIN_BOX
+BOX
+std:MultipleInputs:Box50
+ISEXEC:FALSE
+2.570065:-32.181482:-900.000000
+24.540065:-34.681482:-900.000000
+FIN_BOX
+CONNECTIONS:69
 CONNECTION
 Box01:Out:Box00:Percent
 NumberOfControlPoints:0
 CONNECTION
-Box01:Widget:Box03:Widget2
-NumberOfControlPoints:1
-184.732101:-41.203613:-900.000000
-CONNECTION
 Box01:BoxChange:Box04:In2
 NumberOfControlPoints:0
 CONNECTION
@@ -354,12 +370,6 @@ CONNECTION
 Box01:Out:Box07:Percent
 NumberOfControlPoints:0
 CONNECTION
-Box17:Out:Box00:In1
-NumberOfControlPoints:0
-CONNECTION
-Box18:Out:Box00:In2
-NumberOfControlPoints:0
-CONNECTION
 Box13:Widget:Box03:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -375,9 +385,6 @@ CONNECTION
 VectorImage1:VectorImage1:Box20:In
 NumberOfControlPoints:0
 CONNECTION
-Box05:BoxChange:Box06:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box05:Out:Box06:In
 NumberOfControlPoints:0
 CONNECTION
@@ -387,24 +394,12 @@ CONNECTION
 Box20:Out:Box22:In
 NumberOfControlPoints:0
 CONNECTION
-Box22:Out:Box05:In1
-NumberOfControlPoints:0
-CONNECTION
-Box23:Out:Box05:In2
-NumberOfControlPoints:0
-CONNECTION
 Box20:Out:Box24:In
 NumberOfControlPoints:0
 CONNECTION
 Box19:Out:Box25:In
 NumberOfControlPoints:0
 CONNECTION
-Box25:Out:Box07:In2
-NumberOfControlPoints:0
-CONNECTION
-Box24:Out:Box07:In1
-NumberOfControlPoints:0
-CONNECTION
 Box19:Out:Box23:In
 NumberOfControlPoints:0
 CONNECTION
@@ -417,9 +412,6 @@ CONNECTION
 Box33:Widget:Box32:Widget1
 NumberOfControlPoints:0
 CONNECTION
-Box35:Widget:Box34:Widget1
-NumberOfControlPoints:0
-CONNECTION
 Box02:Widget:Box29:Widget1
 NumberOfControlPoints:0
 CONNECTION
@@ -494,4 +486,58 @@ NumberOfControlPoints:0
 CONNECTION
 Box44:Out:Box46:In
 NumberOfControlPoints:0
+CONNECTION
+Box47:Widget:Box49:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box35:Widget:Box34:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box01:Widget:Box49:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box49:Widget:Box03:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box06:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box02:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box47:Out:Box08:Interpolate
+NumberOfControlPoints:0
+CONNECTION
+Box47:BoxChange:Box40:In3
+NumberOfControlPoints:0
+CONNECTION
+Box47:BoxChange:Box41:In3
+NumberOfControlPoints:0
+CONNECTION
+Box05:BoxChange:Box50:In1
+NumberOfControlPoints:0
+CONNECTION
+Box47:BoxChange:Box50:In2
+NumberOfControlPoints:0
+CONNECTION
+Box50:BoxChange:Box06:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box17:Out:Box00:In2
+NumberOfControlPoints:0
+CONNECTION
+Box18:Out:Box00:In1
+NumberOfControlPoints:0
+CONNECTION
+Box23:Out:Box05:In1
+NumberOfControlPoints:0
+CONNECTION
+Box22:Out:Box05:In2
+NumberOfControlPoints:0
+CONNECTION
+Box25:Out:Box07:In1
+NumberOfControlPoints:0
+CONNECTION
+Box24:Out:Box07:In2
+NumberOfControlPoints:0
 APP_END
index e9674682c84c2f857c1afaba1e933ca0efc5048e..b9f59e92f0274c89a200a7d27064cdb90202d95e 100644 (file)
@@ -21,7 +21,7 @@ category "<VOID>"
 new PackRecalage:TransparencyBox Box00
 
 new wx:Slider Box01
-  set Box01.In "50"
+  set Box01.In "0"
   set Box01.Max "100"
   set Box01.Min "0"
   set Box01.ReactiveOnTrack "true"
@@ -107,8 +107,6 @@ new std:MultipleInputs Box40
 
 new std:MultipleInputs Box41
 
-new creaMaracasVisu:HelpViewerNV Box42
-
 new creaMaracasVisu:HelpViewerNV Box43
 
 new std:MagicBox Box44
@@ -119,9 +117,18 @@ new std:GetVectorDoubleElement Box45
 new std:GetVectorDoubleElement Box46
   set Box46.I "1"
 
+new wx:CheckBox Box47
+  set Box47.In "True"
+  set Box47.Title "Interpolate"
+
+new wx:LayoutLine Box49
+  set Box49.Orientation "H"
+  set Box49.WinTitle "config"
+
+new std:MultipleInputs Box50
+
 
 connect Box01.Out Box00.Percent
-connect Box01.Widget Box03.Widget2
 connect Box01.BoxChange Box04.In2
 connect Box04.BoxChange Box00.BoxExecute
 connect Box00.Out Box02.In
@@ -131,26 +138,18 @@ connect Box04.BoxChange Box05.BoxExecute
 connect Box04.BoxChange Box07.BoxExecute
 connect Box01.Out Box05.Percent
 connect Box01.Out Box07.Percent
-connect Box17.Out Box00.In1
-connect Box18.Out Box00.In2
 connect Box13.Widget Box03.Widget1
 connect Box19.Out Box18.In
 connect Box20.Out Box17.In
-connect Box05.BoxChange Box06.BoxExecute
 connect Box05.Out Box06.In
 connect Box07.Out Box08.In
 connect Box20.Out Box22.In
-connect Box22.Out Box05.In1
-connect Box23.Out Box05.In2
 connect Box20.Out Box24.In
 connect Box19.Out Box25.In
-connect Box25.Out Box07.In2
-connect Box24.Out Box07.In1
 connect Box19.Out Box23.In
 connect Box29.Widget Box28.Widget1
 connect Box31.Widget Box30.Widget1
 connect Box33.Widget Box32.Widget1
-connect Box35.Widget Box34.Widget1
 connect Box02.Widget Box29.Widget1
 connect Box28.Widget Box11.Widget2
 connect Box06.Widget Box31.Widget1
@@ -175,6 +174,24 @@ connect Box37.BoxChange Box41.In2
 connect Box43.widget Box35.Widget2
 connect Box44.Out Box45.In
 connect Box44.Out Box46.In
+connect Box47.Widget Box49.Widget3
+connect Box35.Widget Box34.Widget3
+connect Box01.Widget Box49.Widget1
+connect Box49.Widget Box03.Widget2
+connect Box47.Out Box06.Interpolate
+connect Box47.Out Box02.Interpolate
+connect Box47.Out Box08.Interpolate
+connect Box47.BoxChange Box40.In3
+connect Box47.BoxChange Box41.In3
+connect Box05.BoxChange Box50.In1
+connect Box47.BoxChange Box50.In2
+connect Box50.BoxChange Box06.BoxExecute
+connect Box17.Out Box00.In2
+connect Box18.Out Box00.In1
+connect Box23.Out Box05.In1
+connect Box22.Out Box05.In2
+connect Box25.Out Box07.In1
+connect Box24.Out Box07.In2
 
 # Complex input ports
 input BoxExecute Box04.In1 " "