Add GetSelectImagesInVector()

[creaImageIO.git] / src2 / creaImageIOGimmickView.cpp

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index b213cb1e474fc50361bdd1538207eec478b6173a..b75dcdde5569de43dde9cf1e1c4595721963af45 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -259,17 +259,15 @@ namespace creaImageIO
                        out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
                mMessage = out.str();
                        }
-                       
                }
                else
                {
                        mMessage="The selected images are not compatible.";
                        valid=false;
                }
-       }
+         }
        }
 
-       
        modifyValidationSignal(valid);
        SetMessage(mMessage);
        return valid;
@@ -281,12 +279,10 @@ namespace creaImageIO
          mValidationSignal(ivalid);
   }
 
-
    //======================================================================
   ///Reads Images (Non Threaded)
-void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
+void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
 {
-         
        // Create the output data
        if (im.size()==1) 
        {                 
@@ -298,13 +294,13 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                out->ShallowCopy(mReader.GetImage(im.front()));
                s.push_back( out );
        }         
-    else if (im.size()>1)
+       else if (im.size()>1) // Test inutile ? JPR
        {
                vtkImageData* first = mReader.GetImage( im.front());
                if (dimension == 2) 
                {  
                 // n3D
-                 std::vector<std::string>::iterator it;
+                   std::vector<std::string>::iterator it;
                        for (it=im.begin(); it!=im.end(); ++it) 
                        {
                                vtkImageData* out = vtkImageData::New();
@@ -320,7 +316,8 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                        out->SetScalarType(first->GetScalarType());
                        int ext[6];
                        first->GetExtent(ext);
-                       ext[5] = im.size()-1;
+                       //ext[5] = im.size()-1;        // JPR
+                       ext[5] = ext[5] * im.size()-1; // deal with multiframes //JPR
                        out->SetExtent(ext);
                        // LG : TODO : Z Spacing  ?
 
@@ -331,7 +328,10 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 
                        int dim[3];
                        first->GetDimensions(dim);
-                       unsigned long imsize = dim[0] * dim[1];/*
+                       unsigned long imsize = dim[0] * dim[1];
+                       imsize = imsize * dim[2] ;  // deal with multiframes// JPR
+
+                        /*
                                ( (unsigned long)first->GetScalarPointer(0,1,0)
                        - (unsigned long)first->GetScalarPointer(0,0,0))
                                *dim[1];*/
@@ -339,9 +339,9 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                        int slice = 0;
                        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));
+                       vtkImageData* cur = mReader.GetImage( (*it));
 
                        void* src = cur->GetScalarPointer(0,0,0);
                        void* dst = out->GetScalarPointer(0,0,slice);
@@ -352,11 +352,53 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                        memcpy(dst,src,imsize);
 
                        slice++;
-                               }       
+                       }       
                        s.push_back(out);
-                               
                }
-       }       
+       }
+}
+  //======================================================================
+
+void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
+{
+       // 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);
+               out->ShallowCopy(mReader.GetImage(im.front()));
+               s.push_back( out );
+       }
+       else if (im.size()>1) // Test inutile ? JPR
+       {
+               vtkImageData* first = mReader.GetImage( im.front());
+               if (dimension == 2)
+               {
+                // n3D
+                 std::vector<std::string>::iterator it;
+                       for (it=im.begin(); it!=im.end(); ++it)
+                       {
+                               vtkImageData* out = vtkImageData::New();
+                               out->ShallowCopy(mReader.GetImage(*it));
+                               s.push_back(out);
+                       }
+               }
+               else
+               {
+                       // n2D to 3D // NO!
+                       // n *2D + T in a vector :
+                       
+                       std::vector<std::string>::iterator it;
+                       for (it=im.begin(); it!=im.end(); ++it) 
+                       {
+                               vtkImageData* out = mReader.GetImage( (*it));
+                               s.push_back(out);
+                       }
+               }
+       }
 }
   //======================================================================
 
@@ -391,10 +433,10 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                {
                  //What to do in this case?
                  /*
-               GimmickDebugMessage(5,
+                       GimmickDebugMessage(5,
                                        "Pushing unknown image in queue"
                                        <<std::endl);
-               mImageEventQueue.push_back(ImageEventType(image));*/
+                       mImageEventQueue.push_back(ImageEventType(image));*/
                        return;
                }
                ImageEventTypeMap::iterator i;
@@ -404,8 +446,8 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                        if (i!=mImageEventMap.end())
                        {
                                GimmickDebugMessage(5,
-                                                       "Putting image of file '"<<filename<<"' on pointer"
-                                                       <<std::endl);
+                                               "Putting image of file '"<<filename<<"' on pointer"
+                                               <<std::endl);
                                ImageEventType ie(i->second);
                                ie.image = image;
                                ie.pointerHolder->Set(ie.image);
@@ -445,7 +487,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
                ie.pointerHolder->Set(GetDefaultImage());
                //mImageEventMap.erase(i);
                }
-
        }
   }
 
@@ -455,9 +496,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
   void GimmickView::ConnectValidationObserver(ValidationCallbackType callback)
   {
     mValidationSignal.connect(callback);
-  }
-         
+  }      
   
 } // EO namespace creaImageIO
 
-