X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuColorBar.h;h=94e81b14fc74ac35175935c218ea15bf4edb9404;hb=2a1cde86bf45b8f9b11514a9b04d5834b10af209;hp=f1a92bf6267d9d1f4c5d575abbb37b04a55eef4a;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuColorBar.h b/bbtk/src/bbmaracasvisuColorBar.h
index f1a92bf..94e81b1 100644
--- a/bbtk/src/bbmaracasvisuColorBar.h
+++ b/bbtk/src/bbmaracasvisuColorBar.h
@@ -1,14 +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.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_WXWIDGETS_
-#ifndef __bbmaracasvisuColorBar_h_INCLUDED__
-#define __bbmaracasvisuColorBar_h_INCLUDED__
+#ifndef __bbcreaMaracasVisuColorBar_h_INCLUDED__
+#define __bbcreaMaracasVisuColorBar_h_INCLUDED__
 #include "bbtkWxBlackBox.h"
 
-#include "bbmaracasvisuColorBar.h"
-#include "bbmaracasvisuPackage.h"
+#include "bbcreaMaracasVisuPackage.h"
 #include "pColorBar.h"
 
 
-namespace bbmaracasvisu
+namespace bbcreaMaracasVisu
 {
 
 class /*BBTK_EXPORT*/ ColorBar
@@ -16,14 +40,6 @@ class /*BBTK_EXPORT*/ ColorBar
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ColorBar,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor();
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
     BBTK_DECLARE_INPUT(Orientation, int );
 	BBTK_DECLARE_INPUT(InW, int );
 	BBTK_DECLARE_INPUT(InH, int );
@@ -36,7 +52,7 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow*);
 
   private:
 	pColorBar *mwxwidget;
@@ -47,8 +63,6 @@ BBTK_NAME("ColorBar");
 BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr");
 BBTK_DESCRIPTION("Degrade Color Bar Window");
 //BBTK_CATEGORY("__CategoryBlackBox__");
-  BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Degrade Color Bar Window");
   BBTK_INPUT(ColorBar,Orientation,"Orientation ", int,"");
   BBTK_INPUT(ColorBar,InW,"Width ", int,"");
   BBTK_INPUT(ColorBar,InH,"Height ", int,"");
@@ -60,8 +74,8 @@ BBTK_DESCRIPTION("Degrade Color Bar Window");
   BBTK_INPUT(ColorBar,Values, "Values ",std::vector<int>,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ColorBar);
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu
 
-#endif // __bbmaracasvisuColorBar_h_INCLUDED__
+#endif // __bbcreaMaracasVisuColorBar_h_INCLUDED__
 #endif // _USE_WXWIDGETS_