X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fbbs%2Fappli%2FRecalage2D.bbs;h=6405f32813911d2f9e5f5ec26aface6b45f76cbb;hb=3797ae6d71a76d3f096ad93b92e77db684c00eb7;hp=45ba02ac7f195e8fecb257bee0e4b597494948f4;hpb=ab4dca2f78f873a313c8ec8a142ec7b6c4c2ded2;p=creaRigidRegistration.git

diff --git a/PackRecalage/bbs/appli/Recalage2D.bbs b/PackRecalage/bbs/appli/Recalage2D.bbs
index 45ba02a..6405f32 100644
--- a/PackRecalage/bbs/appli/Recalage2D.bbs
+++ b/PackRecalage/bbs/appli/Recalage2D.bbs
@@ -6,6 +6,14 @@ load creaMaracasVisu
 
 load PackRecalage
 
+//include PackRecalage/boxes/checkerView.bbs
+
+//Uncomment the image readers you need
+
+/////////////////////////////////////////////////
+// File Selector
+////////////////////////////////////////////////
+/*
 new FileSelector imageSelector1
   set imageSelector1.Wildcard "*.mhd"
 new FileSelector imageSelector2
@@ -16,6 +24,31 @@ new MetaImageReader image
 
 new MetaImageReader image2 
   connect imageSelector2.Out image2.In  
+*/
+
+///////////////////////////////////////////////
+// Gimmick
+//////////////////////////////////////////////
+
+include creaImageIO
+
+new Gimmick image
+new Gimmick image2
+
+///////////////////////////////////////////////
+//Image Slicers
+//////////////////////////////////////////////
+
+# Create the slicers
+
+new SliceImage imgslice1
+new SliceImage imgslice2
+  connect image.Out imgslice1.In
+  connect image2.Out imgslice2.In
+
+////////////////////////////////////////////
+//Image Viewers
+///////////////////////////////////////////
 
 #Viewer containing image 1
 
@@ -33,6 +66,10 @@ new ViewerNV viewer2
   set viewer2.nTypeView "0"
   connect viewer2.Widget v2Layout.Widget1
 
+//////////////////////////////////////
+//Layouts for the images
+//////////////////////////////////////
+
 #LayoutSplit were the images will be
 
 new LayoutSplit initialImages
@@ -41,6 +78,10 @@ new LayoutSplit initialImages
   connect v1Layout.Widget initialImages.Widget1
   connect v2Layout.Widget initialImages.Widget2
 
+////////////////////////////////////////////////////////////////
+//Information Sliders and Buttons for the Recalage
+///////////////////////////////////////////////////////////////
+
 #Layout line that will contain the buttons
 
 new LayoutLine buttonsLayout
@@ -76,12 +117,9 @@ new Slider sliderY
   set sliderY.ReactiveOnTrack "1"
   connect sliderY.Widget buttonsLayout.Widget3
 
-# Create the reslicers
-
-new SliceImage imgslice1
-new SliceImage imgslice2
-  connect image.Out imgslice1.In
-  connect image2.Out imgslice2.In
+//////////////////////////////////////////////////
+//Transformation Boxes
+//////////////////////////////////////////////////
 
 #Box were the transformation will be made
 
@@ -96,6 +134,10 @@ new ReSlicerBox reslice1
   connect transform.Out reslice1.Transform
   connect imgslice2.Out reslice1.In
 
+//////////////////////////////////////////////////
+//Convolution Filter
+//////////////////////////////////////////////////
+
 #Convolution Filter for both of the Images
 
 new ImageConvolution convol1
@@ -103,11 +145,22 @@ new ImageConvolution convol1
 new ImageConvolution convol2
   connect reslice1.Out convol2.In
 
+////////////////////////////////////////////////
+//Recalage Properties
+////////////////////////////////////////////////
+
+#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
@@ -121,7 +174,7 @@ new Slider sdrF
   set sdrF.ReactiveOnTrack 1
   set sdrF.Max "100"
   set sdrF.Min "0"
-  set sdrF.In "50"
+  set sdrF.In "0"
   set sdrF.Title "Convolution Factor"
 
   connect sdrF.Out convol1.Factor
@@ -141,21 +194,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"
 
@@ -224,7 +276,7 @@ new ViewerNV viewerCH
   connect sdr.Out cbb.Cols
   connect sdr2.Out cbb.Rows
   connect cbb.Out viewerCH.In
-
+  
   connect sdr.Widget ly.Widget2
   connect sdr2.Widget ly.Widget3
 
@@ -232,11 +284,10 @@ new ViewerNV viewerCH
   connect ly.Widget checkerBoard.Widget2
 /////////////end of Checkboard////////////////////
 
-
 //////////////Transparency///////////////////////////
 #Image Transparency view
 
-new TransparencyV2 trans
+new TransparencyBox trans
   connect convol1.Out trans.In1
   connect convol2.Out trans.In2
 
@@ -266,12 +317,18 @@ new LayoutSplit transparency
 
 new ImageSwitcherBox switch
   connect convol1.Out switch.In1 
-  connect convol2.Out switch.In2
+  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"
   set sdrT.Min "0"
   set sdrT.In "500"
+  set sdrT.ReactiveOnTrack "True"
 
 connect sdrT.Out switch.Time
 
@@ -281,10 +338,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///////////////////
 
@@ -327,9 +397,9 @@ new MultipleInputs mult4
 #Layout for the tabs
 
 new LayoutTab tabs
-  connect checkerBoard.Widget tabs.Widget1
-  connect transparency.Widget tabs.Widget2
-  connect switcher.Widget tabs.Widget3
+   connect switcher.Widget tabs.Widget1
+  connect checkerBoard.Widget tabs.Widget2
+  connect transparency.Widget tabs.Widget3 
 
 #Layout where the images and the buttons will be displayed