X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=82bf038f842dfe7ae2c1ed2eec16dd1cc9d94982;hb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;hp=5095c0e81b452368b4aca8f68f53464aa4cf40cc;hpb=cbdd914a561bf6241a5b56d66873e090db933f8b;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 5095c0e..82bf038 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -4,8 +4,8 @@ Program:   bbtk
 Module:    $RCSfile: bbtkFactory.cxx,v $
 Language:  C++
 
-Date:      $Date: 2008/02/14 13:44:25 $
-Version:   $Revision: 1.21 $
+Date:      $Date: 2008/04/09 11:16:57 $
+Version:   $Revision: 1.32 $
                                                                                 
 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
@@ -37,20 +37,6 @@ PURPOSE.  See the above copyright notices for more information.
 
 #include <cctype>    // std::toupper
 
-// was in gdcm ...
-/*
-#ifdef _MSC_VER
-#   define getcwd _getcwd
-#endif
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#   include <direct.h>
-#else
-#   include <unistd.h>
-#endif
-
-*/
-
 
 namespace bbtk
 {
@@ -61,6 +47,7 @@ namespace bbtk
   //===================================================================
   /// Default ctor
   Factory::Factory()
+    : mExecuter(0)
   {
     bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
   }
@@ -202,8 +189,6 @@ namespace bbtk
     // Invokes the accessor to the PackageUnit pointer
     pack.mPackage = ((PackageAccessor)getpack)();
     
-    mPackageMap[pkgname] = pack;
-    
     // Test bbtk build version ok
     if ( pack.mPackage->GetBBTKVersion() != bbtk::GetVersion() )
       {
@@ -215,6 +200,9 @@ namespace bbtk
 		  << " whereas application build with version "
 		  << bbtk::GetVersion());
       }
+
+    pack.mPackage->AddFactory(this);
+    mPackageMap[pkgname] = pack;
     
     std::string separator =
       ConfigurationFile::GetInstance().Get_file_separator ();
@@ -261,8 +249,7 @@ namespace bbtk
   
 
   
-  void Factory::LoadPackage( const std::string& name,
-                             bool use_configuration_file)
+  void Factory::LoadPackage( const std::string& name )
   {
   // Note : in the following :
   // name : the user supplied name
@@ -275,8 +262,6 @@ namespace bbtk
 
     bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
     bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
-    bbtkMessage("Debug",1,"use_configuration_file ["
-                 << use_configuration_file << "]" << std::endl);
 
     std::vector<std::string> package_paths;
     std::string libname;  // full path library name
@@ -447,71 +432,85 @@ namespace bbtk
 
   //===================================================================
   /// \brief Close the package referenced by the iterator 
-  ///
-  /// If it is a dynamically loaded package 
-  /// - Loads and calls the function "<name>DeletePackage" of the dynamic library (responsible for package desallocation)
-  /// - Closes the dynamic library
-  /// - Erases the package entry in the packages map
-  ///
-  /// Else simply erases the package entry in the packages map
-  void Factory::ClosePackage(PackageMapType::iterator& i) 
+ ///
+ /// First removes the factory from the set of factories which use the package
+ /// If the set is empty then :
+ /// If it is a dynamically loaded package :
+ /// - Loads and calls the function "<name>DeletePackage" of the dynamic library (responsible for package desallocation)
+ /// - Closes the dynamic library
+ /// Else :
+ /// - deletes the package normally
+ /// 
+ /// Finally erases the package entry in the packages map
+ void Factory::ClosePackage(PackageMapType::iterator& i) 
   {   
      bbtkDebugMessageInc("Kernel",7,"Factory::ClosePackage(\""
                          <<i->second.mPackage->GetName()
                         <<"\")"<<std::endl);
 
-     if (i->second.mDynamicLibraryHandler) 
-     {
- 
-      // If it is a dynamically loaded package
-      // Loads the Package delete function
-
-        std::string delfname(i->second.mPackage->GetName());
-        delfname += "DeletePackage";
+     
+     // Removes this from the set of factories which use the package
+     i->second.mPackage->RemoveFactory(this);
+     
+     // If no more factory which use it 
+     if (i->second.mPackage->GetFactorySet().empty())
+       {
+	 // If it is a dynamically loaded package	
+	 if (i->second.mDynamicLibraryHandler) 
+	   {
+	     
+	     
+	     // Loads the Package delete function
+	     
+	     std::string delfname(i->second.mPackage->GetName());
+	     delfname += "DeletePackage";
 #if defined(__GNUC__)     
-        void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
-        if (!delf)
-        {
-           bbtkError("could not close package \""
-                     <<i->second.mPackage->GetName()
-                     <<"\" :"<<dlerror());
-        }    
+	     void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
+	     if (!delf)
+	       {
+		 bbtkError("could not close package \""
+			   <<i->second.mPackage->GetName()
+			   <<"\" :"<<dlerror());
+	       }    
 #elif defined(_WIN32)
-   void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
-                                 delfname.c_str());
-     if (!delf)
-     {  
-       bbtkError("could not close package \""
-                <<i->second.mPackage->GetName()
-                <<"\" : "<<delfname
-                <<" symbol not found (how did you open it ???");
-               //<<"\" :"<<dlerror());
-     }    
+	     void *delf = GetProcAddress(i->second.mDynamicLibraryHandler, 
+					 delfname.c_str());
+	     if (!delf)
+	       {  
+		 bbtkError("could not close package \""
+			   <<i->second.mPackage->GetName()
+			   <<"\" : "<<delfname
+			   <<" symbol not found (how did you open it ???");
+		 //<<"\" :"<<dlerror());
+	       }    
 #endif     
-
-   // deletes the package
-   ((PackageDeleteFunction)delf)();
-
-   // closes the dl handler
+	     
+	     // deletes the package
+	     ((PackageDeleteFunction)delf)();
+	     
+	     // closes the dl handler
 #if defined(__GNUC__)  
-    dlclose(i->second.mDynamicLibraryHandler);  
+	     dlclose(i->second.mDynamicLibraryHandler);  
 #elif defined(_WIN32)
-
-    FreeLibrary(i->second.mDynamicLibraryHandler);
+	     
+	     FreeLibrary(i->second.mDynamicLibraryHandler);
 #endif
-    }
-    else 
-    {  
-       // If it is a manually inserted package 
-       delete i->second.mPackage;
-    }
+	   }
 
-    // remove the entry in the map
-    mPackageMap.erase(i);
-    bbtkDebugDecTab("Kernel",7);
- }
-  //===================================================================
+	 else 
+	   {  
+	     // If it is a manually inserted package : delete it normally
+	     delete i->second.mPackage;
+	   }
+       }
+     
+     // in any cases remove the entry in the map
+     mPackageMap.erase(i);
 
+     bbtkDebugDecTab("Kernel",7);
+  }
+  //===================================================================
+  
 
 
   //===================================================================  
@@ -617,12 +616,12 @@ namespace bbtk
     bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
+    p->AddFactory(this);
     PackageInfoType pack;
     pack.mDynamicLibraryHandler = 0;
-    
     pack.mPackage = p;
-
     mPackageMap[p->GetName()] = pack;
+
     bbtkDebugDecTab("Kernel",9);
   }
   //===================================================================
@@ -642,12 +641,12 @@ namespace bbtk
     
     if (i!=mPackageMap.end())
       {
-      ClosePackage(i);
+	ClosePackage(i);
       }
     else 
       {
-      bbtkError("Factory::RemovePackage(\""<<
-                 p->GetName()<<"\") : package absent from factory");
+	bbtkError("Factory::RemovePackage(\""<<
+		  p->GetName()<<"\") : package absent from factory");
       }
 
     bbtkDebugDecTab("Kernel",9);
@@ -682,13 +681,13 @@ namespace bbtk
 
   //===================================================================
   /// Creates an instance of a black box of type <type> with name <name>
-  BlackBox* Factory::NewAdaptor(TypeInfo typein,
-                     TypeInfo typeout,
-                     const std::string& name) const
+  BlackBox* Factory::NewAdaptor(const DataInfo& typein,
+				const DataInfo& typeout,
+				const std::string& name) const
   {
-    bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor(<"
-                        <<TypeName(typein)<<">,<"
-                        <<TypeName(typeout)<<">,\""
+    bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor("
+                        <<typein<<","
+                        <<typeout<<",\""
                         <<name<<"\")"<<bbtkendl);
 
 
@@ -701,12 +700,169 @@ namespace bbtk
       }
     if (!b) 
       {
-      bbtkError("no <"
-          <<TypeName(typein)<<"> to <"
-          <<TypeName(typeout)
-          <<"> adaptor available");
+	bbtkError("no "<<typein<<" to "<<typeout
+		  <<" adaptor available");
+      } 
+    
+    bbtkDebugDecTab("Kernel",7);
+    return b; 
+  }
+  //===================================================================
+
+
+  //===================================================================
+  /// Creates an instance of a black box of type <type> with name <name>
+  BlackBox* Factory::NewWidgetAdaptor(const DataInfo& typein,
+				      const DataInfo& typeout,
+				      const std::string& name) const
+  {
+    bbtkDebugMessageInc("Kernel",8,"Factory::NewWidgetAdaptor(<"
+                        <<typein<<">,<"
+                        <<typeout<<">,\""
+                        <<name<<"\")"<<bbtkendl);
+
+
+    BlackBox* b = 0; 
+    PackageMapType::const_iterator i;
+    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+      {
+	b = i->second.mPackage->NewWidgetAdaptor(typein,
+						 typeout,
+						 name);
+      if (b) break; 
+      }
+    if (!b) 
+      {
+	bbtkError("no "<<typein<<" to "<<typeout
+		  <<"> widget adaptor available");
+      } 
+    
+    bbtkDebugDecTab("Kernel",7);
+    return b; 
+  }
+  //===================================================================
+
+  //===================================================================
+  /// Creates an instance of a black box of type <type> with name <name>
+  bool Factory::FindAdaptor(const DataInfo& typein,
+				  const DataInfo& typeout,
+				  std::string& adaptor) const
+  {
+    bbtkDebugMessageInc("Kernel",8,"Factory::FindAdaptor(<"
+                        <<typein<<">,<"
+                        <<typeout<<">)"<<bbtkendl);
+    
+    bool b = false;
+    PackageMapType::const_iterator i;
+    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+      {
+	b = i->second.mPackage->FindAdaptor(typein,
+					    typeout,
+					    adaptor);
+	if (b) break; 
+      }
+    /*
+    if (!b) 
+      {
+	bbtkError("no "<<typein<<" to "<<typeout
+		  <<"> widget adaptor available");
       } 
+    */
+
+    bbtkDebugDecTab("Kernel",7);
+    return b; 
+  }
+  //===================================================================
+
+  //===================================================================
+  /// Creates an instance of a black box of type <type> with name <name>
+  bool Factory::FindWidgetAdaptor(const DataInfo& typein,
+				  const DataInfo& typeout,
+				  std::string& adaptor) const
+  {
+    bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<"
+                        <<typein<<">,<"
+                        <<typeout<<">)"<<bbtkendl);
     
