move directory

[creaImageIO.git] / src2 / creaImageIOGimmickView.cpp

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 643ede98c41beed5424a00e555f3afc4bea898af..29d22e3c9b8393e2f6d523fd54cddafd3ad91a99 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -2,8 +2,18 @@
 #include <creaImageIOSystem.h>
 #include "boost/filesystem.hpp"
 
-namespace fs = boost::filesystem;
+#if defined(USE_GDCM)
+#include <gdcmGlobal.h>
+#include <gdcmSerieHelper.h>
+#include <vtkGdcmReader.h>
+#endif
+
+#if defined(USE_GDCM2)
+#include <vtkGDCMImageReader.h>
+#endif
 
+
+namespace fs = boost::filesystem;
 namespace creaImageIO
 {
 
@@ -209,7 +219,7 @@ namespace creaImageIO
                                                                        ""));
        if(mImageExtent==0)
        {
-               mImageExtent=ie;                
+               mImageExtent=ie;
                if((mImageExtent->Get(min_dim-1)<2)||(mImageExtent->Get(max_dim)>1))
                {
                        valid=false;
@@ -224,7 +234,7 @@ namespace creaImageIO
                }
        }
        else
-       {               
+       {
                if(mImageExtent->IsCompatible(*ie))
                {
                        if(mImageExtent->GetDimension()==max_dim && mImageExtent->Get(max_dim)>2)
@@ -283,7 +293,7 @@ namespace creaImageIO
   ///Reads Images (Non Threaded)
 void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
 {
-
+       mReader.Stop();
 /* remember!
 
 #define GIMMICK_NO_IMAGE_SELECTION 0
@@ -299,15 +309,11 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
        // Create the output data
        if (im.size()==1) 
        {
-               // Only one image : give it
-               vtkImageData* out = vtkImageData::New();
-               GimmickDebugMessage(3, "State Check: Full Filename: "
-                                       <<im.front()
-                                       <<std::endl);
+               vtkImageData * out=vtkImageData::New();
                out->ShallowCopy(mReader.GetImage(im.front()));
-               s.push_back( out );
+               s.push_back(out);
        }
-       else if (im.size()>1) // Test inutile ? JPR
+    else if (im.size()>1) // Test inutile ? JPR
        {
                vtkImageData* first = mReader.GetImage( im.front());
                if (dimension == 2)
@@ -325,17 +331,13 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                {
                        // n*2D to 3D
                        vtkImageData* out = vtkImageData::New();
-                       out->CopyStructure(first);      
+//                     out->CopyStructure(first);      
                        out->SetScalarType(first->GetScalarType());
+                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                        int ext[6];
                        //first->GetExtent(ext);  // JPR
                        first->GetWholeExtent(ext);  // renvoie egalement 0,0 en Z // JPR
 
-std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext =";
-for (int jjj=0;jjj<6;jjj++)
-       std:cout << "   [" << jjj << "]=" << ext[jjj];
-std::cout << std::endl;
-
                        if(ext[5] == 0)
                        {
                                ext[5] = im.size()-1;
@@ -348,35 +350,107 @@ std::cout << std::endl;
 
                        // LG : TODO : Z Spacing  ?
 
-                       out->AllocateScalars();
-
-                       //first->Print(std::cout);
-                       //          out->Print(std::cout);
-
                        int dim[3];
                        first->GetDimensions(dim);
+
+                       out->SetDimensions(dim[0], dim[1], im.size() );
+                       out->AllocateScalars();
+                       out->Update();
+
                        unsigned long imsize = dim[0] * dim[1];
                        imsize = imsize * dim[2] ;  // deal with multiframes // JPR
+
+
 //EED 03-11-2009
-                       imsize = imsize * first->GetScalarSize();
+                       // differents formats char , short, etc...
+                       // differents components 1..3  ex. jpg ->RGB 3
+                       imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
+
+
+                       // Order the file name vector
+
+                       double spc[3];
+                       first->GetSpacing(spc);
+                       spc[2]=OrderTheFileNameVector(im);      
+
+                       out->SetSpacing(spc);
 
                        int slice = 0;
                        std::vector<std::string>::iterator it;
+
                        for (it=im.begin(); it!=im.end(); ++it) 
                        {
-               
-                       vtkImageData* cur = mReader.GetImage( (*it));
-               //      void* src = cur->GetScalarPointer(0,0,0);
-               //      void* dst = out->GetScalarPointer(0,0,slice);
-                       memcpy(out->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
-
-                       slice++;
+                               vtkImageData* cur = mReader.GetImage( (*it) );
+                               memcpy(out->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
+                               slice++;
                        }       
                        s.push_back(out);
+
+               }  // dimension == 3
+
+       }  // size >1
+
+}
+  //======================================================================
+
+#if defined(USE_GDCM)
+       double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+{
+       double spacing=1;
+       typedef std::vector<GDCM_NAME_SPACE::File* > FileList;
+       FileList fileVector;
+       //GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+       GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New();
+       std::vector<std::string> lstAux;
+       std::vector<std::string>::iterator it;
+       for (it=im.begin(); it!=im.end(); ++it)
+       {
+               ///\TODO liberer les GDCM_NAME_SPACE::File a la fin!  // JPR
+               GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+               f->SetFileName(*it);
+               f->Load();
+               if (f->IsReadable())
+               {
+                       fileVector.push_back(f);
+               } else {
+                       lstAux.push_back(*it);
                }
+       } // for
+                       
+       
+       if ((fileVector.size()>1) && (sh->IsCoherent( &fileVector )))
+       {
+                       sh->OrderFileList(&fileVector);
+                       spacing= sh->GetZSpacing();
+                       im.clear();
+                       int i;
+                       for (i=0; i<fileVector.size(); i++)
+                       {
+                               im.push_back( (fileVector[i])->GetFileName() );
+                       }
+                       for (i=0; i<lstAux.size(); i++)
+                       {
+                               im.push_back( lstAux[i] );
+                       }
+       }else {
+               std::sort( im.begin(), im.end() );
        }
+                       
+   return spacing;
 }
-  //======================================================================
+
+
+#endif
+
+#if defined(USE_GDCM2)
+       // TO DO
+       double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+       {
+               return 1;
+       }
+#endif
+//======================================================================
+
 
 void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
 {