X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;fp=src%2FcreaImageIOWxSimpleDlg.cpp;h=072e9e796a7a844a10e0a3bf9fbded8bdd559edb;hb=4df41c05225bee74ec2f3803f210882a2e1204ee;hp=a9b1b4b9183fe398b111fa20209fce70e0de55e1;hpb=3213e0d7adb70f52d723a5b7065f4780b6c9e451;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index a9b1b4b..072e9e7 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -1,8 +1,5 @@
 #include "creaImageIOWxSimpleDlg.h"
-#include "creaImageIOWxGimmickReaderDialog.h"
-//#include <itkAnalyzeImageIO.h>
-//#include <itkImageFileReader.h>
-//#include <itkImage.h>
+
 
 namespace creaImageIO
 {
@@ -35,7 +32,7 @@ namespace creaImageIO
 	   Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
 	   /// \TODO  Button to select Bruker directory
-	
+	   bInfo = false;
 	Layout(); 
 	
 	}
@@ -54,8 +51,6 @@ namespace creaImageIO
 				fileDlg->GetPaths(wxArray);
 				if(wxArray.size() >0)
 				{
-				/*	typedef itk::Image< float, 4 >         ImageType;
-					ReadImage<ImageType>(crea::wx2std(wxArray[0]).c_str());*/
 
 					infoimage=_T("FILE(s):")+wxArray[0];
 					std::vector<std::string> files;
@@ -120,28 +115,30 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-	//		infoimage=_T("DICOM: ???_EED_???");
-//EED 07JUIN2010			dlg.GetSelectedImages(m_results,3);
 			std::vector<creaImageIO::OutStrGimmick> out;
 			std::vector<std::string> attr;
-//				attr.push_back("D0028_0010");
-//				attr.push_back("D0008_0023");
-//				attr.push_back("D0008_1070");
 				dlg.stopReading();
 				dlg.getSelected(out, attr,true,"");
-//				crea::VtkBasicSlicer(out.front().img);
 			m_results.clear();
 			int size=out.size();
 			int ii;
-			for (ii=0;ii<size;ii++)
+			if(!bInfo)
 			{
-				m_results.push_back(out[ii].img);
+				for (ii=0;ii<size;ii++)
+				{
+					m_results.push_back(out[ii].img);
+				}
+			}
+			else
+			{
+				for (ii=0;ii<size;ii++)
+				{
+					m_resultsInfo.push_back(out[ii]);
+				}
 			}
-
 			dlg.OnExit();
 		 }
 		 SetReturnCode( dlg.GetReturnCode() );
-//		 Close();
 		 EndModal( dlg.GetReturnCode() );
 	   }