X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=368275afb8d5c07af52361ac09576621246b9300;hb=c7d8e28b602123bc0943752e09907569f0697144;hp=6746746398a24ed4dcb826b4a101265c474320e8;hpb=1e5ead2c1c568f2a924d1dcf77994f46d2f31640;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 6746746..368275a 100644
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/09/05 09:20:49 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.55 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+                                                                       
 
 /**
  *\file
@@ -99,7 +106,6 @@ namespace bbtk
                               std::string pkgname,
                               std::string path)
   {
-    
     Package::Pointer p = Package::CreateFromDynamicLibrary(libname,
 							   pkgname,
 							   path);
@@ -118,8 +124,7 @@ namespace bbtk
 	mPackageMap[pkgname] = p;
 	return true;
       }
-    return false;
-    
+    return false;    
   }
   
   //===================================================================
@@ -140,6 +145,7 @@ namespace bbtk
   
   void Factory::LoadPackage( const std::string& name )
   {
+	  
   // Note : in the following :
   // name : the user supplied name
   //      - abreviated name    e.g.       pkg   pkg.so   libbpkg   libbbpkg.so
@@ -148,7 +154,7 @@ 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);
@@ -158,7 +164,9 @@ namespace bbtk
 		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);
 
@@ -166,6 +174,13 @@ namespace bbtk
 		PackageMapType::iterator iUnload;
 		iUnload = mPackageMap.find(pkgname);
 
+//EED Debuging message
+//     std::cout << "EED Factory::LoadPackage " <<  std::endl;
+//		PackageMapType::iterator it;
+//		for ( it=mPackageMap.begin() ; it != mPackageMap.end(); it++ )
+//			std::cout << (*it).first << " ";
+//		std::cout << std::endl;
+
 		if (iUnload != mPackageMap.end())
 		{
 		  bbtkMessage("output",2,"["<< pkgname <<"] already loaded" << std::endl);
@@ -179,8 +194,6 @@ namespace bbtk
 	// *all* the cases. JP
 	//==================================================
 
-	//std::cout << "upath [" << upath << "]" << std::endl;
-
 		bool ok = false;
 		bool foundFile = false;
 
@@ -194,7 +207,7 @@ namespace bbtk
 			  return;
 		   }
 
-		  // std::string path = Utilities::ExpandLibName(upath, false);
+        // std::string path = Utilities::ExpandLibName(upath, false);
 
 		   std::string path = Utilities::ExpandLibName(name,false); // keep last item, here.
 		   if (path != "")
@@ -209,24 +222,18 @@ namespace bbtk
 			  // 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
-			  {
+				bbtkMessage("output",3,"   [" << libname <<"] : doesn't exist" <<std::endl);
+			} else {
 				 ok = DoLoadPackage( libname, pkgname, path);         
-			  }
-		   }
-		   else
-		   {
+			}
+		   } else {
 			  bbtkError("Path ["<<upath<<"] doesn't exist");
 			  return;
 		   }
-		}
-		else     // ----------------------------------------------------- iterate on the paths  
+		} else     // ----------------------------------------------------- iterate on the paths  
 		{
 
-		std::string path = ".";
+        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)
@@ -261,7 +268,6 @@ namespace bbtk
 			foundFile = true; 
 
 		  // Try to Load the library
-
 			ok = DoLoadPackage( libname, pkgname, path);
 			if (ok)
 			{
@@ -269,7 +275,6 @@ namespace bbtk
 			}
 		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
@@ -298,9 +303,6 @@ namespace bbtk
 		}	
 		bbtkMessage("output",2,"[" << libname << "] loaded" << std::endl);
 	}
-
-    
-
   }
 
   //===================================================================
@@ -498,9 +500,8 @@ namespace bbtk
     bbtkDebugMessageInc("kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
-    p->AddFactory(GetThisPointer<Factory>());
+    p->AddFactory(GetThisPointer<Factory>());	  
     mPackageMap[p->GetName()] = p;
-
     bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
@@ -530,28 +531,100 @@ namespace bbtk
 
     bbtkDebugDecTab("kernel",9);
   }
-  //===================================================================
   
 
+  //===================================================================
+	std::string Factory::GetPackageNameOfaBlackBox(std::string boxType)
+	{
+		std::string packageName="<void bbtk package name>";
+		PackageMapType::const_iterator i;
+
+ 		std::size_t found = boxType.find(":");
+ 		if (found!=std::string::npos)
+ 		{
+	 		packageName	= boxType.substr(0,found);
+ 		} else {
+			for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+			{
+				if ( i->second->ifBoxExist( boxType ) == true)
+				{
+					packageName = i->first;
+				} // if ifBoxExist
+			} // for i
+
+		} // if found
+		return packageName;
+	}
+
+  //===================================================================
+	std::string Factory::GetTypeNameOfaBlackBox(std::string boxType)
+	{
+		std::string typeName="<void bbtk type name>";
+
+	 	std::size_t found = boxType.find(":");
+ 		if (found!=std::string::npos)
+ 		{
+	 		typeName		= boxType.substr(found+1);
+ 		} else {
+			typeName=boxType;
+		} // if found
+		return typeName;
+	}
+
+
+	
+	
   //===================================================================
   /// Creates an instance of a black box of type <type> with name <name>
   BlackBox::Pointer Factory::NewBlackBox(const std::string& type, 
                                  const std::string& name) const
   {
-    bbtkDebugMessageInc("kernel",7,"Factory::NewBlackBox(\""
+	bbtkDebugMessageInc("kernel",7,"Factory::NewBlackBox(\""
                         <<type<<"\",\""<<name<<"\")"<<std::endl);
 
     BlackBox::Pointer b; 
     PackageMapType::const_iterator i;
-    for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
-      {
-      b = i->second->NewBlackBox(type,name);
-      if (b) break; 
-      }
+
+	std::string tmp = type;
+	std::string packageName = ((bbtk::Factory*)this)->GetPackageNameOfaBlackBox(tmp);
+	std::string type2 		= ((bbtk::Factory*)this)->GetTypeNameOfaBlackBox(tmp);
+  	i = mPackageMap.find(packageName);
+	if (i != mPackageMap.end())
+	{
+		b = i->second->NewBlackBox(type2,name);
+	} else {
+		b =BlackBox::Pointer();
+	}
+
+/*
+ 	std::size_t found = type.find(":");
+ 	if (found!=std::string::npos)
+ 	{
+	 	std::string packageName	= type.substr(0,found);
+	 	std::string type2		= type.substr(found+1);
+		i = mPackageMap.find(packageName);
+		if (i != mPackageMap.end())
+		{
+	      	b = i->second->NewBlackBox(type2,name);
+		} else {
+			b =BlackBox::Pointer();
+		}
+ 	} else {
+    	for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+      	{
+      		b = i->second->NewBlackBox(type,name);
+      		if (b) break; 
+      	} // for i
+
+	} // if found :
+*/
+
+
     if (!b) 
-      {
-       bbtkError("black box type \""<<type<<"\" unknown");
-      } 
+    {
+      	bbtkError("black box type \""<<type<<"\" unknown");
+    }  // if !b
+
 
     bbtkDebugDecTab("kernel",7);
     return b;
@@ -584,7 +657,7 @@ namespace bbtk
       } 
     
     bbtkDebugDecTab("kernel",7);
-    return b; 
+    return b;
   }
   //===================================================================
 
@@ -780,10 +853,6 @@ namespace bbtk
     }
     else 
     {
-       printf(" \n",name.c_str());
-       printf(" ..BBTK ERROR.. package >>>%s<<< unknown\n",name.c_str());
-       printf("  Your have to configure your bbtk_config.xml\n");
-       printf("  to configure the correct path of the packages\n\n");
        bbtkDebugDecTab("kernel",9);
        bbtkError("package \""<<name<<"\" unknown");
     }