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

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index cb3755a..d39065f 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
 {
 
   //------------------------------------------------------------------------------------------------------------------------------------
@@ -12,15 +12,15 @@ namespace bbmaracasvisu
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // 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 );
-			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 );		
@@ -29,32 +29,42 @@ namespace bbmaracasvisu
 		wxWidgetSliderMinMax ::  ~wxWidgetSliderMinMax()
 		{
 		}
-		
-
+			
+		void wxWidgetSliderMinMax::PushEventHandler()
+		{
+			modBarRange->PushEventHandler(this);
+		}
+	
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // Min-Max Barrange received events
 	  //--------------------------------------------------------------------------------------------------------------------------------
 		void wxWidgetSliderMinMax :: onBarrange(wxCommandEvent& event)
 		{
 		}
+
 		void wxWidgetSliderMinMax :: onActualChange_Bar(wxCommandEvent& event)
 		{
 			mbbtkSliderMinMax->bbSetOutputOutActual(modBarRange->GetActual());
-			mbbtkSliderMinMax->bbSignalOutputModification("OutActual");
+			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutActual"));
 		}
+
 		void wxWidgetSliderMinMax :: onStartChange_Bar(wxCommandEvent& event)
 		{
-			mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart());
-			mbbtkSliderMinMax->bbSignalOutputModification("OutStart");
+			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("OutEnd");
+			mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutEnd"));
 		}
+	
 		void wxWidgetSliderMinMax :: onSelectionEnd(wxCommandEvent& event)
 		{
 		}
+
 		void wxWidgetSliderMinMax :: onMovedBar(wxCommandEvent& event)
 		{
 		}
@@ -66,35 +76,49 @@ 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);
 
 //------------------------------------------------------
 void SliderMinMax::Process()
 {
-	bbSetOutputOutStart(mwxwidget->GetStart());
-	bbSetOutputOutEnd(mwxwidget->GetEnd());
-	bbSetOutputOutActual(mwxwidget->GetActual());
+	if (mwxwidget!=NULL){
+		if (firsttime==true)
+		{
+			firsttime=false;
+			mwxwidget -> setRepresentedValues( bbGetInputInMin(), bbGetInputInMax() );
+			mwxwidget -> SetStart(bbGetInputInMinShow());
+			mwxwidget -> SetEnd(bbGetInputInMaxShow());  
+		}
+		bbSetOutputOutStart(mwxwidget->GetStart());
+		bbSetOutputOutEnd(mwxwidget->GetEnd());
+		bbSetOutputOutActual(mwxwidget->GetActual());
+	} // mwxwidget
 }
 
 //------------------------------------------------------
-void SliderMinMax::CreateWidget()
+void SliderMinMax::CreateWidget(wxWindow* parent)
 {
 
     bbtkDebugMessageInc("Core",9,"SliderMinMax::CreateWidget()"<<std::endl);
 
-		mwxwidget = new mBarRange( bbGetWxParent() ,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 -> SetStart(bbGetInputInMinShow());
-		mwxwidget -> SetEnd(bbGetInputInMaxShow());  
-		//wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); //JPRx
-		bbtkDebugDecTab("Core",9);
+	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 -> SetStart(bbGetInputInMinShow());
+//		mwxwidget -> SetEnd(bbGetInputInMaxShow());  
+	
+	
+	wxWidgetSliderMinMax *eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); 
+	eventHandler->PushEventHandler();
+
+	
+	bbtkDebugDecTab("Core",9);
 
 	bbSetOutputWidget( mwxwidget );
 
@@ -102,8 +126,10 @@ void SliderMinMax::CreateWidget()
 }
 
 //------------------------------------------------------
-void SliderMinMax::bbUserConstructor()
+void SliderMinMax::bbUserSetDefaultValues()
 {
+		firsttime	=	true;
+		mwxwidget	=	NULL;
 		bbSetInputOrientation(1);
 		bbSetInputInW(200);
 		bbSetInputInH(65);
@@ -119,17 +145,20 @@ void SliderMinMax::bbUserConstructor()
 		bbSetOutputOutActual(0);
 }
 
-//------------------------------------------------------
-void SliderMinMax::bbUserCopyConstructor()
-{
-}
-
-//------------------------------------------------------
-void SliderMinMax::bbUserDestructor()
-{
-}
+		
+	//-----------------------------------------------------------------	
+	void SliderMinMax::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void SliderMinMax::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
 
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu