X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.cpp;h=e7dcfcf63918959ff5d1291ac5620a10b0477159;hb=7a671d12e06db56b25b80194c2fc5a12897d3819;hp=b5e7e1938580db7f0f399e87b58534bea7d56c2d;hpb=34891dc6b110a21ed72b0ae24da3d5046724738a;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index b5e7e19..e7dcfcf 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -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 |
@@ -1200,13 +1219,6 @@ 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)) 
-	    	{
-			p.SetStop();
-	    	}
-    }
 
 	if(mProgressDialog != 0)
 	{