X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;h=0b8fb9c11dc890b0ee3ffe9b5a24d491a9828e07;hb=24e6d3d5d040c30878c7cbaf45db9bf001985713;hp=29bab6cc40a63308c6c3fca425e676403cd1ce3a;hpb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;p=bbtk.git diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx index 29bab6c..0b8fb9c 100644 --- a/kernel/src/bbtkConnection.cxx +++ b/kernel/src/bbtkConnection.cxx @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkConnection.cxx,v $ Language: C++ - Date: $Date: 2008/04/09 11:16:57 $ - Version: $Revision: 1.6 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See doc/license.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2008/10/17 08:18:13 $ + Version: $Revision: 1.15 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 *\brief Class bbtk::Connection @@ -27,27 +40,48 @@ namespace bbtk { - + //================================================================== + Connection::Pointer Connection::New(BlackBox::Pointer from, + const std::string& output, + BlackBox::Pointer to, + const std::string& input , + const Factory::Pointer f ) + { + bbtkDebugMessage("object",1,"##> Connection::Connection(\"" + <bbGetName()<<"\",\""<bbGetName()<<"\",\""<bbGetName()<<"\",\""<bbGetName()<<"\",\""<bbGetName()<<"\",\""<bbGetName()<<"\",\""< Connection::Connection(\"" + <bbGetName()<<"\",\""<bbGetName()<<"\",\""< Connection::Connection(\"" + <bbGetFullName()<<"\",\""<bbGetFullName()<<"\",\""<bbHasOutput(output) ) @@ -99,9 +133,10 @@ namespace bbtk std::string name; name = from->bbGetName() + "." + output + "-" + to->bbGetName() + "." + input; - mAdaptor = mFactory->NewAdaptor(from->bbGetOutputType(output), - to->bbGetInputType(input), - name); + mAdaptor = mFactory.lock() + ->NewAdaptor(from->bbGetOutputType(output), + to->bbGetInputType(input), + name); if (!mAdaptor) { bbtkError("did not find any <" @@ -113,36 +148,182 @@ namespace bbtk } } - // + + mFrom = from; + mOriginalFrom = from; + mTo = to; + mOriginalTo = to; + mInput = mOriginalInput = input; + mOutput = mOriginalOutput = output; + + // Lock this pointer !!! + //Pointer p = MakePointer(this,true); from->bbConnectOutput(output,this); to->bbConnectInput(input,this); + - bbtkDebugDecTab("Kernel",7); + bbtkDebugMessage("connection",1,"<== Connection::Connection(\"" + <bbGetFullName()<<"\",\""<bbGetFullName()<<"\",\""< Connection::Connection(\"" + <bbGetName()<<"\",\""<bbGetName()<<"\",\""< Connection::Connection(\"" + <bbGetName()<<"\",\""<bbGetName()<<"\",\""<bbGetName()<<"\",\""<bbGetName()<<"\",\""< Connection::Connection(\"" + <bbGetName()<<"\",\""<bbGetName()<<"\",\""< Connection::Connection(\"" + <bbGetFullName()<<"\",\""<bbGetFullName()<<"\",\""<bbHasOutput(output) ) + { + bbtkError("The box \""<bbGetTypeName()<< + "\" has no output \""<bbHasInput(input) ) + { + bbtkError("The box \""<bbGetTypeName()<< + "\" has no input \""<bbGetInputConnectorMap().find(input)->second->IsConnected()) + { + bbtkError("The input \""<bbGetName() + <<"\" is already connected"); + } + + // std::string t1 ( from->bbGetOutputType(output).name() ); + // std::string t2 ( to->bbGetInputType(input).name() ); + // if //( t1 != t2 ) + if ( from->bbGetOutputType(output) != + to->bbGetInputType(input) ) + { + if ( from->bbGetOutputType(output) == typeid(Data) ) + { + bbtkWarning("Connection '" + <bbGetName()<<"."<() + <<"> : type compatibility with '" + <bbGetName()<<"."<bbGetInputType(input) == typeid(Data) ) + { + bbtkDebugMessage("Kernel",8," -> '"<()<<" : can receive any data" + <bbConnectOutput(output,this); + to->bbConnectInput(input,this); + + + bbtkDebugMessage("connection",1,"<== Connection::Connection(\"" + <bbGetFullName()<<"\",\""<bbGetFullName()<<"\",\""< Connection::Connection(\"" + <bbGetName()<<"\",\""<bbGetName()<<"\",\""< Connection::~Connection() [" + <bbDisconnectOutput(mOutput,this); + // GetThisPointer()); + mFrom.reset(); + } + else + { + bbtkInternalError("Connection::~Connection() : invalid initial box pointer"); + } + if (mTo!=0) + { + mTo->bbDisconnectInput(mInput,this);// GetThisPointer()); + mTo.reset(); + } + else + { + bbtkInternalError("Connection::~Connection() : invalid final box pointer"); + } - if (mFrom!=0) mFrom->bbDisconnectOutput(mOutput,this); - if (mTo!=0) mTo->bbDisconnectInput(mInput,this); - if (mAdaptor!=0) mAdaptor->bbDelete(); - bbtkDebugDecTab("Kernel",7); + bbtkDebugMessage("object",2, + "<== Connection::~Connection() [" + < Connection::BackwardUpdate() [" + <bbBackwardUpdate(this); + s = mFrom->bbBackwardUpdate(GetThisPointer()); TransferData(); if (mAdaptor && (s==MODIFIED)) mAdaptor->bbSetModifiedStatus(); - bbtkDebugDecTab("Process",2); - + bbtkDebugMessage("process",5, + "<=== Connection::BackwardUpdate() [" + <bbForwardUpdate(this); - bbtkDebugDecTab("Process",2); + bbtkDebugDecTab("process",2); } //================================================================== */ @@ -191,7 +373,7 @@ namespace bbtk /// doing necessary conversions (adaptation or pointer cast) void Connection::TransferData() { - bbtkDebugMessageInc("Process",3, + bbtkDebugMessageInc("data",3, "Connection::TransferData() [" <() <<" which contains a <" <bbGetOutput(mOutput).type()) <<">"<bbGetInputType(mInput)) <<">"<bbGetOutput(mOutput) .contains( mTo->bbGetInputType(mInput) ) ) { - bbtkDebugMessage("Data",3, + bbtkDebugMessage("data",3, " -> Equal types : transfer ok"<bbSetInput( mInput, mFrom->bbGetOutput(mOutput), @@ -235,25 +414,26 @@ namespace bbtk else { // 2) Look for an adaptor - bbtk::BlackBox* adaptor = 0; + bbtk::BlackBox::Pointer adaptor; try { - adaptor = mFactory->NewAdaptor(mFrom->bbGetOutput(mOutput).type(), - mTo->bbGetInputType(mInput), - ""); + adaptor = mFactory.lock() + ->NewAdaptor(mFrom->bbGetOutput(mOutput).type(), + mTo->bbGetInputType(mInput), + ""); } catch (...) { } if (adaptor) { - bbtkDebugMessage("Data",3," -> Adaptor found : using it" + bbtkDebugMessage("data",3," -> Adaptor found : using it" <bbSetInput("In",mFrom->bbGetOutput(mOutput),false); adaptor->bbExecute(); // LG : Connection Update does not set mTo as modified mTo->bbSetInput(mInput, adaptor->bbGetOutput("Out"),false); - adaptor->bbDelete(); + // adaptor->bbDelete(); } // 3) If no adaptor found but the any content is a pointer // and target type is also a pointer : we try run-time cast @@ -261,7 +441,7 @@ namespace bbtk (mTo->bbGetDescriptor()->GetInputDescriptor(mInput) ->IsPointerType()) ) { - bbtkDebugMessage("Data",3, + bbtkDebugMessage("data",3, " -> No adaptor found but source and target types are both pointers : trying up or down cast"<bbSetInput(mInput, mFrom->bbGetOutput(mOutput),false); } - bbtkDebugDecTab("Process",3); } //================================================================== @@ -306,15 +485,19 @@ namespace bbtk /// Modified void Connection::SetModifiedStatus() { - bbtkDebugMessageInc("Process",5, - "Connection::SetModifiedStatus() [" - < Connection::SetModifiedStatus() [" + <bbSetModifiedStatus(); mTo->bbSetModifiedStatus( mTo->bbGetInputConnectorMap().find(mInput)->second ); - bbtkDebugDecTab("Process",5); + /* + bbtkDebugMessage("modified",2, + "==> Connection::SetModifiedStatus() [" + <bbGetName()+"."+mOutput+"--" +mTo->bbGetName()+"."+mInput; - if ((mFrom!=mOriginalFrom)||(mTo!=mOriginalTo)) + if ((!mOriginalFrom.expired()) && (!mOriginalTo.expired()) && + ((mFrom!=mOriginalFrom.lock())||(mTo!=mOriginalTo.lock()))) { - res += "("+mOriginalFrom->bbGetName()+"."+mOriginalOutput+"--" - + mOriginalTo->bbGetName()+"."+mOriginalInput+")"; + res += "("+mOriginalFrom.lock()->bbGetName() + +"."+mOriginalOutput+"--" + + mOriginalTo.lock()->bbGetName()+"."+mOriginalInput+")"; } return res; } @@ -339,90 +524,152 @@ namespace bbtk //================================================================== void Connection::Check() const { - bbtkMessage("Debug",1,"** Checking Connection "<<(void*)this<<" ["<bbGetFullName()<bbGetFullName()<bbHasOutput(mOutput)) { - bbtkError(mFrom->bbGetFullName()<<" does not have output '" + bbtkError("** Checking Connection "<<(void*)this + <<" ["<bbGetFullName()<<" does not have output '" <bbGetOutputConnectorMap().find(mOutput); if (i== mFrom->bbGetOutputConnectorMap().end()) { - bbtkError(mFrom->bbGetFullName()<<" output '" + bbtkError("** Checking Connection "<<(void*)this + <<" ["<bbGetFullName()<<" output '" <::const_iterator j; + std::vector< Connection* >::const_iterator j; + /* + for (j = i->second->GetConnectionVector().begin(); + j != i->second->GetConnectionVector().end(); + ++j) + { + if ((*j)==this) break; + } + */ j = find(i->second->GetConnectionVector().begin(), i->second->GetConnectionVector().end(), this); + if (j==i->second->GetConnectionVector().end()) { - bbtkError("Connection ["<bbGetFullName() <<" does not point to this connection"); } - bbtkMessage("Debug",2," - From : This connection is in OutputConnector connection vector"<bbGetName()<bbGetDescriptor() << std::endl; - std::cout << mTo->bbGetDescriptor()->GetTypeName() << std::endl; - mTo->bbGetFullName(); - bbtkMessage("Debug",2," - To : "<bbGetFullName()<bbGetName()<bbGetDescriptor() << std::endl; + // std::cout << mTo->bbGetDescriptor()->GetTypeName() << std::endl; + // mTo->bbGetFullName(); + bbtkMessage("debug",2," - To : "<bbGetFullName()<bbHasInput(mInput)) { - bbtkError(mTo->bbGetFullName()<<" does not have input '" + bbtkError("** Checking Connection "<<(void*)this + <<" ["<bbGetFullName()<<" does not have input '" <bbGetInputConnectorMap().find(mInput); if (i== mTo->bbGetInputConnectorMap().end()) { - bbtkError(mTo->bbGetFullName()<<" input '" + bbtkError("** Checking Connection "<<(void*)this + <<" ["<bbGetFullName()<<" input '" <second->GetConnection()==0) { - bbtkError("Connection "<bbGetFullName() <<" does not point to this connection"); } - bbtkMessage("Debug",2," - To : This connection is in InputConnector connection vector"<