X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInfoTextImage.cxx;h=7d76ca9aa5761f2cf9dcca7faaea4254fc1bdb0b;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=d7db5b3248a9f3669aee87234d6040b8d656032d;hpb=67d2dcb9144ffd014363d22d2dee0b41af023f0c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx
index d7db5b3..7d76ca9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.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 "vtkInfoTextImage.h"
 
 #include "vtkTextProperty.h"
@@ -74,7 +99,7 @@ vtkTextActor *vtkInfoTextImage::Create_Text_Label(int px, int py )
 
 void vtkInfoTextImage::PutWindowLevel()
 {
-	int value = (int)( _wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->GetWindow() );
+	double value =  _wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->GetWindow() ;
 	char zTzxt[20];
 	char resultText[50];
 
@@ -82,7 +107,7 @@ void vtkInfoTextImage::PutWindowLevel()
 
 
 	//ltoa ( (long)value , zTzxt , 10 );
-	sprintf(zTzxt,"%d",value);
+	sprintf(zTzxt,"%3.4f",value);
 
 	strcat(resultText,zTzxt);
 	_vtkText_WindowLevel		-> SetInput(resultText);
@@ -92,14 +117,14 @@ void vtkInfoTextImage::PutWindowLevel()
 
 void vtkInfoTextImage::PutColorLevel()
 {
-	int value = (int)(_wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->GetLevel());
+	double value = _wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->GetLevel();
 	char zTzxt[20];
 	char resultText[50];
 
 	strcpy(resultText,"c:");
 
 //	itoa (value,zTzxt,10);
-	sprintf(zTzxt,"%d",value);
+	sprintf(zTzxt,"%3.2f",value);
 
 	strcat(resultText,zTzxt);
 	_vtkText_ColorLevel		-> SetInput(resultText);
@@ -212,7 +237,7 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			}
 		}
 	
-		if (imagedata->GetScalarType()==VTK_CHAR)
+		else if (imagedata->GetScalarType()==VTK_CHAR)
 		{
 			char *pOrg=(char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
@@ -220,7 +245,7 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%d",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_SIGNED_CHAR)
+		else if (imagedata->GetScalarType()==VTK_SIGNED_CHAR)
 		{
 			signed char *pOrg=(signed char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
@@ -228,7 +253,7 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%d",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_UNSIGNED_CHAR)
+		else if (imagedata->GetScalarType()==VTK_UNSIGNED_CHAR)
 		{
 			unsigned char *pOrg=(unsigned char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
@@ -236,7 +261,7 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%d",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_SHORT)
+		else if (imagedata->GetScalarType()==VTK_SHORT)
 		{
 			short *pOrg=(short*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
@@ -244,7 +269,7 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%d",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_UNSIGNED_SHORT)
+		else if (imagedata->GetScalarType()==VTK_UNSIGNED_SHORT)
 		{
 			unsigned short *pOrg=(unsigned short*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
@@ -252,14 +277,14 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%d",tmp);
 		}
 	
-		if (imagedata->GetScalarType()==VTK_INT)
+		else if (imagedata->GetScalarType()==VTK_INT)
 		{
 			int *pOrg=(int*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
 			sprintf(zTzxt,"%d",*pOrg);
 		}
 
-		if (imagedata->GetScalarType()==VTK_UNSIGNED_INT)
+		else if (imagedata->GetScalarType()==VTK_UNSIGNED_INT)
 		{
 			unsigned int *pOrg=(unsigned int*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
@@ -267,36 +292,36 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%d",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_LONG)
+		else if (imagedata->GetScalarType()==VTK_LONG)
 		{
 			long *pOrg=(long*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
 			double tmp=*pOrg;
-			sprintf(zTzxt,"%3.2f",tmp);
+			sprintf(zTzxt,"%3.4f",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_UNSIGNED_LONG)
+		else if (imagedata->GetScalarType()==VTK_UNSIGNED_LONG)
 		{
 			unsigned long *pOrg=(unsigned long*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
 			double tmp=*pOrg;
-			sprintf(zTzxt,"%3.2f",tmp);
+			sprintf(zTzxt,"%3.4f",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_FLOAT)
+		else if (imagedata->GetScalarType()==VTK_FLOAT)
 		{
 			float *pOrg=(float*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
 			double tmp=(double)*pOrg;
-			sprintf(zTzxt,"%3.2f",tmp);
+			sprintf(zTzxt,"%3.4f",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_DOUBLE)
+		else if (imagedata->GetScalarType()==VTK_DOUBLE)
 		{
 			double *pOrg=(double*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
 			double tmp=*pOrg;
-			sprintf(zTzxt,"%3.2f",tmp);
+			sprintf(zTzxt,"%3.4f",tmp);
 		}
 	} 
 	else