X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkFactory.cxx;h=ad64151ba1696592f5611f2095d42125f86b6155;hb=98e18224b83c6955a804d79d4e7083626ea8afcd;hp=c024617d59d01416250563110db678ffe8f2855b;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index c024617..ad64151 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -1,22 +1,33 @@ -/*========================================================================= - -Program: bbtk -Module: $RCSfile: bbtkFactory.cxx,v $ -Language: C++ - -Date: $Date: 2008/04/18 12:59:15 $ -Version: $Revision: 1.33 $ - - -Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de -l'Image). All rights reserved. See doc/license.txt or -http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. +/*========================================================================= + Program: bbtk + Module: $RCSfile: bbtkFactory.cxx,v $ + Language: C++ + Date: $Date: 2009/03/30 15:22:51 $ + Version: $Revision: 1.42 $ +=========================================================================*/ -This software is distributed WITHOUT ANY WARRANTY; without even -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -PURPOSE. See the above copyright notices for more information. +/* --------------------------------------------------------------------- + +* 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 *\brief Class bbtk::Factory : can load and unload dynamic libraries containing @@ -28,6 +39,7 @@ PURPOSE. See the above copyright notices for more information. #include "bbtkConnection.h" #include "bbtkConfigurationFile.h" #include "bbtkUtilities.h" +#include "bbtkConfigurationFile.h" #include // for struct stat stFileInfo @@ -37,6 +49,7 @@ PURPOSE. See the above copyright notices for more information. #include // std::toupper +#include namespace bbtk { @@ -137,7 +150,7 @@ namespace bbtk // lastname : string before the last / (if any), or user supplied name bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""< package_paths; std::string libname; // full path library name @@ -146,8 +159,8 @@ namespace bbtk std::string upath; pkgname = Utilities::ExtractPackageName(name,upath); - bbtkMessage("Debug",1,"Package name ["< Trying to load [" << libname << "]" < Trying to load [" << libname << "]" < mAlive; + do { + mAlive.clear(); + while (mPackageMap.begin() != mPackageMap.end()) + { + PackageMapType::iterator i = mPackageMap.begin(); + Package::WeakPointer p = i->second; + ClosePackage(i); + if (p.lock()) mAlive.push_back(p); + } + std::vector< Package::WeakPointer >::iterator i; + for (i=mAlive.begin();i!=mAlive.end();++i) + { + // If not dead : reinsert + if (i->lock()) + { + bbtkDebugMessage("Kernel",7,"Package "<lock()->GetName() + <<" still alive"<lock()); + } + } + } + while (mPackageMap.size()>0); + bbtkDebugDecTab("Kernel",7); } //=================================================================== @@ -344,9 +379,10 @@ namespace bbtk // remove the entry in the map mPackageMap.erase(i); // Release the package if not already destroyed - if (p.lock()) Package::Release(p); - - + if (p.lock()) + { + Package::Release(p); + } bbtkDebugDecTab("Kernel",7); } //=================================================================== @@ -456,13 +492,9 @@ namespace bbtk bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<< p->GetName()<<"\")"<AddFactory(GetThisPointer()); mPackageMap[p->GetName()] = p; - std::cout << p.use_count() <first.mKind == - BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR) && + BlackBoxDescriptor::DEFAULT_GUI) && //(j->first.mTypeIn == typein) && (j->first.mTypeOut.GetNature() == typeout.GetNature() ) ) @@ -754,14 +786,14 @@ namespace bbtk //=================================================================== void Factory::CheckPackages() const { - bbtkMessage("Debug",1,"****** Checking Factory "<<(void*)this + bbtkMessage("debug",1,"****** Checking Factory "<<(void*)this <second->CheckBoxes(); } - bbtkMessage("Debug",1,"****** Checking Factory "<<(void*)this + bbtkMessage("debug",1,"****** Checking Factory "<<(void*)this <<" ... OK"<\n"; - s << "first << "/main.html>(Doxygen documentation of the source)\n"; +//EED 26Mars2009 + std::string bin_path = bbtk::ConfigurationFile::GetInstance().Get_bin_path(); + s << "first << "/main.html>(Doxygen documentation of the source)\n"; } else { @@ -1020,7 +1054,7 @@ namespace bbtk ptm = gmtime ( &rawtime ); s << "

\n"; - s << "Automatically generated by bbi on " + s << "Automatically generated by bbtk on " << ptm->tm_mday << "/" << ptm->tm_mon << "/" << ptm->tm_year+1900 << " - " << ptm->tm_hour << ":" << ptm->tm_min << " GMT\n"; s << "\n";