X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxOutputConnector.cxx;h=f350f89d49b1839ae77502d4df8295bf7b7905b3;hb=1b7876d34a9cfbb96464c860fb671ccf375e343a;hp=6631657a3c3a76f374545f3061b77aa1c566cc13;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx index 6631657..f350f89 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: 2009/05/28 08:12:05 $ - Version: $Revision: 1.12 $ + 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,14 +47,39 @@ namespace bbtk { + //======================================================================== + /// The Pimpl + class BlackBoxOutputConnector::Pimpl + { + public: + Pimpl() : mStatus(OUTOFDATE) {} + Pimpl(const Pimpl&) {} + /// + BlackBoxWeakPointer mBox; + /// The vector of output connections + ConnectionVector mConnection; + /// The status of the output + IOStatus mStatus; + /// The output changed signal + BlackBox::OutputChangeSignalType mChangeSignal; + + + }; + //======================================================================== + + //======================================================================== + BBTK_IMPL_PIMPL(BlackBoxOutputConnector) + //======================================================================== + + //====================================================================== BlackBoxOutputConnector::BlackBoxOutputConnector(BlackBox::Pointer b) - : mBox(b), - mStatus(OUTOFDATE) { bbtkDebugMessage("kernel",9, "["<bbGetName() <<"] BlackBoxOutputConnector()"<mBox = b; } //====================================================================== @@ -58,8 +88,7 @@ namespace bbtk BlackBoxOutputConnector::~BlackBoxOutputConnector() { bbtkDebugMessage("kernel",9, - "[NULL"//<bbGetName() - <<"] ==> ~BlackBoxOutputConnector()" + "[DEAD BOX] ==> ~BlackBoxOutputConnector()" <mConnection.clear(); + PimplDestruct(); + bbtkDebugMessage("kernel",9, - "[NULL"//<bbGetName() - <<"] <== ~BlackBoxOutputConnector()" + "[DEAD BOX] <== ~BlackBoxOutputConnector()" <bbGetName() + "["<mBox.lock()->bbGetName() <<"] BlackBoxOutputConnector::SetConnection(" <mConnection.push_back(c); // AddChangeObserver(boost::bind(&Connection::SignalChange,c)); } //====================================================================== @@ -93,13 +123,13 @@ namespace bbtk //====================================================================== void BlackBoxOutputConnector::UnsetConnection(Connection* c) { - bbtkDebugMessage("kernel",9,"["<bbGetName() + bbtkDebugMessage("kernel",9,"["<mBox.lock()->bbGetName() <<"] BlackBoxOutputConnector::UnsetConnection(" <bbGetFullName() + bbtkInternalError(p->mBox.lock()->bbGetFullName() <<": BlackBoxOutputConnector::UnsetConnection(" <mConnection.begin(); + i!=p->mConnection.end(); ++i) { if (*i==c) break; } - if (i==mConnection.end()) + if (i==p->mConnection.end()) { - bbtkInternalError(mBox.lock()->bbGetFullName() + bbtkInternalError(p->mBox.lock()->bbGetFullName() <<": BlackBoxOutputConnector::UnsetConnection(" <mConnection.erase(i); // RemoveChangeObserver(boost::bind(&Connection::SignalChange,c)); } //====================================================================== + + //====================================================================== + const BlackBoxOutputConnector::ConnectionVector& + BlackBoxOutputConnector::GetConnectionVector() const + { + return p->mConnection; + } + //====================================================================== + + //====================================================================== + /// Returns the status of the input + IOStatus BlackBoxOutputConnector::GetStatus() const + { + return p->mStatus; + } + //====================================================================== + //====================================================================== + /// Sets the status of the input + void BlackBoxOutputConnector::SetStatus( IOStatus s ) + { + p->mStatus = s; + } + //====================================================================== - //====================================================================== + //====================================================================== void BlackBoxOutputConnector::SignalChange( BlackBox::Pointer box, const std::string& output ) { @@ -146,7 +199,7 @@ namespace bbtk // std::cout<<"BlackBoxOutputConnector::SignalChange(" // <bbGetName()<<",'" // <mChangeSignal(box,output,s); bbtkDebugMessage("change",2, "["<bbGetName() @@ -156,66 +209,12 @@ namespace bbtk < BlackBoxOutputConnector::SetModifiedStatus() [" - <SetModifiedStatus(); - } - - - } - */ - /* - //====================================================================== - void BlackBoxOutputConnector::SetChangeTime(const ChangeTime& t) - { - bbtkDebugMessage("change",2, - "==> BlackBoxOutputConnector::SetChangeTime("< BlackBoxOutputConnector::SetChangeTimetoCurrentTime() [" - < BlackBoxOutputConnector::SetChangeTimetoCurrentTime() [" - <mChangeSignal.connect(f); } //======================================================================