X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.h;h=2ccd2e35b5cdf10d7753d249d0dd6e4c3ed0f184;hb=f6c90a7f05ae0fd545dfdba5cd5a37d124bd8056;hp=135802bb8595566552cb7c3a6613243dc47f2237;hpb=40c5cfdc77e721db1507ffdac3625b7813f66f4c;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.h b/src/creaImageIOWxSimpleDlg.h
index 135802b..2ccd2e3 100644
--- a/src/creaImageIOWxSimpleDlg.h
+++ b/src/creaImageIOWxSimpleDlg.h
@@ -1,10 +1,36 @@
-#include "creaImageIOSimpleView.h"
-#include <creaWx.h>
+/*
+# ---------------------------------------------------------------------
+#
+# 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 "creaImageIOSimpleView.h"
 
+#include "creaImageIOWxGimmickReaderDialog.h"
 namespace creaImageIO
 {
-	 /**
+ /**
    * \ingroup View
    */
 
@@ -13,12 +39,14 @@ namespace creaImageIO
 	{
 	public:
 		 /// Ctor
-		  WxSimpleDlg( wxWindow *parent,  wxString i_title ="");
-
+		  WxSimpleDlg( wxWindow *parent,  
+			  wxString i_title =_T(""),
+			  const std::string i_namedescp = "localdatabase_Descriptor.dscp",   
+			  const std::string i_namedb   = "Local Database"     
+			  );
 		  ///Dtor
 		  ~WxSimpleDlg(){};
 
-
 		  /// Callback to read file(s)
 		  void OnReadFile(wxCommandEvent& event);
 
@@ -30,13 +58,38 @@ namespace creaImageIO
 
 		   /// return a vtkImageData vector of selected images, if available
 		   std::vector<vtkImageData*> getImagesSelected();
+		   vtkImageData* getVolumeSelected();
+
+		   wxString getInfoImage();
+		   wxString getInfoImageSource();
+
+		   std::vector< std::map<std::string,std::string> >  getDicomInfoImagesSelected();
+		   void SetAttrDicomTags( std::vector<std::string> attr );
+
+
+		   void setInfo(bool i_val){bInfo = i_val;}
+		   
+		   // OutStrGimmick:
+		   //	- vtkImageData *
+		   //	- std::map<std::string, std::string> mapDicomInfos (std::map<tag Dicom, Value>
+		   std::vector<creaImageIO::OutStrGimmick> getMapInfos(){return m_resultsInfo;}
 
 	private:
+		bool 												bInfo;
+		std::string 										namedescp; 
+		std::string 										namedb;
+		wxString 											infoimage;
+		wxString 											infoimageSource;
 
 		/// interface to read data
-		SimpleView m_view;
+		SimpleView 											m_view;
 
 		/// vtkImageData vector
-		std::vector<vtkImageData*> m_results;
+		std::vector<vtkImageData*> 							m_results;
+		std::vector< std::map<std::string,std::string> > 	m_resultsDicomAtr;
+		std::vector<std::string> 							m_attrDicomTags;    // DXXXX_YYYY DAAAA_BBBB ...
+
+		std::vector<creaImageIO::OutStrGimmick> m_resultsInfo;
+		
 	};
-}
\ No newline at end of file
+}