X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.cpp;h=f73e81ebc5093375f2b9fbebe996d16cebbbbe2d;hb=a67d921cdc10d438852b48c2985f14d91320e016;hp=ab189336f0e235094ecde7bf6e97889e974c9a52;hpb=76e207a0161dd493be1b96d93d54d35cf3e88422;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index ab18933..f73e81e 100644
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -5,13 +5,13 @@
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 #include <vtkImageData.h>
-
+#include <creawxVTKRenderWindowInteractor.h>
 #include <creaMessageManager.h>
 #include <stdio.h>
 #include <time.h>
 
 using namespace crea;
-
+// Memory tracking allocation
 namespace creaImageIO
 {
   
@@ -26,21 +26,11 @@ namespace creaImageIO
     {}
     
     void* Entry();
-    //    void SetImagesToPlay(std::vector<vtkImageData*> im);
-    //    void ShowImage(vtkImageData* v);
-    //	  void StartIterator();
     void  OnExit();
 	
   private:
-    //std::vector<vtkImageData*> mImagesToPlay;
-    //vtkImageViewer2* mViewer;
-    /// Associated wxvtk interactor
-    //crea::creawxVTKRenderWindowInteractor  *mInteractor;
-    //std::vector<vtkImageData*>::iterator i;
+
     WxViewer* mWxViewer;
-    
-    //    int mx1,mx2,my1,my2,mz1,mz2;
-    //    double mspx,mspy,mspz;
   };
   
   //=====================================================================
@@ -62,7 +52,7 @@ namespace creaImageIO
 		 size)
   {
     wxMutexLocker lock(mMutex);
-    GimmickDebugMessage(1,"WxViewer::WxViewer"
+    GimmickDebugMessage(6,"WxViewer::WxViewer"
 			<<std::endl);
 
     mNeedRefresh = false;
@@ -93,7 +83,7 @@ namespace creaImageIO
   WxViewer::~WxViewer()
   {
     wxMutexLocker lock(mMutex);
-    GimmickDebugMessage(1,"WxViewer::~WxViewer"
+    GimmickDebugMessage(6,"WxViewer::~WxViewer"
 			<<std::endl);
     // TO DO : desallocate cleanly
     //    delete mPlayer;
@@ -102,10 +92,10 @@ namespace creaImageIO
   //=====================================================================
 
   //================================================================
-  void WxViewer::SetImageVector(std::vector<ImagePointerHolder*>& pointers)
+   void WxViewer::SetImageVector(std::vector<boost::shared_ptr<ImagePointerHolder> >& pointers)
   {
 	wxMutexLocker lock(mMutex);
-	GimmickMessage(1,"WxViewer::SetImageVector"<<std::endl);
+	GimmickDebugMessage(6,"WxViewer::SetImageVector"<<std::endl);
 	imagePointers=pointers;
   }
 
@@ -116,7 +106,7 @@ namespace creaImageIO
 	wxMutexLocker lock(mMutex);
 	
     
-    GimmickMessage(10,"WxViewer::ShowNextImage() "
+    GimmickDebugMessage(10,"WxViewer::ShowNextImage() "
 		   <<mCurrent+1<<"/"
 		   <<imagePointers.size()<<std::endl);
     
@@ -124,7 +114,8 @@ namespace creaImageIO
 	{
 		if (mCurrent<imagePointers.size()) 
 		{
-			ImagePointerHolder* iph=imagePointers[mCurrent];
+			boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
+			//ImagePointerHolder* iph= imagePointers[mCurrent];
 			vtkImageData* currIm=iph->Get();
 			ShowImage(currIm);
 			if ( currIm != mLastImageShown ) 
@@ -137,7 +128,8 @@ namespace creaImageIO
 		else
 		{
 			mCurrent = 0;
-			ImagePointerHolder* iph=imagePointers[mCurrent];
+			//ImagePointerHolder* iph=imagePointers[mCurrent];
+			boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
 			vtkImageData* currIm=iph->Get();
 			ShowImage(currIm);
 			if ( currIm != mLastImageShown ) 
@@ -155,7 +147,7 @@ namespace creaImageIO
   void WxViewer::ShowImage(vtkImageData* im)
   {
  
-    GimmickDebugMessage(5,"WxViewer::ShowImage"
+    GimmickDebugMessage(6,"WxViewer::ShowImage"
 			<<std::endl);
     if (im==0) return;
 
@@ -215,7 +207,7 @@ namespace creaImageIO
   {
     if (mNeedRefresh)
       {
-	GimmickMessage(1,"WxViewer : Refreshing"<<std::endl);
+	GimmickDebugMessage(10,"WxViewer : Refreshing"<<std::endl);
 
 	mInteractor->Render();
 	mNeedRefresh = false;
@@ -229,7 +221,7 @@ namespace creaImageIO
   void WxViewer::StopPlayer()
   {
 	  wxMutexLocker lock(mMutex);
-	  if (mPlayer==0) return;
+	  if (mPlayer==0 ) return;
 	  mPlayer->Delete();  
 	  mPlayer=0;
   }
@@ -262,7 +254,7 @@ namespace creaImageIO
   void*  WxViewerPlayer::Entry()
   {
 	  
-    GimmickMessage(1,"WxViewerPlayer::Entry()"<<std::endl);
+    GimmickDebugMessage(6,"WxViewerPlayer::Entry()"<<std::endl);
 	
 	while(!TestDestroy())
 	    { 
@@ -271,7 +263,7 @@ namespace creaImageIO
 			::wxWakeUpIdle();
 			clock_t endwait;
 			endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
-			while (clock() < endwait) {}
+			while (clock() < endwait ) {}
 			
       }
     return 0;
@@ -282,7 +274,7 @@ namespace creaImageIO
   //=====================================================================
   void WxViewerPlayer::OnExit()
   {
-    GimmickMessage(1,"WxViewerPlayer::OnExit() "<<std::endl);
+    GimmickDebugMessage(6,"WxViewerPlayer::OnExit() "<<std::endl);
   }