Program: bbtk
Module: $RCSfile: bbtkComplexBlackBox.cxx,v $
Language: C++
-Date: $Date: 2008/04/22 06:59:31 $
-Version: $Revision: 1.13 $
+Date: $Date: 2008/04/24 11:49:59 $
+Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
<<from.bbGetName()<<"\",\""
<<name<<"\")"<<std::endl);
bbtkDebugMessage("object",4," * Cloning Black Boxes"<<std::endl);
+
+ // We have to make the shared_ptr on this because it is used
+ // in bbUnsafeAddBlackBox !
+ MakeBlackBoxPointer(this,true);
+
BlackBoxMapType::const_iterator i;
for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i )
{
bbtkDebugMessageInc("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);
" -> Releasing boxes"<<std::endl);
mBlackBoxMap.clear();
- /*
// Clear();
this->bbDesallocateConnectors();
- if (mLockedDescriptor)
- {
- bbtkMessage("object",3," --> Releasing descriptor"<<std::endl);
- mLockedDescriptor.reset();
- if (!mDescriptor.expired()) BlackBoxDescriptor::Release(mDescriptor);
- }
- */
+
bbtkDebugMessage("object",3,
"<== ComplexBlackBox::~ComplexBlackBox() ["
<<bbGetName()<<"]"<<std::endl);
"ComplexBlackBox::bbAllocateConnectors() ["
<<bbGetFullName()<<"]"
<<std::endl);
- /*
+
// Input connectors
const BlackBoxDescriptor::InputDescriptorMapType& imap
= bbGetDescriptor()->GetInputDescriptorMap();
->bbGetInputConnectorMap()[ d->GetInput() ];
bbGetInputConnectorMap()[i->second->GetName()] = c;
-//new BlackBoxInputConnector();
}
// Output connectors
->bbGetOutputConnectorMap()[ d->GetOutput() ];
bbGetOutputConnectorMap()[o->second->GetName()] = c;
- //new BlackBoxOutputConnector();
}
-
-*/
-
+
bbtkDebugDecTab("Kernel",8);
}
//=========================================================================
// but by the internal boxes. Hence **DO NOT** desallocate !
// just clear the maps to avoid that
// BlackBox::bbDesallocateConnectors delete the connectors
-
- /*
- bbGetInputConnectorMap().clear();
+ bbGetInputConnectorMap().clear();
bbGetOutputConnectorMap().clear();
- */
+
bbtkDebugDecTab("Kernel",8);
}
/// Executes the box so that its outputs are up-to-date on exit
void ComplexBlackBox::bbExecute(bool force)
{
- bbtkDebugMessageInc("Process",1,
- "ComplexBlackBox::bbExecute() ["
+ bbtkDebugMessageInc("process",2,
+ "=> ComplexBlackBox::bbExecute() ["
<<bbGetFullName()<<"]"<<std::endl);
i!=mExecutionList.end();
++i)
{
- bbtkDebugMessage("Process",2," -> Executing '"<<*i<<"'"<<std::endl);
+ bbtkDebugMessage("process",3," -> Executing '"<<*i<<"'"<<std::endl);
mBlackBoxMap[*i]->bbExecute(force);
}
}
Wx::EndBusyCursor();
-
- bbtkDebugDecTab("Process",1);
}
//==================================================================
//==================================================================
void ComplexBlackBox::bbSetModifiedStatus(BlackBoxInputConnector* c)
{
- bbtkDebugMessage("Process",3,
- "ComplexBlackBox::bbSetModifiedStatus("
+ bbtkDebugMessage("modified",1,
+ "==> ComplexBlackBox::bbSetModifiedStatus("
<<c<<") ["<<bbGetFullName()<<"]"<<std::endl);
c->GetBlackBox()->bbSetModifiedStatus(c);
- bbtkDebugMessage("Process",3,
- "EO ComplexBlackBox::bbSetModifiedStatus("
+ /*
+ bbtkDebugMessage("modified",1,
+ "<== ComplexBlackBox::bbSetModifiedStatus("
<<c<<") ["<<bbGetFullName()<<"]"<<std::endl);
+ */
}
//==================================================================
//==================================================================
IOStatus ComplexBlackBox::bbBackwardUpdate(Connection::Pointer caller)
{
- bbtkDebugMessageInc("Process",1,
- "ComplexBlackBox::bbBackwardUpdate("
+ bbtkDebugMessageInc("process",3,
+ "==> ComplexBlackBox::bbBackwardUpdate("
<<(caller?caller->GetFullName():"0")<<") ["
<<bbGetFullName()<<"]"<<std::endl);
// bbtkInternalError("ComplexBlackBox::bbBackwardUpdate should never be called !");
bbtkInternalError("ComplexBlackBox::bbBackwardUpdate called with caller=0");
}
+ /*
std::cout << "CBB BUP : "<<caller->GetBlackBoxFrom()->bbGetFullName()
<<"."<<caller->GetBlackBoxFromOutput()<<"----"
<<caller->GetOriginalBlackBoxFrom()->bbGetFullName()
<<"."<<caller->GetOriginalBlackBoxFromOutput()<<std::endl;
-
+ */
// Get the internal box
BlackBox::Pointer b = bbUnsafeGetBlackBox ( d->GetTarget() );
// Calls BackwardUpdate on it
- bbtkDebugMessageInc("Process",2,"Internal box connected to output : "<<d->GetTarget()<<std::endl);
+ bbtkDebugMessageInc("process",4,"Internal box connected to output : "<<d->GetTarget()<<std::endl);
// Because internal box can also be a complex box we have to
// temporarily change the connection BlackBoxFromOutput to the
// mapped one
// ??? STATUS OF CBBs ???
// ??? Here it is only the final status of the boxes connected to the output
if (s1==MODIFIED) s=MODIFIED;
- bbtkDebugDecTab("Process",2);
}
else
{
bbtkError("Connection '"<<caller->GetFullName()<<"' does not point to a valid output of the complex box !");
}
- bbtkDebugDecTab("Process",1);
return s;
//=========================================================================
/// Connects the input <name> to the connection c
- void ComplexBlackBox::bbConnectInput( const std::string& name, Connection::Pointer c)
+ void ComplexBlackBox::bbConnectInput( const std::string& name, Connection* c)
{
bbtkDebugMessage("connection",2,
"==> ComplexBlackBox::bbConnectInput(\""
//=========================================================================
/// Connects the output <name> to the connection c
- void ComplexBlackBox::bbConnectOutput( const std::string& name, Connection::Pointer c)
+ void ComplexBlackBox::bbConnectOutput( const std::string& name, Connection* c)
{
bbtkDebugMessage("connection",2,
"==> ComplexBlackBox::bbConnectOutput(\""
{
if (ii->second)
{
- Connection::Pointer con = ii->second->GetConnection();
+ Connection* con = ii->second->GetConnection();
if (con!=NULL){
- BlackBox::Pointer a=con->GetBlackBoxFrom();
- BlackBox::Pointer b=con->GetBlackBoxTo();
+ BlackBox::Pointer a=con->GetOriginalBlackBoxFrom();
+ BlackBox::Pointer b=con->GetOriginalBlackBoxTo();
fprintf(ff," ");
a->bbWriteDotInputOutputName(ff,false,detail,level);
if (detail==1)
{
- fprintf(ff,":%s",con->GetBlackBoxFromOutput().c_str());
+ fprintf(ff,":%s",con->GetOriginalBlackBoxFromOutput().c_str());
}
fprintf(ff,"->");
b->bbWriteDotInputOutputName(ff,true,detail,level);
if (detail==1)
{
- fprintf(ff,":%s",con->GetBlackBoxToInput().c_str());
+ fprintf(ff,":%s",con->GetOriginalBlackBoxToInput().c_str());
}
fprintf(ff,"%s\n",";");
} // if con
//=======================================================================
void ComplexBlackBox::Check(bool recursive)
{
- bbtkMessage("Debug",1,"**** Checking Complex Black Box "<<(void*)this
+ bbtkMessage("debug",1,"**** Checking Complex Black Box "<<(void*)this
<<" ["<<bbGetFullName()<<"]"<<std::endl);
BlackBoxMapType::const_iterator i;
for ( j = mConnectionList.begin();
j != mConnectionList.end(); ++j )
{
- //(*j)->Check();
+ (*j)->Check();
}
- bbtkMessage("Debug",1,"**** Checking Complex Black Box "<<(void*)this
+ bbtkMessage("debug",1,"**** Checking Complex Black Box "<<(void*)this
<<" ["<<bbGetFullName()<<"] ... OK"<<std::endl);
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff