]> Creatis software - creaImageIO.git/commitdiff
2026 Bug Reading a group of images, Reading a directory with images
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 5 Jun 2013 15:03:43 +0000 (17:03 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 5 Jun 2013 15:03:43 +0000 (17:03 +0200)
bbtk/src/bbcreaImageIOImagesChooserDialogBox.xml
src/creaImageIOImageReader.cpp
src/creaImageIOSimpleView.cpp
src/creaImageIOVtkImageReader.cpp
src/creaImageIOWxSimpleDlg.h

index 64f41a404da8e69ec34913cf65e9a63a24b81afc..5c753905a3a44195ae37c4f18a2fe032d3afcc4e 100644 (file)
                          double spac[3];
                          first->GetDimensions(dim);
                          first->GetSpacing(spac);
-                     out->SetSpacing(spac);
+                         if (spac[0]==spac[1])
+                          {
+                               spac[2]=spac[0];  
+                         }
+                         out->SetSpacing(spac);
                          out->SetDimensions(dim[0], dim[1], dlg.getImagesSelected().size() );
                          out->AllocateScalars();
                          out->Update();
                          unsigned long imsize = dim[0] * dim[1];
-                         imsize = imsize * dim[2] ;  // deal with multiframes here
+                         imsize = imsize * dim[2];  // deal with multiframes here
                          // differents formats char , short, etc...
                          // differents components 1..3  ex. jpg ->RGB 3
                          imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
-                         int slice = 0;
-                     std::vector<vtkImageData*>::iterator it;
-                     for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
-                         {
-                                 memcpy(out->GetScalarPointer(0,0,slice), (*it)->GetScalarPointer(0,0,0), imsize);
-                                 slice++;
-                         }     
-                         //for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
-                         //{
-                                // (*it)->Delete();
-                         //}
-                         bbSetOutputOut(out);
+
+                       int slice,sizeImageVector=dlg.getImagesSelected().size();
+                        for (slice=0 ; slice<sizeImageVector ; slice++)
+                        {
+                               vtkImageData *img = dlg.getImagesSelected()[slice];
+                               memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
+                               //img->Delete();
+                        }      
+
+//EED Notworking the iteration over the pointer vtkImageData
+//                   int slice=0;
+//                   std::vector<vtkImageData*>::iterator it;
+//                   for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
+//                       {
+//                               memcpy(out->GetScalarPointer(0,0,slice), (*it)->GetScalarPointer(0,0,0), imsize);
+//                               slice++;
+//                       }     
+//                    //for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
+//                     //  {
+//                     //      (*it)->Delete();
+//                     //  }
+
+
+                        bbSetOutputOut(out);
                  }
                } else { 
              bbSetOutputOut( NULL );  
index 2d73f1160c0a698575f8b260ba314894a5eae342..4220fb1f85c7371f809f015b087c49b1e2b7f005 100644 (file)
@@ -62,9 +62,9 @@ namespace creaImageIO
 
 
        Register( boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkPNGReader::New() , "PNG", ".png")));
-    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkTIFFReader::New(), "JPEG", ".jpeg")));
-    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkJPEGReader::New())));
-    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New())));
+    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkTIFFReader::New(), "TIFF", ".tiff")));
+    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkJPEGReader::New(), "JPEG", ".jpeg")));
+    Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New(), "BMP", ".bmp")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkSLCReader::New())));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkMetaImageReader::New(),"MHD",".mhd")));
     //   Register(new VtkImageReader(vtkGESignalReader::New()));
index 63c077ec0edf84ee8a29dac1b8f8fa295442d05c..019214310279cc3eea37abd862e26efcc3052ed0 100644 (file)
@@ -43,16 +43,16 @@ namespace creaImageIO
                                if(bresult)
                                {
                                        i_img.push_back(mReader->ReadImage((*it).c_str()));
-                               }
-                               else
-                               {
+                               } else {
+                                       printf("ERROR. Impossible to read file %s\n", (*it).c_str() );
                                        bfinal = false;
-                               }
-                       }
+                               } // if
+                       } // for
                        delete mReader;
                        return bfinal;  
        }
 
+
        bool SimpleView::readDirectory(const std::string i_pathname, std::vector<vtkImageData *> &i_imgs)
        {
                        bool bresult = true;
index d16137be5552ca1dbb1fc02068778dbb47d35b5d..60ef13a8bfa0e087e95669378881d07a1309df4a 100644 (file)
@@ -98,10 +98,13 @@ namespace creaImageIO{
     vtkImageData* im = 0;
     try
       {
+       
        mReader->SetFileName(filename.c_str());
        mReader->Update();
        im = vtkImageData::New();
+        mReader->FileLowerLeftOff();
        im->ShallowCopy(mReader->GetOutput());
+printf("EED VtkImageReader::ReadImage GetFileLowerLeft %d\n" , mReader->GetFileLowerLeft() );
       }
     catch (...)
       {
index 40b552659b97ab2b1d5546c936f32dc86d902738..7fd3335ffe1893fa33038c475592f890ad20b1a3 100644 (file)
@@ -69,16 +69,16 @@ namespace creaImageIO
                   std::vector<creaImageIO::OutStrGimmick> getMapInfos(){return m_resultsInfo;}
 
        private:
-               bool bInfo;
-               std::string namedescp; 
-               std::string namedb;
-               wxString infoimage;
+               bool                                    bInfo;
+               std::string                             namedescp; 
+               std::string                             namedb;
+               wxString                                infoimage;
 
                /// interface to read data
-               SimpleView m_view;
+               SimpleView                              m_view;
 
                /// vtkImageData vector
-               std::vector<vtkImageData*> m_results;
+               std::vector<vtkImageData*>              m_results;
 
                std::vector<creaImageIO::OutStrGimmick> m_resultsInfo;