From: guigues <guigues>
Date: Wed, 7 May 2008 13:14:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~47
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9525de09e988104a05a98acc18ba1ebc773b5f49;p=bbtk.git

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

diff --git a/packages/wx/src/bbwxColourSelector.h b/packages/wx/src/bbwxColourSelector.h
index 84d4318..3bdebbd 100644
--- a/packages/wx/src/bbwxColourSelector.h
+++ b/packages/wx/src/bbwxColourSelector.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/05/07 13:14:48 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -67,7 +67,7 @@ namespace bbwx
   BBTK_NAME("ColourSelector");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Colour Selector dialog (bbfication of wxColourSelector)");
-  BBTK_OUTPUT(ColourSelector,Out,"The colour selected by the user",std::string,"color");
+  BBTK_OUTPUT(ColourSelector,Out,"The colour selected by the user",std::string,"colour");
   BBTK_END_DESCRIBE_BLACK_BOX(ColourSelector);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h
index 22dd101..ba752c6 100644
--- a/packages/wx/src/bbwxColourSelectorButton.h
+++ b/packages/wx/src/bbwxColourSelectorButton.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/05/07 13:14:49 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -102,8 +102,8 @@ private:
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("A button which displays a colour picker dialog when clicked");
-  BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string,"color");
-  BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"color");
+  BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string,"colour");
+  BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"colour");
   BBTK_END_DESCRIBE_BLACK_BOX(ColourSelectorButton);
   //=================================================================
   
diff --git a/packages/wx/src/bbwxCommandButton.h b/packages/wx/src/bbwxCommandButton.h
index 4702c62..289c2d9 100644
--- a/packages/wx/src/bbwxCommandButton.h
+++ b/packages/wx/src/bbwxCommandButton.h
@@ -3,8 +3,8 @@
   Program:   bbtk 
   Module:    $RCSfile: bbwxCommandButton.h,v $ 
   Language:  C++ 
-  Date:      $Date: 2008/04/18 12:59:52 $ 
-  Version:   $Revision: 1.3 $ 
+  Date:      $Date: 2008/05/07 13:14:49 $ 
+  Version:   $Revision: 1.4 $ 
                                                                                  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de 
   l'Image). All rights reserved. See Doc/License.txt or 
@@ -96,7 +96,7 @@ namespace bbwx
   
   BBTK_INPUT(CommandButton,In,"Commands to be executed separated by commas (;). Each single quote (') is replaced by a double quote (\").",std::string,"");   
   BBTK_INPUT(CommandButton,Label,"Label of the button",std::string,""); 
-  BBTK_INPUT(CommandButton,Colour,"Colour of the button (-1 -1 -1  Background)",vectorcolour,"color"); 
+  BBTK_INPUT(CommandButton,Colour,"Colour of the button (-1 -1 -1  Background)",vectorcolour,"colour"); 
   //	BBTK_OUTPUT(CommandButton,Out,"..Out..",int); 
   BBTK_END_DESCRIBE_BLACK_BOX(CommandButton); 
   //================================================================= 
diff --git a/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithGUI.bbs b/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithGUI.bbs
new file mode 100644
index 0000000..0f154ee
--- /dev/null
+++ b/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithGUI.bbs
@@ -0,0 +1,27 @@
+include vtk
+include std
+include wx
+include wxvtk
+
+# Pipeline : Reader -> IsoSurfaceExtractor -> Viewer
+new LoadHola r
+new IsoSurfaceExtractor i
+new Viewer3D v
+connect r.Out i.In
+connect i.Out v.In1
+
+# GUI
+message echo 2
+newgui    i      ig
+message echo 0
+
+# Layout
+new LayoutLine l
+connect v.Widget l.Widget1
+connect ig.Widget l.Widget2
+
+# Changes in GUI update the view
+connect ig.BoxChange v.BoxExecute
+
+# GO !
+exec l