X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=5d053226805a45430b51785d2e0af1d1a6e2ecb9;hb=1be6b124bc950f4d6734c241ce591d662bf3efbc;hp=6a6621eea98acaefeff1f8e0838fa7e37f726ae9;hpb=aa095c927358b5bd78f6145dfd06368dc065349c;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 6a6621e..5d05322 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -85,7 +85,7 @@ namespace creaImageIO
 					{
 						files.push_back( crea::wx2std(wxArray[i]));
 					}
-					if(!m_view.readFile(files,m_results))
+					if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) )
 					{
 						//TO DO WARNING MESSAGE;
 					}
@@ -113,7 +113,7 @@ namespace creaImageIO
 		 {  
 			 m_results.clear();
 			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
-			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
 			{
 				//TO DO WARNING MESSAGE;
 			}
@@ -146,14 +146,7 @@ namespace creaImageIO
 				dlg.stopReading();
 
 				std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
-				std::vector<std::string> 		attrDicomTags;
-
-				   attrDicomTags.push_back("D0028_0010");
-				   attrDicomTags.push_back("D0008_0023");
-				   attrDicomTags.push_back("D0008_1070");
-				   attrDicomTags.push_back("D0019_100e");
-
-				dlg.getSelected(outStrGimmick, attrDicomTags,true,"");
+				dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
 
 			m_results.clear();
 			int size=(int)outStrGimmick.size();
@@ -163,10 +156,6 @@ namespace creaImageIO
 				for (ii=0;ii<size;ii++)
 				{
 					m_results.push_back(outStrGimmick[ii].img);
-					printf("EED WxSimpleDlg::OnReadGimmick D0028_0010 %s\n", outStrGimmick[ii].infos.find("D0028_0010")->second.c_str() );
-					printf("EED WxSimpleDlg::OnReadGimmick D0008_0023 %s\n", outStrGimmick[ii].infos.find("D0008_0023")->second.c_str() );
-					printf("EED WxSimpleDlg::OnReadGimmick D0008_1070 %s\n", outStrGimmick[ii].infos.find("D0008_1070")->second.c_str() );
-					printf("EED WxSimpleDlg::OnReadGimmick D0019_100e %s\n", outStrGimmick[ii].infos.find("D0019_100e")->second.c_str() );
 					m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
 				}
 //			} else {
@@ -200,6 +189,12 @@ namespace creaImageIO
 		return m_resultsDicomAtr;
 	}
 
+	void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
+	{
+		m_attrDicomTags=attr;
+	}
 	  
+
+
 }