corrections

diff --git a/src/creaImageIOWxISimpleDlg.hpp b/src/creaImageIOWxISimpleDlg.hpp
index b2d813d6ddb83a5db0d0a0265e209280c73073d3..518ff9339a0a3411ab77d5526ba00250aba732cb 100644 (file)
--- a/src/creaImageIOWxISimpleDlg.hpp
+++ b/src/creaImageIOWxISimpleDlg.hpp
@@ -324,8 +324,8 @@ namespace creaImageIO
                            typename TImage::Pointer image = m_Iresults[0];
                        
                                 // Size and dims for Input Image
-                               typedef itk::Size<4> iSize; // TO REMOVE
-                               typedef const itk::Size<4>::SizeValueType iSizeVal; // TO REMOVE
+                               typedef itk::Size<4> iSize;
+                               typedef const itk::Size<4>::SizeValueType iSizeVal;
                                iSize size = image->GetLargestPossibleRegion().GetSize();
                                iSizeVal *dims_size  = size.GetSize();
 
@@ -345,7 +345,7 @@ namespace creaImageIO
                                 typedef itk::NumericSeriesFileNames NamesGeneratorType;
                                 NamesGeneratorType::Pointer namesGenerator = NamesGeneratorType::New();
                                 namesGenerator->SetStartIndex(0);
-                                namesGenerator->SetEndIndex(dims_size[3]-1); // TO CHANGE
+                                namesGenerator->SetEndIndex(dims_size[3]-1);
                                 namesGenerator->SetIncrementIndex(1);
                                 std::string format = i_dir;
                             format += "/image%03d.vtk";
@@ -359,9 +359,11 @@ namespace creaImageIO
                                        vtkImageReader2 *vReader = vtkImageReader2::New();
                                        vReader->SetFilePrefix(".vtk");
                                        std::vector<std::string>::const_iterator it = names.begin();
+//                                     for(unsigned int i = 0 ;i < dims_size[3]; i++)
                                        for( ;it !=  names.end(); ++it)
                                        {
-                                               vReader->SetFileName((*it).c_str());
+                                               std::string name(*it);
+                                               vReader->SetFileName("d://temp2//image000.vtk");//name.c_str());
                                                vReader->Update();
                                                crea::VtkBasicSlicer(vReader->GetOutput());
                                                m_Vresults.push_back(vReader->GetOutput());

diff --git a/src/creaImageIOWxIsimpleDlg.h b/src/creaImageIOWxIsimpleDlg.h
index 6527b014c12debe7f87bfa1a710cd2abfb072eab..d20691c6adc332015f643d50b7c547788cd51341 100644 (file)
--- a/src/creaImageIOWxIsimpleDlg.h
+++ b/src/creaImageIOWxIsimpleDlg.h
@@ -1,4 +1,5 @@
 #include "creaImageIOSimpleView.h"
+#include "itkImageToVTKImageFilter.h"
 #include <creaWx.h>
 #include <itkImageFileReader.h>
 
@@ -42,17 +43,19 @@ namespace creaImageIO
                   wxString getInfoImage();
 
                   void split4Din3Dvtk(const std::string &i_dir);
-                  void split3Din3Dvtk();
+                  void split3Din3Dvtk( );
+                  void set(bool i_dicom){m_dicom= i_dicom;}
        private:
 
                std::vector<std::string> m_exts;
                std::string namedescp; 
                std::string namedb;
                wxString infoimage;
-
+               bool m_dicom;
                /// interface to read data
                SimpleView m_view;
                 void readImg(const std::string &i_name);
+                void readDicomImg(const std::vector<std::string> &i_names);
 
                 std::vector <typename TImage::Pointer> m_Iresults;
 

diff --git a/src/creaImageIOWxViewer.cpp b/src/creaImageIOWxViewer.cpp
index 603d128bf7c79b98128962eb4a8468dc8f8fbcc6..065c686194d953556a6b220e08150187370a0505 100644 (file)
--- a/src/creaImageIOWxViewer.cpp
+++ b/src/creaImageIOWxViewer.cpp
@@ -137,7 +137,6 @@ namespace creaImageIO
        
          mMutex.Unlock();
        wxMutexLocker lock(mMutex);
-       
            
     GimmickMessage(2,"WxViewer::ShowNextImage() "
                   <<mCurrent+1<<"/"