OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0024002: Overall code and build procedure refactoring -- automatic

Browse Source 
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
This commit is contained in:
abv
2015-07-12 07:42:38 +03:00
parent 543a996496
commit 42cf5bc1ca
15354 changed files with 623957 additions and 509844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/IntImpParGen/FILES
View File

@@ -1,3 +1,8 @@
IntImpParGen_Tool.cxx
IntImpParGen.cxx
IntImpParGen.hxx
IntImpParGen_ImpParTool.gxx
IntImpParGen_ImpTool.cxx
IntImpParGen_ImpTool.hxx
IntImpParGen_Intersector.gxx
IntImpParGen_Tool.cxx
IntImpParGen_Tool.hxx

74
src/IntImpParGen/IntImpParGen.cdl
View File

@@ -1,74 +0,0 @@
-- Created on: 1992-03-02
-- Created by: Laurent BUCHARD
-- 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.
package IntImpParGen
---Purpose: Gives a generic algorithm to intersect Implicit Curves
-- and Bounded Parametric Curves.
--
-- Level: Internal
--
-- All the methods of all the classes are Internal.
uses Standard, TColStd, gp, math, IntRes2d, StdFail
is
deferred class ImpTool;
---Purpose: Template class for an implicit curve.
generic class ImpParTool;
---Purpose: Math function, instantiated inside the Intersector.
generic class Intersector,MyImpParTool;
---Purpose: Tool used by the package IntCurve and IntImpParGen
DetermineTransition(Pos1 : Position from IntRes2d;
Tan1 : in out Vec2d from gp;
Norm1 : Vec2d from gp;
Trans1: in out Transition from IntRes2d;
Pos2 : Position from IntRes2d;
Tan2 : in out Vec2d from gp;
Norm2 : Vec2d from gp;
Trans2: in out Transition from IntRes2d;
Tol : Real from Standard);
DetermineTransition(Pos1 : Position from IntRes2d;
Tan1 : in out Vec2d from gp;
Trans1: in out Transition from IntRes2d;
Pos2 : Position from IntRes2d;
Tan2 : in out Vec2d from gp;
Trans2: in out Transition from IntRes2d;
Tol : Real from Standard)
returns Boolean from Standard;
DeterminePosition( Pos1 : in out Position from IntRes2d;
Dom1 : Domain from IntRes2d;
P1 : Pnt2d from gp;
Tol : Real from Standard);
NormalizeOnDomain( Par1 : in out Real from Standard;
Dom1 : Domain from IntRes2d)
returns Real from Standard;
end IntImpParGen;

16
src/IntImpParGen/IntImpParGen.cxx
View File

@@ -14,19 +14,15 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <IntImpParGen.ixx>
#include <gp.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Vec2d.hxx>
#include <IntImpParGen.hxx>
#include <IntImpParGen_Tool.hxx>
#include <IntRes2d_Domain.hxx>
#include <IntRes2d_Position.hxx>
#include <IntRes2d_Transition.hxx>
#include <gp_Vec2d.hxx>
#include <gp_Pnt2d.hxx>
#include <IntImpParGen_Tool.hxx>
#include <gp.hxx>
#define TOLERANCE_ANGULAIRE 0.00000001
#define DERIVEE_PREMIERE_NULLE 0.000000000001

88
src/IntImpParGen/IntImpParGen.hxx Normal file
View File

@@ -0,0 +1,88 @@
// Created on: 1992-03-02
// Created by: Laurent BUCHARD
// 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 _IntImpParGen_HeaderFile
#define _IntImpParGen_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <IntRes2d_Position.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
class gp_Vec2d;
class IntRes2d_Transition;
class IntRes2d_Domain;
class gp_Pnt2d;
class IntImpParGen_ImpTool;
class IntImpParGen_ImpParTool;
class IntImpParGen_Intersector;
class IntImpParGen_MyImpParTool;
//! Gives a generic algorithm to intersect Implicit Curves
//! and Bounded Parametric Curves.
//!
//! Level: Internal
//!
//! All the methods of all the classes are Internal.
class IntImpParGen
{
public:
DEFINE_STANDARD_ALLOC
//! Template class for an implicit curve.
//! Math function, instantiated inside the Intersector.
//! Tool used by the package IntCurve and IntImpParGen
Standard_EXPORT static void DetermineTransition (const IntRes2d_Position Pos1, gp_Vec2d& Tan1, const gp_Vec2d& Norm1, IntRes2d_Transition& Trans1, const IntRes2d_Position Pos2, gp_Vec2d& Tan2, const gp_Vec2d& Norm2, IntRes2d_Transition& Trans2, const Standard_Real Tol);
Standard_EXPORT static Standard_Boolean DetermineTransition (const IntRes2d_Position Pos1, gp_Vec2d& Tan1, IntRes2d_Transition& Trans1, const IntRes2d_Position Pos2, gp_Vec2d& Tan2, IntRes2d_Transition& Trans2, const Standard_Real Tol);
Standard_EXPORT static void DeterminePosition (IntRes2d_Position& Pos1, const IntRes2d_Domain& Dom1, const gp_Pnt2d& P1, const Standard_Real Tol);
Standard_EXPORT static Standard_Real NormalizeOnDomain (Standard_Real& Par1, const IntRes2d_Domain& Dom1);
protected:
private:
friend class IntImpParGen_ImpTool;
friend class IntImpParGen_ImpParTool;
friend class IntImpParGen_Intersector;
friend class IntImpParGen_MyImpParTool;
};
#endif // _IntImpParGen_HeaderFile

