X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR3DView.cxx;h=c32af32beebcf1a55bbb18e809e228ad4918f6f7;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=a55a101ec4311dce7ce0ebf69a6ae8d80efe0425;hpb=2ee213ddb39ae803798099822478e210a6bf0d57;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index a55a101..c32af32 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -80,19 +80,15 @@ class vtkWindowLevelImagePlaneWidgetCallback : public vtkCommand
 				   _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->SetY(xyzv[1]);
 				   _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->SetZ(xyzv[2]);
 			   } else {
-				   
-				   
 				   vtkImageData *image = _wxvtkmpr3Dview->GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetImageData();
 				   double spc[3];
 				   if(image)
 				   {
 					   image->GetSpacing(spc);
 				   }
-				   
 				   double normal[3];
 				   slicePosition = ipw->GetSlicePosition();
 				   ipw->GetNormal(normal);
-				   
 				   // FreePlaneX
 				   if ((normal[0]==1)&&(normal[1]==0)&&(normal[2]==0))
 				   {
@@ -110,28 +106,20 @@ class vtkWindowLevelImagePlaneWidgetCallback : public vtkCommand
 				   }
 			   }// ipw->GetCursorDataStatus
 		   }// ev
-			
 		   if (needRefresh)	
 		   {
 			   vtkInteractorStyleBaseView *isbv = (vtkInteractorStyleBaseView*)_wxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
 			   isbv->SetParent_refresh_waiting();
 			   isbv->EvaluateToRefresh();
 		   }
-			
 	   } // Execute
-	
 		vtkWindowLevelImagePlaneWidgetCallback(){}
 		wxVtkMPR3DView *_wxvtkmpr3Dview;
 };
 
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
-
-
-
 wxVtkMPR3DView::wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview )
 {
 	_wxvtk3Dbaseview			=	wxvtk3Dbaseview;
@@ -143,7 +131,6 @@ wxVtkMPR3DView::wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview )
 	_vtkplane					=	NULL;
 	_probe						=	NULL;
 	_contourMapper				=	NULL;
-
 	_planeWidgetX				=	NULL;
 	_planeWidgetY				=	NULL;
 	_planeWidgetZ				=	NULL;
@@ -151,27 +138,26 @@ wxVtkMPR3DView::wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview )
 	//Free Planes
 }
 
