]> Creatis software - creaImageIO.git/blobdiff - src/creaImageIOWxGimmickView.cpp
Don't create empty MakeFileLists.txt when NewPackage
[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp
index 894e4ede77488268f60c944f79e65d556f117d7b..e7dcfcf63918959ff5d1291ac5620a10b0477159 100644 (file)
@@ -553,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 |
@@ -828,7 +831,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..."));
@@ -948,7 +956,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());
@@ -969,7 +977,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;                                               
@@ -1091,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 |
@@ -1165,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 |