75
src/IntImpParGen/IntImpParGen_ImpParTool.cdl
View File

@@ -1,75 +0,0 @@
-- Created on: 1992-03-30
-- Created by: Laurent BUCHARD
-- 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.
generic class ImpParTool from IntImpParGen (
ImpTool as any; -- as ImpTool from IntImpParGen
ParCurve as any;
ParTool as any)
inherits FunctionWithDerivative from math
---Purpose: Implements the function used by FunctionAllRoots
-- to find the areas where the distance between the
-- implicit and the parametric curves is less than a
-- tolerance.
uses Pnt2d from gp,
Vec2d from gp
is
Create(IT: ImpTool; PC: ParCurve)
---Purpose: Constructor of the class.
returns ImpParTool from IntImpParGen;
Value(me: in out; Param: Real from Standard; F: out Real from Standard)
---Purpose: Computes the value of the signed distance between
-- the implicit curve and the point at parameter Param
-- on the parametrised curve.
returns Boolean from Standard
is redefined static;
Derivative(me: in out; Param: Real from Standard;
D: out Real from Standard)
---Purpose: Computes the derivative of the previous function at
-- parameter Param.
returns Boolean from Standard
is redefined static;
Values(me: in out; Param: Real from Standard; F,D: out Real from Standard)
---Purpose: Computes the value and the derivative of the function.
returns Boolean from Standard
is redefined static;
fields
TheParCurve : Address from Standard;
TheImpTool : ImpTool;
end ImpParTool;

94
src/IntImpParGen/IntImpParGen_ImpTool.cdl
View File

@@ -1,94 +0,0 @@
-- Created on: 1992-03-26
-- Created by: Laurent BUCHARD
-- 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.
deferred class ImpTool from IntImpParGen
---Purpose: Template class for an implicit curve.
uses Pnt2d from gp,
Vec2d from gp
is
Value (me; U: Real from Standard)
--Purpose: Computes the point at parameter U on the
-- Implicit Curve.
returns Pnt2d from gp
is static;
D1 (me; U: Real from Standard ; P: out Pnt2d; T: out Vec2d)
--Purpose: Computes the first derivative and the point on the
-- implicit curve at parameter U.
is static;
D2 (me; U: Real from Standard ; P: out Pnt2d; T,N: out Vec2d)
--Purpose: Computes the first, the second derivatives
-- and the point on the implicit curve at parameter U.
is static;
Distance(me; P: Pnt2d from gp)
---Purpose: Computes the value of the signed distance between
-- the point P and the implicit curve.
--
returns Real from Standard
is static;
GradDistance(me; P: Pnt2d from gp)
---Purpose: Computes the Gradient of the Signed Distance
-- between a point and the implicit curve, at the
-- point P.
--
returns Vec2d from gp
is static;
FindParameter(me; P: Pnt2d from gp)
---Purpose: Returns the parameter U of the point on the
-- implicit curve corresponding to the point P.
-- The correspondance between P and the point P(U) on
-- the implicit curve must be coherent with the way
-- of determination of the signed distance.
returns Real from Standard
is static;
end ImpTool;

5
src/IntImpParGen/IntImpParGen_ImpTool.cxx
View File

@@ -12,4 +12,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <IntImpParGen_ImpTool.ixx>
#include <gp_Pnt2d.hxx>
#include <gp_Vec2d.hxx>
#include <IntImpParGen_ImpTool.hxx>

82
src/IntImpParGen/IntImpParGen_ImpTool.hxx Normal file
View File

