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

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
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

View File

@@ -1,2 +1,11 @@
IntImp_ComputeTangence.cxx
IntImp_ComputeTangence.hxx
IntImp_ConstIsoparametric.hxx
IntImp_Int2S.gxx
IntImp_Int2S.lxx
IntImp_IntCS.gxx
IntImp_ZerCSParFunc.gxx
IntImp_ZerImpFunc.gxx
IntImp_ZerImpFunc.lxx
IntImp_ZerParFunc.gxx
IntImp_ZerParFunc.lxx

View File

@@ -1,39 +0,0 @@
-- Created on: 1992-04-13
-- Created by: Isabelle GRIGNON
-- 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 IntImp
---Purpose:
uses Standard, TColStd, StdFail, math, gp, IntSurf
is
enumeration ConstIsoparametric is
UIsoparametricOnCaro1, VIsoparametricOnCaro1,
UIsoparametricOnCaro2, VIsoparametricOnCaro2;
generic class ZerImpFunc; -- inherits FunctionSetWithDerivatives
generic class ZerParFunc; -- inherits FunctionSetWithDerivatives
generic class ZerCSParFunc; -- inherits FunctionSetWithDerivatives
generic class Int2S,TheFunction;
generic class IntCS;
end IntImp;

View File

@@ -0,0 +1,29 @@
// Created on: 1992-04-13
// Created by: Isabelle GRIGNON
// 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 _IntImp_ConstIsoparametric_HeaderFile
#define _IntImp_ConstIsoparametric_HeaderFile
enum IntImp_ConstIsoparametric
{
IntImp_UIsoparametricOnCaro1,
IntImp_VIsoparametricOnCaro1,
IntImp_UIsoparametricOnCaro2,
IntImp_VIsoparametricOnCaro2
};
#endif // _IntImp_ConstIsoparametric_HeaderFile

View File

@@ -1,255 +0,0 @@
-- Created on: 1991-04-30
-- Created by: Isabelle GRIGNON
-- 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.
generic class Int2S from IntImp
(ThePSurface as any;
ThePSurfaceTool as any)
---Purpose: Determination of the intersection between 2 surfaces
-- from an point close to the solution.
uses Array1OfReal from TColStd,
ConstIsoparametric from IntImp,
PntOn2S from IntSurf,
Dir from gp,
Dir2d from gp,
FunctionSetRoot from math
raises NotDone from StdFail,
DomainError from Standard,
ConstructionError from Standard,
UndefinedDerivative from StdFail
class TheFunction instantiates ZerParFunc from IntImp
(ThePSurface, ThePSurfaceTool);
is
Create
---Purpose: Raises Construction Error
returns Int2S from IntImp;
Create( Param: Array1OfReal from TColStd;
S1,S2: ThePSurface;
TolTangency: Real)
---Purpose: compute the solution point with the close point
returns Int2S from IntImp;
Create( S1,S2: ThePSurface;
TolTangency: Real from Standard)
---Purpose: initialize the parameters to compute the solution point
-- it 's possible to write to optimize:
-- IntImp_Int2S inter(S1,S2,Func,TolTangency);
-- math_FunctionSetRoot rsnld(inter.Function());
-- while ...{
-- Param(1)=...
-- Param(2)=...
-- param(3)=...
-- inter.Perform(Param,rsnld);
-- }
returns Int2S from IntImp;
Perform(me : in out; Param : Array1OfReal from TColStd;
Rsnld : in out FunctionSetRoot from math)
---Purpose: returns the best constant isoparametric to find
-- the next intersection's point +stores the solution
-- point (the solution point is found with the close point
-- to intersect the isoparametric with the other patch;
-- the choice of the isoparametic is calculated)
returns ConstIsoparametric from IntImp
is static;
Perform(me : in out;
Param : Array1OfReal from TColStd;
Rsnld : in out FunctionSetRoot from math;
ChoixIso : ConstIsoparametric from IntImp)
---Purpose: returns the best constant isoparametric to find
-- the next intersection's point +stores the solution
-- point (the solution point is found with the close point
-- to intersect the isoparametric with the other patch;
-- the choice of the isoparametic is given by ChoixIso)
returns ConstIsoparametric from IntImp
is static;
IsDone(me)
---Purpose: Returns TRUE if the creation completed without failure.
returns Boolean from Standard
---C++: inline
is static;
IsEmpty(me)
---Purpose: Returns TRUE when there is no solution to the problem.
returns Boolean from Standard
---C++: inline
raises NotDone from StdFail
is static;
Point(me)
---Purpose: Returns the intersection point.
returns PntOn2S from IntSurf
---C++: return const&
---C++: inline
raises NotDone from StdFail,
DomainError from Standard
-- The exception NotDone is raised if IsDone is false.
-- The exception DomainError is raised if IsEmpty is true.
is static;
IsTangent(me)
---Purpose: Returns True if the surfaces are tangent at the
-- intersection point.
returns Boolean from Standard
---C++: inline
raises NotDone from StdFail,
DomainError from Standard
-- The exception NotDone is raised if IsDone is false.
-- The exception DomainError is raised if IsEmpty is true.
is static;
Direction(me)
---Purpose: Returns the tangent at the intersection line.
returns Dir from gp
---C++: return const&
---C++: inline
raises NotDone from StdFail,
DomainError from Standard,
UndefinedDerivative from StdFail
-- The exception NotDone is raised if IsDone is false.
-- The exception DomainError is raised if IsEmpty is true.
-- The exception UndefinedDerivative is raised if IsTangent
-- returns True.
is static;
DirectionOnS1(me)
---Purpose: Returns the tangent at the intersection line in the
-- parametric space of the first surface.
returns Dir2d from gp
---C++: return const&
---C++: inline
raises NotDone from StdFail,
DomainError from Standard,
UndefinedDerivative from StdFail
-- The exception NotDone is raised if IsDone is false.
-- The exception DomainError is raised if IsEmpty is true.
-- The exception UndefinedDerivative is raised if IsTangent
-- returns True.
is static;
DirectionOnS2(me)
---Purpose: Returns the tangent at the intersection line in the
-- parametric space of the second surface.
returns Dir2d from gp
---C++: return const&
---C++: inline
raises NotDone from StdFail,
DomainError from Standard,
UndefinedDerivative from StdFail
-- The exception NotDone is raised if IsDone is false.
-- The exception DomainError is raised if IsEmpty is true.
-- The exception UndefinedDerivative is raised if IsTangent
-- returns True.
is static;
Function(me: in out)
---Purpose: return the math function which
-- is used to compute the intersection
returns TheFunction
---C++: return &
---C++: inline
is static;
ChangePoint(me: in out)
---Purpose: return the intersection point which is
-- enable for changing.
returns PntOn2S from IntSurf
---C++: return &
---C++: inline
is static;
fields
done : Boolean from Standard;
empty : Boolean from Standard;
pint : PntOn2S from IntSurf;
tangent : Boolean from Standard;
d3d : Dir from gp;
d2d1 : Dir2d from gp;
d2d2 : Dir2d from gp;
myZerParFunc : TheFunction;
tol : Real from Standard;
ua0,va0,ua1,va1 : Real from Standard; -- surf1
ub0,vb0,ub1,vb1 : Real from Standard; -- surf2
ures1,ures2,vres1,vres2 : Real from Standard; -- U et V Resolution
end Int2S;

