X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=d541db35b9203e89b984a63daa7c2dd1a7760eb5;hb=72e1281cc66954975acc2414264239dcf055c15f;hp=3d4aef1d4d45ca196f30c85f81bcad68c16bd6d4;hpb=bf1bdd88621c0556024de37768c2d17d12f2a265;p=bbtk.git

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 3d4aef1..d541db3 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: 2012/05/30 17:17:00 $
-  Version:   $Revision: 1.52 $
+  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
@@ -115,7 +122,6 @@ namespace bbtk
 	bbtkMessage("output",2,p->GetDescription()<<std::endl);
 	//===================================================================
 	p->AddFactory(GetThisPointer<Factory>());
-printf("EED Factory::DoLoadPackage > %s %s  %s \n",libname.c_str(), pkgname.c_str(),path.c_str());		  
 	mPackageMap[pkgname] = p;
 	return true;
       }
@@ -164,26 +170,23 @@ printf("EED Factory::DoLoadPackage > %s %s  %s \n",libname.c_str(), pkgname.c_st
 
 		std::string upath;
 
-		
 		pkgname = Utilities::ExtractPackageName(name,upath);
-		
-		printf("EED Factory::LoadPackage A. %s\n", name.c_str());
-		printf("EED Factory::LoadPackage A. %s\n", upath.c_str());
-		printf("EED Factory::LoadPackage A. %s\n", pkgname.c_str());
-		
+				
 		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);
-		
-		PackageMapType::iterator it;
-std::cout << "EED Factory::LoadPackage PackageMap ";
-		for ( it=mPackageMap.begin() ; it != mPackageMap.end(); it++ )
-			std::cout << (*it).first << " ";
-		std::cout << std::endl;
 
+//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);
@@ -197,9 +200,6 @@ std::cout << "EED Factory::LoadPackage PackageMap ";
 	// *all* the cases. JP
 	//==================================================
 
-		printf("\nEED Factory::LoadPackage B. %s\n\n", name.c_str());
-	//std::cout << "upath [" << name << "]" << std::endl;
-
 		bool ok = false;
 		bool foundFile = false;
 
@@ -517,12 +517,8 @@ std::cout << "EED Factory::LoadPackage PackageMap ";
     bbtkDebugMessageInc("kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
-    p->AddFactory(GetThisPointer<Factory>());
-	  
-printf("EED Factory::InsertPackage %s\n", p->GetName().c_str() );	  
-	  
+    p->AddFactory(GetThisPointer<Factory>());	  
     mPackageMap[p->GetName()] = p;
-
     bbtkDebugDecTab("kernel",9);
   }
   //===================================================================
@@ -552,23 +548,47 @@ printf("EED Factory::InsertPackage %s\n", p->GetName().c_str() );
 
     bbtkDebugDecTab("kernel",9);
   }
-  //===================================================================
   
 
-//	ups3 EED borrame	
+  //===================================================================
 	std::string Factory::GetPackageNameOfaBlackBox(std::string boxType)
 	{
-		std::string result="<void bbtk package name>";
+		std::string packageName="<void bbtk package name>";
 		PackageMapType::const_iterator i;
-		for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
-		{
-			if ( i->second->ifBoxExist( boxType ) == true)
+
+ 		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 )
 			{
-				result = i->first;
-			}
-		}
-		return result;
+				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;
+	}
+
+
 	
 	
   //===================================================================
@@ -576,20 +596,52 @@ printf("EED Factory::InsertPackage %s\n", p->GetName().c_str() );
   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;