From 2b8d8f686974ab38c9ffcf0f88dd533b01b68e84 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 23 Apr 2008 14:49:27 +0000 Subject: [PATCH] *** empty log message *** --- kernel/appli/bbc/main.cxx.in | 8 +- kernel/cmake/BBTKCreatePackageBBdoc.cmake | 4 +- kernel/doc/bbtkWebSite/CMakeLists.txt | 2 +- kernel/src/bbtkBlackBox.cxx | 30 +++---- kernel/src/bbtkBlackBoxOutputConnector.cxx | 13 +-- kernel/src/bbtkComplexBlackBox.cxx | 14 ++-- kernel/src/bbtkConnection.cxx | 16 ++-- kernel/src/bbtkMessageManager.cxx | 8 +- kernel/src/bbtkWx.cxx | 5 +- kernel/src/bbtkWx.h | 2 +- kernel/src/bbtkWxBlackBox.cxx | 98 +++++++++++++++------- kernel/src/bbtkWxGUIConsole.cxx | 8 +- 12 files changed, 131 insertions(+), 77 deletions(-) diff --git a/kernel/appli/bbc/main.cxx.in b/kernel/appli/bbc/main.cxx.in index 61ba8da..119862a 100644 --- a/kernel/appli/bbc/main.cxx.in +++ b/kernel/appli/bbc/main.cxx.in @@ -15,8 +15,8 @@ static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("Debug messages on (message All 9)") }, - { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") }, + { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("debug messages on (message all 9)") }, + { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet (message mac 0)") }, { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("print help") }, { wxCMD_LINE_SWITCH, _T("g"), _T("graphical-dialog"), _T("prompts the user for the parameters values using dialog boxes") }, { wxCMD_LINE_SWITCH, _T("t"), _T("text-dialog"), _T("prompts the user for the parameters values in text mode") }, @@ -105,8 +105,8 @@ bool wxBBIApp::OnInit( ) setlocale(LC_NUMERIC, "C"); #endif - if (quiet) bbtk::MessageManager::SetMessageLevel("All",0); - if (debug) bbtk::MessageManager::SetMessageLevel("All",9); + if (quiet) bbtk::MessageManager::SetMessageLevel("max",0); + if (debug) bbtk::MessageManager::SetMessageLevel("all",9); bbtk::Wx::CreateInvisibleTopWindow(); diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake index b220f47..2f6c958 100644 --- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake +++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake @@ -32,7 +32,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) FILE(TO_NATIVE_PATH ${BBTK_BIN_PATH}/bb${BBTK_PACKAGE_NAME}.dll pathCommand2 ) set(command1 cd "${BBTK_BIN_PATH}/../bbs/") set(command2 copy ${pathCommand2} . ) - set(command3 ${BBTK_BBI} -N ${OUTPUT_FILE}) + set(command3 ${BBTK_BBI} -N -q ${OUTPUT_FILE}) set(command4 del bb${BBTK_PACKAGE_NAME}.dll) ADD_CUSTOM_COMMAND( @@ -46,7 +46,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME) ADD_CUSTOM_COMMAND( OUTPUT ${DOC_OUTPUT} COMMAND - cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N ${OUTPUT_FILE} + cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${OUTPUT_FILE} DEPENDS bb${PACKAGE_NAME} ) ENDIF(WIN32) diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 77b9962..443fe6d 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -35,7 +35,7 @@ CONFIGURE_FILE( ADD_CUSTOM_COMMAND( OUTPUT ${INDEX_OUTPUT} COMMAND - cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -n ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs + cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -N -q ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS} ) ADD_CUSTOM_TARGET(bbdoc_index ALL diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index 1f59e6b..de80917 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ -Date: $Date: 2008/04/22 14:30:25 $ -Version: $Revision: 1.14 $ +Date: $Date: 2008/04/23 14:49:27 $ +Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -417,48 +417,48 @@ namespace bbtk /// Signals that the BlackBox has been modified void BlackBox::bbSetModifiedStatus(BlackBoxInputConnector* c) { - bbtkDebugMessageInc("Process",5, - "=> BlackBox::bbSetModifiedStatus("< BlackBox::bbSetModifiedStatus("<second) ) - // && (bbCanReact())) + // && (bbCanReact())) { - bbtkDebugMessage("Process",9, + bbtkDebugMessage("modified",2, "-> Hide triggered by WinHide input change" <bbHideWindow(); this->bbSetStatus(MODIFIED); return; } - + if ( ( bbBoxProcessModeIsReactive() || (c==bbGetInputConnectorMap().find("BoxExecute")->second)) && (bbCanReact() ) ) { - bbtkDebugMessage("Process",9, + bbtkDebugMessage("modified",2, "-> Execution triggered by Reactive mode or BoxExecute input change"<bbSetStatus(MODIFIED); bbGlobalAddToExecutionList( GetThisPointer() ); } else if ( bbGetStatus() == MODIFIED ) //! this->bbIsUptodate()) { - bbtkDebugMessage("Process",5,"-> Already modified"< Already modified"< Status set to modified"< Status set to modified"<bbSetStatus(MODIFIED); } this->bbSignalOutputModification(false); - bbtkDebugMessageDec("Process",5, + /* + bbtkDebugMessageDec("Process",5, "<= BlackBox::bbSetModifiedStatus("< BlackBoxOutputConnector::SetModifiedStatus() [" + <SetModifiedStatus(); } - bbtkDebugDecTab("Process",5); + // bbtkDebugDecTab("Process",5); } diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx index d15a45c..8a6c65b 100644 --- a/kernel/src/bbtkComplexBlackBox.cxx +++ b/kernel/src/bbtkComplexBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBox.cxx,v $ Language: C++ -Date: $Date: 2008/04/22 14:30:25 $ -Version: $Revision: 1.15 $ +Date: $Date: 2008/04/23 14:49:27 $ +Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -270,15 +270,17 @@ namespace bbtk //================================================================== void ComplexBlackBox::bbSetModifiedStatus(BlackBoxInputConnector* c) { - bbtkDebugMessage("Process",3, - "ComplexBlackBox::bbSetModifiedStatus(" + bbtkDebugMessage("modified",1, + "==> ComplexBlackBox::bbSetModifiedStatus(" <GetBlackBox()->bbSetModifiedStatus(c); - bbtkDebugMessage("Process",3, - "EO ComplexBlackBox::bbSetModifiedStatus(" + /* + bbtkDebugMessage("modified",1, + "<== ComplexBlackBox::bbSetModifiedStatus(" < Connection::SetModifiedStatus() [" + <bbSetModifiedStatus(); mTo->bbSetModifiedStatus( mTo->bbGetInputConnectorMap().find(mInput)->second ); - bbtkDebugDecTab("Process",5); + /* + bbtkDebugMessage("modified",2, + "==> Connection::SetModifiedStatus() [" + <Hide(); Wx::SetTopWindow(top); } diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h index e160c3a..2969edb 100644 --- a/kernel/src/bbtkWx.h +++ b/kernel/src/bbtkWx.h @@ -44,7 +44,7 @@ namespace bbtk static void EndBusyCursor(); static int mBeginBusyCallsCount; - static void CreateInvisibleTopWindow(); + static void CreateInvisibleTopWindow(wxWindow* parent=0); /// Returns the global parent of all bbtk windows static wxWindow* GetTopWindow(); /// Sets the global parent of all bbtk windows diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index be78a7e..e4a8410 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/04/22 14:30:25 $ - Version: $Revision: 1.14 $ + Date: $Date: 2008/04/23 14:49:28 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -379,6 +379,7 @@ namespace bbtk bbSetOutputWidget(0); bbSetWidgetEventHandler(0); + bbSetUpdateTransferedToParent(false); } //========================================================================= @@ -423,42 +424,81 @@ namespace bbtk /// Main processing method of the box. IOStatus WxBlackBox::bbBackwardUpdate( Connection::Pointer caller ) { - bbtkDebugMessageInc("Process",1, - "=> WxBlackBox::bbBackwardUpdate(" - <<(caller?caller->GetFullName():"0")<<") [" - < WxBlackBox::bbBackwardUpdate(" + <<(caller?caller->GetFullName():"0")<<") [" + <GetFullName():"0")<<") [" + <second->GetConnectionVector().size() != 0 ) + + { + BlackBox::Pointer to = + i->second->GetConnectionVector()[0]->GetBlackBoxTo(); + + if (caller) + { + bbtkDebugMessage("Process",2, + "-> Output 'Widget' connected to '" + <bbGetFullName()<<"' - caller->to = '" + <GetBlackBoxTo()->bbGetFullName() + <<"'" + < Output 'Widget' connected to '" + <bbGetFullName()<<"'" + <GetBlackBoxTo() != to))&& + (!bbGetUpdateTransferedToParent())) + { + bbtkDebugMessage("Process",2, + " ... Transfering update order to parent" + <second->GetConnectionVector().front() //.lock() + ->GetBlackBoxTo()->bbExecute(false); + } + else + { + bbSetUpdateTransferedToParent(false); + bbtkDebugMessage("Process",2, + " ... No need to transfer to parent" + <GetBlackBoxFromOutput()!="Widget")) ) { - BlackBox::OutputConnectorMapType::const_iterator i - = bbGetOutputConnectorMap().find("Widget") ; - if ( i->second->GetConnectionVector().size() != 0 ) - - { - bbtkDebugMessage("Process",2, - "-> Output 'Widget' connected : transfering update order to parent" - <second->GetConnectionVector().front() //.lock() - ->GetBlackBoxTo()->bbExecute(false); - } - } } + */ // call 'standard' BlackBox execution method if (!bbGetUpdateTransferedToParent()) { diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index 3659fa9..e70ca40 100644 --- a/kernel/src/bbtkWxGUIConsole.cxx +++ b/kernel/src/bbtkWxGUIConsole.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIConsole.cxx,v $ Language: C++ - Date: $Date: 2008/04/22 14:30:25 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/04/23 14:49:28 $ + Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -152,10 +152,12 @@ namespace bbtk // Creates and sets the parent window of all bbtk windows + /* wxWindow* top = new wxPanel(this,-1);//,_T("top")); top->Hide(); Wx::SetTopWindow(top); - + */ + Wx::CreateInvisibleTopWindow(this); // Layout //EED SetSizer(sizer); -- 2.45.1