X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=d240eedbafacb8461a79c6a635b090cd7e7a9ad0;hb=ce4491d66577c9daf930cb8744e738e4b7220fe7;hp=627bc80881b1e99ac4b112dbf8244d543c8a9718;hpb=f5d5e297c656fb1304cccd72e9ac347c0bddbd09;p=bbtk.git diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 627bc80..d240eed 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: 2009/10/05 22:44:48 $ - Version: $Revision: 1.46 $ + 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 @@ -149,6 +155,8 @@ namespace bbtk // // lastname : string before the last / (if any), or user supplied name + + if(name != ""){ bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<.so std::string upath; + pkgname = Utilities::ExtractPackageName(name,upath); + bbtkMessage("debug",1,"Package name ["<GetName()<<"\")"<AddFactory(GetThisPointer()); + p->AddFactory(GetThisPointer()); mPackageMap[p->GetName()] = p; - bbtkDebugDecTab("kernel",9); } //=================================================================== @@ -530,28 +535,100 @@ namespace bbtk bbtkDebugDecTab("kernel",9); } - //=================================================================== + //=================================================================== + std::string Factory::GetPackageNameOfaBlackBox(std::string boxType) + { + std::string packageName=""; + 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=""; + + 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 with name BlackBox::Pointer Factory::NewBlackBox(const std::string& type, const std::string& name) const { - bbtkDebugMessageInc("kernel",7,"Factory::NewBlackBox(\"" + bbtkDebugMessageInc("kernel",7,"Factory::NewBlackBox(\"" <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 \""< > IndexType; + std::vector > IndexType; IndexType index; // Builds the index map PackageMapType::const_iterator i; for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i ) - { - Package::Pointer pack = i->second; - if (pack->GetName()=="user") continue; - Package::DescriptorMapType::const_iterator j; - for (j = pack->GetDescriptorMap().begin(); - j!= pack->GetDescriptorMap().end(); - ++j) - { + { + Package::Pointer pack = i->second; + if (pack->GetName()=="user") continue; + Package::DescriptorMapType::const_iterator j; + for (j = pack->GetDescriptorMap().begin(); + j!= pack->GetDescriptorMap().end(); + ++j) + { // Skip adaptors - if ( type==Adaptors ) - { - if (j->second->GetKind() == BlackBoxDescriptor::STANDARD ) - continue; - } - else - if (j->second->GetKind() != BlackBoxDescriptor::STANDARD ) - continue; + if ( type==Adaptors ) + { + if (j->second->GetKind() == BlackBoxDescriptor::STANDARD ) + continue; + } + else + if (j->second->GetKind() != BlackBoxDescriptor::STANDARD ) + continue; - std::vector keys; - if (type==Packages) - { - std::string k(""); - k += pack->GetName(); - keys.push_back(k); - title = "Boxes by package"; - } - else if ((type==Initials) || (type==Adaptors)) - { - std::string init(" "); - init[0] = std::toupper(j->second->GetTypeName()[0]); - keys.push_back(init); - title = "Alphabetical list"; - } - else if (type==Categories) - { - // Split the category string - std::string delimiters = ";,"; - Utilities::SplitString(j->second->GetCategory(), - delimiters,keys); - if (keys.size()==0) - keys.push_back(" NONE"); - title = "Boxes by category"; - } - - - std::vector::const_iterator k; - for (k=keys.begin(); k!=keys.end(); ++k ) - { - IndexType::iterator p; - p = index.find(*k); - if (p != index.end()) - { - p->second.push_back(j->second); - } - else - { - std::vector v; - v.push_back(j->second); - index[*k] = v; - } - } - - } - } + std::vector keys; + if (type==Packages) + { + std::string k(""); + k += pack->GetName(); + keys.push_back(k); + title = "Boxes by package"; + } + else if ((type==Initials) || (type==Adaptors)) + { + std::string init(" "); + init[0] = std::toupper(j->second->GetTypeName()[0]); + keys.push_back(init); + title = "Alphabetical list"; + } + else if (type==Categories) + { + // Split the category string + std::string delimiters = ";,"; + Utilities::SplitString(j->second->GetCategory(), + delimiters,keys); + if (keys.size()==0) + keys.push_back(" NONE"); + title = "Boxes by category"; + } + + std::vector::const_iterator k; + for (k=keys.begin(); k!=keys.end(); ++k ) + { + IndexType::iterator p; + p = index.find(*k); + if (p != index.end()) + { + p->second.push_back(j->second); + } + else + { + std::vector v; + v.push_back(j->second); + index[*k] = v; + } + } + } + } // Creates the file //--------------------- // Open output file @@ -1002,7 +1076,7 @@ namespace bbtk IndexType::iterator ii; for (ii=index.begin();ii!=index.end();++ii) { - s << "first<<"\">"<first<<"  "; + s << "first<<"\">"<first<<"  "; } for (ii=index.begin();ii!=index.end();++ii) @@ -1018,9 +1092,14 @@ namespace bbtk s << "  -  \n"; s << "\n"; -//EED 26Mars2009 + +//EED 26Mars2009 + /*JCP 19 Nov 2009 std::string bin_path = bbtk::ConfigurationFile::GetInstance().Get_bin_path(); s << "first << "/main.html>(Doxygen documentation of the source)\n"; + JCP 19 Nov 2009*/ + std::string bin_path = bbtk::ConfigurationFile::GetInstance().Get_bin_path(); + s << "first << "/main.html>(Doxygen documentation of the source)\n"; } else {