#3185 creaImageIO Feature New Normal - Clean code

[creaImageIO.git] / src / creaImageIOWxGimmickPanel.h

diff --git a/src/creaImageIOWxGimmickPanel.h b/src/creaImageIOWxGimmickPanel.h
index 0f0c494f5951ddcd4ae558e379a8fd34711d8d9d..cb74ee122a68489f152ebc5b67897a0ad34112de 100644 (file)
--- a/src/creaImageIOWxGimmickPanel.h
+++ b/src/creaImageIOWxGimmickPanel.h
@@ -1,10 +1,38 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 __creaImageIOWxGimmickPanel_h_INCLUDED__
 #define __creaImageIOWxGimmickPanel_h_INCLUDED__
 
 #ifdef USE_WXWIDGETS
 
 // Signal/slot mechanism for progress events
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 
 #include <creaImageIOWxGimmickView.h>
@@ -32,7 +60,7 @@ namespace creaImageIO
     ~WxGimmickPanel();
 
       //=============================================
-      typedef boost::signal<void (bool)> SendImageSignalType;
+      typedef boost::signals2::signal<void (bool)> SendImageSignalType;
       typedef SendImageSignalType::slot_function_type SendImageCallbackType;
       //=============================================
 
@@ -56,12 +84,22 @@ namespace creaImageIO
        mView->GetSelectedImages(s, dim); 
     }
 
-    void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim)
-    { 
-       mView->GetSelectedImagesInVector(s, dim); 
-    }
-
-  
+//EED 28mai2010      Use new mechanism getSelected
+//    void GetSelectedImagesInVector(std::vector<vtkImageData*>& s, int dim)
+//    { 
+//     mView->GetSelectedImagesInVector(s, dim); 
+//    }
+
+
+       // ----get selected files in an Output structure-------
+       // out: vector structure output  < <img, info>, ... >
+       // i_attr: list of dicom tags to extract 
+       // mult: information of one file or multiple files
+       // outmodel: xml-filename that specifies images order..(todo) 
+       void getSelected(std::vector<OutStrGimmick> &outG,std::vector< std::string> i_attr, bool mult, const std::string outmodel)
+       {
+               mView->getSelectedFiles(outG, i_attr, mult, outmodel);
+       }
 
     void OnSelectedImage(bool t);