From daa4b4dd18d9320341aed677d97e78f890fa88a3 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 3 Jul 2008 18:20:56 +0000 Subject: [PATCH] Some cleaning --- .../VTK_ImageAlgorithm-template.xml | 51 ++++++++++- .../VTK_PolyDataAlgorithm-template.xml | 49 ++++++++++- .../xml-templates/std-template.xml | 11 ++- .../xml-templates/widget-template.xml | 50 +++++++++-- kernel/appli/bbc/CMakeLists.txt | 4 +- kernel/appli/bbc/main.cxx.in | 22 ++--- kernel/appli/bbs2cpp/CMakeLists.txt | 6 +- kernel/appli/bbs2cpp/bbs2cpp.cxx | 2 +- .../bbtkPackageDevelopersGuide.tex | 86 +++++++++++++++---- .../src/bbtkBlackBoxInputOutputDescriptor.h | 6 +- .../toolsbbtk/bbs/appli/GUICreateBlackBox.bbs | 18 ++-- packages/vtk/src/bbvtkConeSource.xml | 14 +-- packages/vtk/src/bbvtkImageDilateErode3D.xml | 14 +-- packages/vtk/src/bbvtkImageGaussianSmooth.xml | 8 +- packages/vtk/src/bbvtkMetaImageReader.xml | 4 +- packages/wx/src/bbwxDirectorySelector.h | 12 +-- 16 files changed, 266 insertions(+), 91 deletions(-) diff --git a/kernel/appli/bbCreateBlackBox/xml-templates/VTK_ImageAlgorithm-template.xml b/kernel/appli/bbCreateBlackBox/xml-templates/VTK_ImageAlgorithm-template.xml index 3f0f0ec..bf2eea9 100644 --- a/kernel/appli/bbCreateBlackBox/xml-templates/VTK_ImageAlgorithm-template.xml +++ b/kernel/appli/bbCreateBlackBox/xml-templates/VTK_ImageAlgorithm-template.xml @@ -1,19 +1,66 @@ + + + __AUTHOR__ 
__DESCRIPTION__
 __CategoryBlackBox__ + + vtkImageAnisotropicDiffusion3D.h -vtkImageData.h +vtkImageData.h + + vtkImageAnisotropicDiffusion3D + + - + + + + 
+    bbSetInputIn(0);
+
+ + + + 
+
+ + + + + + 
+
+
+ + + + + diff --git a/kernel/appli/bbCreateBlackBox/xml-templates/VTK_PolyDataAlgorithm-template.xml b/kernel/appli/bbCreateBlackBox/xml-templates/VTK_PolyDataAlgorithm-template.xml index b6eca38..c7f15bc 100644 --- a/kernel/appli/bbCreateBlackBox/xml-templates/VTK_PolyDataAlgorithm-template.xml +++ b/kernel/appli/bbCreateBlackBox/xml-templates/VTK_PolyDataAlgorithm-template.xml @@ -1,15 +1,27 @@ - - + + + __AUTHOR__ 
__DESCRIPTION__
 __CategoryBlackBox__ + + vtkAppendPolyData.h + + vtkAppendPolyData + @@ -17,6 +29,9 @@ + + 
   SetInput(bbGetInputIn1());
@@ -24,11 +39,17 @@
   SetInput(bbGetInputIn3());
   SetInput(bbGetInputIn4());
   SetInput(bbGetInputIn5());
-   
+
   Update();
+ + 
   bbSetInputIn1((vtkPolyData *)0);
@@ -38,9 +59,29 @@
   bbSetInputIn5((vtkPolyData *)0);
   bbSetOutputOut((vtkPolyData *)0);
- + + + + + 
+
+ + + + + + 
 
+
+ + + diff --git a/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml b/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml index b02c550..6a8caa0 100644 --- a/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml +++ b/kernel/appli/bbCreateBlackBox/xml-templates/std-template.xml @@ -5,6 +5,7 @@ + __AUTHOR__ __DESCRIPTION__ __CATEGORY__ @@ -21,6 +22,7 @@ INPUTS/OUTPUTS DECLARATION --> + + 
     bbSetOutputOut( bbGetInputIn() );
     std::cout << "Output value = " <
   
     bbSetInputIn(0);
