X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.cpp;h=2ee0ad589d08d773c687233721e2c7b69eb930fe;hb=b0843014c5482f70050fab8036c6780172e3b6c9;hp=338d7e9a21ae559d7bd03af5e0bab2a46e0e3890;hpb=3e44acb4a0963c9fb97d135820048fda3cf9ebd9;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index 338d7e9..2ee0ad5 100644
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <time.h>
 
+
 using namespace crea;
 // Memory tracking allocation
 namespace creaImageIO
@@ -57,11 +58,8 @@ namespace creaImageIO
 
     mNeedRefresh = false;
     mLastImageShown = NULL;
-
-    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
-
 	
-    // previewer	
+	// previewer	
     mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();	
  
@@ -70,9 +68,26 @@ namespace creaImageIO
     
     mCurrent = 0;
 	mPlayer = 0;
-	  
-    topsizer-> Add( mInteractor ,1,wxGROW  ,0);
-    SetSizer( topsizer );     
+
+	// Grid to place checkbox and slider 
+	mflexSizer = new wxFlexGridSizer(1,2,1,1);
+	//Slider
+	mslide = new wxSlider(this,-1,0,0,1, wxDefaultPosition, wxSize(400,40), wxSL_HORIZONTAL | wxSL_LABELS);
+	Connect( mslide->GetId(), wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &WxViewer::OnSlide ); 
+	//CheckBox
+	mcheck = new wxCheckBox(this,5123,crea::std2wx("Cine Loop"));
+	Connect( mcheck->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &WxViewer::OnCineLoop ); 
+	mcheck->SetValue(false);
+	mflexSizer->Add(mcheck,0, wxFIXED_MINSIZE);
+	mflexSizer-> Add( mslide,1,wxALIGN_CENTER | wxFIXED_MINSIZE );
+
+	// Sizer for Previewer and GridSizer
+	mtopSizer = new wxBoxSizer(wxVERTICAL);
+	mtopSizer->Add(mflexSizer,0);
+    mtopSizer-> Add( mInteractor ,1,wxGROW,0);
+	SetSizer(mtopSizer,true);
+	
+	Update();  
     Layout(); 
   }
   //=====================================================================
@@ -85,8 +100,16 @@ namespace creaImageIO
     GimmickDebugMessage(6,"WxViewer::~WxViewer"
 			<<std::endl);
     // TO DO : desallocate cleanly
-    //    delete mPlayer;
-    //    delete mInteractor;
+	if(mPlayer)
+	{
+		mPlayer->Pause();
+		mPlayer->Delete();
+		mPlayer = 0;
+	}
+	delete mInteractor;
+	//delete mslide;
+	//delete mflexSizer;
+	//delete mtopSizer;
   }
   //=====================================================================
 
@@ -96,6 +119,14 @@ namespace creaImageIO
 	wxMutexLocker lock(mMutex);
 	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();
   }
 
   //================================================================
@@ -145,22 +176,34 @@ namespace creaImageIO
   //=====================================================================
   void WxViewer::ShowImage(vtkImageData* im)
   {
- 
     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) ||
@@ -181,27 +224,23 @@ 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)
@@ -229,13 +268,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()
@@ -259,6 +337,7 @@ namespace creaImageIO
 	    { 
 			
 			mWxViewer->ShowNextImage();
+			mWxViewer->SetValue();
 			::wxWakeUpIdle();
 			clock_t endwait;
 			endwait = clock () + 0.2 * CLOCKS_PER_SEC ;