X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkObject.h;h=2ba72ffa059c47cb2b22bf24081bbee44e316da9;hb=ed9d32f344e2ffa223081390b63f064cf1e42de0;hp=483efa4244f2c46cc77c15a58143706cc0996fb0;hpb=768afeae7c180d69467cf9f6329af457ce2862e9;p=bbtk.git

diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h
index 483efa4..2ba72ff 100644
--- a/kernel/src/bbtkObject.h
+++ b/kernel/src/bbtkObject.h
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkObject.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/22 08:29:09 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  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: 2009/04/30 14:31:31 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *\file
  *\brief  Object : the top class of bbtk class hierarchy 
@@ -24,6 +37,7 @@
 #ifndef __bbtkObject_h__
 #define __bbtkObject_h__
 
+#include <bbtkSystem.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <set>
@@ -32,7 +46,7 @@ namespace bbtk
 {
 
   // The top class of bbtk class hierarchy 
-  class Object 
+  class BBTK_EXPORT Object 
   {
   public:
     typedef boost::shared_ptr<Object> Pointer;
@@ -51,15 +65,22 @@ namespace bbtk
     static void InsertInObjectList(Pointer);
     static void RemoveFromObjectList(WeakPointer);
 
+    static void InsertInPackageList(Pointer);
+    static void ReleasePackages();
+
     static void PrintObjectListInfo(const std::string& name);
     //    static void PrintObjectInfo(const std::string& name);
     static void PrintObjectInfo(const Pointer& o); 
+
+    static long GetObjectsCount() { return mgObjectList.size(); }
+
     /// Default objects deleter : removes object from list on deletion
-    struct Deleter 
+    struct BBTK_EXPORT Deleter 
     { 
       Deleter() : mPointer() {}
+      virtual ~Deleter() {}
       virtual void operator() (Object* p); 
-      virtual void Delete(Object* p) { delete p; }
+      virtual int Delete(Object* p) { delete p; return 0; }
       WeakPointer mPointer;
     };
 
@@ -111,10 +132,10 @@ namespace bbtk
       return p;							
     }									
      
-
   private:
     typedef std::set<boost::weak_ptr<Object> > ObjectListType;
     static ObjectListType mgObjectList;
+    static ObjectListType mgPackageList;
     WeakPointer mThisPointer;						
     Pointer mThisPointerLocked;						
 
@@ -156,6 +177,15 @@ protected:							    \
     CLASS(const CLASS&);						    \
     ~CLASS();					    
   
+#define BBTK_OBJECT_INTERFACE_NO_CONDES(CLASS)				    \
+  BBTK_OBJECT_MINIMAL_INTERFACE_WITH_SELF(CLASS);		    \
+public:								    \
+  std::string GetObjectName() const;				    \
+    std::string GetObjectInfo() const ;				    \
+    size_t GetObjectSize() const ;				    \
+    size_t GetObjectInternalSize() const ;			    \
+    size_t GetObjectRecursiveSize() const ;			    
+
 #define BBTK_ABSTRACT_OBJECT_INTERFACE(CLASS)				\
   public : typedef CLASS Self;						\
     BBTK_OBJECT_MINIMAL_INTERFACE;					\
@@ -167,15 +197,16 @@ protected:								\
   //=======================================================================
   // A struct with one static instance 
   // just to print object list info after main
-  struct StaticInitTime
+  class BBTK_EXPORT StaticInitTime
   {
+  public:
     StaticInitTime();
     ~StaticInitTime();
 
 
     static bool PrintObjectListInfo;
   private:
-    static Object mObject;
+    static bbtk::Object mObject;
   };