View File

@@ -1,135 +0,0 @@
-- Created on: 1993-01-14
-- Created by: Isabelle GRIGNON
-- Copyright (c) 1993-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 IntCS from IntImp
(ThePSurface as any;
ThePSurfaceTool as any;
TheCurve as any;
TheCurveTool as any;
TheFunction as any)
---Purpose: intersection between a curve and a surface with a close
-- point
uses Pnt from gp,
FunctionSetRoot from math
raises NotDone from StdFail,
DomainError from Standard
is
Create( U,V,W : Real from Standard;
F : TheFunction;
TolTangency : Real;
MarginCoef : Real = 0.0)
---Purpose: compute the solution point with the close point
-- MarginCoef is the coefficient for extension of UV bounds.
-- Ex., UFirst -= MarginCoef*(ULast-UFirst)
returns IntCS from IntImp;
Create( F : TheFunction;
TolTangency : Real from Standard)
---Purpose: initialize the parameters to compute the solution
returns IntCS from IntImp;
Perform(me : in out; U,V,W : Real from Standard;
Rsnld : in out FunctionSetRoot from math;
u0,v0,u1,v1,w0,w1 : Real from Standard)
---Purpose: compute the solution
-- it's possible to write to optimize:
-- IntImp_IntCS inter(S1,C1,Toltangency)
-- math_FunctionSetRoot rsnld(Inter.function())
-- while ...{
-- u=...
-- v=...
-- w=...
-- inter.Perform(u,v,w,rsnld)
-- }
-- or
-- IntImp_IntCS inter(Toltangency)
-- inter.SetSurface(S);
-- math_FunctionSetRoot rsnld(Inter.function())
-- while ...{
-- C=...
-- inter.SetCurve(C);
-- u=...
-- v=...
-- w=...
-- inter.Perform(u,v,w,rsnld)
-- }
--
is static;
IsDone(me) returns Boolean from Standard
---Purpose: Returns TRUE if the creation completed without failure.
is static;
IsEmpty(me) returns Boolean from Standard
raises NotDone from StdFail
is static;
Point(me)
---Purpose: returns the intersection point
-- The exception NotDone is raised if IsDone is false.
-- The exception DomainError is raised if IsEmpty is true.
returns Pnt from gp
---C++: return const &
raises NotDone from StdFail,
DomainError from Standard
is static;
ParameterOnCurve(me) returns Real from Standard
raises NotDone from StdFail,
DomainError from Standard
is static;
ParameterOnSurface(me;U,V : out Real from Standard)
raises NotDone from StdFail,
DomainError from Standard
is static;
Function(me: in out )
---Purpose: return the math function which
-- is used to compute the intersection
---C++: return &
returns TheFunction
is static;
fields
done : Boolean from Standard;
empty : Boolean from Standard;
myFunction : TheFunction;
w : Real from Standard;
u : Real from Standard;
v : Real from Standard;
tol : Real from Standard;
end IntCS;

