X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fdemo%2Fbbs%2Fappli%2FdemoFiltering1.bbs;h=70171df3bcab6f09db9fd111b54bbbe20a19514d;hb=1c1da7a1ca87baa6e8b1ba0607400291655571a4;hp=4ed008470f3fdedc5cbc9beb161fb7e0e36ac749;hpb=f3b92b59a8d31738877965a604fbd7c0b41a37d7;p=bbtk.git

diff --git a/packages/demo/bbs/appli/demoFiltering1.bbs b/packages/demo/bbs/appli/demoFiltering1.bbs
index 4ed0084..70171df 100644
--- a/packages/demo/bbs/appli/demoFiltering1.bbs
+++ b/packages/demo/bbs/appli/demoFiltering1.bbs
@@ -35,20 +35,26 @@ new Div div2
   
 #---------------------------------------------------------------------
 
-new Slider slider
-  set slider.Title "Slice"
+new Slider sliceSider
+  set sliceSider.Title "Slice"
   
   #Slider size is the number of planes
-  connect gveZ.Out     slider.Max
+  connect gveZ.Out     sliceSider.Max
   #initial slice is the middle one
-  connect div2.Out slider.In
-  set slider.ChangeResolution 1
+  connect div2.Out sliceSider.In
+  set sliceSider.ChangeResolution 1
   
 new Slider lowerThresholdSlider
   set lowerThresholdSlider.Title "LowerThreshold"
   set lowerThresholdSlider.Max 	50
   set lowerThresholdSlider.In 	20
   set lowerThresholdSlider.ChangeResolution 1
+
+new Slider lowerOpacitySlider
+  set lowerOpacitySlider.Title "LowerOpacity"
+  set lowerOpacitySlider.Max 	100
+  set lowerOpacitySlider.In 	20
+  set lowerOpacitySlider.Orientation V
   
 new Slider upperThresholdSlider
   set upperThresholdSlider.Title "UpperThreshold"
@@ -56,6 +62,12 @@ new Slider upperThresholdSlider
   set upperThresholdSlider.In 	500
   set upperThresholdSlider.ChangeResolution 1 
 
+new Slider upperOpacitySlider
+  set upperOpacitySlider.Title "UpperOpacity"
+  set upperOpacitySlider.Max 	100
+  set upperOpacitySlider.In 	100  
+  set upperOpacitySlider.Orientation V
+  
 new Slider smoothSlider
   set smoothSlider.Title "Smooth"
   set smoothSlider.Max 	10
@@ -64,10 +76,10 @@ new Slider smoothSlider
     
 new CommandButton refresh
    set refresh.Label "Refresh"
-   set refresh.In "exec isoextractorthreshold;exec isoextractorsmooth;exec mainSplit"
+   set refresh.In "exec isoextractorthreshold;exec isoextractorsmooth;exec viewer2DImageSegmented; exec viewer2DImageSmooth; exec viewer2DImageOriginal; exec mainSplit"
 
 new MultipleInputs refreshimages
-  //connect slider.BoxChange             refreshimages.In1
+  connect sliceSider.BoxChange           refreshimages.In1
   connect upperThresholdSlider.BoxChange refreshimages.In2
   connect lowerThresholdSlider.BoxChange refreshimages.In3
   connect smoothSlider.BoxChange         refreshimages.In4
@@ -76,8 +88,8 @@ new MultipleInputs refreshimages
 
 new Viewer2D viewer2DImageOriginal
   connect reader.Out                    viewer2DImageOriginal.In
-  connect slider.Out                    viewer2DImageOriginal.Slice
-  connect slider.BoxChange              viewer2DImageOriginal.BoxExecute
+  connect sliceSider.Out                viewer2DImageOriginal.Slice
+  connect sliceSider.BoxChange          viewer2DImageOriginal.BoxExecute
     
 #---------------------------------------------------------------------
 
@@ -90,8 +102,8 @@ new BinaryThresholdImageFilter threshold
 
 new Viewer2D viewer2DImageSegmented
   connect threshold.Out			viewer2DImageSegmented.In
