X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxColourSelectorButton.h;h=288050fe638b41c5a5a5b4ed874b526eeff66c1d;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=0ffeb1dbdd05715508c8b372e97435086314995e;hpb=5e3d12f47887915d40f55316633783da9f2a6802;p=bbtk.git diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h index 0ffeb1d..288050f 100644 --- a/packages/wx/src/bbwxColourSelectorButton.h +++ b/packages/wx/src/bbwxColourSelectorButton.h @@ -1,20 +1,39 @@ +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÈ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # 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. + # ------------------------------------------------------------------------ */ + + /*========================================================================= - Program: bbtk Module: $RCSfile: bbwxColourSelectorButton.h,v $ Language: C++ - Date: $Date: 2008/02/20 11:36:29 $ - Version: $Revision: 1.1 $ - - 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: 2012/11/16 08:52:14 $ + Version: $Revision: 1.12 $ +=========================================================================*/ + + /** * \file * \brief Short description in one line @@ -27,8 +46,7 @@ * \class bbwx::ColourSelectorButton * \brief - * \class bbwx::wxColourPickerCtrlWidget - * \brief + */ #ifdef _USE_WXWIDGETS_ @@ -41,8 +59,7 @@ // Include wxBlackBox definition #include "bbtkWxBlackBox.h" - -#include +#include "bbwx_EXPORT.h" // Namespace of the package "wx" is "bbwx" // Namespace associated to packages should be of the form : @@ -50,66 +67,36 @@ namespace bbwx { -class ColourSelectorButton; - -class wxColourPickerCtrlWidget :public wxPanel -{ - -public: - wxColourPickerCtrlWidget( ColourSelectorButton* box, - wxWindow *parent, - unsigned char cr, - unsigned char cg, - unsigned char cb ); - ~wxColourPickerCtrlWidget(); - void OnColorChange(wxColourPickerEvent& e); - void UpdateBox(); -private: - wxColourPickerCtrl *picker; - ColourSelectorButton *mBox; -}; -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - - - - -//------------------------------------------------------------------------ -// The black box - class /*BBTK_EXPORT*/ ColourSelectorButton : public bbtk::WxBlackBox - { - BBTK_USER_BLACK_BOX_INTERFACE(ColourSelectorButton,bbtk::WxBlackBox); + //------------------------------------------------------------------------ + // The black box + class bbwx_EXPORT ColourSelectorButton : public bbtk::WxBlackBox + { + BBTK_BLACK_BOX_INTERFACE(ColourSelectorButton,bbtk::WxBlackBox); BBTK_DECLARE_INPUT(In,std::string); BBTK_DECLARE_OUTPUT(Out,std::string); BBTK_PROCESS(Process); BBTK_CREATE_WIDGET(CreateWidget); void Process(); - void CreateWidget(); - + void CreateWidget(wxWindow*); protected: - virtual void bbUserConstructor(); - - private: - wxColourPickerCtrlWidget* pickerWidget; + }; - //================================================================= - // UserBlackBox description + + //================================================================= + // BlackBox description BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColourSelectorButton,bbtk::WxBlackBox); + // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); BBTK_NAME("ColourSelectorButton"); BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); - // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); BBTK_DESCRIPTION("A button which displays a colour picker dialog when clicked"); - BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string); - BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string); + BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string,"colour"); + BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"colour"); BBTK_END_DESCRIBE_BLACK_BOX(ColourSelectorButton); //================================================================= - - -}//namespace bbwx -#endif // __bbwxColourSelectorButton_h_INCLUDED_H__ +}//namespace bbtk +#endif // __bbtkWxColourSelector_h__ -#endif //_USE_WXWIDGETS_ +#endif //USE_WXWIDGETS