X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=filters%2FclitkGuerreroVentilationGenericFilter.h;h=608cdf12967bf88d04470e53451ac3fbe630ad4b;hb=d1ce705178f497e18fe7bc2c4115001a0755106d;hp=c3fd2b19a84ae89973f8a1cac63fd164ce00cfee;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git

diff --git a/filters/clitkGuerreroVentilationGenericFilter.h b/filters/clitkGuerreroVentilationGenericFilter.h
index c3fd2b1..608cdf1 100644
--- a/filters/clitkGuerreroVentilationGenericFilter.h
+++ b/filters/clitkGuerreroVentilationGenericFilter.h
@@ -1,18 +1,22 @@
-/*-------------------------------------------------------------------------
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                             
--------------------------------------------------------------------------*/
+  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
 
+  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.
+
+  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 clitkGuerreroVentilationGenericFilter_H
 #define clitkGuerreroVentilationGenericFilter_H
-
 /**
  -------------------------------------------------------------------
  * @file   clitkGuerreroVentilationGenericFilter.h
@@ -21,8 +25,6 @@
  -------------------------------------------------------------------*/
 
 // clitk include
-#include "clitkCommon.h"
-#include "clitkImageCommon.h"
 #include "clitkImageToImageGenericFilter.h"
 
 // itk include
@@ -34,16 +36,17 @@
 namespace clitk {
   
   //--------------------------------------------------------------------
-  class GuerreroVentilationGenericFilter : public ImageToImageGenericFilter {
-  
+  class GuerreroVentilationGenericFilter : 
+  public ImageToImageGenericFilter<GuerreroVentilationGenericFilter> {
   public:
 	
     // Constructor 
-    GuerreroVentilationGenericFilter ();
+    GuerreroVentilationGenericFilter();
+    virtual ~GuerreroVentilationGenericFilter() {}
 
     // Types
     typedef GuerreroVentilationGenericFilter  Self;
-    typedef ImageToImageGenericFilter     Superclass;
+    typedef ImageToImageGenericFilterBase     Superclass;
     typedef itk::SmartPointer<Self>       Pointer;
     typedef itk::SmartPointer<const Self> ConstPointer;
 
@@ -54,19 +57,17 @@ namespace clitk {
     void SetBloodCorrectionFactor(double f) {blood_mass_factor=f;}
     void SetUseCorrectFormula(bool u) {use_correct_formula=u;}
 
-    // Update
-    void Update ();
+    //--------------------------------------------------------------------
+    // Main function called each time the filter is updated
+    template<class InputImageType>  
+    void UpdateWithInputImageType();
 
   protected:  
+    template<unsigned int Dim> void InitializeImageType();
     //Parameters
     double blood_mass_factor;
     bool use_correct_formula;
 
-    //--------------------------------------------------------------------
-    template<unsigned int Dim> void Update_WithDim();
-    template<unsigned int Dim, class PixelType> void Update_WithDimAndPixelType();
-    //--------------------------------------------------------------------
-
   }; // end class GuerreroVentilationGenericFilter
 //--------------------------------------------------------------------