-  
    
+
+ 
-
+ + 
-
+ diff --git a/kernel/appli/bbCreateBlackBox/xml-templates/widget-template.xml b/kernel/appli/bbCreateBlackBox/xml-templates/widget-template.xml index 4e321db..ec1d45b 100644 --- a/kernel/appli/bbCreateBlackBox/xml-templates/widget-template.xml +++ b/kernel/appli/bbCreateBlackBox/xml-templates/widget-template.xml @@ -1,11 +1,20 @@ - + - + __AUTHOR__ __DESCRIPTION__ __CategoryBlackBox__ + + + + @@ -13,24 +22,51 @@ bbSetOutputWidget( new wxStaticText ( bbGetWxParent() , -1 , _T("") ) ); Process(); - + + + 
    std::string msg;
     if (bbGetInputTitle()!="")
       {
 	msg = bbGetInputTitle()+": " + bbGetInputIn();
-      }  
-    else 
+      }
+    else
       {
 	msg = bbGetInputIn();
       }
    ((wxStaticText*)bbGetOutputWidget())->SetLabel( bbtk::std2wx( msg ) );
- + + + 
 
     bbSetInputIn("");
     bbSetInputTitle("");
-
+ + + + + + + 
+
+
+ + + + 
+
+
+ + diff --git a/kernel/appli/bbc/CMakeLists.txt b/kernel/appli/bbc/CMakeLists.txt index 0ee3cb1..41bc897 100644 --- a/kernel/appli/bbc/CMakeLists.txt +++ b/kernel/appli/bbc/CMakeLists.txt @@ -3,8 +3,6 @@ SET(bbc_DATA_REL_PATH_FROM_DATA kernel/bbc) # Relative path to the data used by bbc from bin folder SET(bbc_DATA_REL_PATH_FROM_BIN ../${BBTK_DATA_REL_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}) - - # Build tree SET(bbc_CMAKE_OPTION_FOR_BUILD_TREE "-DBBTK_DIR=${PROJECT_BINARY_DIR}") CONFIGURE_FILE( @@ -32,7 +30,7 @@ ELSE(UNIX) ${CMAKE_CURRENT_SOURCE_DIR}/bbc.bat.in ${CMAKE_CURRENT_BINARY_DIR}/bbc.bat @ONLY IMMEDIATE - ) + ) INSTALL( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbc.bat DESTINATION bin diff --git a/kernel/appli/bbc/main.cxx.in b/kernel/appli/bbc/main.cxx.in index d1d8212..f3bd451 100644 --- a/kernel/appli/bbc/main.cxx.in +++ b/kernel/appli/bbc/main.cxx.in @@ -46,7 +46,7 @@ public: bool text_dialog; std::map param_map; - + }; IMPLEMENT_APP(wxBBIApp); @@ -77,7 +77,7 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser) std::string right = s.substr(pos+1,s.size()); param_map[left]=right; } - else + else { std::cout << "'" << s << "' option unrecognized : ignored"<SetDialogMode(bbtk::VirtualExec::TextDialog); EXEC_FUNCTION(mExecuter); - + mExecuter->SetNoExecMode(false); - if (help) + if (help) { - std::string package; + std::string package; mExecuter->GetFactory()->HelpBlackBox("workspace",package,false); } } @@ -138,15 +138,15 @@ bool wxBBIApp::OnInit( ) bbtk::Wx::GetTopWindow()->Close(); return false; } - if (help || !bbtk::Wx::IsSomeWindowAlive()) - { + if (help || !bbtk::Wx::IsSomeWindowAlive()) + { return false; } return true; } -#if defined(_WIN32) +#if defined(_WIN32) // How to have a Console and wxWidgets // http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide @@ -155,11 +155,11 @@ bool wxBBIApp::OnInit( ) // you need to use the linker option "/subsystem:console" and the following code: int main(int argc, char* argv[]) { - return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), + return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL); } -#endif // defined(_WIN32) +#endif // defined(_WIN32) #else @@ -183,7 +183,7 @@ int main(int argc, char* argv[]) { I.CommandLineInterpreter(); } - else + else { std::string f(argv[1]); I.InterpretFile(f); diff --git a/kernel/appli/bbs2cpp/CMakeLists.txt b/kernel/appli/bbs2cpp/CMakeLists.txt index ddec705..a682e24 100644 --- a/kernel/appli/bbs2cpp/CMakeLists.txt +++ b/kernel/appli/bbs2cpp/CMakeLists.txt @@ -3,13 +3,13 @@ SET(SOURCES bbs2cpp ) SET(EXENAME bbs2cpp ) #IF(BBTK_USE_WXWIDGETS AND WIN32) -# ADD_EXECUTABLE(${EXENAME} WIN32 ${SOURCES}) +# ADD_EXECUTABLE(${EXENAME} WIN32 ${SOURCES}) # SET_TARGET_PROPERTIES(${EXENAME} PROPERTIES LINK_FLAGS /subsystem:console ) #ELSE(BBTK_USE_WXWIDGETS AND WIN32) -# ADD_EXECUTABLE(${EXENAME} ${SOURCES}) +# ADD_EXECUTABLE(${EXENAME} ${SOURCES}) #ENDIF(BBTK_USE_WXWIDGETS AND WIN32) -ADD_EXECUTABLE(${EXENAME} ${SOURCES}) +ADD_EXECUTABLE(${EXENAME} ${SOURCES}) TARGET_LINK_LIBRARIES(${EXENAME} bbtk) INSTALL_TARGETS(/bin/ ${EXENAME}) diff --git a/kernel/appli/bbs2cpp/bbs2cpp.cxx b/kernel/appli/bbs2cpp/bbs2cpp.cxx index 0fd3e0c..bfddf71 100644 --- a/kernel/appli/bbs2cpp/bbs2cpp.cxx +++ b/kernel/appli/bbs2cpp/bbs2cpp.cxx @@ -23,6 +23,6 @@ int main(int argc, char* argv[]) return 0; } - + // EOF diff --git a/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex b/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex index de75a27..0c6a428 100644 --- a/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex +++ b/kernel/doc/bbtkPackageDevelopersGuide/bbtkPackageDevelopersGuide.tex @@ -72,8 +72,7 @@ the utility \bbfy will then generate the corresponding \CPP code. Run \texttt{bbStudio}. -Use the option \texttt{Create Package} of the menu \texttt{Tools}. - +You''l get something like in fig. \ref{bb-Studio} \begin{figure}[!ht] \caption{\label{bb-Studio} bbStudio} @@ -82,6 +81,8 @@ Use the option \texttt{Create Package} of the menu \texttt{Tools}. \end{center} \end{figure} +Use the option \texttt{Create package} of the menu \texttt{Tools}. + You will be asked to choose the directory where you want to create the package, then you'll get something like in fig. \ref{bbCreatePackage}. @@ -98,7 +99,7 @@ That will creates the directory structure and the \texttt{cmake} files necessary to build the project. You must then decide the name of your new package. -It will be the name used to load the package in \texttt{bbi}. +This name will be used to load the package in \texttt{bbi}. Fill up the form like in fig. \ref{bbFillUpPackageForm}. @@ -109,7 +110,7 @@ Fill up the form like in fig. \ref{bbFillUpPackageForm}. \end{center} \end{figure} -Edit the file 'MyPackage/CMakeLists.txt' to customize your package +Edit the file \texttt{MyPackage/CMakeLists.txt} to customize your package the file tree obtained is : @@ -352,9 +353,11 @@ Apart from this choice of the description langage to use, there is an important choice to do concerning the implementation of the box. In \CPP, a black box is nothing but a class which has the standard interface of all black boxes : what's its name ? inputs ? outputs ? and so on. + + The abstract description of this interface is done in the class \texttt{bbtk::BlackBox} and is implemented in its child classes : -\texttt{bbtk::UserBlackBox} and \texttt{bbtk::WxBlackBox} +\texttt{bbtk::AtomicBlackBox} and \texttt{bbtk::WxBlackBox} \footnote{all the classes of the \bbtk library are in a \emph{namespace} called \texttt{bbtk} and the \CPP header of a class called \texttt{NameOfAClass} is @@ -366,10 +369,12 @@ If your black box is a \emph{Widget} black box, that is a black box which has (or is) a piece of a graphical interface based on the \wx library, then it must inherit the class \texttt{bbtk::WxBlackBox}. -Concretely, a \texttt{bbtk::WxBlackBox} is associated + +Concretely, a \texttt{bbtk::WxBlackBox} is associated to a \texttt{wxWindow} and must be able to return a pointer to it. -If your black box is not a widget black box, it must inherit -\texttt{bbtk::UserBlackBox}. +If your black box is not a widget black box +(that is : doesn't returns a pointer to a \emph{Widget}), + it must inherit from \texttt{bbtk::AtomicBlackBox}. \subsubsection{Inherit or encapsulate ?} @@ -393,7 +398,7 @@ In \CPP, in order to embed an existing processing \emph{class} into a standard interface you only have two possibilities : \begin{enumerate} \item {\bf Inherit} the existing processing class -\emph{and} the interface class (e.g. \texttt{bbtk::UserBlackBox}). +\emph{and} the interface class (e.g. \texttt{bbtk::AtomicBlackBox}). In this case you have to : \begin{enumerate} \item make the link between the inputs and outputs of the black box @@ -403,7 +408,7 @@ method of the inherited class in the processing method of the black box. \end{enumerate} \item {\bf Encapsulate} the existing processing class in a class inherited from -the interface class (e.g. \texttt{bbtk::UserBlackBox}). +the interface class (e.g. \texttt{bbtk::AtomicBlackBox}). In this case you have to : \begin{enumerate} \item declare it as a member of the black box, @@ -588,8 +593,8 @@ describing the \texttt{Add} box of the \texttt{std} package : The tags and their role are easily understandable. -As the box is not a widget, we inherit from -\texttt{bbtk::UserBlackBox} (\texttt{parentblackbox} tag). +As the box is not a widget, we inherit implicitely from +\texttt{bbtk::AtomicBlackBox}. The only part of the file which needs a bit of explaination is @@ -602,9 +607,9 @@ like the \texttt{<} and \texttt{>} which have a special meaning in \xml. In the case of the \texttt{Add} box, the process code is very simple : remember that -\texttt{bbGetInputIn1} is the +\texttt{bbGetInputIn1()} is the accessor to the input \texttt{In1} declared above and -\texttt{bbGetInputIn2} is the +\texttt{bbGetInputIn2()} is the accessor to the input \texttt{In2}; the code simply adds the values of the two inputs and sets the output \texttt{Out} with the resulting value. @@ -614,14 +619,14 @@ you must modify the xml file generated in previous step : \begin{enumerate} \item Complete the description and author tags if you feel like. - \item add the '\#include' directives to be put in the generated .h file + \item add the \texttt{\#include} directives to be put in the generated \texttt{.h} file \item Create your inputs and outputs \item Fill in the process tag \item Fill in the constructor tag \item Fill in the copyconstructor tag \item Fill in the destructor tag \item Pray -\end{enumerate} +\end{enumerate} % ========================================== @@ -631,11 +636,31 @@ you must modify the xml file generated in previous step : % ========================================== \subsubsection{Specific \texttt{xml} tags for \texttt{vtkImageAlgorithm} classes bbfication} % ========================================== +\begin{verbatim} + + + +the vtk ImageAlgorithm class it inherits from + + + + +\end{verbatim} % ========================================== \subsubsection{Specific \texttt{xml} tags for \texttt{vtkPolyDataAlgorithm} classes bbfication} % ========================================== +\begin{verbatim} + + +the vtk Polydata class it inherits from + + + + + +\end{verbatim} % ========================================== \subsubsection{\bbfy \texttt{xml} tags reference} % ========================================== @@ -685,8 +710,9 @@ Use \texttt{bbPACKAGE}, where \texttt{PACKAGE} is the name of the package\\\hlin \texttt{} & \texttt{name} & - & 1 & The name of the output \\\hline & \texttt{type} & - & 1 & The type of the output \\\hline & \texttt{special} & - & 0-1 & In: \{\texttt{``itk output'', -``vtk output''}\} (see below).\\\hline - & \texttt{generic\_type} & c) & 0-1 & The ``generic'' type of the output (see text).\\\hline +``vtk output''}\} (see below).\\\hline + & \texttt{generic\_type} & c) & 0-1 & The ``generic'' type of the output (see text).\\\hline + & \texttt{nature} & c) & 0-1 & The ``nature'' of the output (used for automatic GUI generation).\\\hline \texttt{} & - & - & 0-1 & The code of the processing method of the box. Must be put between clear tags : \texttt{
} \\\hline 
 \texttt{} & - & - & 0-1 & The code of the user Constructor of the box (may contains default initialisations). Must be put between clear tags : \texttt{
} \\\hline 
@@ -731,7 +757,7 @@ c) & \texttt{} and
  \texttt{example}        & : Example script showing a box use-case      \\ \hline
  \texttt{filter}         & : Image processing box                       \\ \hline
  \texttt{image}          & : Image processing related box               \\ \hline
