X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fbbs%2Fboxes%2FCompareImagesByRGB-Widget.bbs;h=784c2f13ea9e831cefcd1992ca61e4736be88a24;hb=a3620d4e1b64678c8bc31791fd8cb86a80c04256;hp=0d15ef6d6bf809cd09c805ea056c135975851bab;hpb=a6e13b99c7b4544afb8ed38460de8a80ca3760df;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs
index 0d15ef6..784c2f1 100644
--- a/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs
+++ b/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C8/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs
+# - BBTKGEditor v 1.6 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C23/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/CompareImagesByRGB-Widget.bbs
 # ----------------------------------
 
 include std
@@ -10,7 +10,6 @@ include creaVtk
 include vtk
 include wx
 include std
-include PackRecalage
 
 define CompareImagesByRGB-Widget creaVtk
 
@@ -33,7 +32,7 @@ new vtk:RescaleSlopeIntercept Box05
 new creaMaracasVisu:SetwxVtkBaseViewLookupTable Box06
 
 new wx:LayoutSplit Box07
-  set Box07.Proportion "90"
+  set Box07.Proportion "95"
 
 new creaVtk:ScalarsToColors Box10
   set Box10.Type "3"
@@ -54,7 +53,7 @@ new std:StringSelect Box18
   set Box18.In6 "1 0 1"
   set Box18.In7 "0 1 1"
 
-new PackRecalage:AddImageToVector Box19
+new vtk:AddImageToVector Box19
 
 new std:GetVectorStringElement Box20
   set Box20.I "0"
@@ -74,13 +73,26 @@ new vtk:GetVectorVtkImageDataElement Box25
 new wx:Slider Box26
   set Box26.Max "7"
   set Box26.Min "0"
-
-new wx:LayoutCenter Box28
+  set Box26.ReactiveOnTrack "true"
 
 new vtk:vtkImageDataPointerRelay Box29
 
 new vtk:vtkImageDataPointerRelay Box30
 
+new wx:LayoutLine Box31
+  set Box31.Orientation "H"
+
+new wx:CheckBox Box32
+  set Box32.Title "Interpolation"
+
+new std:MagicBox Box33
+
+new std:MultipleInputs Box34
+
+new std:MagicBox Box35
+
+new creaMaracasVisu:SetPosition Box36
+
 
 connect Box02.Out Box00.In
 connect Box10.LookupTable Box06.ScalarToColors
@@ -99,19 +111,29 @@ connect Box23.Out Box02.In0
 connect Box24.Out Box02.In1
 connect Box25.Out Box02.In2
 connect Box26.Out Box18.In
-connect Box00.Widget Box07.Widget1
-connect Box26.Widget Box28.Widget2
-connect Box28.Widget Box07.Widget2
 connect Box00.wxVtkBaseView1 Box06.BaseView1
 connect Box00.wxVtkBaseView2 Box06.BaseView2
 connect Box00.wxVtkBaseView3 Box06.BaseView3
 connect Box29.Out Box05.In
 connect Box30.Out Box13.In
-connect Box26.BoxChange Box06.BoxExecute
+connect Box26.Widget Box31.Widget1
+connect Box32.Widget Box31.Widget2
+connect Box32.Out Box00.Interpolate
+connect Box32.BoxChange Box00.BoxExecute
+connect Box00.Widget Box07.Widget1
+connect Box31.Widget Box07.Widget2
+connect Box26.BoxChange Box34.In1
+connect Box34.BoxChange Box06.BoxExecute
+connect Box33.BoxChange Box34.In2
+connect Box00.wxVtkBaseView1 Box36.wxVtkBaseView
+connect Box35.Out Box36.Point
+connect Box33.BoxChange Box36.BoxExecute
 
 # Complex input ports
 input Image1 Box29.In " "
 input Image2 Box30.In " "
+input boxExecute Box33.BoxExecute " "
+input point Box35.In " "
 
 # Complex output ports
 output OutWidget Box07.Widget " "