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=a8020e41a0c4af6d47a28e1f1a14969f1f9edd68;hpb=4970ac35d6d4bc3cea54e8e6033b34c01c3103fb;p=creaMaracasVisu.git diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx index a8020e4..c76cc21 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx +++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx @@ -43,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) { @@ -78,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()"< SetOrientation( bbGetInputOrientation()==1 ); mwxwidget -> setActiveStateTo(true); mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 ); @@ -110,6 +112,7 @@ void SliderMinMax::CreateWidget() //------------------------------------------------------ void SliderMinMax::bbUserConstructor() { + mwxwidget = NULL; bbSetInputOrientation(1); bbSetInputInW(200); bbSetInputInH(65); @@ -126,7 +129,7 @@ void SliderMinMax::bbUserConstructor() } //------------------------------------------------------ -void SliderMinMax::bbUserCopyConstructor() +void SliderMinMax::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { }