]> Creatis software - bbtk.git/commitdiff
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8ea4a3)
minor modifs
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Fri, 17 Oct 2008 16:28:45 +0000 (16:28 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Fri, 17 Oct 2008 16:28:45 +0000 (16:28 +0000)
kernel/doc/bbtkWebSite/install.html patch | blob | history
kernel/doc/bbtkWebSite/menu.html patch | blob | history
packages/demo/bbs/appli/demoFiltering1.bbs patch | blob | history

diff --git a/kernel/doc/bbtkWebSite/install.html b/kernel/doc/bbtkWebSite/install.html
index c3c409b53f093218bf5e69792b10b227cc2019b5..95d60cc9f9ed09be674b03b6d71d4cb418fc4336 100644 (file)
--- a/kernel/doc/bbtkWebSite/install.html
+++ b/kernel/doc/bbtkWebSite/install.html
@@ -8,7 +8,7 @@
 <body>
 <div style="text-align: center; font-weight: bold;"><big><big><big><small></small></big></big></big>
 <div style="text-align: left;">
-<div style="text-align: center;"><big><big style="font-weight: normal;"><big><big>Install</big></big></big></big><br>
+<div style="text-align: center;"><big><big style="font-weight: normal;"><big><big>BBK buid instructions</big></big></big></big><br>
 <div style="text-align: left;">
 <ol id="mozToc">
 <!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6-->
diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html
index 6daa4e8bf740ecd5864b574d3cc6ec9f18cedeb4..505a05068fb2aaf1a372b6f956791b9afb6c599a 100644 (file)
--- a/kernel/doc/bbtkWebSite/menu.html
+++ b/kernel/doc/bbtkWebSite/menu.html
@@ -8,8 +8,14 @@
 <body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);">
 <small>
 <a target="information" href="home.html"></a></small><br>
-The Black Box Toolkit @BBTK_VERSION@ <br>
+The <span style="font-weight: bold;">B</span>lack <span
+ style="font-weight: bold;">B</span>ox <span style="font-weight: bold;">T</span>ool<span
+ style="font-weight: bold;">k</span>it @BBTK_VERSION@ <br>
 <br>
+<hr style="width: 100%; height: 2px;">Build Instructions<br>
+<br>
+<a href="./install.html">Follow this link</a><br>
+<hr style="width: 100%; height: 2px;">Guides and documentation<br>
 <br>
 <small> <font size="3"><small><a
  href="../bbtkUsersGuide/bbtkUsersGuide.html" target="information">User's
diff --git a/packages/demo/bbs/appli/demoFiltering1.bbs b/packages/demo/bbs/appli/demoFiltering1.bbs
index 109973696aaa092f0a98c9533deca60c756467bb..70171df3bcab6f09db9fd111b54bbbe20a19514d 100644 (file)
--- 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
 
 
 #---------------------------------------------------------------------
@@ -131,8 +143,9 @@ new Viewer3D  viewernvImagethreshold3D
 
 new IsoSurfaceExtractor  isoextractorthreshold
   connect threshold.Out isoextractorthreshold.In
-  set isoextractorthreshold.Opacity 1.0
-  set isoextractorthreshold.Isovalue 100
+  set isoextractorthreshold.Opacity 1
+  #set isoextractorthreshold.Isovalue 10
+set isoextractorthreshold.Isovalue 100
   connect colourUpper.Out isoextractorthreshold.Colour  
   connect viewernvImagethreshold3D.Renderer    isoextractorthreshold.Renderer
 
@@ -142,9 +155,13 @@ 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 0.2
+  connect div3.Out isoextractorsmooth.Opacity
   set isoextractorsmooth.Isovalue 200
   connect colourLower.Out isoextractorsmooth.Colour
   connect viewernvImageSmooth3D.Renderer       isoextractorsmooth.Renderer
@@ -172,27 +189,40 @@ new LayoutLine toolLayout
   connect  sliderLayout.Widget toolLayout.Widget1
   connect  buttonLayout.Widget toolLayout.Widget2
 
+
+//new ImageWriter imw
+//  connect smooth.Out imw.In
   connect refresh.BoxChange smooth.BoxExecute
 
+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
 
 #---------------------------------------------------------------------
 
Black Box Tool Kit