From: guigues <guigues>
Date: Fri, 14 Nov 2008 09:24:42 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.9.1~91
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=eea3727d477c36310ed9e27743bf1e9afe7ab81e;p=bbtk.git

*** empty log message ***
---

diff --git a/packages/demo/bbs/appli/demoFiltering1.bbs b/packages/demo/bbs/appli/demoFiltering1.bbs
index b0f596b..3da9435 100644
--- a/packages/demo/bbs/appli/demoFiltering1.bbs
+++ b/packages/demo/bbs/appli/demoFiltering1.bbs
@@ -44,9 +44,9 @@ new Div div2
 
 new LayoutSplit mainSplit
   set mainSplit.Proportion 50
-  set mainSplit.WinHeight 1200
-  set mainSplit.WinWidth 1600
-  set mainSplit.WinTitle "Processing / Viewing example (demoFiltering1-try.bbs) "
+  set mainSplit.WinHeight  1000
+  set mainSplit.WinWidth   1400
+  set mainSplit.WinTitle "Processing / Viewing example (demoFiltering1.bbs) "
   
   
    new LayoutSplit splitUp
@@ -90,13 +90,13 @@ new LayoutSplit mainSplit
               set buttonLayout.Orientation V	      
 	      connect buttonLayout.Widget toolLayout.Widget2
 	      
-              new ColourSelectorButton colourLower
-                 set colourLower.In "1 1 0"
-	         connect colourLower.Widget buttonLayout.Widget1		 
+              new ColourSelectorButton colourSmooth
+                 set colourSmooth.In "1 1 0"
+	         connect colourSmooth.Widget buttonLayout.Widget1		 
    
-              new ColourSelectorButton colourUpper  
-                 set colourUpper.In "1 0 0"	      
-	         connect colourUpper.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)"
@@ -135,7 +135,7 @@ new LayoutSplit mainSplit
 	   connect vSliderLayout.Widget layout3D.Widget2
 	
            new Slider lowerOpacitySlider
-              set lowerOpacitySlider.Title "LowerOpacity"
+              set lowerOpacitySlider.Title "Opacity"
               set lowerOpacitySlider.Min 	1  
               set lowerOpacitySlider.Max 	100
               set lowerOpacitySlider.In 	20
@@ -197,7 +197,7 @@ new IsoSurfaceExtractor  isoextractorThreshold
   connect threshold.Out isoextractorThreshold.In
   set isoextractorThreshold.Opacity 1  
   set isoextractorThreshold.Isovalue 100
-  connect colourUpper.Out isoextractorThreshold.Colour  
+  connect colourThreshold.Out isoextractorThreshold.Colour  
   connect isoextractorThreshold.Out  viewer3DSurfaceThreshold.In1
       
 new Div div3
@@ -208,7 +208,7 @@ new IsoSurfaceExtractor  isoextractorSmooth
   connect smooth.Out isoextractorSmooth.In
   connect div3.Out isoextractorSmooth.Opacity
   set isoextractorSmooth.Isovalue 200
-  connect colourLower.Out isoextractorSmooth.Colour 
+  connect colourSmooth.Out isoextractorSmooth.Colour 
   connect isoextractorSmooth.Out  viewer3DSurfaceSmooth.In2
   
 // Refresh issues  
@@ -231,9 +231,11 @@ new IsoSurfaceExtractor  isoextractorSmooth
 
  new MultipleInputs multInForSurfaceThreshold
   connect refresh.BoxChange multInForSurfaceThreshold.In1
-  
+  connect colourThreshold.BoxChange multInForSurfaceThreshold.In2
+
  new MultipleInputs multInForSurfaceSmooth
   connect refresh.BoxChange multInForSurfaceSmooth.In1  
+  connect colourSmooth.BoxChange multInForSurfaceSmooth.In2
     
   connect multInForImageOriginal.BoxChange     viewer2DImageOriginal.BoxExecute  
   connect multInForImageSegmented.BoxChange    viewer2DImageSegmented.BoxExecute
