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=01c7e1400cc3f42652651dfc2c562649779e7fdf;hpb=25e3adf442d6a8d357d52410267445c54426c525;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index 01c7e14..517ca87 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -232,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 );
@@ -248,6 +248,16 @@ void wxVtkMPR2DView::SetVisibleAxis(bool ok)
 	} // ok
 }
 
+
+//-------------------------------------------------------------------
+void wxVtkMPR2DView::ResetBackXYZ()
+{
+	_backX=-9999;
+	_backY=-9999;
+	_backZ=-9999;
+}
+
+
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::Refresh()
 {
@@ -274,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]);
@@ -289,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];
@@ -395,6 +401,8 @@ void wxVtkMPR2DView::Refresh()
 	imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
 //EED 01nov2012
 		UpdateColorWindowLevel();
+//EED 05juin2019
+		UpdateCameraParallelScale();
 		wxVtkBaseView::Refresh();
 	}
 }