Feature #1766 Add licence terms for all files.

[creaRigidRegistration.git] / PackRecalage / src / bbPackRecalageImageSubstraction.h

diff --git a/PackRecalage/src/bbPackRecalageImageSubstraction.h b/PackRecalage/src/bbPackRecalageImageSubstraction.h
index f2a18e9a2d918b16c59adefc36178536bffc664c..ff45bf40342886fec12037d11096f5128942bc01 100644 (file)
--- a/PackRecalage/src/bbPackRecalageImageSubstraction.h
+++ b/PackRecalage/src/bbPackRecalageImageSubstraction.h
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------   
+*/
+
+
 #ifndef __bbPackRecalageImageSubstraction_h_INCLUDED__
 #define __bbPackRecalageImageSubstraction_h_INCLUDED__
 #include "bbPackRecalage_EXPORT.h"
@@ -8,86 +34,11 @@
 #include <string>
 #include <vector>
 
+#include "Substraction.h"
 
-namespace bbPackRecalage
-{
 
-       class MyImageSubstraction 
+namespace bbPackRecalage
 {
-
-       //----------------------------------------------------------------------------------------
-       // Methods definition
-       //----------------------------------------------------------------------------------------
-       public:
-       //--------------------------
-       //Constructor & Destructor
-       //--------------------------            
-               MyImageSubstraction(vtkImageData* imageData1, vtkImageData* imageData2, int uZLevel,int lZLevel, std::vector<double> uColor, std::vector<double> lColor, std::vector<double> mColor);
-               ~MyImageSubstraction();
-       //--------------------------
-       //Methods
-       //--------------------------
-               /*
-               getting ready the points
-               */
-               void initialize(int dimensions[],double spacing[]);
-               /*
-               Calculate the new image and save it in the attribute imageResult
-               it is used if the user had given the imageData
-               */
-               void substractImage(vtkImageData* imageData1, vtkImageData* imageData2);
-               
-               /*
-               Returns the ImageResult
-               */
-               vtkImageData* getSubstractedImage();
-               
-               /*
-                Get Image Size
-               */
-               int getImageSize();
-               
-               /*
-               constructing image substract
-               */
-               void substract(vtkImageData* imageData1, vtkImageData* imageData2);
-               
-
-
-       //----------------------------------------------------------------------------------------
-       // Attributes declaration
-       //----------------------------------------------------------------------------------------
-       private: 
-               /*
-                Substracted Image
-               */
-               vtkImageData* imageResult;
-               /*
-                image size dimx*dimy*dimz
-               */
-               int sizeImage;
-               /*
-               upper zero level for doing the Substraction
-               */
-               int uZeroLevel;
-               /*
-               lower zero level for doing the Substraction
-               */
-               int lZeroLevel;
-               /*
-               Color for the upper threshold
-               */
-               int upperColor[3];
-               /*
-               Color for the lower threshold
-               */
-               int lowerColor[3];
-               /*
-               Color for the medium threshold
-               */
-               int mediumColor[3];
-};
-
 class bbPackRecalage_EXPORT ImageSubstraction
  : 
    public bbtk::AtomicBlackBox
@@ -103,6 +54,9 @@ class bbPackRecalage_EXPORT ImageSubstraction
   BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
   BBTK_PROCESS(Process);
   void Process();
+
+  private:
+               Substraction* subImage;
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageSubstraction,bbtk::AtomicBlackBox);