X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxOutputConnector.cxx;h=ca794920622ae758b2bc3cda7de70815cfb98962;hb=3dcc408acd2264664ca6431a501378ea64233dd6;hp=8024663d81f4734857e704d718bfea3bdf893b94;hpb=3928b4ad06b5b5fd142f696f58a7828d064e2883;p=bbtk.git diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx index 8024663..ca79492 100644 --- a/kernel/src/bbtkBlackBoxOutputConnector.cxx +++ b/kernel/src/bbtkBlackBoxOutputConnector.cxx @@ -1,33 +1,38 @@ -/*========================================================================= +/* + # --------------------------------------------------------------------- + # + # 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: bbtkBlackBoxOutputConnector.cxx,v $ Language: C++ - Date: $Date: 2008/12/08 12:54:00 $ - Version: $Revision: 1.9 $ + Date: $Date: 2012/11/16 08:49:01 $ + Version: $Revision: 1.14 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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 @@ -42,11 +47,37 @@ namespace bbtk { - //====================================================================== - BlackBoxOutputConnector::BlackBoxOutputConnector() - : mStatus(OUTOFDATE) + //======================================================================== + /// The Pimpl + class BlackBoxOutputConnector::Pimpl { - bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<bbGetName() + <<"] BlackBoxOutputConnector()"<mBox = b; } //====================================================================== @@ -54,8 +85,8 @@ namespace bbtk //====================================================================== BlackBoxOutputConnector::~BlackBoxOutputConnector() { - bbtkDebugMessage("Kernel",9, - "==> BlackBoxOutputConnector::~BlackBoxOutputConnector()" + bbtkDebugMessage("kernel",9, + "[DEAD BOX] ==> ~BlackBoxOutputConnector()" <mConnection.clear(); + PimplDestruct(); + + bbtkDebugMessage("kernel",9, + "[DEAD BOX] <== ~BlackBoxOutputConnector()" <mBox.lock()->bbGetName() + <<"] BlackBoxOutputConnector::SetConnection(" <mConnection.push_back(c); // AddChangeObserver(boost::bind(&Connection::SignalChange,c)); } //====================================================================== @@ -86,116 +121,98 @@ namespace bbtk //====================================================================== void BlackBoxOutputConnector::UnsetConnection(Connection* c) { - bbtkDebugMessageInc("Kernel",9,"BlackBoxOutputConnector::UnsetConnection(" + bbtkDebugMessage("kernel",9,"["<mBox.lock()->bbGetName() + <<"] BlackBoxOutputConnector::UnsetConnection(" <mBox.lock()->bbGetFullName() + <<": BlackBoxOutputConnector::UnsetConnection(" + <Check(); //Connection::WeakPointer w(c); ConnectionVector::iterator i; // = find(mConnection.begin(),mConnection.end(),c); - for (i=mConnection.begin(); - i!=mConnection.end(); + for (i=p->mConnection.begin(); + i!=p->mConnection.end(); ++i) { if (*i==c) break; } - if (i==mConnection.end()) + if (i==p->mConnection.end()) { - bbtkInternalError("BlackBoxOutputConnector::UnsetConnection("<mBox.lock()->bbGetFullName() + <<": BlackBoxOutputConnector::UnsetConnection(" + <mConnection.erase(i); // RemoveChangeObserver(boost::bind(&Connection::SignalChange,c)); - bbtkDebugDecTab("Kernel",9); + } //====================================================================== - - //====================================================================== - void BlackBoxOutputConnector::SignalChange( BlackBox::Pointer box, - const std::string& output ) - { - bbtkDebugMessage("change",2, - "==> BlackBoxOutputConnector::SignalChange(" - <bbGetFullName()<<",'" - <bbGetFullName()<<",'" - <mConnection; } //====================================================================== - /* - void BlackBoxOutputConnector::SetModifiedStatus() - { - bbtkDebugMessage("modified",2, - "==> BlackBoxOutputConnector::SetModifiedStatus() [" - <SetModifiedStatus(); - } - - - } - */ - /* + //====================================================================== - void BlackBoxOutputConnector::SetChangeTime(const ChangeTime& t) + /// Returns the status of the input + IOStatus BlackBoxOutputConnector::GetStatus() const + { + return p->mStatus; + } + //====================================================================== + + //====================================================================== + /// Sets the status of the input + void BlackBoxOutputConnector::SetStatus( IOStatus s ) { - bbtkDebugMessage("change",2, - "==> BlackBoxOutputConnector::SetChangeTime("<mStatus = s; } //====================================================================== - */ - /* - //====================================================================== - void BlackBoxOutputConnector::SetChangeTimeToCurrentTime() + + //====================================================================== + void BlackBoxOutputConnector::SignalChange( BlackBox::Pointer box, + const std::string& output ) { + IOStatus s = OUTOFDATE; //mStatus; + //if (s==UPTODATE) s=MODIFIED; + bbtkDebugMessage("change",2, - "==> BlackBoxOutputConnector::SetChangeTimetoCurrentTime() [" + "["<bbGetName() + <<"] ==> BlackBoxOutputConnector::SignalChange('" + <bbGetName()<<",'" + // <mChangeSignal(box,output,s); bbtkDebugMessage("change",2, - "<==> BlackBoxOutputConnector::SetChangeTimetoCurrentTime() [" + "["<bbGetName() + <<"] <== BlackBoxOutputConnector::SignalChange('" + <mChangeSignal.connect(f); } //======================================================================