=== MAJOR RELEASE ====

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

diff --git a/kernel/src/bbtkConnection.h b/kernel/src/bbtkConnection.h
index f69695f112cb749bb4725909af89a3b75e5fdd77..f1494f01397346cbdda5a6a6c77918efabcbdc86 100644 (file)
--- a/kernel/src/bbtkConnection.h
+++ b/kernel/src/bbtkConnection.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/09 11:16:57 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/04/18 12:59:15 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -29,6 +29,7 @@
 #define __bbtkConnection_h__
 
 #include "bbtkSystem.h"
+#include "bbtkObject.h"
 
 #include <string>
 
@@ -36,6 +37,11 @@ namespace bbtk
 {
 
   class Factory;
+  BBTK_FORWARD_DECLARE_POINTER(Factory);
+  class BlackBox;
+  BBTK_FORWARD_DECLARE_POINTER(BlackBox);
+  class BlackBoxInputConnector;
+  class BlackBoxOutputConnector;
 
   /// 
   typedef int IOStatus;
@@ -46,21 +52,20 @@ namespace bbtk
   /// 
   const int UPDATING = 2;
 
-  class BlackBox;
-  class BlackBoxInputConnector;
-  class BlackBoxOutputConnector;
 
-  class BBTK_EXPORT Connection
+  class BBTK_EXPORT Connection : public Object
   {
+     BBTK_OBJECT_INTERFACE(Connection);
+    typedef Object Superclass;
   public:
-    /// Ctor 
-    Connection(BlackBox* from, const std::string& output,
-              BlackBox* to, const std::string& input,
-              const Factory* f);
+
+    static Pointer New(BlackBoxPointer from, const std::string& output,
+                      BlackBoxPointer to, const std::string& input,
+                      const FactoryPointer f);
     /// Dtor
-    ~Connection();
+    //    ~Connection();
 
-    void Clear();
+    // void Delete();
     
     /// Amont direction pipeline processing
     /// 1) call bbBackwardUpdate(this) on the upstream box
@@ -76,27 +81,27 @@ namespace bbtk
     std::string GetFullName() const; 
 
     /// Returns the original initial black box of the connection
-    BlackBox* GetOriginalBlackBoxFrom() const { return mOriginalFrom; }
+    BlackBoxPointer GetOriginalBlackBoxFrom() const { return mOriginalFrom.lock(); }
     /// Returns the origianl final black box of the connection
-    BlackBox* GetOriginalBlackBoxTo() const { return mOriginalTo; }
+    BlackBoxPointer GetOriginalBlackBoxTo() const { return mOriginalTo.lock(); }
     /// Returns the original output of the initial black box of the connection
     const std::string& GetOriginalBlackBoxFromOutput() const { return mOriginalOutput; }
     /// Returns the original input of the final black box of the connection
     const std::string& GetOriginalBlackBoxToInput() const { return mOriginalInput; }
-
+    
     /// Returns the initial black box of the connection
-    BlackBox* GetBlackBoxFrom() const { return mFrom; }
+    BlackBoxPointer GetBlackBoxFrom() const { return mFrom; }
     /// Returns the final black box of the connection
-    BlackBox* GetBlackBoxTo() const { return mTo; }
+    BlackBoxPointer GetBlackBoxTo() const { return mTo; }
     /// Returns the output of the initial black box of the connection
     const std::string& GetBlackBoxFromOutput() const { return mOutput; }
     /// Returns the input of the final black box of the connection
     const std::string& GetBlackBoxToInput() const { return mInput; }
 
     /// Sets the initial black box of the connection
-    void SetBlackBoxFrom(BlackBox* b) { mFrom = b; }
+    void SetBlackBoxFrom(BlackBoxPointer b) { mFrom = b; }
     /// Sets the final black box of the connection
-    void SetBlackBoxTo(BlackBox* b) { mTo = b; }
+    void SetBlackBoxTo(BlackBoxPointer b) { mTo = b; }
     /// Sets the output of the initial black box of the connection
     void SetBlackBoxFromOutput(const std::string& o) { mOutput = o; }
     /// Sets the input of the final black box of the connection
@@ -107,26 +112,26 @@ namespace bbtk
     
   protected:
     /// Black box origin of the connection
-    BlackBox* mFrom;
-    BlackBox* mOriginalFrom;
+    BlackBoxPointer mFrom;
+    BlackBoxWeakPointer mOriginalFrom;
     /// Output of mFrom which is connected
     std::string mOutput;
     std::string mOriginalOutput;
     /// Output connector of mFrom which is connected
     //  BlackBoxOutputConnector* mOutputConnector;
     /// Black box destination of the connection
-    BlackBox* mTo;
-    BlackBox* mOriginalTo;
+    BlackBoxPointer mTo;
+    BlackBoxWeakPointer mOriginalTo;
     /// Input of mTo which is connected
     std::string mInput;
     std::string mOriginalInput;
     /// Input connector of mTo which is connected
     //  BlackBoxInputConnector* mInputConnector;
     /// Adaptor black box if needed
-    BlackBox* mAdaptor;
+    BlackBoxPointer mAdaptor;
 
     /// The factory used to create adaptors
-    const Factory* mFactory;
+    const FactoryWeakPointer mFactory;
 
     /// Is the connection input type is any<thing> ?
     bool mFromAny;
@@ -145,6 +150,13 @@ namespace bbtk
     //        BlackBox* to, const std::string& input, int   );
     
     void TransferData(); 
+
+  private:
+    /// Ctor 
+    Connection(BlackBoxPointer from, const std::string& output,
+              BlackBoxPointer to, const std::string& input,
+              const FactoryPointer f);
+
   };
 
 }// namespace bbtk