X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkReadMHDPlane.cxx;h=020eb5f9080d0aecff4b85e807382e57172c7029;hb=ef9f90810fcc3800acac54a104f14ff505135fd3;hp=f17bc9d78508517d268af61637717001ccb5cb8d;hpb=10e31d8e12d78d664924d7cb2f9cd728c7b7970f;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
index f17bc9d..020eb5f 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
@@ -42,14 +42,21 @@ vtkImageData* ReadMHDPlane::CreateDefaultImage()
 	sizeZ = 1;
 	vtkImageData *newImage = vtkImageData::New();
    	newImage->Initialize();
-   	newImage->SetScalarTypeToUnsignedChar();
    	newImage->SetSpacing( 1,1,1 );
    	newImage->SetDimensions(  sizeX,sizeY,sizeZ );
-   	newImage->SetWholeExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
    	newImage->SetExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+   	newImage->SetWholeExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
+   	newImage->SetScalarTypeToUnsignedChar();
    	newImage->SetNumberOfScalarComponents(1);
    	newImage->AllocateScalars();
    	newImage->Update();
+#else
+   	newImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
+
 	memset ( (void*)newImage->GetScalarPointer(), 0, sizeX*sizeY*1 );
    	for (i=0; i<sizeX; i++)
    	{
@@ -80,6 +87,8 @@ void ReadMHDPlane::ReadNormalMHD()
 	std::string inputfilename;
 	int slice;
 	int width;
+	long long dataSize;
+
 
 	if (bbGetInputDirectionPlane()=="XY")
 	{
@@ -89,7 +98,6 @@ void ReadMHDPlane::ReadNormalMHD()
 
 	if ((bbGetInputDirectionPlane()=="YZ") || (bbGetInputDirectionPlane()=="ZX"))
 	{
-
 		//-- Split FileName
   		std::size_t found		=	bbGetInputFileName().find_last_of("/\\");
 		std::string path		=	bbGetInputFileName().substr(0,found+1);
@@ -99,8 +107,6 @@ void ReadMHDPlane::ReadNormalMHD()
 #else
 		path=path+"YZ_ZX/";
 #endif
-	
-	
 		if (bbGetInputDirectionPlane()=="YZ") 
 		{ 
 			inputfilename = path+filename+"_YZ.mhd";  
@@ -118,9 +124,8 @@ void ReadMHDPlane::ReadNormalMHD()
 	slice = bbGetInputSlice();
 	if (slice<0 ) { slice=0; }
 
-
 	vtkImageData *newImage;
-	long long int newHeaderSize;
+	long long newHeaderSize;
     std::string newFileName=inputfilename+"-OneSlice";
 
     int sx,sy,sz;
@@ -159,12 +164,26 @@ void ReadMHDPlane::ReadNormalMHD()
     			newHeaderSize = (long long int)sx*(long long int)sy*(long long int)slice;
 				if (bbGetInputSlice()>=sz) {ok=false;}
 			} // if
-        	if (strncmp("ElementType = MET_CHAR",mystring,22)==0) 	{ newHeaderSize=newHeaderSize*1; }
-        	if (strncmp("ElementType = MET_UCHAR",mystring,23)==0) 	{ newHeaderSize=newHeaderSize*1; }
-        	if (strncmp("ElementType = MET_USHORT",mystring,24)==0) { newHeaderSize=newHeaderSize*2; }
-        	if (strncmp("ElementType = MET_SHORT",mystring,23)==0) 	{ newHeaderSize=newHeaderSize*2; }
-        	if (strncmp("ElementType = MET_FLOAT",mystring,23)==0) 	{ newHeaderSize=newHeaderSize*4; }
-        	if (strncmp("ElementType = VTK_FLOAT",mystring,23)==0) 	{ newHeaderSize=newHeaderSize*4; }
+        	if (strncmp("ElementType = MET_CHAR",mystring,22)==0) 			{ dataSize=sizeof(char); 			}
+        	if (strncmp("ElementType = VTK_CHAR",mystring,22)==0) 			{ dataSize=sizeof(char); 			}
+        	if (strncmp("ElementType = MET_UCHAR",mystring,23)==0) 			{ dataSize=sizeof(unsigned char); 	}
+        	if (strncmp("ElementType = VTK_UNSIGNED_CHAR",mystring,31)==0) 	{ dataSize=sizeof(unsigned char); 	}
+        	if (strncmp("ElementType = MET_USHORT",mystring,24)==0) 		{ dataSize=sizeof(unsigned short);	}
+        	if (strncmp("ElementType = VTK_UNSIGNED_SHORT",mystring,32)==0) { dataSize=sizeof(unsigned short);	}
+        	if (strncmp("ElementType = MET_SHORT",mystring,23)==0) 			{ dataSize=sizeof(short); 			}
+        	if (strncmp("ElementType = VTK_SHORT",mystring,23)==0) 			{ dataSize=sizeof(short); 			}
+        	if (strncmp("ElementType = MET_UINT",mystring,22)==0) 			{ dataSize=sizeof(unsigned int);	}
+        	if (strncmp("ElementType = VTK_UNSIGNED_INT",mystring,30)==0) 	{ dataSize=sizeof(unsigned int);	}
+        	if (strncmp("ElementType = MET_INT",mystring,21)==0) 			{ dataSize=sizeof(int);				}
+        	if (strncmp("ElementType = VTK_INT",mystring,21)==0) 			{ dataSize=sizeof(int);				}
+        	if (strncmp("ElementType = MET_FLOAT",mystring,23)==0) 			{ dataSize=sizeof(float); 			}
+        	if (strncmp("ElementType = VTK_FLOAT",mystring,23)==0) 			{ dataSize=sizeof(float); 			}
+        	if (strncmp("ElementType = MET_LONG",mystring,22)==0) 			{ dataSize=sizeof(long); 			}
+        	if (strncmp("ElementType = VTK_LONG",mystring,22)==0) 			{ dataSize=sizeof(long); 			}
+        	if (strncmp("ElementType = MET_DOUBLE",mystring,24)==0) 		{ dataSize=sizeof(double); 			}
+        	if (strncmp("ElementType = VTK_DOUBLE",mystring,24)==0) 		{ dataSize=sizeof(double); 			}
+			newHeaderSize=newHeaderSize*dataSize;
+
         	if (strncmp("Offset",mystring,6)==0) {strcpy(mystring,"Offset = 0 0 0\n");}
         	if (strncmp("HeaderSize",mystring,10)==0) {strcpy(mystring,"");}
         	if (strncmp("ElementDataFile",mystring,15)==0) 
@@ -220,6 +239,7 @@ void ReadMHDPlane::Read64lseek()
 	long int 	headersize=0;
 
 	vtkImageData *newImage=NULL;
+	int imageType;
 
 	char mystring[250];
 	char strTmp[30];
@@ -244,24 +264,26 @@ void ReadMHDPlane::Read64lseek()
         	if (strncmp("HeaderSize",mystring,10)==0) 		{ sscanf(mystring,"%s %s %ld"		,strTmp, strTmp, &headersize);			}
 			if (strncmp("ElementDataFile",mystring,15)==0) 	{ sscanf(mystring,"%s %s %s"		,strTmp, strTmp, strTmp2); elementdatafile=strTmp2;		}
 
-        	if (strncmp("ElementType = MET_CHAR",mystring,22)==0) 			{ newImage->SetScalarTypeToChar(); 			dataSize=sizeof(char); 			}
-        	if (strncmp("ElementType = VTK_CHAR",mystring,22)==0) 			{ newImage->SetScalarTypeToChar(); 			dataSize=sizeof(char); 			}
-        	if (strncmp("ElementType = MET_UCHAR",mystring,23)==0) 			{ newImage->SetScalarTypeToUnsignedChar();	dataSize=sizeof(unsigned char); }
-        	if (strncmp("ElementType = VTK_UNSIGNED_CHAR",mystring,31)==0) 	{ newImage->SetScalarTypeToUnsignedChar();	dataSize=sizeof(unsigned char); }
-        	if (strncmp("ElementType = MET_USHORT",mystring,24)==0) 		{ newImage->SetScalarTypeToUnsignedShort();	dataSize=sizeof(unsigned short);}
-        	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); 		}
+
+
+			if (strncmp("ElementType = MET_CHAR",mystring,22)==0) 			{ imageType =VTK_CHAR; 			 dataSize=sizeof(char); 		 }
+			if (strncmp("ElementType = VTK_CHAR",mystring,22)==0) 			{ imageType =VTK_CHAR; 			 dataSize=sizeof(char); 		 }
+			if (strncmp("ElementType = MET_UCHAR",mystring,23)==0) 			{ imageType =VTK_UNSIGNED_CHAR;	 dataSize=sizeof(unsigned char); }
+			if (strncmp("ElementType = VTK_UNSIGNED_CHAR",mystring,31)==0) 	{ imageType =VTK_UNSIGNED_CHAR;	 dataSize=sizeof(unsigned char); }
+			if (strncmp("ElementType = MET_USHORT",mystring,24)==0) 		{ imageType =VTK_UNSIGNED_SHORT; dataSize=sizeof(unsigned short);}
+			if (strncmp("ElementType = VTK_UNSIGNED_SHORT",mystring,32)==0) { imageType =VTK_UNSIGNED_SHORT; dataSize=sizeof(unsigned short);}
+			if (strncmp("ElementType = MET_SHORT",mystring,23)==0) 			{ imageType =VTK_SHORT;			 dataSize=sizeof(short); 		 }
+			if (strncmp("ElementType = VTK_SHORT",mystring,23)==0) 			{ imageType =VTK_SHORT;			 dataSize=sizeof(short); 		 }
+			if (strncmp("ElementType = MET_UINT",mystring,22)==0) 			{ imageType =VTK_UNSIGNED_INT;	 dataSize=sizeof(unsigned int);	 }
+			if (strncmp("ElementType = VTK_UNSIGNED_INT",mystring,30)==0) 	{ imageType =VTK_UNSIGNED_INT;	 dataSize=sizeof(unsigned int);	 }
+			if (strncmp("ElementType = MET_INT",mystring,21)==0) 			{ imageType =VTK_INT;			 dataSize=sizeof(int);			 }
+			if (strncmp("ElementType = VTK_INT",mystring,21)==0) 			{ imageType =VTK_INT;			 dataSize=sizeof(int);			 }
+			if (strncmp("ElementType = MET_FLOAT",mystring,23)==0) 			{ imageType =VTK_FLOAT;			 dataSize=sizeof(float); 		 }
+			if (strncmp("ElementType = VTK_FLOAT",mystring,23)==0) 			{ imageType =VTK_FLOAT;			 dataSize=sizeof(float); 		 }
+			if (strncmp("ElementType = MET_LONG",mystring,22)==0) 			{ imageType =VTK_LONG;			 dataSize=sizeof(long); 		 }
+			if (strncmp("ElementType = VTK_LONG",mystring,22)==0) 			{ imageType =VTK_LONG;			 dataSize=sizeof(long); 		 }
+			if (strncmp("ElementType = MET_DOUBLE",mystring,24)==0) 		{ imageType =VTK_DOUBLE;		 dataSize=sizeof(double); 		 }
+			if (strncmp("ElementType = VTK_DOUBLE",mystring,24)==0) 		{ imageType =VTK_DOUBLE;		 dataSize=sizeof(double); 		 }
 
     	} // while
    		fclose(ffIn);
