void WxSimpleDlg::OnReadFile(wxCommandEvent& event)
{
int resultShowModal;
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog* fileDlg = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxOPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#else
+ wxFileDialog* fileDlg = new wxFileDialog( 0, _T("Select file"), _T(""), _T(""), crea::std2wx("*"), wxFD_OPEN |wxFD_MULTIPLE, wxDefaultPosition);
+#endif
resultShowModal = fileDlg->ShowModal();
if ( resultShowModal==wxID_OK )
dlg.ShowModal();
if (dlg.GetReturnCode() == wxID_OK)
{
- dlg.stopReading();
- std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
- dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
+//EED1 dlg.stopReading();
m_results.clear();
int size=(int)outStrGimmick.size();
int ii;
// {
for (ii=0;ii<size;ii++)
{
- outStrGimmick[ii].img->Modified();
- outStrGimmick[ii].img->Update();
m_results.push_back(outStrGimmick[ii].img);
m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
}
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;
}
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...