View File

@@ -1,83 +0,0 @@
-- Created on: 1993-01-14
-- Created by: Isabelle GRIGNON
-- Copyright (c) 1993-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 ZerCSParFunc from IntImp
(ThePSurface as any;
ThePSurfaceTool as any;
TheCurve as any;
TheCurveTool as any)
inherits FunctionSetWithDerivatives from math
---Purpose: this function is associated to the intersection between
-- a curve in 3d space and a surface
uses Vector from math,
Matrix from math,
Pnt from gp
is
Create( S : ThePSurface;
C : TheCurve) returns ZerCSParFunc from IntImp;
NbVariables(me) returns Integer from Standard
is static;
NbEquations(me) returns Integer from Standard
is static;
Value(me : in out; X : in Vector from math;
F : out Vector from math)
returns Boolean from Standard
is static;
Derivatives(me : in out;X : in Vector from math;
D : out Matrix from math)
returns Boolean from Standard
is static;
Values(me : in out;
X : in Vector from math;
F : out Vector from math; D: out Matrix from math)
returns Boolean from Standard
is static;
Point(me)
---C++: return const&
returns Pnt from gp
is static;
Root(me) returns Real from Standard
is static;
AuxillarSurface(me)
---C++: return const&
returns ThePSurface
is static;
AuxillarCurve(me)
---C++: return const&
returns TheCurve
is static;
fields
surface : ThePSurface;
curve : TheCurve;
p : Pnt from gp;
f : Real from Standard;
end ZerCSParFunc;

View File

@@ -1,205 +0,0 @@
-- Created on: 1992-03-27
-- Created by: Isabelle GRIGNON
-- 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 ZerImpFunc from IntImp
(ThePSurface as any;
ThePSurfaceTool as any;
TheISurface as any;
TheISurfaceTool as any)
inherits FunctionSetWithDerivatives from math
---Purpose: this function is associated to IWalking
-- it's the function : F(x,y,z)=0
-- where x=X(u,v), y=Y(u,v), z=Z(u,v)
uses Vector from math,
Matrix from math,
Pnt from gp,
Vec from gp,
Dir2d from gp
raises UndefinedDerivative from StdFail
is
Create
returns ZerImpFunc from IntImp;
Create(PS: ThePSurface;
IS: TheISurface)
returns ZerImpFunc from IntImp;
Create(IS: TheISurface)
returns ZerImpFunc from IntImp;
Set(me: in out; PS: ThePSurface)
---C++: inline
is static;
SetImplicitSurface(me: in out; IS: TheISurface)
---C++: inline
is static;
Set(me: in out; Tolerance: Real from Standard)
---C++: inline
is static;
NbVariables(me)
returns Integer from Standard
is static;
NbEquations(me)
returns Integer from Standard
is static;
Value(me : in out; X : Vector from math;
F : out Vector from math)
returns Boolean from Standard
is static;
Derivatives(me : in out; X : Vector from math;
D : out Matrix from math)
returns Boolean from Standard
is static;
Values(me : in out; X : Vector from math;
F : out Vector from math;
D : out Matrix from math)
returns Boolean from Standard
is static;
Root(me)
returns Real from Standard
---C++: inline
is static;
Tolerance(me)
---Purpose: Returns the value Tol so that if Abs(Func.Root())<Tol
-- the function is considered null.
--
---C++: inline
returns Real from Standard
is static;
Point(me)
returns Pnt from gp
---C++: return const&
---C++: inline
is static;
IsTangent(me : in out)
returns Boolean from Standard
is static;
Direction3d(me: in out)
returns Vec from gp
---C++: return const&
---C++: inline
raises UndefinedDerivative from StdFail
is static;
Direction2d(me: in out)
returns Dir2d from gp
---C++: return const&
---C++: inline
raises UndefinedDerivative from StdFail
is static;
PSurface(me)
returns ThePSurface
---C++: return const&
---C++: inline
is static;
ISurface(me)
returns TheISurface
---C++: return const&
---C++: inline
is static;
fields
surf : Address from Standard; --- ThePSurface;
func : Address from Standard; --- TheISurface;
u : Real from Standard;
v : Real from Standard;
tol : Real from Standard;
pntsol : Pnt from gp;
valf : Real from Standard;
computed : Boolean from Standard;
tangent : Boolean from Standard;
tgdu : Real from Standard;
tgdv : Real from Standard;
gradient : Vec from gp;
derived : Boolean from Standard;
d1u : Vec from gp;
d1v : Vec from gp;
d3d : Vec from gp;
d2d : Dir2d from gp;
end ZerImpFunc;

