X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxColourSelector.h;h=77e4c6a47e11313e35a26476f11da6ede9672191;hb=f5d5e297c656fb1304cccd72e9ac347c0bddbd09;hp=3bdebbd2f2a94fca2a38b0e8b8882b0595665821;hpb=9525de09e988104a05a98acc18ba1ebc773b5f49;p=bbtk.git

diff --git a/packages/wx/src/bbwxColourSelector.h b/packages/wx/src/bbwxColourSelector.h
index 3bdebbd..77e4c6a 100644
--- a/packages/wx/src/bbwxColourSelector.h
+++ b/packages/wx/src/bbwxColourSelector.h
@@ -1,21 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/05/07 13:14:48 $
-  Version:   $Revision: 1.4 $
-                                                                                
-  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.
+  Date:      $Date: 2009/05/15 14:58:03 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
 
-     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.
+/* ---------------------------------------------------------------------
 
-=========================================================================*//**
- /**
+* 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
  * 
@@ -31,11 +45,16 @@
 
 #ifdef _USE_WXWIDGETS_
 
-
+// Prevents multiple inclusions : use symbols of the form
+// __FILENAME_INCLUDED__ 
+// where FILENAME must be replaced by the actual file name
 #ifndef __bbWxColourSelector_h__
 #define __bbWxColourSelector_h__
 
-#include "bbtkWxBlackBox.h"
+// Include base BlackBox definition
+#include "bbtkAtomicBlackBox.h"
+// Include bbwx_EXPORT symbol definition
+#include "bbwx_EXPORT.h"
 
 // Namespace of the package "wx" is "bbwx" 
 // Namespace associated to packages should be of the form :
@@ -44,36 +63,28 @@ namespace bbwx
 {
 
   //=================================================================
-  class /*BBTK_EXPORT*/ ColourSelector : public bbtk::AtomicBlackBox
+  class bbwx_EXPORT ColourSelector : public bbtk::AtomicBlackBox
   {
     BBTK_BLACK_BOX_INTERFACE(ColourSelector,bbtk::AtomicBlackBox);
     BBTK_DECLARE_OUTPUT(Out,std::string);
     BBTK_PROCESS(Process);
-//    BBTK_CREATE_WIDGET(CreateWidget);
     void Process();
-//    void CreateWidget();
-
   protected:
-    virtual void bbUserConstructor();
- // private:
- //   wxColourSelector* mColorDialog;
+	  
   };
-  //=================================================================
-
+  
   //=================================================================
   // UserBlackBox description
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColourSelector,bbtk::AtomicBlackBox);
-  // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
+  BBTK_CATEGORY("widget");
   BBTK_NAME("ColourSelector");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Colour Selector dialog (bbfication of wxColourSelector)");
-  BBTK_OUTPUT(ColourSelector,Out,"The colour selected by the user",std::string,"colour");
+  BBTK_OUTPUT(ColourSelector,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"colour");
   BBTK_END_DESCRIBE_BLACK_BOX(ColourSelector);
   //=================================================================
 
-}
-
-//namespace bbtk
-#endif  //__bbtkWxColourSelector_h__
+}//namespace bbtk
 
-#endif //_USE_WXWIDGETS_
+#endif  // __bbtkWxColourSelector_h__
+#endif //USE_WXWIDGETS