X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageContour.h;h=12bb2dcca7c065a77577377fad238bdafc97159e;hb=1e4c81a5ad6b3cf7e769835b40619090f558a62f;hp=4228b7021732c6cab89553a7568ebf815dfc3713;hpb=0410cde2a749710c2659d4c582d9fc0c332aced6;p=clitk.git

diff --git a/vv/vvImageContour.h b/vv/vvImageContour.h
index 4228b70..12bb2dc 100644
--- a/vv/vvImageContour.h
+++ b/vv/vvImageContour.h
@@ -1,38 +1,30 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Program:   vv
-  Module:    $RCSfile: vvImageContour.h,v $
-  Language:  C++
-  Date:      $Date: 2010/03/05 10:32:33 $
-  Version:   $Revision: 1.5 $
-  Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-  Copyright (C) 2010
-  Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-  CREATIS                   http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  =========================================================================*/
+  It is distributed under dual licence
 
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #ifndef VVIMAGECONTOUR_H
 #define VVIMAGECONTOUR_H
 
 #include "clitkCommon.h"
 #include "vvSlicer.h"
+
 class vtkImageClip;
 class vtkMarchingSquares;
 class vtkActor;
+class vvImage;
 
 //------------------------------------------------------------------------------
 class vvImageContour
@@ -47,17 +39,44 @@ class vvImageContour
   void hideActors();
   void showActors();
   void setColor(double r, double g, double b);
+  void setImage(vvImage::Pointer image);
+  void setPreserveMemoryModeEnabled(bool b);
 
  protected:
   vvSlicer * mSlicer;
   int mSlice;
   int mTSlice;
   double mValue;
+  int mPreviousTSlice;
+  double mPreviousValue;
+  bool mHiddenImageIsUsed;
+  vvImage::Pointer mHiddenImage;
+  bool mDisplayModeIsPreserveMemory;
 
+  // For preserveMemory mode
   std::vector<vtkImageClip*> mClipperList;
   std::vector<vtkMarchingSquares*> mSquaresList;
   std::vector<vtkActor*> mSquaresActorList;
 
+  // For fast cache mode
+  int mPreviousSlice;
+  int mPreviousOrientation;
+  std::vector<std::vector<vtkActor*> > mListOfCachedContourActors;
+
+  // Functions
+  void initializeCacheMode();
+  void updateWithPreserveMemoryMode();
+  void updateWithFastCacheMode();
+  void createNewActor(vtkActor ** actor, 
+		      vtkMarchingSquares ** squares, 
+		      vtkImageClip ** clipper, int numImage);
+  void updateActor(vtkActor * actor, 
+		   vtkMarchingSquares * squares,
+		   vtkImageClip * clipper, 
+		   int threshold, int orientation, int slice);
+  void createActor(int orientation, int slice);
+  int computeCurrentOrientation();
+  
 }; // end class vvImageContour
 //------------------------------------------------------------------------------