X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=627bc80881b1e99ac4b112dbf8244d543c8a9718;hb=63d56e2f28b834d9e13f3757aaa23ab63b2b3dd6;hp=bd057e349e8aeaa24c19f58d148fe078074bd8b7;hpb=c333db268f8b73bcf7fe7ff9eeed8394252f1c94;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index bd057e3..627bc80 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 14:22:10 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2009/10/05 22:44:48 $
+  Version:   $Revision: 1.46 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -148,153 +148,158 @@ namespace bbtk
   //          same for Windows, with      c:, d: ...
   //
   // lastname : string before the last / (if any), or user supplied name
+	  
+	if(name != ""){
+		bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+		bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+
+		std::vector<std::string> package_paths;
+		std::string libname;  // full path library name
+		std::string pkgname;  // e.g. libbb<pkgname>.so
+
+		std::string upath;
+		pkgname = Utilities::ExtractPackageName(name,upath);
+		bbtkMessage("debug",1,"Package name ["<<pkgname<<"]"<<std::endl);
+		bbtkMessage("debug",1,"Package path ["<<upath<<"]"<<std::endl);
+
+		// no loading package if already loaded
+		PackageMapType::iterator iUnload;
+		iUnload = mPackageMap.find(pkgname);
+
+		if (iUnload != mPackageMap.end())
+		{
+		  bbtkMessage("output",2,"["<< pkgname <<"] already loaded" << std::endl);
+		  return;
+		}
+
+	// =================================================
+	// The following structure was checked to work
+	// with any type of relative/absolute path.
+	// Please don't modify it without checking
+	// *all* the cases. JP
+	//==================================================
+
+	//std::cout << "upath [" << upath << "]" << std::endl;
+
+		bool ok = false;
+		bool foundFile = false;
+
+		// If path provided by user will be the first scanned :
+		// push it into vector of paths
+		if (upath.length()>0)   // ------------------------------------- check user supplied location
+		{
+		   if (name[0] != '.' && name[0] != '/' && name[1]!= ':')
+		   {
+			  bbtkError("Use absolute or relative path name! ["<<name<<"] is an illegal name");
+			  return;
+		   }
+
+		  // std::string path = Utilities::ExpandLibName(upath, false);
+
+		   std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
+		   if (path != "")
+		   {
+			  std::string p2;
+			  Utilities::ExtractPackageName(path,p2);
+			  //libname = Utilities::MakeLibnameFromPath(path, pkgname);
+			  libname = Utilities::MakeLibnameFromPath(p2, pkgname); // remove last item
+			  // Check if library exists
+			  if ( !Utilities::FileExists(libname) )
+			  {
+			  // The following is *NOT* a debug time message :
+			  // It's a user intended message.
+			  // Please don't remove it.
+			bbtkMessage("output",3,"   [" <<libname 
+				<<"] : doesn't exist" <<std::endl);
+			  }
+			  else
+			  {
+				 ok = DoLoadPackage( libname, pkgname, path);         
+			  }
+		   }
+		   else
+		   {
+			  bbtkError("Path ["<<upath<<"] doesn't exist");
+			  return;
+		   }
+		}
+		else     // ----------------------------------------------------- iterate on the paths  
+		{
+
+		std::string path = ".";
+		package_paths = ConfigurationFile::GetInstance().Get_package_paths();
+		std::vector<std::string>::iterator i;
+		for (i=package_paths.begin();i!=package_paths.end();++i)
+		{
+			foundFile = false;
+			path = *i;
+//std::cout<<"JCP bbtkFactory.cxx void Factory::LoadPackage = path "<<path<<std::endl;
+			// we *really* want '.' to be the current working directory
+			if (path == ".")
+			{
+			  char buf[2048]; // for getcwd
+			  char * currentDir = getcwd(buf, 2048);
+			  std::string cwd(currentDir);
+//std::cout<<"JCP  bbtkFactory.cxx void Factory::LoadPackage = currentDir "<<currentDir<<std::endl;
+			  path = currentDir;
+			}
+//std::cout<<"JCP bbtkFactory.cxx void Factory::LoadPackage = path "<<path<<" pkgnam="<<pkgname<<std::endl;	         
+			libname = Utilities::MakeLibnameFromPath(path, pkgname);
+
+			bbtkMessage("debug",2,"-> Trying to load [" << libname << "]" <<std::endl);
+
+		  // Check if library exists           
+			if ( !Utilities::FileExists(libname) )
+			{
+			// The following is *NOT* a debug time message :
+			// It's a user intended message.
+			// Please don't remove it.
+			  bbtkMessage("output",3,
+				  "   [" <<libname <<"] : doesn't exist" <<std::endl);
+			   continue;  // try next path
+			}
+			foundFile = true; 
+
+		  // Try to Load the library
+
+			ok = DoLoadPackage( libname, pkgname, path);
+			if (ok)
+			{
+			   bbtkMessage("debug",2,"   OK"<<std::endl);
+			}
+		break; // we stop iterating even if error : have to signal it to user
+		} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
 
-    bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
-    bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
-
-    std::vector<std::string> package_paths;
-    std::string libname;  // full path library name
-    std::string pkgname;  // e.g. libbb<pkgname>.so
-
-    std::string upath;
-    pkgname = Utilities::ExtractPackageName(name,upath);
-
-    bbtkMessage("debug",1,"Package name ["<<pkgname<<"]"<<std::endl);
-    bbtkMessage("debug",1,"Package path ["<<upath<<"]"<<std::endl);
-
-    // no loading package if already loaded
-    PackageMapType::iterator iUnload;
-    iUnload = mPackageMap.find(pkgname);
-    if (iUnload != mPackageMap.end())
-    {
-      bbtkMessage("output",2,"["<< pkgname <<"] already loaded" << std::endl);
-      return;
-    }
-
-// =================================================
-// The following structure was checked to work
-// with any type of relative/absolute path.
-// Please don't modify it without checking
-// *all* the cases. JP
-//==================================================
-
-//std::cout << "upath [" << upath << "]" << std::endl;
-
-    bool ok = false;
-    bool foundFile = false;
-
-    // If path provided by user will be the first scanned :
-    // push it into vector of paths
-    if (upath.length()>0)   // ------------------------------------- check user supplied location
-    {
-       if (name[0] != '.' && name[0] != '/' && name[1]!= ':')
-       {
-          bbtkError("Use absolute or relative path name! ["<<name<<"] is an illegal name");
-          return;
-       }
-
-      // std::string path = Utilities::ExpandLibName(upath, false);
-       std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
-         
-       if (path != "")
-       {
-          std::string p2;
-          Utilities::ExtractPackageName(path,p2);
-          //libname = Utilities::MakeLibnameFromPath(path, pkgname);
-          libname = Utilities::MakeLibnameFromPath(p2, pkgname); // remove last item
-          // Check if library exists
-          if ( !Utilities::FileExists(libname) )
-          {
-          // The following is *NOT* a debug time message :
-          // It's a user intended message.
-          // Please don't remove it.
-	    bbtkMessage("output",3,"   [" <<libname 
-			<<"] : doesn't exist" <<std::endl);
-          }
-          else
-          {
-             ok = DoLoadPackage( libname, pkgname, path);         
-          }
-       }
-       else
-       {
-          bbtkError("Path ["<<upath<<"] doesn't exist");
-          return;
-       }
-    }
-    else     // ----------------------------------------------------- iterate on the paths  
-    {
-
-    std::string path;
-    package_paths = ConfigurationFile::GetInstance().Get_package_paths();
-    std::vector<std::string>::iterator i;
-    for (i=package_paths.begin();i!=package_paths.end();++i)
-    {
-        foundFile = false;
-        path = *i;
-
-        // we *really* want '.' to be the current working directory
-        if (path == ".")
-        {
-          char buf[2048]; // for getcwd
-          char * currentDir = getcwd(buf, 2048);
-          std::string cwd(currentDir);
-          path = currentDir;
-        }
-
-        libname = Utilities::MakeLibnameFromPath(path, pkgname);
-
-        bbtkMessage("debug",2,"-> Trying to load [" << libname << "]" <<std::endl);
-
-      // Check if library exists           
-        if ( !Utilities::FileExists(libname) )
-        {
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-          bbtkMessage("output",3,
-		      "   [" <<libname <<"] : doesn't exist" <<std::endl);
-           continue;  // try next path
-        }
-        foundFile = true; 
-
-      // Try to Load the library
-
-        ok = DoLoadPackage( libname, pkgname, path);
-        if (ok)
-        {
-           bbtkMessage("debug",2,"   OK"<<std::endl);
-        }
-	break; // we stop iterating even if error : have to signal it to user
-    } //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
+	}
 
-}
+		if( !ok )  // nothing was loaded
+		{
+		  if (!foundFile)
+		  {
+			bbtkError("Could not find package ["<<pkgname<< "]");
+		  }
+		  else
+		  {
+	#if defined(__GNUC__)
+			bbtkError("Could not load package ["<< pkgname
+					  <<"] :" << std::endl 
+			  << "  Opening "<<libname<<" failed"
+			  << "  Reason: "<< dlerror());
+	#elif defined(_WIN32)
+			bbtkError("Could not load package ["<<pkgname
+			  <<"] :"<< std::endl << "   Error loading " <<libname);
+
+		// look how to get the error message on win
+		//<<dlerror());
+		// it is the bordel !! (the bloody fucking bordel, you mean?)
+		// look : http://msdn2.microsoft.com/en-us/library/ms680582.aspx
+	#endif
+		  }
+		}	
+		bbtkMessage("output",2,"[" << libname << "] loaded" << std::endl);
+	}
 
