X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FmanualContour.h;h=2f3f7783060d50b83e39edfa8f1004ddeed20fc3;hb=8b75d0d7ee7c2aed68f1663282127c8e9932e705;hp=e2aa630e221fa966beccc82a3b970dfa9932a2fd;hpb=5416ef78d59b6a919d4fa1cb7167d379287d2e3d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
index e2aa630..2f3f778 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
@@ -73,7 +73,7 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContourModel{
+class creaMaracasVisu_EXPORT manualContourModel{
 public:
 	manualContourModel();
 	virtual ~manualContourModel();
@@ -141,7 +141,7 @@ private:
 
 //--------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS manualContourModelCircle : public manualContourModel
+class creaMaracasVisu_EXPORT manualContourModelCircle : public manualContourModel
 {
 public:
 	manualContourModelCircle();
@@ -160,6 +160,22 @@ 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:
@@ -197,7 +213,7 @@ private:
 
 //--------------------------------------------------------
 //eed004
-class MARACASVISULIB_EXPORTS manualContourModelBullEye : public manualContourModel
+class creaMaracasVisu_EXPORT manualContourModelBullEye : public manualContourModel
 {
 public:
 	manualContourModelBullEye();
@@ -246,7 +262,7 @@ private:
 //--------------------------------------------------------
 
 //JSTG 25-02-08 ------------------------------------------
-class MARACASVISULIB_EXPORTS manualContourModelRoi : public manualContourModel
+class creaMaracasVisu_EXPORT manualContourModelRoi : public manualContourModel
 {
 	public:
 	manualContourModelRoi();
@@ -298,7 +314,7 @@ protected:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualViewBaseContour{
+class creaMaracasVisu_EXPORT manualViewBaseContour{
 public:
 	manualViewBaseContour();
 	virtual ~manualViewBaseContour();
@@ -458,7 +474,7 @@ protected:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualViewContour: public manualViewBaseContour
+class creaMaracasVisu_EXPORT manualViewContour: public manualViewBaseContour
 {
 public:
 	manualViewContour();
@@ -553,7 +569,7 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualViewRoi: public manualViewBaseContour
+class creaMaracasVisu_EXPORT manualViewRoi: public manualViewContour
 {
 public:
 	manualViewRoi();
@@ -579,7 +595,7 @@ private:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-class MARACASVISULIB_EXPORTS manualViewBullEyeSector: public manualViewBaseContour
+class creaMaracasVisu_EXPORT manualViewBullEyeSector: public manualViewContour
 {
 public:
 	manualViewBullEyeSector();
@@ -592,7 +608,7 @@ public:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 //EED004
-class MARACASVISULIB_EXPORTS manualViewBullEye: public manualViewRoi
+class creaMaracasVisu_EXPORT manualViewBullEye: public manualViewRoi
 {
 public:
 	manualViewBullEye();
@@ -625,7 +641,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // EED08
-class MARACASVISULIB_EXPORTS manualViewCircle: public manualViewContour
+class creaMaracasVisu_EXPORT manualViewCircle: public manualViewContour
 {
 public:
 	manualViewCircle();
@@ -635,8 +651,6 @@ public:
 	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,7 +691,8 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContourBaseControler: public InteractorStyleMaracas
+
+class creaMaracasVisu_EXPORT manualContourBaseControler: public InteractorStyleMaracas
 {
 public:
 	manualContourBaseControler();
@@ -751,7 +788,7 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContourControler: public manualContourBaseControler
+class creaMaracasVisu_EXPORT manualContourControler: public manualContourBaseControler
 {
 public:
 	manualContourControler();
@@ -780,7 +817,7 @@ private:
 
 
 
-class MARACASVISULIB_EXPORTS manualContour3VControler:  public manualContourControler
+class creaMaracasVisu_EXPORT manualContour3VControler:  public manualContourControler
 {
 public:
 	manualContour3VControler(int type);
@@ -824,7 +861,7 @@ private:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualContour3DControler:  public manualContourControler
+class creaMaracasVisu_EXPORT manualContour3DControler:  public manualContourControler
 {
 public:
 	manualContour3DControler();
@@ -853,7 +890,7 @@ private:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS manualContour3V3DControler: public manualContour3DControler
+class creaMaracasVisu_EXPORT manualContour3V3DControler: public manualContour3DControler
 {
 public:
 	manualContour3V3DControler();
@@ -882,7 +919,7 @@ private:
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-class MARACASVISULIB_EXPORTS manualContourPerpPlaneControler: public manualContourControler
+class creaMaracasVisu_EXPORT manualContourPerpPlaneControler: public manualContourControler
 {
 public:
 	manualContourPerpPlaneControler();
@@ -925,7 +962,7 @@ protected:
 // ----------------------------------------------------------------------------
 
 
-class MARACASVISULIB_EXPORTS manualRoiControler: public manualContourBaseControler
+class creaMaracasVisu_EXPORT manualRoiControler: public manualContourControler
 {
 public:
 	manualRoiControler();
@@ -950,7 +987,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // EED08
-class MARACASVISULIB_EXPORTS manualCircleControler: public manualContourControler
+class creaMaracasVisu_EXPORT manualCircleControler: public manualContourControler
 {
 public:
 	manualCircleControler();
@@ -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;
+};
+