X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR2DView.cxx;h=803bea180e9eed803882a9e249172eab98dd2b58;hb=ba3bf1e05af2b03d6b013606b9d885d8fb0b2cb4;hp=b6e50ca0e95e42fc60d84e5a851cb28a1b325b41;hpb=60238e95450685ecb14f7e6d77247fa9e15b7441;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx index b6e50ca..803bea1 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx @@ -28,6 +28,8 @@ #include "vtkInteractorStyleBaseView.h" #include "vtkCellArray.h" +#include "vtkImageActor.h" + #ifdef WIN32 #include using namespace gtm; @@ -95,11 +97,9 @@ void wxVtkMPR2DView::Configure() x1 = (int)(x1*spc[0]); y1 = (int)(y1*spc[1]); z1 = (int)(z1*spc[2]); - x2 = (int)(x2*spc[0]); y2 = (int)(y2*spc[1]); z2 = (int)(z2*spc[2]); - _visibleAxis = true; } @@ -248,7 +248,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 +289,8 @@ 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) @@ -344,17 +345,21 @@ 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() ); //EED 01nov2012 UpdateColorWindowLevel(); wxVtkBaseView::Refresh(); } } + //------------------------------------------------------------------- int wxVtkMPR2DView::GetActualSlice() // virtual {