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

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index cb3755a..ce4ea2f 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,22 @@ namespace bbmaracasvisu
 		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->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)
 		{
@@ -66,24 +69,26 @@ 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){
+		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 = new mBarRange(parent ,bbGetInputInW(), bbGetInputInH()); 
 		mwxwidget -> SetOrientation( bbGetInputOrientation()==1 );
 		mwxwidget -> setActiveStateTo(true);
 		mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 );
@@ -102,8 +107,9 @@ void SliderMinMax::CreateWidget()
 }
 
 //------------------------------------------------------
-void SliderMinMax::bbUserConstructor()
+void SliderMinMax::bbUserSetDefaultValues()
 {
+		mwxwidget = NULL;
 		bbSetInputOrientation(1);
 		bbSetInputInW(200);
 		bbSetInputInH(65);
@@ -119,17 +125,20 @@ void SliderMinMax::bbUserConstructor()
 		bbSetOutputOutActual(0);
 }
 
-//------------------------------------------------------
-void SliderMinMax::bbUserCopyConstructor()
-{
-}
-
-//------------------------------------------------------
-void SliderMinMax::bbUserDestructor()
-{
-}
+		
+	//-----------------------------------------------------------------	
+	void SliderMinMax::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void SliderMinMax::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
 
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu