#333 Export new list of filesnames after DropDuplicatePositions

[creaImageIO.git] / src / creaImageIOGimmickView.cpp

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index 9b4169f571d09d296304fee2f6833fa7e7b2ddff..62c7d0c862fbb884d5ec6fcb4f03d47f46489361 100644 (file)
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -124,7 +124,6 @@ namespace creaImageIO
   /// Destructor
   GimmickView::~GimmickView()
   {
-         printf("EED GimmickView::~GimmickView  DESTROCTEUR \n");
     GimmickDebugMessage(1,"GimmickView::~GimmickView"
                        <<std::endl);
   }
@@ -506,9 +505,9 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                for (it=im.begin(); it!=im.end(); ++it)
                {
                        OutStrGimmick out;
-                       out.img = vtkImageData::New();
+                       out.img         = vtkImageData::New();
                        out.img->ShallowCopy(mReader.GetImage(*it));
-                       if(i_attr.mult) 
+                       if(i_attr.mult)
                        {
                                getAttributes((*it),out.infos,i_attr);
                        }
@@ -529,8 +528,9 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                         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
@@ -549,7 +549,11 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                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() );
 
 
@@ -564,7 +568,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                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...
@@ -574,12 +577,13 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                //!!!!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);
@@ -613,7 +617,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                        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
@@ -768,7 +772,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 
 //EED UnMosaic step...  
 //How to verifie if is a mosaic file , with how many images inside??
-
        }