#3111 creaImageIO Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index e750b912c185811e58608c261985f64daf97fee4..2e9a9c557993b0057c846e250ac8c97cbe82736f 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -79,7 +79,8 @@ namespace creaImageIO
                                if(wxArray.size() >0)
                                {
                                        m_results.clear();
-                                       infoimage=_T("FILE(s):")+wxArray[0];
+                                       infoimage               =       wxArray[0];
+                                       infoimageSource =       _T("FILE(s)");
                                        std::vector<std::string> files;
                                        for( int i = 0; i < wxArray.GetCount(); i++)
                                        {
@@ -112,7 +113,8 @@ namespace creaImageIO
                 if ( resultShowModal==wxID_OK )
                 {  
                         m_results.clear();
-                       infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
+                       infoimage               =       dirDlg->GetPath();
+                       infoimageSource =       _T("DIRECTORY");
                        if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
                        {
                                //TO DO WARNING MESSAGE;
@@ -165,6 +167,9 @@ namespace creaImageIO
 //                             }
 //                     }
 
+                       infoimage               =       _T("EED Missing info <void> ???");
+                       infoimageSource =       _T("GIMMICK");
+
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
@@ -177,6 +182,12 @@ namespace creaImageIO
                return infoimage;
        }
 
+//-----------------------------------------------------------------------------   
+       wxString WxSimpleDlg::getInfoImageSource()
+       {
+               return infoimageSource;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////
@@ -221,12 +232,14 @@ namespace creaImageIO
                                first->GetDimensions(dim);
                                if (dim[2]==1)
                                {
-                                       vtkImageData *out;
-                                       out  = vtkImageData::New();
-                                       out->SetScalarType(first->GetScalarType());
-                                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
+                                       vtkImageData *out = vtkImageData::New();
                                        int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                        first->GetWholeExtent(ext); 
+#else
+                                       first->GetExtent(ext); 
+#endif
                                        if(ext[5] == 0)
                                        {
                                           ext[5] = getImagesSelected().size()-1;
@@ -243,8 +256,18 @@ namespace creaImageIO
                                }
                                        out->SetSpacing(spac);
                                        out->SetDimensions(dim[0], dim[1], getImagesSelected().size() );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+
+                                       out->SetScalarType(first->GetScalarType());
+                                       out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
                                        out->AllocateScalars();
                                        out->Update();
+#else
+                                       out->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
+#endif
+
+
                                        unsigned long imsize = dim[0] * dim[1];
                                        imsize = imsize * dim[2];  // deal with multiframes here
                                        // differents formats char , short, etc...