X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FmBarRange.h;h=25d4e2f276f34a0dec2a90ec3043167c90728ef7;hb=659bcd2c2a608cfb8c5854ffe84e9248871df9a1;hp=f1d95b79eed7ad4b41c6a2d47b8ef08a585c38c9;hpb=4970ac35d6d4bc3cea54e8e6033b34c01c3103fb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h
index f1d95b7..25d4e2f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h
@@ -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.
+# ------------------------------------------------------------------------ */
+
 
 
 #ifndef __mBAR__RANGE__
@@ -29,14 +54,14 @@
 //----------------------------------------------------------------------------
 
 BEGIN_DECLARE_EVENT_TYPES()
- DECLARE_EVENT_TYPE(wxEVT_TSBAR,-1) 
-//DECLARE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL,-1)
-//DECLARE_EXPORTED_EVENT_TYPE(MARACASVISULIB_EXPORTS,wxEVT_TSBAR_ACTUAL,-1)
-extern MARACASVISULIB_EXPORTS const wxEventType wxEVT_TSBAR_ACTUAL;
- DECLARE_EVENT_TYPE(wxEVT_TSBAR_START,-1)
- DECLARE_EVENT_TYPE(wxEVT_TSBAR_END,-1)
- DECLARE_EVENT_TYPE(wxEVT_TSBAR_MOVED,-1)
- DECLARE_EVENT_TYPE(wxEVT_SELECTION_END,-1)
+ 	DECLARE_EVENT_TYPE(wxEVT_TSBAR,-1) 
+	DECLARE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL,-1)
+//	DECLARE_EXPORTED_EVENT_TYPE(MARACASVISULIB_EXPORTS,wxEVT_TSBAR_ACTUAL,-1)
+//	extern creaMaracasVisu_EXPORT const wxEventType wxEVT_TSBAR_ACTUAL;
+ 	DECLARE_EVENT_TYPE(wxEVT_TSBAR_START,-1)
+ 	DECLARE_EVENT_TYPE(wxEVT_TSBAR_END,-1)
+ 	DECLARE_EVENT_TYPE(wxEVT_TSBAR_MOVED,-1)
+	DECLARE_EVENT_TYPE(wxEVT_SELECTION_END,-1)
 END_DECLARE_EVENT_TYPES()
 
 
@@ -54,12 +79,13 @@ enum
 };
 
 
-class MARACASVISULIB_EXPORTS mBarRange :public  wxScrolledWindow{
+class creaMaracasVisu_EXPORT mBarRange :public  wxPanel{
+//EED-2019-10-25 class creaMaracasVisu_EXPORT mBarRange :public  wxScrolledWindow{
 public:
 	//------------------------------------
 	//Constructors & Destructors
 	//------------------------------------
-	mBarRange(wxWindow *parent, int w, int h/*, bool theOrientation, bool useWithActualDrawed*/);
+	mBarRange(wxWindow *parent, int w, int h);
 	~mBarRange();
 	//------------------------------------
 	// Bar Methods
@@ -71,6 +97,8 @@ public:
 	void RefreshVerticalView();
 	void RefreshForce();
 	void OnMouseMove(wxMouseEvent& event );
+	void onKey(wxKeyEvent& event);
+
 	void DrawBar();
 	//------------------------------------
 	// Getters & Setters
@@ -103,17 +131,19 @@ public:
 	int GetWidth();
 	void SetWidth(int w);
 
+	int filtreValue(int value);
+	
 	//Logical Start
 	int GetStart();
-	void SetStart(int start);
+	void SetStart(int newstart);
 
 	//Logical End
 	int GetEnd();
-	void SetEnd(int end);
+	void SetEnd(int newend);
 
 	//logical actual
 	int GetActual();
-	void SetActual(int actual);
+	void SetActual(int newactual);
 
 
 	//The triangles half width managment
@@ -314,9 +344,9 @@ private:
 	//End of the rectangule
 	int                        _end;
 	//Logical Max
-	double                        _max;
+	double                    _max;
 	//Logical Min
-	double						   _min;
+	double                     _min;
 	//Initial point when moving the rectangule bar according to bar reference 
 	int						   _initialPoint;
 	/*
@@ -441,7 +471,10 @@ private:
 	wxBitmap        *_bitmap_bar;
 	//the info bitmap device 
 	wxBitmap        *_bitmap_info;
+
+
 	DECLARE_CLASS(BarRange)
+
 	// any class wishing to process wxWindows events must use this macro
 	DECLARE_EVENT_TABLE()
 };