#3208 creaImageIO Feature New Normal - branch mingw64

[creaImageIO.git] / src / creaImageIOGimmickView.cpp

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index 2cca5ad7fe699d1f7f087e3c46891f9ff9af252c..0a0dd0c13c18a557ff2cacf2c336472476f3e19b 100644 (file)
--- 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"
@@ -376,11 +379,14 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                        // n*2D to 3D
                        vtkImageData* out = vtkImageData::New();
 //                     out->CopyStructure(first);      
-                       out->SetScalarType(first->GetScalarType());
-                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                        int ext[6];
                        //first->GetExtent(ext);  // JPR
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        first->GetWholeExtent(ext);  // renvoie egalement 0,0 en Z // JPR
+#else
+                       first->GetExtent(ext);  // renvoie egalement 0,0 en Z // JPR
+#endif
 
                        if(ext[5] == 0)
                        {
@@ -396,10 +402,17 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 
                        int dim[3];
                        first->GetDimensions(dim);
-
                        out->SetDimensions(dim[0], dim[1], (int)im.size() );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       out->SetScalarType(first->GetScalarType());
+                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                        out->AllocateScalars();
                        out->Update();
+#else
+                       out->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
+#endif
 
                        unsigned long imsize = dim[0] * dim[1];
                        imsize = imsize * dim[2] ;  // deal with multiframes // JPR
@@ -486,29 +499,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->ShallowCopy(mReader.GetImage(*it));
-printf("EED GimmickView::readImages1 A\n ");
                        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);
                }
@@ -516,7 +516,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() );
                }
                
        }
@@ -530,10 +529,13 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
                OutStrGimmick out;
                vtkImageData* first = mReader.GetImage( im.front());
                out.img  = vtkImageData::New();
-               out.img->SetScalarType(first->GetScalarType());
-               out.img->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                first->GetWholeExtent(ext);  // send also 0,0 in Z 
+#else
+               first->GetExtent(ext);  // send also 0,0 in Z 
+#endif
                if(ext[5] == 0)
                {
                        ext[5] = (int)im.size()-1;
@@ -547,8 +549,20 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
                first->GetSpacing(spac);
                out.img->SetSpacing(spac);
                out.img->SetDimensions(dim[0], dim[1], (int)im.size() );
+
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               out.img->SetScalarType(first->GetScalarType());
+               out.img->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                out.img->AllocateScalars();
                out.img->Update();
+#else
+               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...
@@ -564,6 +578,7 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
                        memcpy(out.img->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
                        slice++;
                }       
+               
                getAttributes(im.front(),out.infos, i_attr);
                o_output.push_back(out);
        }
@@ -597,17 +612,29 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
                        {
                                OutStrGimmick out;
                                out.img = vtkImageData::New();
-                               out.img->SetScalarType(first->GetScalarType());
                                out.img->SetSpacing(spac);
-                               out.img->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                                int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                first->GetWholeExtent(ext);  // send also 0,0 in Z 
+#else
+                               first->GetExtent(ext);  // send also 0,0 in Z 
+#endif
                                ext[5] = 0;
                                out.img->SetExtent(ext);
-
                                out.img->SetDimensions(dim[0], dim[1], 1 );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                               out.img->SetScalarType(first->GetScalarType());
+                               out.img->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                                out.img->AllocateScalars();
                                out.img->Update();
+#else
+                               out.img->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
+#endif
+
+
                                memcpy(out.img->GetScalarPointer(0,0,0), cur->GetScalarPointer(0,0,slice), imsize);
                                o_output.push_back(out);
                        }
@@ -637,19 +664,33 @@ printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D
                {
                        OutStrGimmick out;
                        out.img = vtkImageData::New();
-                       out.img->SetScalarType(first->GetScalarType());
-                       out.img->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                        
                        int ext[6];
-                       double spac[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        first->GetWholeExtent(ext);  // send also 0,0 in Z 
+#else
+                       first->GetExtent(ext);  // send also 0,0 in Z 
+#endif
+
+                       double spac[6];
                        ext[5] = 0;
                        out.img->SetExtent(ext);
                        first->GetSpacing(spac);
                        out.img->SetSpacing(spac);
                        out.img->SetDimensions(dim[0], dim[1], (int)im.size() );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       out.img->SetScalarType(first->GetScalarType());
+                       out.img->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                        out.img->AllocateScalars();
                        out.img->Update();
+#else
+                       out.img->AllocateScalars(first->GetScalarType(), first->GetNumberOfScalarComponents());
+#endif
+
                        unsigned long imsize = dim[0] * dim[1];
                        imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
                        int index = 0;
@@ -925,7 +966,7 @@ void GimmickView::Anonymize(std::vector<std::string> i_filenames, int type)
           fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
    
           fh->WriteDcmExplVR(file->GetFileName() +".ano1" );
-          std::cout << i <<"  End Anonymize" << std::cout;  
+          std::cout << i <<"  End Anonymize" << std::endl;  
           file->ClearAnonymizeList();
           file->Delete();
           fh->Delete();