X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=f69261f6c0b9c8b0238b9190c047a7f00f5e01ea;hb=e512772003e71d7505c469967730c9e6b562e9a0;hp=43e2ac115639bd342fa4e15cadf30edea3fe5feb;hpb=f2ae64f4abd9dc5eacdc778cdd89d194f191c301;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 43e2ac1..f69261f 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,11 +47,11 @@ namespace creaImageIO
 			this->SetTitle(i_title);  
 	   }
 	   // Button to select file(s)
-	   wxButton *fileBut = new wxButton(this, -1,_T("Select a single 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
@@ -31,7 +59,7 @@ namespace creaImageIO
 	   Connect( gimmickBut->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxSimpleDlg::OnReadGimmick ); 
 
 	   /// \TODO  Button to select Bruker directory
-	
+	   bInfo = false;
 	Layout(); 
 	
 	}
@@ -50,6 +78,7 @@ 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++)
@@ -82,6 +111,7 @@ namespace creaImageIO
 		 resultShowModal = dirDlg->ShowModal();
 		 if ( resultShowModal==wxID_OK )
 		 {  
+			 m_results.clear();
 			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
 			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
 			{
@@ -113,28 +143,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() );
 	   }
 
@@ -150,5 +182,7 @@ namespace creaImageIO
 	  {
 		  return m_results;
 	  }
+
+	  
 }