X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=77d384390a912d2156b3bf4e9566c626592a013e;hb=f9901e756bb82bd333310b47607875331616bb29;hp=b19937e2e847e88950cb61091ed60ca50ca6bc3e;hpb=1e7de89ec5e380426c57ee4e85c6a5ccd5aa44ad;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index b19937e..77d3843 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -45,7 +45,7 @@ wxVtkBaseView::wxVtkBaseView()
 wxVtkBaseView::wxVtkBaseView(wxWindow *parent)
 {
 	_parent				= parent;
-	_iren				= (wxVTKRenderWindowInteractor*)new wxVTKRenderWindowInteractorPlus(_parent,this);
+	_iren				= (crea::wxVTKRenderWindowInteractor*)new wxVTKRenderWindowInteractorPlus(_parent,this);
 //	_iren->UseCaptureMouseOn();
 //	_iren				= new wxVTKRenderWindowInteractor(_parent,-1);
 	_interactorStyle	= NULL;
@@ -58,11 +58,12 @@ wxVtkBaseView::~wxVtkBaseView()
 	//_iren=NULL;
 }
 //-------------------------------------------------------------------
-wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*)
+crea::wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*)
 {
 
-	if(_iren==NULL){
-		throw "wxVtkBaseView::GetWxVTKRenderWindowInteractor() _iren wxVTKRenderWindowInteractorPlus =NULL";
+	if(_iren==NULL)
+	{
+		throw "wxVtkBaseView::GetWxVTKRenderWindowInteractor() _iren cwxVTKRenderWindowInteractorPlus =NULL";
 	}
    return _iren;
 }
@@ -73,34 +74,29 @@ void wxVtkBaseView::Configure()  // virtual
 //-------------------------------------------------------------------
 void wxVtkBaseView::Refresh()  // virtual 
 {
-	
 // EED 10 Oct 2007
 	#if defined(WIN32)
-		_iren->Refresh(false);
+		_iren->Refresh(true);
+// EED 27 sept 2016
+  	   vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor();
+	   vri->vtkRenderWindowInteractor::Render();
 	#else
-	
 //EED 01Avril2009
 //		_iren->Render();	
 	vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor();
 	vri->vtkRenderWindowInteractor::Render();
-	
-	
 		//_iren->Refresh();
 	#endif
-
 }
 //-------------------------------------------------------------------
 void wxVtkBaseView::RefreshView()  // virtual 
 {
-	printf("EED wxVtkBaseView::RefreshView() \n");
 // EED 10 Oct 2007
-
 	#if defined(WIN32)
 		GetRenWin()->Render();
 	#else
 		//GetRenWin()->Render();
 	#endif
-
 }
 //---------------------------------------------------------------------------
 vtkRenderer* wxVtkBaseView::GetRenderer()	// virtual 
@@ -217,6 +213,19 @@ int  wxVtkBaseView::GetDirection()   // virtual
 	return -1;
 }
 
+//-------------------------------------------------------------------
+vtkBaseData *wxVtkBaseView::GetVtkBaseData()
+{
+   return _vtkbasedata;
+}
+
+//-------------------------------------------------------------------
+void wxVtkBaseView::SetVtkBaseData(vtkBaseData *vtkbasedata)
+{
+   _vtkbasedata=vtkbasedata;
+}
+
+
 
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------