Feature #1790

[creaImageIO.git] / src / creaImageIOExternalGimmick.cpp

diff --git a/src/creaImageIOExternalGimmick.cpp b/src/creaImageIOExternalGimmick.cpp
index 8201a8193c3bd6f698605d51ea969da542c52110..42e07e2fe7fc8605cd92980cc3f55f1116706ed9 100644 (file)
--- a/src/creaImageIOExternalGimmick.cpp
+++ b/src/creaImageIOExternalGimmick.cpp
@@ -1,6 +1,79 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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>
+
+//EED Borrame
+//#include <creaImageIOExternalGimmick.h>
+
+
+vtkImageData* getImageDataDialog()
+{
+    wxString infoImage;
+    std::vector<vtkImageData*> images;
+    creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB");
+    w.ShowModal();
+    if(w.GetReturnCode() == wxID_OK)
+    {
+        std::vector<std::string> s;
+        images   = w.getImagesSelected();
+        infoImage = w.getInfoImage();
+    } // if
+
+    vtkImageData *result=NULL;
+    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();
        #ifdef __WXGTK__
@@ -15,11 +88,11 @@ vtkImageData* getImageDataDialog() {
           int min_dim = GIMMICK_2D_IMAGE_SELECTION;
           int max_dim = GIMMICK_3D_IMAGE_SELECTION;
           int output_dim = NATIVE;
-          int threads = 1;         
+          int threads = 1;
 
           creaImageIO::WxGimmickReaderDialog w(
                                                0,
-                                          -1, 
+                                          -1,
                                           "localdatabase_Descriptor.dscp",
                                           "Local Database",
                                           _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
@@ -39,7 +112,7 @@ vtkImageData* getImageDataDialog() {
                   std::vector<std::string> s;
                   w.GetSelectedFiles(s);
                   std::vector<std::string>::iterator i;
-                  for (i=s.begin();i!=s.end();++i) 
+                  for (i=s.begin();i!=s.end();++i)
                         {
                           std::cout << *i << std::endl;
                         }
@@ -55,7 +128,7 @@ vtkImageData* getImageDataDialog() {
 
                   //crea::VtkBasicSlicer(images.front());
                   //images.front()->Delete();
-                  
+
 
                 }
           else if (w.GetReturnCode() == wxID_CANCEL)
@@ -63,11 +136,11 @@ vtkImageData* getImageDataDialog() {
                   w.OnExit();
                   std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
                 }
-          else 
+          else
                 {
                   w.OnExit();
                   std::cout << "$$$$ main : dialog ended without return code ! $$$$"
-                                        <<std::endl;    
+                                        <<std::endl;
                 }
 
           //   std::cout << "$$$$ main : deleting dialog"<<std::endl;
@@ -75,5 +148,6 @@ vtkImageData* getImageDataDialog() {
           std::cout << "$$$$$$$$$$$$$$$$$$$$ main ended "<<std::endl;
           return NULL;
        }
-       
-       
+
+
+*/