-/*=========================================================================
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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/01/21 16:03:17 $
- Version: $Revision: 1.47 $
+ 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
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
//
// 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::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);
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);
// *all* the cases. JP
//==================================================
- //std::cout << "upath [" << upath << "]" << std::endl;
-
bool ok = false;
bool foundFile = false;
bbtkDebugMessageInc("kernel",9,"Factory::InsertPackage(\""<<
p->GetName()<<"\")"<<std::endl);
- p->AddFactory(GetThisPointer<Factory>());
+ p->AddFactory(GetThisPointer<Factory>());
mPackageMap[p->GetName()] = p;
-
bbtkDebugDecTab("kernel",9);
}
//===================================================================
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;
void Factory::ShowGraphTypes(const std::string& name) const
{
-
bool found = false;
PackageMapType::const_iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
std::string title;
typedef std::map<std::string,
- std::vector<BlackBoxDescriptor::Pointer> > IndexType;
+ std::vector<BlackBoxDescriptor::Pointer> > IndexType;
IndexType index;
// Builds the index map
PackageMapType::const_iterator i;
title = "Boxes by category";
}
-
std::vector<std::string>::const_iterator k;
for (k=keys.begin(); k!=keys.end(); ++k )
{
index[*k] = v;
}
}
-
}
}
// Creates the file
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff