X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxOutputDescriptor.h;h=89cf0596b9384987f86a05e9a7a6a4512b65f3d0;hb=16993e9f411c62e9a73d13c40f3748bdd232ce09;hp=eb1164f9f46abe2557c935e1c5acc98d40e2b52c;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBoxOutputDescriptor.h b/kernel/src/bbtkBlackBoxOutputDescriptor.h
index eb1164f..89cf059 100644
--- a/kernel/src/bbtkBlackBoxOutputDescriptor.h
+++ b/kernel/src/bbtkBlackBoxOutputDescriptor.h
@@ -1,21 +1,41 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkBlackBoxOutputDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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.6 $
 =========================================================================*/
 
+                                                                     
+
+
 /**
  *  \file 
  *  \brief Class bbtk::BlackBoxOutputDescriptor : abstract descriptor of an output of a black box (stores a name, a description and type)
@@ -28,55 +48,32 @@
 #ifndef __bbtkBlackBoxOutputDescriptor_h__
 #define __bbtkBlackBoxOutputDescriptor_h__
 
-
-#include "bbtkSystem.h"
-#include "bbtkData.h"
-#include "bbtkRTTI.h"
+#include "bbtkBlackBoxInputOutputDescriptor.h"
 
 namespace bbtk
 {
   
-  
   class BBTK_EXPORT BlackBoxOutputDescriptor
+    : public BlackBoxInputOutputDescriptor
   {
   public:
     /// Ctor with name and description
-    BlackBoxOutputDescriptor( const std::string& name,
+    BlackBoxOutputDescriptor( TypeInfo creator_type_info,
+			      const std::string& name,
 			      const std::string& description,
+			      const std::string& nature,
 			      bool copy_construct = true)
-      : mName(name), mDescription(description), 
-	mCopyConstruct(copy_construct) 
+      : BlackBoxInputOutputDescriptor(creator_type_info,name,
+				      description,
+				      nature,
+				      copy_construct)
+    {}
+ 
+  protected:
+    /// Default ctor is reserved to children
+    BlackBoxOutputDescriptor() : 
+      BlackBoxInputOutputDescriptor()
     {}
-    
-    /// Returns the name of the output
-    const std::string& GetName() const { return mName; }
-    /// Returns the description of the output
-    const std::string& GetDescription() const { return mDescription; }
-    /// Returns the type of the output
-    virtual TypeInfo GetTypeInfo() const = 0;
-    /// Returns the name of the type of the output
-    virtual std::string GetTypeName() const = 0;
-    /// Returns the name of the type of the output
-    virtual std::string GetHumanTypeName() const = 0;
-     /// Returns true iff the type is a pointer to class 
-    virtual bool IsPointerType() const = 0;
-    /// Returns true iff the input must be copied 
-    /// by the copy constructor of the box
-    bool GetCopyConstruct() const { return mCopyConstruct; }
-    
-    
-  private:
-    /// Default ctor is private
-    BlackBoxOutputDescriptor() : mName(""), mDescription("") {}
-    /// The name of the output
-    std::string mName;
-    /// The description of the output
-    std::string mDescription;
-     /// Does the output has to be copied by copy constructor 
-    /// default = true. Must be set to false if it is 
-    /// initialized by the user in bbUserCopyConstructor 
-    /// (typically if it is a pointer)
-    bool mCopyConstruct;
  };
   
 }