0024002: Overall code and build procedure refactoring -- automatic

Automatic upgrade of OCCT code by command "occt_upgrade . -nocdl":
- WOK-generated header files from inc and sources from drv are moved to src
- CDL files removed
- All packages are converted to nocdlpack

src/DrawTrSurf/DrawTrSurf.cdl

@@ -1,191 +0,0 @@
--- Created on: 1991-06-24
--- Created by: Christophe MARION
--- Copyright (c) 1991-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-package DrawTrSurf 
-
-	---Purpose: This  package supports the   display of parametric
-	--          curves and surfaces.
-	--          
-	--          The  Drawable deferred  classes is  inherited from
-	--          the Drawable3D  class  from  the package Draw,  it
-	--          adds methods to  draw 3D Curves  and  Curves on 3D
-	--          Surfaces.
-	--          
-	--          The classes Curve Curve2d and Surface are drawable
-	--          and  can be  used  to  draw a   single  curve from
-	--          packages Geom or Geom2d or a surface from Geom.
-	--          
-	--          The  Triangulation  and Polygon  from the  package
-	--          Poly are also supported.
-
-uses
-   MMgt,
-   TCollection,
-   TColStd,
-   Draw,
-   Adaptor3d,
-   Adaptor2d,
-   GeomAbs,
-   Geom,
-   Geom2d,
-   gp,
-   Poly
-
-is
-    
-   deferred class Drawable;
-   
-   class Point;
-   
-   class Curve;
-   
-      class BSplineCurve;
-      
-      class BezierCurve;
-      
-
-   class Curve2d;
-   
-      class BSplineCurve2d;
-      
-      class BezierCurve2d;
-
-   class Triangulation2D;
-
-   class Surface;
-
-      class BSplineSurface;
-
-      class BezierSurface;
-
-   class Triangulation;
-
-   class Polygon3D;
-
-   class Polygon2D;
-
-
-    --     
-    -- package methods to handle named points curves and surface.
-    -- 
-
-    Set(Name : CString; G : Pnt from gp);
-	---Purpose: Sets <G> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-    
-    Set(Name : CString; G : Pnt2d from gp);
-	---Purpose: Sets <G> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-    
-    Set(Name : CString; G : Geometry from Geom;
-        isSenseMarker : Boolean = Standard_True);
-	---Purpose: Sets <G> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-  --          isSenseMarker indicates whether to render the
-  --          sense glyph (arrow) for curves or not
-    ---C++: alias "template <class T> static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if<std::is_base_of<Geom_Geometry, T>::value>::type * = 0) { Set (Name, (const Handle(Geom_Geometry)&)Arg); };"
-    
-    Set(Name : CString; C : Curve from Geom2d;
-        isSenseMarker : Boolean = Standard_True);
-	---Purpose: Sets <C> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-  --          isSenseMarker indicates whether to render the
-  --          sense glyph (arrow) for curves or not
-	---C++: alias "template <class T> static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if<std::is_base_of<Geom2d_Curve, T>::value>::type * = 0) { Set (Name, (const Handle(Geom2d_Curve)&)Arg); }"
-    
-    Set(Name : CString; T : Triangulation from Poly);
-	---Purpose: Sets <T> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-    
-    Set(Name : CString; P : Polygon3D from Poly);
-	---Purpose: Sets <P> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-    
-    Set(Name : CString; P : Polygon2D from Poly);
-	---Purpose: Sets <P> in the variable <Name>.  Overwrite the
-	--          variable if already set.
-    
-    
-    -- if the variable name is a void string a graphic selection is made.
-    
-    Get(Name : in out CString) returns Geometry from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-
-    GetPoint(Name :  in out CString; P : in out Pnt from gp)
-    returns Boolean;
-	---Purpose: Gets the variable. Returns False if none and print
-	--          a warning message.
-    
-    GetPoint2d(Name :  in out CString; P : in out Pnt2d from gp)
-    returns Boolean;
-	---Purpose: Gets the variable. Returns False if none and print
-	--          a warning message.
-    
-    GetCurve(Name : in out CString) returns Curve from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetBezierCurve(Name :  in out CString) returns BezierCurve from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetBSplineCurve(Name :  in out CString) returns BSplineCurve from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetCurve2d(Name :   in out CString) returns Curve from Geom2d;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetBezierCurve2d(Name : in out CString) returns BezierCurve from Geom2d;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetBSplineCurve2d(Name : in out CString) returns BSplineCurve from Geom2d;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetSurface(Name : in out CString) returns Surface from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetBezierSurface(Name : in out CString) returns BezierSurface from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetBSplineSurface(Name : in out CString) returns BSplineSurface from Geom;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetTriangulation(Name : in out CString) returns Triangulation from  Poly;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetPolygon3D(Name : in out CString) returns Polygon3D from  Poly;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    GetPolygon2D(Name : in out CString) returns Polygon2D from  Poly;
-	---Purpose: Get  the variable <S>.  Returns a  null  handle if
-	--          none, and print a warning message.
-    
-    
-    
-    BasicCommands(I : in out Interpretor from Draw);
-	---Purpose: defines display commands.
-    
-end DrawTrSurf;

src/DrawTrSurf/DrawTrSurf.cxx

@@ -14,45 +14,50 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <Standard_Stream.hxx>
 
-#include <Draw_Color.hxx>
-#include <DrawTrSurf.ixx>
-#include <DrawTrSurf_Point.hxx>
-#include <DrawTrSurf_BezierSurface.hxx>
-#include <DrawTrSurf_BSplineSurface.hxx>
-#include <DrawTrSurf_BezierCurve.hxx>
-#include <DrawTrSurf_BSplineCurve.hxx>
-#include <DrawTrSurf_BezierCurve2d.hxx>
-#include <DrawTrSurf_BSplineCurve2d.hxx>
-#include <DrawTrSurf_Triangulation.hxx>
-#include <DrawTrSurf_Polygon3D.hxx>
-#include <DrawTrSurf_Polygon2D.hxx>
-#include <Draw_Appli.hxx>
 #include <Draw.hxx>
-
-#include <GeomTools_CurveSet.hxx>
-#include <GeomTools_Curve2dSet.hxx>
-#include <GeomTools_SurfaceSet.hxx>
-
-#include <gp_Pln.hxx>
-#include <gp_Ax2d.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Trsf2d.hxx>
-#include <Poly.hxx>
-#include <TCollection_AsciiString.hxx>
+#include <Draw_Appli.hxx>
+#include <Draw_Color.hxx>
+#include <DrawTrSurf.hxx>
+#include <DrawTrSurf_BezierCurve.hxx>
+#include <DrawTrSurf_BezierCurve2d.hxx>
+#include <DrawTrSurf_BezierSurface.hxx>
+#include <DrawTrSurf_BSplineCurve.hxx>
+#include <DrawTrSurf_BSplineCurve2d.hxx>
+#include <DrawTrSurf_BSplineSurface.hxx>
 #include <DrawTrSurf_Curve.hxx>
 #include <DrawTrSurf_Curve2d.hxx>
-#include <DrawTrSurf_Surface.hxx>
 #include <DrawTrSurf_Drawable.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_Surface.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineSurface.hxx>
+#include <DrawTrSurf_Point.hxx>
+#include <DrawTrSurf_Polygon2D.hxx>
+#include <DrawTrSurf_Polygon3D.hxx>
+#include <DrawTrSurf_Surface.hxx>
+#include <DrawTrSurf_Triangulation.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
+#include <Geom2d_Curve.hxx>
+#include <Geom_BezierCurve.hxx>
+#include <Geom_BezierSurface.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <Geom_BSplineSurface.hxx>
+#include <Geom_Curve.hxx>
+#include <Geom_Geometry.hxx>
+#include <Geom_Surface.hxx>
+#include <GeomTools_Curve2dSet.hxx>
+#include <GeomTools_CurveSet.hxx>
+#include <GeomTools_SurfaceSet.hxx>
+#include <gp_Ax2.hxx>
+#include <gp_Ax2d.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
+#include <gp_Trsf2d.hxx>
+#include <Poly.hxx>
+#include <Poly_Polygon2D.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <Poly_Triangulation.hxx>
+#include <Standard_Stream.hxx>
+#include <TCollection_AsciiString.hxx>
 
 static Draw_Color       PntColor(Draw_rouge);
 static Draw_Color       CurvColor(Draw_jaune);

src/DrawTrSurf/DrawTrSurf.hxx