@@ -300,11 +322,20 @@ void ReadMHDPlane::Read64lseek()
 		{ 
 	   		newImage->SetSpacing( spcX,spcY,spcZ );
 	   		newImage->SetDimensions(  dimX,dimY,width );
-	   		newImage->SetWholeExtent(0,  dimX-1,0,dimY-1,0,width-1 );
 	   		newImage->SetExtent(0,  dimX-1,0,dimY-1,0,width-1 );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	   		newImage->SetWholeExtent(0,  dimX-1,0,dimY-1,0,width-1 );
 	   		newImage->SetNumberOfScalarComponents(1);
+	   		newImage->SetScalarType(imageType);
 	   		newImage->AllocateScalars();
 	   		newImage->Update();
+#else
+	   		newImage->AllocateScalars( imageType,1 );
+#endif
+
+
 			pos = dimX*dimY*(long long)slice*dataSize;
 #if defined(_WIN32)
 			if (_lseeki64( fd, pos, SEEK_SET ) < 0)
@@ -328,11 +359,18 @@ void ReadMHDPlane::Read64lseek()
 		{ 
 	   		newImage->SetSpacing( spcX,spcZ,spcY );
 	   		newImage->SetDimensions(  dimX,dimZ,width );
-	   		newImage->SetWholeExtent(0,  dimX-1,0,dimZ-1,0,width-1 );
 	   		newImage->SetExtent(0,  dimX-1,0,dimZ-1,0,width-1 );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	   		newImage->SetWholeExtent(0,  dimX-1,0,dimZ-1,0,width-1 );
 	   		newImage->SetNumberOfScalarComponents(1);
+	   		newImage->SetScalarType(imageType);
 	   		newImage->AllocateScalars();
 	   		newImage->Update();
+#else
+	   		newImage->AllocateScalars( imageType, 1);
+#endif
+
 			int iWidth;
 			for (iWidth=0;iWidth<width;iWidth++)
 			{
@@ -344,11 +382,18 @@ void ReadMHDPlane::Read64lseek()
 		{ 
 	   		newImage->SetSpacing( spcY,spcZ,spcX );
 	   		newImage->SetDimensions(  dimY,dimZ,width );
-	   		newImage->SetWholeExtent(0,  dimY-1,0,dimZ-1,0,width-1 );
 	   		newImage->SetExtent(0,  dimY-1,0,dimZ-1,0,width-1 );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	   		newImage->SetWholeExtent(0,  dimY-1,0,dimZ-1,0,width-1 );
 	   		newImage->SetNumberOfScalarComponents(1);
+	   		newImage->SetScalarType(imageType);
 	   		newImage->AllocateScalars();
 	   		newImage->Update();
+#else
+	   		newImage->AllocateScalars( imageType ,1 );
+#endif
+
 			int iWidth;
 			for (iWidth=0;iWidth<width;iWidth++)
 			{