X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvBinaryImageOverlayActor.h;h=2e575c316caf14d51f444c22cb274fa9d974bff5;hb=a9d632132fa5c0da47d7b3079ccca9d673381a1e;hp=1d05760981e1b8a7cbf286b0566094230b6c2b8c;hpb=11b8c3a844d76b55cf5a6c7e06ce445bc3732120;p=clitk.git

diff --git a/vv/vvBinaryImageOverlayActor.h b/vv/vvBinaryImageOverlayActor.h
index 1d05760..2e575c3 100644
--- a/vv/vvBinaryImageOverlayActor.h
+++ b/vv/vvBinaryImageOverlayActor.h
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef VVBINARYIMAGEOVERLAYACTOR_H
 #define VVBINARYIMAGEOVERLAYACTOR_H
 
@@ -27,23 +27,29 @@ class vtkActor;
 class vvImage;
 class vtkImageMapToRGBA;
 class vtkImageActor;
+class vtkImageReslice;
+class vtkTransform;
 
 //------------------------------------------------------------------------------
-class vvBinaryImageOverlayActor
+class vvBinaryImageOverlayActor : public itk::LightObject
 {
   //  Q_OBJECT
  public:
-  vvBinaryImageOverlayActor();
-  ~vvBinaryImageOverlayActor();
+  typedef vvBinaryImageOverlayActor Self;
+  typedef itk::SmartPointer<Self> Pointer;
+  itkNewMacro(Self);
 
-  void setSlicer(vvSlicer * slicer);
-  void update(int slicer, int slice);
-  void hideActors();
-  void showActors();
-  void setColor(double r, double g, double b);
-  void setImage(vvImage::Pointer image, double bg);
-  void initialize();
+  void SetSlicer(vvSlicer * slicer);
+  void SetColor(double r, double g, double b);
   void SetOpacity(double d);
+  void SetImage(vvImage::Pointer image, double bg, bool modeBG=true);
+  void SetDepth(double d) { mDepth = d; }
+  void Initialize(bool IsVisible=true);
+  void UpdateColor();
+  void UpdateSlice(int slicer, int slice, bool force=false);
+  void HideActors();
+  void ShowActors();
+  void RemoveActors();
 
  protected:
   vvSlicer * mSlicer;
@@ -55,10 +61,15 @@ class vvBinaryImageOverlayActor
   std::vector<double> mColor;
   double mAlpha;
   double mBackgroundValue;
-  vtkLookupTable * mColorLUT;
+  double mForegroundValue;
+  bool m_modeBG;
+  vtkSmartPointer<vtkLookupTable> mColorLUT;
+  double mDepth;
 
-  std::vector<vtkImageMapToRGBA *> mMapperList;
-  std::vector<vtkImageActor*> mImageActorList;
+  std::vector<vtkSmartPointer<vtkImageMapToRGBA> > mMapperList;
+  std::vector<vtkSmartPointer<vtkImageActor> > mImageActorList;
+  vtkSmartPointer<vtkImageReslice> mFusionReslice;
+  vtkSmartPointer<vtkTransform> mConcatenatedFusionTransform;
 
   void ComputeExtent(int orientation, 
 		     int slice, 
@@ -74,6 +85,10 @@ class vvBinaryImageOverlayActor
 					 vtkImageActor * actor, 
 					 double position);
 
+private:
+  vvBinaryImageOverlayActor();
+  ~vvBinaryImageOverlayActor();
+    
 }; // end class vvBinaryImageOverlayActor
 //------------------------------------------------------------------------------