X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.cpp;h=523e780051d5f6640d2e0490400dda5493230b5f;hb=b818afb24157d3474ecb598a98d92667745a6aa3;hp=d14e4bb485f9eb7bc8c28360d60d26a4b9a07cde;hpb=cac026929f2431aa4a966bf9ae3c8ff263f5dd63;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index d14e4bb..523e780 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;
   };
   
   //=====================================================================
@@ -71,8 +61,7 @@ namespace creaImageIO
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
 	
-    // previewer
-	
+    // previewer	
     mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();	
  
@@ -102,7 +91,7 @@ namespace creaImageIO
   //=====================================================================
 
   //================================================================
-  void WxViewer::SetImageVector(std::vector<ImagePointerHolder*>& pointers)
+   void WxViewer::SetImageVector(std::vector<boost::shared_ptr<ImagePointerHolder> >& pointers)
   {
 	wxMutexLocker lock(mMutex);
 	GimmickDebugMessage(6,"WxViewer::SetImageVector"<<std::endl);
@@ -124,7 +113,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 +127,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 ) 
@@ -194,6 +185,7 @@ namespace creaImageIO
 	double *range = im->GetScalarRange();
 	 mViewer->SetColorWindow(range[1] - range[0]);
 	 mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+	
 
 	 mViewer->GetRenderer()->ResetCamera();
 	double bounds[6];
@@ -203,7 +195,9 @@ namespace creaImageIO
 
 	  
 	 mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+	      mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
 
+	 
 	  
 	  }
 
@@ -271,7 +265,7 @@ namespace creaImageIO
 			::wxWakeUpIdle();
 			clock_t endwait;
 			endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
-			while (clock() < endwait) {}
+			while (clock() < endwait ) {}
 			
       }
     return 0;