- \texttt{interaction}    & :  \\ \hline
+ \texttt{interaction}    & :                                            \\ \hline
  \texttt{math}           & : Mathematical operations\\ \hline
  \texttt{mesh}           & : Mesh processing related box \\ \hline
  \texttt{misc}           & : A box that cannot be put in other category ! \\ \hline
@@ -764,6 +790,28 @@ c) & \texttt{} and
 \end{tabular}
 \end{table}
 
+
+% ==========================================
+\begin{table}[!ht]
+\caption{\label{nature}
+\bbfy \texttt{nature}}
+\small
+\begin{tabular}{|ll|}
+\hline
+ \texttt{Nature}     &   : used for    \\ \hline \\ \hline
+ 
+ \texttt{file name} & Poping up a File Selector\\ \hline
+ \texttt{directory name} & Poping up a Directory Selector\\ \hline 
+ \texttt{file extension} & \\ \hline  
+ \texttt{colour} & Poping up a Colour Selector\\ \hline 
+ \texttt{pixel type} & \\ \hline 
+ \texttt{image dimension} & \\ \hline
+ \texttt{image index} & \\ \hline 
+ \texttt{image size} & \\ \hline 
+ \texttt{voxel size} & \\ \hline  
+\end{tabular}
+\end{table}
+
 % ==========================================
 \subsection{\CPP description of a box}
 % ==========================================