-
 //-------------------------------------------------------------------
 wxVtkMPR3DView::~wxVtkMPR3DView()
 {
 	VisiblePointWidget( false );
-	VisiblePlaneWidget( false );
-
-	if(_pointWidget!=NULL){
+//	VisiblePlaneWidget( false );
+	if(_pointWidget!=NULL)
+	{
 		_pointWidget->Delete();
 	}
-	if(_planeWidget!=NULL){
+	if(_planeWidget!=NULL)
+	{
 		_planeWidget->Delete();
 	}
-
-	if(_vtkplane!=NULL){
+	if(_vtkplane!=NULL)
+	{
 		_vtkplane->Delete();
 		_probe->Delete();
 		_contourMapper->Delete();
 		_contourPlaneActor->Delete();
 	}
-
 }
 
 //-------------------------------------------------------------------
@@ -179,43 +165,21 @@ void wxVtkMPR3DView::RemoveActor(vtkActor* actor)
 {
 	_wxvtk3Dbaseview->GetRenderer()->RemoveActor(actor);
 }
-
-
-
 //-------------------------------------------------------------------
 void wxVtkMPR3DView::Configure()
 {
 	vtkImageData *imageData = GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetImageData();
-
 	_wxvtk3Dbaseview->Configure();
 	_wxvtkmpr3DviewCntrlPanel->UpdateControlPanel();
-
-//EED 27 Mai 2009
-//	_wxvtk3Dbaseview->GetRenderer()->Clear();
-
 	// Actors are added to the renderer.
 	vtkActor* _outlineActor = _vtkmpr3Ddataviewer->GetOutlineActor();
-
-
 	_wxvtk3Dbaseview->GetRenderer()->AddActor( _outlineActor );
 
-//	_wxvtk3Dbaseview->GetRenderer()->AddActor( _vtkmpr3Ddataviewer->GetImageActor(0)  );	// _saggital
-//	_wxvtk3Dbaseview->GetRenderer()->AddActor( _vtkmpr3Ddataviewer->GetImageActor(1)  );	// _axial
-//	_wxvtk3Dbaseview->GetRenderer()->AddActor( _vtkmpr3Ddataviewer->GetImageActor(2)  );	// _coronal
-
-
-	
-	// vtkPointWidget
-	//if(_myCallback!=NULL){
-		//_myCallback->Delete();
-
-	//}
 	vtkmyPWCallback_3DPointWidget *_myCallback = vtkmyPWCallback_3DPointWidget::New();
 	_myCallback->SetWxVtkMPR3DView(this);
-
-
 	if(imageData){
-		if(_pointWidget==NULL){
+		if(_pointWidget==NULL)
+		{
 			_pointWidget = vtkPointWidget::New();
 		}
 //EED 2017-01-01 Migration VTK7
@@ -228,9 +192,7 @@ void wxVtkMPR3DView::Configure()
 		_pointWidget->SetInteractor( GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor() );
 		_pointWidget->AllOff();
 		_pointWidget->PlaceWidget();
-
 		_pointWidget->AddObserver(vtkCommand::InteractionEvent,_myCallback);
-
 		if(_planeWidget==NULL)
 		{
 			_planeWidget = vtkPlaneWidget::New();
@@ -243,49 +205,44 @@ void wxVtkMPR3DView::Configure()
 #endif
 
 		_myCallback->SetVtkPlaneWidget(_planeWidget);
-
 		_planeWidget->NormalToXAxisOn();
 		_planeWidget->SetResolution(50);
 		_planeWidget->SetRepresentationToOutline();
-
 		int dim[3];
-
 		imageData->GetDimensions(dim);
 		int px=(dim[0]/2);
 		int py=(dim[1]/2);
 		int pz=(dim[2]/2);
 		int dd=20;
 		_planeWidget->PlaceWidget( px-dd , px+dd , py-dd , py+dd , pz-dd , pz+dd );
-
-		if(_vtkplane==NULL){
-			_vtkplane = vtkPolyData::New();
-
-			_probe = vtkProbeFilter::New();
-			_contourMapper = vtkPolyDataMapper::New();
-
+		if(_vtkplane==NULL)
+		{
+			_vtkplane 		= vtkPolyData::New();
+			_probe 			= vtkProbeFilter::New();
+			_contourMapper 	= vtkPolyDataMapper::New();
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
 			_probe->SetInput(_vtkplane);
 			_contourMapper->SetInput( _probe->GetPolyDataOutput() );
 #else
+			_myCallback->SetVtkPolyData(_vtkplane);
+			_myCallback->SetVtkProbeFilter(_probe);
+			_planeWidget->GetPolyData(_vtkplane);
 			_probe->SetInputData(_vtkplane);
+			_probe->SetSourceData(imageData);
+//			_probe->Update();
 			_contourMapper->SetInputData( _probe->GetPolyDataOutput() );
 #endif
 
 			_contourPlaneActor = vtkActor::New();
 			_contourPlaneActor->SetMapper(_contourMapper);
-
 			_contourPlaneActor->VisibilityOff();
-
 			_planeWidget->SetInteractor( GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor() );
 			_planeWidget->AddObserver(vtkCommand::InteractionEvent,_myCallback);
-
 			_planeWidget->Off();
 			_wxvtk3Dbaseview->GetRenderer()->AddActor( _contourPlaneActor );
-
 		}
-
 		_planeWidget->GetPolyData(_vtkplane);
 
 //EED 2017-01-01 Migration VTK7
@@ -295,7 +252,6 @@ void wxVtkMPR3DView::Configure()
 		_probe->SetSourceData( imageData );
 #endif
 		_contourMapper->SetScalarRange( imageData->GetScalarRange() );
-
 	ConfigureFreePlanes();
 	}
 
@@ -330,26 +286,21 @@ void wxVtkMPR3DView::Configure()
 	// render window (expressed in pixels).
 	_wxvtk3Dbaseview->GetRenderer()->SetBackground( 0.36 , 0.36 , 0.36 );
 //EED 23oct2010	_wxvtk3Dbaseview->GetRenWin()->SetSize(400, 400);
-
 }
 
 //-------------------------------------------------------------------
 void wxVtkMPR3DView::ConfigureFreePlanes()
 {
-
 	// The shared picker enables us to use 3 planes at one time
 	// and gets the picking order right
 	vtkCellPicker* picker = vtkCellPicker::New();
 	picker->SetTolerance(0.005);
-
 	// The 3 image plane widgets
 	_planeWidgetX = GetPlaneWidget('x', 1, 0, 0, picker);
 	_planeWidgetY = GetPlaneWidget('y', 1, 1, 0, picker);
 	_planeWidgetZ = GetPlaneWidget('z', 0, 0, 1, picker);
-
 	_planeWidgetY->SetLookupTable(_planeWidgetX->GetLookupTable());
 	_planeWidgetZ->SetLookupTable(_planeWidgetX->GetLookupTable());
-
 	picker->UnRegister(NULL);
 
 	// ColorWindow ColorLevel Callback
@@ -385,7 +336,6 @@ void wxVtkMPR3DView::SetImage()
 	// -- Plane widget
 	_probe->SetSourceData( imageData );
 #endif
-
 	_vtkmpr3Ddataviewer->SetImage();
 }
 
@@ -510,7 +460,7 @@ void wxVtkMPR3DView::FreePlaneInteraction(bool ok)
 			_planeWidgetY->InteractionOff();
 			_planeWidgetZ->InteractionOff();
 		}
-	} // if _planeWidgetX
+	} // if _planeWidgetXVisiblePointWidget
 }
 
 
@@ -611,6 +561,12 @@ void wxVtkMPR3DView::RefreshView()   // virtual
 		_planeWidget->SetCenter( x,y,z );
 		_planeWidget->UpdatePlacement();
 		_planeWidget->GetPolyData(_vtkplane);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		// ..
+#else
+		_probe->Update();
+#endif
 	}
 
 	if (_wxvtkmpr3DviewCntrlPanel!=NULL)
@@ -690,9 +646,9 @@ void wxVtkMPR3DView::VisibleImageActor(int idPosition, bool visible){
 			// step 5 Refresh
 			_wxvtk3Dbaseview->GetRenderer()->GetRenderWindow()->Render();
 
-		}
+		} // if visible
 		_vtkmpr3Ddataviewer->SetVisiblePosition(idPosition,visible);
