From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Thu, 14 May 2009 14:49:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~28
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5c51e157c5f506ceac760bdc90f4b73943395539;p=creaContours.git

*** empty log message ***
---

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index e6a1eec..9109393 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1616,7 +1616,8 @@ void wxContourMainFrame::referenceLine()
 		_refLineView->SetWidthLine(4);
 
 		_refLineControl->SetModelView( _refLineModel , _refLineView );
-		viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl );
+		vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView();
+		style->AddInteractorStyleMaracas( _refLineControl );
 		_refLineModel->SetCloseContour(false);
 		_refLineControl->CreateNewManualContour();
 
@@ -1670,7 +1671,8 @@ void wxContourMainFrame::refLineShow()
 			_refLineView->SetZ( 1200 );
 
 			_refLineControl->SetModelView( _refLineModel , _refLineView );
-			viewer2D->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _refLineControl );
+			vtkInteractorStyleBaseView* style = (vtkInteractorStyleBaseView*)viewer2D->GetInteractorStyleBaseView();
+			style->AddInteractorStyleMaracas( _refLineControl );
 			_refLineControl->CreateNewManualContour();
 			_refLineControl->SetActive(true);
 			_refLineView->RefreshContour();
diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
index 30aa149..4bfd0fd 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
@@ -806,7 +806,9 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	}
 
 	void wxContourViewPanel::setImageSlice(int z){
-		_sceneManager->getWxVtkViewBase()->GetInteractorStyleBaseView()->GetWxVtk2DBaseView()->SetActualSlice(z);
+		vtkInteractorStyleBaseView* stylebaseview = (vtkInteractorStyleBaseView*) _sceneManager->getWxVtkViewBase()->GetInteractorStyleBaseView();
+		wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)stylebaseview->GetWxVtk2DBaseView();
+		baseview->SetActualSlice(z);
 		RefreshInterface();
 	}
 	
diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 0ede4c6..9e6a605 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -3,6 +3,7 @@
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
 #include "wxVtkBaseView_SceneManager.h"
+#include "wxVtk2DBaseView.h"
 
 //----------------------------------------------------------------------------------------------------------------
 // Class implementation
@@ -61,7 +62,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_wxVtk_BaseView = theWxBaseViewToManage;
 		if( _wxVtk_BaseView!=NULL )
 		{
-			vtkInteractorStyleBaseView* theInteractorStyleBaseView = _wxVtk_BaseView->GetInteractorStyleBaseView();
+			vtkInteractorStyleBaseView* theInteractorStyleBaseView = (vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView();
 			theInteractorStyleBaseView->AddInteractorStyleMaracas( this );
 			SetVtkInteractorStyleBaseView( theInteractorStyleBaseView );			
 		}
@@ -223,7 +224,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 		_viewerSelectionROI->SetSpacing( spc );
 
 		_controlerSelectionROI->SetModelView( _modelSelectionROI , _viewerSelectionROI );
-		_wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _controlerSelectionROI );
+		((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _controlerSelectionROI );
 		_controlerSelectionROI->SetActive(false);
 	}
 
@@ -392,7 +393,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 //fprintf(ff,"    %p \n", contourWRP->getControler() );
 //fclose(ff);
 
-		_wxVtk_BaseView->GetInteractorStyleBaseView()->RemoveInteractorStyleMaracas( contourWRP->getControler() );
+		((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->RemoveInteractorStyleMaracas( contourWRP->getControler() );
 
 		contourWRP->getControler()->SetActive( control );	
 		contourWRP->getControler()->SetEditable( false );		
@@ -517,7 +518,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
 
 		if( control )
 		{
-			_wxVtk_BaseView->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( contourWRP->getControler() );
+			((vtkInteractorStyleBaseView*)_wxVtk_BaseView->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( contourWRP->getControler() );
 		}
 		if( ifActive )
 		{