*** empty log message ***

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
index ac750b93cf5e4566bd0cb0358be96761f28cd8b2..7b43bbe0963c8b362f4657c170fc01b3cdb03704 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
@@ -32,15 +32,15 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "widgets/wxVTKRenderWindowInteractor.h"
-
+#include "wxVTKRenderWindowInteractor.h"
 
+#include "InteractorStyleMaracas.h"
 //--
 
 #include <vector>
 
 
-#include "widgets/wxVtkBaseView.h"
+#include "wxVtkBaseView.h"
 #include "marTypes.h"
 
 
@@ -53,7 +53,7 @@
 class manualPoint{
 public:
        manualPoint();
-       ~manualPoint();
+       virtual ~manualPoint();
        void    SetPoint(double x,double y,double z);
        void    SetPointX(double x);
        void    SetPointY(double y);
@@ -73,16 +73,16 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContourModel{
+class creaMaracasVisu_EXPORT manualContourModel{
 public:
        manualContourModel();
-       ~manualContourModel();
+       virtual ~manualContourModel();
 
        virtual manualContourModel * Clone();
        void CopyAttributesTo( manualContourModel *cloneObject );
        virtual void Open(FILE *ff);    // virtual
        virtual void Save(FILE *ff);    // virtual
-       virtual GetTypeModel();                 // virtual 
+       virtual int GetTypeModel();                     // virtual 
 
        int                             AddPoint(double x,double y,double z);
        int                             InsertPoint(double x,double y,double z);
@@ -141,11 +141,11 @@ private:
 
 //--------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS manualContourModelCircle : public manualContourModel
+class creaMaracasVisu_EXPORT manualContourModelCircle : public manualContourModel
 {
 public:
        manualContourModelCircle();
-       ~manualContourModelCircle();
+       virtual ~manualContourModelCircle();
        virtual manualContourModelCircle *Clone();
        void CopyAttributesTo( manualContourModelCircle *cloneObject);
        virtual void GetSpline_i_Point(int i, double *x, double *y, double *z);
@@ -160,11 +160,27 @@ private:
        virtual void    UpdateSpline();
 };
 
+//--------------------------------------------------------
+
+class creaMaracasVisu_EXPORT manualContourModelLine : public manualContourModel
+{
+public:
+       manualContourModelLine();
+       virtual ~manualContourModelLine();
+       virtual manualContourModelLine *Clone();
+       void CopyAttributesTo( manualContourModelLine *cloneObject);
+//     virtual void GetSpline_i_Point(int i, double *x, double *y, double *z);
+private:
+       virtual int             GetTypeModel();  
+};
+
+//--------------------------------------------------------
+
 class manualContourModelBullEyeSector : public manualContourModel
 {
 public:
        manualContourModelBullEyeSector();
-       ~manualContourModelBullEyeSector();
+       virtual ~manualContourModelBullEyeSector();
        virtual manualContourModelBullEyeSector *Clone();
        void    CopyAttributesTo( manualContourModelBullEyeSector *cloneObject);
        void    SetSector(      double radioA,
@@ -197,11 +213,11 @@ private:
 
 //--------------------------------------------------------
 //eed004
-class MARACASVISULIB_EXPORTS manualContourModelBullEye : public manualContourModel
+class creaMaracasVisu_EXPORT manualContourModelBullEye : public manualContourModel
 {
 public:
        manualContourModelBullEye();
-       ~manualContourModelBullEye();
+       virtual ~manualContourModelBullEye();
        virtual manualContourModelBullEye *Clone();
        void    CopyAttributesTo( manualContourModelBullEye *cloneObject);
        virtual void Save(FILE *ff);
@@ -246,11 +262,11 @@ private:
 //--------------------------------------------------------
 
 //JSTG 25-02-08 ------------------------------------------
-class MARACASVISULIB_EXPORTS manualContourModelRoi : public manualContourModel
+class creaMaracasVisu_EXPORT manualContourModelRoi : public manualContourModel
 {
        public:
        manualContourModelRoi();
-       ~manualContourModelRoi();
+       virtual ~manualContourModelRoi();
        virtual manualContourModelRoi *Clone();
        void CopyAttributesTo( manualContourModelRoi *cloneObject);
 private:
@@ -298,10 +314,10 @@ protected:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualViewBaseContour{
+class creaMaracasVisu_EXPORT manualViewBaseContour{
 public:
        manualViewBaseContour();
-       ~manualViewBaseContour();
+       virtual ~manualViewBaseContour();
 
        virtual int GetType();
        virtual void Save(FILE *pFile);
@@ -458,11 +474,11 @@ protected:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualViewContour: public manualViewBaseContour
+class creaMaracasVisu_EXPORT manualViewContour: public manualViewBaseContour
 {
 public:
        manualViewContour();
-       ~manualViewContour();
+       virtual ~manualViewContour();
        virtual manualViewContour * Clone();
        void CopyAttributesTo( manualViewContour *cloneObject );
 
@@ -497,7 +513,7 @@ class manualView3VContour: public manualViewContour
 {
 public:
        manualView3VContour(int type);
-       ~manualView3VContour();
+       virtual ~manualView3VContour();
        virtual manualView3VContour * Clone();
        void CopyAttributesTo( manualView3VContour *cloneObject );
 
@@ -526,7 +542,7 @@ class manualView3DContour: public manualViewContour
 {
 public:
        manualView3DContour();
-       ~manualView3DContour();
+       virtual ~manualView3DContour();
        virtual manualView3DContour * Clone();
        void CopyAttributesTo( manualView3DContour *cloneObject );
 
@@ -553,11 +569,11 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualViewRoi: public manualViewBaseContour
+class creaMaracasVisu_EXPORT manualViewRoi: public manualViewContour
 {
 public:
        manualViewRoi();
-       ~manualViewRoi();
+       virtual ~manualViewRoi();
 
        virtual int GetType();
        virtual manualViewRoi * Clone();
@@ -579,7 +595,7 @@ private:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-class MARACASVISULIB_EXPORTS manualViewBullEyeSector: public manualViewBaseContour
+class creaMaracasVisu_EXPORT manualViewBullEyeSector: public manualViewContour
 {
 public:
        manualViewBullEyeSector();
@@ -592,11 +608,11 @@ public:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 //EED004
-class MARACASVISULIB_EXPORTS manualViewBullEye: public manualViewRoi
+class creaMaracasVisu_EXPORT manualViewBullEye: public manualViewRoi
 {
 public:
        manualViewBullEye();
-       ~manualViewBullEye();
+       virtual ~manualViewBullEye();
 
        virtual int GetType();
        virtual manualViewBullEye * Clone();
@@ -625,18 +641,16 @@ private:
 // ----------------------------------------------------------------------------
 
 // EED08
-class MARACASVISULIB_EXPORTS manualViewCircle: public manualViewContour
+class creaMaracasVisu_EXPORT manualViewCircle: public manualViewContour
 {
 public:
        manualViewCircle();
-       ~manualViewCircle();
+       virtual ~manualViewCircle();
 
        virtual int GetType();
        virtual manualViewCircle * Clone();
        void CopyAttributesTo( manualViewCircle *cloneObject );
 
-//     void RefreshContour();
-//     virtual bool ifTouchContour(int x,int y, int z);  
        virtual void InitMove(int x, int y, int z);
        virtual void MoveContour(int x, int y, int z);
        void GetMinMax(double &minX,double &minY, double &maxX, double &maxY);
@@ -644,8 +658,30 @@ public:
 private:
        double                          _dp0[3];
        double                          _dp1[3];
-//     double                          _dp2[3];
-//     double                          _dp3[3];
+};
+
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+// AD:02-09
+class creaMaracasVisu_EXPORT manualViewLine: public manualViewContour
+{
+public:
+       manualViewLine();
+       virtual ~manualViewLine();
+
+       virtual int GetType();
+       virtual manualViewLine * Clone();
+       void CopyAttributesTo( manualViewLine *cloneObject );
+
+       virtual void InitMove(int x, int y, int z);
+       virtual void MoveContour(int x, int y, int z);
+
+private:
+       double                          _dp0[3];
+       double                          _dp1[3];
 };
 
 
@@ -655,11 +691,12 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContourBaseControler: public InteractorStyleMaracas
+
+class creaMaracasVisu_EXPORT manualContourBaseControler: public InteractorStyleMaracas
 {
 public:
        manualContourBaseControler();
-       ~manualContourBaseControler();
+       virtual ~manualContourBaseControler();
 
        virtual manualContourBaseControler * Clone();
        void CopyAttributesTo( manualContourBaseControler *cloneObject );
@@ -751,11 +788,11 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContourControler: public manualContourBaseControler
+class creaMaracasVisu_EXPORT manualContourControler: public manualContourBaseControler
 {
 public:
        manualContourControler();
-       ~manualContourControler();
+       virtual ~manualContourControler();
        virtual manualContourControler * Clone();
        void CopyAttributesTo( manualContourControler *cloneObject );
 
@@ -780,11 +817,11 @@ private:
 
 
 
-class MARACASVISULIB_EXPORTS manualContour3VControler:  public manualContourControler
+class creaMaracasVisu_EXPORT manualContour3VControler:  public manualContourControler
 {
 public:
        manualContour3VControler(int type);
-       ~manualContour3VControler();
+       virtual ~manualContour3VControler();
        virtual manualContour3VControler * Clone();
        void CopyAttributesTo( manualContour3VControler *cloneObject );
 
@@ -824,11 +861,11 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContour3DControler:  public manualContourControler
+class creaMaracasVisu_EXPORT manualContour3DControler:  public manualContourControler
 {
 public:
        manualContour3DControler();
-       ~manualContour3DControler();
+       virtual ~manualContour3DControler();
        virtual manualContour3DControler * Clone();
        void CopyAttributesTo( manualContour3DControler *cloneObject );
 
@@ -853,11 +890,11 @@ private:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS manualContour3V3DControler: public manualContour3DControler
+class creaMaracasVisu_EXPORT manualContour3V3DControler: public manualContour3DControler
 {
 public:
        manualContour3V3DControler();
-       ~manualContour3V3DControler();
+       virtual ~manualContour3V3DControler();
        virtual manualContour3V3DControler * Clone();
        void CopyAttributesTo( manualContour3V3DControler *cloneObject );
 
@@ -882,11 +919,11 @@ private:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS manualContourPerpPlaneControler: public manualContourControler
+class creaMaracasVisu_EXPORT manualContourPerpPlaneControler: public manualContourControler
 {
 public:
        manualContourPerpPlaneControler();
-       ~manualContourPerpPlaneControler();
+       virtual ~manualContourPerpPlaneControler();
     virtual manualContourPerpPlaneControler * Clone();
        void CopyAttributesTo( manualContourPerpPlaneControler *cloneObject );
 
@@ -925,11 +962,11 @@ protected:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualRoiControler: public manualContourBaseControler
+class creaMaracasVisu_EXPORT manualRoiControler: public manualContourControler
 {
 public:
        manualRoiControler();
-       ~manualRoiControler();
+       virtual ~manualRoiControler();
        virtual manualRoiControler * Clone();
        void CopyAttributesTo( manualRoiControler *cloneObject );
 
@@ -950,11 +987,11 @@ private:
 // ----------------------------------------------------------------------------
 
 // EED08
-class MARACASVISULIB_EXPORTS manualCircleControler: public manualContourControler
+class creaMaracasVisu_EXPORT manualCircleControler: public manualContourControler
 {
 public:
        manualCircleControler();
-       ~manualCircleControler();
+       virtual ~manualCircleControler();
        virtual manualCircleControler * Clone();
        void CopyAttributesTo( manualCircleControler *cloneObject );
 
@@ -971,6 +1008,30 @@ private:
 };
 
 
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+// AD:02-09
+class creaMaracasVisu_EXPORT manualLineControler: public manualContourControler
+{
+public:
+       manualLineControler();
+       virtual ~manualLineControler();
+       virtual manualLineControler * Clone();
+       void CopyAttributesTo( manualLineControler *cloneObject );
+
+       virtual void MouseClickLeft(int x, int y);
+       virtual void MouseMove(int x, int y );
+       virtual void DeleteActualMousePoint(int x, int y);
+                       void InitRoi(int ww, int hh, double porcentage);
+
+
+
+private:
+       int                                     bakIdPoint;
+};
+