Clean code

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualContour / manualContourModel.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
index 16514a42ebe5397f2369b92254b44c47c2d0f9c8..4493ed5b38b09612af60f56d5f76b6b4eb8efc6b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #ifndef manualContourModel_h
 #define manualContourModel_h
 
@@ -21,7 +46,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -68,35 +93,30 @@ public:
        virtual int                             GetIdPoint(double x, double y, double z, int i_range,int type);
        virtual manualPoint*    GetManualPoint(int id);
        virtual int                             GetSizeLstPoints();
-       int                             GetNumberOfPointsSpline();
+       int                                             GetNumberOfPointsSpline();
        virtual void                    SetNumberOfPointsSpline(int size);
 
-       virtual void    UpdateSpline();
-       void                    SetCloseContour(bool closeContour);
-       bool                    IfCloseContour();
+       virtual void                    UpdateSpline();
+       void                                    SetCloseContour(bool closeContour);
+       bool                                    IfCloseContour();
 //JSTG 25-02-08 -----------------------------------------------------------------
        //void                  GetSplinePoint(double t, double &x, double &y, double &z);      //Method Original
        //void                  GetSplineiPoint(int i, double &x, double &y, double &z);        //Method Original
 //-------------------------------------------------------------------------------
-       virtual double                  GetPathSize();
-       virtual double                  GetPathArea();
+       virtual double                  GetPathSize(double *spc);
+       virtual double                  GetPathArea(double *spc);
 
-       void                    GetNearestPointAndNormal(double *p, double *rp,  double *rn);
+       void                                    GetNearestPointAndNormal(double *p, double *rp,  double *rn);
        
 // JSTG 25-02-08 -----------------------------------------------------------------
-       virtual void    GetSpline_i_Point(int i, double *x, double *y, double *z);
-       void                    GetSpline_t_Point(double t, double *x, double *y, double *z);
+       virtual void                    GetSpline_i_Point(int i, double *x, double *y, double *z);
+       void                                    GetSpline_t_Point(double t, double *x, double *y, double *z);
 //--------------------------------------------------------------------------------
 
        virtual std::vector<manualBaseModel*> ExploseModel(  );
 
 // CMRU 17-08-09 -----------------------------------------------------------------
        
-       /*
-       * Assigns the parameter value to the label
-       * @param newLabel New label of the contour
-       */
-       void SetLabel(std::string newLabel);
        
        /*
        * Assigns the parameter value to the real size
@@ -104,11 +124,6 @@ public:
        */
        void SetRealSize(double newRealSize);
        
-       /**
-       * Returns the label of the contour
-       */
-       std::string GetLabel();
-
        /**
        * Returns the real size in milimeters of the contour
        */
@@ -136,19 +151,15 @@ public:
     vtkKochanekSpline                  *_cntSplineZ;
 
 //JSTG 25-02-08 ----------------------------------------
-       double                  _delta_JSTG;
+       double                                          _delta_JSTG;
 //------------------------------------------------------
 
 //CMRU 17-08-09 -----------------------------------------------------------------
        /**
        * Represents the real size in milimeters of the contour
        */
-       double                  _realSize;
+       double                                          _realSize;
 
-       /**
-       * Represents the label associated with the contour
-       */
-       std::string             _label;
 //--------------------------------------------------------------------------------
 
 };