X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuSliderMinMax.cxx;h=d39065ff27c4cd09a99d63d332b694ca2e7f3a8f;hb=0738bcbc9e571daa06e0249bc9d9b8c42b30cecf;hp=2c074cab6cfb9e224db87a0f74c45b0c68281dbe;hpb=2ea436781de525e1ffa633997c9df9b938f170ff;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index 2c074ca..d39065f 100644
--- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
@@ -12,12 +12,11 @@ namespace bbcreaMaracasVisu
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // Constructors ans destructors
 	  //--------------------------------------------------------------------------------------------------------------------------------
-		wxWidgetSliderMinMax :: wxWidgetSliderMinMax(SliderMinMax *bbParent,mBarRange * modelBarRange)//(wxWindow *parent, mBarRange * modelBarRange)
+		wxWidgetSliderMinMax :: wxWidgetSliderMinMax(SliderMinMax *bbParent,mBarRange * modelBarRange)
 		:wxEvtHandler()
 		{			
-			modBarRange = modelBarRange;
-			mbbtkSliderMinMax = bbParent;
-			modBarRange->PushEventHandler(this);
+			modBarRange			= modelBarRange;
+			mbbtkSliderMinMax	= bbParent;
 			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 );
@@ -30,8 +29,12 @@ namespace bbcreaMaracasVisu
 		wxWidgetSliderMinMax ::  ~wxWidgetSliderMinMax()
 		{
 		}
-		
-
+			
+		void wxWidgetSliderMinMax::PushEventHandler()
+		{
+			modBarRange->PushEventHandler(this);
+		}
+	
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // Min-Max Barrange received events
 	  //--------------------------------------------------------------------------------------------------------------------------------
@@ -47,17 +50,21 @@ namespace bbcreaMaracasVisu
 
 		void wxWidgetSliderMinMax :: onStartChange_Bar(wxCommandEvent& event)
 		{
-			mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart());
+			mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart());			
+			mbbtkSliderMinMax->bbSetInputInMinShow(modBarRange->GetStart());
 			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutStart"));
 		}
+	
 		void wxWidgetSliderMinMax :: onEndChange_Bar(wxCommandEvent& event)
 		{
 			mbbtkSliderMinMax->bbSetOutputOutEnd(modBarRange->GetEnd());
 			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutEnd"));
 		}
+	
 		void wxWidgetSliderMinMax :: onSelectionEnd(wxCommandEvent& event)
 		{
 		}
+
 		void wxWidgetSliderMinMax :: onMovedBar(wxCommandEvent& event)
 		{
 		}
@@ -95,18 +102,23 @@ void SliderMinMax::CreateWidget(wxWindow* parent)
 
     bbtkDebugMessageInc("Core",9,"SliderMinMax::CreateWidget()"<<std::endl);
 
-		mwxwidget = new mBarRange(parent ,bbGetInputInW(), bbGetInputInH()); 
-		mwxwidget -> SetOrientation( bbGetInputOrientation()==1 );
-		mwxwidget -> setActiveStateTo(true);
-		mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 );
-		mwxwidget -> setDeviceEndMargin(10);
+	mwxwidget = new mBarRange(parent ,bbGetInputInW(), bbGetInputInH()); 
+	mwxwidget -> SetOrientation( bbGetInputOrientation()==1 );
+	mwxwidget -> setActiveStateTo(true);
+	mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 );
+	mwxwidget -> setDeviceEndMargin(10);
 //   	    mwxwidget -> setRepresentedValues(bbGetInputInMin(), bbGetInputInMax());
-		mwxwidget -> setDeviceBlitStart(10,10); 
-		mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual());
+	mwxwidget -> setDeviceBlitStart(10,10); 
+	mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual());
 //		mwxwidget -> SetStart(bbGetInputInMinShow());
 //		mwxwidget -> SetEnd(bbGetInputInMaxShow());  
-		//wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); //JPRx
-		bbtkDebugDecTab("Core",9);
+	
+	
+	wxWidgetSliderMinMax *eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); 
+	eventHandler->PushEventHandler();
+
+	
+	bbtkDebugDecTab("Core",9);
 
 	bbSetOutputWidget( mwxwidget );