From: Ricardo Corredor <Ricardo.Corredor@creatis.insa-lyon.fr>
Date: Fri, 2 Apr 2010 07:22:25 +0000 (+0000)
Subject: changes in vtkInteractorStyleBaseView2D. Check out the constructor of this class... 
X-Git-Tag: CREATOOLS.2-0-3~42
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0e9c6cea471e235717da5cac8b924254ed3f4f75;p=creaMaracasVisu.git

changes in vtkInteractorStyleBaseView2D. Check out the constructor of this class for more information
---

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index 023b9d8..bfd82ed 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
@@ -3,8 +3,8 @@
 Program:   wxMaracas
 Module:    $RCSfile: CutModelManager.cxx,v $
 Language:  C++
-Date:      $Date: 2010/03/04 15:09:57 $
-Version:   $Revision: 1.8 $
+Date:      $Date: 2010/04/02 07:22:25 $
+Version:   $Revision: 1.9 $
 
 Copyright: (c) 2002, 2003
 License:
@@ -357,7 +357,7 @@ void CutModelManager::UpdatePolygon(bool mode)
 
 			_polygonCutter = new CutModelPolygon();
 
-			cout<<"RaC ContourDrawer::Update Printing points"<<endl;
+			cout<<"RaC Printing points......"<<endl;
 			for(int t=0;t<numPoints;t++)
 			{
 				double point[3];
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
index b33cd8e..5779b98 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.cxx
@@ -8,18 +8,39 @@ vtkStandardNewMacro(vtkInteractorStyleBaseView2D);
 //---------------------------------------------------------------------------
 vtkInteractorStyleBaseView2D::vtkInteractorStyleBaseView2D()
 {
-	_manualinteractorwindowlevel= new manualInteractorWindowLevel();
-	AddInteractorStyleMaracas( _manualinteractorwindowlevel );
-
-	_vtkInteractorScrollZ = new vtkInteractorScrollZ();
-	AddInteractorStyleMaracas(_vtkInteractorScrollZ);
-	
+	////////////
+	// RaC 04-2010 This mechanism of adding new functionalities has to be made externally in order 
+	// to maintain a plugin architecture. 
+	// Remember: The manualInteractorWindowLevel changes the window level over the image
+	//           The vtkInteractorScrollZ changes the slice with right click interaction
+	//			 This vtkInteractorStyleBaseView2D gives the minimal interaction with a 2D scene
+	//
+	// _manualinteractorwindowlevel= new manualInteractorWindowLevel();
+	// AddInteractorStyleMaracas( _manualinteractorwindowlevel );
+	//
+	// _vtkInteractorScrollZ = new vtkInteractorScrollZ();
+	// AddInteractorStyleMaracas(_vtkInteractorScrollZ);
+	////////////
 }
 //---------------------------------------------------------------------------
 vtkInteractorStyleBaseView2D::~vtkInteractorStyleBaseView2D()
 {
 }
 
+//---------------------------------------------------------------------------
+void  vtkInteractorStyleBaseView2D::SetInteractorScrollZ(vtkInteractorScrollZ* interactorScroll)
+{    
+	_vtkInteractorScrollZ = interactorScroll;
+	AddInteractorStyleMaracas(_vtkInteractorScrollZ);
+}
+
+//---------------------------------------------------------------------------
+void  vtkInteractorStyleBaseView2D::SetInteractorWindowLevel(manualInteractorWindowLevel* interactorWindowLevel)
+{    
+	_manualinteractorwindowlevel = interactorWindowLevel;
+	AddInteractorStyleMaracas(_manualinteractorwindowlevel);
+}
+
 //---------------------------------------------------------------------------
 void  vtkInteractorStyleBaseView2D::OnRightButtonDown()  // virtual
 {    
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h
index 1432c06..f9bc6cc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView2D.h
@@ -13,6 +13,11 @@ public:
 	vtkInteractorStyleBaseView2D();
 	~vtkInteractorStyleBaseView2D();
 	static vtkInteractorStyleBaseView2D *New();
+
+	// RaC 04-2010 Look for the description of new changes in vtkInteractorStyleBaseView2D constructor.
+	void  SetInteractorScrollZ(vtkInteractorScrollZ* interactorScroll);
+	void  SetInteractorWindowLevel(manualInteractorWindowLevel* interactorWindowLevel);
+
 	virtual void  OnMouseMove();
 	virtual void  OnLeftButtonDown(); 
 	virtual void  OnLeftButtonUp();
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
index 82442f5..b0be829 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
@@ -344,7 +344,25 @@ void vtkPlane2DView::Configure( )
 //	SetActive(false);
 	_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
+	//////////////
 
 	_interactorstyleplane2D = new vtkInteractorStylePlane2D();
 	((vtkInteractorStyleBaseView*)GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _interactorstyleplane2D );
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index 33accb3..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
+		//////////////
+
 	}