-/*=========================================================================
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkBlackBox.cxx,v $
Language: C++
- Date: $Date: 2011/03/03 14:37:57 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2012/11/16 08:49:01 $
+ Version: $Revision: 1.56 $
=========================================================================*/
-/* ---------------------------------------------------------------------
-
-* 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
bbmExecuting(false),
bbmName(name),
bbmBoxProcessMode("Pipeline"),
+ bbLetRecursiveExecuteManualMode(false),
bbmParent()
{
bbmExecuting(false),
bbmName(name),
bbmBoxProcessMode(from.bbmBoxProcessMode),
+ bbLetRecursiveExecuteManualMode(false),
bbmParent()
{
(p == "F") || (p == "f") ||
(p == "Flash") || (p == "flash") ) return Flash;
*/
- bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
+
+ if ( (p == "3") ||
+ (p == "M") || (p == "m") ||
+ (p == "Manual") || (p == "manual") ) return bbManual;
+
+ bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
<<"' unknown. Possible values : "
<<"'0'/'P'/'p'/'Pipeline'/'pipeline' | "
<<"'1'/'A'/'a'/'Always'/'always' | "
<<"'2'/'R'/'r'/'Reactive'/'reactive'"
// <<"'3'/'F'/'f'/'Flash'/'flash'"
- <<std::endl);
+ <<"'3'/'M'/'m'/'Manual'/'manual'"
+ <<std::endl);
}
//=========================================================================
//=========================================================================
-
+ //=========================================================================
+ bool BlackBox::bbBoxProcessModeIsManual() const
+ {
+ return (bbGetBoxProcessModeValue() == bbManual);
+ }
+ //=========================================================================
+
//=========================================================================
void BlackBox::bbAddOutputObserver(const std::string& output,
}
*/
+
OutputConnectorMapType::const_iterator o;
for ( o = bbGetOutputConnectorMap().begin();
o != bbGetOutputConnectorMap().end(); ++o )
- {
- if (o->second->GetStatus()==UPTODATE)
+ {
+
+
+ if (o->first=="BoxChange")
+ {
+ o->second->SetStatus(UPTODATE);
+ }
+
+
+
+//EED 24/08/2015
+// EED CASPITAS 2
+ if (o->second->GetStatus()==UPTODATE)
+// if ((o->second->GetStatus()==UPTODATE) || (o->second->GetStatus()==OUTOFDATE))
+// if ((o->second->GetStatus()==UPTODATE) || (o->second->GetStatus()==MODIFIED))
{
o->second->SetStatus(OUTOFDATE);
o->second->SignalChange(GetThisPointer<BlackBox>(),o->first);
- }
- }
+ } // if
+ } // for
- if ( ( bbBoxProcessModeIsReactive() ||
- (c==bbGetInputConnectorMap().find("BoxExecute")->second))
- && (bbCanReact() ) )
+
+ if ( ( bbBoxProcessModeIsReactive()
+ || (c==bbGetInputConnectorMap().find("BoxExecute")->second))
+ && (bbCanReact() ) )
{
bbtkBlackBoxDebugMessage("change",2,
"-> Execution triggered by Reactive mode or BoxExecute input change"<<std::endl);
bbGlobalAddToExecutionList( GetThisPointer<BlackBox>() );
- }
+ } // if
bbtkBlackBoxDebugMessage("change",5,
"<= BlackBox::bbSetStatusAndPropagate(input)"
<<std::endl);
// {
i->second->SignalChange(GetThisPointer<BlackBox>(),i->first);
// }
- }
+ } // for
if (reaction) bbGlobalProcessExecutionList();
<<std::endl);
}
//=========================================================================
+
+
//=========================================================================
void BlackBox::bbSignalOutputModification(const std::string& output,
bool reaction)
// If force is true then update is triggered even if the box is UPTODATE
// if (force) bbSetModifiedStatus();
+ if ( bbBoxProcessModeIsManual() )
+ {
+ bbLetRecursiveExecuteManualMode = true;
+ }
+
+
// Calls the main recursive execution method
bbRecursiveExecute(Connection::Pointer());
+
+ if ( bbBoxProcessModeIsManual() )
+ {
+ bbLetRecursiveExecuteManualMode = false;
+ }
+
+
bbtkBlackBoxDebugMessage("process",2,
"<= BlackBox::bbExecute()"
<<std::endl);
//=========================================================================
void BlackBox::bbRecursiveExecute( Connection::Pointer caller )
{
+
bbtkBlackBoxDebugMessage("process",3,
"=> BlackBox::bbRecursiveExecute("
<<(caller?caller->GetFullName():"0")<<")"
this->bbCreateWindow();
// Updates its inputs
- IOStatus s = bbUpdateInputs();
-
- if ( (s != UPTODATE) ||
- bbBoxProcessModeIsAlways() )
+
+// IOStatus s;
+ IOStatus s=UPTODATE;
+// IOStatus s=OUTOFDATE;
+// IOStatus s=MODIFIED;
+
+
+ if ( ( bbBoxProcessModeIsManual()==false ) ||
+ ( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==true) ) )
+ {
+ s = bbUpdateInputs();
+ }
+
+ if ( (s != UPTODATE) || bbBoxProcessModeIsAlways() )
{
// Displays the window (WxBlackbox)
// bbShowWindow(caller);
// Actual processing (virtual)
- this->bbProcess();
-
-
- // Update the I/O statuses
- bbComputePostProcessStatus();
+ if ( ( bbBoxProcessModeIsManual()==false ) ||
+ ( (bbBoxProcessModeIsManual()==true)&&(bbLetRecursiveExecuteManualMode==true) )
+ )
+ {
+ this->bbProcess();
+ } // Manual analysis
+
+//EED ups if ((bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==false))
+//EED ups {
+//EED ups bbSignalOutputModification(true);
+//EED ups }
+
+
+ // Update the I/O statuses
+ bbComputePostProcessStatus();
}
else
{
bbSetExecuting(false);
bbGlobalSetSomeBoxExecuting(wasExecuting);
+
return;
}
//=========================================================================
for ( o = bbGetOutputConnectorMap().begin();
o!= bbGetOutputConnectorMap().end(); ++o)
{
- o->second->SetStatus(new_output_status);
+
+//EED if ( ( bbBoxProcessModeIsManual()==false ) ||
+//EED ( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==true) )
+//EED )
+//EED {
+ o->second->SetStatus(new_output_status);
+//EED } else {
+//EED if (( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==false) ) )
+//EED {
+//EED o->second->SetStatus(UPTODATE);
+//EED }
+//EED } // Manual analysis
+
}
bbtkBlackBoxDebugMessage("process",4,
const BlackBoxOutputDescriptor* id = bbGetDescriptor()->GetOutputDescriptor(ii->first);
tempStrTypeName=id->GetTypeName();
SubsBrackets(tempStrTypeName);
- std::string Name(ii->first);
- SubsBrackets(Name);
+ std::string Name(ii->first);
+ SubsBrackets(Name);
labelStr=labelStr+"<"+ii->first.c_str()+"> " + valueStr + Name.c_str() + " ["+tempStrTypeName+"]";
}
labelStr = labelStr+ " } }" ;
if (this->bbGetDescriptor()->GetPackage())
{
- bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
+ bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
this->bbGetDescriptor()->GetPackage()->GetName()
<<"::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
}
else
{
- bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
+ bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
}
/*
if (bbIsUpToDate())
{
- bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
+ bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
<<mMinOutputChangeTime<<"]"<<std::endl);
}
else
{
- bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
+ bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
<<mMinOutputChangeTime<<"]"<<std::endl);
}
*/
unsigned int valuelmax = 0;
// unsigned int connlmax = 0;
for ( i = mInputConnectorMap.begin(); i != mInputConnectorMap.end(); ++i )
- {
- iname.push_back(i->first);
- if (iname.back().size()>namelmax) namelmax = iname.back().size();
- ivalue.push_back(bbGetInputAsString(i->first));
- if (ivalue.back().size()>valuelmax) valuelmax = ivalue.back().size();
- std::string s("");
- Connection* con = i->second->GetConnection();
- if (con!=0){
- s = con->GetOriginalBlackBoxFrom()->bbGetName();
- s += ".";
- s += con->GetOriginalBlackBoxFromOutput();
- } // if con
- iconn.push_back(s);
- istatus.push_back(GetIOStatusString(i->second->GetStatus()));
- }
+ {
+ iname.push_back(i->first);
+ if (iname.back().size()>namelmax) namelmax = iname.back().size();
+ ivalue.push_back(bbGetInputAsString(i->first));
+ if (ivalue.back().size()>valuelmax) valuelmax = ivalue.back().size();
+ std::string s("");
+ Connection* con = i->second->GetConnection();
+ if (con!=0){
+ s = con->GetOriginalBlackBoxFrom()->bbGetName();
+ s += ".";
+ s += con->GetOriginalBlackBoxFromOutput();
+ } // if con
+ iconn.push_back(s);
+ istatus.push_back(GetIOStatusString(i->second->GetStatus()));
+ }
OutputConnectorMapType::iterator o;
std::vector<std::string> oname;
std::vector<std::string> ovalue;
std::vector<std::vector<std::string> > oconn;
std::vector<std::string> ostatus;
for ( o = mOutputConnectorMap.begin(); o != mOutputConnectorMap.end(); ++o )
- {
- oname.push_back(o->first);
- if (oname.back().size()>namelmax) namelmax = oname.back().size();
- ovalue.push_back(bbGetOutputAsString(o->first));
- if (ovalue.back().size()>valuelmax) valuelmax = ovalue.back().size();
- std::vector<std::string> ss;
- const std::vector<Connection*>& con
- = o->second->GetConnectionVector();
- std::vector<Connection*>::const_iterator c;
- for (c=con.begin();c!=con.end();++c)
- {
- std::string s;
- s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
- s += ".";
- s += (*c)->GetOriginalBlackBoxToInput();
- ss.push_back(s);
- } // if con
- oconn.push_back(ss);
- ostatus.push_back(GetIOStatusString(o->second->GetStatus()));
- }
+ {
+ oname.push_back(o->first);
+ if (oname.back().size()>namelmax)
+ namelmax = oname.back().size();
+ ovalue.push_back(bbGetOutputAsString(o->first));
+ if (ovalue.back().size()>valuelmax)
+ valuelmax = ovalue.back().size();
+ std::vector<std::string> ss;
+ const std::vector<Connection*>& con
+ = o->second->GetConnectionVector();
+ std::vector<Connection*>::const_iterator c;
+ for (c=con.begin();c!=con.end();++c)
+ {
+ std::string s;
+ s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
+ s += ".";
+ s += (*c)->GetOriginalBlackBoxToInput();
+ ss.push_back(s);
+ } // if con
+ oconn.push_back(ss);
+ ostatus.push_back(GetIOStatusString(o->second->GetStatus()));
+ }
if (iname.size())
bbtkBlackBoxMessage("help",1," * Inputs : "<<std::endl);
std::vector<std::string>::iterator i1,i2,i3,i4;
for (i1=iname.begin(),i2=ivalue.begin(),i3=iconn.begin(),i4=istatus.begin();
- i1!=iname.end(),i2!=ivalue.end(),i3!=iconn.end(),i4!=istatus.end();
- ++i1,++i2,++i3,++i4)
- {
- std::string name(*i1);
- name += "'";
- name.append(1+namelmax-name.size(),' ');
- std::string value(*i2);
- value += "'";
- value.append(1+valuelmax-value.size(),' ');
- if (i3->size())
- bbtkBlackBoxMessage("help",1," '"<<name<<" = '"<<value<<" <-- '"
- <<*i3<<"'");
- else
- bbtkBlackBoxMessage("help",1," '"<<name<<" = '"<<value);
- bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
- }
+ i1!=iname.end(),i2!=ivalue.end(),i3!=iconn.end(),i4!=istatus.end();
+ ++i1,++i2,++i3,++i4)
+ {
+ std::string name(*i1);
+ name += "'";
+ name.append(1+namelmax-name.size(),' ');
+ std::string value(*i2);
+ value += "'";
+ value.append(1+valuelmax-value.size(),' ');
+ if (i3->size())
+ bbtkBlackBoxMessage("help",1," '"<<name<<" = '"<<value<<" <-- '" <<*i3<<"'");
+ else
+ bbtkBlackBoxMessage("help",1," '"<<name<<" = '"<<value);
+ bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
+ }
if (oname.size())
- bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
+ bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
else
- bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
+ bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
std::vector<std::vector<std::string> >::iterator i5;
for (i1=oname.begin(),i2=ovalue.begin(),i5=oconn.begin(),i4=ostatus.begin();
- i1!=oname.end(),i2!=ovalue.end(),i5!=oconn.end(),i4!=ostatus.end();
- ++i1,++i2,++i4,++i5)
- {
- std::string name(*i1);
- name += "'";
- name.append(1+namelmax-name.size(),' ');
- std::string value(*i2);
- value += "'";
- value.append(1+valuelmax-value.size(),' ');
- if (!(*i5).size())
- bbtkBlackBoxMessage("help",1," '"<<name<<" = '"<<value);
- else
- {
- std::string pref = " '"+name+" = '"+value;
- for (i3=i5->begin();i3!=i5->end();++i3)
- {
- bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
- pref.replace(0,pref.size(),pref.size(),' ');
- }
- }
- bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
- }
+ i1!=oname.end(),i2!=ovalue.end(),i5!=oconn.end(),i4!=ostatus.end();
+ ++i1,++i2,++i4,++i5)
+ {
+ std::string name(*i1);
+ name += "'";
+ name.append(1+namelmax-name.size(),' ');
+ std::string value(*i2);
+ value += "'";
+ value.append(1+valuelmax-value.size(),' ');
+ if (!(*i5).size())
+ bbtkBlackBoxMessage("help",1," '"<<name<<" = '"<<value);
+ else
+ {
+ std::string pref = " '"+name+" = '"+value;
+ for (i3=i5->begin();i3!=i5->end();++i3)
+ {
+ bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
+ pref.replace(0,pref.size(),pref.size(),' ');
+ }
+ }
+ bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
+ }
}
//=========================================================================
<<std::endl);
bbmgGlobalProcessingExecutionList = false;
+
}
//=========================================================================
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff