X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR2DView.cxx;h=eae1fb6086b8a31aaa7a0a3599c3d1bdc3f10129;hb=70a5e2bac1fe33d240ff5632d65a915269ff69e3;hp=96fad29aab966c22e5198c8c3bebe152cf7bf4dd;hpb=b6acee59da3bb94b6619f79705580d5a3a1cc997;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index 96fad29..eae1fb6 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -115,7 +115,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);
 	}
@@ -153,7 +160,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){
 		_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
@@ -248,7 +262,8 @@ void wxVtkMPR2DView::Refresh()
 	double xx1,yy1,zz1,xx2,yy2,zz2;
 	
 	vtkImageData* img = GetVtkmprbasedata()->GetImageData();
-	if(img!=NULL){
+	if(img!=NULL)
+ 	{
 		origin = img->GetOrigin();
 		img->GetExtent(x1,x2,y1,y2,z1,z2);
 		spc = img->GetSpacing();
@@ -288,8 +303,9 @@ void wxVtkMPR2DView::Refresh()
 		y =  yy*spc[1];
 		z =  zz*spc[2];
 
+		if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)) 
+		{
 
-		if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)  ) {
 			if (_direction==0) {	// YZ
 				if(_imageViewer2XYZ)
 				{
@@ -343,11 +359,12 @@ void wxVtkMPR2DView::Refresh()
 				_ptsB->SetPoint(1, x   , yy2, z1 );
 				
 				
-			}
+			} // if back
 			_backX=xx;
 			_backY=yy;
 			_backZ=zz;
-		}
+		} // if image
+
 //EED 2016/02/19
 	vtkImageActor *imageactor = _imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor();
 	imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );