#2842 creaImageIO Bug New Normal - Read images from directory

[creaImageIO.git] / src / creaImageIOExternalGimmick.cpp

diff --git a/src/creaImageIOExternalGimmick.cpp b/src/creaImageIOExternalGimmick.cpp
index 7e56ab93827ca6189533914d92e9ccaf78e60338..f29cf984ae027c319614a18bae3bbd11fae2fa8a 100644 (file)
--- a/src/creaImageIOExternalGimmick.cpp
+++ b/src/creaImageIOExternalGimmick.cpp
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIOExternalGimmick.h>
 #include <creaImageIOWxSimpleDlg.h>
@@ -12,23 +39,44 @@ vtkImageData* getImageDataDialog()
     std::vector<vtkImageData*> images;
     creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB");
     w.ShowModal();
+
+    vtkImageData *result=NULL;
+
     if(w.GetReturnCode() == wxID_OK)
     {
-        std::vector<std::string> s;
-        images   = w.getImagesSelected();
-        infoImage = w.getInfoImage();
+//        images         = w.getImagesSelected();
+//        infoImage = w.getInfoImage();
+       result=w.getVolumeSelected();
+
     } // if
 
-    vtkImageData *result=NULL;
-    if (images.size()>0)
-    {
-        result=images[0];
-    }
+// EED 2016/02/16 
+//    if (images.size()>0)
+//    {
+//       result=images[0];
+//    }
 
     return result;
 }
 
 
+
+std::vector<creaImageIO::OutStrGimmick> getImagesInfoDialog()
+{
+    wxString infoImage;
+    std::vector<creaImageIO::OutStrGimmick> s;
+    creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB");
+       w.setInfo(true);
+    w.ShowModal();
+    if(w.GetReturnCode() == wxID_OK)
+    {
+           s     = w.getMapInfos();
+    } 
+
+    return s;
+}
+
+
 /*EED Borrame
 vtkImageData* getImageDataDialog() {
        //      wxApp::OnInit();