X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtk2DBaseView.cxx;h=e703115d09b08fa97a262b39cfe6158d7f74a1cb;hb=0e9c6cea471e235717da5cac8b924254ed3f4f75;hp=a7a406ba828a7bc7c37e7f113559bcabf52f4291;hpb=6e940f8b87d85a90438f01d56c3c6c92da2bc14a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index a7a406b..e703115 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -75,7 +75,26 @@ void wxVtk2DBaseView::ResetView()
  	_imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren );
 
 	_imageViewer2XYZ->GetVtkImageViewer2()->Render();
-	SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
+	
+	//////////////
+	//RaC 04-2010 Look for the description of new changes in vtkInteractorStyleBaseView2D constructor.
+	//
+	// Previous version
+	// SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
+	//
+	// Actual version
+	vtkInteractorStyleBaseView2D *style2D = vtkInteractorStyleBaseView2D::New();
+
+	manualInteractorWindowLevel *_manualinteractorwindowlevel= new manualInteractorWindowLevel();
+	style2D->SetInteractorWindowLevel( _manualinteractorwindowlevel );
+	
+	vtkInteractorScrollZ *_vtkInteractorScrollZ = new vtkInteractorScrollZ();
+	style2D->SetInteractorScrollZ(_vtkInteractorScrollZ);
+
+	SetInteractorStyleImage( style2D );
+
+	// RaC
+	//////////////
 	
 }
 
@@ -93,7 +112,27 @@ void wxVtk2DBaseView::Configure(bool okimage)
 		_imageViewer2XYZ = new vtkImageViewer2_XYZ();
 		wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
 		_imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren );
-		SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
+		
+		//////////////
+		//RaC 04-2010 Look for the description of new changes in vtkInteractorStyleBaseView2D constructor.
+		//
+		// Previous version
+		// SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
+		//
+		// Actual version
+		vtkInteractorStyleBaseView2D *style2D = vtkInteractorStyleBaseView2D::New();
+
+		manualInteractorWindowLevel *_manualinteractorwindowlevel= new manualInteractorWindowLevel();
+		style2D->SetInteractorWindowLevel( _manualinteractorwindowlevel );
+		
+		vtkInteractorScrollZ *_vtkInteractorScrollZ = new vtkInteractorScrollZ();
+		style2D->SetInteractorScrollZ(_vtkInteractorScrollZ);
+
+		SetInteractorStyleImage( style2D );
+
+		// RaC
+		//////////////
+
 	}
 
 
@@ -154,13 +193,16 @@ void wxVtk2DBaseView::Configure(bool okimage)
 			camera->SetParallelScale( spx*(x2-x1)/3.0 );
 			
 			// text information over the graphic window
-			_vtkIinfoTextImage		= new vtkInfoTextImage();
-			_vtkIinfoTextImageInteractor	= new vtkInfoTextImageInteractor();
+			if(_vtkIinfoTextImage == NULL){
+				_vtkIinfoTextImage		= new vtkInfoTextImage();
+				_vtkIinfoTextImageInteractor	= new vtkInfoTextImageInteractor();				
+				((vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView())->AddInteractorStyleMaracas(_vtkIinfoTextImageInteractor);
+			}
 			_vtkIinfoTextImage->SetWxVtk2DBaseView(this);
 			_vtkIinfoTextImage->SetMarImageData( GetVtkBaseData()->GetMarImageData() );
-			_vtkIinfoTextImageInteractor->SetModelVtkInfoTextImage(_vtkIinfoTextImage);	
+			_vtkIinfoTextImageInteractor->SetModelVtkInfoTextImage(_vtkIinfoTextImage);				
 			_vtkIinfoTextImage->Configure();
-			((vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView())->AddInteractorStyleMaracas(_vtkIinfoTextImageInteractor);
+			
 		} // okimage
 	} // imageData
 
@@ -244,5 +286,21 @@ void wxVtk2DBaseView::GetSpacing(double spc[3])  // virtual
 void wxVtk2DBaseView::setColorTransferFunction(vtkColorTransferFunction* colortable){
 	if(_imageViewer2XYZ!=NULL){
 		_imageViewer2XYZ->setColorTransferFunction(colortable);
+		this->Refresh();
 	}
 }
+
+void wxVtk2DBaseView::setWindowLevel(double level){
+//	_imageViewer2XYZ->GetVtkImageViewer2()->SetColorWindow(level);	
+
+	vtkImageMapToWindowLevelColors* imagemaptowindowlevel = _imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel();
+	imagemaptowindowlevel->SetWindow(level);
+	this->Refresh();
+}
+
+void wxVtk2DBaseView::setColorLevel(double level){
+//	_imageViewer2XYZ->GetVtkImageViewer2()->SetColorLevel(level);
+	vtkImageMapToWindowLevelColors* imagemaptowindowlevel = _imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel();
+	imagemaptowindowlevel->SetLevel(level);
+	this->Refresh();
+}