X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fbbs%2Fappli%2FRecalage2D.bbs;h=28ef6953a60077c7ac3e99555c5454858891b6b1;hb=86c3482ce714b8d4201c8d819a10b59e4e4440c4;hp=e9ffb0ecb8aed1b0ef5cda6165b4eb5c6d89a7c7;hpb=caf70b171caba0cb8c1e4c00688b27844f93e31b;p=creaRigidRegistration.git

diff --git a/PackRecalage/bbs/appli/Recalage2D.bbs b/PackRecalage/bbs/appli/Recalage2D.bbs
index e9ffb0e..28ef695 100644
--- a/PackRecalage/bbs/appli/Recalage2D.bbs
+++ b/PackRecalage/bbs/appli/Recalage2D.bbs
@@ -6,6 +6,8 @@ load creaMaracasVisu
 
 load PackRecalage
 
+//include PackRecalage/boxes/checkerView
+
 new FileSelector imageSelector1
   set imageSelector1.Wildcard "*.mhd"
 new FileSelector imageSelector2
@@ -103,11 +105,18 @@ new ImageConvolution convol1
 new ImageConvolution convol2
   connect reslice1.Out convol2.In
 
+#Image Properties
+
+new ImageRecalageProperties properties
+  connect image.Out properties.In
+  connect image.BoxChange properties.BoxExecute
+
 # Create the ZSlider for the slices
 
 new Slider sdrZ
   set sdrZ.ReactiveOnTrack 1
-  set sdrZ.Max 50
+  set sdrZ.Min 0
+  connect properties.LengthZ sdrZ.Max
   set sdrZ.Title "Z for slice"
 
   connect sdrZ.Out imgslice1.Z
@@ -141,21 +150,20 @@ new MultipleInputs multF
 
   connect multF.BoxChange convol1.BoxExecute
   connect multF.BoxChange convol2.BoxExecute
-  
 
 #Create Sliders for WinLevel and ColorLevel
 
 new Slider colorLevel
   set colorLevel.Min "0"
-  set colorLevel.Max "99"
-  set colorLevel.In "50"
+  connect properties.ColorLevel colorLevel.Max 
+  connect properties.MidColorLevel colorLevel.In
   set colorLevel.ReactiveOnTrack true
   set colorLevel.Title "Color Level"
 
 new Slider windowLevel
   set windowLevel.Min "0"
-  set windowLevel.Max "99"
-  set windowLevel.In "50"
+  connect properties.ColorLevel windowLevel.Max
+  connect properties.MidColorLevel windowLevel.In
   set windowLevel.ReactiveOnTrack true
   set windowLevel.Title "Window Level"
 
@@ -232,7 +240,15 @@ new ViewerNV viewerCH
   connect ly.Widget checkerBoard.Widget2
 /////////////end of Checkboard////////////////////
 
+/*
+new checkerView checkerboard
+
+  connect convol1.Out checkerboard.In1
+  connect convol2.Out checkerboard.In2
 
+  connect colorLevel.Out checkerboard.ColorLevel
+  connect windowLevel.Out checkerboard.WindowLevel
+*/
 //////////////Transparency///////////////////////////
 #Image Transparency view
 
@@ -266,8 +282,12 @@ new LayoutSplit transparency
 
 new ImageSwitcherBox switch
   connect convol1.Out switch.In1 
-  connect convol2.Out switch.In2
-  set switch.On "True"
+  connect convol2.Out switch.In2  
+
+new CheckBox checkS
+  connect checkS.Out switch.On
+  set checkS.Title "On"
+  set checkS.In "true"
 
 new Slider sdrT
   set sdrT.Max "1000"
@@ -283,10 +303,23 @@ new Viewer2D viewerSwitch
   connect sdrT.BoxChange switch.BoxExecute
   connect switch.BoxChange viewerSwitch.BoxExecute
 
-new LayoutLine switcher
-  connect viewerSwitch.Widget switcher.Widget1
-  connect switch.Widget switcher.Widget2
-  connect sdrT.Widget switcher.Widget3
+new LayoutSplit switcher
+  set switcher.Proportion "70"
+
+new LayoutSplit switchWindow
+  set switchWindow.Proportion "80"
+  connect viewerSwitch.Widget switchWindow.Widget1
+
+new LayoutSplit switchTool
+  set switchTool.Orientation H
+  set switchTool.Proportion "50"
+  connect switch.Widget switchTool.Widget1
+  connect checkS.Widget switchTool.Widget2
+
+  connect switchTool.Widget switchWindow.Widget2
+
+  connect switchWindow.Widget switcher.Widget1 
+  connect sdrT.Widget switcher.Widget2
 
 //////////////end of Image Switch///////////////////