*** empty log message ***

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index d9f727cc56096b3acadd402892a59e2c1943ea98..df8a67caee3b769ab986d41a1c494fce68f862b9 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -324,10 +324,10 @@ namespace creaImageIO
   /// By default if out_infos is empty, we dont' provide informations, we return only vtkImageData 
   /// if out_infos has only one entry "all" we provide all database informations
   void WxGimmickView::getSelectedFiles(std::vector<OutStrGimmick> &outG, std::vector< std::string> i_attr, 
-                                                                         bool mult, const std::string out_model)
+                                       bool mult, const std::string out_model)
   {
        // First we select the files
-    std::vector<std::string> files;
+        std::vector<std::string> files;
        std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
        GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
 
@@ -502,7 +502,8 @@ namespace creaImageIO
          new wxProgressDialog(_T("Adding file(s)"),
                               _T(""),
                               1000,
-                              this,
+//                            this,
+                              NULL,
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
@@ -514,7 +515,7 @@ namespace creaImageIO
        mProgressDialog->Pulse(_T("Updating view..."));
 
        UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-       delete mProgressDialog;
+       killProgress();
        DisplayAddSummary();    
 
       }
@@ -552,7 +553,10 @@ namespace creaImageIO
                new wxProgressDialog(_T("Adding directory"),
                                        _T(""),
                                        NumberFilesToAdd(dirname,recurse),
-                                       this,
+
+//EED                                  this,
+                                       NULL,
+
                                        wxPD_ELAPSED_TIME | 
                                        wxPD_SMOOTH |
                                        // wxPD_ESTIMATED_TIME |
@@ -564,7 +568,7 @@ namespace creaImageIO
                mProgressDialog->Pulse(_T("Updating view..."));
 
                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-               delete mProgressDialog;
+               killProgress();
                DisplayAddSummary();
          }
     mViewer->StartPlayer();
@@ -827,13 +831,18 @@ 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..."));
 
      UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-     delete mProgressDialog;
+     killProgress();
      DisplayAddSummary();
   }
 
@@ -925,7 +934,7 @@ namespace creaImageIO
   void WxGimmickView::OnTools(wxCommandEvent& event)
   {
        mViewer->StopPlayer();
-               
+       
        wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(550,350));
 
        wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
@@ -951,12 +960,12 @@ namespace creaImageIO
                {
                        std::string inputDir  = crea::wx2std(gimmickTools->getInputDir());
                        std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
-                       
+
                        bool addToDB = gimmickTools->getAddToDBCheckBoxValue();
 
                        if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
                        {
-                               if ( wxMessageBox(_T("Depending on the amount of Data the process can take between 1 and 5 minutes. Do you want to continue?"),
+                               if ( wxMessageBox(_T("Depending on the amount of Data the process can take several minutes. Do you want to continue?"),
                                                  _T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES )
                                {
                                        Bruker2Dicom b2d;    
@@ -965,17 +974,28 @@ namespace creaImageIO
                                        b2d.SetConvertModeToDicom();
                                        b2d.verbose=false;
                                        b2d.Execute();
-
                                        if (addToDB)
                                        {
-                                               mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+       std::cout <<"after addToDB" << std::endl;
+                                               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;                                               
                                                mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true);
+       std::cout <<"after mGimmick->AddDir" << std::endl;                                      
                                                mProgressDialog->Pulse(_T("Updating view..."));
-
+       std::cout <<"after mProgressDialog->Pulse" << std::endl;
                                                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-                                               delete mProgressDialog;
+       std::cout <<"after UpdateTreeViewLevel" << std::endl;                                           
+                                               killProgress();
+       std::cout <<"after delete mProgressDialog" << std::endl;                                                        
                                                DisplayAddSummary();
+       std::cout <<"after dDisplayAddSummary" << std::endl;                                            
                                        }       
                                }
                        }
@@ -1084,7 +1104,10 @@ namespace creaImageIO
                new wxProgressDialog(_T("Adding drive"),
                                        _T(""),
                                        1000,
-                                       this,
+
+//EED                                  this,
+                                       NULL,
+
                                        wxPD_ELAPSED_TIME |
                                        //                             wxPD_ESTIMATED_TIME | 
                                        //                             wxPD_REMAINING_TIME |
@@ -1094,7 +1117,7 @@ namespace creaImageIO
                mProgressDialog->Pulse(_T("Updating view..."));
                
                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-               delete mProgressDialog;
+               killProgress();
                DisplayAddSummary();
                mViewer->StartPlayer();  
          }
@@ -1158,7 +1181,10 @@ namespace creaImageIO
            new wxProgressDialog(_T("Adding file(s)"),
                               _T(""),
                               1000,
-                              this,
+
+//EED                          this,
+                               NULL,
+
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
@@ -1166,7 +1192,7 @@ namespace creaImageIO
                mGimmick->AddFiles(storage,i_filenames);
                mProgressDialog->Pulse(_T("Updating view..."));
                UpdateTreeViewLevel(storage,1);
-               delete mProgressDialog;
+               killProgress();
                DisplayAddSummary();    
        }
   }
@@ -1193,10 +1219,14 @@ namespace creaImageIO
     //    std::cout << "OnAddProgress "<<mess<<std::endl;
     wxString s(wxString::From8BitData(mess));
     //  std::cout << "Pulse"<<std::endl;
-    if (!mProgressDialog->Pulse(s)) 
-      {
-       p.SetStop();
-      }
+
+       if(mProgressDialog != 0)
+       {
+               if (!mProgressDialog->Pulse(s)) 
+                 {
+               p.SetStop();
+                 }
+       }
     //  std::cout << "OnAddProgress ok"<<std::endl;
   }
   //=================================================
@@ -1204,13 +1234,8 @@ namespace creaImageIO
   //=================================================
   void WxGimmickView::DisplayAddSummary()
   {
-    const Gimmick::AddProgress& p = mGimmick->GetAddProgress();
-    std::stringstream mess;
-    mess << "Dirs \tscanned\t: " << p.GetNumberScannedDirs()  << "\n";
-    mess << "Files\tscanned\t: " << p.GetNumberScannedFiles() << "\n";
-    mess << "Files\thandled\t: " << p.GetNumberHandledFiles() << "\n\n";
-    mess << "Files\tadded  \t: " << p.GetNumberAddedFiles()   << "\n\n";
-       time_t end;
+      std::stringstream mess(mGimmick->getSummary());
+    time_t end;
        time(&end);
        mess << "time to scan :" << difftime(end,mstart) << "sec";
     wxMessageBox(std2wx(mess.str()),_T("Addition result"),wxOK,this);
@@ -1287,6 +1312,13 @@ namespace creaImageIO
        }
   }
 
+  void WxGimmickView::killProgress()
+  {
+               mProgressDialog->Resume();
+               mProgressDialog->Destroy();
+               mProgressDialog = 0;
+  }
+
    //=================================================
 
    //=================================================