=== MAJOR RELEASE ====

[bbtk.git] / kernel / src / bbtkBlackBoxDescriptor.h

diff --git a/kernel/src/bbtkBlackBoxDescriptor.h b/kernel/src/bbtkBlackBoxDescriptor.h
index a680b54f81124bbcd195085ee69ec4ddedef4168..4d047c6ef106dd9819bdbb7b5e30005a3f428938 100644 (file)
--- a/kernel/src/bbtkBlackBoxDescriptor.h
+++ b/kernel/src/bbtkBlackBoxDescriptor.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/09 11:16:57 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/04/18 12:59:15 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,6 +28,7 @@
 #ifndef __bbtkBlackBoxDescriptor_h__
 #define __bbtkBlackBoxDescriptor_h__
 
+#include "bbtkObject.h"
 #include "bbtkBlackBoxInputDescriptor.h"
 #include "bbtkBlackBoxOutputDescriptor.h"
 #include <map>
@@ -38,10 +39,13 @@ namespace bbtk
 
   class BlackBox;
   class Package;
+  BBTK_FORWARD_DECLARE_POINTER(BlackBox);
+  BBTK_FORWARD_DECLARE_POINTER(Package);
 
   //==========================================================================
-  class BBTK_EXPORT BlackBoxDescriptor
+  class BBTK_EXPORT BlackBoxDescriptor : public Object
   {
+    BBTK_ABSTRACT_OBJECT_INTERFACE(BlackBoxDescriptor);
   public:
     /// The type of descriptor of inputs 
     typedef BlackBoxInputDescriptor InputDescriptor;
@@ -62,11 +66,12 @@ namespace bbtk
     }
     Kind;
 
-    /// Default ctor
-    BlackBoxDescriptor(); 
-    /// Creates an instance with name boxname of the BlackBox
+    /// Releases a descriptor
+    //    static void Release(BlackBoxDescriptor::WeakPointer);
+
+     /// Creates an instance with name boxname of the BlackBox
     /// of which this is the descriptor 
-    virtual BlackBox* CreateInstance(const std::string& boxname) = 0;
+    virtual BlackBoxPointer NewBlackBox(const std::string& boxname) = 0;
 
     /// Returns the name of the **TYPE** of the black box
     const std::string& GetTypeName() const { return mTypeName; }
@@ -83,11 +88,8 @@ namespace bbtk
     /// Returns the category(s) of the BlackBox
     const std::string& GetCategory() const { return mCategory; }
     
-    /// Returns the Package to which the box belongs
-    Package* GetPackage() { return mPackage; }
-    
     /// Returns the Package to which the box belongs (const pointer)
-    const Package* GetPackage() const { return mPackage; }
+    PackagePointer GetPackage() const { return mPackage; }
     
     /// Returns the kind of box 
     Kind GetKind() const { return mKind; }
@@ -122,7 +124,7 @@ namespace bbtk
     void AddToCategory( const std::string&, bool clear = false );
     
     /// Sets the Package to which the box belongs
-    void SetPackage(Package *package) { mPackage = package; }
+    void SetPackage(PackagePointer package) { mPackage = package; }
     
     /// Sets the kind of box 
     void SetKind(Kind kind) { mKind = kind; }
@@ -140,19 +142,10 @@ namespace bbtk
                                  int detail, int level,
                                  const std::string& output_dir = "",
                                  bool relative_link = false );
-
-    /// Increase ref count
-    void Reference() { mRefCount++; }
-    /// Decrease ref count and delete if no more used
-    void UnReference();
-
     ///
     virtual void Check(bool recursive=true) const;
 
   protected:
-    /// Default dtor is protected : use UnRegister to destroy (ref counting)
-    virtual ~BlackBoxDescriptor();
-
     /// Adds an input descriptor
     void AddInputDescriptor( BlackBoxInputDescriptor *d ) 
     { mInput[d->GetName()] = d; }
@@ -172,17 +165,12 @@ namespace bbtk
     /// The kind of box (standard / adaptor)
     Kind mKind;
     /// The Package to which the box belongs
-    Package *mPackage;
+    PackagePointer mPackage;
     /// The inputs 
     InputDescriptorMapType mInput;
     /// The outputs 
     OutputDescriptorMapType mOutput;
 
-    /// Reference counting
-    int mRefCount;
-    
-  private:
-    BlackBoxDescriptor(const BlackBoxDescriptor&) {}
   };
   // class BlackBoxDescriptor
   //==========================================================================