X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR2DView.cxx;h=d4752bd5f9ed62d1205455a8e350ac860dc7d69a;hb=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=69a58bb5e5f907f405d840b44587823baa29db89;hpb=69c806e632999e11e12e8626609f4192d3aec364;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index 69a58bb..d4752bd 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -56,14 +56,14 @@ wxVtkMPR2DView::wxVtkMPR2DView( wxWindow *parent, int direction)
 //-------------------------------------------------------------------
 wxVtkMPR2DView::~wxVtkMPR2DView()
 {
-	if (_ptsA!=NULL) 	    { _ptsA		    -> Delete(); }
-	if (_lineAActor!=NULL) 	{ _lineAActor	-> Delete(); }
-	if (_lineAMapper!=NULL) { _lineAMapper 	-> Delete(); }
-	if (_pdA!=NULL) 	    { _pdA		    -> Delete(); }
-	if (_ptsB!=NULL) 	    { _ptsB		    -> Delete(); }
-	if (_lineBActor!=NULL) 	{ _lineBActor	-> Delete(); }
-	if (_lineBMapper!=NULL) { _lineBMapper 	-> Delete(); }
-	if (_pdB!=NULL) 	    { _pdB		    -> Delete(); }
+	if (_ptsA!=NULL) 	    { _ptsA->Delete(); 			}
+	if (_lineAActor!=NULL) 	{ _lineAActor->Delete(); 	}
+	if (_lineAMapper!=NULL) { _lineAMapper->Delete(); 	}
+	if (_pdA!=NULL) 	    { _pdA->Delete(); 			}
+	if (_ptsB!=NULL) 	    { _ptsB->Delete(); 			}
+	if (_lineBActor!=NULL) 	{ _lineBActor->Delete(); 	}
+	if (_lineBMapper!=NULL) { _lineBMapper->Delete(); 	}
+	if (_pdB!=NULL) 	    { _pdB->Delete(); 			}
 }
 //-------------------------------------------------------------------
 vtkMPRBaseData *wxVtkMPR2DView::GetVtkmprbasedata()
@@ -84,7 +84,8 @@ void wxVtkMPR2DView::Configure()
 		((vtkInteractorStyleBaseView*)GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _interactorstylemprview );
 	}
 
-	if(img!=NULL){
+	if(img!=NULL)
+	{
 		double* origin = img->GetOrigin();
 		img->GetExtent(x1,x2,y1,y2,z1,z2);
 		img->GetSpacing(spc);
@@ -115,7 +116,14 @@ void wxVtkMPR2DView::Configure()
 		_ptsA->SetPoint(1,  1000	,  1000	,  1000	);
 		_pdA = vtkPolyData::New();
 		_lineAMapper = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_lineAMapper->SetInput(_pdA);
+#else
+		_lineAMapper->SetInputData(_pdA);
+#endif
+
 		_lineAMapper->ImmediateModeRenderingOn();
 		_lineAActor->SetMapper(_lineAMapper);
 	}
@@ -154,7 +162,14 @@ void wxVtkMPR2DView::Configure()
 	_pdB->SetPoints( _ptsB );
 	_pdB->SetLines( linesB );
 	linesB->Delete();  //do not delete lines ??
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_lineBMapper->SetInput(_pdB);
+#else
+	_lineBMapper->SetInputData(_pdB);
+#endif
+
 	_lineBMapper->ImmediateModeRenderingOn();
 	if(_imageViewer2XYZ)
 	{
@@ -352,6 +367,15 @@ void wxVtkMPR2DView::Refresh()
 				focalpoint[0]	= x;	
 				focalpoint[1]	= y;					
 			} // if back
+			
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+				// ..
+#else
+				_ptsA->Modified();
+				_ptsB->Modified();
+#endif
+
 			if (fixAxis2D == true)
 			{
 				GetRenderer()->GetActiveCamera()->SetPosition(position);
@@ -371,6 +395,8 @@ void wxVtkMPR2DView::Refresh()
 	imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
 //EED 01nov2012
 		UpdateColorWindowLevel();
+//EED 05juin2019
+		UpdateCameraParallelScale();
 		wxVtkBaseView::Refresh();
 	}
 }