X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkPiecewiseFunction.cxx;h=c667b6eaba55365605e0b73614d49be5a4d1a053;hb=84454af9be8cecfbf41ca7c0198c65efe60f9b48;hp=67e2198b27915814e5d5d4e1a27387468e913bfb;hpb=ff64736c7b0524ea73c6f1ca1ca569593c8e0946;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkPiecewiseFunction.cxx b/packages/vtk/src/bbvtkPiecewiseFunction.cxx
index 67e2198..c667b6e 100644
--- a/packages/vtk/src/bbvtkPiecewiseFunction.cxx
+++ b/packages/vtk/src/bbvtkPiecewiseFunction.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkPiecewiseFunction.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/16 12:48:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.3 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -49,12 +54,9 @@ namespace bbvtk
    BBTK_BLACK_BOX_IMPLEMENTATION(PiecewiseFunction,bbtk::AtomicBlackBox);
 
 
-
-
-
-   void PiecewiseFunction::bbUserConstructor() 
+	//---------------------------------------------------------------------
+   void PiecewiseFunction::bbUserSetDefaultValues() 
    { 
-     Init();
      // Identity function
      std::vector<float> x,y;
      x.push_back(0);
@@ -63,20 +65,24 @@ namespace bbvtk
      y.push_back(1);
      bbSetInputX(x);
      bbSetInputY(y);
-   }
-   void PiecewiseFunction::bbUserCopyConstructor(bbtk::BlackBox::Pointer) 
-   { 
-     Init();
+	 bbSetOutputOut(0);
    }
 
-   void PiecewiseFunction::Init() 
+	
+	//---------------------------------------------------------------------
+   void PiecewiseFunction::bbUserInitializeProcessing() 
    { 
      bbSetOutputOut(vtkPiecewiseFunction::New());
    }
 
-   void PiecewiseFunction::bbUserDestructor() 
+	//---------------------------------------------------------------------
+   void PiecewiseFunction::bbUserFinalizeProcessing() 
    { 
-     bbGetOutputOut()->Delete();
+	   if (bbGetOutputOut()!=NULL)
+	   {
+		   bbGetOutputOut()->Delete();
+		   bbSetOutputOut(0);
+	   }
    }
 //---------------------------------------------------------------------