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=f4b62dc8bcdbb2850c20a0a4cd527c8c591a0829;hpb=4443a8fe2b4992b6abee8531917fd0803018fc12;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h index f4b62dc..2f3f778 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h @@ -569,7 +569,7 @@ private: // ---------------------------------------------------------------------------- -class creaMaracasVisu_EXPORT manualViewRoi: public manualViewBaseContour +class creaMaracasVisu_EXPORT manualViewRoi: public manualViewContour { public: manualViewRoi(); @@ -595,7 +595,7 @@ private: // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- -class creaMaracasVisu_EXPORT manualViewBullEyeSector: public manualViewBaseContour +class creaMaracasVisu_EXPORT manualViewBullEyeSector: public manualViewContour { public: manualViewBullEyeSector(); @@ -651,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); @@ -660,8 +658,6 @@ public: private: double _dp0[3]; double _dp1[3]; -// double _dp2[3]; -// double _dp3[3]; }; @@ -680,16 +676,12 @@ public: 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]; }; @@ -970,7 +962,7 @@ protected: // ---------------------------------------------------------------------------- -class creaMaracasVisu_EXPORT manualRoiControler: public manualContourBaseControler +class creaMaracasVisu_EXPORT manualRoiControler: public manualContourControler { public: manualRoiControler();