X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInfoTextImage.cxx;h=8f70abce157cc31cce2dffdf6cfc062f1534ab0a;hb=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=d219404bc0c4202dfc6cb67fee2cd5dfd546681e;hpb=9ddd28bedb530df448addc8851763ab796622b42;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx
index d219404..8f70abc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx
@@ -25,10 +25,12 @@ vtkInfoTextImage::~vtkInfoTextImage()
 
 void vtkInfoTextImage::Configure()
 {
-	_vtkText_WindowLevel	= Create_Text_Label( 10	, 55 );
-	_vtkText_ColorLevel		= Create_Text_Label( 10	, 40 );
-	_vtkText_position		= Create_Text_Label( 10 , 25 );
-	_vtkText_pixelIntensity	= Create_Text_Label( 10 , 10 );
+	if(_vtkText_WindowLevel == NULL){
+		_vtkText_WindowLevel	= Create_Text_Label( 10	, 55 );
+		_vtkText_ColorLevel		= Create_Text_Label( 10	, 40 );
+		_vtkText_position		= Create_Text_Label( 10 , 25 );
+		_vtkText_pixelIntensity	= Create_Text_Label( 10 , 10 );
+	}
 }
 
 
@@ -72,7 +74,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];
 
@@ -80,7 +82,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);
@@ -90,14 +92,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);
@@ -210,7 +212,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);
@@ -218,7 +220,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);
@@ -226,7 +228,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);
@@ -234,7 +236,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);
@@ -242,7 +244,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);
@@ -250,14 +252,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);
@@ -265,36 +267,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