X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuColorBar.cxx;h=3d2a1e483c1e4704f39b47265b4aa4cf887e12e4;hb=54bb3fba5f59ca71cb82d87043e21354dd85e7aa;hp=7e57f4d0de303423f05b5bc3b8fe124ddafc447c;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuColorBar.cxx b/bbtk/src/bbmaracasvisuColorBar.cxx
index 7e57f4d..3d2a1e4 100644
--- a/bbtk/src/bbmaracasvisuColorBar.cxx
+++ b/bbtk/src/bbmaracasvisuColorBar.cxx
@@ -1,9 +1,9 @@
 #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 +12,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 +29,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 +43,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