+    bool b = false;
+    PackageMapType::const_iterator i;
+    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+      {
+	b = i->second.mPackage->FindWidgetAdaptor(typein,
+						  typeout,
+						  adaptor);
+	if (b) break; 
+      }
+    bbtkDebugDecTab("Kernel",7);
+    return b; 
+  }
+  //===================================================================
+
+  //===================================================================
+  /// Creates an instance of a black box of type <type> with name <name>
+  bool Factory::FindWidgetAdaptor2(const DataInfo& typein,
+				  const DataInfo& typeout,
+				  std::string& widget,
+				  std::string& adaptor) const
+  {
+    bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<"
+                        <<typein<<">,<"
+                        <<typeout<<">)"<<bbtkendl);
+    
+    bool b = false;
+    adaptor = widget = "";
+    PackageMapType::const_iterator i;
+    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+      {
+	b = i->second.mPackage->FindWidgetAdaptor(typein,
+						  typeout,
+						  widget);
+	if (b) break; 
+      }
+    if (!b) 
+      {
+	// Look for a widget adaptor with good nature out
+	bbtkMessage("Kernel",5,
+		    "*** Looking for a two pieces widget adaptor for : "
+		    << typein << "->"<<typeout<<std::endl);
+	for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+	  {
+	    Package::AdaptorMapType::const_iterator j;
+	    for (j=i->second.mPackage->GetAdaptorMap().begin();
+		 j!=i->second.mPackage->GetAdaptorMap().end();
+		 ++j)
+	      {
+		if ( ( j->first.mKind ==  
+		       BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR) &&
+		     //(j->first.mTypeIn == typein) &&
+		     (j->first.mTypeOut.GetNature() == typeout.GetNature() ) 
+		     )
+		  {
+		    widget = j->second->GetTypeName();
+		    bbtkMessage("Kernel",5,
+				"===> Found first part : "<<widget
+				<< " "<<j->first.mTypeIn<<"->"
+				<<j->first.mTypeOut<<std::endl);
+		    DataInfo ti( j->first.mTypeOut.GetType(), "");
+		    DataInfo to( typeout.GetType(), "");
+		    b = FindAdaptor( ti, to, adaptor );
+		    if (b) 
+		      {
+			bbtkMessage("Kernel",5,
+				    "===> Found second part : "<<adaptor
+				    <<std::endl);
+			break;
+		      }
+		    else
+		      {
+			bbtkMessage("Kernel",5,
+				    "===> No second part found"<<std::endl);
+		      }
+		  }
+	      }
+	    if (b) break;
+	  }
+      }
     bbtkDebugDecTab("Kernel",7);
     return b; 
   }
@@ -724,53 +880,7 @@ namespace bbtk
                       <<to->bbGetName()<<"\",\""<<input
                       <<"\")"<<std::endl);
     