View File

@@ -1,187 +0,0 @@
-- Created on: 1992-03-27
-- Created by: Isabelle GRIGNON
-- 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 ZerParFunc from IntImp
(ThePSurface as any;
ThePSurfaceTool as any)
inherits FunctionSetWithDerivatives from math
---Purpose: this function is associated to IWalking
-- it's the definition of the line F(x,y,z)=0
-- where x=X(u,v),y=Y(u,v),z=Z(u,v)
uses Pnt from gp,
Dir from gp,
Vec from gp,
Dir2d from gp,
ConstIsoparametric from IntImp,
Array1OfReal from TColStd,
Vector from math,
Matrix from math
raises UndefinedDerivative from StdFail,
ConstructionError from Standard
is
Create
---Purpose: Raises Construction Error
--
returns ZerParFunc from IntImp;
Create( S1,S2 : ThePSurface )
returns ZerParFunc from IntImp;
NbVariables(me)
returns Integer from Standard
is static;
NbEquations(me)
returns Integer from Standard
is static;
Value(me : in out;X : in Vector from math;
F : out Vector from math)
returns Boolean from Standard
is static;
Derivatives(me : in out;X : in Vector from math;
D : out Matrix from math)
returns Boolean from Standard
is static;
Values(me : in out;
X: in Vector from math;
F: out Vector from math; D: out Matrix from math)
returns Boolean from Standard
is static;
ComputeParameters(me : in out;
ChoixIso: ConstIsoparametric from IntImp;
Param: Array1OfReal from TColStd;
UVap,BornInf,BornSup,Tolerance : out Vector from math)
is static;
Root(me)
---Purpose: returns somme des fi*fi
returns Real from Standard
---C++: inline
is static;
Point(me)
returns Pnt from gp
---C++: inline
is static;
IsTangent(me : in out; UVap : Vector from math;
Param : out Array1OfReal from TColStd;
BestChoix : out ConstIsoparametric from IntImp)
returns Boolean from Standard
is static;
Direction(me)
returns Dir from gp
---C++: inline
raises UndefinedDerivative from StdFail
is static;
DirectionOnS1(me)
returns Dir2d from gp
---C++: inline
raises UndefinedDerivative from StdFail
is static;
DirectionOnS2(me)
returns Dir2d from gp
---C++: inline
raises UndefinedDerivative from StdFail
is static;
AuxillarSurface1(me)
returns ThePSurface
---C++: return const&
---C++: inline
is static;
AuxillarSurface2(me)
returns ThePSurface
---C++: return const&
---C++: inline
is static;
fields
surf1 : Address from Standard; --- ThePSurface;
surf2 : Address from Standard; --- ThePSurface;
pntsol1 : Pnt from gp; --point solution=milieu(pntsol1,pntsol2)
pntsol2 : Pnt from gp;
f : Real from Standard[3]; -- equations
compute : Boolean from Standard; --indicateur si tangence calculee
tangent : Boolean from Standard; --indicateur si tangente
tgduv : Real from Standard[4] ; --composante en u,en v de la
-- tangente ds plan tg du 1 ier et 2ieme caro
dpuv : Vec from gp[4]; -- dp/du,dp/dv sur 1ier et 2 ieme
-- caro
chxIso : ConstIsoparametric from IntImp; -- indicateur sur l'iso
-- constante
paramConst : Real from Standard; -- parametre de l iso
ua0,va0,ua1,va1 : Real from Standard; -- surf1
ub0,vb0,ub1,vb1 : Real from Standard; -- surf2
ures1,ures2,vres1,vres2 : Real from Standard; -- U et V Resolution
end ZerParFunc;