X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FmanualContour.h;h=4b953a8edac7ff32d6e75e5acd42b377286c9879;hb=063777593408e340c3fb5f0aa9b584c3371ca65d;hp=6cb157a8a10b91eda64ebf103e30f6c457a56fc0;hpb=3e48d6cf83c4d96585d3e825899db643f9a62193;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
index 6cb157a..4b953a8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
@@ -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:
@@ -649,12 +665,41 @@ private:
 };
 
 
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+// AD:02-09
+class creaMaracasVisu_EXPORT manualViewLine: public manualViewContour
+{
+public:
+	manualViewLine();
+	virtual ~manualViewLine();
+
+	virtual int GetType();
+	virtual manualViewLine * Clone();
+	void CopyAttributesTo( manualViewLine *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);
+
+private:
+	double				_dp0[3];
+	double				_dp1[3];
+//	double				_dp2[3];
+//	double				_dp3[3];
+};
+
+
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
 
+
 class creaMaracasVisu_EXPORT manualContourBaseControler: public InteractorStyleMaracas
 {
 public:
@@ -971,6 +1016,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;
+};
+