]> Creatis software - creaImageIO.git/blobdiff - src2/creaImageIOGimmickView.cpp
correction of infinity loop at starting
[creaImageIO.git] / src2 / creaImageIOGimmickView.cpp
index 945b091ce3552ddc80bb3d4d3dc945926d7bd163..4cf4cb5be6f37bab2e910cdf4b509a49f8d8e104 100644 (file)
@@ -1,6 +1,5 @@
 #include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
-
 #include "boost/filesystem.hpp"
 
 namespace fs = boost::filesystem;
@@ -58,7 +57,7 @@ namespace creaImageIO
 
   //======================================================================
   // CTor
-  GimmickView::GimmickView(Gimmick* gimmick, int threads)
+  GimmickView::GimmickView(boost::shared_ptr<Gimmick> gimmick, int threads)
     : mGimmick(gimmick),
          mReader(threads)
   {
@@ -67,7 +66,7 @@ namespace creaImageIO
        // Anciently started the threads ...
     // Threads now automatically start at first image request
     //mReader.Start();
-       
+
   }
   //======================================================================
 
@@ -86,11 +85,10 @@ namespace creaImageIO
   /// 
   void GimmickView::Initialize()
   {
-       mImageExtent=0;
        mReaderStarted=false;
   }
   //======================================================================
-  
+
   //======================================================================
   /// Finalize 
   void GimmickView::Finalize()
@@ -116,7 +114,7 @@ namespace creaImageIO
   /// Create a tree view with a given name
   void GimmickView::CreateSingleTreeView(std::string &i_name)
   {
-               this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
+       this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
      
   }
 
@@ -135,22 +133,22 @@ namespace creaImageIO
        GimmickError("INTERNAL ERROR : GimmickView::UpdateTreeView : '"
                     <<t<<"' is not in TreeViewMap");
       }
-    i->second->UpdateLevel(l);    
+    i->second->UpdateLevel(l);
   }
+
   //======================================================================
   /// Clears the status and begins a new selection process
   void GimmickView::ResetExtent()
   {
          if(mImageExtent!=0)
          {
-         mImageExtent=0;
+                 mImageExtent.reset();
          }
          valid=true;
   }
 
-
   //======================================================================
-  
+
   //======================================================================
   bool ImageExtent::IsCompatible(const ImageExtent& ie)
   {
@@ -165,7 +163,7 @@ namespace creaImageIO
   }
 
   //======================================================================
-  
+
   //======================================================================
   void ImageExtent::Add(const ImageExtent& ie)
   {
@@ -177,6 +175,19 @@ namespace creaImageIO
          }
   }
 
+  //======================================================================
+  /// No selected image
+  bool GimmickView::NoValidateSelected ()
+  {
+       GimmickDebugMessage(2,"Validating selected"<<std::endl);
+       std::string mMessage;
+       mMessage="Cannot have 0 images selected!";
+       valid=false;
+       modifyValidationSignal(valid);
+       SetMessage(mMessage);
+       return valid;
+  }
+
   //======================================================================
   ///Validates the dimension compliance of the images with the maximum and 
   ///minimum given, and between their sizes
@@ -192,10 +203,10 @@ namespace creaImageIO
        }
        else
        {
-       ImageExtent* ie=new ImageExtent((*sel).GetAttribute("D0028_0010"),
-                                                (*sel).GetAttribute("D0028_0011"),
-                                                                        (*sel).GetAttribute("D0028_0012"), 
-                                                                        "");
+               boost::shared_ptr<ImageExtent> ie=boost::shared_ptr<ImageExtent>(new ImageExtent((*sel).GetAttribute("D0028_0010"),
+                                                                       (*sel).GetAttribute("D0028_0011"),
+                                                                       (*sel).GetAttribute("D0028_0012"), 
+                                                                       ""));
        if(mImageExtent==0)
        {
                mImageExtent=ie;
@@ -207,7 +218,7 @@ namespace creaImageIO
                {
                        std::stringstream out;
                        out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
-               mMessage = out.str();
+                       mMessage = out.str();
                        mImageExtent->SetDimension(2);
                        valid=true;
                }
@@ -243,22 +254,20 @@ namespace creaImageIO
                        }
                        else
                        {
-            mImageExtent->Add(*ie);
-                       std::stringstream out;
-                       out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
-               mMessage = out.str();
+                               mImageExtent->Add(*ie);
+                               std::stringstream out;
+                               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;
@@ -270,16 +279,110 @@ 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)
+{
+
+/* remember!
+
+#define GIMMICK_NO_IMAGE_SELECTION 0
+#define GIMMICK_2D_IMAGE_SELECTION 2
+#define GIMMICK_3D_IMAGE_SELECTION 3
+#define GIMMICK_4D_IMAGE_SELECTION 4
+
+#define NATIVE 0
+#define _2D    2
+#define _3D    3
+
+*/
        // 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 
+               {
+                       // n*2D to 3D
+                       vtkImageData* out = vtkImageData::New();
+                       out->CopyStructure(first);      
+                       out->SetScalarType(first->GetScalarType());
+                       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;
+                       }
+                       else
+                       {
+                               ext[5] = ext[5] * im.size()-1; // to deal with multiframes - JPR
+                       }
+                       out->SetExtent(ext);
+
+                       // LG : TODO : Z Spacing  ?
+
+                       out->AllocateScalars();
+
+                       //first->Print(std::cout);
+                       //          out->Print(std::cout);
+
+                       int dim[3];
+                       first->GetDimensions(dim);
+                       unsigned long imsize = dim[0] * dim[1];
+                       imsize = imsize * dim[2] ;  // deal with multiframes // JPR
+//EED 03-11-2009
+                       imsize = imsize * first->GetScalarSize();
+
+                       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++;
+                       }       
+                       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: "
@@ -287,80 +390,49 @@ namespace creaImageIO
                                                <<std::endl);
                out->ShallowCopy(mReader.GetImage(im.front()));
                s.push_back( out );