@@ -0,0 +1,215 @@
+// Created on: 1991-06-24
+// Created by: Christophe MARION
+// Copyright (c) 1991-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_HeaderFile
+#define _DrawTrSurf_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_CString.hxx>
+#include <Standard_Boolean.hxx>
+#include <Draw_Interpretor.hxx>
+class gp_Pnt;
+class gp_Pnt2d;
+class Geom_Geometry;
+class Geom2d_Curve;
+class Poly_Triangulation;
+class Poly_Polygon3D;
+class Poly_Polygon2D;
+class Geom_Curve;
+class Geom_BezierCurve;
+class Geom_BSplineCurve;
+class Geom2d_BezierCurve;
+class Geom2d_BSplineCurve;
+class Geom_Surface;
+class Geom_BezierSurface;
+class Geom_BSplineSurface;
+class DrawTrSurf_Drawable;
+class DrawTrSurf_Point;
+class DrawTrSurf_Curve;
+class DrawTrSurf_BSplineCurve;
+class DrawTrSurf_BezierCurve;
+class DrawTrSurf_Curve2d;
+class DrawTrSurf_BSplineCurve2d;
+class DrawTrSurf_BezierCurve2d;
+class DrawTrSurf_Triangulation2D;
+class DrawTrSurf_Surface;
+class DrawTrSurf_BSplineSurface;
+class DrawTrSurf_BezierSurface;
+class DrawTrSurf_Triangulation;
+class DrawTrSurf_Polygon3D;
+class DrawTrSurf_Polygon2D;
+
+
+//! This  package supports the   display of parametric
+//! curves and surfaces.
+//!
+//! The  Drawable deferred  classes is  inherited from
+//! the Drawable3D  class  from  the package Draw,  it
+//! adds methods to  draw 3D Curves  and  Curves on 3D
+//! Surfaces.
+//!
+//! The classes Curve Curve2d and Surface are drawable
+//! and  can be  used  to  draw a   single  curve from
+//! packages Geom or Geom2d or a surface from Geom.
+//!
+//! The  Triangulation  and Polygon  from the  package
+//! Poly are also supported.
+class DrawTrSurf 
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+
+  
+  //! Sets <G> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  Standard_EXPORT static void Set (const Standard_CString Name, const gp_Pnt& G);
+  
+  //! Sets <G> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  Standard_EXPORT static void Set (const Standard_CString Name, const gp_Pnt2d& G);
+  
+  //! Sets <G> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  //! isSenseMarker indicates whether to render the
+  //! sense glyph (arrow) for curves or not
+  Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Geom_Geometry)& G, const Standard_Boolean isSenseMarker = Standard_True);
+template <class T> static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if<std::is_base_of<Geom_Geometry, T>::value>::type * = 0) { Set (Name, (const Handle(Geom_Geometry)&)Arg); };
+  
+  //! Sets <C> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  //! isSenseMarker indicates whether to render the
+  //! sense glyph (arrow) for curves or not
+  Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Geom2d_Curve)& C, const Standard_Boolean isSenseMarker = Standard_True);
+template <class T> static void Set (const Standard_CString Name, const Handle(T)& Arg, typename std::enable_if<std::is_base_of<Geom2d_Curve, T>::value>::type * = 0) { Set (Name, (const Handle(Geom2d_Curve)&)Arg); }
+  
+  //! Sets <T> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Poly_Triangulation)& T);
+  
+  //! Sets <P> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Poly_Polygon3D)& P);
+  
+  //! Sets <P> in the variable <Name>.  Overwrite the
+  //! variable if already set.
+  Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Poly_Polygon2D)& P);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_Geometry) Get (Standard_CString& Name);
+  
+  //! Gets the variable. Returns False if none and print
+  //! a warning message.
+  Standard_EXPORT static Standard_Boolean GetPoint (Standard_CString& Name, gp_Pnt& P);
+  
+  //! Gets the variable. Returns False if none and print
+  //! a warning message.
+  Standard_EXPORT static Standard_Boolean GetPoint2d (Standard_CString& Name, gp_Pnt2d& P);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_Curve) GetCurve (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_BezierCurve) GetBezierCurve (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_BSplineCurve) GetBSplineCurve (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom2d_Curve) GetCurve2d (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom2d_BezierCurve) GetBezierCurve2d (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom2d_BSplineCurve) GetBSplineCurve2d (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_Surface) GetSurface (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_BezierSurface) GetBezierSurface (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Geom_BSplineSurface) GetBSplineSurface (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Poly_Triangulation) GetTriangulation (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Poly_Polygon3D) GetPolygon3D (Standard_CString& Name);
+  
+  //! Get  the variable <S>.  Returns a  null  handle if
+  //! none, and print a warning message.
+  Standard_EXPORT static Handle(Poly_Polygon2D) GetPolygon2D (Standard_CString& Name);
+  
+  //! defines display commands.
+  Standard_EXPORT static void BasicCommands (Draw_Interpretor& I);
+
+
+
+
+protected:
+
+
+
+
+
+private:
+
+
+
+
+friend class DrawTrSurf_Drawable;
+friend class DrawTrSurf_Point;
+friend class DrawTrSurf_Curve;
+friend class DrawTrSurf_BSplineCurve;
+friend class DrawTrSurf_BezierCurve;
+friend class DrawTrSurf_Curve2d;
+friend class DrawTrSurf_BSplineCurve2d;
+friend class DrawTrSurf_BezierCurve2d;
+friend class DrawTrSurf_Triangulation2D;
+friend class DrawTrSurf_Surface;
+friend class DrawTrSurf_BSplineSurface;
+friend class DrawTrSurf_BezierSurface;
+friend class DrawTrSurf_Triangulation;
+friend class DrawTrSurf_Polygon3D;
+friend class DrawTrSurf_Polygon2D;
+
+};
+
+
+
+
+
+
+
+#endif // _DrawTrSurf_HeaderFile

src/DrawTrSurf/DrawTrSurf_BSplineCurve.cdl

@@ -1,147 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class BSplineCurve
-
-
-from DrawTrSurf
-
-
-inherits Curve from DrawTrSurf
-
-
-uses BSplineCurve from Geom,
-     Color from Draw,
-     MarkerShape from Draw,
-     Display from Draw,
-     Drawable3D from Draw
-
-
-is
-
-
-  Create (C : BSplineCurve from Geom)
-        --- Purpose :
-        --  creates a drawable BSpline curve from a BSpline curve of 
-        --  package Geom.
-     returns BSplineCurve from DrawTrSurf;
-
-
-
-  Create (C : BSplineCurve from Geom;
-          CurvColor, PolesColor, KnotsColor : Color from Draw;
-          KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
-          ShowPoles, ShowKnots : Boolean; Discret : Integer; Deflection : Real;
-          DrawMode : Integer)
-        --- Purpose :
-        --  creates a drawable BSpline curve from a BSpline curve of 
-        --  package Geom.
-     returns BSplineCurve from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw)
-     is redefined static;
-
-
-  DrawOn (me; dis : in out Display from Draw;
-          ShowPoles, ShowKnots : Boolean);
-
-
-  DrawOn (me; 
-          dis : in out Display from Draw; 
-          U1, U2 : Real; 
-          Pindex : Integer;
-          ShowPoles : Boolean = Standard_True;
-          ShowKnots : Boolean = Standard_True);
-
-
-  ShowPoles (me : mutable)
-     is static;
-
-
-  ShowKnots (me : mutable)
-     is static;
-     
-
-  ClearPoles (me : mutable)
-     is static;
-     
-  
-  ClearKnots (me : mutable)
-     is static;
-     
-
-  FindPole(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           Index : in out Integer)
-        --- Purpose :
-        --  Returns in <Index> the index of the first pole  of the
-        --  curve projected by the Display <D> at a distance lower
-        --  than <Prec> from <X,Y>. If no pole  is found  index is
-        --  set to 0, else index is always  greater than the input
-        --  value of index.
-  is static;
-  
-
-  FindKnot(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           Index : in out Integer)
-  is static;
-  
-
-  SetPolesColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-     
-
-  SetKnotsColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-     
-
-  SetKnotsShape (me : mutable; Shape : MarkerShape from Draw)
-        ---C++: inline
-     is static;
-     
-
-  KnotsShape (me)  returns MarkerShape from Draw
-        ---C++: inline
-     is static;
-     
-  
-  KnotsColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-     
-  
-  PolesColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-    
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;	
-    
-    
-fields
-
-  drawPoles  : Boolean;
-  drawKnots  : Boolean;
-  knotsForm  : MarkerShape from Draw;
-  knotsLook  : Color from Draw;
-  knotsDim   : Integer;
-  polesLook  : Color from Draw;
- 
-end BSplineCurve;
-

src/DrawTrSurf/DrawTrSurf_BSplineCurve.cxx

@@ -12,16 +12,18 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_BSplineCurve.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
 #include <Draw_MarkerShape.hxx>
+#include <DrawTrSurf_BSplineCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <gp_Pnt2d.hxx>
-
-
+#include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
-
 DrawTrSurf_BSplineCurve::DrawTrSurf_BSplineCurve (
    const Handle(Geom_BSplineCurve)& C) :
    DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1) {

src/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx

@@ -0,0 +1,124 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_BSplineCurve_HeaderFile
+#define _DrawTrSurf_BSplineCurve_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_MarkerShape.hxx>
+#include <Draw_Color.hxx>
+#include <Standard_Integer.hxx>
+#include <DrawTrSurf_Curve.hxx>
+#include <Standard_Real.hxx>
+class Geom_BSplineCurve;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_BSplineCurve;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
+
+
+class DrawTrSurf_BSplineCurve : public DrawTrSurf_Curve
+{
+
+public:
+
+  
+
+  //! creates a drawable BSpline curve from a BSpline curve of
+  //! package Geom.
+  Standard_EXPORT DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C);
+  
+
+  //! creates a drawable BSpline curve from a BSpline curve of
+  //! package Geom.
+  Standard_EXPORT DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots) const;
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Real U1, const Standard_Real U2, const Standard_Integer Pindex, const Standard_Boolean ShowPoles = Standard_True, const Standard_Boolean ShowKnots = Standard_True) const;
+  
+  Standard_EXPORT void ShowPoles();
+  
+  Standard_EXPORT void ShowKnots();
+  
+  Standard_EXPORT void ClearPoles();
+  
+  Standard_EXPORT void ClearKnots();
+  
+
+  //! Returns in <Index> the index of the first pole  of the
+  //! curve projected by the Display <D> at a distance lower
+  //! than <Prec> from <X,Y>. If no pole  is found  index is
+  //! set to 0, else index is always  greater than the input
+  //! value of index.
+  Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
+  
+  Standard_EXPORT void FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
+  
+    void SetPolesColor (const Draw_Color& aColor);
+  
+    void SetKnotsColor (const Draw_Color& aColor);
+  
+    void SetKnotsShape (const Draw_MarkerShape Shape);
+  
+    Draw_MarkerShape KnotsShape() const;
+  
+    Draw_Color KnotsColor() const;
+  
+    Draw_Color PolesColor() const;
+  
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_BSplineCurve,DrawTrSurf_Curve)
+
+protected:
+
+
+
+
+private:
+
+
+  Standard_Boolean drawPoles;
+  Standard_Boolean drawKnots;
+  Draw_MarkerShape knotsForm;
+  Draw_Color knotsLook;
+  Standard_Integer knotsDim;
+  Draw_Color polesLook;
+
+
+};
+
+
+#include <DrawTrSurf_BSplineCurve.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_BSplineCurve_HeaderFile

src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cdl

@@ -1,116 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class BSplineCurve2d
-
-
-from DrawTrSurf
-
-
-inherits Curve2d from DrawTrSurf
-
-
-uses BSplineCurve from Geom2d,
-     Color from Draw,
-     MarkerShape from Draw,
-     Display from Draw,
-     Drawable3D from Draw
-
-
-is
-
-
-  Create (C : BSplineCurve from Geom2d)
-        --- Purpose :
-        --  creates a drawable BSpline curve from a BSpline curve of 
-        --  package Geom2d.
-     returns BSplineCurve2d from DrawTrSurf;
-
-
-  Create (C : BSplineCurve from Geom2d;
-          CurvColor, PolesColor, KnotsColor : Color from Draw;
-          KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
-          ShowPoles, ShowKnots : Boolean; Discret : Integer)
-     returns BSplineCurve2d from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw)
-     is redefined static;
-
-  ShowPoles (me : mutable)
-     is static;
-
-  ShowKnots (me : mutable)
-     is static;
-     
-  ClearPoles (me : mutable)
-     is static;
-  
-  ClearKnots (me : mutable)
-     is static;
-
-  FindPole(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           Index : in out Integer)
-    ---Purpose: Returns in <Index> the index of the first pole  of the
-    --          curve projected by the Display <D> at a distance lower
-    --          than <Prec> from <X,Y>. If no pole  is found  index is
-    --          set to 0, else index is always  greater than the input
-    --          value of index.
-  is static;
-
-  FindKnot(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           Index : in out Integer)
-  is static;
-
-  SetPolesColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-  SetKnotsColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-  SetKnotsShape (me : mutable; Shape : MarkerShape from Draw)
-        ---C++: inline
-     is static;
-
-  KnotsShape (me)  returns MarkerShape from Draw
-        ---C++: inline
-     is static;
-  
-  KnotsColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-  
-  PolesColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-    
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-      
-fields
-
-  drawPoles  : Boolean;
-  drawKnots  : Boolean;
-  knotsForm  : MarkerShape from Draw;
-  knotsLook  : Color from Draw;
-  knotsDim   : Integer;
-  polesLook  : Color from Draw;
-
-end BSplineCurve2d;

