X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOGimmickView.cpp;h=62c7d0c862fbb884d5ec6fcb4f03d47f46489361;hb=b124b45664473a3ad32c1c8cf680cc3355e4dbd2;hp=c9965637106f259cf1e00d943f5508248b711077;hpb=26b4c3303c14bfef570ad5671627ba5e01519f83;p=creaImageIO.git

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index c996563..62c7d0c 100644
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -36,8 +36,11 @@
 #include <gdcmFileHelper.h>
 #include <gdcmUtil.h>
 #include <vtkGdcmReader.h>
+
 #endif
 
+#include <vtkMetaImageWriter.h>
+
 /*#if defined(USE_GDCM2)
 #include <vtkGDCMImageReader.h>
 #include "gdcmSystem.h"
@@ -140,6 +143,7 @@ namespace creaImageIO
   /// Finalize 
   void GimmickView::Finalize()
   {
+	  printf("EED GimmickView::Finalize  \n");
   }
 
   //======================================================================
@@ -496,29 +500,16 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 	void GimmickView::readImages1(std::vector<OutStrGimmick>& o_output, std::vector<std::string> im,
 			 OutputAttr i_attr)
 	{
-
 		i_attr.outside.push_back("D0019_100a");  // simens Number Of Images In Mosaic
-
-//EED Borrame
-		int i,isize=i_attr.outside.size();
-		for (i=0;i<isize;i++)
-		{
-   		printf("EED GimmickView::readImages1 A  i_attr out %s \n", i_attr.outside[i].c_str());
-		}
-
-
-
 		std::vector<std::string>::iterator it;
 		for (it=im.begin(); it!=im.end(); ++it)
 		{
 			OutStrGimmick out;
-			out.img = vtkImageData::New();
+			out.img         = vtkImageData::New();
 			out.img->ShallowCopy(mReader.GetImage(*it));
-printf("EED GimmickView::readImages1 A\n ");
-			if(i_attr.mult) 
+			if(i_attr.mult)
 			{
 				getAttributes((*it),out.infos,i_attr);
-printf("EED GimmickView::readImages1 B   %s \n ", out.infos.find("D0019_100a")->second.c_str() );				
 			}
 			o_output.push_back(out);
 		}
@@ -526,7 +517,6 @@ printf("EED GimmickView::readImages1 B   %s \n ", out.infos.find("D0019_100a")->
 		if(!i_attr.mult)
 		{
 			getAttributes(im.front(), o_output.front().infos, i_attr);
-printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D0019_100a")->second.c_str() );
 		}
 		
 	}
@@ -538,8 +528,9 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
 			 OutputAttr i_attr, double i_zspc)
 	{
 		OutStrGimmick out;
-		vtkImageData* first = mReader.GetImage( im.front());
-		out.img  = vtkImageData::New();
+		vtkImageData* first = mReader.GetImage( im.front() );
+		out.img             = vtkImageData::New();
+
 		int ext[6];
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
@@ -558,7 +549,11 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
 		double spac[3];
 		first->GetDimensions(dim);
 		first->GetSpacing(spac);
-		out.img->SetSpacing(spac);
+        
+        //EED 2024-01-24
+        spac[2] = i_zspc;
+        
+        out.img->SetSpacing(spac);
 		out.img->SetDimensions(dim[0], dim[1], (int)im.size() );
 
 
@@ -573,7 +568,6 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
 		out.img->AllocateScalars(first->GetScalarType(), first->GetNumberOfScalarComponents());
 #endif
 
-
 		unsigned long imsize = dim[0] * dim[1];
 		imsize = imsize * dim[2] ;  // deal with multiframes here
 		// differents formats char , short, etc...
@@ -583,12 +577,14 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
 		//!!!!out.img->SetSpacing(i_zspc);
 		int slice = 0;
 		std::vector<std::string>::iterator it;
+		
 		for (it=im.begin(); it!=im.end(); ++it) 
 		{
 			vtkImageData* cur = mReader.GetImage( (*it) );
 			memcpy(out.img->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
 			slice++;
-		}	
+		} // for it	
+		
 		getAttributes(im.front(),out.infos, i_attr);
 		o_output.push_back(out);
 	}
@@ -621,7 +617,7 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
 			for (int slice= 0 ; slice <dim[2]; slice++)
 			{
 				OutStrGimmick out;
-				out.img = vtkImageData::New();
+				out.img         = vtkImageData::New();
 				out.img->SetSpacing(spac);
 				int ext[6];
 //EED 2017-01-01 Migration VTK7
@@ -776,7 +772,6 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
 
 //EED UnMosaic step...  
 //How to verifie if is a mosaic file , with how many images inside??
-
 	}