From: trillos <trillos>
Date: Tue, 13 Oct 2009 13:46:43 +0000 (+0000)
Subject: Version 4
X-Git-Tag: CREATOOLS.2-0-3~54
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaRigidRegistration.git;a=commitdiff_plain;h=960b85ff02b7b98c87074a7b4090eeb5038805eb

Version 4
---

diff --git a/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs b/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs
index 7512bb6..f9e1e57 100644
--- a/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs
+++ b/PackRecalage/bbs/appli/ViewerMerge2DInteractive.bbs
@@ -143,12 +143,14 @@ new Slider colorLevel
   set colorLevel.Min "0"
   set colorLevel.Max "99"
   set colorLevel.In "50"
+  set colorLevel.ReactiveOnTrack true
   set colorLevel.Title "Color Level"
 
 new Slider windowLevel
   set windowLevel.Min "0"
   set windowLevel.Max "99"
   set windowLevel.In "50"
+  set windowLevel.ReactiveOnTrack true
   set windowLevel.Title "Window Level"
 
 # Connection to viewers
@@ -202,6 +204,7 @@ new Slider sdrP
   set sdrP.Max "100"
   set sdrP.Min "0"
   set sdrP.In "50"
+  set sdrP.ReactiveOnTrack true
 
   connect sdrP.Out trans.Percent
 
@@ -279,6 +282,67 @@ new LayoutLine lySubColor
   connect subView.Widget substraction.Widget1
   connect lySub.Widget substraction.Widget2
 
+#Image Switch view
+/*
+new ImageSwitcherBox swt
+  connect imgslice1.Out swt.In1 
+  connect imgslice2.Out swt.In2
+
+new Slider sdrT
+  set sdrT.Max "1000"
+  set sdrT.Min "0"
+  set sdrT.In "500"
+
+  connect sdrT.Out swt.Time
+
+#Image Switch Layout
+
+new Viewer2D viewerS
+  connect swt.Out viewerS.In
+  //set viewerS.nTypeView "0"  
+
+new LayoutLine switch
+  connect viewerS.Widget switch.Widget1
+  connect switch.Widget switch.Widget2
+  connect sdrT.Widget switch.Widget3
+
+  //connect colorLevel.Out viewerS.ColorLevel
+  //connect windowLevel.Out viewerS.WindowLevel
+*/
+
+#Image Convolution View
+
+new ImageConvolution convol1
+  connect imgslice1.Out convol1.In
+
+new ImageConvolution convol2
+  connect imgslice2.Out convol2.In
+
+new Viewer2D viewerConv1
+  connect convol1.Out viewerConv1.In
+  
+new Viewer2D viewerConv2
+  connect convol2.Out viewerConv2.In
+
+new Slider sdrC
+  set sdrC.Max "100"
+  set sdrC.Min "0"
+  set sdrC.In "100"
+  set sdrC.ReactiveOnTrack "true"
+
+#Layout for convolution
+
+new LayoutSplit lyConvView
+  set lyConvView.Proportion "50"
+  connect viewerConv1.Widget lyConvView.Widget1
+  connect viewerConv2.Widget lyConvView.Widget2
+
+new LayoutSplit convolution
+  set convolution.Proportion "80"
+  connect lyConvView.Widget convolution.Widget1
+  connect sdrC.Widget convolution.Widget2
+
+
 #Multiple inputs for managing the interaction
 
 new MultipleInputs mult
@@ -300,7 +364,7 @@ new MultipleInputs mult2
 connect mult2.BoxChange cbb.BoxExecute
 connect cbb.BoxChange viewerCH.BoxExecute
 
-#Execution pipeline for trqnsparency
+#Execution pipeline for transparency
 
 new MultipleInputs mult5
   connect mult2.BoxChange mult5.In1
@@ -325,6 +389,28 @@ new MultipleInputs mult4
   connect mult4.BoxChange imageSub.BoxExecute
   connect imageSub.BoxChange substraction.BoxExecute
 
+#Execution pipeline for switching
+/*
+new MultipleInputs mult6
+  connect sdrT.BoxChange mult6.In1
+  connect mult2.BoxChange mult6.In2
+
+  connect mult6.BoxChange switch.BoxExecute
+  connect switch.BoxChange viewerS.BoxExecute
+*/
+
+#Execution pipeline for convolution
+
+new MultipleInputs mult7
+  connect mult2.BoxChange mult7.In1
+  connect sdrC.BoxChange mult7.In2
+
+  connect mult7.BoxChange convol1.BoxExecute
+  connect mult7.BoxChange convol2.BoxExecute
+
+  connect convol1.BoxChange viewerConv1.BoxExecute
+  connect convol2.BoxChange viewerConv2.BoxExecute
+
 # Button for saving
 
 new CommandButton saveBut
@@ -354,6 +440,8 @@ new LayoutTab tabs
   connect checkerBoard.Widget tabs.Widget1
   connect substraction.Widget tabs.Widget2
   connect transparency.Widget tabs.Widget3
+  connect convolution.Widget tabs.Widget4
+  //connect switch.Widget tabs.Widget4
 
 new LayoutLine tools
   connect sdrZ.Widget tools.Widget1