X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkFactory.h;h=75acb76c5908c1f144237f86431375c9e81429f6;hb=1fd0a4edc8f7e8d5444788662f59c4384a9aab93;hp=c5433cc7af73a9f544db4c8c20898a761e42ca6c;hpb=cbdd914a561bf6241a5b56d66873e090db933f8b;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.h b/kernel/src/bbtkFactory.h
index c5433cc..75acb76 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/02/14 13:44:25 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/03/07 08:40:14 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -35,6 +35,9 @@
 
 namespace bbtk
 {
+
+  class Executer;
+
   class BBTK_EXPORT Factory
   {
 
@@ -42,9 +45,8 @@ namespace bbtk
 
     Factory();
     ~Factory();
-
-    void LoadPackage( const std::string& name, 
-                      bool use_configuration_file = true );
+    
+    void LoadPackage( const std::string& name );
     void UnLoadPackage( const std::string& name );
     void PrintPackages(bool details = true, bool adaptors = false) const;
     void HelpPackage(const std::string& name, bool adaptors = false) const;
@@ -77,11 +79,20 @@ namespace bbtk
       {
 	Packages,
 	Categories,
-	Initials
+	Initials,
+	Adaptors
       }
       IndexEntryType;
     void CreateHtmlIndex(IndexEntryType type, const std::string& filename);
 
+    /// Sets the executer who created the factory (if any)
+    void SetExecuter(Executer *e) { mExecuter = e; }
+    /// Gets the executer who created the factory (if any)
+    Executer* GetExecuter() { return mExecuter; }
+    /// Gets the executer who created the factory (if any) - const
+    const Executer* GetExecuter() const { return mExecuter; }
+
+
   private:
 
     bool DoLoadPackage(std::string libname,
@@ -106,6 +117,9 @@ namespace bbtk
     /// The map of packages
     PackageMapType mPackageMap;
 
+    /// The executer which created the factory (if any)
+    Executer* mExecuter;
+
     void CloseAllPackages();
     void ClosePackage(PackageMapType::iterator& i);
 
@@ -113,6 +127,8 @@ namespace bbtk
   // class Factory
 
 
+
+  /*
   /// SYSTEM METHOD : Global method returning the global factory object pointer
   inline Factory*& GlobalFactoryPointer() 
   {
@@ -139,10 +155,9 @@ namespace bbtk
     }
   }
 
-  inline void LoadPackage( const std::string& name, 
-                           bool use_configuration_file = true)
+  inline void LoadPackage( const std::string& name )
   {
-    GetGlobalFactory()->LoadPackage(name,use_configuration_file);
+    GetGlobalFactory()->LoadPackage(name);
   }
 
   inline void UnLoadPackage( const std::string& name )
@@ -219,7 +234,7 @@ namespace bbtk
   {
     GetGlobalFactory()->WriteDotFilePackagesList(ff);
   }
-
+  */
 }// namespace bbtk