src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cxx

@@ -12,14 +12,18 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_BSplineCurve2d.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
 #include <Draw_MarkerShape.hxx>
+#include <DrawTrSurf_BSplineCurve2d.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <gp_Pnt.hxx>
+#include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
-
 DrawTrSurf_BSplineCurve2d::DrawTrSurf_BSplineCurve2d (
    const Handle(Geom2d_BSplineCurve)& C) 
    : DrawTrSurf_Curve2d (C, Draw_vert, 100) {

src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx

@@ -0,0 +1,116 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_BSplineCurve2d_HeaderFile
+#define _DrawTrSurf_BSplineCurve2d_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_MarkerShape.hxx>
+#include <Draw_Color.hxx>
+#include <Standard_Integer.hxx>
+#include <DrawTrSurf_Curve2d.hxx>
+#include <Standard_Real.hxx>
+class Geom2d_BSplineCurve;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_BSplineCurve2d;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
+
+
+class DrawTrSurf_BSplineCurve2d : public DrawTrSurf_Curve2d
+{
+
+public:
+
+  
+
+  //! creates a drawable BSpline curve from a BSpline curve of
+  //! package Geom2d.
+  Standard_EXPORT DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C);
+  
+  Standard_EXPORT DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+  
+  Standard_EXPORT void ShowPoles();
+  
+  Standard_EXPORT void ShowKnots();
+  
+  Standard_EXPORT void ClearPoles();
+  
+  Standard_EXPORT void ClearKnots();
+  
+  //! Returns in <Index> the index of the first pole  of the
+  //! curve projected by the Display <D> at a distance lower
+  //! than <Prec> from <X,Y>. If no pole  is found  index is
+  //! set to 0, else index is always  greater than the input
+  //! value of index.
+  Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
+  
+  Standard_EXPORT void FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
+  
+    void SetPolesColor (const Draw_Color& aColor);
+  
+    void SetKnotsColor (const Draw_Color& aColor);
+  
+    void SetKnotsShape (const Draw_MarkerShape Shape);
+  
+    Draw_MarkerShape KnotsShape() const;
+  
+    Draw_Color KnotsColor() const;
+  
+    Draw_Color PolesColor() const;
+  
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_BSplineCurve2d,DrawTrSurf_Curve2d)
+
+protected:
+
+
+
+
+private:
+
+
+  Standard_Boolean drawPoles;
+  Standard_Boolean drawKnots;
+  Draw_MarkerShape knotsForm;
+  Draw_Color knotsLook;
+  Standard_Integer knotsDim;
+  Draw_Color polesLook;
+
+
+};
+
+
+#include <DrawTrSurf_BSplineCurve2d.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_BSplineCurve2d_HeaderFile

src/DrawTrSurf/DrawTrSurf_BSplineSurface.cdl

@@ -1,165 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class BSplineSurface  from DrawTrSurf 
-
-inherits Surface from DrawTrSurf
-
-        --- Purpose :
-        --  This class defines a drawable BSplineSurface. 
-        --  With this class you can draw the control points and the knots 
-        --  of the surface.
-        --  You can use the general class Surface from DrawTrSurf too,
-        --  if you just want to sea boundaries and isoparametric curves.
-
-uses BSplineSurface from Geom,
-     Color from Draw,
-     MarkerShape from Draw,
-     Display from Draw,
-     Drawable3D from Draw
-
-is
-
-
-
-  Create (S : BSplineSurface from Geom)
-     returns BSplineSurface from DrawTrSurf;
-        --- Purpose : default drawing mode.
-        --  The isoparametric curves corresponding to the knots values are 
-        --  drawn.
-        --  The control points and the knots points are drawn.
-        --  The boundaries are yellow, the isoparametric curves are blues.
-        --  For the discretisation 50 points are computed in each parametric
-        --  direction.
-
-
-  Create (S : BSplineSurface from Geom;
-          BoundsColor, IsosColor, PolesColor, KnotsColor : Color from Draw;
-          KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
-          ShowPoles, ShowKnots : Boolean; Discret : Integer; Deflection : Real;
-          DrawMode : Integer)
-     returns BSplineSurface from DrawTrSurf;
-        --- Purpose :
-        --  The isoparametric curves corresponding to the knots values are 
-        --  drawn.
-
-
-
-  Create (S : BSplineSurface from Geom;
-          NbUIsos, NbVIsos : Integer;
-          BoundsColor, IsosColor, PolesColor, KnotsColor : Color from Draw;
-          KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
-          ShowPoles, ShowKnots : Boolean; Discret : Integer; Deflection : Real;
-          DrawMode : Integer)
-     returns BSplineSurface from DrawTrSurf;
-	--- Purpose : Parametric equidistant iso curves are drawn.
-
-
-  DrawOn (me; dis : in out Display from Draw)
-     is redefined static;
-
-
-  ShowPoles  (me : mutable)
-     is static;
-
-
-  ShowKnots  (me : mutable)
-     is static;
-
-
-  ShowIsos (me : mutable; Nu, Nv : Integer)
-        --- Purpose : change the number of isoparametric curves to be drawn.
-     is redefined;
-
-
-  ShowKnotsIsos (me : mutable)
-        --- Purpose : change the number of isoparametric curves to be drawn.
-     is static;
-
-
-  ClearIsos (me : mutable)
-        --- Purpose : rub out all the isoparametric curves.
-     is redefined;
-     
-
-  ClearPoles (me : mutable)
-     is static;
-  
-
-  ClearKnots (me : mutable)
-     is static;
-
-
-  FindPole(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-            UIndex, VIndex : in out Integer)
-  is static;
-  
-
-  FindUKnot(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-            UIndex : in out Integer)
-  is static;
-
-
-  FindVKnot(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-            VIndex : in out Integer)
-  is static;
-
-
-  SetPolesColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-
-  SetKnotsColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-
-  SetKnotsShape (me : mutable; Shape : MarkerShape from Draw)
-        ---C++: inline
-     is static;
-
-
-  KnotsShape (me)  returns MarkerShape from Draw
-        ---C++: inline
-     is static;
-  
-
-  KnotsColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-  
-
-  PolesColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-    
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-	
-
-fields
-
-  drawPoles   : Boolean;
-  drawKnots   : Boolean;
-  knotsIsos   : Boolean;
-  knotsForm   : MarkerShape from Draw;
-  knotsLook   : Color from Draw;
-  knotsDim    : Integer;
-  polesLook   : Color from Draw;
-
-end BSplineSurface;

src/DrawTrSurf/DrawTrSurf_BSplineSurface.cxx

@@ -12,20 +12,22 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_BSplineSurface.ixx>
-#include <DrawTrSurf_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
+
+#include <Adaptor3d_IsoCurve.hxx>
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
 #include <Draw_MarkerShape.hxx>
+#include <DrawTrSurf_BSplineCurve.hxx>
+#include <DrawTrSurf_BSplineSurface.hxx>
+#include <Geom_BSplineSurface.hxx>
 #include <GeomAdaptor_HSurface.hxx>
 #include <GeomAdaptor_Surface.hxx>
-#include <Adaptor3d_IsoCurve.hxx>
 #include <gp_Pnt2d.hxx>
-
+#include <Standard_Type.hxx>
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
-
-
 DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (
    const Handle(Geom_BSplineSurface)& S)
    : DrawTrSurf_Surface (S, S->NbUKnots()-2, S->NbVKnots()-2, 

src/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx

@@ -0,0 +1,138 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_BSplineSurface_HeaderFile
+#define _DrawTrSurf_BSplineSurface_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_MarkerShape.hxx>
+#include <Draw_Color.hxx>
+#include <Standard_Integer.hxx>
+#include <DrawTrSurf_Surface.hxx>
+#include <Standard_Real.hxx>
+class Geom_BSplineSurface;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_BSplineSurface;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
+
+
+//! This class defines a drawable BSplineSurface.
+//! With this class you can draw the control points and the knots
+//! of the surface.
+//! You can use the general class Surface from DrawTrSurf too,
+//! if you just want to sea boundaries and isoparametric curves.
+class DrawTrSurf_BSplineSurface : public DrawTrSurf_Surface
+{
+
+public:
+
+  
+  //! default drawing mode.
+  //! The isoparametric curves corresponding to the knots values are
+  //! drawn.
+  //! The control points and the knots points are drawn.
+  //! The boundaries are yellow, the isoparametric curves are blues.
+  //! For the discretisation 50 points are computed in each parametric
+  //! direction.
+  Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S);
+  
+
+  //! The isoparametric curves corresponding to the knots values are
+  //! drawn.
+  Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
+  
+  //! Parametric equidistant iso curves are drawn.
+  Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S, const Standard_Integer NbUIsos, const Standard_Integer NbVIsos, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+  
+  Standard_EXPORT void ShowPoles();
+  
+  Standard_EXPORT void ShowKnots();
+  
+  //! change the number of isoparametric curves to be drawn.
+  Standard_EXPORT virtual void ShowIsos (const Standard_Integer Nu, const Standard_Integer Nv) Standard_OVERRIDE;
+  
+  //! change the number of isoparametric curves to be drawn.
+  Standard_EXPORT void ShowKnotsIsos();
+  
+  //! rub out all the isoparametric curves.
+  Standard_EXPORT virtual void ClearIsos() Standard_OVERRIDE;
+  
+  Standard_EXPORT void ClearPoles();
+  
+  Standard_EXPORT void ClearKnots();
+  
+  Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex, Standard_Integer& VIndex) const;
+  
+  Standard_EXPORT void FindUKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex) const;
+  
+  Standard_EXPORT void FindVKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& VIndex) const;
+  
+    void SetPolesColor (const Draw_Color& aColor);
+  
+    void SetKnotsColor (const Draw_Color& aColor);
+  
+    void SetKnotsShape (const Draw_MarkerShape Shape);
+  
+    Draw_MarkerShape KnotsShape() const;
+  
+    Draw_Color KnotsColor() const;
+  
+    Draw_Color PolesColor() const;
+  
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_BSplineSurface,DrawTrSurf_Surface)
+
+protected:
+
+
+
+
+private:
+
+
+  Standard_Boolean drawPoles;
+  Standard_Boolean drawKnots;
+  Standard_Boolean knotsIsos;
+  Draw_MarkerShape knotsForm;
+  Draw_Color knotsLook;
+  Standard_Integer knotsDim;
+  Draw_Color polesLook;
+
+
+};
+
+
+#include <DrawTrSurf_BSplineSurface.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_BSplineSurface_HeaderFile

src/DrawTrSurf/DrawTrSurf_BezierCurve.cdl

