Clean code

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
index 5e8dcac9a9df2912ba3979206d1e1d1c3c2e3f6b..f5abbb6b61cc6add81fd915486288db483203e15 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
@@ -47,7 +47,6 @@
 #include "InteractorStyleMaracas.h"
 #include "vtkImageChangeInformation.h"
 
-
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------
@@ -95,7 +94,6 @@ class LayerImageBase
                void                    SetColorBarPosition(std::vector<int> &colorbarposition);
                void                    SetwxVtkBaseView(wxVtkBaseView *baseview);
 
-
                void onThreshold();
                void onThresholdChange();
                void onThresholdInterpolation(bool interpolate);
@@ -103,7 +101,8 @@ class LayerImageBase
                void onThresholdRemove();
                wxVtkBaseView *GetwxVtkBaseView();
                void Refresh();
-               vtkLookupTable *GetvtkLookupTable();
+               vtkLookupTable *GetThresholdTable();
+
                vtkImageReslice *GetvtkImageReslice();
                virtual int GetX();
                virtual int GetY();
@@ -120,7 +119,7 @@ class LayerImageBase
                void GetDimensionBase(int *dim);
                void GetSpcOriginalLayer(double *spc);
                void GetSpcBase(double *spc);
-
+               vtkScalarsToColors* GetLookupTable();
 
   private:
                int                                                     _X;
@@ -132,8 +131,7 @@ class LayerImageBase
                double                                          _newSpcLayer[3];
                int                                             _dimBase[3];
                double                                          _spcBase[3];
-
-               
+               double                                          _opacity;
 
                vtkImageData                            *_image;
                vtkImageChangeInformation       *_imageChangeInformation;
@@ -142,19 +140,14 @@ class LayerImageBase
                vtkImageMapToColors                     *_thresholdMapper;
                vtkImageActor                           *_thresholdActor;
                wxVtkBaseView                           *_baseView;
-
                vtkScalarBarActor                       *_scalarbarActor;
-
                virtual void                            ConfigLookupTable() = 0;                
                void                                            CleanXYZ(double &x, double &y, double &z);
 
-
   protected:
-               vtkLookupTable                          *GetThresholdTable();
                double                                          _range[2];
                std::vector<double>             _rangeForColorBar;
                std::vector<int>                        _colorBarPosition;
-
  };