#ifndef __creaImageWxAnySimpleDlg_h_INCLUDED__
#define __creaImageWxAnySimpleDlg_h_INCLUDED__
+#include <vtkVersionMacros.h>
#include "creaImageIOSimpleView.h"
#include <creaWx.h>
#include <itkImageFileReader.h>
for(; it != m_AnyImages.end(); it++)
{
imgs.push_back(boost::any_cast<TImage*> (*it));
- }
+ } // for
return imgs;
}
bool AllSameType();
template <class TImage>
void split3Din3Dvtk(TImage* i_Img)
- {
+ {
typedef itk::ImageToVTKImageFilter< TImage > ConnectorType;
typename ConnectorType::Pointer connector = ConnectorType::New();
connector->SetInput(i_Img);
connector->Update();
vtkImageData *im = vtkImageData::New();
im->ShallowCopy(connector->GetOutput());
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
im->Update();
+#else
+ im->Modified();
+#endif
+
+
m_Vresults.push_back(im);
}
-
template <typename TImage>
void split4Din3Dvtk(TImage* i_Img);
-
private:
-
// strange compile error with gcc 4.5.1-4 //JPR
std::vector</*const*/ size_t> m_AnyDims; //comment out const JPR
std::vector</*const*/ std::type_info *> m_AnyType; //comment out const JPR
wxString infoimage;
std::string m_dir;
-
bool m_dicom;
/// interface to read data
SimpleView m_view;
const std::type_info & getType(const std::string &i_name);
};
-
}// namespace creaImageIO
#endif //__creaImageWxAnySimpleDlg_h_INCLUDED__