-/*=========================================================================
-
-Program: bbtk
-Module: $RCSfile: bbtkFactory.cxx,v $
-Language: C++
-
-Date: $Date: 2008/03/10 06:24:12 $
-Version: $Revision: 1.29 $
-
-
-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
#include "bbtkConnection.h"
#include "bbtkConfigurationFile.h"
#include "bbtkUtilities.h"
+#include "bbtkConfigurationFile.h"
#include <sys/stat.h> // for struct stat stFileInfo
#include <cctype> // std::toupper
+#include <time.h>
namespace bbtk
{
- typedef Package* (*PackageAccessor)();
- typedef void (*PackageDeleteFunction)();
+ //===================================================================
+ /// Default ctor
+ Factory::Pointer Factory::New()
+ {
+ bbtkDebugMessage("Kernel",9,"Factory::New()"<<std::endl);
+ return MakePointer(new Factory());
+ }
+ //===================================================================
//===================================================================
/// Default ctor
Factory::Factory()
- : mExecuter(0)
+ : mExecuter()
{
bbtkDebugMessage("Kernel",7,"Factory::Factory()"<<std::endl);
}
//===================================================================
- //===================================================================
- void Factory::CloseAllPackages()
- {
- bbtkDebugMessageInc("Kernel",7,"Factory::CloseAllPackages()"<<std::endl);
- while (mPackageMap.begin() != mPackageMap.end())
- {
- PackageMapType::iterator i = mPackageMap.begin();
- ClosePackage(i);
- }
- bbtkDebugDecTab("Kernel",7);
- }
- //===================================================================
//===================================================================
void Factory::Reset()
{
-printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
-printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
-printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
-printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
-printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
-printf("EED kkkkkkkkkkkkkkkkkkkkkkkk Factory::Reset() \n");
bbtkDebugMessageInc("Kernel",7,"Factory::Reset()"<<std::endl);
CloseAllPackages();
bbtkDebugDecTab("Kernel",7);
std::string path)
{
-#if defined(__GNUC__)
-
- void *handler;
- handler = dlopen(libname.c_str(),
- BBTK_RTLD_TIME | BBTK_RTLD_SCOPE );
- if (!handler)
+ Package::Pointer p = Package::CreateFromDynamicLibrary(libname,
+ pkgname,
+ path);
+ if (p!=0)
{
- // The following is *NOT* a debug time message :
- // It's a user intended message.
- // Please don't remove it.
- bbtkError("Could not open shared library [" <<libname<<"] : "
- <<dlerror() << std::endl);
-
- return false; // try next path
+ //===================================================================
+ bbtkMessage("Output",2,p->GetName()<<" "
+ <<p->GetVersion()
+ <<" "
+ <<p->GetAuthor() << " Category(s) :"
+ <<p->GetCategory()
+ <<std::endl);
+ bbtkMessage("Output",2,p->GetDescription()<<std::endl);
+ //===================================================================
+ p->AddFactory(GetThisPointer<Factory>());
+ mPackageMap[pkgname] = p;
+ return true;
}
+ return false;
- // The following is *NOT* a debug time message :
- // It's a user intended message.
- // Please don't remove it.
- bbtkMessage("Output",2," -->[" <<libname<<"] found" << std::endl);
-
- // Loads the Package accessor
-
- std::string getpackname(pkgname);
- getpackname += "GetPackage";
- void *getpack = dlsym(handler, getpackname.c_str());
- if (!getpack)
- {
- dlclose(handler);
- bbtkError("Shared library ["<<libname<<"] is not a valid bbtk package."
- <<" Symbol ["<<getpackname<<"] :"<<dlerror());
- }
-
- // Verifies that the Package delete function is present
- std::string delfname(pkgname);
- delfname += "DeletePackage";
- void *delf = dlsym(handler, delfname.c_str());
- if (!delf)
- {
- dlclose(handler);
- bbtkError("Shared library ["<<libname<<"] is not a valid bbtk package."
- <<" Symbol ["<<delfname<<"] :"<<dlerror());
- }
-
-#elif defined(_WIN32)
-
- HINSTANCE handler;
-
- SetErrorMode(0);
- handler = LoadLibrary(libname.c_str());
- if (!handler)
- {
- // The following is *NOT* a debug time message :
- // It's a user intended message.
- // Please don't remove it.
- bbtkError("Error loading library [" <<libname<<"]" << std::endl);
- return false;// Problem with the found library
- }
-
- bbtkMessage("Output",2," --->[" <<libname<<"] found" << std::endl);
-
- // Loads the Package accessor
-
- std::string getpackname(pkgname);
- getpackname += "GetPackage";
- void *getpack = GetProcAddress(handler, getpackname.c_str());
- if (!getpack)
- {
- FreeLibrary(handler);
- bbtkError("[1] Could not load package \""<<pkgname
- <<"\" : "<<getpackname<<" symbol not found (is it a bbtk package lib ?)");
- // look how to get the error message on win
- //<<dlerror());
- }
- // Verifies that the Package delete function is present
- std::string delfname(pkgname);
- delfname += "DeletePackage";
- void *delf = GetProcAddress(handler, delfname.c_str());
- if (!delf)
- {
- FreeLibrary(handler);
- bbtkError("[2] Could not load package \""<<pkgname
- <<"\" : "<<delfname<<" symbol not found (is it a bbtk package lib ?)");
- // look how to get the error message on win
- //<<dlerror());
- }
-#else
- bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?");
-#endif
-
- // Stores the package
- PackageInfoType pack;
- pack.mDynamicLibraryHandler = handler;
- // Invokes the accessor to the PackageUnit pointer
- pack.mPackage = ((PackageAccessor)getpack)();
-
- // Test bbtk build version ok
- if ( pack.mPackage->GetBBTKVersion() != bbtk::GetVersion() )
- {
- std::string v(pack.mPackage->GetBBTKVersion());
- UnLoadPackage(pkgname);
- bbtkError("Cannot load package ["<<libname<<"]. "
- <<"Package build with bbtk version "
- << v
- << " whereas application build with version "
- << bbtk::GetVersion());
- }
-
- pack.mPackage->AddFactory(this);
- mPackageMap[pkgname] = pack;
-
- std::string separator =
- ConfigurationFile::GetInstance().Get_file_separator ();
- //BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH)
- std::string docreldoc =
- separator + "bbdoc" + separator + pkgname + separator + "index.html";
- std::string reldoc =
- ".." + separator + ".." + docreldoc;
- std::string doc = path + separator + ".." + separator
- + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH)
- + docreldoc;
-
- pack.mPackage->SetDocURL(doc);
- pack.mPackage->SetDocRelativeURL(reldoc);
-
- //===================================================================
- bbtkMessage("Output",2,pack.mPackage->GetName()<<" "
- <<pack.mPackage->GetVersion()
- <<" (bbtk "
- <<pack.mPackage->GetBBTKVersion()<<") "
- <<pack.mPackage->GetAuthor() << " Category(s) :"
- <<pack.mPackage->GetCategory()
- <<std::endl);
- bbtkMessage("Output",2,pack.mPackage->GetDescription()<<std::endl);
- //===================================================================
-
- bbtkDebugDecTab("Kernel",7);
- return true;
}
//===================================================================
// lastname : string before the last / (if any), or user supplied name
bbtkDebugMessageInc("Kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
- bbtkMessage("Debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
+ bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
std::vector<std::string> package_paths;
std::string libname; // full path library name
std::string upath;
pkgname = Utilities::ExtractPackageName(name,upath);
- bbtkMessage("
Debug",1,"Package name ["<<pkgname<<"]"<<std::endl);
- bbtkMessage("Debug",1,"Package path ["<<upath<<"]"<<std::endl);
+ 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;
libname = Utilities::MakeLibnameFromPath(path, pkgname);
- bbtkMessage("Debug",2,"-> Trying to load [" << libname << "]" <<std::endl);
+ bbtkMessage("debug",2,"-> Trying to load [" << libname << "]" <<std::endl);
// Check if library exists
if ( !Utilities::FileExists(libname) )
ok = DoLoadPackage( libname, pkgname, path);
if (ok)
{
- bbtkMessage("Debug",2," OK"<<std::endl);
- break; // a package was found; we stop iterating
+ bbtkMessage("debug",2," OK"<<std::endl);
}
+ break; // we stop iterating even if error : have to signal it to user
} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
}
{
#if defined(__GNUC__)
bbtkError("Could not load package ["<< pkgname
- <<"] :" << std::endl << " " << dlerror());
+ <<"] :" << std::endl
+ << " Opening "<<libname<<" failed"
+ << " Reason: "<< dlerror());
#elif defined(_WIN32)
bbtkError("Could not load package ["<<pkgname
- <<"] : " << std::endl << " " <<libname<<" not found");
+ <<"] :"<< std::endl << " Error loading " <<libname);
// look how to get the error message on win
//<<dlerror());
//===================================================================
+ //===================================================================
+ void Factory::CloseAllPackages()
+ {
+ bbtkDebugMessageInc("Kernel",7,"Factory::CloseAllPackages()"<<std::endl);
+
+ std::vector< Package::WeakPointer > 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 "<<i->lock()->GetName()
+ <<" still alive"<<std::endl);
+ // InsertPackage(i->lock());
+ }
+ }
+ }
+ while (mPackageMap.size()>0);
+
+ bbtkDebugDecTab("Kernel",7);
+ }
+ //===================================================================
+
//===================================================================
/// \brief Close the package referenced by the iterator
///
void Factory::ClosePackage(PackageMapType::iterator& i)
{
bbtkDebugMessageInc("Kernel",7,"Factory::ClosePackage(\""
- <<i->second.mPackage->GetName()
+ <<i->second->GetName()
<<"\")"<<std::endl);
// Removes this from the set of factories which use the package
- i->second.mPackage->RemoveFactory(this);
-
- // If no more factory which use it
- if (i->second.mPackage->GetFactorySet().empty())
+ i->second->RemoveFactory(GetThisPointer<Factory>());
+ Package::WeakPointer p = i->second;
+ // remove the entry in the map
+ mPackageMap.erase(i);
+ // Release the package if not already destroyed
+ if (p.lock())
{
- // If it is a dynamically loaded package
- if (i->second.mDynamicLibraryHandler)
- {
-
-
- // Loads the Package delete function
-
- std::string delfname(i->second.mPackage->GetName());
- delfname += "DeletePackage";
-#if defined(__GNUC__)
- void *delf = dlsym(i->second.mDynamicLibraryHandler, delfname.c_str());
- if (!delf)
- {
- bbtkError("could not close package \""
- <<i->second.mPackage->GetName()
- <<"\" :"<<dlerror());
- }
-#elif defined(_WIN32)
- void *delf = GetProcAddress(i->second.mDynamicLibraryHandler,
- delfname.c_str());
- if (!delf)
- {
- bbtkError("could not close package \""
- <<i->second.mPackage->GetName()
- <<"\" : "<<delfname
- <<" symbol not found (how did you open it ???");
- //<<"\" :"<<dlerror());
- }
-#endif
-
- // deletes the package
- ((PackageDeleteFunction)delf)();
-
- // closes the dl handler
-#if defined(__GNUC__)
- dlclose(i->second.mDynamicLibraryHandler);
-#elif defined(_WIN32)
-
- FreeLibrary(i->second.mDynamicLibraryHandler);
-#endif
- }
-
- else
- {
- // If it is a manually inserted package : delete it normally
- delete i->second.mPackage;
- }
+ Package::Release(p);
}
-
- // in any cases remove the entry in the map
- mPackageMap.erase(i);
-
bbtkDebugDecTab("Kernel",7);
}
//===================================================================
{
bbtkMessage("Help",1, i->first << std::endl);
if (details) {
- i->second.mPackage->PrintBlackBoxes(false,adaptors);
+ i->second->PrintBlackBoxes(false,adaptors);
}
}
{
bbtkMessage("Help",1, "Package "<<i->first<<" ");
- if (i->second.mPackage->GetVersion().length()>0)
- bbtkMessageCont("Help",1,"v" <<i->second.mPackage->GetVersion());
+ if (i->second->GetVersion().length()>0)
+ bbtkMessageCont("Help",1,"v" <<i->second->GetVersion());
- if (i->second.mPackage->GetAuthor().length()>0)
- bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetAuthor());
+ if (i->second->GetAuthor().length()>0)
+ bbtkMessageCont("Help",1,"- "<<i->second->GetAuthor());
- if (i->second.mPackage->GetCategory().length()>0)
- bbtkMessageCont("Help",1,"- "<<i->second.mPackage->GetCategory());
+ if (i->second->GetCategory().length()>0)
+ bbtkMessageCont("Help",1,"- "<<i->second->GetCategory());
bbtkMessageCont("Help",1,std::endl);
bbtkIncTab("Help",1);
- bbtkMessage("Help",1,i->second.mPackage->GetDescription()<<std::endl);
- if (i->second.mPackage->GetNumberOfBlackBoxes()>0)
+ bbtkMessage("Help",1,i->second->GetDescription()<<std::endl);
+ if (i->second->GetNumberOfBlackBoxes()>0)
{
bbtkMessage("Help",1, "Black boxes : "<<std::endl);
- i->second.mPackage->PrintBlackBoxes(true,adaptors);
+ i->second->PrintBlackBoxes(true,adaptors);
}
else
{
PackageMapType::const_iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
{
- if (i->second.mPackage->ContainsBlackBox(name))
+ if (i->second->ContainsBlackBox(name))
{
- i->second.mPackage->HelpBlackBox(name,full);
- package = i->second.mPackage->GetName();
+ i->second->HelpBlackBox(name,full);
+ package = i->second->GetName();
found = true;
}
}
//===================================================================
/// Inserts a package in the factory
- void Factory::InsertPackage( Package* p )
+ void Factory::InsertPackage( Package::Pointer p )
{
bbtkDebugMessageInc("Kernel",9,"Factory::InsertPackage(\""<<
p->GetName()<<"\")"<<std::endl);
- p->AddFactory(this);
- PackageInfoType pack;
- pack.mDynamicLibraryHandler = 0;
- pack.mPackage = p;
- mPackageMap[p->GetName()] = pack;
+ p->AddFactory(GetThisPointer<Factory>());
+ mPackageMap[p->GetName()] = p;
bbtkDebugDecTab("Kernel",9);
}
//===================================================================
/// Removes a package from the factory (and deletes it)
- void Factory::RemovePackage( Package* p )
+ void Factory::RemovePackage( Package::Pointer p )
{
bbtkDebugMessageInc("Kernel",9,"Factory::RemovePackage(\""<<
p->GetName()<<"\")"<<std::endl);
PackageMapType::iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
{
- if (i->second.mPackage == p) break;
+ if (i->second == p) break;
};
if (i!=mPackageMap.end())
//===================================================================
/// Creates an instance of a black box of type <type> with name <name>
- BlackBox* Factory::NewBlackBox(const std::string& type,
+ BlackBox::Pointer Factory::NewBlackBox(const std::string& type,
const std::string& name) const
{
bbtkDebugMessageInc("Kernel",7,"Factory::NewBlackBox(\""
<<type<<"\",\""<<name<<"\")"<<std::endl);
- BlackBox* b = 0;
+ BlackBox::Pointer b;
PackageMapType::const_iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
{
- b = i->second.mPackage->NewBlackBox(type,name);
+ b = i->second->NewBlackBox(type,name);
if (b) break;
}
if (!b)
//===================================================================
/// Creates an instance of a black box of type <type> with name <name>
- BlackBox* Factory::NewAdaptor(TypeInfo typein,
- TypeInfo typeout,
- const std::string& name) const
+ BlackBox::Pointer Factory::NewAdaptor(const DataInfo& typein,
+ const DataInfo& typeout,
+ const std::string& name) const
{
- bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor(<"
- <<TypeName(typein)<<">,<"
- <<TypeName(typeout)<<">,\""
+ bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor("
+ <<typein<<","
+ <<typeout<<",\""
<<name<<"\")"<<bbtkendl);
- BlackBox* b = 0;
+ BlackBox::Pointer b;
PackageMapType::const_iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
{
- b = i->second.mPackage->NewAdaptor(typein,typeout,name);
+ b = i->second->NewAdaptor(typein,typeout,name);
if (b) break;
}
if (!b)
{
- bbtkError("no <"
- <<TypeName(typein)<<"> to <"
- <<TypeName(typeout)
- <<"> adaptor available");
+ bbtkError("no "<<typein<<" to "<<typeout
+ <<" adaptor available");
}
bbtkDebugDecTab("Kernel",7);
}
//===================================================================
+
+ //===================================================================
+ /// Creates an instance of a black box of type <type> with name <name>
+ BlackBox::Pointer Factory::NewWidgetAdaptor(const DataInfo& typein,
+ const DataInfo& typeout,
+ const std::string& name) const
+ {
+ bbtkDebugMessageInc("Kernel",8,"Factory::NewWidgetAdaptor(<"
+ <<typein<<">,<"
+ <<typeout<<">,\""
+ <<name<<"\")"<<bbtkendl);
+
+
+ BlackBox::Pointer b;
+ PackageMapType::const_iterator i;
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ b = i->second->NewWidgetAdaptor(typein,
+ typeout,
+ name);
+ if (b) break;
+ }
+ if (!b)
+ {
+ bbtkError("no "<<typein<<" to "<<typeout
+ <<"> widget adaptor available");
+ }
+
+ bbtkDebugDecTab("Kernel",7);
+ return b;
+ }
+ //===================================================================
+
+ //===================================================================
+ /// Creates an instance of a black box of type <type> with name <name>
+ bool Factory::FindAdaptor(const DataInfo& typein,
+ const DataInfo& typeout,
+ std::string& adaptor) const
+ {
+ bbtkDebugMessageInc("Kernel",8,"Factory::FindAdaptor(<"
+ <<typein<<">,<"
+ <<typeout<<">)"<<bbtkendl);
+
+ bool b = false;
+ PackageMapType::const_iterator i;
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ b = i->second->FindAdaptor(typein,
+ typeout,
+ adaptor);
+ if (b) break;
+ }
+ /*
+ if (!b)
+ {
+ bbtkError("no "<<typein<<" to "<<typeout
+ <<"> widget adaptor available");
+ }
+ */
+
+ bbtkDebugDecTab("Kernel",7);
+ return b;
+ }
+ //===================================================================
+
+ //===================================================================
+ /// Creates an instance of a black box of type <type> with name <name>
+ bool Factory::FindWidgetAdaptor(const DataInfo& typein,
+ const DataInfo& typeout,
+ std::string& adaptor) const
+ {
+ bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<"
+ <<typein<<">,<"
+ <<typeout<<">)"<<bbtkendl);
+
+ bool b = false;
+ PackageMapType::const_iterator i;
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ b = i->second->FindWidgetAdaptor(typein,
+ typeout,
+ adaptor);
+ if (b) break;
+ }
+ bbtkDebugDecTab("Kernel",7);
+ return b;
+ }
+ //===================================================================
+
+ //===================================================================
+ /// Creates an instance of a black box of type <type> with name <name>
+ bool Factory::FindWidgetAdaptor2(const DataInfo& typein,
+ const DataInfo& typeout,
+ std::string& widget,
+ std::string& adaptor) const
+ {
+ bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<"
+ <<typein<<">,<"
+ <<typeout<<">)"<<bbtkendl);
+
+ bool b = false;
+ adaptor = widget = "";
+ PackageMapType::const_iterator i;
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ b = i->second->FindWidgetAdaptor(typein,
+ typeout,
+ widget);
+ if (b) break;
+ }
+ if (!b)
+ {
+ // Look for a widget adaptor with good nature out
+ bbtkMessage("Kernel",5,
+ "*** Looking for a two pieces widget adaptor for : "
+ << typein << "->"<<typeout<<std::endl);
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ Package::AdaptorMapType::const_iterator j;
+ for (j=i->second->GetAdaptorMap().begin();
+ j!=i->second->GetAdaptorMap().end();
+ ++j)
+ {
+ if ( ( j->first.mKind ==
+ BlackBoxDescriptor::DEFAULT_GUI) &&
+ //(j->first.mTypeIn == typein) &&
+ (j->first.mTypeOut.GetNature() == typeout.GetNature() )
+ )
+ {
+ widget = j->second.lock()->GetTypeName();
+ bbtkMessage("Kernel",5,
+ "===> Found first part : "<<widget
+ << " "<<j->first.mTypeIn<<"->"
+ <<j->first.mTypeOut<<std::endl);
+ DataInfo ti( j->first.mTypeOut.GetType(), "");
+ DataInfo to( typeout.GetType(), "");
+ b = FindAdaptor( ti, to, adaptor );
+ if (b)
+ {
+ bbtkMessage("Kernel",5,
+ "===> Found second part : "<<adaptor
+ <<std::endl);
+ break;
+ }
+ else
+ {
+ bbtkMessage("Kernel",5,
+ "===> No second part found"<<std::endl);
+ }
+ }
+ }
+ if (b) break;
+ }
+ }
+ bbtkDebugDecTab("Kernel",7);
+ return b;
+ }
+ //===================================================================
+
//===================================================================
/// Creates an instance of a connection
- Connection* Factory::NewConnection(BlackBox* from,
- const std::string& output,
- BlackBox* to,
- const std::string& input) const
+ Connection::Pointer Factory::NewConnection(BlackBox::Pointer from,
+ const std::string& output,
+ BlackBox::Pointer to,
+ const std::string& input) const
{
bbtkDebugMessage("Kernel",7,"Factory::NewConnection(\""
<<from->bbGetName()<<"\",\""<<output<<"\",\""
<<to->bbGetName()<<"\",\""<<input
<<"\")"<<std::endl);
- return new Connection(from,output,to,input,this);
+ return Connection::New(from,output,to,input,
+ GetThisPointer<Factory>());
}
//===================================================================
//===================================================================
- const Package* Factory::GetPackage(const std::string& name) const
+ Package::Pointer Factory::GetPackage(const std::string& name) const
{
bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
<<std::endl);
if ( i != mPackageMap.end() )
{
bbtkDebugDecTab("Kernel",9);
- return i->second.mPackage;
+ return i->second;
}
else
{
}
//===================================================================
+
//===================================================================
- Package* Factory::GetPackage(const std::string& name)
+ void Factory::CheckPackages() const
{
- bbtkDebugMessageInc("Kernel",9,"Factory::GetPackage(\""<<name<<"\")"
- <<std::endl);
-
- PackageMapType::const_iterator i = mPackageMap.find(name);
- if ( i != mPackageMap.end() )
- {
- bbtkDebugDecTab("Kernel",9);
- return i->second.mPackage;
- }
- else
- {
- bbtkDebugDecTab("Kernel",9);
- bbtkError("package \""<<name<<"\" unknown");
- }
-
- bbtkDebugDecTab("Kernel",9);
+ bbtkMessage("debug",1,"****** Checking Factory "<<(void*)this
+ <<std::endl);
+ PackageMapType::const_iterator i;
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ i->second->CheckBoxes();
+ }
+ bbtkMessage("debug",1,"****** Checking Factory "<<(void*)this
+ <<" ... OK"<<std::endl);
}
//===================================================================
PackageMapType::const_iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
{
- if (i->second.mPackage->ContainsBlackBox(name))
+ if (i->second->ContainsBlackBox(name))
{
std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
ff=fopen(filename2.c_str(),"w");
fprintf(ff,"<html><head><title>TMP</title> <script type=\"text/javascript\"> <!--\n");
- fprintf(ff," window.location=\"%s#%s\";\n" , i->second.mPackage->GetDocURL().c_str(),name.c_str() );
+ fprintf(ff," window.location=\"%s#%s\";\n" , i->second->GetDocURL().c_str(),name.c_str() );
fprintf(ff,"//--></script></head><body></body></html>\n");
- //fprintf(ff, "<a href=\"%s#%s\">Link</a>\n", i->second.mPackage->GetDocURL().c_str(),name.c_str() );
+ //fprintf(ff, "<a href=\"%s#%s\">Link</a>\n", i->second->GetDocURL().c_str(),name.c_str() );
fclose(ff);
system( command.c_str() );
found = true;
std::string title;
- typedef std::map<std::string, std::vector<BlackBoxDescriptor*> > IndexType;
+ typedef std::map<std::string,
+ std::vector<BlackBoxDescriptor::Pointer> > IndexType;
IndexType index;
// Builds the index map
PackageMapType::const_iterator i;
for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
{
- Package* pack = i->second.mPackage;
+ Package::Pointer pack = i->second;
if (pack->GetName()=="user") continue;
Package::BlackBoxMapType::const_iterator j;
for (j = pack->GetBlackBoxMap().begin();
}
else
{
- std::vector<BlackBoxDescriptor*> v;
+ std::vector<BlackBoxDescriptor::Pointer> v;
v.push_back(j->second);
index[*k] = v;
}
s << " - \n";
s << "<a name=\"doxygen\"></a>\n";
- s << "<a href=..\\doxygen\\" << ii->first << "/main.html>(Doxygen documentation of the source)</a>\n";
+//EED 26Mars2009
+ std::string bin_path = bbtk::ConfigurationFile::GetInstance().Get_bin_path();
+ s << "<a href=" << bin_path <<"/../share/bbtk/doc/doxygen/" << ii->first << "/main.html>(Doxygen documentation of the source)</a>\n";
}
else
{
s << "<p><TABLE cellspacing=0 cellpadding=3>\n";
- std::vector<BlackBoxDescriptor*>::iterator di;
+ std::vector<BlackBoxDescriptor::Pointer>::iterator di;
for (di=ii->second.begin();di!=ii->second.end();++di)
{
std::string pack = (*di)->GetPackage()->GetName();
ptm = gmtime ( &rawtime );
s << "<p><hr>\n";
- s << "Automatically generated by <b>bbi</b> on "
+ s << "Automatically generated by <b>bbtk</b> on "
<< ptm->tm_mday << "/" << ptm->tm_mon << "/" << ptm->tm_year+1900
<< " - " << ptm->tm_hour << ":" << ptm->tm_min << " GMT\n";
s << "</body></html>\n";
bbtkDebugDecTab("Kernel",9);
}
+ //==========================================================================
+ std::string Factory::GetObjectName() const
+ {
+ return std::string("Factory");
+ }
+ //==========================================================================
+
+ //==========================================================================
+ std::string Factory::GetObjectInfo() const
+ {
+ std::stringstream i;
+ return i.str();
+ }
+ //==========================================================================
+
+ //==========================================================================
+size_t Factory::GetObjectSize() const
+{
+ size_t s = Superclass::GetObjectSize();
+ s += Factory::GetObjectInternalSize();
+ return s;
+ }
+ //==========================================================================
+ //==========================================================================
+size_t Factory::GetObjectInternalSize() const
+{
+ size_t s = sizeof(Factory);
+ return s;
+ }
+ //==========================================================================
+ //==========================================================================
+ size_t Factory::GetObjectRecursiveSize() const
+ {
+ size_t s = Superclass::GetObjectRecursiveSize();
+ s += Factory::GetObjectInternalSize();
+
+ PackageMapType::const_iterator i;
+ for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+ {
+ s += i->second->GetObjectRecursiveSize();
+ }
+ return s;
+ }
+ //==========================================================================
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff