X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdStringToVector.h;h=6e68911584a32e5f90ed0f79ca8b3053cf606529;hb=19c9e9989a6be039aac2daac660e9133ee578ed7;hp=bd5d9f2ce0bcd8f171798874b8e5cf5d8a2df58f;hpb=487dbfe275c2c6fa7454a000503082bfca54396b;p=bbtk.git

diff --git a/packages/std/src/bbstdStringToVector.h b/packages/std/src/bbstdStringToVector.h
index bd5d9f2..6e68911 100644
--- a/packages/std/src/bbstdStringToVector.h
+++ b/packages/std/src/bbstdStringToVector.h
@@ -1,16 +1,54 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbstdStringToVector.h,v $
+  Language:  C++
+  Date:      $Date: 2012/11/16 08:51:32 $
+  Version:   $Revision: 1.11 $
+=========================================================================*/
+
+
+
 #ifndef __bbstdStringToVector_INCLUDED_h__
 #define __bbstdStringToVector_INCLUDED_h__
 
 #include "bbtkAtomicBlackBox.h"
+#include "bbstd_EXPORT.h"
 
 namespace bbstd
 {
   //=================================================================
   // BlackBox declaration
   template <class T>
-  class StringToVector : public bbtk::AtomicBlackBox
+  class bbstd_EXPORT StringToVector : public bbtk::AtomicBlackBox
   {  
-    BBTK_USER_BLACK_BOX_INTERFACE(StringToVector,bbtk::AtomicBlackBox);
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(StringToVector,bbtk::AtomicBlackBox,T);
     BBTK_DECLARE_INPUT(In,std::string);
     BBTK_DECLARE_OUTPUT(Out,std::vector<T>);
     BBTK_PROCESS(DoIt);
@@ -21,7 +59,7 @@ namespace bbstd
 
   //=================================================================
   // BlackBox description
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector);
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector,bbtk::AtomicBlackBox);
   BBTK_NAME("StringTo"+bbtk::HumanTypeName<std::vector<T> >());
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DEFAULT_ADAPTOR();
@@ -34,6 +72,10 @@ namespace bbstd
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector);
   //=================================================================
   
+
+  template <class T> void StringToVector<T>::bbUserSetDefaultValues() {}
+  template <class T> void StringToVector<T>::bbUserInitializeProcessing() {}
+  template <class T> void StringToVector<T>::bbUserFinalizeProcessing() {}
   //=================================================================
   template <class T>
   void StringToVector<T>::DoIt()
@@ -48,18 +90,21 @@ namespace bbstd
     std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
     // Find first "non-delimiter".
     std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
-    bbmOutputOut.clear();
+//    bbmOutputOut.clear();
+std::vector<T> out;
     while (std::string::npos != pos || std::string::npos != lastPos)
       {
 	// Found a token, add it to the vector.
-	bbmOutputOut.push_back( 
-			       this->decode_item( str.substr(lastPos, pos - lastPos) ) );
+//	bbmOutputOut.push_back( this->decode_item( str.substr(lastPos, pos - lastPos) ) );
+	out.push_back( this->decode_item( str.substr(lastPos, pos - lastPos) ) );
 	//      std::cout << this->bbGetOutputOut().back() << std::endl;
 	// Skip delimiters.  Note the "not_of"
 	lastPos = str.find_first_not_of(delimiters, pos);
 	// Find next "non-delimiter"
 	pos = str.find_first_of(delimiters, lastPos);
       }
+bbSetOutputOut (out);
+//bbSignalOutputModification();
     //  std::cout << "s=" << this->bbGetOutputOut().size() << std::endl;
   }
   //=================================================================