@@ -1,91 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class BezierCurve
-
-
-from DrawTrSurf
-
-
-inherits Curve from DrawTrSurf
-
-
-uses BezierCurve from Geom,
-     Color from Draw,
-     Display from Draw,
-     Drawable3D from Draw
-
-
-is
-
-
-  Create (C : BezierCurve from Geom)
-        --- Purpose :
-        --  creates a drawable Bezier curve from a Bezier curve of 
-        --  package Geom.
-     returns BezierCurve from DrawTrSurf;
-
-
-  Create (C : BezierCurve from Geom;
-          CurvColor, PolesColor : Color from Draw;
-          ShowPoles : Boolean; Discret : Integer;Deflection : Real;
-          DrawMode : Integer)
-     returns BezierCurve from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw)
-     is redefined static;
-
-
-  ShowPoles (me : mutable)
-     is static;
-
-
-  ClearPoles (me : mutable)
-     is static;
-     
-  
-  FindPole(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           Index : in out Integer)
-        --- Purpose :
-        --  Returns in <Index> the index of the first pole  of the
-        --  curve projected by the Display <D> at a distance lower
-        --  than <Prec> from <X,Y>. If no pole  is found  index is
-        --  set to 0, else index is always  greater than the input
-        --  value of index.
-  is static;
-
-
-  SetPolesColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-     
-
-  PolesColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-    
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-      
-fields
-
-  drawPoles  : Boolean;
-  polesLook  : Color from Draw;
-
-end BezierCurve;

src/DrawTrSurf/DrawTrSurf_BezierCurve.cxx

@@ -12,9 +12,14 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_BezierCurve.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_BezierCurve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <gp_Pnt2d.hxx>
+#include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 

src/DrawTrSurf/DrawTrSurf_BezierCurve.hxx

@@ -0,0 +1,98 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_BezierCurve_HeaderFile
+#define _DrawTrSurf_BezierCurve_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_Color.hxx>
+#include <DrawTrSurf_Curve.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+class Geom_BezierCurve;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_BezierCurve;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
+
+
+class DrawTrSurf_BezierCurve : public DrawTrSurf_Curve
+{
+
+public:
+
+  
+
+  //! creates a drawable Bezier curve from a Bezier curve of
+  //! package Geom.
+  Standard_EXPORT DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C);
+  
+  Standard_EXPORT DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+  
+  Standard_EXPORT void ShowPoles();
+  
+  Standard_EXPORT void ClearPoles();
+  
+
+  //! Returns in <Index> the index of the first pole  of the
+  //! curve projected by the Display <D> at a distance lower
+  //! than <Prec> from <X,Y>. If no pole  is found  index is
+  //! set to 0, else index is always  greater than the input
+  //! value of index.
+  Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
+  
+    void SetPolesColor (const Draw_Color& aColor);
+  
+    Draw_Color PolesColor() const;
+  
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_BezierCurve,DrawTrSurf_Curve)
+
+protected:
+
+
+
+
+private:
+
+
+  Standard_Boolean drawPoles;
+  Draw_Color polesLook;
+
+
+};
+
+
+#include <DrawTrSurf_BezierCurve.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_BezierCurve_HeaderFile

src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cdl

@@ -1,89 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class BezierCurve2d
-
-
-from DrawTrSurf
-
-
-inherits Curve2d from DrawTrSurf
-
-
-uses BezierCurve from Geom2d,
-     Color from Draw,
-     Display from Draw,
-     Drawable3D from Draw
-
-
-is
-
-
-  Create (C : BezierCurve from Geom2d)
-        --- Purpose :
-        --  creates a drawable Bezier curve from a Bezier curve of 
-        --  package Geom2d.
-     returns BezierCurve2d from DrawTrSurf;
-
-
-  Create (C : BezierCurve from Geom2d;
-          CurvColor, PolesColor : Color from Draw;
-          ShowPoles : Boolean; Discret : Integer)
-     returns BezierCurve2d from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw)
-     is redefined static;
-
-
-  ShowPoles (me : mutable)
-     is static;
-
-
-  ClearPoles (me : mutable)
-     is static;
-     
-  
-  FindPole(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           Index : in out Integer)
-        --- Purpose :
-        --  Returns in <Index> the index of the first pole  of the
-        --  curve projected by the Display <D> at a distance lower
-        --  than <Prec> from <X,Y>. If no pole  is found  index is
-        --  set to 0, else index is always  greater than the input
-        --  value of index.
-  is static;
-  
-  
-  SetPolesColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-  PolesColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-    
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-      
-fields
-
-  drawPoles  : Boolean;
-  polesLook  : Color from Draw;
-
-end BezierCurve2d;

src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cxx

@@ -12,14 +12,17 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_BezierCurve2d.ixx>
 
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_BezierCurve2d.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <gp_Pnt.hxx>
+#include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
 #include <TColStd_Array1OfReal.hxx>
 
-
 DrawTrSurf_BezierCurve2d::DrawTrSurf_BezierCurve2d (
    const Handle(Geom2d_BezierCurve)& C) :
    DrawTrSurf_Curve2d (C, Draw_vert, 50) {

src/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx

@@ -0,0 +1,98 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_BezierCurve2d_HeaderFile
+#define _DrawTrSurf_BezierCurve2d_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_Color.hxx>
+#include <DrawTrSurf_Curve2d.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+class Geom2d_BezierCurve;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_BezierCurve2d;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
+
+
+class DrawTrSurf_BezierCurve2d : public DrawTrSurf_Curve2d
+{
+
+public:
+
+  
+
+  //! creates a drawable Bezier curve from a Bezier curve of
+  //! package Geom2d.
+  Standard_EXPORT DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C);
+  
+  Standard_EXPORT DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+  
+  Standard_EXPORT void ShowPoles();
+  
+  Standard_EXPORT void ClearPoles();
+  
+
+  //! Returns in <Index> the index of the first pole  of the
+  //! curve projected by the Display <D> at a distance lower
+  //! than <Prec> from <X,Y>. If no pole  is found  index is
+  //! set to 0, else index is always  greater than the input
+  //! value of index.
+  Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
+  
+    void SetPolesColor (const Draw_Color& aColor);
+  
+    Draw_Color PolesColor() const;
+  
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_BezierCurve2d,DrawTrSurf_Curve2d)
+
+protected:
+
+
+
+
+private:
+
+
+  Standard_Boolean drawPoles;
+  Draw_Color polesLook;
+
+
+};
+
+
+#include <DrawTrSurf_BezierCurve2d.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_BezierCurve2d_HeaderFile

src/DrawTrSurf/DrawTrSurf_BezierSurface.cdl

@@ -1,84 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class BezierSurface 
-
-from DrawTrSurf
-
-inherits Surface from DrawTrSurf
-
-uses BezierSurface from Geom,
-     Color from Draw,
-     MarkerShape from Draw,
-     Display from Draw,
-     Drawable3D from Draw
-
-is
-
-
-  Create (S : BezierSurface from Geom)
-        --- Purpose :
-        --  creates a drawable Bezier curve from a Bezier curve of 
-        --  package Geom.
-     returns BezierSurface from DrawTrSurf;
-
-
-
-  Create (S : BezierSurface from Geom;
-          NbUIsos, NbVIsos : Integer;
-          BoundsColor, IsosColor, PolesColor : Color from Draw;
-          ShowPoles : Boolean; Discret : Integer;Deflection : Real;
-          DrawMode : Integer)
-     returns BezierSurface from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw)
-     is redefined static;
-
-
-  ShowPoles  (me : mutable)
-     is static;
-
-
-  ClearPoles (me : mutable)
-     is static;
-  
-
-  FindPole(me; X,Y : Real; D : Display from Draw; Prec : Real; 
-           UIndex, VIndex : in out Integer)
-  is static;
-  
-
-  SetPolesColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-
-  PolesColor (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-    
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-  
-fields
-
-  drawPoles   : Boolean;
-  polesLook  : Color from Draw;
-
-end BezierSurface;

src/DrawTrSurf/DrawTrSurf_BezierSurface.cxx

@@ -12,10 +12,15 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_BezierSurface.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
 #include <DrawTrSurf_BezierCurve.hxx>
+#include <DrawTrSurf_BezierSurface.hxx>
 #include <Geom_BezierSurface.hxx>
 #include <gp_Pnt2d.hxx>
+#include <Standard_Type.hxx>
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColStd_Array1OfReal.hxx>
 

src/DrawTrSurf/DrawTrSurf_BezierSurface.hxx

@@ -0,0 +1,92 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_BezierSurface_HeaderFile
+#define _DrawTrSurf_BezierSurface_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_Color.hxx>
+#include <DrawTrSurf_Surface.hxx>
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+class Geom_BezierSurface;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_BezierSurface;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
+
+
+class DrawTrSurf_BezierSurface : public DrawTrSurf_Surface
+{
+
+public:
+
+  
+
+  //! creates a drawable Bezier curve from a Bezier curve of
+  //! package Geom.
+  Standard_EXPORT DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S);
+  
+  Standard_EXPORT DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S, const Standard_Integer NbUIsos, const Standard_Integer NbVIsos, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
+  
+  Standard_EXPORT void ShowPoles();
+  
+  Standard_EXPORT void ClearPoles();
+  
+  Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex, Standard_Integer& VIndex) const;
+  
+    void SetPolesColor (const Draw_Color& aColor);
+  
+    Draw_Color PolesColor() const;
+  
+  //! For variable copy.
+  Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_BezierSurface,DrawTrSurf_Surface)
+
+protected:
+
+
+
+
+private:
+
+
+  Standard_Boolean drawPoles;
+  Draw_Color polesLook;
+
+
+};
+
+
+#include <DrawTrSurf_BezierSurface.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_BezierSurface_HeaderFile

src/DrawTrSurf/DrawTrSurf_Curve.cdl

