X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxColourSelectorButton.cxx;h=f61de883dbe95be403088ca616044c4ae026deda;hb=fb65ef0feb38b84723ea928ec3d3c056ba26274e;hp=791d96771d432f24fefa03d70d19b0d9e9b1c3ff;hpb=5e3d12f47887915d40f55316633783da9f2a6802;p=bbtk.git

diff --git a/packages/wx/src/bbwxColourSelectorButton.cxx b/packages/wx/src/bbwxColourSelectorButton.cxx
index 791d967..f61de88 100644
--- a/packages/wx/src/bbwxColourSelectorButton.cxx
+++ b/packages/wx/src/bbwxColourSelectorButton.cxx
@@ -1,27 +1,40 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.cxx,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: 2008/12/12 08:55:23 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
+ * \file
  * \brief Short description in one line
  *
- * Long 
+ * Long
  * description
- *  
+ *
  */
 
 #ifdef _USE_WXWIDGETS_
@@ -29,13 +42,32 @@
 #include "bbwxColourSelectorButton.h"
 #include "bbwxPackage.h"
 
+#include <wx/clrpicker.h>
 
 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, 
+
+//-------------------------------------------------------------------------
+wxColourPickerCtrlWidget::wxColourPickerCtrlWidget(	ColourSelectorButton* box,
 													wxWindow *parent, 
 													unsigned char  cr,
 													unsigned char  cg,
@@ -55,15 +87,15 @@ wxColourPickerCtrlWidget::wxColourPickerCtrlWidget(	ColourSelectorButton* box,
 				);
     picker->SetPickerCtrlGrowable(false);
     picker->SetTextCtrlGrowable(false);
-    
+
     Connect ( picker->GetId(),
 	      wxEVT_COMMAND_COLOURPICKER_CHANGED,
 	      wxColourPickerEventHandler( wxColourPickerCtrlWidget::OnColorChange ) );
-    
+
     bbtkDebugMessage("Process",9,"<= wxColourPickerCtrlWidget::wxColourPickerCtrlWidget"<<std::endl);
     wxFlexGridSizer *sizer = new wxFlexGridSizer(10);
 	sizer -> AddGrowableRow(0);
-	sizer -> Add( picker, 1, wxEXPAND, 0 );		
+	sizer -> Add( picker, 1, wxEXPAND, 0 );
 	panel -> SetSizer(sizer);
   }
 
@@ -101,20 +133,34 @@ void wxColourPickerCtrlWidget::UpdateBox()
 
   //--------------------------------------------------------------------------
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(ColourSelectorButton,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(ColourSelectorButton,bbtk::WxBlackBox);
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ColourSelectorButton);
   
   void ColourSelectorButton::bbUserConstructor() 
   { 
+  // 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::Process() 
   { 
-    bbtkDebugMessageInc("Process",9,"ColourSelectorButton::Process()"<<std::endl);
-      pickerWidget->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());
+      }
   }
 
 
@@ -123,9 +169,8 @@ void wxColourPickerCtrlWidget::UpdateBox()
    *
    *
    */
-  void ColourSelectorButton::CreateWidget()
+  void ColourSelectorButton::CreateWidget(wxWindow* parent)
   {
-    bbtkDebugMessage("Process",9,"=> ColourSelectorButton::CreateWidget()"<<std::endl);
     
     float r,g,b;
     sscanf( bbGetInputIn().c_str(), "%f %f %f", &r, &g ,&b);
@@ -134,11 +179,11 @@ void wxColourPickerCtrlWidget::UpdateBox()
     cg = (unsigned char)(255.*g);
     cb = (unsigned char)(255.*b);
 
-    pickerWidget = new wxColourPickerCtrlWidget(this, bbGetWxParent() , cr , cg , cb );    
+    wxColourPickerCtrlWidget* w = new wxColourPickerCtrlWidget(this, //bbGetWxParent() , 
+								parent,
+								cr , cg , cb );    
     
-    bbtkDebugMessage("Process",9,"<= ColourSelectorButton::CreateWidget()"<<std::endl);
-
-    bbSetOutputWidget( pickerWidget );
+    bbSetOutputWidget( w );
   }