-    return new Connection(from,output,to,input);
-    /*  
-       Connection* c;
-    // !!! WARNING : WE NEED TO TEST THE TYPE NAME EQUALITY 
-    // BECAUSE IN DIFFERENT DYN LIBS THE type_info EQUALITY CAN 
-    // BE FALSE (DIFFERENT INSTANCES !)
-  
-    std::string t1 ( from->bbGetOutputType(output).name() );
-    std::string t2 ( to->bbGetInputType(input).name() );
-
-
-    if ( t1 == t2 ) 
-       //from->bbGetOutputType(output) ==
-       // to->bbGetInputType(input) )
-      {
-         c = new Connection(from,output,to,input);
-      }
-    else 
-      {
-         //   std::cout << "Adaptive connection "<<std::endl;
-         std::string name;
-         name = from->bbGetName() + "." + output + "-" 
-                                  + to->bbGetName() + "." + input; 
-
-         BlackBox* b = 0; 
-         PackageMapType::const_iterator i;
-         for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
-         {
-             b = i->second.mPackage->NewAdaptor(from->bbGetOutputType(output),
-                                                  to->bbGetInputType(input),
-                                                  name);
-             if (b) break; 
-         } 
-         if (!b)  
-         {  
-            bbtkError("did not find any <"
-                       <<TypeName(from->bbGetOutputType(output))
-                       <<"> to <"
-                       <<TypeName(to->bbGetInputType(input))
-                       <<"> adaptor");
-         } 
-         c = new AdaptiveConnection(from,output,to,input,b);
-      }
-      bbtkDebugDecTab("Kernel",7);
-    
-      return c;
-    */
+    return new Connection(from,output,to,input,this);
   }
   //===================================================================
 
@@ -820,9 +930,25 @@ namespace bbtk
   }
   //===================================================================
 
+  //===================================================================
+  void Factory::CheckPackages() const
+  {
+    bbtkMessage("Debug",1,"****** Checking Factory "<<(void*)this
+		 <<std::endl);
+    PackageMapType::const_iterator i;
+    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+      {
+	i->second.mPackage->CheckBoxes();
+      }
+    bbtkMessage("Debug",1,"****** Checking Factory "<<(void*)this
+		<<" ... OK"<<std::endl);
+  }
+  //===================================================================
+
   //===================================================================
   void Factory::WriteDotFilePackagesList(FILE *ff)
   {
+
     bbtkDebugMessageInc("Kernel",9,"Factory::WriteDotFilePackagesList()"
                          <<std::endl);
 
@@ -848,6 +974,7 @@ namespace bbtk
 
  void Factory::ShowGraphTypes(const std::string& name) const
  {
+
    bool found = false;
    PackageMapType::const_iterator i;
    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
@@ -915,6 +1042,16 @@ namespace bbtk
 	     ++j)
 	  {
 	    
+	    // Skip adaptors 
+	    if ( type==Adaptors )
+	      {  
+		if (j->second->GetKind() == BlackBoxDescriptor::STANDARD )
+		  continue;
+	      }
+	    else 
+	      if (j->second->GetKind() != BlackBoxDescriptor::STANDARD )
+		continue;
+
 	    std::vector<std::string> keys;
 	    if (type==Packages)
 	      {
@@ -923,7 +1060,7 @@ namespace bbtk
 		keys.push_back(k);
 		title = "Boxes by package";
 	      }
-	    else if (type==Initials)
+	    else if ((type==Initials) || (type==Adaptors))
 	      {
 		std::string init(" ");
 		init[0] =  std::toupper(j->second->GetTypeName()[0]);
@@ -940,6 +1077,7 @@ namespace bbtk
 		  keys.push_back(" NONE");
 		title = "Boxes by category";
 	      }
+    
 	    
 	    std::vector<std::string>::const_iterator k;
 	    for (k=keys.begin(); k!=keys.end(); ++k )
@@ -1004,7 +1142,7 @@ namespace bbtk
     IndexType::iterator ii;
     for (ii=index.begin();ii!=index.end();++ii)
       {
-	s << "<a href=\"#"<<ii->first<<"\">"<<ii->first<<"</a>&nbsp;";	
+	s << "<a href=\"#"<<ii->first<<"\">"<<ii->first<<"</a>&nbsp;&nbsp;";	
       }
 
     for (ii=index.begin();ii!=index.end();++ii)
@@ -1016,6 +1154,11 @@ namespace bbtk
 	    s << "<a name=\""<<ii->first<<"\"></a>\n"; 
 	    s << "<p><a href=\""<<ii->first<<"/index.html\">"
 	      << ii->first<<"</a>\n"; 
+
+	    s << "&nbsp;&nbsp;-&nbsp;&nbsp;\n"; 
+
+	    s << "<a name=\"doxygen\"></a>\n"; 
+	    s << "<a href=..\\doxygen\\" << ii->first << "/main.html>(Doxygen documentation of the source)</a>\n"; 
 	  }
 	else 
 	  {