@@ -245,4 +247,3 @@ new IsoSurfaceExtractor  isoextractorSmooth
  
 
   exec mainSplit
-
diff --git a/packages/std/bbs/appli/exampleAdd.bbs b/packages/std/bbs/appli/exampleAdd.bbs
index c9e7669..99d3907 100644
--- a/packages/std/bbs/appli/exampleAdd.bbs
+++ b/packages/std/bbs/appli/exampleAdd.bbs
@@ -1,5 +1,6 @@
 description "std::Add box example. Also shows how to print an output of a box in bbi. "
 category "example"
+author "laurent.guigues@creatis.insa-lyon.fr"
 
 include std
 new Add a
diff --git a/packages/std/bbs/appli/exampleWait.bbs b/packages/std/bbs/appli/exampleWait.bbs
new file mode 100644
index 0000000..3577422
--- /dev/null
+++ b/packages/std/bbs/appli/exampleWait.bbs
@@ -0,0 +1,16 @@
+description "std::Wait box example : waits 1 second then 3 seconds..."
+category "example"
+author "laurent.guigues@creatis.insa-lyon.fr"
+
+load std
+new Wait wait
+set wait.In 1000
+print "==== Starting to wait 1 second ===="
+exec wait
+print "==== 1 second elapsed ===="
+set wait.In 3000
+print "==== Starting to wait 3 seconds ===="
+exec wait
+print "==== 3 seconds elapsed ===="
+print "==== Done ! ===="
+
diff --git a/packages/std/src/bbstdWait.xml b/packages/std/src/bbstdWait.xml
new file mode 100644
index 0000000..8d6c093
--- /dev/null
+++ b/packages/std/src/bbstdWait.xml
@@ -0,0 +1,67 @@
+<!--==========================================================================
+   STARTS THE DESCRIPTION OF THE BLACK BOX -->
+<blackbox name="Wait">
+<!--=======================================================================-->
+
+  <!--========================================================================
+    THE BOX DOCUMENTATION -->
+
+  <author>laurent.guigues@creatis.insa-lyon.fr</author>
+  <description>Waits a certain number of milliseconds</description>
+  <category></category>
+  <!--=====================================================================-->
+
+  <!--========================================================================
+    #include directives to be put in the .h generated
+    There must be one tag per file to include
+    Here we include the standard header iostream.h -->
+  <include><PRE>ctime</PRE></include>
+  <!--=====================================================================-->
+
+  <!--========================================================================
+    INPUTS/OUTPUTS DECLARATION -->
+  <input name="In" type="int" description="Number of milliseconds to wait"/>
+  <!--=====================================================================-->
+
+  <!--========================================================================
+    THE PROCESSING METHOD BODY : -->
+  <process>
+  <PRE>
+    clock_t endwait;
+    endwait = clock () + (bbGetInputIn() * CLOCKS_PER_SEC )/ 1000;
+    while (clock() < endwait) {}
+  </PRE>
+  </process>
+  <!--=====================================================================-->
+
+  <!--========================================================================
+    CONSTRUCTORS / DESTRUCTORS (OPTIONAL) 
+    THE CONSTRUCTION METHOD BODY : -->
+  <constructor>
+  <PRE>
+    bbSetInputIn(1000);
+  </PRE>
+  </constructor>
+
+  <!-- THE COPY-CONSTRUCTION METHOD BODY :
+    Here does nothing 
+    But this is where you should allocate the output pointers if any
+    and copy the pointed values (to avoid bug caused by multiple references)-->
+  <copyconstructor>
+  <PRE>
+  </PRE>
+  </copyconstructor>
+
+  <!-- THE DESTRUCTION METHOD BODY :
+    Here does nothing 
+    but this is where you should desallocate the output pointers if any -->
+  <destructor>
+  <PRE>
+  </PRE>
+  </destructor>
+  <!--=====================================================================-->
+
+<!--=======================================================================-->
+<!-- END OF BLACK BOX DESCRIPTION -->
+</blackbox>
+<!--=======================================================================-->