#3347 creaMaracasVisu Bug New Normal - ViewerMPR2D Reset back position when set...

[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 edee925a4775be64502286deaaedd46a9dd5861b..e94a2b7022ec0252e44013fccadff9ffcdc16475 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
@@ -46,7 +46,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -71,8 +71,8 @@ public:
 
        virtual manualContourModel * Clone();
        void CopyAttributesTo( manualContourModel *cloneObject );
-       void Open(FILE *ff);    // virtual
-       virtual void Save(FILE *ff);    // virtual
+       void Open(FILE *ff);                            // virtual
+       virtual void Save(FILE *ff);            // virtual
        virtual int GetTypeModel();                     // virtual 
 
        virtual int                             AddPoint(double x,double y,double z);
@@ -93,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
@@ -129,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
        */
@@ -161,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;
 //--------------------------------------------------------------------------------
 
 };