#3012 creaMaracasVisu Bug New Normal - Update Image in ViewerNV #3065 creaMara...

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
index 10ead8b63c2bee4609cbbcd206ff7f162b0ca8b6..2a8a7588e493cbe8acdf0ca10f334b5d22f836f7 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
@@ -74,7 +74,8 @@
 // ----------------------------------------------------------------------------
 
 
-class creaMaracasVisu_EXPORT manualViewBaseContour{
+class creaMaracasVisu_EXPORT manualViewBaseContour
+{
 
 //---------------------------------------------------
 // PUBLIC METHODS & ATTS
@@ -130,7 +131,7 @@ public:
 
        virtual void    Refresh();
        int             GetNumberOfPoints();                                            // ??? 
-       //int           GetNumberOfPointsSpline();                              //JSTG 25-02-08 In ContourModel is the same method 
+       //int   GetNumberOfPointsSpline();                                      //JSTG 25-02-08 In ContourModel is the same method 
        //void  SetNumberOfPointsSpline(int size);                      //JSTG 25-02-08 In ContourModel is the same method 
 
        void    CreateNewContour();
@@ -142,7 +143,7 @@ public:
        void    UpdateColorActor();
 
        void    SetRange(double range);
-       double          GetRange();
+       double  GetRange();
        void    SetZ(int z);
        int             GetZ();
 
@@ -189,15 +190,18 @@ public:
 
        virtual void                    ConstructVTKObjects();
 
+       void SetCellArray(bool type);
 //---------------------------------------------------
 // PRIVATE METHODS & ATTS
 //---------------------------------------------------
 
 private:
 
-       vtkPolyData                                             *_pd;
-       vtkActor                                                *_contourVtkActor;
-       vtkPolyDataMapper                               *_bboxMapper;
+       vtkPolyData                                                     *_pd;
+       vtkCellArray                                            *_splineCell;
+       vtkCellArray                                            *_lineCell;
+       vtkActor                                                        *_contourVtkActor;
+       vtkPolyDataMapper                                       *_bboxMapper;
 
        void                    DeleteVtkObjects();
        
@@ -210,54 +214,55 @@ protected:
 
        double                                                          _range;
 
-       double                                                  _coulorEdit_r;
-       double                                                  _coulorEdit_g;
-       double                                                  _coulorEdit_b;
-       double                                                  _coulorNormal_r;
-       double                                                  _coulorNormal_g;
-       double                                                  _coulorNormal_b;
-       double                                                  _coulorSelection_r;
-       double                                                  _coulorSelection_g;
-       double                                                  _coulorSelection_b;
-       double                                                  _widthline;
+       double                                                          _coulorEdit_r;
+       double                                                          _coulorEdit_g;
+       double                                                          _coulorEdit_b;
+       double                                                          _coulorNormal_r;
+       double                                                          _coulorNormal_g;
+       double                                                          _coulorNormal_b;
+       double                                                          _coulorSelection_r;
+       double                                                          _coulorSelection_g;
+       double                                                          _coulorSelection_b;
+       double                                                          _widthline;
 
        //
        // Reference to VTKBaseView
        //
-       wxVtkBaseView                                   *_wxvtkbaseview;
+       wxVtkBaseView                                           *_wxvtkbaseview;
 
        //
        // Is the contour selected
        //
-       bool                                                    _selected;
-       bool                                                    *_editable;
-       bool                                                    _posibleSelected;
-       bool                                                    _viewControlPoints;
+       bool                                                            _selected;
+       bool                                                            *_editable;
+       bool                                                            _posibleSelected;
+       bool                                                            _viewControlPoints;
 
        // text
-       bool                                                    _show_text;
-       int                                                             _id_viewPoint_for_text;
-       vtkTextActor                                    *_textActor;
+       bool                                                            _show_text;
+       int                                                                     _id_viewPoint_for_text;
+       vtkTextActor                                            *_textActor;
+       vtkTextActor                                            *_textActor2;
 
        //
        // Contour model
        //
-       manualBaseModel                         *_manContModel;
+       manualBaseModel                                         *_manContModel;
 
-       vtkPoints                                               *_pts;
+       vtkPoints                                                       *_pts;
 // JSTG 25-02-08 --------------------------------------------
-       int                                                             _sizePointsContour;
+       int                                                                     _sizePointsContour;
 //-----------------------------------------------------------
 
        //
        // Control points list
        //
-       std::vector<manualViewPoint*>   _lstViewPoints;
+       std::vector<manualViewPoint*>           _lstViewPoints;
 
        //
        // Spacing
        //
-       double                                                  _spc[3];
+       double                                                          _spc[3];
 
        virtual void    RefreshText();