X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxColourSelectorButton.cxx;h=df4ed6eebca98b56c84bfed73cadb9bb3c9679e3;hb=49cb3ed3b5b7e58ab54dd3b6eb4ad8adee824ef2;hp=9328d6ae5405c86ce1d40c7fa8261d40448fc882;hpb=e4149b56dda0cfb15427533e6f573f09cd3ff74b;p=bbtk.git diff --git a/packages/wx/src/bbwxColourSelectorButton.cxx b/packages/wx/src/bbwxColourSelectorButton.cxx index 9328d6a..df4ed6e 100644 --- a/packages/wx/src/bbwxColourSelectorButton.cxx +++ b/packages/wx/src/bbwxColourSelectorButton.cxx @@ -1,33 +1,38 @@ -/*========================================================================= +/* + # --------------------------------------------------------------------- + # + # 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.cxx,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:51 $ - Version: $Revision: 1.6 $ + Date: $Date: 2012/11/16 08:52:14 $ + Version: $Revision: 1.11 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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. -* ------------------------------------------------------------------------ */ - /** * \file * \brief Short description in one line @@ -42,9 +47,29 @@ #include "bbwxColourSelectorButton.h" #include "bbwxPackage.h" +#include namespace bbwx { +//------------------------------------------------------------------------- +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; +}; +//------------------------------------------------------------------------- //------------------------------------------------------------------------- wxColourPickerCtrlWidget::wxColourPickerCtrlWidget( ColourSelectorButton* box, @@ -116,17 +141,44 @@ void wxColourPickerCtrlWidget::UpdateBox() BBTK_BLACK_BOX_IMPLEMENTATION(ColourSelectorButton,bbtk::WxBlackBox); BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ColourSelectorButton); - void ColourSelectorButton::bbUserConstructor() - { - bbSetInputIn("1 1 1"); - } - + //----------------------------------------------------------------- + void ColourSelectorButton::bbUserSetDefaultValues() + { + // Default input value + bbSetInputIn("1 1 1"); + // Initial output value = the same than input + bbSetOutputOut("1 1 1"); + // IMPORTANT : Initialize output widget to null pointer to test it after + bbSetOutputWidget(0); + } + + //----------------------------------------------------------------- + void ColourSelectorButton::bbUserInitializeProcessing() + { + } + + //----------------------------------------------------------------- + void ColourSelectorButton::bbUserFinalizeProcessing() + { + } void ColourSelectorButton::Process() { - bbtkDebugMessageInc("Process",9,"ColourSelectorButton::Process()"<UpdateBox(); - bbtkDebugDecTab("Process",9); +/* + // The widget may not be created : have to test it before using it + wxColourPickerCtrlWidget* w = ( wxColourPickerCtrlWidget* )bbGetOutputWidget(); + if (w) + { + w->UpdateBox(); + } + else + { + // If widget does not exist yet you have to update the output value according + // to the input (which may have changed if the user set it) + bbSetOutputOut(bbGetInputIn()); + } +*/ + } @@ -137,7 +189,6 @@ void wxColourPickerCtrlWidget::UpdateBox() */ void ColourSelectorButton::CreateWidget(wxWindow* parent) { - bbtkDebugMessage("Process",9,"=> ColourSelectorButton::CreateWidget()"<