v1.0.3 BUG 1404

[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 65a8b825c80b8f9b8dfc4db3bd4ff7fcc2f74c38..815a9db16fd1aee2a2b9a933097255095bb53338 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
@@ -50,6 +50,11 @@
 
 
 class creaMaracasVisu_EXPORT manualViewBaseContour{
+
+//---------------------------------------------------
+// PUBLIC METHODS & ATTS
+//---------------------------------------------------
+
 public:
        manualViewBaseContour();
        virtual ~manualViewBaseContour();
@@ -59,7 +64,7 @@ public:
        virtual void Open(FILE *pFile);
 
        void    AddPoint();
-       void    AddPoint( manualViewPoint * manualViewPoint );
+       virtual void    AddPoint( manualViewPoint * manualViewPoint );
        void    InsertPoint(int id);
        void    DeleteContour();
        void    DeletePoint(int x, int y,int z);
@@ -95,7 +100,7 @@ public:
        void    UnSelectLstPoints();
        void    UnSelectAllPoints();
 
-       void    SetModel(manualContourModel *manContModel);
+       void    SetModel(manualBaseModel *manContModel);
        void    SetWxVtkBaseView(wxVtkBaseView *wxvtkbaseview);
 
        virtual void    Refresh();
@@ -145,10 +150,11 @@ public:
        void    RemoveCompleteContourActor();
        virtual void    AddSplineActor();
        virtual void    RemoveSplineActor();
-       void    AddControlPoints();
-       void    RemoveControlPoints();  
+       virtual void    AddControlPoints();
+       virtual void    RemoveControlPoints();  
        void    AddTextActor();
        void    RemoveTextActor();
+       void InitTextActor();
 
        virtual manualViewBaseContour * Clone();
                        void                                    CopyAttributesTo( manualViewBaseContour *cloneObject );
@@ -158,20 +164,27 @@ public:
 
        virtual void                    ConstructVTKObjects();
 
-private:
-       double                                                          _range;
-
-       wxVtkBaseView                                   *_wxvtkbaseview;
-       bool                                                    _selected;
-       bool                                                    *_editable;
-       bool                                                    _posibleSelected;
-       bool                                                    _viewControlPoints;
+//---------------------------------------------------
+// PRIVATE METHODS & ATTS
+//---------------------------------------------------
 
+private:
 
        vtkPolyData                                             *_pd;
        vtkActor                                                *_contourVtkActor;
        vtkPolyDataMapper                               *_bboxMapper;
 
+       void                    DeleteVtkObjects();
+       
+
+//---------------------------------------------------
+// PROTECTED METHODS & ATTS
+//---------------------------------------------------
+
+protected:
+
+       double                                                          _range;
+
        double                                                  _coulorEdit_r;
        double                                                  _coulorEdit_g;
        double                                                  _coulorEdit_b;
@@ -183,24 +196,46 @@ private:
        double                                                  _coulorSelection_b;
        double                                                  _widthline;
 
-       void                    DeleteVtkObjects();
-       virtual void    RefreshText();
-
+       //
+       // Reference to VTKBaseView
+       //
+       wxVtkBaseView                                   *_wxvtkbaseview;
 
-protected:
+       //
+       // Is the contour selected
+       //
+       bool                                                    _selected;
+       bool                                                    *_editable;
+       bool                                                    _posibleSelected;
+       bool                                                    _viewControlPoints;
 
        // text
        bool                                                    _show_text;
        int                                                             _id_viewPoint_for_text;
        vtkTextActor                                    *_textActor;
-       manualContourModel                              *_manContModel;
+
+       //
+       // Contour model
+       //
+       manualBaseModel                         *_manContModel;
+
        vtkPoints                                               *_pts;
 // JSTG 25-02-08 --------------------------------------------
        int                                                             _sizePointsContour;
 //-----------------------------------------------------------
+
+       //
+       // Control points list
+       //
        std::vector<manualViewPoint*>   _lstViewPoints;
+
+       //
+       // Spacing
+       //
        double                                                  _spc[3];
 
+       virtual void    RefreshText();
+
 };