0031990: Coding, Draw Harness - Replace C-like pointers to function in Draw_SaveAndRe...

[occt.git] / src / DrawTrSurf / DrawTrSurf_Curve2d.hxx

diff --git a/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx b/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
index ca86b47..7de035d 100644 (file)
--- a/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
+++ b/src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
@@ -17,100 +17,75 @@
 #ifndef _DrawTrSurf_Curve2d_HeaderFile
 #define _DrawTrSurf_Curve2d_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
 #include <Draw_Color.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Real.hxx>
 #include <DrawTrSurf_Drawable.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_OStream.hxx>
 #include <Draw_Interpretor.hxx>
+
 class Geom2d_Curve;
 class Draw_Color;
-class Draw_Display;
-class Draw_Drawable3D;
-
 
-class DrawTrSurf_Curve2d;
 DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
 
 //! This class defines a drawable curve in 2d space.
-//! The curve is drawned in the plane XOY.
+//! The curve is drawn in the plane XOY.
 class DrawTrSurf_Curve2d : public DrawTrSurf_Drawable
 {
-
+  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
+  Draw_Drawable3D_FACTORY
 public:
 
-  
-
   //! creates a drawable curve from a curve of package Geom2d.
-  Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, const Standard_Boolean DispOrigin = Standard_True);
-  
-  Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, const Draw_Color& aColor, const Standard_Integer Discret, const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False, const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1);
-  
-  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
-  
-    Handle(Geom2d_Curve) GetCurve() const;
-  
-    void SetColor (const Draw_Color& aColor);
-  
-    void ShowCurvature();
-  
-    void ClearCurvature();
-  
-    void SetRadiusMax (const Standard_Real Radius);
-  
-    void SetRadiusRatio (const Standard_Real Ratio);
-  
-    Draw_Color Color() const;
-  
-    Standard_Real RadiusMax() const;
-  
-    Standard_Real RadiusRatio() const;
-  
-  //! For variable copy.
-  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
-  
-  //! For variable dump.
-  Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
-  
-  //! Returns False.
-  Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE;
-  
-  //! For variable whatis command. Set  as a result  the
-  //! type of the variable.
-  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+  Standard_EXPORT DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C, const Standard_Boolean DispOrigin = Standard_True);
 
+  Standard_EXPORT DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C,
+                                      const Draw_Color& aColor, const Standard_Integer Discret,
+                                      const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False,
+                                      const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1);
 
+  Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
 
+  Handle(Geom2d_Curve) GetCurve() const { return curv; }
 
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d,DrawTrSurf_Drawable)
+  void SetColor (const Draw_Color& theColor) { look = theColor; }
 
-protected:
+  void ShowCurvature() { dispcurvradius = Standard_True; }
 
+  void ClearCurvature() { dispcurvradius = Standard_False; }
 
-  Handle(Geom2d_Curve) curv;
-  Draw_Color look;
-  Standard_Boolean disporigin;
-  Standard_Boolean dispcurvradius;
-  Standard_Real radiusmax;
-  Standard_Real radiusratio;
+  void SetRadiusMax (const Standard_Real theRadius) { radiusmax = theRadius; }
 
+  void SetRadiusRatio (const Standard_Real theRatio) { radiusratio = theRatio; }
 
-private:
+  Draw_Color Color() const { return look; }
 
+  Standard_Real RadiusMax() const { return radiusmax; }
 
+  Standard_Real RadiusRatio() const { return radiusratio; }
 
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
 
-};
+  //! For variable dump.
+  Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
 
+  //! Save drawable into stream.
+  Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
 
-#include <DrawTrSurf_Curve2d.lxx>
+  //! Returns False.
+  Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE;
 
+  //! For variable whatis command. Set as a result the type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
 
+protected:
 
+  Handle(Geom2d_Curve) curv;
+  Draw_Color look;
+  Standard_Boolean disporigin;
+  Standard_Boolean dispcurvradius;
+  Standard_Real radiusmax;
+  Standard_Real radiusratio;
 
+};
 
 #endif // _DrawTrSurf_Curve2d_HeaderFile