-      }
-         
-    else if (im.size()>1)
-      {
-       vtkImageData* first = mReader.GetImage( im.front());
-       if (dimension==2) 
-         {     
-           // n2D to 3D
-           vtkImageData* out = vtkImageData::New();
-           out->CopyStructure(first);  
-           out->SetScalarType(first->GetScalarType());
-           int ext[6];
-           first->GetExtent(ext);
-           ext[5] = im.size();
-           out->SetExtent(ext);
-           // LG : TODO : Z Spacing  ?
-           
-           out->AllocateScalars();
-           
-           //first->Print(std::cout);
-           //      out->Print(std::cout);
-           
-           int dim[3];
-           first->GetDimensions(dim);
-           unsigned long imsize = 
-             ( (unsigned long)first->GetScalarPointer(0,1,0)
-               - (unsigned long)first->GetScalarPointer(0,0,0))
-             *dim[1];
-
-           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));
-               
-               void* src = cur->GetScalarPointer(0,0,0);
-               void* dst = out->GetScalarPointer(0,0,slice);
-               //              std::cout << "src="<<src<<std::endl;
-               //              std::cout << "dst="<<dst<<std::endl;
-               //              std::cout << "siz="<<imsize<<std::endl;
-               memcpy(dst,src,imsize);
-
-               slice++;
-             }
-           s.push_back(out);
-         }
-       else 
-         {
-           // n3D
+       }
+       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);
-             }
-         }
-      }
-       
-  }
+                       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);
+                       }
+               }
+       }
+}
   //======================================================================
 
   //======================================================================
   ///Requests the reading of an image
   void GimmickView::RequestReading(tree::Node* n, 
-                                  int prio, int selection_index, ImagePointerHolder *p)
+         int prio, int selection_index, boost::shared_ptr<ImagePointerHolder> p)
   {
          if(!mReaderStarted)
          {
                mReader.Start();
                mReaderStarted=true;
          }
-    ImageEventType t(n,selection_index, p);
+    ImageEventType t(n,selection_index);
+       t.pointerHolder = p;
     mImageEventMap[n->GetAttribute("FullFileName")] = t;    
     mReader.Request(this,n->GetAttribute("FullFileName"),prio);
   }
@@ -376,28 +448,31 @@ namespace creaImageIO
                        "MultiThreadImageReader event : "<<e<<std::endl);
        if (e==ImageLoaded)
        {
-    if (filename.size()==0)
-      {
+               if (filename.size()==0)
+               {
                  //What to do in this case?
                  /*
-               GimmickDebugMessage(5,
+                       GimmickDebugMessage(5,
                                        "Pushing unknown image in queue"
                                        <<std::endl);
-               mImageEventQueue.push_back(ImageEventType(image));*/
-               return;
-      }
-    ImageEventTypeMap::iterator i;
-    i = mImageEventMap.find(filename);
-    if (i!=mImageEventMap.end())
-      {
-               GimmickDebugMessage(5,
-                                       "Putting image of file '"<<filename<<"' on pointer"
-                                       <<std::endl);
-               ImageEventType ie(i->second);
-               ie.image = image;
-               ie.pointerHolder->Set(ie.image);
-               //mImageEventMap.erase(i);
-      }
+                       mImageEventQueue.push_back(ImageEventType(image));*/
+                       return;
+               }
+               ImageEventTypeMap::iterator i;
+//JCP 22-06-2009, test mImageEventMap.size() > 0
+               if(mImageEventMap.size()>0){
+                       i = mImageEventMap.find(filename);
+                       if (i!=mImageEventMap.end())
+                       {
+                               GimmickDebugMessage(5,
+                                               "Putting image of file '"<<filename<<"' on pointer"
+                                               <<std::endl);
+                               ImageEventType ie(i->second);
+                               ie.image = image;
+                               ie.pointerHolder->Set(ie.image);
+                               //mImageEventMap.erase(i);
+                       }
+               }    
        }
        else if (e==Error)
        {
@@ -431,7 +506,6 @@ namespace creaImageIO
                ie.pointerHolder->Set(GetDefaultImage());
                //mImageEventMap.erase(i);
                }
-
        }
   }
 
@@ -441,9 +515,7 @@ namespace creaImageIO
   void GimmickView::ConnectValidationObserver(ValidationCallbackType callback)
   {
     mValidationSignal.connect(callback);
-  }
-         
+  }      
   
 } // EO namespace creaImageIO
 
-