X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=eb9882edfa8ca568fbd62d33c3c4222391e88150;hb=5ce273b1e5a79911e2582e16adc02f0c9505d5d2;hp=ca984309b7eaf5d5e5cb27d8f3110c929317dd28;hpb=abc0f1167f95cd0ed091cfbd3ac6df41445caf90;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index ca98430..eb9882e 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -69,7 +69,12 @@ namespace creaImageIO
 	  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 )
@@ -145,7 +150,7 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-				dlg.stopReading();
+//EED1				dlg.stopReading();
 
 				std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
 				dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
@@ -157,6 +162,7 @@ namespace creaImageIO
 //			{
 				for (ii=0;ii<size;ii++)
 				{
+printf("EED1 WxSimpleDlg::OnReadGimmick %d \n", ii);
 					m_results.push_back(outStrGimmick[ii].img);
 					m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
 				}
@@ -232,12 +238,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;
@@ -254,8 +262,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...