From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Tue, 13 Sep 2016 14:12:22 +0000 (+0200)
Subject: #3015 creaVtk Bug New Normal  -  In box ReadMHDPlane, Error:end application, when... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b5336cb50d214351673b863554714c5b2fa728a1;p=creaVtk.git

#3015 creaVtk Bug New Normal  -  In box ReadMHDPlane, Error:end application, when the raw file not exist
---

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
index 1eb4c84..58486f2 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
@@ -225,6 +225,7 @@ void ReadMHDPlane::Read64lseek()
 	char strTmp[30];
 	char strTmp2[30];
 	FILE *ffIn	= fopen(bbGetInputFileName().c_str(),"r");
+printf("EED ReadMHDPlane::Read64lseek filename %s %p\n", bbGetInputFileName().c_str(), ffIn );
 	long long dataSize;
 
 	if (ffIn!=NULL)
@@ -252,8 +253,14 @@ void ReadMHDPlane::Read64lseek()
         	if (strncmp("ElementType = VTK_UNSIGNED_SHORT",mystring,32)==0) { newImage->SetScalarTypeToUnsignedShort();	dataSize=sizeof(unsigned short);}
         	if (strncmp("ElementType = MET_SHORT",mystring,23)==0) 			{ newImage->SetScalarTypeToShort();			dataSize=sizeof(short); 		}
         	if (strncmp("ElementType = VTK_SHORT",mystring,23)==0) 			{ newImage->SetScalarTypeToShort();			dataSize=sizeof(short); 		}
+        	if (strncmp("ElementType = MET_UINT",mystring,24)==0) 			{ newImage->SetScalarTypeToUnsignedInt();	dataSize=sizeof(unsigned int);	}
+        	if (strncmp("ElementType = VTK_UNSIGNED_INT",mystring,32)==0) 	{ newImage->SetScalarTypeToUnsignedInt();	dataSize=sizeof(unsigned int);	}
+        	if (strncmp("ElementType = MET_INT",mystring,24)==0) 			{ newImage->SetScalarTypeToInt();			dataSize=sizeof(int);			}
+        	if (strncmp("ElementType = VTK_INT",mystring,32)==0) 			{ newImage->SetScalarTypeToInt();			dataSize=sizeof(int);			}
         	if (strncmp("ElementType = MET_FLOAT",mystring,23)==0) 			{ newImage->SetScalarTypeToFloat();			dataSize=sizeof(float); 		}
         	if (strncmp("ElementType = VTK_FLOAT",mystring,23)==0) 			{ newImage->SetScalarTypeToFloat();			dataSize=sizeof(float); 		}
+        	if (strncmp("ElementType = MET_LONG",mystring,23)==0) 			{ newImage->SetScalarTypeToLong();			dataSize=sizeof(long); 			}
+        	if (strncmp("ElementType = VTK_LONG",mystring,23)==0) 			{ newImage->SetScalarTypeToLong();			dataSize=sizeof(long); 			}
         	if (strncmp("ElementType = MET_DOUBLE",mystring,24)==0) 		{ newImage->SetScalarTypeToDouble();		dataSize=sizeof(double); 		}
         	if (strncmp("ElementType = VTK_DOUBLE",mystring,24)==0) 		{ newImage->SetScalarTypeToDouble();		dataSize=sizeof(double); 		}
 
@@ -281,15 +288,16 @@ void ReadMHDPlane::Read64lseek()
 #endif // defined(_WIN32)
 
 
-
 		if (fd < 0)
 		{
-			printf("EED ReadMHDPlane::Read64lseek \n");
+			printf("EED ReadMHDPlane::Read64lseek   WARNNING! raw file not exist\n");
 			fprintf(stderr, "%s\n", strerror(errno));
-			exit(1);
-		}
+			newImage=CreateDefaultImage();
+//			exit(1);
+		} 	
+		
 
-		if (bbGetInputDirectionPlane()=="XY") 
+		if ((bbGetInputDirectionPlane()=="XY") && (fd>=0)) 
 		{ 
 	   		newImage->SetSpacing( spcX,spcY,spcZ );
 	   		newImage->SetDimensions(  dimX,dimY,width );
@@ -317,7 +325,7 @@ void ReadMHDPlane::Read64lseek()
 			}
 		}  // if PLANE XY
 
-		if (bbGetInputDirectionPlane()=="XZ") 
+		if ((bbGetInputDirectionPlane()=="XZ") && (fd>=0))
 		{ 
 	   		newImage->SetSpacing( spcX,spcZ,spcY );
 	   		newImage->SetDimensions(  dimX,dimZ,width );
@@ -333,8 +341,7 @@ void ReadMHDPlane::Read64lseek()
 			}
 		}  // if PLANE XZ
 
-
-		if (bbGetInputDirectionPlane()=="YZ") 
+		if ((bbGetInputDirectionPlane()=="YZ") && (fd>=0))
 		{ 
 	   		newImage->SetSpacing( spcY,spcZ,spcX );
 	   		newImage->SetDimensions(  dimY,dimZ,width );