@@ -1,119 +0,0 @@
--- Created on: 1992-05-21
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Curve from DrawTrSurf
-
-inherits Drawable 
-   
-        --- Purpose :
-        --  This class defines a drawable curve in 3d space.
-
-uses Curve from Geom,
-     Color from Draw,
-     Display from Draw,
-     Drawable3D from Draw,
-     Interpretor from Draw,
-     OStream
-
-is
-
-
-
-
-  Create (C : Curve from Geom; DispOrigin : Boolean from Standard = Standard_True)
-        --- Purpose :
-        --  creates a drawable curve from a curve of package Geom.
-     returns Curve from DrawTrSurf;
-
-
-  Create (C : Curve from Geom; aColor : Color from Draw; Discret : Integer;
-          Deflection : Real; DrawMode : Integer;
-    	  DispOrigin : Boolean from Standard = Standard_True;
-          DispCurvRadius : Boolean  = Standard_False;
-          RadiusMax : Real = 1.0e3;
-	  RatioOfRadius : Real = 0.1)
-     returns Curve from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw);
-     
-
-  GetCurve (me) returns any Curve from Geom
-  ---C++: inline
-  is static;
-
-  SetColor(me : mutable; aColor : Color from Draw)
-  ---C++: inline
-  is static;
-
-  DisplayOrigin(me) returns Boolean
-  ---C++: inline
-  is static;
-    
-  DisplayOrigin(me : mutable; V : Boolean)
-  ---C++: inline
-  is static;
-    
-  ShowCurvature(me : mutable)
-        ---C++: inline
-     is static;
-     
-  ClearCurvature(me : mutable)
-        ---C++: inline
-     is static;
-  
-  SetRadiusMax(me : mutable; Radius : Real)
-        ---C++: inline
-     is static;
-     
-  SetRadiusRatio(me : mutable;  Ratio : Real)
-        ---C++: inline
-     is static;
-  Color (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-     
-  RadiusMax(me)  returns Real
-        ---C++: inline
-     is static;
-     
-  RadiusRatio(me)  returns Real
-        ---C++: inline
-     is static;   
-     
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-  Dump(me; S : in out OStream)
-	---Purpose: For variable dump.
-  is redefined;
-
-    Whatis(me; I : in out Interpretor from Draw)
-    is redefined;
-	---Purpose: For variable whatis command. Set  as a result  the
-	--          type of the variable.
-
-fields
-
-  curv       : Curve   from Geom     is protected ;
-  look       : Color   from Draw     is protected ;
-  disporigin : Boolean from Standard is protected ;
-  dispcurvradius : Boolean from Standard is protected ;
-  radiusmax      : Real from  Standard is protected ;
-  radiusratio    : Real from  Standard is protected ;  
-
-end Curve;

src/DrawTrSurf/DrawTrSurf_Curve.cxx

@@ -12,18 +12,23 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Curve.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_Curve.hxx>
+#include <Geom_Curve.hxx>
 #include <GeomAdaptor_Curve.hxx>
-#include <GeomTools_CurveSet.hxx>
 #include <GeomLProp_CLProps.hxx>
-#include <Precision.hxx>
+#include <GeomTools_CurveSet.hxx>
 #include <gp.hxx>
-#include <gp_Pnt2d.hxx>
 #include <gp_Dir2d.hxx>
+#include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
+#include <Precision.hxx>
+#include <Standard_Type.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <Geom_Curve.hxx>
 
 Standard_Real DrawTrSurf_CurveLimit = 400;
 extern Standard_Boolean Draw_Bounds;

src/DrawTrSurf/DrawTrSurf_Curve.hxx

@@ -0,0 +1,117 @@
+// Created on: 1992-05-21
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Curve_HeaderFile
+#define _DrawTrSurf_Curve_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 Geom_Curve;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Curve;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve, DrawTrSurf_Drawable)
+
+
+//! This class defines a drawable curve in 3d space.
+class DrawTrSurf_Curve : public DrawTrSurf_Drawable
+{
+
+public:
+
+  
+
+  //! creates a drawable curve from a curve of package Geom.
+  Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, const Standard_Boolean DispOrigin = Standard_True);
+  
+  Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, const Draw_Color& aColor, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode, 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;
+  
+    Handle(Geom_Curve) GetCurve() const;
+  
+    void SetColor (const Draw_Color& aColor);
+  
+    Standard_Boolean DisplayOrigin() const;
+  
+    void DisplayOrigin (const Standard_Boolean V);
+  
+    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;
+  
+  //! For variable whatis command. Set  as a result  the
+  //! type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Curve,DrawTrSurf_Drawable)
+
+protected:
+
+
+  Handle(Geom_Curve) curv;
+  Draw_Color look;
+  Standard_Boolean disporigin;
+  Standard_Boolean dispcurvradius;
+  Standard_Real radiusmax;
+  Standard_Real radiusratio;
+
+
+private:
+
+
+
+
+};
+
+
+#include <DrawTrSurf_Curve.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_Curve_HeaderFile

src/DrawTrSurf/DrawTrSurf_Curve2d.cdl

@@ -1,122 +0,0 @@
--- Created on: 1992-05-22
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
--- Modified     PMN CurvatureRadius added
-
-
-
-class Curve2d  from DrawTrSurf
-	
-inherits Drawable  
-
-        --- Purpose : This class defines a drawable curve in 2d space.
-        --  The curve is drawned in the plane XOY. 
-
-uses Curve       from Geom2d,
-     Color       from Draw,
-     Display     from Draw,
-     Drawable3D  from Draw,
-     Interpretor from Draw,
-     OStream
-
-
-is
-
-
-
-
-
-  Create (C : Curve from Geom2d; 
-          DispOrigin : Boolean from Standard = Standard_True)
-        --- Purpose :
-        --  creates a drawable curve from a curve of package Geom2d.
-     returns Curve2d from DrawTrSurf;
-
-
-  Create (C : Curve from Geom2d; aColor : Color from Draw; Discret :Integer;
-    	  DispOrigin : Boolean from Standard = Standard_True;
-          DispCurvRadius : Boolean  = Standard_False;
-          RadiusMax : Real = 1.0e3;
-	  RatioOfRadius : Real = 0.1)
-     returns Curve2d from DrawTrSurf;
-
-
-  DrawOn (me; dis : in out Display from Draw);
-     
-
-  GetCurve (me) returns any Curve from Geom2d
-        ---C++: inline
-     is static;
-
-
-  SetColor(me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-     
-  ShowCurvature(me : mutable)
-        ---C++: inline
-     is static;
-     
-  ClearCurvature(me : mutable)
-        ---C++: inline
-     is static;
-  
-  SetRadiusMax(me : mutable; Radius : Real)
-        ---C++: inline
-     is static;
-     
-  SetRadiusRatio(me : mutable;  Ratio : Real)
-        ---C++: inline
-     is static;   
-
-  Color (me)  returns Color from Draw
-        ---C++: inline
-     is static;
-     
-  RadiusMax(me)  returns Real
-        ---C++: inline
-     is static;
-     
-  RadiusRatio(me)  returns Real
-        ---C++: inline
-     is static;     
-     
- 
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-	
-  Dump(me; S : in out OStream)
-	---Purpose: For variable dump.
-  is redefined;
-  
-  Is3D(me) returns Boolean
-    	---Purpose: Returns False.
-  is redefined;
-
-  Whatis(me; I : in out Interpretor from Draw)
-  is redefined;
-	---Purpose: For variable whatis command. Set  as a result  the
-	--          type of the variable.
-
-fields
-  curv       : Curve   from Geom2d   is protected ;
-  look       : Color   from Draw     is protected ;
-  disporigin : Boolean from Standard is protected ;
-  dispcurvradius : Boolean from Standard is protected ;
-  radiusmax      : Real from  Standard is protected ;
-  radiusratio    : Real from  Standard is protected ;
-end Curve2d;

src/DrawTrSurf/DrawTrSurf_Curve2d.cxx

@@ -12,19 +12,24 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Curve2d.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_Curve2d.hxx>
 #include <Geom2d_Curve.hxx>
-#include <Geom2d_OffsetCurve.hxx>
-#include <Geom2d_Line.hxx>
-#include <Geom2d_Parabola.hxx>
 #include <Geom2d_Hyperbola.hxx>
+#include <Geom2d_Line.hxx>
+#include <Geom2d_OffsetCurve.hxx>
+#include <Geom2d_Parabola.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
+#include <Geom2dLProp_CLProps2d.hxx>
 #include <Geom_Plane.hxx>
 #include <GeomTools_Curve2dSet.hxx>
-#include <Geom2dLProp_CLProps2d.hxx>
 #include <gp.hxx>
-#include <TColStd_Array1OfReal.hxx>
 #include <Precision.hxx>
+#include <Standard_Type.hxx>
+#include <TColStd_Array1OfReal.hxx>
 
 static Standard_Real DrawTrSurf_CurveLimit = 400;
 extern Standard_Boolean Draw_Bounds;

src/DrawTrSurf/DrawTrSurf_Curve2d.hxx

@@ -0,0 +1,116 @@
+// Created on: 1992-05-22
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#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.
+class DrawTrSurf_Curve2d : public DrawTrSurf_Drawable
+{
+
+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;
+  
+    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;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Curve2d,DrawTrSurf_Drawable)
+
+protected:
+
+
+  Handle(Geom2d_Curve) curv;
+  Draw_Color look;
+  Standard_Boolean disporigin;
+  Standard_Boolean dispcurvradius;
+  Standard_Real radiusmax;
+  Standard_Real radiusratio;
+
+
+private:
+
+
+
+
+};
+
+
+#include <DrawTrSurf_Curve2d.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_Curve2d_HeaderFile

src/DrawTrSurf/DrawTrSurf_Drawable.cdl

@@ -1,88 +0,0 @@
--- Created on: 1991-07-16
--- Created by: Christophe MARION
--- Copyright (c) 1991-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-deferred class Drawable from DrawTrSurf inherits Drawable3D from Draw
-
-	---Purpose: this  class adds   to   the Drawable3D methods  to
-	--          display Curves and Curves on Surface.
-	--          
-	--          The discretisation,  number  of points on a Curve,
-	--          is stored in this class.
-
-uses
-    Display        from Draw,
-    Curve          from Adaptor3d,
-    Curve2d        from Adaptor2d,
-    IsoCurve       from Adaptor3d,
-    IsoType        from GeomAbs
-
-is
-    Initialize(discret : Integer; deflection : Real = 0.01; DrawMode : Integer = 0);
-	---Purpose: set the number of points on a curve at creation.
-	
-    DrawCurve2dOn(me;
-                C : in out Curve2d from Adaptor2d;
-    	        D : in out Display from Draw);
-	---Purpose: Draw a polygon of the curve on the Display
-	
-    DrawCurveOn(me;
-                C : in out Curve from Adaptor3d;
-    	        D : in out Display from Draw);
-	---Purpose: Draw a polygon of the curve on the Display
-	
-    DrawIsoCurveOn(me;
-                C : in out IsoCurve from Adaptor3d;
-		T : IsoType from GeomAbs;
-		P, F, L : Real;
-    	        D : in out Display from Draw);
-	---Purpose: Load C  with the specified iso  and Draw a polygon
-	--          of the curve on the Display
-	
-    DrawOn(me; dis : in out Display from Draw)
-	---Purpose: this is defined only to tell C++ not to complain
-	--          about inheriting a pure virtual method.
-    is deferred;
-
-   
-    SetDiscretisation (me : mutable; Discret : Integer);
-        ---C++: inline
-    
-    GetDiscretisation (me) returns Integer;
-        ---C++: inline
-    
-    SetDeflection (me : mutable; Deflection : Real);
-        ---C++: inline
-    
-    GetDeflection (me) returns Real;
-        ---C++: inline
-
-    SetDrawMode (me : mutable; DrawMode : Integer);
-        ---C++: inline
-    
-    GetDrawMode (me) returns Integer;
-        ---C++: inline
-
-        
-
-    
-fields
-    myDrawMode   : Integer;
-       --- Purpose : 0 parametre constant, 1 fleche constante
-    myDiscret    : Integer;
-    myDeflection : Real;
-
-end Drawable;
-

src/DrawTrSurf/DrawTrSurf_Drawable.cxx

@@ -14,22 +14,26 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Drawable.ixx>
+
+#include <Adaptor2d_Curve2d.hxx>
+#include <Adaptor3d_Curve.hxx>
+#include <Adaptor3d_IsoCurve.hxx>
+#include <Draw_Display.hxx>
+#include <DrawTrSurf_Drawable.hxx>
 #include <GCPnts_UniformDeflection.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Pnt2d.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BSplineCurve.hxx>
