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

diff --git a/PackRecalage/bbs/appli/Recalage2D.bbs b/PackRecalage/bbs/appli/Recalage2D.bbs
index 28ef695..6405f32 100644
--- a/PackRecalage/bbs/appli/Recalage2D.bbs
+++ b/PackRecalage/bbs/appli/Recalage2D.bbs
@@ -6,8 +6,14 @@ load creaMaracasVisu
 
 load PackRecalage
 
-//include PackRecalage/boxes/checkerView
+//include PackRecalage/boxes/checkerView.bbs
 
+//Uncomment the image readers you need
+
+/////////////////////////////////////////////////
+// File Selector
+////////////////////////////////////////////////
+/*
 new FileSelector imageSelector1
   set imageSelector1.Wildcard "*.mhd"
 new FileSelector imageSelector2
@@ -18,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
 
@@ -35,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
@@ -43,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
@@ -78,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
 
@@ -98,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
@@ -105,6 +145,10 @@ new ImageConvolution convol1
 new ImageConvolution convol2
   connect reslice1.Out convol2.In
 
+////////////////////////////////////////////////
+//Recalage Properties
+////////////////////////////////////////////////
+
 #Image Properties
 
 new ImageRecalageProperties properties
@@ -130,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
@@ -232,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
 
@@ -240,19 +284,10 @@ 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
 
-new TransparencyV2 trans
+new TransparencyBox trans
   connect convol1.Out trans.In1
   connect convol2.Out trans.In2
 
@@ -362,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