#2458 creaImageIO Feature New Normal - UnMosaic Images SimpleView Gimick

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 072e9e796a7a844a10e0a3bf9fbded8bdd559edb..5d053226805a45430b51785d2e0af1d1a6e2ecb9 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.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 "creaImageIOWxSimpleDlg.h"
 
 
@@ -51,14 +78,14 @@ namespace creaImageIO
                                fileDlg->GetPaths(wxArray);
                                if(wxArray.size() >0)
                                {
-
+                                       m_results.clear();
                                        infoimage=_T("FILE(s):")+wxArray[0];
                                        std::vector<std::string> files;
                                        for( int i = 0; i < wxArray.GetCount(); i++)
                                        {
                                                files.push_back( crea::wx2std(wxArray[i]));
                                        }
-                                       if(!m_view.readFile(files,m_results))
+                                       if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) )
                                        {
                                                //TO DO WARNING MESSAGE;
                                        }
@@ -84,8 +111,9 @@ namespace creaImageIO
                 resultShowModal = dirDlg->ShowModal();
                 if ( resultShowModal==wxID_OK )
                 {  
+                        m_results.clear();
                        infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
-                       if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+                       if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
                        {
                                //TO DO WARNING MESSAGE;
                        }
@@ -115,27 +143,28 @@ namespace creaImageIO
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
-                       std::vector<creaImageIO::OutStrGimmick> out;
-                       std::vector<std::string> attr;
                                dlg.stopReading();
-                               dlg.getSelected(out, attr,true,"");
+
+                               std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+                               dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
+
                        m_results.clear();
-                       int size=out.size();
+                       int size=(int)outStrGimmick.size();
                        int ii;
-                       if(!bInfo)
-                       {
-                               for (ii=0;ii<size;ii++)
-                               {
-                                       m_results.push_back(out[ii].img);
-                               }
-                       }
-                       else
-                       {
+//                     if(!bInfo)
+//                     {
                                for (ii=0;ii<size;ii++)
                                {
-                                       m_resultsInfo.push_back(out[ii]);
+                                       m_results.push_back(outStrGimmick[ii].img);
+                                       m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
                                }
-                       }
+//                     } else {
+//                             for (ii=0;ii<size;ii++)
+//                             {
+//                                     m_resultsInfo.push_back(outStrGimmick[ii]);
+//                             }
+//                     }
+
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
@@ -154,5 +183,18 @@ namespace creaImageIO
          {
                  return m_results;
          }
+
+       std::vector< std::map<std::string, std::string> >  WxSimpleDlg::getDicomInfoImagesSelected()
+       {
+               return m_resultsDicomAtr;
+       }
+
+       void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
+       {
+               m_attrDicomTags=attr;
+       }
+         
+
+
 }