+#include <GeomAdaptor_Curve.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
 #include <Precision.hxx>
-
+#include <Standard_Type.hxx>
+#include <TColStd_Array1OfReal.hxx>
 
 //=======================================================================
 //function : DrawTrSurf_Drawable
 //purpose  : initialise the discretisation
 //=======================================================================
-
 DrawTrSurf_Drawable::DrawTrSurf_Drawable (
 
 const Standard_Integer discret,

src/DrawTrSurf/DrawTrSurf_Drawable.hxx

@@ -0,0 +1,103 @@
+// Created on: 1991-07-16
+// Created by: Christophe MARION
+// Copyright (c) 1991-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Drawable_HeaderFile
+#define _DrawTrSurf_Drawable_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Integer.hxx>
+#include <Standard_Real.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <GeomAbs_IsoType.hxx>
+class Adaptor2d_Curve2d;
+class Draw_Display;
+class Adaptor3d_Curve;
+class Adaptor3d_IsoCurve;
+
+
+class DrawTrSurf_Drawable;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Drawable, Draw_Drawable3D)
+
+//! this  class adds   to   the Drawable3D methods  to
+//! display Curves and Curves on Surface.
+//!
+//! The discretisation,  number  of points on a Curve,
+//! is stored in this class.
+class DrawTrSurf_Drawable : public Draw_Drawable3D
+{
+
+public:
+
+  
+  //! Draw a polygon of the curve on the Display
+  Standard_EXPORT void DrawCurve2dOn (Adaptor2d_Curve2d& C, Draw_Display& D) const;
+  
+  //! Draw a polygon of the curve on the Display
+  Standard_EXPORT void DrawCurveOn (Adaptor3d_Curve& C, Draw_Display& D) const;
+  
+  //! Load C  with the specified iso  and Draw a polygon
+  //! of the curve on the Display
+  Standard_EXPORT void DrawIsoCurveOn (Adaptor3d_IsoCurve& C, const GeomAbs_IsoType T, const Standard_Real P, const Standard_Real F, const Standard_Real L, Draw_Display& D) const;
+  
+  //! this is defined only to tell C++ not to complain
+  //! about inheriting a pure virtual method.
+  Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const = 0;
+  
+    void SetDiscretisation (const Standard_Integer Discret);
+  
+    Standard_Integer GetDiscretisation() const;
+  
+    void SetDeflection (const Standard_Real Deflection);
+  
+    Standard_Real GetDeflection() const;
+  
+    void SetDrawMode (const Standard_Integer DrawMode);
+  
+    Standard_Integer GetDrawMode() const;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Drawable,Draw_Drawable3D)
+
+protected:
+
+  
+  //! set the number of points on a curve at creation.
+  Standard_EXPORT DrawTrSurf_Drawable(const Standard_Integer discret, const Standard_Real deflection = 0.01, const Standard_Integer DrawMode = 0);
+
+
+
+private:
+
+
+  Standard_Integer myDrawMode;
+  Standard_Integer myDiscret;
+  Standard_Real myDeflection;
+
+
+};
+
+
+#include <DrawTrSurf_Drawable.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_Drawable_HeaderFile

src/DrawTrSurf/DrawTrSurf_Point.cdl

@@ -1,93 +0,0 @@
--- Created on: 1994-03-28
--- Created by: Remi LEQUETTE
--- Copyright (c) 1994-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Point from DrawTrSurf inherits Drawable3D from Draw
-
-	---Purpose: A drawable point.
-
-uses
-    	Pnt from gp,
-    	Pnt2d from gp,
-	MarkerShape from Draw,
-     	Color from Draw,
-     	Display from Draw,
-     	Drawable3D from Draw,
-	Interpretor from Draw
-
-is
-
-    Create( P : Pnt from gp; 
-    	    Shape : MarkerShape from Draw;
-	    Col   : Color from Draw) 
-    returns Point from DrawTrSurf;
-    
-    Create( P : Pnt2d from gp; 
-    	    Shape : MarkerShape from Draw;
-	    Col   : Color from Draw) 
-    returns Point from DrawTrSurf;
-    
-    DrawOn (me; dis : in out Display from Draw);
-     
-    Is3D(me) returns Boolean
-	---Purpose: Is a 3D object. (Default True).
-    is redefined;
-    
-    Point(me) returns Pnt from gp
-    is static;
-    
-    Point(me : mutable; P : Pnt from gp)
-    is static;
-
-    Point2d(me) returns Pnt2d from gp
-    is static;
-    
-    Point2d(me : mutable; P : Pnt2d from gp)
-    is static;
-
-  Color(me : mutable; aColor : Color from Draw)
-     is static;
-
-  Color (me)  returns Color from Draw
-     is static;
-     
-  Shape(me : mutable; S : MarkerShape from Draw)
-  is static;
-  
-  Shape(me) returns MarkerShape from Draw
-  is  static;
-     
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-  Dump(me; S : in out OStream)
-	---Purpose: For variable dump.
-  is redefined;
-
-  Whatis(me; I : in out Interpretor from Draw)
-	---Purpose: For variable whatis command.
-  is redefined;
-
-fields
-
-    myPoint : Pnt from gp;
-    is3D    : Boolean;
-    myShape : MarkerShape from Draw;
-    myColor : Color from Draw;
-
-end Point;
-
-

src/DrawTrSurf/DrawTrSurf_Point.cxx

@@ -14,14 +14,20 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Point.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_Point.hxx>
+#include <gp_Pnt.hxx>
+#include <gp_Pnt2d.hxx>
 #include <Standard_Stream.hxx>
+#include <Standard_Type.hxx>
 
 //=======================================================================
 //function : DrawTrSurf_Point
 //purpose  : 
 //=======================================================================
-
 DrawTrSurf_Point::DrawTrSurf_Point(const gp_Pnt& P, 
 				   const Draw_MarkerShape Shape,
 				   const Draw_Color& Col) :

src/DrawTrSurf/DrawTrSurf_Point.hxx

@@ -0,0 +1,108 @@
+// Created on: 1994-03-28
+// Created by: Remi LEQUETTE
+// Copyright (c) 1994-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Point_HeaderFile
+#define _DrawTrSurf_Point_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <gp_Pnt.hxx>
+#include <Standard_Boolean.hxx>
+#include <Draw_MarkerShape.hxx>
+#include <Draw_Color.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <Standard_OStream.hxx>
+#include <Draw_Interpretor.hxx>
+class gp_Pnt;
+class Draw_Color;
+class gp_Pnt2d;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Point;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Point, Draw_Drawable3D)
+
+//! A drawable point.
+class DrawTrSurf_Point : public Draw_Drawable3D
+{
+
+public:
+
+  
+  Standard_EXPORT DrawTrSurf_Point(const gp_Pnt& P, const Draw_MarkerShape Shape, const Draw_Color& Col);
+  
+  Standard_EXPORT DrawTrSurf_Point(const gp_Pnt2d& P, const Draw_MarkerShape Shape, const Draw_Color& Col);
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const;
+  
+  //! Is a 3D object. (Default True).
+  Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE;
+  
+  Standard_EXPORT gp_Pnt Point() const;
+  
+  Standard_EXPORT void Point (const gp_Pnt& P);
+  
+  Standard_EXPORT gp_Pnt2d Point2d() const;
+  
+  Standard_EXPORT void Point2d (const gp_Pnt2d& P);
+  
+  Standard_EXPORT void Color (const Draw_Color& aColor);
+  
+  Standard_EXPORT Draw_Color Color() const;
+  
+  Standard_EXPORT void Shape (const Draw_MarkerShape S);
+  
+  Standard_EXPORT Draw_MarkerShape Shape() 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;
+  
+  //! For variable whatis command.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Point,Draw_Drawable3D)
+
+protected:
+
+
+
+
+private:
+
+
+  gp_Pnt myPoint;
+  Standard_Boolean is3D;
+  Draw_MarkerShape myShape;
+  Draw_Color myColor;
+
+
+};
+
+
+
+
+
+
+
+#endif // _DrawTrSurf_Point_HeaderFile

src/DrawTrSurf/DrawTrSurf_Polygon2D.cdl

@@ -1,62 +0,0 @@
--- Created on: 1995-03-10
--- Created by: Laurent PAINNOT
--- Copyright (c) 1995-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Polygon2D from DrawTrSurf inherits Drawable2D from Draw
-
-    	---Purpose: Used to display a 2d polygon.
-    	--          
-    	--          Optional display of nodes.
-
-
-uses Polygon2D   from Poly,
-     Display     from Draw,
-     Drawable3D  from Draw,
-     Interpretor from Draw,
-     OStream
-is
-
-    Create(P: Polygon2D from Poly)
-    returns Polygon2D from DrawTrSurf;
-    
-    Polygon2D(me) returns Polygon2D from Poly;
-    
-    ShowNodes(me: mutable; B: Boolean);
-    
-    ShowNodes(me) returns Boolean;
-    
-    DrawOn(me; dis: in out Display);
-    
-    Copy(me) returns Drawable3D from Draw
-    is redefined;
-	---Purpose: For variable copy.
-
-
-    Dump(me; S : in out OStream)
-    is redefined;
-	---Purpose: For variable dump.
-
-    Whatis(me; I : in out Interpretor from Draw)
-    is redefined;
-	---Purpose: For variable whatis command. Set  as a result  the
-	--          type of the variable.
-
-
-fields
-
-    myPolygon2D:  Polygon2D from Poly;
-    myNodes:      Boolean;
-
-end Polygon2D;

src/DrawTrSurf/DrawTrSurf_Polygon2D.cxx

@@ -14,16 +14,20 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Polygon2D.ixx>
-#include <Poly.hxx>
+
 #include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
 #include <Draw_MarkerShape.hxx>
+#include <DrawTrSurf_Polygon2D.hxx>
+#include <Poly.hxx>
+#include <Poly_Polygon2D.hxx>
+#include <Standard_Type.hxx>
 
 //=======================================================================
 //function : DrawTrSurf_Polygon2D
 //purpose  : 
 //=======================================================================
-
 DrawTrSurf_Polygon2D::DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P):
    myPolygon2D(P),
    myNodes(Standard_False)

src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx

@@ -0,0 +1,89 @@
+// Created on: 1995-03-10
+// Created by: Laurent PAINNOT
+// Copyright (c) 1995-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Polygon2D_HeaderFile
+#define _DrawTrSurf_Polygon2D_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_Drawable2D.hxx>
+#include <Standard_OStream.hxx>
+#include <Draw_Interpretor.hxx>
+class Poly_Polygon2D;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Polygon2D;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon2D, Draw_Drawable2D)
+
+//! Used to display a 2d polygon.
+//!
+//! Optional display of nodes.
+class DrawTrSurf_Polygon2D : public Draw_Drawable2D
+{
+
+public:
+
+  
+  Standard_EXPORT DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P);
+  
+  Standard_EXPORT Handle(Poly_Polygon2D) Polygon2D() const;
+  
+  Standard_EXPORT void ShowNodes (const Standard_Boolean B);
+  
+  Standard_EXPORT Standard_Boolean ShowNodes() const;
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) 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;
+  
+  //! For variable whatis command. Set  as a result  the
+  //! type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Polygon2D,Draw_Drawable2D)
+
+protected:
+
+
+
+
+private:
+
+
+  Handle(Poly_Polygon2D) myPolygon2D;
+  Standard_Boolean myNodes;
+
+
+};
+
+
+
+
+
+
+
+#endif // _DrawTrSurf_Polygon2D_HeaderFile