@@ -0,0 +1,82 @@
// Created on: 1992-03-26
// Created by: Laurent BUCHARD
// 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 _IntImpParGen_ImpTool_HeaderFile
#define _IntImpParGen_ImpTool_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Real.hxx>
class gp_Pnt2d;
class gp_Vec2d;
//! Template class for an implicit curve.
class IntImpParGen_ImpTool
{
public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT gp_Pnt2d Value (const Standard_Real U) const;
Standard_EXPORT void D1 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& T) const;
Standard_EXPORT void D2 (const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& T, gp_Vec2d& N) const;
//! Computes the value of the signed distance between
//! the point P and the implicit curve.
Standard_EXPORT Standard_Real Distance (const gp_Pnt2d& P) const;
//! Computes the Gradient of the Signed Distance
//! between a point and the implicit curve, at the
//! point P.
Standard_EXPORT gp_Vec2d GradDistance (const gp_Pnt2d& P) const;
//! Returns the parameter U of the point on the
//! implicit curve corresponding to the point P.
//! The correspondance between P and the point P(U) on
//! the implicit curve must be coherent with the way
//! of determination of the signed distance.
Standard_EXPORT Standard_Real FindParameter (const gp_Pnt2d& P) const;
protected:
private:
};
#endif // _IntImpParGen_ImpTool_HeaderFile

139
src/IntImpParGen/IntImpParGen_Intersector.cdl
View File

@@ -1,139 +0,0 @@
-- Created on: 1992-03-02
-- Created by: Laurent BUCHARD
-- 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.
generic class Intersector from IntImpParGen (
ImpTool as any; -- as ImpTool from IntImpParGen
ParCurve as any;
ParTool as any;
ProjectOnPCurveTool as any) -- as ProjectOnPCurveToolGen from IntCurve
inherits Intersection from IntRes2d
---Purpose: Calculates all the IntersectionPoints
-- and IntersectionSegments between an implicit curve
-- (see class ImpTool) and a parametrised curve (see class
-- ParTool) on their domains.
-- The results of the intersection are stored in the
-- Intersection class from IntRes2d.
-- The parametrised curve has to be bounded (the domain
-- of this curve must verify HasFirstPoint returns True
-- and HasLastPoint returns True).
uses IntersectionPoint from IntRes2d,
IntersectionSegment from IntRes2d,
SequenceOfIntersectionPoint from IntRes2d,
SequenceOfIntersectionSegment from IntRes2d,
Domain from IntRes2d,
Pnt2d from gp,
Array1OfReal from TColStd
raises ConstructionError from Standard
class MyImpParTool instantiates ImpParTool from IntImpParGen(
ImpTool,
ParCurve,
ParTool);
is
Create
---Purpose: Empty constructor.
returns Intersector from IntImpParGen;
Create ( ITool : ImpTool;
Dom1 : Domain from IntRes2d;
PCurve : ParCurve;
Dom2 : Domain from IntRes2d;
TolConf,Tol: Real from Standard)
---Purpose: Intersection between an implicit curve and
-- a parametrised curve.
-- The exception ConstructionError is raised if the domain
-- of the parametrised curve does not verify HasFirstPoint
-- and HasLastPoint return True.
returns Intersector from IntImpParGen
raises ConstructionError from Standard;
Perform (me: in out;
ITool : ImpTool;
Dom1 : Domain from IntRes2d;
PCurve : ParCurve;
Dom2 : Domain from IntRes2d;
TolConf,Tol: Real from Standard)
---Purpose: Intersection between an implicit curve and
-- a parametrised curve.
-- The exception ConstructionError is raised if the domain
-- of the parametrised curve does not verify HasFirstPoint
-- and HasLastPoint return True.
raises ConstructionError from Standard
is static;
FindU ( me ;
parameter : Real from Standard ;
point : in out Pnt2d from gp;
TheParCurev : ParCurve;
TheImpTool : ImpTool)
returns Real from Standard
is static ;
FindV ( me ;
parameter : Real from Standard ;
point : in out Pnt2d from gp ;
TheImpTool : ImpTool ;
ParCurve : ParCurve ;
TheParCurveDomain : Domain from IntRes2d ;
V0 : Real from Standard ;
V1 : Real from Standard ;
Tolerance : Real from Standard )
returns Real from Standard
is static;
And_Domaine_Objet1_Intersections ( me ;
TheImpTool : ImpTool ;
TheParCurve : ParCurve ;
TheImpCurveDomain : Domain from IntRes2d ;
TheParCurveDomain : Domain from IntRes2d ;
NbResultats : in out Integer from Standard ;
Inter2_And_Domain2 : in out Array1OfReal from TColStd ;
Inter1 : in out Array1OfReal from TColStd ;
Resultat1 : in out Array1OfReal from TColStd ;
Resultat2 : in out Array1OfReal from TColStd ;
EpsNul : Real from Standard )
is static;
end Intersector;