#3470 merge vtk8itk5wx3-mingw64

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h
index 11e0030810ee30ea7dd14678704779236837eeba..56bb7bb59f9c6a58a6ee080d8e8c8d7365c9a3dc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h
@@ -47,7 +47,6 @@ public:
                        vtkMPRBaseData  *GetVtkmprbasedata();
        virtual int                             GetActualSlice();
        virtual void                    SetActualSlice(int slice);
-
                        bool                    IfMouseTouchX(double x, double y, double z);
                        bool                    IfMouseTouchY(double x, double y, double z);
                        bool                    IfMouseTouchZ(double x, double y, double z);
@@ -56,20 +55,17 @@ public:
                        void                    MoveZ(double x, double y, double z);
                        void                    ChangeAxisColor(double x, double y, double z);
        virtual void                    TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection=false, int type=2);
-
                        void                    SetVisibleAxis(bool ok);
     virtual int             GetDirection();
-
-
+                       void                    ResetBackXYZ();
 
 private:
-
        int                                                     _backX;
        int                                                     _backY;
        int                                                     _backZ;
-
+       bool                                            _backFixAxis2D;
+       double                                          _backOpacityAxis;
        bool                                            _visibleAxis;
-
        int                                                     _direction;
        vtkPoints                                       *_ptsA;
        vtkActor                                        *_lineAActor;
@@ -83,5 +79,4 @@ private:
        vtkInteractorStyleMPRView       *_interactorstylemprview;
 };
 
-
 #endif /*WXVTKMPR2DVIEW_H_*/