X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.cpp;h=3aaf583e2a0ceb9d1dffadfe1363ec0108846452;hb=7e532afa6e1ab955d7c0fa63ea5d12eabc2504e5;hp=cf7c3a68c8053a1127948ec215a200401a251f10;hpb=eee9b84bf483431b69b8e420d4e01935afd9c7ef;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index cf7c3a6..3aaf583 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;
@@ -70,9 +60,12 @@ namespace creaImageIO
 
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
-	
-    // previewer
-	
+	mslide = new wxSlider(this,-1,0,0,1, wxDefaultPosition, wxSize(400,10), wxSL_HORIZONTAL | wxSL_LABELS);
+	Connect( mslide->GetId(), wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &WxViewer::OnSlide ); 
+	mcheck = new wxCheckBox(this,5123,crea::std2wx("Cine Loop"));
+	Connect( mcheck->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &WxViewer::OnCineLoop ); 
+	mcheck->SetValue(false);
+    // previewer	
     mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();	
  
@@ -81,8 +74,10 @@ namespace creaImageIO
     
     mCurrent = 0;
 	mPlayer = 0;
-	  
+
+	topsizer-> Add( mslide,1,wxALIGN_CENTER  ,0);
     topsizer-> Add( mInteractor ,1,wxGROW  ,0);
+
     SetSizer( topsizer );     
     Layout(); 
   }
@@ -93,20 +88,29 @@ namespace creaImageIO
   WxViewer::~WxViewer()
   {
     wxMutexLocker lock(mMutex);
-    GimmickDebugMessage(1,"WxViewer::~WxViewer"
+    GimmickDebugMessage(6,"WxViewer::~WxViewer"
 			<<std::endl);
     // TO DO : desallocate cleanly
     //    delete mPlayer;
     //    delete mInteractor;
+	delete mslide;
   }
   //=====================================================================
 
   //================================================================
-  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;
+	
+	mslide->SetMax(pointers.size());
+	// Refresh don't work, TO MODIFY
+	mslide->Refresh();
+	mslide->ClearTicks();
+	mslide->Hide();
+	mslide->Show();
+	StartPlayer();
   }
 
   //================================================================
@@ -116,7 +120,7 @@ namespace creaImageIO
 	wxMutexLocker lock(mMutex);
 	
     
-    GimmickMessage(10,"WxViewer::ShowNextImage() "
+    GimmickDebugMessage(10,"WxViewer::ShowNextImage() "
 		   <<mCurrent+1<<"/"
 		   <<imagePointers.size()<<std::endl);
     
@@ -124,7 +128,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 +142,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 ) 
@@ -154,22 +160,34 @@ namespace creaImageIO
   //=====================================================================
   void WxViewer::ShowImage(vtkImageData* im)
   {
- 
-    GimmickDebugMessage(5,"WxViewer::ShowImage"
+    GimmickDebugMessage(6,"WxViewer::ShowImage"
 			<<std::endl);
     if (im==0) return;
 
     mViewer->SetInput(im);
-	
+
     mViewer->SetSlice( 0 );
-    
+
     int x1,x2,y1,y2,z1,z2;
     double spx,spy,spz;
     im->Update();
-    
+
+//std::cout << "in WxViewer::ShowImage PrintSelf() =";
+//im->PrintSelf(std::cout, vtkIndent(2));
+
     im->GetSpacing(spx,spy,spz);
-    im->GetExtent (x1,x2,y1,y2,z1,z2);
-    
+    //im->GetExtent (x1,x2,y1,y2,z1,z2);  // JPR
+    im->GetWholeExtent (x1,x2,y1,y2,z1,z2); 
+/*       
+std::cout << "in WxViewer::ShowImage GetWholeExtent ext =";
+	std::cout << "   [x1]=" << x1;
+	std::cout << "   [x2]=" << x2;
+	std::cout << "   [y1]=" << y1;
+	std::cout << "   [y2]=" << y2;
+	std::cout << "   [z1]=" << z1;
+	std::cout << "   [z2]=" << z2;
+std::cout << std::endl; 
+*/   
     if ((x1!=mx1) ||
 	(x2!=mx2) ||
 	(y1!=my1) ||
@@ -190,32 +208,28 @@ namespace creaImageIO
 	mspx = spx;
 	mspy = spy;
 	mspz = spz;
-	
+
 	double *range = im->GetScalarRange();
-	 mViewer->SetColorWindow(range[1] - range[0]);
-	 mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+	mViewer->SetColorWindow(range[1] - range[0]);
+	mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
 
-	 mViewer->GetRenderer()->ResetCamera();
+	mViewer->GetRenderer()->ResetCamera();
 	double bounds[6];
 
+	mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
 
-	 mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
-
-	  
-	 mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
-
-	  
-	  }
-
+	mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+	mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);  
+      }
   } 
   //================================================================
   
