X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdVectorToString.h;h=0a48b6cab6011b30dc6d79f27f5d786e24b47aee;hb=7a26044dd46cb80ab90ee1f63d3b4d8ce52b2d39;hp=3c28ff1583e05cce812b7a8e4653e4127484a697;hpb=e27f49d94042bf18dc5067807594325eea8b6d56;p=bbtk.git

diff --git a/packages/std/src/bbstdVectorToString.h b/packages/std/src/bbstdVectorToString.h
index 3c28ff1..0a48b6c 100644
--- a/packages/std/src/bbstdVectorToString.h
+++ b/packages/std/src/bbstdVectorToString.h
@@ -1,17 +1,16 @@
 #ifndef __bbstdVectorToString_INCLUDED_h__
 #define __bbstdVectorToString_INCLUDED_h__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 
 namespace bbstd
 {
-
   //=================================================================
-  // UserBlackBox declaration
+  // BlackBox declaration
   template <class T>
-  class VectorToString : public bbtk::UserBlackBox
+  class VectorToString : public bbtk::AtomicBlackBox
   {  
-    BBTK_USER_BLACK_BOX_INTERFACE(VectorToString,bbtk::UserBlackBox);
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(VectorToString,bbtk::AtomicBlackBox,T);
     BBTK_DECLARE_INPUT(In,std::vector<T>);
     BBTK_DECLARE_INPUT(Separator,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::string);
@@ -20,13 +19,11 @@ namespace bbstd
     virtual void bbUserConstructor();
   };
   //=================================================================
-  
-  
-  
+
   //=================================================================
-  // UserBlackBox description
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString);
-  BBTK_NAME(bbtk::TypeName<std::vector<T> >()+"ToString");
+  // BlackBox description
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString,bbtk::AtomicBlackBox);
+  BBTK_NAME(bbtk::HumanTypeName<std::vector<T> >()+"ToString");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Converts the content of the input vector ("+bbtk::TypeName<std::vector<T> >()+") to a string in which each item is separated by the value of the input 'Separator'");
@@ -36,9 +33,7 @@ namespace bbstd
   BBTK_TEMPLATE_OUTPUT(VectorToString, Out,"Output",std::string);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString);
   //=================================================================
-  
 
-  
   //=================================================================
   template <class T>
   void VectorToString<T>::DoIt()
@@ -46,17 +41,18 @@ namespace bbstd
     std::string out;
     typename std::vector<T>::const_iterator i;
     for (i=bbmInputIn.begin();i!=bbmInputIn.end();++i)
-      {
-	if (i!=bbmInputIn.begin()) out += bbGetInputSeparator();
-	std::ostringstream s;				
-	s <<  *i;
-	out += s.str();
-      }
+    {
+      if (i!=bbmInputIn.begin())
+         out += bbGetInputSeparator();
+      std::ostringstream s;
+      s <<  *i;
+      out += s.str();
+    }
     bbSetOutputOut(out);
   }
   //=================================================================
-  
-  //=================================================================
+
+  //=================================================================  
   template <class T>
   void VectorToString<T>::bbUserConstructor()
   {