X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.h;h=e472420bcd3a1e3758894714112d3cbcc363d0e8;hb=0300e66f49dd4dd1fd252f0a343944a3cbd5eb53;hp=f676eceb13a905e4b97b4859b054f228d47494a9;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickView.h b/src/creaImageIOWxGimmickView.h
index f676ece..e472420 100644
--- a/src/creaImageIOWxGimmickView.h
+++ b/src/creaImageIOWxGimmickView.h
@@ -1,3 +1,31 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------
+*/
+
+
 #ifndef __creaImageIOWxGimmickView_h_INCLUDED__
 #define __creaImageIOWxGimmickView_h_INCLUDED__
 
@@ -8,6 +36,7 @@
 #include <creaImageIOWxGimmickTools.h>
 #include <creaImageIOListener.h>
 #include <creaWx.h>
+#include <time.h>
 
 #include "wx/progdlg.h"
 
@@ -32,6 +61,7 @@ namespace creaImageIO
   public:
     
     typedef int EventType;
+	OutStrGimmick m_out;
     
     /// Ctor
     WxGimmickView(boost::shared_ptr<Gimmick>, 
@@ -48,11 +78,15 @@ namespace creaImageIO
     ///(overloaded from GimmickView)
     void GetSelectedFiles(std::vector<std::string>& s);
     
+	 /// Returns the selected files in output structure
+	void getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> out_infos, bool mult = false, const std::string out_model = "");
+
     /// Returns the selected Images so that they comply with the 
     /// given parameter(4D) (overloaded from GimmickView)
     void GetSelectedImages(std::vector<vtkImageData*>& s, int dim);
     void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim);
 
+
     /// Returns the images indicated by the filenames in the vector 
     /// so that they comply with the given parameter(dim)
     //(overloaded from GimmickView) 
@@ -104,7 +138,8 @@ namespace creaImageIO
 
 	///Called when there has been a change in the visible attributes of a tree view
 	void OnAttributesChanged(const std::vector<std::string>& nShown, int level);
-    
+
+
   protected:
     /// Creates the tool bar
     void CreateToolBar(); 
@@ -177,7 +212,7 @@ namespace creaImageIO
     
     /// Display a message box with the last addition statistics
     void DisplayAddSummary();
-
+	time_t  mstart;
 	/// Test a directory to know if contains sub-directory to analyze
 	bool isNeedRecursive(std::string i_name);
 
@@ -229,6 +264,9 @@ namespace creaImageIO
     //Pointer holders for images to be shown
  	std::vector< boost::shared_ptr<ImagePointerHolder> > pointers;
 
+	//kill Progress DialogBar
+	void killProgress();
+
     wxString mCurrentDirectory;
     
     DECLARE_EVENT_TABLE()