-  connect slider.Out			viewer2DImageSegmented.Slice
-//  connect slider.BoxChange		viewer2DImageSegmented.BoxExecute
+  connect sliceSider.Out		viewer2DImageSegmented.Slice
+//  connect sliceSider.BoxChange	viewer2DImageSegmented.BoxExecute
   connect refreshimages.Out		viewer2DImageSegmented.BoxExecute
   
 #---------------------------------------------------------------------
@@ -105,8 +117,8 @@ new ImageGaussianSmooth smooth
 
 new Viewer2D viewer2DImageSmooth
   connect smooth.Out			viewer2DImageSmooth.In
-  connect slider.Out			viewer2DImageSmooth.Slice
-  connect slider.BoxChange		viewer2DImageSmooth.BoxExecute
+  connect sliceSider.Out			viewer2DImageSmooth.Slice
+  connect sliceSider.BoxChange		viewer2DImageSmooth.BoxExecute
 
 
 #---------------------------------------------------------------------
@@ -132,7 +144,8 @@ new Viewer3D  viewernvImagethreshold3D
 new IsoSurfaceExtractor  isoextractorthreshold
   connect threshold.Out isoextractorthreshold.In
   set isoextractorthreshold.Opacity 1
-  set isoextractorthreshold.Isovalue 10
+  #set isoextractorthreshold.Isovalue 10
+set isoextractorthreshold.Isovalue 100
   connect colourUpper.Out isoextractorthreshold.Colour  
   connect viewernvImagethreshold3D.Renderer	isoextractorthreshold.Renderer
 
@@ -142,10 +155,14 @@ new Viewer3D  viewernvImageSmooth3D
 #  set viewernvImageSmooth3D.nTypeView "5" 
   //connect refreshimages.Out		viewernvImageSmooth3D.BoxExecute
 
+new Div div3
+   connect lowerOpacitySlider.Out div3.In1
+   set div3.In2 100
+
 new IsoSurfaceExtractor  isoextractorsmooth
   connect smooth.Out isoextractorsmooth.In
-  set isoextractorsmooth.Opacity 1
-  set isoextractorsmooth.Isovalue 10
+  connect div3.Out isoextractorsmooth.Opacity
+  set isoextractorsmooth.Isovalue 200
   connect colourLower.Out isoextractorsmooth.Colour
   connect viewernvImageSmooth3D.Renderer	isoextractorsmooth.Renderer
 
@@ -176,24 +193,36 @@ new LayoutLine toolLayout
 //new ImageWriter imw
 //  connect smooth.Out imw.In
   connect refresh.BoxChange smooth.BoxExecute
-//  set imw.Filename "/home/jpr/t8_eau_smooth.mhd"  
+
+new LayoutLine vSliderLayout
+   connect lowerOpacitySlider.Widget  vSliderLayout.Widget1  
+   connect upperOpacitySlider.Widget  vSliderLayout.Widget2
+    
+new LayoutSplit layout3D
+  set layout3D.Orientation H
+  set layout3D.Proportion 90
+  connect downLayout.Widget    layout3D.Widget1
+  connect vSliderLayout.Widget layout3D.Widget2
 
 #---------------------------------------------------------------------
 new LayoutSplit splitUp
-  set splitUp.Proportion 50
+  set splitUp.Proportion 38
   connect toolLayout.Widget     splitUp.Widget1
   connect upLayout.Widget       splitUp.Widget2
 
-  connect slider.Widget                 sliderLayout.Widget1
+  connect sliceSider.Widget                 sliderLayout.Widget1
   connect lowerThresholdSlider.Widget   sliderLayout.Widget2
   connect upperThresholdSlider.Widget   sliderLayout.Widget3
   connect smoothSlider.Widget           sliderLayout.Widget4     
   
 
 new LayoutSplit mainSplit
-  set mainSplit.Proportion 66
+  set mainSplit.Proportion 50
+  set mainSplit.WinHeight 1200
+  set mainSplit.WinWidth 1600
+  set mainSplit.WinTitle "Processing / Viewing example (demoFiltering1.bbs) "
   connect splitUp.Widget	mainSplit.Widget1
-  connect downLayout.Widget	mainSplit.Widget2
+  connect layout3D.Widget	mainSplit.Widget2
 
 #---------------------------------------------------------------------
 
@@ -201,5 +230,4 @@ exec isoextractorthreshold
 exec isoextractorsmooth
 
 
-set mainSplit.WinTitle "demoFiltering1"
 exec mainSplit