X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdConcatStrings.h;h=ad0ac839c85b554230430c192aec03efa1fa7390;hb=5b3846e059f725d9e3c39715fceae5b6809a013a;hp=6b6d46c9b8400d4dd4eb6804779c771600737235;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/std/src/bbstdConcatStrings.h b/packages/std/src/bbstdConcatStrings.h
index 6b6d46c..ad0ac83 100644
--- a/packages/std/src/bbstdConcatStrings.h
+++ b/packages/std/src/bbstdConcatStrings.h
@@ -1,42 +1,48 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbstdConcatStrings.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:26 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/16 08:51:32 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
-
 
 #ifndef __bbstdConcatStrings_h_INCLUDED__
 #define __bbstdConcatStrings_h_INCLUDED__
 
 #include "bbtkAtomicBlackBox.h"
+#include "bbstd_EXPORT.h"
 
 namespace bbstd
 {
-  class ConcatStrings
+  class bbstd_EXPORT ConcatStrings
     : 
     public bbtk::AtomicBlackBox
   {
@@ -52,18 +58,16 @@ namespace bbstd
     BBTK_DECLARE_INPUT(In9, std::string);
     BBTK_DECLARE_INPUT(In10,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::string);
+    BBTK_DECLARE_OUTPUT(Box_ConcatStrings,ConcatStrings*);
     BBTK_PROCESS(DoProcess);
     void DoProcess();
-
-  protected:
-    virtual void bbUserConstructor();
   };
 
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ConcatStrings,bbtk::AtomicBlackBox);
   BBTK_NAME("ConcatStrings");
   BBTK_AUTHOR("jean-pierre.roux@creatis.insa-lyon.fr");
   BBTK_CATEGORY("misc");
-  BBTK_DESCRIPTION("String concatenation");
+  BBTK_DESCRIPTION("String concatenation (C++,Python,JavaScript)");
   BBTK_INPUT(ConcatStrings,In1, "String 1", std::string,"");
   BBTK_INPUT(ConcatStrings,In2, "String 2", std::string,"");  
   BBTK_INPUT(ConcatStrings,In3, "String 3", std::string,"");  
@@ -75,6 +79,7 @@ namespace bbstd
   BBTK_INPUT(ConcatStrings,In9, "String 9", std::string,"");  
   BBTK_INPUT(ConcatStrings,In10,"String 10",std::string,"");  
   BBTK_OUTPUT(ConcatStrings,Out,"Concatenated string",std::string,"");
+  BBTK_OUTPUT(ConcatStrings,Box_ConcatStrings,"bbtk Box ConcatStrings",ConcatStrings*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(ConcatStrings);
 
 }