(some of the) unused variables

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 9c0d327057be53dbebbde686e7a770226129203e..9e79d4341575493be2a7565b8ca708af9a9957dd 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -171,6 +171,7 @@ namespace creaImageIO
     mBottomPanel->SetSizer(mbottom_sizer);
 
     // Splitting
+    /// \TODO fix warning: unused variable hsize
     int hsize = size.GetHeight();
 
     int top_minsize = 450;
@@ -502,7 +503,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 +516,7 @@ namespace creaImageIO
        mProgressDialog->Pulse(_T("Updating view..."));
 
        UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-       delete mProgressDialog;
+       killProgress();
        DisplayAddSummary();    
 
       }
@@ -552,7 +554,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 +569,7 @@ namespace creaImageIO
                mProgressDialog->Pulse(_T("Updating view..."));
 
                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-               delete mProgressDialog;
+               killProgress();
                DisplayAddSummary();
          }
     mViewer->StartPlayer();
@@ -602,7 +607,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,13 +832,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();
   }
 
@@ -947,7 +957,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 +978,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;                                               
@@ -978,7 +993,7 @@ namespace creaImageIO
        std::cout <<"after mProgressDialog->Pulse" << std::endl;
                                                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
        std::cout <<"after UpdateTreeViewLevel" << std::endl;                                           
-                                               delete mProgressDialog;
+                                               killProgress();
        std::cout <<"after delete mProgressDialog" << std::endl;                                                        
                                                DisplayAddSummary();
        std::cout <<"after dDisplayAddSummary" << std::endl;                                            
@@ -1090,7 +1105,10 @@ namespace creaImageIO
                new wxProgressDialog(_T("Adding drive"),
                                        _T(""),
                                        1000,
-                                       this,
+
+//EED                                  this,
+                                       NULL,
+
                                        wxPD_ELAPSED_TIME |
                                        //                             wxPD_ESTIMATED_TIME | 
                                        //                             wxPD_REMAINING_TIME |
@@ -1100,7 +1118,7 @@ namespace creaImageIO
                mProgressDialog->Pulse(_T("Updating view..."));
                
                UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-               delete mProgressDialog;
+               killProgress();
                DisplayAddSummary();
                mViewer->StartPlayer();  
          }
@@ -1164,7 +1182,10 @@ namespace creaImageIO
            new wxProgressDialog(_T("Adding file(s)"),
                               _T(""),
                               1000,
-                              this,
+
+//EED                          this,
+                               NULL,
+
                               wxPD_ELAPSED_TIME |
                               // wxPD_ESTIMATED_TIME |
                               // wxPD_REMAINING_TIME |
@@ -1172,7 +1193,7 @@ namespace creaImageIO
                mGimmick->AddFiles(storage,i_filenames);
                mProgressDialog->Pulse(_T("Updating view..."));
                UpdateTreeViewLevel(storage,1);
-               delete mProgressDialog;
+               killProgress();
                DisplayAddSummary();    
        }
   }
@@ -1199,10 +1220,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;
   }
   //=================================================
@@ -1288,6 +1313,13 @@ namespace creaImageIO
        }
   }
 
+  void WxGimmickView::killProgress()
+  {
+               mProgressDialog->Resume();
+               mProgressDialog->Destroy();
+               mProgressDialog = 0;
+  }
+
    //=================================================
 
    //=================================================