Bug 1805:

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index fc748e0aa2ebd31f5b5bd8599d286ba40ddbb898..c1b7acb8fc5e68aab4efdffb84f9e41c6878171c 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -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.
+# ------------------------------------------------------------------------
+*/
+
+
 #include <creaImageIOPACSConnection.h>
 #include <creaImageIOWxPACSConnectionPanel.h>
 #include <creaImageIOWxGimmickView.h>
@@ -171,6 +199,7 @@ namespace creaImageIO
     mBottomPanel->SetSizer(mbottom_sizer);
 
     // Splitting
+    /// \TODO fix warning: unused variable hsize
     int hsize = size.GetHeight();
 
     int top_minsize = 450;
@@ -502,7 +531,8 @@ namespace creaImageIO
          new wxProgressDialog(_T("Adding file(s)"),
                               _T(""),
                               1000,
-                              this,
+//                            this,
+                              NULL,
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
@@ -552,7 +582,10 @@ namespace creaImageIO
                new wxProgressDialog(_T("Adding directory"),
                                        _T(""),
                                        NumberFilesToAdd(dirname,recurse),
-                                       this,
+
+//EED                                  this,
+                                       NULL,
+
                                        wxPD_ELAPSED_TIME | 
                                        wxPD_SMOOTH |
                                        // wxPD_ESTIMATED_TIME |
@@ -586,7 +619,7 @@ namespace creaImageIO
                {
                        if (recursive) 
                        {
-                               nb += NumberFilesToAdd(itr->string(), recursive);
+                               nb += NumberFilesToAdd(itr->path().string(), recursive);
                        }
                }
                else
@@ -602,7 +635,7 @@ namespace creaImageIO
   bool WxGimmickView::isNeedRecursive(std::string i_name)
   {
       boost::filesystem::directory_iterator iter(i_name), end_iter;
-         bool bfindir = false;
+      //bool bfindir = false;
                  for(; iter != end_iter; ++iter)
                  {
                          if(boost::filesystem::is_directory(*iter))
@@ -827,7 +860,12 @@ namespace creaImageIO
    //=================================================
   void WxGimmickView::AddDir(std::string dirName)
   {
-     mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+     mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,
+
+//EED                                          this,
+                                               NULL,
+       
+                                               wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
      mCurrentDirectory = crea::std2wx(dirName);
      mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),dirName,true);
      mProgressDialog->Pulse(_T("Updating view..."));
@@ -947,7 +985,7 @@ namespace creaImageIO
        if (dial->GetReturnCode() == wxID_OK)
        {
 #if defined(BUILD_BRUKER)
-               if (nb->GetSelection()==0)//Selection: Bruker Image Reader
+               if (nb->GetSelection()==0)//Selection: Bruker Image Reader  
                {
                        std::string inputDir  = crea::wx2std(gimmickTools->getInputDir());
                        std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
@@ -968,7 +1006,12 @@ namespace creaImageIO
                                        if (addToDB)
                                        {
        std::cout <<"after addToDB" << std::endl;
-                                               mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+                                               mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,
+
+//EED                                                                                  this,
+                                                                                       NULL,
+
+                                                                                       wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
        std::cout <<"after new wxProgressDialog" << std::endl;                                          
                                                mCurrentDirectory = gimmickTools->getOutputDir();
        std::cout <<"after gimmickTools->getOutputDir[" <<mCurrentDirectory << std::endl;                                               
@@ -1090,7 +1133,10 @@ namespace creaImageIO
                new wxProgressDialog(_T("Adding drive"),
                                        _T(""),
                                        1000,
-                                       this,
+
+//EED                                  this,
+                                       NULL,
+
                                        wxPD_ELAPSED_TIME |
                                        //                             wxPD_ESTIMATED_TIME | 
                                        //                             wxPD_REMAINING_TIME |
@@ -1164,7 +1210,10 @@ namespace creaImageIO
            new wxProgressDialog(_T("Adding file(s)"),
                               _T(""),
                               1000,
-                              this,
+
+//EED                          this,
+                               NULL,
+
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
@@ -1199,6 +1248,7 @@ namespace creaImageIO
     //    std::cout << "OnAddProgress "<<mess<<std::endl;
     wxString s(wxString::From8BitData(mess));
     //  std::cout << "Pulse"<<std::endl;
+
        if(mProgressDialog != 0)
        {
                if (!mProgressDialog->Pulse(s))