-    if( !ok )  // nothing was loaded
-    {
-      if (!foundFile)
-      {
-        bbtkError("Could not find package ["<<pkgname<< "]");
-      }
-      else
-      {
-#if defined(__GNUC__)
-        bbtkError("Could not load package ["<< pkgname
-                  <<"] :" << std::endl 
-		  << "  Opening "<<libname<<" failed"
-		  << "  Reason: "<< dlerror());
-#elif defined(_WIN32)
-        bbtkError("Could not load package ["<<pkgname
-		  <<"] :"<< std::endl << "   Error loading " <<libname);
-
-    // look how to get the error message on win
-    //<<dlerror());
-    // it is the bordel !! (the bloody fucking bordel, you mean?)
-    // look : http://msdn2.microsoft.com/en-us/library/ms680582.aspx
-#endif
-      }
-    }
-    bbtkMessage("output",2,"[" << libname << "] loaded" << std::endl);
+    
 
   }
 
@@ -390,8 +395,7 @@ namespace bbtk
 
 
   //===================================================================  
-  /// Displays the list of packages loaded
-  void Factory::PrintPackages(bool details, bool adaptors) const
+  void Factory::PrintHelpListPackages(bool details, bool adaptors) const
   {
     bbtkDebugMessageInc("kernel",9,"Factory::PrintPackages"<<std::endl);
 
@@ -400,7 +404,7 @@ namespace bbtk
     {
       bbtkMessage("help",1, i->first << std::endl);
       if (details) {
-         i->second->PrintBlackBoxes(false,adaptors);
+         i->second->PrintHelpListDescriptors(false,adaptors);
       }
     }
 
@@ -410,9 +414,10 @@ namespace bbtk
 
   //===================================================================  
   /// Displays help on a package
-  void Factory::HelpPackage(const std::string& name, bool adaptors) const
+  void Factory::PrintHelpPackage(const std::string& name, bool adaptors) const
   {
-    bbtkDebugMessageInc("kernel",9,"Factory::HelpPackage(\""<<name<<"\")"
+    bbtkDebugMessageInc("kernel",9,"Factory::PrintHelpPackage(\""
+			<<name<<"\")"
                         <<std::endl);
 
     PackageMapType::const_iterator i = mPackageMap.find(name);
@@ -432,10 +437,10 @@ namespace bbtk
       bbtkMessageCont("help",1,std::endl);
       bbtkIncTab("help",1);
       bbtkMessage("help",1,i->second->GetDescription()<<std::endl);
-      if (i->second->GetNumberOfBlackBoxes()>0) 
+      if (i->second->GetNumberOfDescriptors()>0) 
         {
           bbtkMessage("help",1, "Black boxes : "<<std::endl);
-          i->second->PrintBlackBoxes(true,adaptors);
+          i->second->PrintHelpListDescriptors(true,adaptors);
         }
       else 
         {
@@ -456,20 +461,21 @@ namespace bbtk
   //===================================================================
   /// Prints help on the black box of type <name>
   /// Returns the package to which it belongs
-  void Factory::HelpBlackBox(const std::string& name, 
+  void Factory::PrintHelpDescriptor(const std::string& name, 
 			     std::string& package,
 			     bool full) const
   {
-    bbtkDebugMessageInc("kernel",9,"Factory::HelpBlackBox(\""<<name<<"\")"
+    bbtkDebugMessageInc("kernel",9,"Factory::PrintHelpDescriptor(\""
+			<<name<<"\")"
                         <<std::endl);
 
     bool found = false;
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
       {
-      if (i->second->ContainsBlackBox(name)) 
+      if (i->second->ContainsDescriptor(name)) 
         {
-          i->second->HelpBlackBox(name,full);
+          i->second->PrintHelpDescriptor(name,full);
 	      package = i->second->GetName();
           found = true;
         }
@@ -784,14 +790,14 @@ namespace bbtk
   
 
   //===================================================================
-  void Factory::CheckPackages() const
+  void Factory::Check() const
   {
     bbtkMessage("debug",1,"****** Checking Factory "<<(void*)this
 		 <<std::endl);
     PackageMapType::const_iterator i;
     for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
       {
-	i->second->CheckBoxes();
+	i->second->Check();
       }
     bbtkMessage("debug",1,"****** Checking Factory "<<(void*)this
 		<<" ... OK"<<std::endl);
@@ -832,41 +838,41 @@ namespace bbtk
    PackageMapType::const_iterator i;
    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
    {
-      if (i->second->ContainsBlackBox(name)) 
-      {
+     if (i->second->ContainsDescriptor(name)) 
+       {
          std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
-
-            // Don't pollute the file store with  "temp_dir" directories ...    
+	 
+	 // Don't pollute the file store with  "temp_dir" directories ...    
          std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
          std::string directory = "\"" + default_doc_dir + separator + "temp_dir"  +separator + "\"";
          std::string filename2 =  default_doc_dir + separator + "temp_dir" + separator + "tmp.html"; 
-
+	 
 #if defined(_WIN32)  
-        std::string command("start \"Titre\" /D ");
+	 std::string command("start \"Titre\" /D ");
 #else 
-        std::string command("gnome-open ");
+	 std::string command("gnome-open ");
 #endif
-        command=command + directory +" tmp.html";
-        FILE *ff;
-        ff=fopen(filename2.c_str(),"w");
-
-        fprintf(ff,"<html><head><title>TMP</title> <script type=\"text/javascript\"> <!--\n");
-        fprintf(ff,"  window.location=\"%s#%s\";\n" , i->second->GetDocURL().c_str(),name.c_str() );
-        fprintf(ff,"//--></script></head><body></body></html>\n");
-
-
-        //fprintf(ff, "<a  href=\"%s#%s\">Link</a>\n", i->second->GetDocURL().c_str(),name.c_str() );
-        fclose(ff);
-        system( command.c_str() );      
-        found = true;
-     }
+	 command=command + directory +" tmp.html";
+	 FILE *ff;
+	 ff=fopen(filename2.c_str(),"w");
+	 
+	 fprintf(ff,"<html><head><title>TMP</title> <script type=\"text/javascript\"> <!--\n");
+	 fprintf(ff,"  window.location=\"%s#%s\";\n" , i->second->GetDocURL().c_str(),name.c_str() );
+	 fprintf(ff,"//--></script></head><body></body></html>\n");
+	 
+	 
+	 //fprintf(ff, "<a  href=\"%s#%s\">Link</a>\n", i->second->GetDocURL().c_str(),name.c_str() );
+	 fclose(ff);
+	 system( command.c_str() );      
+	 found = true;
+       }
    }
-    
+   
    bbtkDebugDecTab("kernel",9);
    if (!found) 
    {
-      bbtkError("No package of the factory contains any black box <"
-                <<name<<">");
+     bbtkError("No package of the factory contains any black box <"
+	       <<name<<">");
    }
  }
     
@@ -890,9 +896,9 @@ namespace bbtk
       {
 	Package::Pointer pack = i->second;
 	if (pack->GetName()=="user") continue;
-	Package::BlackBoxMapType::const_iterator j;
-	for (j = pack->GetBlackBoxMap().begin(); 
-	     j!= pack->GetBlackBoxMap().end(); 
+	Package::DescriptorMapType::const_iterator j;
+	for (j = pack->GetDescriptorMap().begin(); 
+	     j!= pack->GetDescriptorMap().end(); 
 	     ++j)
 	  {