diff --git a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h
index fc2f97e..ad99419 100644
--- a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h
+++ b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxInputOutputDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/08 06:59:29 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/07/03 18:20:57 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@ namespace bbtk
   class BBTK_EXPORT BlackBoxInputOutputDescriptor
   {
   public:
-    /// Ctor with name and description
+    /// Ctor with name, description and naure
     BlackBoxInputOutputDescriptor(TypeInfo creator_type_info,
 				  const std::string& name,
 				  const std::string& description,
diff --git a/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs b/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
index 43ac0e4..c07f0b1 100644
--- a/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
+++ b/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
@@ -25,7 +25,7 @@ new InputText author
     set author.In "_author_"
 
 new InputText description
-    set description.Title "Description            (caracters   '<',  '>' not accepted...)"
+    set description.Title "Description    (caracters   '<',  '>' not accepted...)"
     set description.In "_description_"
 
 #---------------------------------------------------------------------
@@ -136,24 +136,24 @@ new ConcatStrings descriptionStr
 new Configuration conf
 
 new ConcatStrings commandStr
-    set						commandStr.In1 " "
-    connect ascii.Out			commandStr.In2
-    connect conf.BinPath		commandStr.In3
+    set				commandStr.In1 " "
+    connect ascii.Out		commandStr.In2
+    connect conf.BinPath	commandStr.In3
     connect conf.FileSeparator	commandStr.In4
-    set						commandStr.In5 "bbCreateBlackBox"
-    connect ascii.Out			commandStr.In6
-    set						commandStr.In7 " "
+    set				commandStr.In5 "bbCreateBlackBox"
+    connect ascii.Out		commandStr.In6
+    set				commandStr.In7 " "
 
 
 new ConcatStrings concatStr
-    connect  commandStr.Out		concatStr.In1 
+    connect  commandStr.Out			concatStr.In1 
     connect dirStr.Out				concatStr.In2 
     connect packageNameStr.Out	concatStr.In3 
     connect blackboxNameStr.Out	concatStr.In4
     connect typeStr.Out				concatStr.In5
     connect formatStr.Out			concatStr.In6
     connect authorStr.Out			concatStr.In7
-    connect descriptionStr.Out		concatStr.In8
+    connect descriptionStr.Out			concatStr.In8
 
 /*
 LG : bug on linux 
diff --git a/packages/vtk/src/bbvtkConeSource.xml b/packages/vtk/src/bbvtkConeSource.xml
index a749f68..0faf6f2 100644
--- a/packages/vtk/src/bbvtkConeSource.xml
+++ b/packages/vtk/src/bbvtkConeSource.xml
@@ -10,12 +10,12 @@
 vtkConeSource.h 
 vtkConeSource
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 
@@ -27,7 +27,7 @@ SetCenter(bbGetInputCenterX(),
           bbGetInputCenterZ());
 
 SetDirection(bbGetInputDirectionX(), 
-          bbGetInputDirectionY(), 
+          bbGetInputDirectionY(),
           bbGetInputDirectionZ());
                     
 SetResolution(bbGetInputResolution());
diff --git a/packages/vtk/src/bbvtkImageDilateErode3D.xml b/packages/vtk/src/bbvtkImageDilateErode3D.xml
index c4a3509..548a128 100644
--- a/packages/vtk/src/bbvtkImageDilateErode3D.xml
+++ b/packages/vtk/src/bbvtkImageDilateErode3D.xml
@@ -11,13 +11,13 @@
 
 vtkImageDilateErode3D
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
 
 
diff --git a/packages/vtk/src/bbvtkImageGaussianSmooth.xml b/packages/vtk/src/bbvtkImageGaussianSmooth.xml
index 1bb7346..c73c88c 100644
--- a/packages/vtk/src/bbvtkImageGaussianSmooth.xml
+++ b/packages/vtk/src/bbvtkImageGaussianSmooth.xml
@@ -11,11 +11,11 @@
 
 vtkImageGaussianSmooth
 
-  
+  
 
-
-
-
+
+
+
 
 
 
diff --git a/packages/vtk/src/bbvtkMetaImageReader.xml b/packages/vtk/src/bbvtkMetaImageReader.xml
index 38661c6..e019150 100644
--- a/packages/vtk/src/bbvtkMetaImageReader.xml
+++ b/packages/vtk/src/bbvtkMetaImageReader.xml
@@ -10,8 +10,8 @@
 vtkImageData.h 
 vtkMetaImageReader
 
-  
-
+  
+
  
  
    SetFileName(bbGetInputIn().c_str());
diff --git a/packages/wx/src/bbwxDirectorySelector.h b/packages/wx/src/bbwxDirectorySelector.h
index 82bfe63..8a07f3e 100644
--- a/packages/wx/src/bbwxDirectorySelector.h
+++ b/packages/wx/src/bbwxDirectorySelector.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxDirectorySelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/07/03 18:20:57 $
+  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
@@ -70,10 +70,10 @@ namespace bbwx
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("Pops up a directory selection dialog (wxDirDialog)");
-  BBTK_INPUT(DirectorySelector,Title,"Title of the dialog",std::string,"directory name");
-  BBTK_INPUT(DirectorySelector,Message,"Message to show on the dialog",std::string,"");
-  BBTK_INPUT(DirectorySelector,DefaultDir,"The default directory",std::string,"directory name");
-  BBTK_OUTPUT(DirectorySelector,Out,"The directory selected by the user",std::string,"directory name");
+  BBTK_INPUT(DirectorySelector,Title,     "Title of the dialog",                std::string,"directory name");
+  BBTK_INPUT(DirectorySelector,Message,   "Message to show on the dialog",      std::string,"");
+  BBTK_INPUT(DirectorySelector,DefaultDir,"The default directory",              std::string,"directory name");
+  BBTK_OUTPUT(DirectorySelector,Out,      "The directory selected by the user", std::string,"directory name");
   BBTK_END_DESCRIBE_BLACK_BOX(DirectorySelector);
   //=================================================================
 
-- 
2.45.1