From 953cb03ed366d8660904b730bbae35d5f77e2e93 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 20 Feb 2008 11:58:32 +0000 Subject: [PATCH] ColourDialog -> ColourSelector --- kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex | 24 +++-- kernel/src/bbtkInterpreter.cxx | 7 +- kernel/src/bbtkTranscriptor.h | 6 +- packages/std/bbs/boxes/bbPrependDataPath.bbs | 1 + .../appli/exampleLayoutSplit_Orientation.bbs | 4 +- packages/wx/src/bbwxColourDialog.cxx | 73 --------------- packages/wx/src/bbwxColourDialog.h | 88 ------------------- 7 files changed, 24 insertions(+), 179 deletions(-) delete mode 100644 packages/wx/src/bbwxColourDialog.cxx delete mode 100644 packages/wx/src/bbwxColourDialog.h diff --git a/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex b/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex index 62590e0..4d86c3f 100644 --- a/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex +++ b/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex @@ -1091,17 +1091,23 @@ the \texttt{print} command. Type \texttt{help wx}, you get something like: \begin{verbatim} -Package wx v1.0.0- eduardo.davila/laurent.guigues@creatis.insa-lyon.fr +Package wx v1.0.0- info-dev@creatis.insa-lyon.fr Basic graphical interface elements (slider, button ...) based on wxWidgets Black boxes: - Button : Button that gives a string - FileDialog : FileDialog widget (wxFileDialog) - RadioButton : RadioButton group widget (wxRadioButton) 0-9 entries - Sizer : Sizer widget (wxSizer) - Slider : Slider widget (wxSlider) - Split : Split widget (wxSplitterWindow) - StaticText : wxWidget Static text - TextCtrl : TextCtrl widget (wxTextCtrl) + Button : Button that gives a string + ColourSelectorButton : + ColourSelector : Colour Selector widget (wxColourDialog) + CommandButton : + DirectorySelector : + FileSelector : FileDialog widget (wxFileDialog) + InputText : TextCtrl widget (wxTextCtrl) + LayoutLine : Sizer widget (wxSizer) + LayoutSplit : Split widget (wxSplitterWindow) + NoteBook : + OutputText : wxWidget Static text + RadioButton : RadioButton group widget (wxRadioButton) 0-9 entries + Slider : Slider widget (wxSlider) + \end{verbatim} You can reproduce the same experiment as above using a diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 3688c64..7a58ffe 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/02/19 18:40:10 $ - Version: $Revision: 1.34 $ + Date: $Date: 2008/02/20 11:58:32 $ + Version: $Revision: 1.35 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -58,7 +58,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; // For the time being, comment out previous line, and // uncomment next line to check Transcriptor - //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); + // mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); // Builds the commands dict CommandInfoType info; @@ -308,7 +308,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; bool exm = mCommandLine; mCommandLine = false; - try { printf("EED: Interpreter::InterpretFile 01\n"); diff --git a/kernel/src/bbtkTranscriptor.h b/kernel/src/bbtkTranscriptor.h index 97eeb56..3d819ce 100644 --- a/kernel/src/bbtkTranscriptor.h +++ b/kernel/src/bbtkTranscriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkTranscriptor.h,v $ $ Language: C++ - Date: $Date: 2008/02/14 20:23:51 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/02/20 11:58:32 $ + 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 @@ -49,7 +49,7 @@ namespace bbtk /// Destructor ~Transcriptor( ); - + /// Sets the inputs of the workspace : void SetInputs(const std::map& m) { mInputs = m; } diff --git a/packages/std/bbs/boxes/bbPrependDataPath.bbs b/packages/std/bbs/boxes/bbPrependDataPath.bbs index 0cd920c..0f6335e 100755 --- a/packages/std/bbs/boxes/bbPrependDataPath.bbs +++ b/packages/std/bbs/boxes/bbPrependDataPath.bbs @@ -1,4 +1,5 @@ load std + define PrependDataPath std author "jpr@creatis.insa-lyon.fr" description "Prepends the input string file 'last name' with the default DataPath found in bbtk_config_xml" diff --git a/packages/wx/bbs/appli/exampleLayoutSplit_Orientation.bbs b/packages/wx/bbs/appli/exampleLayoutSplit_Orientation.bbs index 673b063..adb9fe2 100644 --- a/packages/wx/bbs/appli/exampleLayoutSplit_Orientation.bbs +++ b/packages/wx/bbs/appli/exampleLayoutSplit_Orientation.bbs @@ -1,5 +1,5 @@ -description "Simple test of wx::LayoutSplit widgets" -author "jean-pierre.roux@creatis.univ-lyon1.fr" +description "Simple test of wx::LayoutLine widgets" +author "jean-pierre.roux [at] creatis [dot] univ [dash] lyon1 [dot] fr" category "example;widget" load std diff --git a/packages/wx/src/bbwxColourDialog.cxx b/packages/wx/src/bbwxColourDialog.cxx deleted file mode 100644 index 805254b..0000000 --- a/packages/wx/src/bbwxColourDialog.cxx +++ /dev/null @@ -1,73 +0,0 @@ -/*========================================================================= - - Program: bbtk - Module: $RCSfile: bbwxColourDialog.cxx,v $ - Language: C++ - Date: $Date: 2008/02/14 19:19:52 $ - 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 - 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. - -=========================================================================*/ -/** - * \file - * \brief - */ - - -#ifdef _USE_WXWIDGETS_ - - -#include "bbwxColourDialog.h" -#include "bbwxPackage.h" - -#include - - - -namespace bbwx -{ - - BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ColourDialog); - BBTK_USER_BLACK_BOX_IMPLEMENTATION(ColourDialog,bbtk::AtomicBlackBox); - - - void ColourDialog::bbUserConstructor() - { - } - - void ColourDialog::Process() - { - bbtkDebugMessageInc("Core",9,"ColourDialog::Process() [" - <ShowModal(); - if (colordialog->GetReturnCode()==wxID_OK) - { - char col[100]; - wxColour& c = colordialog->GetColourData().GetColour(); - sprintf(col,"%f %f %f",c.Red()/255.,c.Green()/255.,c.Blue()/255.); - bbSetOutputOut( col ); - } else { - bbSetOutputOut(""); - } - bbtkDebugDecTab("Core",9); - } - -// void ColourDialog::CreateWidget() -// { -// mColorDialog = new wxColourDialog( 0 ); -// bbSetOutputWidget( mColorDialog ); -// } - -}//namespace bbwx - -#endif // _USE_WXWIDGETS_ - diff --git a/packages/wx/src/bbwxColourDialog.h b/packages/wx/src/bbwxColourDialog.h deleted file mode 100644 index db5edc9..0000000 --- a/packages/wx/src/bbwxColourDialog.h +++ /dev/null @@ -1,88 +0,0 @@ -/*========================================================================= - - Program: bbtk - Module: $RCSfile: bbwxColourDialog.h,v $ - Language: C++ - Date: $Date: 2008/02/14 19:19:52 $ - 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 - 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. - -=========================================================================*//** - /** - * \file - * \brief Short description in one line - * - * Long description which - * can span multiple lines -*/ - -/** - * \class bbwx::ColorDialog - * \brief - - */ - -#ifdef _USE_WXWIDGETS_ - - -#ifndef __bbWxColourDialog_h__ -#define __bbWxColourDialog_h__ - -#include "bbtkWxBlackBox.h" - - -// Namespace of the package "wx" is "bbwx" -// Namespace associated to packages should be of the form : -// bbPACKAGENAME -namespace bbwx -{ - - - - - //================================================================= - class /*BBTK_EXPORT*/ ColourDialog : public bbtk::AtomicBlackBox - { - BBTK_USER_BLACK_BOX_INTERFACE(ColourDialog,bbtk::AtomicBlackBox); - BBTK_DECLARE_OUTPUT(Out,std::string); - BBTK_PROCESS(Process); -// BBTK_CREATE_WIDGET(CreateWidget); - void Process(); -// void CreateWidget(); - - protected: - virtual void bbUserConstructor(); - // private: - // wxColourDialog* mColorDialog; - }; - //================================================================= - - - //================================================================= - // UserBlackBox description - BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColourDialog,bbtk::AtomicBlackBox); - // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); - BBTK_NAME("ColourDialog"); - BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("Colour chooser dialog (bbfication of wxColourDialog)"); - BBTK_OUTPUT(ColourDialog,Out,"The colour selected by the user",std::string); - BBTK_END_DESCRIBE_BLACK_BOX(ColourDialog); - //================================================================= - - - -} - - - -//namespace bbtk -#endif //__bbtkWxColourDialog_h__ - -#endif //_USE_WXWIDGETS_ -- 2.45.2