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

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index cf9f13c..523e780 100644
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -11,7 +11,7 @@
 #include <time.h>
 
 using namespace crea;
-
+// Memory tracking allocation
 namespace creaImageIO
 {
   
@@ -61,8 +61,7 @@ namespace creaImageIO
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
 	
-    // previewer
-	
+    // previewer	
     mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();	
  
@@ -92,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);
@@ -114,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 ) 
@@ -127,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 ) 
@@ -184,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];
@@ -193,7 +195,9 @@ namespace creaImageIO
 
 	  
 	 mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+	      mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
 
+	 
 	  
 	  }