clean-up

[creaImageIO.git] / src2 / creaImageIOGimmickView.cpp

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 30ca0d5d094b9bd430e6e1824da392bb64057bf7..d990cb56b942e509197655e39841dd74c612c30a 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -1,12 +1,9 @@
 #include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem.hpp"
-
-#include <gdcmSerieHelper.h>    // JPR
-#include <gdcmFile.h>           // JPR
-#include <vtkGdcmReader.h>      // JPR
-#include <gdcmDebug.h>
-
+#include <gdcmGlobal.h>
+#include <gdcmSerieHelper.h>
+#include <vtkGdcmReader.h>
 namespace fs = boost::filesystem;
 
 namespace creaImageIO
@@ -18,21 +15,22 @@ namespace creaImageIO
   public:
     ImageExtent(const std::string& x, const std::string& y, const std::string& z, const std::string& t)
        {
-          sscanf(x.c_str(),"%d",&mExtent[0]);
-          sscanf(y.c_str(),"%d",&mExtent[1]);
-          sscanf(z.c_str(),"%d",&mExtent[2]);
-          sscanf(t.c_str(),"%d",&mExtent[3]);
-          if(x==""){mExtent[0]=1;}
-          if(y==""){mExtent[1]=1;}
-          if(z==""){mExtent[2]=1;}
-          if(t==""){mExtent[3]=1;}
-
-          if (mExtent[3]>1) mDim=4;
-          else if (mExtent[2]>1) mDim=3;
-          else if (mExtent[1]>1) mDim=2;
-          else if (mExtent[0]>1) mDim=1;
-          else mDim=0;
+                sscanf(x.c_str(),"%d",&mExtent[0]);
+                sscanf(y.c_str(),"%d",&mExtent[1]);
+                sscanf(z.c_str(),"%d",&mExtent[2]);
+                sscanf(t.c_str(),"%d",&mExtent[3]);
+                if(x==""){mExtent[0]=1;}
+            if(y==""){mExtent[1]=1;}
+            if(z==""){mExtent[2]=1;}
+                if(t==""){mExtent[3]=1;}
+
+                if (mExtent[3]>1) mDim=4;
+                else if (mExtent[2]>1) mDim=3;
+            else if (mExtent[1]>1) mDim=2;
+            else if (mExtent[0]>1) mDim=1;
+                else mDim=0;
        }
+       
 
        ///Clears the extent
     void Clear() { mExtent[0] = mExtent[1] = mExtent[2] = mExtent[3] = 1; }
@@ -70,6 +68,7 @@ namespace creaImageIO
        // Anciently started the threads ...
     // Threads now automatically start at first image request
     //mReader.Start();
+
   }
   //======================================================================
 
@@ -121,6 +120,7 @@ namespace creaImageIO
      
   }
 
+
   //======================================================================
 
   //======================================================================
@@ -305,9 +305,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
        }
     else if (im.size()>1) // Test inutile ? JPR
        {
-               // Read the FIRST image to get info ... about all the other ones. ?!? // JPR
                vtkImageData* first = mReader.GetImage( im.front());
-
                if (dimension == 2)
                {
                 // n3D
@@ -319,19 +317,16 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                                s.push_back(out);
                        }
                }         
-               else if (dimension == 3)
+               else 
                {
-                       // n*2D to 3D  :: --> NON ! Ca va tres bien pour du 2D+T (le ZSpacing, on s'en tape)
-                       //                      // ne convient pas pour du n*2D a  lire comme un 3D
-                       //                      // Il faut un gdcmSerieHelper !
+                       // 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
+                       //first->GetExtent(ext);  // JPR
                        first->GetWholeExtent(ext);  // renvoie egalement 0,0 en Z // JPR
-                                                    // Normal :
 
                        if(ext[5] == 0)
                        {
@@ -343,7 +338,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                        }
                        out->SetExtent(ext);
 
-                       // LG : TODO : Z Spacing  ?  // Voir + loin // JPR
+                       // LG : TODO : Z Spacing  ?
 
                        int dim[3];
                        first->GetDimensions(dim);
@@ -455,10 +450,9 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
                if (dimension == 2)
                {
                 // n3D
-                   std::vector<std::string>::iterator it;
+                 std::vector<std::string>::iterator it;
                        for (it=im.begin(); it!=im.end(); ++it)
                        {
-                       std::cout << "----------------------------------------n3D" << std::endl;
                                vtkImageData* out = vtkImageData::New();
                                out->ShallowCopy(mReader.GetImage(*it));
                                s.push_back(out);
@@ -468,15 +462,11 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
                {
                        // n2D to 3D // NO!
                        // n *2D + T in a vector :
-                       std::cout << "---------------------------------------- n *2D + T" << std::endl;                 
+                       
                        std::vector<std::string>::iterator it;
                        for (it=im.begin(); it!=im.end(); ++it) 
                        {
-                       std::cout << "---------------------------------------- [" << *it << "]" << std::endl;
-                               //vtkImageData* out = mReader.GetImage( (*it));
-                               //s.push_back(out);
-                               vtkImageData* out = vtkImageData::New();
-                               out->ShallowCopy(mReader.GetImage(*it));
+                               vtkImageData* out = mReader.GetImage( (*it));
                                s.push_back(out);
                        }
                }
@@ -489,15 +479,15 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
   void GimmickView::RequestReading(tree::Node* n, 
          int prio, int selection_index, boost::shared_ptr<ImagePointerHolder> p)
   {
-     if(!mReaderStarted)
-     {
-        mReader.Start();
-        mReaderStarted=true;
-      }
-      ImageEventType t(n,selection_index);
-      t.pointerHolder = p;
-      mImageEventMap[n->GetAttribute("FullFileName")] = t;
-      mReader.Request(this,n->GetAttribute("FullFileName"),prio);
+         if(!mReaderStarted)
+         {
+               mReader.Start();
+               mReaderStarted=true;
+         }
+    ImageEventType t(n,selection_index);
+       t.pointerHolder = p;
+    mImageEventMap[n->GetAttribute("FullFileName")] = t;    
+    mReader.Request(this,n->GetAttribute("FullFileName"),prio);
   }
   //======================================================================