X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpColorBar.cxx;h=68874cc645a63a9ae8c92f68008390e21659da1c;hb=25e3adf442d6a8d357d52410267445c54426c525;hp=bfd05eaec7a3c10aceb360939a4bd9c1412fb922;hpb=8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
index bfd05ea..68874cc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.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.
+# ------------------------------------------------------------------------ */
+
 //------------------------------------------------------------------------------------------------------------
 // Class definition include
 //------------------------------------------------------------------------------------------------------------
@@ -182,7 +207,7 @@ pColorBar :: ~pColorBar()
 					bool hasPrevPoint = movingPointIndex > 0;
 					bool hasNextPoint = movingPointIndex < showedColorPoints.size()-1;
 
-					pColorPoint * prevPoint =  hasPrevPoint? showedColorPoints[movingPointIndex-1]: NULL; 
+					pColorPoint * prevPoint = hasPrevPoint? showedColorPoints[movingPointIndex-1]: NULL; 
 					pColorPoint * nextPoint = hasNextPoint ? showedColorPoints[movingPointIndex+1]: NULL;
 
 					if ( hasPrevPoint && prevPoint!=NULL )
@@ -363,7 +388,7 @@ pColorBar :: ~pColorBar()
 	void pColorBar ::  onAddColorPoint ( wxCommandEvent& anEvent )
 	{
 		bool addedPoint = false;
-		double real_x = getOrientation() ? convertToRealValue( clickedX ) : convertToRealValue( clickedY );;
+		double real_x = getOrientation() ? convertToRealValue( clickedX ) : convertToRealValue( clickedY );
 		wxColour selectedColor = getSelectedColour();
 		if (okSelectedColor)
 		{
@@ -384,15 +409,15 @@ pColorBar :: ~pColorBar()
 	*/
 	void pColorBar :: onDeleteColorPoint ( wxCommandEvent& anEvent )
 	{
-		bool deletedPoint = false;
-		double real_x = getOrientation() ? convertToRealValue( clickedX ) : convertToRealValue( clickedY );
-		deletedPoint = deleteColorPoint(real_x);
+		bool 		deletedPoint 		= false;
+		double 	real_x 				= getOrientation() ? convertToRealValue( clickedX ) : convertToRealValue( clickedY );
+					deletedPoint 		= deleteColorPoint(real_x);
 		// Inform deletedPoint event
 		if ( deletedPoint )
 		{
 			//RefreshForce();
 			createAndSendEvent( wxEVT_REMOVED_POINT );			
-		}
+		} //if
 	}
 
 		/**
@@ -409,8 +434,10 @@ pColorBar :: ~pColorBar()
 		{
 			//RefreshForce();
 			createAndSendEvent( wxEVT_CHANGED_POINT );			
-		}
+		} // if
 	}
+
+
 	/**
 	* Reacts to the cntID_TRIANGLES_UP wxCommandEvent and changes the assigned figure to -triangles up- for the color points of the color bar.
 	* param & anEvent The wxCommandEvent actioned event 
@@ -705,7 +732,7 @@ pColorBar :: ~pColorBar()
 		for (int a =0; a<showedColorPoints.size() && !deletedPoint; a++)	
 		{
 			actualPoint = showedColorPoints[a];
-			int actualX = actualPoint -> getRealX();
+			int actualX = (int)actualPoint -> getRealX();
 			bool isInsideActual = figure -> isPointInside (convertToPixelValue(actualX), convertToPixelValue(xRealValue));
 			if( actualX == xRealValue || isInsideActual)
 			{
@@ -732,7 +759,7 @@ pColorBar :: ~pColorBar()
 		for (int a =0; a<showedColorPoints.size() && !colourUpdated; a++)	
 		{
 			actualPoint = showedColorPoints[a];
-			int actualX = actualPoint -> getRealX();
+			int actualX = (int)actualPoint -> getRealX();
 			bool isInsideActual = figure -> isPointInside (convertToPixelValue(actualX), clickedValue);
 			if( actualX == xRealValue || isInsideActual)
 			{
@@ -770,7 +797,7 @@ pColorBar :: ~pColorBar()
 			temp_dc.SetPen(wxPen( wxColour(167,165,191),1,wxSOLID  ));
 			temp_dc.DrawRectangle(0, 0, bar_height, bar_width-deviceEndMargin);
 		}
-		wxPoint figPoints[4];
+		//wxPoint figPoints[4]; // JPRx
 		
 		if( _logicalBar -> getCount() >0)
 		{
@@ -1163,11 +1190,11 @@ pColorBar :: ~pColorBar()
 	*/
 	void pColorBar :: setRepresentedValues ( double minRealValue, double maxRealValue )
 	{
-		temporalMinXToShow = minRealValue;
-		temporalMaxXToShow = maxRealValue;
+		temporalMinXToShow = (int)minRealValue;
+		temporalMaxXToShow = (int)maxRealValue;
 
-		minX_represented_Tshow = minRealValue;		
-		maxX_represented_Tshow = maxRealValue;
+		minX_represented_Tshow = (int)minRealValue;		
+		maxX_represented_Tshow = (int)maxRealValue;
 		_logicalBar->setMinValue(minX_represented_Tshow);
 		_logicalBar->setMaxValue(maxX_represented_Tshow);
 	}