#3020 creaMaracasVisu Bug New Normal - ViewerNV opacity, isovalue slice (size)

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtkMPR2DView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index b9bc3ac4551796029d358a8e0ad36b3156f69ecf..803bea180e9eed803882a9e249172eab98dd2b58 100644 (file)
--- 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 <mathdefs.h>
 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;
        }
 
@@ -236,7 +236,11 @@ void wxVtkMPR2DView::Refresh()
 {
        //wxVtk2DBaseView::Refresh();
        int x1 = 0,x2 = 0,y1 = 0,y2 = 0,z1 = 0,z2 = 0;
-       int x = 0, y = 0, z = 0;
+
+//EED 02/08/2013
+//     int x = 0, y = 0, z = 0;
+       double x = 0, y = 0, z = 0;
+
        int xx = 0, yy = 0, zz = 0;
        double *spc     = 0;
        double *origin  = 0;
@@ -244,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();
@@ -275,11 +280,17 @@ void wxVtkMPR2DView::Refresh()
                yy = (int)(GetVtkmprbasedata()->GetY());
                zz = (int)(GetVtkmprbasedata()->GetZ());
 
-               x =  round(xx*spc[0]);
-               y =  round(yy*spc[1]);
-               z =  round(zz*spc[2]);
-               
-               if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)) {
+//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];
+
+               if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)) 
+               {
 
                        if (_direction==0) {    // YZ
                                if(_imageViewer2XYZ)
@@ -334,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
 {