*** empty log message ***

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuSliderMinMax.cxx

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index 4987b9f16a2a2a12b24c07510799d8a152506af4..ce4ea2f904c03b4708c0570b88947d299b1e15fe 100644 (file)
--- 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 );
@@ -93,7 +98,7 @@ void SliderMinMax::CreateWidget()
                mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual());
                mwxwidget -> SetStart(bbGetInputInMinShow());
                mwxwidget -> SetEnd(bbGetInputInMaxShow());  
-               wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget);
+               //wxWidgetSliderMinMax * eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); //JPRx
                bbtkDebugDecTab("Core",9);
 
        bbSetOutputWidget( mwxwidget );
@@ -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