src/DrawTrSurf/DrawTrSurf_Polygon3D.cdl

@@ -1,62 +0,0 @@
--- Created on: 1995-03-09
--- Created by: Laurent PAINNOT
--- Copyright (c) 1995-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Polygon3D from DrawTrSurf inherits Drawable3D from Draw
-
-    	---Purpose: Used to display a 3d polygon.
-    	--          
-    	--          Optional display of nodes.
-
-
-uses Polygon3D   from Poly,
-     Display     from Draw,
-     Interpretor from Draw,
-     OStream
-
-is
-
-    Create(P: Polygon3D from Poly)
-    returns Polygon3D from DrawTrSurf;
-    
-    Polygon3D(me) returns Polygon3D from Poly;
-    
-    ShowNodes(me: mutable; B: Boolean);
-    
-    ShowNodes(me) returns Boolean;
-    
-    DrawOn(me; dis: in out Display);
-    
-    Copy(me) returns Drawable3D from Draw
-    is redefined;
-	---Purpose: For variable copy.
-
-
-    Dump(me; S : in out OStream)
-    is redefined;
-	---Purpose: For variable dump.
-
-    Whatis(me; I : in out Interpretor from Draw)
-    is redefined;
-	---Purpose: For variable whatis command. Set  as a result  the
-	--          type of the variable.
-
-
-fields
-
-    myPolygon3D:  Polygon3D from Poly;
-    myNodes:      Boolean;
-
-end Polygon3D;

src/DrawTrSurf/DrawTrSurf_Polygon3D.cxx

@@ -14,17 +14,20 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Polygon3D.ixx>
-#include <Poly.hxx>
-#include <Draw_Color.hxx>
-#include <Draw_MarkerShape.hxx>
 
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <Draw_MarkerShape.hxx>
+#include <DrawTrSurf_Polygon3D.hxx>
+#include <Poly.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <Standard_Type.hxx>
 
 //=======================================================================
 //function : DrawTrSurf_Polygon3D
 //purpose  : 
 //=======================================================================
-
 DrawTrSurf_Polygon3D::DrawTrSurf_Polygon3D(const Handle(Poly_Polygon3D)& P):
    myPolygon3D(P),
    myNodes(Standard_False)

src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx

@@ -0,0 +1,89 @@
+// Created on: 1995-03-09
+// Created by: Laurent PAINNOT
+// Copyright (c) 1995-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Polygon3D_HeaderFile
+#define _DrawTrSurf_Polygon3D_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Standard_Boolean.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <Standard_OStream.hxx>
+#include <Draw_Interpretor.hxx>
+class Poly_Polygon3D;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Polygon3D;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon3D, Draw_Drawable3D)
+
+//! Used to display a 3d polygon.
+//!
+//! Optional display of nodes.
+class DrawTrSurf_Polygon3D : public Draw_Drawable3D
+{
+
+public:
+
+  
+  Standard_EXPORT DrawTrSurf_Polygon3D(const Handle(Poly_Polygon3D)& P);
+  
+  Standard_EXPORT Handle(Poly_Polygon3D) Polygon3D() const;
+  
+  Standard_EXPORT void ShowNodes (const Standard_Boolean B);
+  
+  Standard_EXPORT Standard_Boolean ShowNodes() const;
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) 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;
+  
+  //! For variable whatis command. Set  as a result  the
+  //! type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Polygon3D,Draw_Drawable3D)
+
+protected:
+
+
+
+
+private:
+
+
+  Handle(Poly_Polygon3D) myPolygon3D;
+  Standard_Boolean myNodes;
+
+
+};
+
+
+
+
+
+
+
+#endif // _DrawTrSurf_Polygon3D_HeaderFile

src/DrawTrSurf/DrawTrSurf_Surface.cdl

@@ -1,119 +0,0 @@
--- Created on: 1992-05-21
--- Created by: Jean Claude VAUTHIER
--- Copyright (c) 1992-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Surface from DrawTrSurf
-     
-inherits Drawable 
-
-        ---Purpose:  This class defines a drawable surface.
-        -- With this class you can draw a general surface from 
-        -- package Geom.
-
-uses Surface     from Geom,
-     Display     from Draw,
-     Color       from Draw,
-     Drawable3D  from Draw,
-     Interpretor from Draw 
-
-is
-
-  Create (S : Surface from Geom)
-        --- Purpose : default drawing mode
-        --  Just the middle isoparametric curves are drawn.
-        --  The boundaries are yellow, the isoparametric curves are blues.
-        --  For the discretisation 50 points are computed in each parametric
-        --  direction.
-     returns Surface from DrawTrSurf;
-
-
-
-  Create (S : Surface from Geom;
-          Nu, Nv : Integer;
-          BoundsColor, IsosColor : Color from Draw;
-          Discret : Integer;
-          Deflection : Real;
-          DrawMode  : Integer)
-     returns Surface from DrawTrSurf;
-
-
-  BoundsColor (me) returns Color from Draw
-        ---C++: inline
-     is static;
-
-
-  ClearIsos (me : mutable) is virtual;
-        --- Purpose : rub out all the isoparametric curves.
-     
-
-  DrawOn (me; dis : in out Display from Draw);
-
-
-  DrawOn (me; dis : in out Display from Draw;
-              Iso : Boolean from Standard)
-       ---Purpose: Iso = True : Draw the isos, the boundaries, the UVMarker.
-       --          Iso = False: Only Draw the boundary and the UVMarker.
-  is static;
-  
-  
-  GetSurface (me) returns any Surface from Geom
-        ---C++: inline
-     is static;
-
-
-  IsosColor (me) returns Color from Draw
-        ---C++: inline
-     is static;
-
-
-  NbIsos (me; Nu, Nb : in out Integer)
-        ---C++: inline
-     is static;
-     
-
-  SetBoundsColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-
-  SetIsosColor (me : mutable; aColor : Color from Draw)
-        ---C++: inline
-     is static;
-
-
-  ShowIsos (me : mutable; Nu, Nv : Integer) is virtual;
-        --- Purpose : change the number of isoparametric curves to be drawn.
-
-  Copy(me) returns Drawable3D from Draw
-	---Purpose: For variable copy.
-  is redefined;
-  
-  Dump(me; S : in out OStream)
-	---Purpose: For variable dump.
-  is redefined;
-  
-  Whatis(me; I : in out Interpretor from Draw)
-	---Purpose: For variable whatis command.
-  is redefined;
-
-fields
-
-  surf        : Surface from Geom is protected;
-  boundsLook  : Color from Draw   is protected;
-  isosLook    : Color from Draw   is protected;
-  nbUIsos     : Integer           is protected;
-  nbVIsos     : Integer           is protected;
-
-end Surface;

src/DrawTrSurf/DrawTrSurf_Surface.cxx

@@ -12,12 +12,17 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Surface.ixx>
-#include <GeomTools_SurfaceSet.hxx>
-#include <GeomAdaptor_HSurface.hxx>
+
 #include <Adaptor3d_IsoCurve.hxx>
-#include <Precision.hxx>
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_Surface.hxx>
 #include <Geom_Surface.hxx>
+#include <GeomAdaptor_HSurface.hxx>
+#include <GeomTools_SurfaceSet.hxx>
+#include <Precision.hxx>
+#include <Standard_Type.hxx>
 
 Standard_Real DrawTrSurf_SurfaceLimit = 400;
 

src/DrawTrSurf/DrawTrSurf_Surface.hxx

@@ -0,0 +1,119 @@
+// Created on: 1992-05-21
+// Created by: Jean Claude VAUTHIER
+// Copyright (c) 1992-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Surface_HeaderFile
+#define _DrawTrSurf_Surface_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <Draw_Color.hxx>
+#include <Standard_Integer.hxx>
+#include <DrawTrSurf_Drawable.hxx>
+#include <Standard_Real.hxx>
+#include <Standard_Boolean.hxx>
+#include <Standard_OStream.hxx>
+#include <Draw_Interpretor.hxx>
+class Geom_Surface;
+class Draw_Color;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Surface;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Surface, DrawTrSurf_Drawable)
+
+//! This class defines a drawable surface.
+//! With this class you can draw a general surface from
+//! package Geom.
+class DrawTrSurf_Surface : public DrawTrSurf_Drawable
+{
+
+public:
+
+  
+  //! default drawing mode
+  //! Just the middle isoparametric curves are drawn.
+  //! The boundaries are yellow, the isoparametric curves are blues.
+  //! For the discretisation 50 points are computed in each parametric
+  //! direction.
+  Standard_EXPORT DrawTrSurf_Surface(const Handle(Geom_Surface)& S);
+  
+  Standard_EXPORT DrawTrSurf_Surface(const Handle(Geom_Surface)& S, const Standard_Integer Nu, const Standard_Integer Nv, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
+  
+    Draw_Color BoundsColor() const;
+  
+  //! rub out all the isoparametric curves.
+  Standard_EXPORT virtual void ClearIsos();
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) const;
+  
+  //! Iso = True : Draw the isos, the boundaries, the UVMarker.
+  //! Iso = False: Only Draw the boundary and the UVMarker.
+  Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Boolean Iso) const;
+  
+    Handle(Geom_Surface) GetSurface() const;
+  
+    Draw_Color IsosColor() const;
+  
+    void NbIsos (Standard_Integer& Nu, Standard_Integer& Nb) const;
+  
+    void SetBoundsColor (const Draw_Color& aColor);
+  
+    void SetIsosColor (const Draw_Color& aColor);
+  
+  //! change the number of isoparametric curves to be drawn.
+  Standard_EXPORT virtual void ShowIsos (const Standard_Integer Nu, const Standard_Integer Nv);
+  
+  //! 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;
+  
+  //! For variable whatis command.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Surface,DrawTrSurf_Drawable)
+
+protected:
+
+
+  Handle(Geom_Surface) surf;
+  Draw_Color boundsLook;
+  Draw_Color isosLook;
+  Standard_Integer nbUIsos;
+  Standard_Integer nbVIsos;
+
+
+private:
+
+
+
+
+};
+
+
+#include <DrawTrSurf_Surface.lxx>
+
+
+
+
+
+#endif // _DrawTrSurf_Surface_HeaderFile

src/DrawTrSurf/DrawTrSurf_Triangulation.cdl

@@ -1,71 +0,0 @@
--- Created on: 1995-03-06
--- Created by: Laurent PAINNOT
--- Copyright (c) 1995-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Triangulation from DrawTrSurf inherits Drawable3D from Draw
-
-	---Purpose: Used to display a triangulation.
-	--          
-	--          Display internal edges in blue
-	--          Display boundary edges in red
-	--          Optional display of triangles and nodes indices.
-
-uses
-    HArray1OfInteger from TColStd,
-    Triangulation from Poly,
-    Display       from Draw,
-    Interpretor   from Draw,
-    OStream
-
-is
-
-    Create(T : Triangulation from Poly)
-    returns Triangulation from DrawTrSurf;
-    
-    Triangulation(me)
-    returns Triangulation from Poly;
-    
-    ShowNodes(me : mutable; B : Boolean);
-
-    ShowNodes(me) returns Boolean;
-
-    ShowTriangles(me : mutable; B : Boolean);
-
-    ShowTriangles(me) returns Boolean;
-
-    DrawOn(me; dis : in out Display);
-    
-    Copy(me) returns Drawable3D from Draw
-    is redefined;
-	---Purpose: For variable copy.
-	
-    Dump(me; S : in out OStream)
-    is redefined;
-	---Purpose: For variable dump.
-
-    Whatis(me; I : in out Interpretor from Draw)
-    is redefined;
-	---Purpose: For variable whatis command. Set  as a result  the
-	--          type of the variable.
-
-fields
-
-    myTriangulation : Triangulation from Poly;
-    myInternals     : HArray1OfInteger from TColStd;
-    myFree          : HArray1OfInteger from TColStd;
-    myNodes         : Boolean;
-    myTriangles     : Boolean;
-
-end Triangulation;

src/DrawTrSurf/DrawTrSurf_Triangulation.cxx

@@ -14,24 +14,27 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Triangulation.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_Triangulation.hxx>
+#include <gp_Pnt.hxx>
+#include <Poly.hxx>
+#include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Connect.hxx>
 #include <Poly_Triangle.hxx>
-#include <Poly_Array1OfTriangle.hxx>
+#include <Poly_Triangulation.hxx>
+#include <Standard_Type.hxx>
 #include <TColStd_Array1OfInteger.hxx>
-#include <gp_Pnt.hxx>
-#include <Draw_Color.hxx>
-#include <Poly.hxx>
 
-//#ifdef WNT
 #include <stdio.h>
+//#ifdef WNT
 //#endif
-
 //=======================================================================
 //function : DrawTrSurf_Triangulation
 //purpose  : 
 //=======================================================================
-
 DrawTrSurf_Triangulation::DrawTrSurf_Triangulation
 (const Handle(Poly_Triangulation)& T): 
     myTriangulation(T), 

src/DrawTrSurf/DrawTrSurf_Triangulation.hxx

@@ -0,0 +1,99 @@
+// Created on: 1995-03-06
+// Created by: Laurent PAINNOT
+// Copyright (c) 1995-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Triangulation_HeaderFile
+#define _DrawTrSurf_Triangulation_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <TColStd_HArray1OfInteger.hxx>
+#include <Standard_Boolean.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <Standard_OStream.hxx>
+#include <Draw_Interpretor.hxx>
+class Poly_Triangulation;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Triangulation;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation, Draw_Drawable3D)
+
+//! Used to display a triangulation.
+//!
+//! Display internal edges in blue
+//! Display boundary edges in red
+//! Optional display of triangles and nodes indices.
+class DrawTrSurf_Triangulation : public Draw_Drawable3D
+{
+
+public:
+
+  
+  Standard_EXPORT DrawTrSurf_Triangulation(const Handle(Poly_Triangulation)& T);
+  
+  Standard_EXPORT Handle(Poly_Triangulation) Triangulation() const;
+  
+  Standard_EXPORT void ShowNodes (const Standard_Boolean B);
+  
+  Standard_EXPORT Standard_Boolean ShowNodes() const;
+  
+  Standard_EXPORT void ShowTriangles (const Standard_Boolean B);
+  
+  Standard_EXPORT Standard_Boolean ShowTriangles() const;
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) 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;
+  
+  //! For variable whatis command. Set  as a result  the
+  //! type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Triangulation,Draw_Drawable3D)
+
+protected:
+
+
+
+
+private:
+
+
+  Handle(Poly_Triangulation) myTriangulation;
+  Handle(TColStd_HArray1OfInteger) myInternals;
+  Handle(TColStd_HArray1OfInteger) myFree;
+  Standard_Boolean myNodes;
+  Standard_Boolean myTriangles;
+
+
+};
+
+
+
+
+
+
+
+#endif // _DrawTrSurf_Triangulation_HeaderFile

src/DrawTrSurf/DrawTrSurf_Triangulation2D.cdl

@@ -1,62 +0,0 @@
--- Created on: 1997-07-22
--- Created by: Laurent PAINNOT
--- Copyright (c) 1997-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-class Triangulation2D from DrawTrSurf inherits Drawable2D from Draw
-
-	---Purpose: Used to display a 2d triangulation.
-	--          
-	--          Display internal edges in blue
-	--          Display boundary edges in red
-	--          Optional display of triangles and nodes indices.
-
-uses
-    HArray1OfInteger from TColStd,
-    Triangulation from Poly,
-    Drawable3D    from Draw,
-    Display       from Draw,
-    Interpretor   from Draw,
-    OStream
-
-is
-
-    Create(T : Triangulation from Poly)
-    returns Triangulation2D from DrawTrSurf;
-    
-    Triangulation(me)
-    returns Triangulation from Poly;
-    
-    DrawOn(me; dis : in out Display);
-    
-    Copy(me) returns Drawable3D from Draw
-    is redefined;
-	---Purpose: For variable copy.
-	
-    Dump(me; S : in out OStream)
-    is redefined;
-	---Purpose: For variable dump.
-
-    Whatis(me; I : in out Interpretor from Draw)
-    is redefined;
-	---Purpose: For variable whatis command. Set  as a result  the
-	--          type of the variable.
-
-fields
-
-    myTriangulation : Triangulation from Poly;
-    myInternals     : HArray1OfInteger from TColStd;
-    myFree          : HArray1OfInteger from TColStd;
-
-end Triangulation2D;

src/DrawTrSurf/DrawTrSurf_Triangulation2D.cxx

@@ -14,15 +14,20 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <DrawTrSurf_Triangulation2D.ixx>
+
+#include <Draw_Color.hxx>
+#include <Draw_Display.hxx>
+#include <Draw_Drawable3D.hxx>
+#include <DrawTrSurf_Triangulation2D.hxx>
+#include <gp_Pnt2d.hxx>
+#include <Poly.hxx>
+#include <Poly_Array1OfTriangle.hxx>
 #include <Poly_Connect.hxx>
 #include <Poly_Triangle.hxx>
-#include <Poly_Array1OfTriangle.hxx>
-#include <TColStd_Array1OfInteger.hxx>
+#include <Poly_Triangulation.hxx>
+#include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
-#include <gp_Pnt2d.hxx>
-#include <Draw_Color.hxx>
-#include <Poly.hxx>
+#include <TColStd_Array1OfInteger.hxx>
 
 #ifdef WNT
 #include <stdio.h>

src/DrawTrSurf/DrawTrSurf_Triangulation2D.hxx

@@ -0,0 +1,88 @@
+// Created on: 1997-07-22
+// Created by: Laurent PAINNOT
+// Copyright (c) 1997-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _DrawTrSurf_Triangulation2D_HeaderFile
+#define _DrawTrSurf_Triangulation2D_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_Type.hxx>
+
+#include <TColStd_HArray1OfInteger.hxx>
+#include <Draw_Drawable2D.hxx>
+#include <Standard_OStream.hxx>
+#include <Draw_Interpretor.hxx>
+class Poly_Triangulation;
+class Draw_Display;
+class Draw_Drawable3D;
+
+
+class DrawTrSurf_Triangulation2D;
+DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation2D, Draw_Drawable2D)
+
+//! Used to display a 2d triangulation.
+//!
+//! Display internal edges in blue
+//! Display boundary edges in red
+//! Optional display of triangles and nodes indices.
+class DrawTrSurf_Triangulation2D : public Draw_Drawable2D
+{
+
+public:
+
+  
+  Standard_EXPORT DrawTrSurf_Triangulation2D(const Handle(Poly_Triangulation)& T);
+  
+  Standard_EXPORT Handle(Poly_Triangulation) Triangulation() const;
+  
+  Standard_EXPORT void DrawOn (Draw_Display& dis) 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;
+  
+  //! For variable whatis command. Set  as a result  the
+  //! type of the variable.
+  Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
+
+
+
+
+  DEFINE_STANDARD_RTTI(DrawTrSurf_Triangulation2D,Draw_Drawable2D)
+
+protected:
+
+
+
+
+private:
+
+
+  Handle(Poly_Triangulation) myTriangulation;
+  Handle(TColStd_HArray1OfInteger) myInternals;
+  Handle(TColStd_HArray1OfInteger) myFree;
+
+
+};
+
+
+
+
+
+
+
+#endif // _DrawTrSurf_Triangulation2D_HeaderFile

src/DrawTrSurf/FILES

@@ -1 +1,43 @@
+DrawTrSurf.cxx
+DrawTrSurf.hxx
+DrawTrSurf_BezierCurve.cxx
+DrawTrSurf_BezierCurve.hxx
+DrawTrSurf_BezierCurve.lxx
+DrawTrSurf_BezierCurve2d.cxx
+DrawTrSurf_BezierCurve2d.hxx
+DrawTrSurf_BezierCurve2d.lxx
+DrawTrSurf_BezierSurface.cxx
+DrawTrSurf_BezierSurface.hxx
+DrawTrSurf_BezierSurface.lxx
+DrawTrSurf_BSplineCurve.cxx
+DrawTrSurf_BSplineCurve.hxx
+DrawTrSurf_BSplineCurve.lxx
+DrawTrSurf_BSplineCurve2d.cxx
+DrawTrSurf_BSplineCurve2d.hxx
+DrawTrSurf_BSplineCurve2d.lxx
+DrawTrSurf_BSplineSurface.cxx
+DrawTrSurf_BSplineSurface.hxx
+DrawTrSurf_BSplineSurface.lxx
+DrawTrSurf_Curve.cxx
+DrawTrSurf_Curve.hxx
+DrawTrSurf_Curve.lxx
+DrawTrSurf_Curve2d.cxx
+DrawTrSurf_Curve2d.hxx
+DrawTrSurf_Curve2d.lxx
 DrawTrSurf_Debug.cxx
+DrawTrSurf_Drawable.cxx
+DrawTrSurf_Drawable.hxx
+DrawTrSurf_Drawable.lxx
+DrawTrSurf_Point.cxx
+DrawTrSurf_Point.hxx
+DrawTrSurf_Polygon2D.cxx
+DrawTrSurf_Polygon2D.hxx
+DrawTrSurf_Polygon3D.cxx
+DrawTrSurf_Polygon3D.hxx
+DrawTrSurf_Surface.cxx
+DrawTrSurf_Surface.hxx
+DrawTrSurf_Surface.lxx
+DrawTrSurf_Triangulation.cxx
+DrawTrSurf_Triangulation.hxx
+DrawTrSurf_Triangulation2D.cxx
+DrawTrSurf_Triangulation2D.hxx