X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.h;h=e39b6d766e9dd1e24a5367b3f3b3b524930192d2;hb=789ecd0eb75c3657333605b45faf47c5c37a29c6;hp=d359b2d9f0c5bba7f656e1c846b43fec9886b424;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.h b/kernel/src/bbtkComplexBlackBoxDescriptor.h
index d359b2d..e39b6d7 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.h
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.h
@@ -1,21 +1,39 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkComplexBlackBoxDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.5 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
+
 /**
  *  \file 
  *  \brief Class bbtk::ComplexBlackBoxDescriptor : describes a ComplexBlackBox (constituents, connections) and is able to create an instance of it.
@@ -33,7 +51,8 @@
 #include "bbtkComplexBlackBoxOutputDescriptor.h"
 #include "bbtkFactory.h"
 #include <fstream>
-
+#include <vector>
+#include "bbtkUtilities.h"
 namespace bbtk
 {
 
@@ -92,10 +111,6 @@ namespace bbtk
 		       const std::string& help);
  
  
-    /// Sets the name of the script file from which it is defined
-    void SetScriptFileName(const std::string& n) { mScriptFileName = n; }
-    /// Gets the name of the script file from which it is defined
-    std::string GetScriptFileName() const { return mScriptFileName; }
    
     /// 
     void AddToExecutionList( const std::string& box );
@@ -129,7 +144,7 @@ namespace bbtk
 			  const std::string& output_dir = "",
 			  bool relative_link = false );
     
-
+		void GetBoxesInside (NodeTreeC& tree, int cont);
    ///
     virtual void Check(bool recursive=true) const;
        
@@ -140,19 +155,17 @@ namespace bbtk
     ComplexBlackBoxDescriptor(const std::string& name); 
 
   private:
+	
     /// The factory used
     Factory::WeakPointer mFactory;
     /// The complex box in which boxes and connections are stored
     ComplexBlackBoxPointer mPrototype;
-    /// The name of the script file from which it was created
-    std::string mScriptFileName;
-    
+	      
   };
   // class ComplexBlackBoxDescriptor
   //==========================================================================
 
 
- 
 }
 // namespace bbtk
 #endif