From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Fri, 28 Jan 2011 14:29:44 +0000 (+0000)
Subject: correction bug Fedora 64 bits
X-Git-Tag: Creatools2-0-3.creaImageIO0-2-5.17Feb2011~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaImageIO.git;a=commitdiff_plain;h=a610d2391be10e2e008eab8c6b23221ed318aaea

correction bug Fedora 64 bits
---

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 9c0d327..fc748e0 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -514,7 +514,7 @@ namespace creaImageIO
 	mProgressDialog->Pulse(_T("Updating view..."));
 
 	UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-	delete mProgressDialog;
+	killProgress();
 	DisplayAddSummary();	
 
       }
@@ -564,7 +564,7 @@ namespace creaImageIO
 		mProgressDialog->Pulse(_T("Updating view..."));
 
 		UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-		delete mProgressDialog;
+		killProgress();
 		DisplayAddSummary();
 	  }
     mViewer->StartPlayer();
@@ -833,7 +833,7 @@ namespace creaImageIO
      mProgressDialog->Pulse(_T("Updating view..."));
 
      UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-     delete mProgressDialog;
+     killProgress();
      DisplayAddSummary();
   }
 
@@ -978,7 +978,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;						
@@ -1100,7 +1100,7 @@ namespace creaImageIO
 		mProgressDialog->Pulse(_T("Updating view..."));
 		
 		UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-		delete mProgressDialog;
+		killProgress();
 		DisplayAddSummary();
 		mViewer->StartPlayer();  
 	  }
@@ -1172,7 +1172,7 @@ namespace creaImageIO
 		mGimmick->AddFiles(storage,i_filenames);
 		mProgressDialog->Pulse(_T("Updating view..."));
 		UpdateTreeViewLevel(storage,1);
-		delete mProgressDialog;
+		killProgress();
 		DisplayAddSummary();	
 	}
   }
@@ -1199,10 +1199,13 @@ 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 +1291,13 @@ namespace creaImageIO
 	}
   }
 
+  void WxGimmickView::killProgress()
+  {
+	  	mProgressDialog->Resume();
+		mProgressDialog->Destroy();
+		mProgressDialog = 0;
+  }
+
    //=================================================
 
    //=================================================
diff --git a/src/creaImageIOWxGimmickView.h b/src/creaImageIOWxGimmickView.h
index ad66923..6f820f9 100644
--- a/src/creaImageIOWxGimmickView.h
+++ b/src/creaImageIOWxGimmickView.h
@@ -235,6 +235,9 @@ namespace creaImageIO
     //Pointer holders for images to be shown
  	std::vector< boost::shared_ptr<ImagePointerHolder> > pointers;
 
+	//kill Progress DialogBar
+	void killProgress();
+
     wxString mCurrentDirectory;
     
     DECLARE_EVENT_TABLE()