-/*=========================================================================
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkComplexBlackBox.cxx,v $
Language: C++
- Date: $Date: 2008/12/11 09:50:35 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2012/11/16 08:49:01 $
+ Version: $Revision: 1.33 $
=========================================================================*/
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */
/**
*/
#include "bbtkComplexBlackBox.h"
#include "bbtkWx.h"
-#include "bbtkBlackBoxDescriptor.h"
-#include "bbtkFactory.h"
+//#include "bbtkBlackBoxDescriptor.h"
+//#include "bbtkFactory.h"
#include "bbtkConfigurationFile.h"
namespace bbtk
ComplexBlackBox::Pointer ComplexBlackBox::New(const std::string& name,
ComplexBlackBoxDescriptor::Pointer desc)
{
- bbtkDebugMessage("object",1,"##> ComplexBlackBox::New('"<<name<<"','"<<
- desc->GetTypeName()<<"')" <<bbtkendl);
- ComplexBlackBox::Pointer p =
- MakeBlackBoxPointer(new ComplexBlackBox(name,desc));
- bbtkDebugMessage("object",2,"<## ComplexBlackBox::New('"<<name<<"','"<<
- desc->GetTypeName()<<"')" <<bbtkendl);
+ bbtkDebugMessage("object",1,"##> ComplexBlackBox::New('"<<name<<"','"<< desc->GetTypeName()<<"')" <<bbtkendl);
+ ComplexBlackBox::Pointer p = MakeBlackBoxPointer(new ComplexBlackBox(name,desc));
+ bbtkDebugMessage("object",2,"<## ComplexBlackBox::New('"<<name<<"','"<< desc->GetTypeName()<<"')" <<bbtkendl);
return p;
}
//==========================================================================
mLockedDescriptor(desc),
mDescriptor(desc)
{
- bbtkDebugMessage("object",3,
- "##> ComplexBlackBox::ComplexBlackBox(\""
+ bbtkBlackBoxDebugMessage("object",3,
+ "##> ComplexBlackBox(\""
<<name<<"\")"<<std::endl);
bbAllocateConnectors();
- bbtkDebugMessage("object",3,
- "<## ComplexBlackBox::ComplexBlackBox(\""
+ bbtkBlackBoxDebugMessage("object",3,
+ "<## ComplexBlackBox(\""
<<name<<"\")"<<std::endl);
}
//=======================================================================
mDescriptor(from.mDescriptor),
mExecutionList(from.mExecutionList)
{
- bbtkDebugMessage("object",3,
- "##> ComplexBlackBox::ComplexBlackBox(\""
+ bbtkBlackBoxDebugMessage("object",3,
+ "##> ComplexBlackBox(\""
<<from.bbGetName()<<"\",\""
<<name<<"\")"<<std::endl);
- bbtkDebugMessage("object",4," * Cloning Black Boxes"<<std::endl);
+ bbtkBlackBoxDebugMessage("object",4," * Cloning Black Boxes"<<std::endl);
// We have to make the shared_ptr on this because it is used
// in bbUnsafeAddBlackBox !
BlackBoxMapType::const_iterator i;
for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i )
{
- bbtkDebugMessageInc("object",5," * Cloning \""<<i->first<<"\""<<std::endl);
+ bbtkBlackBoxDebugMessage("object",5," * Cloning \""<<i->first<<"\""<<std::endl);
BlackBox::Pointer B = i->second->bbClone(i->second->bbGetName());
bbUnsafeAddBlackBox(B);
}
- bbtkDebugMessage("object",4," * Cloning Connections"<<std::endl);
+ bbtkBlackBoxDebugMessage("object",4," * Cloning Connections"<<std::endl);
ConnectionListType::const_iterator j;
for ( j = from.mConnectionList.begin(); j != from.mConnectionList.end(); ++j )
{
- bbtkDebugMessage("object",5," * Cloning \""<<
+ bbtkBlackBoxDebugMessage("object",5," * Cloning \""<<
(*j)->GetFullName()<<"\""<<std::endl);
BlackBox::Pointer bbfrom = bbGetBlackBox( (*j)->GetOriginalBlackBoxFrom()->bbGetName() );
}
bbAllocateConnectors();
- bbtkDebugMessage("object",3,
- "<## ComplexBlackBox::ComplexBlackBox(\""
+ bbtkBlackBoxDebugMessage("object",3,
+ "<## ComplexBlackBox(\""
<<from.bbGetName()<<"\",\""
<<name<<"\")"<<std::endl);
}
/// Destructor
ComplexBlackBox::~ComplexBlackBox()
{
- bbtkDebugMessage("object",3,
- "==> ComplexBlackBox::~ComplexBlackBox() ["
- <<bbGetName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("object",3,
+ "==> ~ComplexBlackBox()"
+ <<std::endl);
+
+ Clear();
+ this->bbDesallocateConnectors();
+
+ bbtkBlackBoxDebugMessage("object",3,
+ "<== ~ComplexBlackBox()"
+ <<std::endl);
+ }
+ //=======================================================================
+
- bbtkDebugMessage("object",4,
+ //=======================================================================
+ /// Clear
+ void ComplexBlackBox::Clear()
+ {
+ bbtkBlackBoxDebugMessage("object",3,
+ "==> ComplexBlackBox::Clear()"
+ <<std::endl);
+
+ bbtkBlackBoxDebugMessage("object",4,
" -> Releasing connections"<<std::endl);
mConnectionList.clear();
- bbtkDebugMessage("object",4,
+ bbtkBlackBoxDebugMessage("object",4,
" -> Releasing boxes"<<std::endl);
mBlackBoxMap.clear();
- // Clear();
- this->bbDesallocateConnectors();
-
- bbtkDebugMessage("object",3,
- "<== ComplexBlackBox::~ComplexBlackBox() ["
- <<bbGetName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("object",3,
+ "<== ComplexBlackBox::Clear()"
+ <<std::endl);
}
//=======================================================================
-
//=========================================================================
/// Allocates the i/o connectors of the black box
void ComplexBlackBox::bbAllocateConnectors()
{
- bbtkDebugMessageInc("Kernel",8,
- "ComplexBlackBox::bbAllocateConnectors() ["
- <<bbGetFullName()<<"]"
+ bbtkBlackBoxDebugMessage("kernel",8,
+ "==> ComplexBlackBox::bbAllocateConnectors()"
<<std::endl);
// Input connectors
BlackBoxDescriptor::InputDescriptorMapType::const_iterator i;
for ( i = imap.begin(); i != imap.end(); ++i )
{
- bbtkDebugMessage("Kernel",8,"* Allocate \""<<i->first<<"\""<<std::endl);
+ bbtkBlackBoxDebugMessage("kernel",8,"* Allocate \""<<i->first<<"\""<<std::endl);
// Redirect the connector to the internal box connector
// Cast the BBInputDescriptor into a ComplexBBInputDescriptor
ComplexBlackBoxInputDescriptor* d =
BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o;
for ( o = omap.begin(); o != omap.end(); ++o )
{
- bbtkDebugMessage("Kernel",8,"* Allocate \""<<o->first<<"\""<<std::endl);
+ bbtkBlackBoxDebugMessage("kernel",8,"* Allocate \""<<o->first<<"\""<<std::endl);
// Redirect the connector to the internal box connector
// Cast the BBOutputDescriptor into a ComplexBBOutputDescriptor
ComplexBlackBoxOutputDescriptor* d =
bbGetOutputConnectorMap()[o->second->GetName()] = c;
}
-
- bbtkDebugDecTab("Kernel",8);
- }
+ bbtkBlackBoxDebugMessage("kernel",8,
+ "<== ComplexBlackBox::bbAllocateConnectors()"
+ <<std::endl);
+ }
//=========================================================================
/// Desallocates the i/o connectors of the black box
void ComplexBlackBox::bbDesallocateConnectors()
{
- bbtkDebugMessageInc("Kernel",8,
- "ComplexBlackBox::DesallocateConnectors()"
+ bbtkBlackBoxDebugMessage("kernel",8,
+ "==> ComplexBlackBox::DesallocateConnectors()"
<<std::endl);
// The connectors have not been allocated by the complex box
// BlackBox::bbDesallocateConnectors delete the connectors
bbGetInputConnectorMap().clear();
bbGetOutputConnectorMap().clear();
-
- bbtkDebugDecTab("Kernel",8);
+
+ bbtkBlackBoxDebugMessage("kernel",8,
+ "<== ComplexBlackBox::DesallocateConnectors()"
+ <<std::endl);
+
}
//=========================================================================
//=======================================================================
BlackBox::Pointer ComplexBlackBox::bbClone(const std::string& name)
{
- bbtkDebugMessageInc("Kernel",9,
- "ComplexBlackBox::bbClone(\""<<name<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("kernel",9,
+ "==> ComplexBlackBox::bbClone(\""<<name<<"\")"
+ <<std::endl);
ComplexBlackBox* CBB = new ComplexBlackBox(*this,name);
- return MakeBlackBoxPointer(CBB);
+ bbtkBlackBoxDebugMessage("kernel",9,
+ "<== ComplexBlackBox::bbClone(\""<<name<<"\")"
+ <<std::endl);
+ return MakeBlackBoxPointer(CBB);
}
//=======================================================================
/// Executes the box so that its outputs are up-to-date on exit
void ComplexBlackBox::bbExecute(bool force)
{
- bbtkDebugMessageInc("process",2,
- "=> ComplexBlackBox::bbExecute() ["
- <<bbGetFullName()<<"]"<<std::endl);
-
-
+ bbtkBlackBoxDebugMessage("process",2,
+ "**> ComplexBlackBox::bbExecute()"
+ <<std::endl);
+
+
Wx::BusyCursor wait;
if (mExecutionList.size() != 0)
i!=mExecutionList.end();
++i)
{
- bbtkDebugMessage("process",3," -> Executing '"<<*i<<"'"<<std::endl);
+ bbtkBlackBoxDebugMessage("process",3," -> Executing '"<<*i<<"'"<<std::endl);
mBlackBoxMap[*i]->bbExecute(force);
}
}
i->second->bbExecute(force);
}
}
-
+ bbtkBlackBoxDebugMessage("process",2,
+ "<** ComplexBlackBox::bbExecute()"
+ <<std::endl);
+
}
//==================================================================
//==================================================================
void ComplexBlackBox::bbAddToExecutionList( const std::string& name )
{
- bbtkDebugMessageInc("Kernel",9,
+ bbtkBlackBoxDebugMessage("kernel",9,
"ComplexBlackBox::bbAddToExecutionList(\""
- <<name<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ <<name<<"\")"
+ <<std::endl);
mExecutionList.push_back( name );
- bbtkDebugDecTab("Kernel",9);
}
//==================================================================
//==================================================================
Data ComplexBlackBox::bbGetOutput( const std::string &name )
{
- bbtkDebugMessageInc("Data",7,
- "ComplexBlackBox::bbGetOutput(\""<<name<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("data",7,
+ "ComplexBlackBox::bbGetOutput(\""<<name<<"\")"
+ <<std::endl);
ComplexBlackBoxOutputDescriptor* d =
(ComplexBlackBoxOutputDescriptor*)
Data p = bbGetBlackBox(d->GetTarget())->bbGetOutput(d->GetOutput());
-
- bbtkDebugDecTab("Data",7);
return p;
}
//==================================================================
/// Gets the input Data of a given name
Data ComplexBlackBox::bbGetInput( const std::string &name )
{
- bbtkDebugMessageInc("Data",7,
- "ComplexBlackBox::bbGetInput(\""<<name<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("data",7,
+ "ComplexBlackBox::bbGetInput(\""<<name<<"\")"
+ <<std::endl);
ComplexBlackBoxInputDescriptor* d =
(ComplexBlackBoxInputDescriptor*)
Data p = bbGetBlackBox(d->GetTarget())->bbGetInput(d->GetInput());
- bbtkDebugDecTab("Data",7);
return p;
}
//==================================================================
/// Sets the data of the output called <name>
void ComplexBlackBox::bbSetOutput( const std::string &name, Data data)
{
- bbtkDebugMessageInc("Data",7,
- "ComplexBlackBox::bbSetOutput(\""<<name<<"\",data) ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("data",7,
+ "ComplexBlackBox::bbSetOutput(\""<<name<<"\",data)"
+ <<std::endl);
ComplexBlackBoxOutputDescriptor* d =
(ComplexBlackBoxOutputDescriptor*)
bbGetBlackBox(d->GetTarget())->bbSetOutput(d->GetOutput(),data);
- bbtkDebugDecTab("Data",7);
}
//==================================================================
void ComplexBlackBox::bbSetInput( const std::string &name, Data data,
bool setModified)
{
- bbtkDebugMessageInc("Data",7,
- "ComplexBlackBox::bbSetInput(\""<<name<<"\",data) ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("data",7,
+ "ComplexBlackBox::bbSetInput(\""<<name<<"\",data)"
+ <<std::endl);
ComplexBlackBoxInputDescriptor* d = (ComplexBlackBoxInputDescriptor*)
bbGetDescriptor()->GetInputDescriptor(name);
bbGetBlackBox(d->GetTarget())->bbSetInput(d->GetInput(),data,setModified);
- bbtkDebugDecTab("Data",7);
}
//==================================================================
void* data,
bool setModified)
{
- bbtkDebugMessageInc("Data",7,
+ bbtkBlackBoxDebugMessage("data",7,
"ComplexBlackBox::bbBruteForceSetInputPointer('"
- <<name<<"',"<<data<<") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ <<name<<"',"<<data<<")"
+ <<std::endl);
ComplexBlackBoxInputDescriptor* d = (ComplexBlackBoxInputDescriptor*)
bbGetDescriptor()->GetInputDescriptor(name);
data,
setModified);
- bbtkDebugDecTab("Data",7);
}
//==================================================================
/// Connects the input <name> to the connection c
void ComplexBlackBox::bbConnectInput( const std::string& name, Connection* c)
{
- bbtkDebugMessage("connection",2,
+ bbtkBlackBoxDebugMessage("connection",2,
"==> ComplexBlackBox::bbConnectInput(\""
- <<name<<"\","<<c->GetFullName()<<") ["
- <<bbGetFullName()<<"]"
+ <<name<<"\","<<c->GetFullName()<<")"
<<std::endl);
ComplexBlackBoxInputDescriptor* d = (ComplexBlackBoxInputDescriptor*)
BlackBox::Pointer t = bbGetBlackBox(d->GetTarget());
- bbtkDebugMessage("connection",2," - Target = "<<d->GetTarget()<<" = "<<t->bbGetFullName()<<std::endl);
+ bbtkBlackBoxDebugMessage("connection",2," - Target = "<<d->GetTarget()<<" = "<<t->bbGetFullName()<<std::endl);
c->SetBlackBoxTo(t);
c->SetBlackBoxToInput(d->GetInput());
- bbtkDebugMessage("connection",2," - New conn = "<<c->GetFullName()<<std::endl);
+ bbtkBlackBoxDebugMessage("connection",2," - New conn = "<<c->GetFullName()<<std::endl);
t->bbConnectInput(d->GetInput(),c);
- bbtkDebugMessage("connection",2,
+ bbtkBlackBoxDebugMessage("connection",2,
"<== ComplexBlackBox::bbConnectInput(\""
- <<name<<"\","<<c->GetFullName()<<") ["
- <<bbGetFullName()<<"]"
+ <<name<<"\","<<c->GetFullName()<<")"
<<std::endl);
}
//=========================================================================
/// Connects the output <name> to the connection c
void ComplexBlackBox::bbConnectOutput( const std::string& name, Connection* c)
{
- bbtkDebugMessage("connection",2,
+ bbtkBlackBoxDebugMessage("connection",2,
"==> ComplexBlackBox::bbConnectOutput(\""
- <<name<<"\","<<c->GetFullName()<<") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ <<name<<"\","<<c->GetFullName()<<")"
+ <<std::endl);
ComplexBlackBoxOutputDescriptor* d = (ComplexBlackBoxOutputDescriptor*)
bbGetDescriptor()->GetOutputDescriptor(name);
BlackBox::Pointer t = bbGetBlackBox(d->GetTarget());
- bbtkDebugMessage("connection",2," - Target = "<<d->GetTarget()<<" = "<<t->bbGetFullName()<<std::endl);
+ bbtkBlackBoxDebugMessage("connection",2," - Target = "<<d->GetTarget()<<" = "<<t->bbGetFullName()<<std::endl);
c->SetBlackBoxFrom(t);
c->SetBlackBoxFromOutput(d->GetOutput());
- bbtkDebugMessage("connection",2," - New conn = "<<c->GetFullName()<<std::endl);
+ bbtkBlackBoxDebugMessage("connection",2," - New conn = "<<c->GetFullName()<<std::endl);
t->bbConnectOutput(d->GetOutput(),c);
- bbtkDebugMessage("connection",2,
+ bbtkBlackBoxDebugMessage("connection",2,
"<== ComplexBlackBox::bbConnectOutput(\""
- <<name<<"\","<<c->GetFullName()<<") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ <<name<<"\","<<c->GetFullName()<<")"
+ <<std::endl);
}
//=========================================================================
/// Adds the black box to the complex box
void ComplexBlackBox::bbAddBlackBox( BlackBox::Pointer b)
{
- bbtkDebugMessageInc("Kernel",7,
- "ComplexBlackBox::AddBlackBox(\""<<b->bbGetName()
- <<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("kernel",7,
+ "ComplexBlackBox::AddBlackBox(\""<<b->bbGetName()
+ <<"\")"
+ <<std::endl);
if ( bbUnsafeGetBlackBox(b->bbGetName()) )
{
b->bbSetParent(GetThisPointer<ComplexBlackBox>());
mBlackBoxMap[b->bbGetName()] = b;
- bbtkDebugDecTab("Kernel",7);
}
//==================================================================
/// Adds the black box to the complex box (unsafe)
void ComplexBlackBox::bbUnsafeAddBlackBox( BlackBox::Pointer b)
{
- bbtkDebugMessageInc("Kernel",7,
+ bbtkBlackBoxDebugMessage("kernel",7,
"ComplexBlackBox::UnsafeAddBlackBox(\""<<b->bbGetName()
- <<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ <<"\")"
+ <<std::endl);
b->bbSetParent(GetThisPointer<ComplexBlackBox>());
mBlackBoxMap[b->bbGetName()] = b;
- bbtkDebugDecTab("Kernel",7);
}
//==================================================================
void ComplexBlackBox::bbRemoveBlackBox( const std::string& name,
bool remove_connections )
{
- bbtkDebugMessageInc("Kernel",7,
- "ComplexBlackBox::RemoveBlackBox(\""<<name<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("kernel",7,
+ "ComplexBlackBox::RemoveBlackBox(\""<<name<<"\")"
+ <<std::endl);
BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
if ( i == mBlackBoxMap.end() )
// Unload orphan dl packages
Package::UnLoadReleasedDynamicallyLoadedPackages();
- bbtkDebugDecTab("Kernel",7);
}
//==================================================================
/// Adds the connection to the complex box
void ComplexBlackBox::bbAddConnection( Connection::Pointer c)
{
- bbtkDebugMessageInc("Kernel",7,
- "ComplexBlackBox::AddConnection(\""<<"..."<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
+ bbtkBlackBoxDebugMessage("kernel",7,
+ "ComplexBlackBox::AddConnection(\""<<"..."<<"\")"
+ <<std::endl);
mConnectionList.push_back(c);
- bbtkDebugDecTab("Kernel",7);
}
//==================================================================
// void RemoveConnection( );
/// Returns the black box with name <name>
BlackBox::Pointer ComplexBlackBox::bbGetBlackBox( const std::string& name )
{
- bbtkDebugMessageInc("Kernel",9,
- "ComplexBlackBox::GetBlackBox(\""<<name<<"\") ["
- <<bbGetFullName()<<"]"<<std::endl);
-
+ bbtkBlackBoxDebugMessage("kernel",9,
+ "ComplexBlackBox::GetBlackBox(\""<<name<<"\")"
+ <<std::endl);
BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
if ( i == mBlackBoxMap.end() )
- {
- bbtkError("the black box \""<<name<<"\" does not exist");
- }
-
- bbtkDebugDecTab("Kernel",9);
+ {
+ bbtkError("the black box \""<<name<<"\" does not exist");
+ }
return i->second;
}
//==================================================================
/// if it does not exist but return a null pointer
BlackBox::Pointer ComplexBlackBox::bbUnsafeGetBlackBox( const std::string& name )
{
- bbtkDebugMessageInc("Kernel",9,
- "ComplexBlackBox::UnsafeGetBlackBox(\""<<name<<"\") ["
- <<bbGetFullName()<<"]"
+ bbtkBlackBoxDebugMessage("kernel",9,
+ "ComplexBlackBox::UnsafeGetBlackBox(\""<<name<<"\")"
<<std::endl);
BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
if ( i == mBlackBoxMap.end() )
{
- bbtkDebugDecTab("Kernel",9);
return BlackBox::Pointer();
}
- bbtkDebugDecTab("Kernel",9);
return i->second;
}
//==================================================================
void ComplexBlackBox::bbPrintBlackBoxes()
{
- bbtkDebugMessageInc("Kernel",9,
- "ComplexBlackBox::PrintBlackBoxes() ["
- <<bbGetFullName()<<"]"
+ bbtkBlackBoxDebugMessage("kernel",9,
+ "ComplexBlackBox::PrintBlackBoxes()"
<<std::endl);
BlackBoxMapType::iterator i;
for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i )
{
- bbtkMessage("Help",1,i->second->bbGetFullName()<<std::endl);
+ bbtkMessage("help",1,i->second->bbGetFullName()<<std::endl);
}
- bbtkDebugDecTab("Kernel",9);
}
//==================================================================
const std::string& output_dir,
bool relative_link )
{
-
std::string directory(output_dir);
if (output_dir.length() == 0)
std::string filename_dot2 ("\"" + filename_dot + "\"");
- std::string command1 ("dot -T png -o "
- + filename_png2 + " " + filename_dot2);
- std::string command1a("dot -T cmap -o "
- + filename_cmap2 + " " + filename_dot2);
+#ifdef WIN32
+ std::string currentexecpath("\"\"" + crea::System::GetDllAppPath("bbtk") +"\\dot_embedded\\dot\"");
+ std::string command1 (currentexecpath + " -Tpng -o " + filename_png2 + " " + filename_dot2 + "\"");
+ std::string command1a(currentexecpath + " -T cmap -o " + filename_cmap2 + " " + filename_dot2 + "\"");
+#else
+ #ifdef APPLE
+ std::string command1 ("dot -Tpng:quartz -o " + filename_png2 + " " + filename_dot2 );
+ std::string command1a("dot -T cmap -o " + filename_cmap2 + " " + filename_dot2 );
+ #else
+ std::string command1 ("dot -Tpng:cairo -o " + filename_png2 + " " + filename_dot2 );
+ std::string command1a("dot -T cmap -o " + filename_cmap2 + " " + filename_dot2 );
+ #endif
+#endif
+
+
+
// 1. Generating .dot file
FILE *ff;
fprintf(ff,"}\n");
fclose(ff);
+ std::cout<<"JCP bbtkComplexBlackBox.cxx execute1="<<command1<<std::endl;
// 2. Executing .dot file -> png
system( command1.c_str() );
// 3. Executing .dot file -> cmap
+ std::cout<<"JCP bbtkComplexBlackBox.cxx execute2="<<command1a<<std::endl;
system( command1a.c_str() );
// 4. HTML code insertion
FILE *ff2;
char c;
ff2=fopen(filename_cmap.c_str(),"r");
- while (!feof(ff2))
- {
- c=fgetc(ff2);
- if (c!=-1)
- {
- (s) << c;
- }
- }
+ if (ff2!=NULL){
+ while (!feof(ff2))
+ {
+ c=fgetc(ff2);
+ if (c!=-1)
+ {
+ (s) << c;
+ } // if
+ } // while
+ } // if ff2
(s) << "</map>\n\n";
// End
BlackBoxMapType::const_iterator i;
for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i )
{
- s += i->second->GetObjectRecursiveSize();
+ s += i->second->GetObjectRecursiveSize();
}
ConnectionListType::const_iterator j;
for ( j = mConnectionList.begin();
j != mConnectionList.end(); ++j )
{
- s += (*j)->GetObjectRecursiveSize();
+ s += (*j)->GetObjectRecursiveSize();
}
return s;
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff