=== MAJOR RELEASE ====

[bbtk.git] / packages / std / src / bbstdConfiguration.h

diff --git a/packages/std/src/bbstdConfiguration.h b/packages/std/src/bbstdConfiguration.h
index f0b048d5c1600c5929d5a359627e04b61a850b7d..9f3aced1acec41991955e65a4adf07598264b06c 100644 (file)
--- a/packages/std/src/bbstdConfiguration.h
+++ b/packages/std/src/bbstdConfiguration.h
@@ -1,18 +1,20 @@
 #ifndef __bbstdConfiguration_h_INCLUDED__
 #define __bbstdConfiguration_h_INCLUDED__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 
 namespace bbstd
 {
   class Configuration
     : 
-    public bbtk::UserBlackBox
+    public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(Configuration,bbtk::UserBlackBox);
-      BBTK_DECLARE_OUTPUT(DataPath,std::string);
-      BBTK_DECLARE_OUTPUT(FileSeparator,std::string);
-      BBTK_DECLARE_OUTPUT(SystemType,int);
+    BBTK_BLACK_BOX_INTERFACE(Configuration,bbtk::AtomicBlackBox);
+    BBTK_DECLARE_OUTPUT(BinPath,std::string);
+    BBTK_DECLARE_OUTPUT(DataPath,std::string);
+    BBTK_DECLARE_OUTPUT(DocPath,std::string);
+    BBTK_DECLARE_OUTPUT(FileSeparator,std::string);
+    BBTK_DECLARE_OUTPUT(SystemType,int);
     BBTK_PROCESS(DoProcess);
     void DoProcess();
 
@@ -21,14 +23,16 @@ namespace bbstd
 
   };
 
-  BBTK_BEGIN_DESCRIBE_BLACK_BOX(Configuration,bbtk::UserBlackBox);
+  BBTK_BEGIN_DESCRIBE_BLACK_BOX(Configuration,bbtk::AtomicBlackBox);
   BBTK_NAME("Configuration");
   BBTK_AUTHOR("jpr@creatis.insa-lyon.fr");
   BBTK_CATEGORY("misc");
   BBTK_DESCRIPTION("Gets configuration informations");
-    BBTK_OUTPUT(Configuration,DataPath,"Sample Data Path",std::string);
-    BBTK_OUTPUT(Configuration,FileSeparator,"/ or \\",std::string);  
-    BBTK_OUTPUT(Configuration,SystemType,"0=Linux 1=Windows",int);  
+  BBTK_OUTPUT(Configuration,BinPath,"Binaries path",std::string,"directory name");
+  BBTK_OUTPUT(Configuration,DataPath,"Data path",std::string,"directory name");
+  BBTK_OUTPUT(Configuration,DocPath,"Documentation path",std::string,"directory name");
+  BBTK_OUTPUT(Configuration,FileSeparator,"/ or \\",std::string,"");  
+  BBTK_OUTPUT(Configuration,SystemType,"0=Linux 1=Windows",int,"");  
   BBTK_END_DESCRIBE_BLACK_BOX(Configuration);
 }
 // EO namespace bbstd