#2647 creaMaracasVisu Feature New Normal - Merge creaButtonContainer BRANCH

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuColorBar.cxx

diff --git a/bbtk/src/bbmaracasvisuColorBar.cxx b/bbtk/src/bbmaracasvisuColorBar.cxx
index 7e57f4d0de303423f05b5bc3b8fe124ddafc447c..9ebda6a9f0c9f29114f9d586f9a93eaee2585eea 100644 (file)
--- a/bbtk/src/bbmaracasvisuColorBar.cxx
+++ b/bbtk/src/bbmaracasvisuColorBar.cxx
@@ -1,9 +1,34 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuColorBar.h"
-#include "bbmaracasvisuPackage.h"
-namespace bbmaracasvisu
+#include "bbcreaMaracasVisuPackage.h"
+namespace bbcreaMaracasVisu
 {
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ColorBar)
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ColorBar)
 BBTK_BLACK_BOX_IMPLEMENTATION(ColorBar,bbtk::WxBlackBox);
 
 //--------------------------------------------------
@@ -12,12 +37,12 @@ void ColorBar::Process()
 }
 
 //--------------------------------------------------
-void ColorBar::CreateWidget()
+void ColorBar::CreateWidget(wxWindow* parent)
 {
 //   bbSetOutputWidget( new wxStaticText ( bbGetWxParent() , -1 , _T("") ) );
 //   Process();
                bbtkDebugMessageInc("Core",9,"ColorBar::CreateWidget()"<<std::endl);
-               mwxwidget = new pColorBar( bbGetWxParent() ,bbGetInputInW(), bbGetInputInH(), bbGetInputOrientation()==1); 
+               mwxwidget = new pColorBar( parent ,bbGetInputInW(), bbGetInputInH(), bbGetInputOrientation()==1); 
                mwxwidget -> setActiveStateTo( true );
            mwxwidget -> setRepresentedValues(bbGetInputInMin(), bbGetInputInMax());
                mwxwidget -> setDeviceEndMargin(10);
@@ -29,7 +54,7 @@ void ColorBar::CreateWidget()
                if(vectRED.size()==vectGREEN.size() && vectGREEN.size()==vectBLUE.size() && vectBLUE.size()==vectVALUES.size())
                {
                        int i=0;
-                       while ( i< vectVALUES.size())
+                       while ( i< (int)(vectVALUES.size()))
                        {
                                mwxwidget -> addColorPoint ( (double)vectVALUES[i], wxColour(vectRED[i], vectGREEN[i], vectBLUE[i]));
                                i++;
@@ -43,27 +68,30 @@ void ColorBar::CreateWidget()
 }
 
 //--------------------------------------------------
-void ColorBar::bbUserConstructor()
+void ColorBar::bbUserSetDefaultValues()
 {
+               mwxwidget = NULL;
                bbSetInputOrientation(1);
                bbSetInputInW(200);
                bbSetInputInH(80);
                bbSetInputInMax(1);
                bbSetInputInMin(1);     
 }
-
-//--------------------------------------------------
-void ColorBar::bbUserCopyConstructor()
-{
-}
-
-//--------------------------------------------------
-void ColorBar::bbUserDestructor()
-{
-}
-
+       
+       //-----------------------------------------------------------------     
+       void ColorBar::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ColorBar::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu