X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=99096b73ed163188bb298531a022ceff10422dbe;hb=54a7d70f44d627ee33821eebeeceb22e45023662;hp=5b8e52f0efb5602342b05dae1757008387228853;hpb=141959873bfc3610f427de9a7690458a8b18bd2a;p=bbtk.git diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 5b8e52f..99096b7 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/03/10 12:28:43 $ - Version: $Revision: 1.10 $ + Date: $Date: 2008/05/13 09:52:58 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,30 +48,27 @@ namespace bbtk //========================================================================= - WxBlackBoxWindow::WxBlackBoxWindow(WxBlackBox* box) + WxBlackBoxWindow::WxBlackBoxWindow(WxBlackBox::Pointer box) : mBox(box), mShown(false) { - bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<< - mBox->bbGetFullName()<<")"<bbSetWindow(this); + bbtkDebugMessage("wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<< + mBox.lock()->bbGetFullName()<<")"<bbSetWindow(this); Wx::IncNbWindowsAlive(); - bbtkDebugMessage("Wx",5," -> Number of windows alive = " - <bbGetFullName()<<"]"<bbSetWindow(0); Wx::DecNbWindowsAlive(); - bbtkDebugMessage("Wx",5," -> Number of windows alive = " - <bbSetWindow(0); + } } //========================================================================= @@ -80,12 +77,9 @@ namespace bbtk void WxBlackBoxWindow::bbShow() { if (bbIsShown()) return; - bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::bbShow() ["<< - mBox->bbGetFullName()<<"]"< Number of windows shown = " - <bbGetFullName()<<"]"< Number of windows shown = " - <bbGetFullName()<<","<bbGetFullName()<<"]"<bbGetFullName()<<"]"<bbGetFullName()<<","<bbGetFullName()<<")"<bbUserOnShow(); + if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow(); // wxFrame::SetFocus(); } //========================================================================= @@ -236,104 +227,31 @@ namespace bbtk //========================================================================= void WxBlackBoxFrame::bbHide() { - bbtkDebugMessage("Wx",9,"WxBlackBoxFrame::bbHide() ["<< - bbGetBlackBox()->bbGetFullName()<<"]"<bbUserOnHide(); + if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnHide(); } //========================================================================= - //========================================================================= - // WxBlackBoxDialogWrapper - //========================================================================= - /* - //========================================================================= - WxBlackBoxDialogWrapper::WxBlackBoxDialogWrapper(WxBlackBox* box, - wxDialog *wrapped) - : WxBlackBoxWindow(box), - mWrapped(wrapped) - { - bbtkDebugMessage("Wx",9, - "WxBlackBoxDialogWrapper::WxBlackBoxDialogWrapper(" - <bbGetFullName()<<","<bbGetFullName()<<")"<ShowModal(); - // For Windows : - mWrapped->SetReturnCode( i ); - } - //========================================================================= - - //========================================================================= - void WxBlackBoxDialogWrapper::bbHide() - { - bbtkDebugMessage("Wx",9,"WxBlackBoxDialogWrapper::bbHide() ["<< - bbGetBlackBox()->bbGetFullName()<<"]"<Hide(); - } - //========================================================================= - - */ - - /* - //========================================================================= - // WxBlackBoxWidget - //========================================================================= - - //========================================================================= - WxBlackBoxWidget::WxBlackBoxWidget( WxBlackBox* box) - : mBox(box) - { - bbtkDebugMessage("Wx",9,"WxBlackBoxWidget::WxBlackBoxWidget("<bbGetFullName()<<")"<bbSetWidget(this); - } - //========================================================================= - - //========================================================================= - WxBlackBoxWidget::~WxBlackBoxWidget() - { - bbtkDebugMessage("Wx",9,"WxBlackBoxWidget::~WxBlackBoxWidget("<bbGetFullName()<<")"<bbSetWidget(0); - //bbtkDebugMessage("Wx",9,"EO WxBlackBoxWidget::~WxBlackBoxWidget("<bbGetFullName()<<")"<bbGetFullName()<<")"<bbGetFullName()<<")"<bbSetWidgetEventHandler(this); + mBox.lock()->bbSetWidgetEventHandler(this); Connect ( mWindow->GetId(), wxEVT_DESTROY, @@ -349,22 +267,22 @@ namespace bbtk //========================================================================= WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler() { - bbtkDebugMessage("Wx",9, - "WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler(" - <bbGetFullName()<<")"<bbSetWidgetEventHandler(0); + if (mBox.expired()) return; + bbtkDebugMessage("wx",9, + "WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler() [" + <bbGetFullName()<<"]"<bbSetWidgetEventHandler(0); } //========================================================================= //========================================================================= void WxBlackBoxWidgetEventHandler::OnWindowDestroy(wxWindowDestroyEvent&) { - bbtkDebugMessage("Wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() [" - <bbGetFullName()<<"]"<bbSetOutputWidget(0); - mBox->bbSetModifiedStatus(); - //mDead = true; - //delete this; + if (mBox.expired()) return; + bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() [" + <bbGetFullName()<<"]"<bbSetOutputWidget(0); + mBox.lock()->bbSetModifiedStatus(); } //========================================================================= @@ -374,46 +292,6 @@ namespace bbtk - /* - //========================================================================= - wxWindow* WxParentToChildData::GetWindowInWhichToInsert( const BlackBox* b) - const - { - bbtkDebugMessageInc("Kernel",9,"WxParentToChildData::GetWindowInWhichToInsert("<bbGetFullName()<<")"<bbGetInputConnectorMap().find("WinParent"); - if (i==b->bbGetInputConnectorMap().end()) - { - bbtkError("WxParentToChildData::GetWindowInWhichToInsert : the box " - <bbGetFullName() - <<" does not have any 'Parent' input ?!?"); - } - Connection* c = i->second->GetConnection(); - if (!c) - { - bbtkDebugMessage("Kernel",9, - "-> The input 'Parent' of the box " - <bbGetFullName() - <<" is not connected."<::const_iterator j - = mConnectionToWindowMap.find(c); - - if (j==mConnectionToWindowMap.end()) - { - bbtkError("WxParentToChildData::GetWindowInWhichToInsert(" - <bbGetFullName() - <<") no window provided by parent ?!?"); - } - - bbtkDebugDecTab("Kernel",9); - return j->second; - } - //========================================================================= - */ - //========================================================================= // WxBlackBox //========================================================================= @@ -422,7 +300,7 @@ namespace bbtk //========================================================================= //========================================================================= //========================================================================= - BBTK_USER_BLACK_BOX_IMPLEMENTATION(WxBlackBox,AtomicBlackBox); + BBTK_BLACK_BOX_IMPLEMENTATION(WxBlackBox,AtomicBlackBox); //========================================================================= //========================================================================= @@ -446,12 +324,12 @@ namespace bbtk //========================================================================= void WxBlackBox::bbUserDestructor() { - bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserDestructor()"< WxBlackBox::bbUserDestructor() ["<IsDead()) { - bbtkDebugMessage("Wx",9,"WxBlackBox::bbGetWidget() ["<< + bbtkDebugMessage("wx",9,"WxBlackBox::bbGetWidget() ["<< bbGetFullName()<<"] : Widget is dead : deleting it" < WxBlackBox::bbExecute() [" <second->GetConnectionVector().size() != 0 ) { - bbtkDebugMessage("Process",2, + bbtkDebugMessage("process",3, "-> Output 'Widget' connected : transfering execution to parent" <second->GetConnectionVector().front() + i->second->GetConnectionVector().front() //.lock() ->GetBlackBoxTo()->bbExecute(force); } @@ -524,13 +403,107 @@ namespace bbtk } // - bbtkDebugMessageDec("Process",1, + bbtkDebugMessageDec("process",2, "<= WxBlackBox::bbExecute() [" < WxBlackBox::bbBackwardUpdate(" + <<(caller?caller->GetFullName():"0")<<") [" + <GetFullName():"0")<<") [" + <second->GetConnectionVector().size() != 0 ) + + { + BlackBox::Pointer to = + i->second->GetConnectionVector()[0]->GetBlackBoxTo(); + + if (caller) + { + bbtkDebugMessage("process",3, + "-> Output 'Widget' connected to '" + <bbGetFullName()<<"' - caller->to = '" + <GetBlackBoxTo()->bbGetFullName() + <<"'" + < Output 'Widget' connected to '" + <bbGetFullName()<<"'" + <GetBlackBoxTo() != to))&& + (!bbGetUpdateTransferedToParent())) + { + bbtkDebugMessage("process",3, + " ... Transfering update order to parent" + <second->GetConnectionVector().front() //.lock() + ->GetBlackBoxTo()->bbExecute(false); + } + else + { + bbSetUpdateTransferedToParent(false); + bbtkDebugMessage("process",3, + " ... No need to transfer to parent" + <GetBlackBoxFromOutput()!="Widget")) + ) + { + } + */ + // call 'standard' BlackBox execution method + if (!bbGetUpdateTransferedToParent()) + { + AtomicBlackBox::bbBackwardUpdate(caller); + } + + bbtkDebugMessageDec("process",3, + "<= WxBlackBox::bbBackwardUpdate() [" + < WxBlackBox::bbShowWindow() [" + bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbShowWindow() [" < No widget event handler : creating one" <(), + bbGetOutputWidget()); } else if ( ! bbGetWidgetEventHandler()->IsHandlerOf ( bbGetOutputWidget() ) ) { - bbtkDebugMessage("Process",3, + bbtkDebugMessage("wx",3, "-> Obsolete widget event handler : re-creating one" <(), + bbGetOutputWidget()); } // Sets the name of the wxWindow to the input WinTitle bbGetOutputWidget()->SetName(bbtk::std2wx(bbGetInputWinTitle())); @@ -578,10 +553,9 @@ namespace bbtk ->GetConnectionVector().size() != 0 ) { - bbtkDebugMessage("Process",2, + bbtkDebugMessage("wx",2, "-> Output 'Widget' connected : nothing to do" < Window already exists" < Widget exists : creating the window" <(), bbGetWxParent(), std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS LRMN"), wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) ); @@ -617,10 +591,10 @@ namespace bbtk // Input WinDialog set to false : creating a Frame else { - bbtkDebugMessage("Process",2, + bbtkDebugMessage("process",2, " Input WinDialog set to false : creating a Frame" <(), bbGetWxParent(), std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS LRMN"), wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) ); @@ -643,13 +617,13 @@ namespace bbtk } else { - bbtkDebugMessage("Process",2,"-> Already shown : nothing to do"< Already shown : nothing to do"< WxBlackBox::bbHideWindow() [" + bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbHideWindow() [" <bbHide(); - bbtkDebugMessageDec("Process",1,"<= WxBlackBox::bbHideWindow() [" + bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbHideWindow() [" <second->GetConnectionVector().size() != 0 ) { - return ((WxBlackBox*)i->second->GetConnectionVector().front() - ->GetBlackBoxTo())->bbGetContainingWindow(); + return boost::static_pointer_cast + (i->second->GetConnectionVector().front() //.lock() + ->GetBlackBoxTo())->bbGetContainingWindow(); } return 0; }