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

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index f1e75e8..5d05322 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -1,15 +1,43 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
 #include "creaImageIOWxSimpleDlg.h"
-#include "creaImageIOWxGimmickReaderDialog.h"
+
 
 namespace creaImageIO
 {
 
+
 	///Ctor
    WxSimpleDlg::WxSimpleDlg(wxWindow *parent, 
-							wxString i_title,  
-							const std::string i_namedescp , 
-							const std::string i_namedb)
-    : wxDialog(parent, -1,_T("DISPLAY IMAGES"), wxDefaultPosition, wxSize(230,150))
+                            wxString i_title,  
+                            const std::string i_namedescp , 
+                            const std::string i_namedb)
+    : wxDialog(parent, -1,_T("SELECT IMAGE(S)"), wxDefaultPosition, wxSize(230,150))
    {
 		namedescp	= i_namedescp; 
 		namedb		= i_namedb;
@@ -19,19 +47,19 @@ namespace creaImageIO
 			this->SetTitle(i_title);  
 	   }
 	   // Button to select file(s)
-	   wxButton *fileBut = new wxButton(this, -1,_T("Select a file to display"), wxPoint(10,7) );
+	   wxButton *fileBut = new wxButton(this, -1,_T("Select a single file"), wxPoint(10,7) );
   	   Connect( fileBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadFile ); 
 
 	   // Button to select directory
-	   wxButton *directoryBut = new wxButton(this, -1,_T("Select a directory to display"), wxPoint(10,40) );
+	   wxButton *directoryBut = new wxButton(this, -1,_T("Select all the files in a directory"), wxPoint(10,40) );
 	   Connect( directoryBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadDirectory ); 
 
 	   // button to select creaImageIO
-	   wxButton *gimmickBut = new wxButton(this, -1,_T("Select Gimmick"), wxPoint(10,70) );
+	   wxButton *gimmickBut = new wxButton(this, -1,_T("Select thru Dicom browser"), wxPoint(10,70) );
 	   Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
 	   /// \TODO  Button to select Bruker directory
-	
+	   bInfo = false;
 	Layout(); 
 	
 	}
@@ -50,18 +78,18 @@ namespace creaImageIO
 				fileDlg->GetPaths(wxArray);
 				if(wxArray.size() >0)
 				{
+					m_results.clear();
+					infoimage=_T("FILE(s):")+wxArray[0];
 					std::vector<std::string> files;
 					for( int i = 0; i < wxArray.GetCount(); i++)
 					{
 						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;
 					}
-				}
-				else
-				{
+				} else {
 					// TO DO WARNING MESSAGES
 				}
 			}
@@ -83,7 +111,9 @@ namespace creaImageIO
 		 resultShowModal = dirDlg->ShowModal();
 		 if ( resultShowModal==wxID_OK )
 		 {  
-			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+			 m_results.clear();
+			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
+			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
 			{
 				//TO DO WARNING MESSAGE;
 			}
@@ -113,29 +143,39 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-//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.getSelected(out, attr,true,"");
-//				crea::VtkBasicSlicer(out.front().img);
+				dlg.stopReading();
+
+				std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+				dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
+
 			m_results.clear();
-			int size=out.size();
+			int size=(int)outStrGimmick.size();
 			int ii;
-			for (ii=0;ii<size;ii++)
-			{
-				m_results.push_back(out[ii].img);
-			}
+//			if(!bInfo)
+//			{
+				for (ii=0;ii<size;ii++)
+				{
+					m_results.push_back(outStrGimmick[ii].img);
+					m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
+				}
+//			} else {
+//				for (ii=0;ii<size;ii++)
+//				{
+//					m_resultsInfo.push_back(outStrGimmick[ii]);
+//				}
+//			}
 
 			dlg.OnExit();
 		 }
 		 SetReturnCode( dlg.GetReturnCode() );
-//		 Close();
 		 EndModal( dlg.GetReturnCode() );
 	   }
 
+	wxString WxSimpleDlg::getInfoImage()
+	{
+		return infoimage;
+	}
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector										//
 //////////////////////////////////////////////////////////////////////
@@ -143,5 +183,18 @@ namespace creaImageIO
 	  {
 		  return m_results;
 	  }
+
+	std::vector< std::map<std::string, std::string> >  WxSimpleDlg::getDicomInfoImagesSelected()
+	{
+		return m_resultsDicomAtr;
+	}
+
+	void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
+	{
+		m_attrDicomTags=attr;
+	}
+	  
+
+
 }