X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=08c58c97554c34a08cd8bd92af7c73f8967a8026;hb=d2e9b6b072310e5fd087c6f412eb2f148c4d0638;hp=5b8e52f0efb5602342b05dae1757008387228853;hpb=141959873bfc3610f427de9a7690458a8b18bd2a;p=bbtk.git diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 5b8e52f..08c58c9 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -1,21 +1,34 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/03/10 12:28:43 $ - Version: $Revision: 1.10 $ - - 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: 2009/05/28 14:22:11 $ + Version: $Revision: 1.42 $ =========================================================================*/ +/* --------------------------------------------------------------------- + +* 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. +* ------------------------------------------------------------------------ */ + + #ifdef _USE_WXWIDGETS_ @@ -26,6 +39,8 @@ */ #include "bbtkWxBlackBox.h" +#include "bbtkBlackBoxOutputConnector.h" + //#include "bbtkWxContainerBlackBox.h" #include @@ -40,81 +55,136 @@ namespace bbtk + //========================================================================= - // WxBlackBoxWindow + // WxFrame //========================================================================= + //================================================================== + class WxFrame : public wxFrame + { + public: + WxFrame(WxBlackBox::Pointer b, + wxWindow *parent, + wxString title, + wxSize size); + ~WxFrame(); + void OnCloseWindow(wxCloseEvent& event); - //========================================================================= - WxBlackBoxWindow::WxBlackBoxWindow(WxBlackBox* box) - : mBox(box), mShown(false) - { - bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::WxBlackBoxWindow("<< - mBox->bbGetFullName()<<")"<bbSetWindow(this); + WxBlackBox::WeakPointer mBox; + DECLARE_EVENT_TABLE(); + + }; + + BEGIN_EVENT_TABLE(WxFrame, wxFrame) + // EVT_CLOSE(WxFrame::OnCloseWindow) + END_EVENT_TABLE(); + //================================================================== + + //================================================================== + WxFrame::WxFrame(WxBlackBox::Pointer b, + wxWindow *parent, + wxString title, + wxSize size) + : + wxFrame( parent, + -1, + title, + wxDefaultPosition, + size, + wxRESIZE_BORDER | + wxSYSTEM_MENU | + wxCLOSE_BOX | + wxMAXIMIZE_BOX | + wxMINIMIZE_BOX | + wxCAPTION + ), + mBox(b) + { + bbtkDebugMessage("widget",9,"["<bbGetName()<<"] WxFrame()" + < Number of windows alive = " - <bbSetWindow(this); + // Insert the widget into the window + wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); + b->bbUserCreateWidget(this); + wxWindow* widget = b->bbGetOutputWidget(); + sizer->Add( widget, 1, wxALL|wxGROW, 2); + SetSizer(sizer); + Layout(); } - //========================================================================= + //================================================================== + //================================================================== + WxFrame::~WxFrame() + { + if (mBox.lock()) + bbtkDebugMessage("widget",9,"["<bbGetName() + <<"] $$$$$$$$$$$$$$$$$$$ ~WxFrame()" + <bbSetWindow(0); + Wx::DecNbWindowsAlive(); + } + //================================================================== + //================================================================== + void WxFrame::OnCloseWindow(wxCloseEvent& event) + { + if (mBox.lock()) + bbtkDebugMessage("widget",9,"["<bbGetName() + <<"] $$$$$$$$$$$$$$$ WxFrame::OnCloseWindow()"<bbSetWindow(0); + Wx::DecNbWindowsAlive(); + + bbtkDebugMessage("widget",9, + "$$$$$$$$$$$$$$$ Destroy !!!"<Destroy(); + } + //================================================================== - //========================================================================= - WxBlackBoxWindow::~WxBlackBoxWindow() - { - bbtkDebugMessage("Wx",9,"WxBlackBoxWindow::~WxBlackBoxWindow() ["<< - mBox->bbGetFullName()<<"]"<bbSetWindow(0); - Wx::DecNbWindowsAlive(); - bbtkDebugMessage("Wx",5," -> Number of windows alive = " - <bbGetFullName()<<"]"< Number of windows shown = " - <bbGetFullName()<<"]"< Number of windows shown = " - <bbGetFullName()<<","<bbGetName()<<"]" + <bbSetWindow(this); // Insert the widget into the window wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - wxWindow* widget = bbGetBlackBox()->bbGetOutputWidget(); - widget->Reparent(this); - sizer->Add( widget, 1, wxALL|wxEXPAND, 2); - //SetAutoLayout(true); + b->bbUserCreateWidget(this); + wxWindow* widget = b->bbGetOutputWidget(); + sizer->Add( widget, 1, wxALL|wxGROW, 2); SetSizer(sizer); Layout(); } //========================================================================= - - //========================================================================= - void WxBlackBoxDialog::bbShow() - { - bbtkDebugMessage("Wx",5,"WxBlackBoxDialog::bbShow() [" - <bbGetFullName()<<"]"<bbGetFullName()<<"]"<bbGetFullName()<<","<bbGetOutputWidget(); - wxFrame* frame = (wxFrame*)this; - widget->Reparent(frame); - sizer->Add( widget, 1, wxALL|wxGROW, 2); - // frame->SetAutoLayout(true); - frame->SetSizer(sizer); - //frame->Fit(); - frame->Layout(); - } - //========================================================================= - - //========================================================================= - WxBlackBoxFrame::~WxBlackBoxFrame() - { - } - //========================================================================= - - //========================================================================= - void WxBlackBoxFrame::bbShow() - { - bbtkDebugMessage("Wx",5,"WxBlackBoxFrame::bbShow(" - <bbGetFullName()<<")"<bbUserOnShow(); - // wxFrame::SetFocus(); - } - //========================================================================= - - //========================================================================= - void WxBlackBoxFrame::bbHide() - { - bbtkDebugMessage("Wx",9,"WxBlackBoxFrame::bbHide() ["<< - bbGetBlackBox()->bbGetFullName()<<"]"<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()<<")"<bbSetWidgetEventHandler(this); - - Connect ( mWindow->GetId(), - wxEVT_DESTROY, - (wxObjectEventFunction) - (void (wxEvtHandler::*)(wxWindowDestroyEvent& c)) - &WxBlackBoxWidgetEventHandler::OnWindowDestroy ); - - mWindow->PushEventHandler(this); - - } - //========================================================================= - - //========================================================================= - WxBlackBoxWidgetEventHandler::~WxBlackBoxWidgetEventHandler() - { - 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; - } - //========================================================================= - - + //================================================================== + WxDialog::~WxDialog() + { + bbtkDebugMessage("widget",9,"WxDialog::~WxDialog()"<bbSetWindow(0); + // Wx::DecNbWindowsAlive(); + } + //================================================================== + //================================================================== + void WxDialog::OnCloseWindow(wxCloseEvent& event) + { + bbtkDebugMessage("widget",9,"WxDialog::OnCloseWindow()"<bbSetWindow(0); + Wx::DecNbWindowsAlive(); + this->Destroy(); + } + //================================================================== - /* - //========================================================================= - 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,283 +245,125 @@ namespace bbtk //========================================================================= //========================================================================= //========================================================================= - BBTK_USER_BLACK_BOX_IMPLEMENTATION(WxBlackBox,AtomicBlackBox); + BBTK_BLACK_BOX_IMPLEMENTATION(WxBlackBox,WidgetBlackBox); //========================================================================= //========================================================================= - void WxBlackBox::bbUserConstructor() + void WxBlackBox::bbUserSetDefaultValues() { - bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserConstructor()"<IsDead()) - { - bbtkDebugMessage("Wx",9,"WxBlackBox::bbGetWidget() ["<< - bbGetFullName()<<"] : Widget is dead : deleting it" - < WxBlackBox::bbUserFinalizeProcessing()"< WxBlackBox::bbCreateDialogWindow() - parent = " + <(), + Wx::GetTopWindow(), + std2wx( bbGetInputWinTitle() + + " - bbtk (c) CREATIS-LRMN"), + wxSize( bbGetInputWinWidth() , + bbGetInputWinHeight() ) ); + w->Show(false); + // w->ShowModal(); + } + //========================================================================= + + //================================================================== + + //================================================================== + /// Callback for creating a Frame window + void WxBlackBox::bbCreateFrameWindow() { - bbtkDebugMessageInc("Process",1, - "=> WxBlackBox::bbExecute() [" - <second->GetConnectionVector().size() != 0 ) - { - bbtkDebugMessage("Process",2, - "-> Output 'Widget' connected : transfering execution to parent" - <second->GetConnectionVector().front() - ->GetBlackBoxTo()->bbExecute(force); - - } - // else call 'standard' BlackBox execution method - else - { - BlackBox::bbExecute(force); + bbtkBlackBoxDebugMessage("widget",3, + "==> WxBlackBox::bbCreateFrameWindow() - parent = " + <(), + Wx::GetTopWindow(), + std2wx( bbGetInputWinTitle() + + " - bbtk (c) CREATIS-LRMN"), + wxSize( bbGetInputWinWidth() , + bbGetInputWinHeight() ) ); + w->Show(); + } + //================================================================== + + //================================================================== + void WxBlackBox::bbSetWindow(wxWindow* w) + { + bbtkBlackBoxDebugMessage("widget",9,"==> WxBlackBox::bbSetWindow("<bbUserCreateWidget(); - this->bbUserProcess(); - bbShowWindow(); - } - //========================================================================= - - //================================================================== - /// Specific methods for window creation during pipeline execution - /// Shows the window associated to the box - /// (called after bbProcess during bbExecute) + //================================================================== void WxBlackBox::bbShowWindow() { - bbtkDebugMessageInc("Process",1,"=> WxBlackBox::bbShowWindow() [" - < No widget event handler : creating one" - <IsHandlerOf - ( bbGetOutputWidget() ) ) - { - bbtkDebugMessage("Process",3, - "-> Obsolete widget event handler : re-creating one" - <SetName(bbtk::std2wx(bbGetInputWinTitle())); - } - - // If the output 'Widget' is connected then it's gonna - // be captured by its parent window : nothing to do - if ( (*bbGetOutputConnectorMap().find("Widget")).second - ->GetConnectionVector().size() != 0 ) + if ((bbmWindow) && (!bbIsShown())) { - - bbtkDebugMessage("Process",2, - "-> Output 'Widget' connected : nothing to do" + bbtkBlackBoxDebugMessage("widget",3,"==> WxBlackBox::bbShowWindow()" < Window already exists" - < Widget exists : creating the window" - <ShowModal(); } - // Input WinDialog set to false : creating a Frame - else + else { - bbtkDebugMessage("Process",2, - " Input WinDialog set to false : creating a Frame" - <IsShown()) - { - show->bbShow(); - } - else - { - bbtkDebugMessage("Process",2,"-> Already shown : nothing to do"< WxBlackBox::bbHideWindow() [" - <bbHide(); - - bbtkDebugMessageDec("Process",1,"<= WxBlackBox::bbHideWindow() [" - <Show(); + bbSetShown(true); + } + } } - //================================================================== - + //================================================================== - //================================================================== - WxBlackBox::Window* WxBlackBox::bbGetContainingWindow() + //================================================================== + void WxBlackBox::bbDestroyWindow() { - if (bbGetWindow()!=0) return bbGetWindow(); - BlackBox::OutputConnectorMapType::const_iterator i - = bbGetOutputConnectorMap().find("Widget"); - if ( i->second->GetConnectionVector().size() != 0 ) + bbtkBlackBoxDebugMessage("widget",3,"==> WxBlackBox::bbDestroyWindow("<second->GetConnectionVector().front() - ->GetBlackBoxTo())->bbGetContainingWindow(); + // wxWindow* w = bbGetWindow(); + //bbSetWindow(0); + // WE SHOULD DESTROY THE WINDOW WITH THE Close METHOD + // HOWEVER I + //w->Close(true); + // + delete bbGetWindow(); + bbSetShown(false); } - return 0; - } - //================================================================== - + bbtkBlackBoxDebugMessage("widget",3,"<== WxBlackBox::bbDestroyWindow("<bbIsShown(); - return false; } - //================================================================== + //================================================================== + }//namespace bbtk