-	}
+	} // if visible 
 }
 
 
@@ -705,8 +661,8 @@ void wxVtkMPR3DView::VisiblePointWidget( bool visible )
 			_pointWidget->On();
 		} else {
 			_pointWidget->Off();
-		}
-	}
+		} // visible
+	} // _pointWidget
 }
 
 //-------------------------------------------------------------------
@@ -720,25 +676,22 @@ void wxVtkMPR3DView::VisiblePlaneWidget( bool visible )
 
 		} else {
 			_planeWidget->Off();
-			_contourPlaneActor->VisibilityOff();
-		}
-	}
+			_contourPlaneActor->VisibilityOff();			
+		} // if visible
+		_wxvtk3Dbaseview->GetRenderer()->GetRenderWindow()->Render();
+	} // _planeWidget
 }
 
 //CPR: Method added 30 Nov 2009
 void wxVtkMPR3DView::showOutlineActor(bool value)
 {
-
 	vtkActor* _outlineActor = _vtkmpr3Ddataviewer->GetOutlineActor();
 	if(value == true)
 	{
 		_wxvtk3Dbaseview->GetRenderer()->AddActor( _outlineActor );
-	}
-	else
-	{
+	} else {
 		_wxvtk3Dbaseview->GetRenderer()->RemoveActor( _outlineActor );
-	}
-
+	} // value
 }
 
 //-------------------------------------------------------------------