*** empty log message ***

[bbtk.git] / packages / demo / bbs / appli / demoFiltering1.bbs

diff --git a/packages/demo/bbs/appli/demoFiltering1.bbs b/packages/demo/bbs/appli/demoFiltering1.bbs
index 3da9435a9ba1f759b32343b6093883ff98b21909..1be94e23bf1d2608ee6e6c422f347ec3867c482c 100644 (file)
--- a/packages/demo/bbs/appli/demoFiltering1.bbs
+++ b/packages/demo/bbs/appli/demoFiltering1.bbs
@@ -43,7 +43,7 @@ new Div div2
 // ----------------------
 
 new LayoutSplit mainSplit
-  set mainSplit.Proportion 50
+  set mainSplit.Proportion 60
   set mainSplit.WinHeight  1000
   set mainSplit.WinWidth   1400
   set mainSplit.WinTitle "Processing / Viewing example (demoFiltering1.bbs) "
@@ -63,45 +63,48 @@ new LayoutSplit mainSplit
 
                  new Slider sliceSlider
                     set sliceSlider.Title "Slice"
+                    set sliceSlider.ReactiveOnTrack true
                    connect sliceSlider.Widget sliderLayout.Widget1
                    
                  new Slider lowerThresholdSlider
                     set lowerThresholdSlider.Title "LowerThreshold"
-                    set lowerThresholdSlider.Max       50
-                    set lowerThresholdSlider.In        20
+                    set lowerThresholdSlider.Max       200
+                    set lowerThresholdSlider.In        10
                     set lowerThresholdSlider.ChangeResolution 1
                    connect lowerThresholdSlider.Widget sliderLayout.Widget2
                
                  new Slider upperThresholdSlider
                     set upperThresholdSlider.Title "UpperThreshold"
                     set upperThresholdSlider.Max       500
-                    set upperThresholdSlider.In        500
+                    set upperThresholdSlider.In        150
                     set upperThresholdSlider.ChangeResolution 1     
                    connect upperThresholdSlider.Widget sliderLayout.Widget3
 
                  new Slider smoothSlider
                     set smoothSlider.Title "Smooth"
                     set smoothSlider.Max       10
-                    set smoothSlider.In        1
+                    set smoothSlider.In        3
                     set smoothSlider.ChangeResolution 1
                    connect  smoothSlider.Widget sliderLayout.Widget4
                                                                              
            new LayoutLine buttonLayout
-              set buttonLayout.Orientation V         
+              set buttonLayout.Orientation H         
              connect buttonLayout.Widget toolLayout.Widget2
              
+              new ColourSelectorButton colourThreshold  
+                 set colourThreshold.In "1 0 0"              
+                connect colourThreshold.Widget buttonLayout.Widget1
+
               new ColourSelectorButton colourSmooth
                  set colourSmooth.In "1 1 0"
-                connect colourSmooth.Widget buttonLayout.Widget1                
+                connect colourSmooth.Widget buttonLayout.Widget2                
    
-              new ColourSelectorButton colourThreshold  
-                 set colourThreshold.In "1 0 0"              
-                connect colourThreshold.Widget buttonLayout.Widget2
-                
+
+/*              
               new CommandButton refresh
                  set refresh.Label "Refresh (to be used once at start time)"
                 connect refresh.Widget buttonLayout.Widget3
-                                               
+*/                                             
       new LayoutLine layout2D
          set layout2D.Orientation H
          connect layout2D.Widget splitUp.Widget2
@@ -138,7 +141,7 @@ new LayoutSplit mainSplit
               set lowerOpacitySlider.Title "Opacity"
               set lowerOpacitySlider.Min       1  
               set lowerOpacitySlider.Max       100
-              set lowerOpacitySlider.In        20
+              set lowerOpacitySlider.In        50
               set lowerOpacitySlider.Orientation V
              connect lowerOpacitySlider.Widget vSliderLayout.Widget1
 
@@ -190,6 +193,13 @@ new ImageGaussianSmooth smooth
   connect smooth.Out            viewer2DImageSmooth.In
   connect sliceSlider.Out       viewer2DImageSmooth.Slice
  
+
+// Planes
+new ImagePlanes planes
+  connect reader.Out planes.In
+  connect planes.PlaneX viewer3DSurfaceSmooth.Obs1
+  connect planes.PlaneY viewer3DSurfaceSmooth.Obs2
+  connect planes.PlaneZ viewer3DSurfaceSmooth.Obs3
  
 // Surfaces 3D 
  
@@ -215,27 +225,35 @@ new IsoSurfaceExtractor  isoextractorSmooth
 
  new MultipleInputs multInForImageOriginal
   connect sliceSlider.BoxChange multInForImageOriginal.In1  
-  connect refresh.BoxChange     multInForImageOriginal.In2
-  
+#  connect refresh.BoxChange     multInForImageOriginal.In2
+
+
  new MultipleInputs multInForImageSegmented
   connect lowerThresholdSlider.BoxChange multInForImageSegmented.In1
   connect upperThresholdSlider.BoxChange multInForImageSegmented.In2
-  connect refresh.BoxChange              multInForImageSegmented.In3
+#  connect refresh.BoxChange              multInForImageSegmented.In3
+  connect sliceSlider.BoxChange  multInForImageSegmented.In4    
     
  new MultipleInputs multInForImageSmooth
   connect lowerThresholdSlider.BoxChange multInForImageSmooth.In1
   connect upperThresholdSlider.BoxChange multInForImageSmooth.In2 
   connect smoothSlider.BoxChange         multInForImageSmooth.In3
-  connect lowerOpacitySlider.BoxChange   multInForImageSmooth.In4  
-  connect refresh.BoxChange              multInForImageSmooth.In5
+#  connect refresh.BoxChange              multInForImageSmooth.In4
+  connect sliceSlider.BoxChange multInForImageSmooth.In5
 
  new MultipleInputs multInForSurfaceThreshold
-  connect refresh.BoxChange multInForSurfaceThreshold.In1
+#  connect refresh.BoxChange multInForSurfaceThreshold.In1
   connect colourThreshold.BoxChange multInForSurfaceThreshold.In2
+  connect lowerThresholdSlider.BoxChange multInForSurfaceThreshold.In3
+  connect upperThresholdSlider.BoxChange multInForSurfaceThreshold.In4 
 
  new MultipleInputs multInForSurfaceSmooth
-  connect refresh.BoxChange multInForSurfaceSmooth.In1  
+#  connect refresh.BoxChange multInForSurfaceSmooth.In1  
+  connect lowerOpacitySlider.BoxChange multInForSurfaceSmooth.In1  
   connect colourSmooth.BoxChange multInForSurfaceSmooth.In2
+  connect lowerThresholdSlider.BoxChange multInForSurfaceSmooth.In3
+  connect upperThresholdSlider.BoxChange multInForSurfaceSmooth.In4 
+  connect smoothSlider.BoxChange         multInForSurfaceSmooth.In5
     
   connect multInForImageOriginal.BoxChange     viewer2DImageOriginal.BoxExecute  
   connect multInForImageSegmented.BoxChange    viewer2DImageSegmented.BoxExecute