Added GetImages to obtain images from a given file list.

[creaImageIO.git] / src2 / creaImageIOGimmickView.cpp

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index c24a7c3c3534638640762fc75d1eaaf1e61b3e0f..8c0884c3e4926406e2d2387ba39612e42ad942fd 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -256,7 +256,7 @@ namespace creaImageIO
 
    //======================================================================
   ///Reads Images (Non Threaded)
-  void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<tree::Node*> im, int dimension)
+  void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
   {
          
        // Create the output data
@@ -265,16 +265,16 @@ namespace creaImageIO
                  
                // Only one image : give it
                vtkImageData* out = vtkImageData::New();
-               GimmickMessage(1, "State Check: Full Filename: "
-                                               <<im.front()->GetAttribute("FullFileName")
+               GimmickDebugMessage(3, "State Check: Full Filename: "
+                                               <<im.front()
                                                <<std::endl);
-               out->ShallowCopy(mReader.GetImage(im.front()->GetAttribute("FullFileName")));
+               out->ShallowCopy(mReader.GetImage(im.front()));
                s.push_back( out );
       }
          
     else if (im.size()>1)
       {
-       vtkImageData* first = mReader.GetImage( im.front()->GetAttribute("FullFileName"));
+       vtkImageData* first = mReader.GetImage( im.front());
        if (dimension==2) 
          {     
            // n2D to 3D
@@ -300,11 +300,11 @@ namespace creaImageIO
              *dim[1];
 
            int slice = 0;
-               std::vector<tree::Node*>::iterator it;
-           for (it=im.begin(); it!=im.end(); ++it) 
+               std::vector<std::string>::iterator it;
+          for (it=im.begin(); it!=im.end(); ++it) 
              {
                //std::cout << "copying slice "<<slice <<std::endl;
-                         vtkImageData* cur = mReader.GetImage( (*it)->GetAttribute("FullFileName"));
+                         vtkImageData* cur = mReader.GetImage( (*it));
                
                void* src = cur->GetScalarPointer(0,0,0);
                void* dst = out->GetScalarPointer(0,0,slice);
@@ -320,11 +320,11 @@ namespace creaImageIO
        else 
          {
            // n3D
-                 std::vector<tree::Node*>::iterator it;
+                 std::vector<std::string>::iterator it;
            for (it=im.begin(); it!=im.end(); ++it) 
              {
                vtkImageData* out = vtkImageData::New();
-               out->ShallowCopy(mReader.GetImage((*it)->GetAttribute("FullFileName")));
+               out->ShallowCopy(mReader.GetImage(*it));
                s.push_back(out);
              }
          }