X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.cpp;h=2b473a22703f87773c3abe9c668fbe6c538d010a;hb=60257912f98339ad44b500d6d4b700cca8e8daa9;hp=a566189298693f8103cbfd9a490b3b7e8b0e71c2;hpb=0475a9d0f4623a7ce65d1f8b0c14e53b305b1c10;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index a566189..2b473a2 100644
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -65,6 +65,9 @@ namespace creaImageIO
     GimmickDebugMessage(1,"WxViewer::WxViewer"
 			<<std::endl);
 
+    mNeedRefresh = false;
+    mLastImageShown = NULL;
+
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
 	
@@ -162,12 +165,18 @@ namespace creaImageIO
   void WxViewer::ShowNextImage()
   {
     wxMutexLocker lock(mMutex);
+	
+    /*
     GimmickMessage(1,"WxViewer::ShowNextImage() "
 		   <<mCurrent+1<<"/"
 		   <<images.size()<<std::endl);
+    */
+    
     if (mCurrent<images.size()) 
       {
 	ShowImage(images[mCurrent]);
+	if ( images[mCurrent] != mLastImageShown ) mNeedRefresh = true;
+	mLastImageShown = images[mCurrent];
       }
     mCurrent++;
     if (mCurrent >= images.size()) mCurrent = 0;
@@ -185,6 +194,7 @@ namespace creaImageIO
     if (im==0) return;
 
     mViewer->SetInput(im);
+	
     mViewer->SetSlice( 0 );
     
     int x1,x2,y1,y2,z1,z2;
@@ -277,7 +287,18 @@ namespace creaImageIO
   }
 
    //================================================================
-  
+  bool WxViewer::RefreshIfNecessary()
+  {
+    if (mNeedRefresh)
+      {
+	GimmickMessage(1,"WxViewer : Refreshing"<<std::endl);
+
+	mInteractor->Render();
+	mNeedRefresh = false;
+	return true;
+      }
+    return false;
+  }
   //==================================================
   void WxViewer::StopPlayer()
   {
@@ -308,11 +329,14 @@ namespace creaImageIO
       { 
 		if(!TestDestroy())
 	    { 
+			
 			mWxViewer->ShowNextImage();
-			mWxViewer->Refresh();
+			//			mWxViewer->Refresh();
+			::wxWakeUpIdle();
 			clock_t endwait;
 			endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
 			while (clock() < endwait) {}
+			
 		}
 		else
 		{