X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.h;h=0d0560ac7d4eabf750c5393ed00218b068115958;hb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;hp=73b23c45db71efcde3bab8af1e421aaad695649d;hpb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.h b/kernel/src/bbtkFactory.h
index 73b23c4..0d0560a 100644
--- a/kernel/src/bbtkFactory.h
+++ b/kernel/src/bbtkFactory.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/09 11:16:57 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/04/18 12:59:15 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -29,22 +29,21 @@
 #ifndef __bbtkFactory_h__
 #define __bbtkFactory_h__
 
-//#include "bbtkBlackBox.h"
 #include "bbtkPackage.h"
-#include "bbtkDynamicLibraryHandling.h"
 
 namespace bbtk
 {
 
   class Executer;
+  BBTK_FORWARD_DECLARE_POINTER(Executer);
 
-  class BBTK_EXPORT Factory
+  class BBTK_EXPORT Factory : public Object
   {
-
+    BBTK_OBJECT_INTERFACE(Factory);
+    typedef Object Superclass;
   public:
+    static Pointer New();
 
-    Factory();
-    ~Factory();
     
     void GetPackagesList(std::vector<std::string>&);
     void LoadPackage( const std::string& name );
@@ -54,20 +53,20 @@ namespace bbtk
     void HelpBlackBox(const std::string& name, std::string& package,
 		      bool full=true ) const;
     void ShowGraphTypes(const std::string& name) const;
-    void InsertPackage( Package* );
-    void RemovePackage( Package* );
+    void InsertPackage( Package::Pointer );
+    void RemovePackage( Package::Pointer );
+
+    Package::Pointer GetPackage(const std::string& name) const;
 
-    const Package* GetPackage(const std::string& name) const;
-    Package* GetPackage(const std::string& name);
     
-    BlackBox* NewBlackBox(const std::string& type, 
+    BlackBox::Pointer NewBlackBox(const std::string& type, 
                           const std::string& name) const;
     
-    BlackBox* NewAdaptor(const DataInfo& typein,
+    BlackBox::Pointer NewAdaptor(const DataInfo& typein,
 			 const DataInfo& typeout,
                          const std::string& name) const;
 
-    BlackBox* NewWidgetAdaptor(const DataInfo& typein,
+    BlackBox::Pointer NewWidgetAdaptor(const DataInfo& typein,
 			       const DataInfo& typeout,
 			       const std::string& name) const;
 
@@ -84,10 +83,10 @@ namespace bbtk
 			    std::string& widget,
 			    std::string& adaptor) const;
 
-    Connection* NewConnection(BlackBox* from,
-                              const std::string& output,
-                              BlackBox* to,
-                              const std::string& input) const;
+    Connection::Pointer NewConnection(BlackBox::Pointer from,
+				      const std::string& output,
+				      BlackBox::Pointer to,
+				      const std::string& input) const;
 
     void WriteDotFilePackagesList(FILE *ff);
 
@@ -106,11 +105,11 @@ namespace bbtk
     void CreateHtmlIndex(IndexEntryType type, const std::string& filename);
 
     /// Sets the executer who created the factory (if any)
-    void SetExecuter(Executer *e) { mExecuter = e; }
+    void SetExecuter(ExecuterPointer e) { mExecuter = e; }
     /// Gets the executer who created the factory (if any)
-    Executer* GetExecuter() { return mExecuter; }
+    ExecuterPointer GetExecuter();// { return mExecuter.lock(); }
     /// Gets the executer who created the factory (if any) - const
-    const Executer* GetExecuter() const { return mExecuter; }
+    //    const Executer::Pointer GetExecuter() const { return mExecuter.lock(); }
 
 
   private:
@@ -120,21 +119,9 @@ namespace bbtk
 		       std::string path);
 
   public:
-    /// The structure storing info on a package
-    class PackageInfoType
-    {
-    public :
-      /// Ctor
-      PackageInfoType() {}
-      /// Dtor
-      ~PackageInfoType() {}
-      /// The pointer on the package
-      Package* mPackage;
-      /// The handler of the dynamic library 
-      DynamicLibraryHandler mDynamicLibraryHandler;
-    };
+
     /// The type of map of packages
-    typedef std::map< std::string, PackageInfoType > PackageMapType;
+    typedef std::map< std::string, Package::Pointer > PackageMapType;
 
     const PackageMapType& GetPackageMap() const { return mPackageMap; }
 
@@ -143,7 +130,7 @@ namespace bbtk
     PackageMapType mPackageMap;
 
     /// The executer which created the factory (if any)
-    Executer* mExecuter;
+    ExecuterWeakPointer mExecuter;
 
     void CloseAllPackages();
     void ClosePackage(PackageMapType::iterator& i);
@@ -153,113 +140,6 @@ namespace bbtk
 
 
 
-  /*
-  /// SYSTEM METHOD : Global method returning the global factory object pointer
-  inline Factory*& GlobalFactoryPointer() 
-  {
-    static Factory* f = 0;
-    return f;
-  }
-
-  /// SYSTEM METHOD : Global method returning the global factory object 
-  inline Factory* GetGlobalFactory() 
-  {
-    if (!GlobalFactoryPointer()) 
-    {
-       GlobalFactoryPointer() = new Factory;
-    }
-    return GlobalFactoryPointer();
-  }
-
-  /// SYSTEM METHOD : Deletes the global factory pointer
-  inline void DeleteGlobalFactory() 
-  {
-    if (GlobalFactoryPointer()) 
-    {
-      delete GlobalFactoryPointer();
-    }
-  }
-
-  inline void LoadPackage( const std::string& name )
-  {
-    GetGlobalFactory()->LoadPackage(name);
-  }
-
-  inline void UnLoadPackage( const std::string& name )
-  { 
-    GetGlobalFactory()->UnLoadPackage(name);
-  }
-
-  inline void PrintPackages(bool details = true, bool adaptors = false)
-  {
-    GetGlobalFactory()->PrintPackages(details,adaptors);
-  }
-
-  inline void HelpPackage(const std::string& name, bool adaptors = false) 
-  {
-    GetGlobalFactory()->HelpPackage(name,adaptors);
-  }
-  
-  inline void HelpBlackBox(const std::string& name, bool full=true) 
-  {
-    std::string package; 
-    GetGlobalFactory()->HelpBlackBox(name, package, full);
-  }
-
-  inline void HelpBlackBox(const std::string& name, std::string& package,
-			   bool full=true
-			   )
-  {
-    GetGlobalFactory()->HelpBlackBox(name, package, full);
-  }
-
-
-  inline void ShowGraphTypes(const std::string& name)
-  {
-    GetGlobalFactory()->ShowGraphTypes(name);
-  }
-
-  inline void InsertPackage( Package* p)
-  {
-    GetGlobalFactory()->InsertPackage(p);
-  }
-
-  inline void RemovePackage( Package* p)
-  {
-    GetGlobalFactory()->RemovePackage(p);
-  }
-  
-  inline const Package* GetPackage(const std::string& name) 
-  {
-    return GetGlobalFactory()->GetPackage(name);
-  }
-    
-  inline BlackBox* NewBlackBox(const std::string& type, 
-                               const std::string& name) 
-  {
-    return GetGlobalFactory()->NewBlackBox(type,name);
-  }
-    
-  inline BlackBox* NewAdaptor(TypeInfo typein,
-                              TypeInfo typeout,
-                              const std::string& name) 
-  {
-    return GetGlobalFactory()->NewAdaptor(typein,typeout,name);
-  }
-  
-  inline Connection* NewConnection(BlackBox* from,
-                                   const std::string& output,
-                                   BlackBox* to,
-                                   const std::string& input) 
-  {
-    return GetGlobalFactory()->NewConnection(from,output,to,input);
-  }
-  
-  inline void WriteDotFilePackagesList(FILE *ff)
-  {
-    GetGlobalFactory()->WriteDotFilePackagesList(ff);
-  }
-  */
 }// namespace bbtk