changes in vtkInteractorStyleBaseView2D. Check out the constructor of this class...

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index 023b9d8dd5039ec60800210fbd8b2b5c5bb917ac..bfd82ed15a33a240160200fba3c44687c5fa3e77 100644 (file)
--- 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 b33cd8e43d6476e6df1a792c862d2186727cdd0d..5779b98473621548ae693b421875c15acf2c464d 100644 (file)
--- 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 1432c06d05883f99794c1cb97dfdb0127a2a39c6..f9bc6ccf6065e8bd8d8f470eeba9bd6a4cc3d582 100644 (file)
--- 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 82442f5d04e3dee2bd6cbb5cefd4cbc95abf4d2c..b0be829ca391527fa803fd87a1c797405c7f01f9 100644 (file)
--- 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 33accb3a4dc960b35e03140ee00f81ea3df53fea..e703115d09b08fa97a262b39cfe6158d7f74a1cb 100644 (file)
--- 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
+               //////////////
+
        }