X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR2DView.cxx;h=517ca87925bd997bb706ddf1109daea013f4478c;hb=f9901e756bb82bd333310b47607875331616bb29;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..517ca87 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)
 	{
@@ -217,9 +232,9 @@ void wxVtkMPR2DView::Configure()
 
 void wxVtkMPR2DView::SetVisibleAxis(bool ok)
 {
-	if (ok!=_visibleAxis)
+	if (ok != _visibleAxis)
 	{
-		_visibleAxis=ok;
+		_visibleAxis = ok;
 		if (_visibleAxis==true)
 		{
 			_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
@@ -233,6 +248,16 @@ void wxVtkMPR2DView::SetVisibleAxis(bool ok)
 	} // ok
 }
 
+
+//-------------------------------------------------------------------
+void wxVtkMPR2DView::ResetBackXYZ()
+{
+	_backX=-9999;
+	_backY=-9999;
+	_backZ=-9999;
+}
+
+
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::Refresh()
 {
@@ -259,12 +284,12 @@ void wxVtkMPR2DView::Refresh()
 		y2 += origin[1];
 		z1 += origin[2];
 		z2 += origin[2];
-		xx1 =		x1*spc[0];
-		yy1 =		y1*spc[1];
-		zz1 =		z1*spc[2];
-		xx2 =		x2*spc[0];
-		yy2 =		y2*spc[1];
-		zz2 =		z2*spc[2];
+		xx1 = x1*spc[0];
+		yy1 = y1*spc[1];
+		zz1 = z1*spc[2];
+		xx2 = x2*spc[0];
+		yy2 = y2*spc[1];
+		zz2 = z2*spc[2];
 		x1 	= (int)(x1*spc[0]);
 		y1 	= (int)(y1*spc[1]);
 		z1	= (int)(z1*spc[2]);
@@ -274,10 +299,6 @@ void wxVtkMPR2DView::Refresh()
 		xx 	= (int)(GetVtkmprbasedata()->GetX());
 		yy 	= (int)(GetVtkmprbasedata()->GetY());
 		zz 	= (int)(GetVtkmprbasedata()->GetZ());
-//EED 02/08/2013
-//		x =  round(xx*spc[0]);
-//		y =  round(yy*spc[1]);
-//		z =  round(zz*spc[2]);
 		x 	=  xx*spc[0];
 		y 	=  yy*spc[1];
 		z 	=  zz*spc[2];
@@ -352,6 +373,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 +401,8 @@ void wxVtkMPR2DView::Refresh()
 	imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
 //EED 01nov2012
 		UpdateColorWindowLevel();
+//EED 05juin2019
+		UpdateCameraParallelScale();
 		wxVtkBaseView::Refresh();
 	}
 }