-   //================================================================
+  //================================================================
   bool WxViewer::RefreshIfNecessary()
   {
     if (mNeedRefresh)
       {
-	GimmickMessage(1,"WxViewer : Refreshing"<<std::endl);
+	GimmickDebugMessage(10,"WxViewer : Refreshing"<<std::endl);
 
 	mInteractor->Render();
 	mNeedRefresh = false;
@@ -238,13 +252,52 @@ namespace creaImageIO
   //==================================================
   void WxViewer::StartPlayer()
 	{
-	//	wxMutexLocker lock(mMutex);
-		if (mPlayer != 0) return;
-		mPlayer = new WxViewerPlayer(this);
-		mPlayer->Create();
-		mPlayer->Run();  
+		if(mcheck->IsChecked())
+		{
+			//	wxMutexLocker lock(mMutex);
+			if (mPlayer != 0) return;
+			mPlayer = new WxViewerPlayer(this);
+			mPlayer->Create();
+			mPlayer->Run();  
+		}
+		else
+		{
+			ShowNextImage();
+		}
+	}
+
+  //================================================================
+  
+  //==================================================
+
+    void WxViewer::OnCineLoop(wxCommandEvent &Event)
+	{
+		if(!mcheck->IsChecked())
+		{
+			mPlayer->Pause();
+			mPlayer->Delete();
+			mPlayer = 0;
+		}
+		StartPlayer();
 	}
 	
+ //================================================================
+  
+  //==================================================
+	
+	void WxViewer::OnSlide(wxCommandEvent &Event)
+	 {
+		 mCurrent = mslide->GetValue();
+		 StartPlayer();
+	 }
+	 //================================================================
+  
+  //==================================================
+
+	 void WxViewer::SetValue()
+	 {
+		 mslide->SetValue(mCurrent);
+	 }
 
   //  BEGIN_EVENT_TABLE(WxGimmickFrame, wxDialog)
   //    END_EVENT_TABLE()
@@ -262,16 +315,17 @@ namespace creaImageIO
   void*  WxViewerPlayer::Entry()
   {
 	  
-    GimmickMessage(1,"WxViewerPlayer::Entry()"<<std::endl);
+    GimmickDebugMessage(6,"WxViewerPlayer::Entry()"<<std::endl);
 	
 	while(!TestDestroy())
 	    { 
 			
 			mWxViewer->ShowNextImage();
+			mWxViewer->SetValue();
 			::wxWakeUpIdle();
 			clock_t endwait;
 			endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
-			while (clock() < endwait) {}
+			while (clock() < endwait ) {}
 			
       }
     return 0;
@@ -282,7 +336,7 @@ namespace creaImageIO
   //=====================================================================
   void WxViewerPlayer::OnExit()
   {
-    GimmickMessage(1,"WxViewerPlayer::OnExit() "<<std::endl);
+    GimmickDebugMessage(6,"WxViewerPlayer::OnExit() "<<std::endl);
   }