X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuSliderMinMax.cxx;h=b3b5caa79b7eb600bdae91399ea28726e9780288;hb=e78a80c507961553cc6186b93a793c0d1fc96be2;hp=4987b9f16a2a2a12b24c07510799d8a152506af4;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index 4987b9f..b3b5caa 100644
--- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
@@ -1,8 +1,8 @@
 #include "bbmaracasvisuSliderMinMax.h"
-#include "bbmaracasvisuPackage.h"
+#include "bbcreaMaracasVisuPackage.h"
 
 
-namespace bbmaracasvisu
+namespace bbcreaMaracasVisu
 {
 
   //------------------------------------------------------------------------------------------------------------------------------------
@@ -19,8 +19,9 @@ namespace bbmaracasvisu
 			mbbtkSliderMinMax = bbParent;
 			modBarRange->PushEventHandler(this);
 			Connect(modBarRange->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxWidgetSliderMinMax::onBarrange );
+//			Connect(modBarRange->GetId(),98765,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onActualChange_Bar );
 			Connect(modBarRange->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onActualChange_Bar );
-			Connect(modBarRange->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onStartChange_Bar );
+			Connect(modBarRange->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onStartChange_Bar );		
 			Connect(modBarRange->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onEndChange_Bar );
 			Connect(modBarRange->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onSelectionEnd );
 			Connect(modBarRange->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onMovedBar );		
@@ -37,20 +38,25 @@ namespace bbmaracasvisu
 		void wxWidgetSliderMinMax :: onBarrange(wxCommandEvent& event)
 		{
 		}
+
 		void wxWidgetSliderMinMax :: onActualChange_Bar(wxCommandEvent& event)
 		{
+printf ("EED wxWidgetSliderMinMax :: onActualChange_Bar \n"); 
 			mbbtkSliderMinMax->bbSetOutputOutActual(modBarRange->GetActual());
-			mbbtkSliderMinMax->bbSignalOutputModification("OutActual");
+			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutActual"));
 		}
+
 		void wxWidgetSliderMinMax :: onStartChange_Bar(wxCommandEvent& event)
 		{
+printf ("EED wxWidgetSliderMinMax :: onStartChange_Bar \n"); 
 			mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart());
-			mbbtkSliderMinMax->bbSignalOutputModification("OutStart");
+			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutStart"));
 		}
 		void wxWidgetSliderMinMax :: onEndChange_Bar(wxCommandEvent& event)
 		{
+printf ("EED wxWidgetSliderMinMax :: onEndChange_Bar \n"); 
 			mbbtkSliderMinMax->bbSetOutputOutEnd(modBarRange->GetEnd());
-			mbbtkSliderMinMax->bbSignalOutputModification("OutEnd");
+			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutEnd"));
 		}
 		void wxWidgetSliderMinMax :: onSelectionEnd(wxCommandEvent& event)
 		{
@@ -66,7 +72,7 @@ namespace bbmaracasvisu
   //--------------------------------------------------------------------------
 
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,SliderMinMax)
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,SliderMinMax)
 BBTK_BLACK_BOX_IMPLEMENTATION(SliderMinMax,bbtk::WxBlackBox);
 
 //------------------------------------------------------
@@ -78,12 +84,12 @@ void SliderMinMax::Process()
 }
 
 //------------------------------------------------------
-void SliderMinMax::CreateWidget()
+void SliderMinMax::CreateWidget(wxWindow* parent)
 {
 
     bbtkDebugMessageInc("Core",9,"SliderMinMax::CreateWidget()"<<std::endl);
 
-		mwxwidget = new mBarRange( bbGetWxParent() ,bbGetInputInW(), bbGetInputInH()); 
+		mwxwidget = new mBarRange(parent ,bbGetInputInW(), bbGetInputInH()); 
 		mwxwidget -> SetOrientation( bbGetInputOrientation()==1 );
 		mwxwidget -> setActiveStateTo(true);
 		mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 );
@@ -93,7 +99,7 @@ void SliderMinMax::CreateWidget()
 		mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual());
 		mwxwidget -> SetStart(bbGetInputInMinShow());
 		mwxwidget -> SetEnd(bbGetInputInMaxShow());  
-		wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget);
+		//wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); //JPRx
 		bbtkDebugDecTab("Core",9);
 
 	bbSetOutputWidget( mwxwidget );
@@ -120,7 +126,7 @@ void SliderMinMax::bbUserConstructor()
 }
 
 //------------------------------------------------------
-void SliderMinMax::bbUserCopyConstructor()
+void SliderMinMax::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }
 
@@ -130,6 +136,6 @@ void SliderMinMax::bbUserDestructor()
 }
 
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu