X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInfoTextImage.cxx;h=6e901631511c9afa32e430cded6b3d68545b389d;hb=96facb2168314bc57826afc4342abd43e27f0ff7;hp=e3a39578caffa39b8375f2ce39c39e0231da9a9c;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx
index e3a3957..6e90163 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 );
+	}
 }
 
 
@@ -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,7 +267,7 @@ 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);
@@ -273,7 +275,7 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%3.2f",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);
@@ -281,15 +283,15 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz)
 			sprintf(zTzxt,"%3.2f",tmp);
 		}
 
-		if (imagedata->GetScalarType()==VTK_FLOAT)
+		else if (imagedata->GetScalarType()==VTK_FLOAT)
 		{
-			long *pOrg=(long*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
+			float *pOrg=(float*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz);
 	//		itoa (*pOrg,zTzxt,10);
-			double tmp=*pOrg;
+			double tmp=(double)*pOrg;
 			sprintf(zTzxt,"%3.2f",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);