X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuSliderMinMax.cxx;h=c76cc21b338152d7fab7850415e51457c18de328;hb=21c2226cf3dcad1daf3fb04818583b559694fa81;hp=54d0096ba5fc1f0573955e19bd6f9bf100d5a9d7;hpb=059d790d40c29a646fa02dfd30ee5b604aaba6ad;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index 54d0096..c76cc21 100644
--- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
@@ -19,8 +19,9 @@ namespace bbcreaMaracasVisu
 			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 );		
@@ -42,20 +43,20 @@ namespace bbcreaMaracasVisu
 		{
 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)
 		{
@@ -77,18 +78,20 @@ 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 );
@@ -109,6 +112,7 @@ void SliderMinMax::CreateWidget()
 //------------------------------------------------------
 void SliderMinMax::bbUserConstructor()
 {
+		mwxwidget = NULL;
 		bbSetInputOrientation(1);
 		bbSetInputInW(200);
 		bbSetInputInH(65);
@@ -125,7 +129,7 @@ void SliderMinMax::bbUserConstructor()
 }
 
 //------------------------------------------------------
-void SliderMinMax::bbUserCopyConstructor()
+void SliderMinMax::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }