From 2b7ac5ab18a67097a812e20a5ecba3dac63f29cc Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 20 Mar 2008 15:27:56 +0000 Subject: [PATCH] *** empty log message *** --- kernel/appli/CMakeLists.txt | 2 + kernel/src/bbtkAtomicBlackBox.cxx | 179 +++++++++++++------------ kernel/src/bbtkInterpreter.cxx | 56 +++++--- kernel/src/bbtkInterpreter.h | 11 +- kernel/src/bbtkWxGUICommand.cxx | 8 +- kernel/src/bbtkWxGUIConsole.cxx | 12 +- kernel/src/bbtkWxGUIHtmlBrowser.cxx | 14 +- kernel/src/bbtkWxGUIOutputMessages.cxx | 6 +- 8 files changed, 159 insertions(+), 129 deletions(-) diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt index 72c7707..0a02f7d 100644 --- a/kernel/appli/CMakeLists.txt +++ b/kernel/appli/CMakeLists.txt @@ -20,3 +20,5 @@ SUBDIRS(bbCreatePackage) SUBDIRS(bbCreateBlackBox) SUBDIRS(bbed) + +SUBDIRS(bbhelp) diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx index 6b8d402..3f46046 100644 --- a/kernel/src/bbtkAtomicBlackBox.cxx +++ b/kernel/src/bbtkAtomicBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/02/07 11:06:37 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/03/20 15:27:56 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,8 +31,8 @@ namespace bbtk : BlackBox(name) { bbtkDebugMessageInc("Kernel",7, - "AtomicBlackBox::AtomicBlackBox(\"" - < AtomicBlackBox::bbBackwardUpdate() [" - < AtomicBlackBox::bbBackwardUpdate() [" + <GetOutputDescriptor(name))->GetGetFunctor()->Get(this); + Data p = ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor() + ->GetOutputDescriptor(name))->GetGetFunctor()->Get(this); bbtkDebugDecTab("Data",7); return p; @@ -168,11 +162,12 @@ namespace bbtk Data AtomicBlackBox::bbGetInput( const std::string &name ) { bbtkDebugMessageInc("Data",7, - "AtomicBlackBox::bbGetInput(\""<GetInputDescriptor(name))->GetGetFunctor()->Get(this); + Data p = ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor() + ->GetInputDescriptor(name))->GetGetFunctor()->Get(this); bbtkDebugDecTab("Data",7); return p; @@ -185,11 +180,12 @@ namespace bbtk void AtomicBlackBox::bbSetOutput( const std::string &name, Data data) { bbtkDebugMessageInc("Data",7, - "AtomicBlackBox::bbSetOutput(\""<GetOutputDescriptor(name))->GetSetFunctor()->Set(this,data); + ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor() + ->GetOutputDescriptor(name))->GetSetFunctor()->Set(this,data); bbtkDebugDecTab("Data",7); } @@ -198,19 +194,21 @@ namespace bbtk //========================================================================= /// Sets the data of the input called - void AtomicBlackBox::bbSetInput( const std::string &name, Data data, - bool setModified ) + void AtomicBlackBox::bbSetInput( + const std::string &name, + Data data, + bool setModified ) { bbtkDebugMessageInc("Data",7, - "AtomicBlackBox::bbSetInput(\""<GetInputDescriptor(name))->GetSetFunctor()->Set(this,data); if (setModified) - { - bbSetModifiedStatus(); - } + { + bbSetModifiedStatus(); + } bbtkDebugDecTab("Data",7); } @@ -218,20 +216,25 @@ namespace bbtk //========================================================================= /// Sets the data of the input called - void AtomicBlackBox::bbBruteForceSetInputPointer( const std::string &name, - void* data, - bool setModified ) + void AtomicBlackBox::bbBruteForceSetInputPointer + ( + const std::string &name, + void* data, + bool setModified + ) { bbtkDebugMessageInc("Data",7, - "AtomicBlackBox::bbBruteForceSetInputPointer(\"" - <GetInputDescriptor(name))->GetSetFunctor()->BruteForceSetPointer(this,data); + "AtomicBlackBox::bbBruteForceSetInputPointer(\"" + <GetInputDescriptor(name))->GetSetFunctor() + ->BruteForceSetPointer(this,data); if (setModified) { - bbSetModifiedStatus(); + bbSetModifiedStatus(); } bbtkDebugDecTab("Data",7); diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 39eb9ce..7b5fa77 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/03/20 11:04:57 $ - Version: $Revision: 1.49 $ + Date: $Date: 2008/03/20 15:27:56 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,7 +45,8 @@ namespace bbtk Interpreter::Interpreter() : mUser(0), - mCommandLine(false) + mCommandLine(false), + mThrow(false) { bufferNb =0; bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1); @@ -308,6 +309,7 @@ bufferNb =0; ExitStatus status = OK; + try { SwitchToFile(filename); @@ -335,35 +337,53 @@ bufferNb =0; catch (QuitException e) { status = QUIT; + if (mThrow) throw QuitException(); } catch (bbtk::Exception e) { - std::cerr << "* ERROR : "< mHistory; int bufferNb; + + bool mThrow; + }; // EO class Interpreter @@ -269,7 +274,7 @@ namespace bbtk // The "Quit" exception struct QuitException : public bbtk::Exception { - QuitException() : bbtk::Exception("","","") {} + QuitException() : bbtk::Exception("Interpreter","","Quit") {} }; } diff --git a/kernel/src/bbtkWxGUICommand.cxx b/kernel/src/bbtkWxGUICommand.cxx index 37c2af1..d540113 100644 --- a/kernel/src/bbtkWxGUICommand.cxx +++ b/kernel/src/bbtkWxGUICommand.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUICommand.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 11:04:57 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/03/20 15:27:56 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -78,7 +78,7 @@ namespace bbtk sizerCommand->Add(mwxTextCommand,1,wxGROW); sizerCommand->Add(btnGo); - sizer->Add(sizerCommand,0,wxLEFT | wxRIGHT | wxBOTTOM | wxGROW, 10 ); + sizer->Add(sizerCommand,0,wxGROW); wxBoxSizer *btnsSizer = new wxBoxSizer(wxHORIZONTAL); @@ -98,7 +98,7 @@ namespace bbtk btnsSizer->Add( btnGraphD ); btnsSizer->Add( btnHelp ); - sizer->Add(btnsSizer,0,wxLEFT | wxRIGHT | wxBOTTOM | wxGROW, 10 ); + sizer->Add(btnsSizer,0,wxTOP|wxGROW, 10 ); SetSizer(sizer); diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx index 164e244..fe4619f 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/03/20 11:04:57 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/03/20 15:27:57 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -131,11 +131,11 @@ namespace bbtk wxSize(200,0)); // mWxGUIHtmlBrowser->SetSize(wxSize(800,1000)); - helpsizer->Add (mWxGUIHtmlBrowser,1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM ); + helpsizer->Add (mWxGUIHtmlBrowser,1, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5 ); // helpsizer->Add ( new wxButton(mwxPageHelp,-1,"perro"), 0, wxEXPAND ); wxBitmap bmp_run(cc_run_xpm); mwxButtonRun = new wxBitmapButton( mwxPageHelp,ID_Button_Run,bmp_run);//_T("Run") ); - helpsizer->Add( mwxButtonRun ); + helpsizer->Add( mwxButtonRun, 0, wxALL, 5 ); //============== @@ -146,8 +146,8 @@ namespace bbtk mWxGUICommand->SetFocus(); - cmdsizer->Add (mWxGUIOutputMessages, 1, wxALL | wxGROW, 10); - cmdsizer->Add (mWxGUICommand, 1, wxALL | wxGROW, 10); + cmdsizer->Add (mWxGUIOutputMessages, 1, wxALL | wxGROW, 5); + cmdsizer->Add (mWxGUICommand, 0, wxALL | wxGROW, 5); // Creates and sets the parent window of all bbtk windows diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx index 0461448..abc4835 100644 --- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx +++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 09:51:29 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/03/20 15:27:57 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -103,19 +103,19 @@ namespace bbtk mwxBackButton = new wxButton( panel, bwd_id,_T("<"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 ); + bsizer->Add ( mwxBackButton , 0, wxALIGN_CENTRE ); mwxForwardButton = new wxButton( panel, fwd_id,_T(">"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxForwardButton , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10); + bsizer->Add ( mwxForwardButton , 0, wxALIGN_CENTRE ); mwxHomeButton = new wxButton( panel, home_id,_T("Home"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 ); + bsizer->Add ( mwxHomeButton , 0, wxALIGN_CENTRE ); mwxReloadButton = new wxButton( panel, reload_id,_T("Reload"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); - bsizer->Add ( mwxReloadButton , 0, wxALIGN_CENTRE | wxTOP | wxBOTTOM , 10 ); + bsizer->Add ( mwxReloadButton , 0, wxALIGN_CENTRE ); /* mwxIncludeFileButton = new wxButton( panel, include_id, @@ -129,7 +129,7 @@ namespace bbtk wxDefaultSize, wxTE_PROCESS_ENTER); mwxURL->SetLabel(_T("URL")); - bsizer->Add(mwxURL, 1, wxEXPAND | wxALL, 10); + bsizer->Add(mwxURL, 1, wxEXPAND); // mwxHtmlWindow = new WxHtmlWindow(parent,html_id,this,size); diff --git a/kernel/src/bbtkWxGUIOutputMessages.cxx b/kernel/src/bbtkWxGUIOutputMessages.cxx index bb1b422..d7d13bc 100644 --- a/kernel/src/bbtkWxGUIOutputMessages.cxx +++ b/kernel/src/bbtkWxGUIOutputMessages.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIOutputMessages.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 09:51:29 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/03/20 15:27:57 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,7 +62,7 @@ namespace bbtk mwxOutputTextAttr = new wxTextAttr; mwxOutputTextAttr->SetFont(*FixedFont); - sizer->Add ( mwxOutputText, 1, wxALL | wxGROW, 10); + sizer->Add ( mwxOutputText, 1, wxGROW); // Redirection of std::cout to mwxTextHistory and printf mRedirect_cout = -- 2.46.1