X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuSliderMinMax.cxx;h=0b22df73af068e66a65aa64fa5d20e594251b420;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=ce4ea2f904c03b4708c0570b88947d299b1e15fe;hpb=738e5bef4c52a1f25013e598a008a81f20fc6f63;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
index ce4ea2f..0b22df7 100644
--- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx
+++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuSliderMinMax.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -12,12 +37,11 @@ namespace bbcreaMaracasVisu
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // 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 );
@@ -31,6 +55,10 @@ namespace bbcreaMaracasVisu
 		{
 		}
 		
+		void wxWidgetSliderMinMax::PushEventHandler()
+		{
+			modBarRange->PushEventHandler(this);
+		}
 
 	  //--------------------------------------------------------------------------------------------------------------------------------
 	  // Min-Max Barrange received events
@@ -48,16 +76,20 @@ namespace bbcreaMaracasVisu
 		void wxWidgetSliderMinMax :: onStartChange_Bar(wxCommandEvent& event)
 		{
 			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(std::string("OutEnd"));
 		}
+	
 		void wxWidgetSliderMinMax :: onSelectionEnd(wxCommandEvent& event)
 		{
 		}
+
 		void wxWidgetSliderMinMax :: onMovedBar(wxCommandEvent& event)
 		{
 		}
@@ -76,6 +108,13 @@ BBTK_BLACK_BOX_IMPLEMENTATION(SliderMinMax,bbtk::WxBlackBox);
 void SliderMinMax::Process()
 {
 	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());
@@ -88,18 +127,23 @@ void SliderMinMax::CreateWidget(wxWindow* parent)
 
     bbtkDebugMessageInc("Core",9,"SliderMinMax::CreateWidget()"<<std::endl);
 
-		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); //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 );
 
@@ -109,7 +153,8 @@ void SliderMinMax::CreateWidget(wxWindow* parent)
 //------------------------------------------------------
 void SliderMinMax::bbUserSetDefaultValues()
 {
-		mwxwidget = NULL;
+		firsttime	=	true;
+		mwxwidget	=	NULL;
 		bbSetInputOrientation(1);
 		bbSetInputInW(200);
 		bbSetInputInH(65);