X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdConfiguration.h;h=4dc5fe58eaf69e075fd4f900eac1a44fffaa6fac;hb=899e84df04040566381e7252faa0b47d0863baca;hp=71408b6214567a24624c4fd7266185d4547bdd10;hpb=cd48d6c543f0238a07dade3387b3c363096d9179;p=bbtk.git

diff --git a/packages/std/src/bbstdConfiguration.h b/packages/std/src/bbstdConfiguration.h
index 71408b6..4dc5fe5 100644
--- a/packages/std/src/bbstdConfiguration.h
+++ b/packages/std/src/bbstdConfiguration.h
@@ -1,36 +1,72 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
+  Program:   bbtk
+  Module:    $RCSfile: bbstdConfiguration.h,v $
+  Language:  C++
+  Date:      $Date: 2012/11/16 08:51:32 $
+  Version:   $Revision: 1.12 $
+=========================================================================*/
+
+
 #ifndef __bbstdConfiguration_h_INCLUDED__
 #define __bbstdConfiguration_h_INCLUDED__
 
 #include "bbtkAtomicBlackBox.h"
+#include "bbstd_EXPORT.h"
 
 namespace bbstd
 {
-  class Configuration
+  class bbstd_EXPORT Configuration
     : 
     public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(Configuration,bbtk::AtomicBlackBox);
-      BBTK_DECLARE_OUTPUT(DataPath,std::string);
-      BBTK_DECLARE_OUTPUT(DocPath,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();
 
-  protected:
-    virtual void bbUserConstructor();
-
   };
 
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(Configuration,bbtk::AtomicBlackBox);
   BBTK_NAME("Configuration");
-  BBTK_AUTHOR("jpr@creatis.insa-lyon.fr");
+  BBTK_AUTHOR("jpr@creatis.insa-lyon [dot] fr");
   BBTK_CATEGORY("misc");
   BBTK_DESCRIPTION("Gets configuration informations");
-  BBTK_OUTPUT(Configuration,DataPath,"Data Path",std::string);
-  BBTK_OUTPUT(Configuration,DocPath,"Documentation 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