1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +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,27 +0,0 @@
-- Created on: 1993-12-13
-- Created by: Jacques GOUSSARD
-- 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.
package AppBlend
uses StdFail, MMgt, TCollection, TColStd, TColgp, GeomAbs
is
deferred class Approx;
generic class AppSurf;
end AppBlend;

View File

@@ -1,342 +0,0 @@
-- Created on: 1993-12-13
-- Created by: Jacques GOUSSARD
-- 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.
-- Modified: Fri Jul 10 11:23:35 1998
-- JCT : Add SpApprox in Perform
generic class AppSurf from AppBlend
(TheSectionGenerator as any;
TheLine as Transient)
inherits Approx from AppBlend
---Purpose: Bspline approximation of a surface.
uses Array2OfPnt from TColgp,
HArray2OfPnt from TColgp,
Array2OfReal from TColStd,
HArray2OfReal from TColStd,
Array1OfReal from TColStd,
HArray1OfReal from TColStd,
Array1OfInteger from TColStd,
HArray1OfInteger from TColStd,
Array1OfPnt2d from TColgp,
SequenceOfArray1OfPnt2d from TColgp,
ParametrizationType from Approx,
Shape from GeomAbs
raises NotDone from StdFail,
DomainError from Standard,
OutOfRange from Standard
is
Create
returns AppSurf from AppBlend;
Create(Degmin,Degmax: Integer from Standard;
Tol3d,Tol2d : Real from Standard;
NbIt: Integer from Standard;
KnownParameters : Boolean from Standard = Standard_False)
returns AppSurf from AppBlend;
Init(me: in out; Degmin,Degmax: Integer from Standard;
Tol3d,Tol2d : Real from Standard;
NbIt: Integer from Standard;
KnownParameters : Boolean from Standard = Standard_False)
is static;
SetParType(me: in out; ParType : ParametrizationType from Approx)
---Purpose: Define the type of parametrization used in the approximation
is static;
SetContinuity(me: in out; C : Shape from GeomAbs)
---Purpose: Define the Continuity used in the approximation
is static;
SetCriteriumWeight(me : in out;
W1, W2, W3 : Real)
---Purpose: define the Weights associed to the criterium used in
-- the optimization.
--
raises DomainError -- if Wi <= 0
is static;
ParType(me)
---Purpose: returns the type of parametrization used in the approximation
returns ParametrizationType from Approx
is static;
Continuity(me)
---Purpose: returns the Continuity used in the approximation
returns Shape from GeomAbs
is static;
CriteriumWeight(me ;
W1, W2, W3 : out Real)
---Purpose: returns the Weights (as percent) associed to the criterium used in
-- the optimization.
is static;
Perform(me: in out; Lin: TheLine;
SecGen: in out TheSectionGenerator;
SpApprox : Boolean from Standard = Standard_False)
is static;
PerformSmoothing(me: in out; Lin: TheLine;
SecGen: in out TheSectionGenerator)
is static;
Perform(me: in out; Lin: TheLine;
SecGen: in out TheSectionGenerator;
NbMaxP: Integer from Standard)
is static;
InternalPerform(me: in out; Lin: TheLine;
SecGen: in out TheSectionGenerator;
SpApprox : Boolean from Standard;
UseVariational: Boolean from Standard)
is static private;
IsDone(me)
returns Boolean from Standard
---C++: inline
is static;
SurfShape(me; UDegree,VDegree : out Integer from Standard;
NbUPoles,NbVPoles: out Integer from Standard;
NbUKnots,NbVKnots: out Integer from Standard)
raises NotDone from StdFail
is static;
Surface(me; TPoles : out Array2OfPnt from TColgp;
TWeights : out Array2OfReal from TColStd;
TUKnots,TVKnots : out Array1OfReal from TColStd;
TUMults,TVMults : out Array1OfInteger from TColStd)
raises NotDone from StdFail
is static;
UDegree(me)
returns Integer from Standard
---C++: inline
raises NotDone from StdFail
is static;
VDegree(me)
returns Integer from Standard
---C++: inline
raises NotDone from StdFail
is static;
SurfPoles(me)
returns Array2OfPnt from TColgp
---C++: inline
---C++: return const&
raises NotDone from StdFail
is static;
SurfWeights(me)
returns Array2OfReal from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail
is static;
SurfUKnots(me)
returns Array1OfReal from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail
is static;
SurfVKnots(me)
returns Array1OfReal from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail
is static;
SurfUMults(me)
returns Array1OfInteger from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail
is static;
SurfVMults(me)
returns Array1OfInteger from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail
is static;
NbCurves2d(me)
returns Integer from Standard
---C++: inline
raises NotDone from StdFail
is static;
Curves2dShape(me; Degree,NbPoles,NbKnots: out Integer from Standard)
raises NotDone from StdFail,
DomainError from Standard
is static;
Curve2d(me; Index: Integer from Standard;
TPoles : out Array1OfPnt2d from TColgp;
TKnots : out Array1OfReal from TColStd;
TMults : out Array1OfInteger from TColStd)
raises NotDone from StdFail,
OutOfRange from Standard,
DomainError from Standard
is static;
Curves2dDegree(me)
returns Integer from Standard
---C++: inline
raises NotDone from StdFail,
DomainError from Standard
is static;
Curve2dPoles(me; Index: Integer from Standard)
returns Array1OfPnt2d from TColgp
---C++: inline
---C++: return const&
raises NotDone from StdFail,
OutOfRange from Standard,
DomainError from Standard
is static;
Curves2dKnots(me)
returns Array1OfReal from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail,
DomainError from Standard
is static;
Curves2dMults(me)
returns Array1OfInteger from TColStd
---C++: inline
---C++: return const&
raises NotDone from StdFail,
DomainError from Standard
is static;
TolReached(me; Tol3d, Tol2d : out Real from Standard)
---C++: inline
raises NotDone from StdFail
is static;
TolCurveOnSurf(me; Index : Integer from Standard)
returns Real from Standard
raises NotDone from StdFail
is static;
fields
done : Boolean from Standard;
dmin : Integer from Standard;
dmax : Integer from Standard;
tol3d : Real from Standard;
tol2d : Real from Standard;
nbit : Integer from Standard;
udeg : Integer from Standard;
vdeg : Integer from Standard;
knownp : Boolean from Standard;
tabPoles : HArray2OfPnt from TColgp;
tabWeights : HArray2OfReal from TColStd;
tabUKnots : HArray1OfReal from TColStd;
tabVKnots : HArray1OfReal from TColStd;
tabUMults : HArray1OfInteger from TColStd;
tabVMults : HArray1OfInteger from TColStd;
seqPoles2d : SequenceOfArray1OfPnt2d from TColgp;
tol3dreached : Real from Standard;
tol2dreached : Real from Standard;
paramtype : ParametrizationType from Approx;
continuity : Shape from GeomAbs;
critweights : Real[3];
end AppSurf;

View File

@@ -1,202 +0,0 @@
-- Created on: 1996-08-27
-- Created by: Philippe MANGIN
-- Copyright (c) 1996-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 Approx from AppBlend
---Purpose: Bspline approximation of a surface.
uses Array2OfPnt from TColgp,
HArray2OfPnt from TColgp,
Array2OfReal from TColStd,
HArray2OfReal from TColStd,
Array1OfReal from TColStd,
HArray1OfReal from TColStd,
Array1OfInteger from TColStd,
HArray1OfInteger from TColStd,
Array1OfPnt2d from TColgp
raises NotDone from StdFail,
DomainError from Standard,
OutOfRange from Standard
is
IsDone(me)
returns Boolean from Standard
is deferred;
SurfShape(me; UDegree,VDegree : out Integer from Standard;
NbUPoles,NbVPoles: out Integer from Standard;
NbUKnots,NbVKnots: out Integer from Standard)
raises NotDone from StdFail
is deferred;
Surface(me; TPoles : out Array2OfPnt from TColgp;
TWeights : out Array2OfReal from TColStd;
TUKnots,TVKnots : out Array1OfReal from TColStd;
TUMults,TVMults : out Array1OfInteger from TColStd)
raises NotDone from StdFail
is deferred;
UDegree(me)
returns Integer from Standard
raises NotDone from StdFail
is deferred;
VDegree(me)
returns Integer from Standard
raises NotDone from StdFail
is deferred;
SurfPoles(me)
returns Array2OfPnt from TColgp
---C++: return const&
raises NotDone from StdFail
is deferred;
SurfWeights(me)
returns Array2OfReal from TColStd
---C++: return const&
raises NotDone from StdFail
is deferred;
SurfUKnots(me)
returns Array1OfReal from TColStd
---C++: return const&
raises NotDone from StdFail
is deferred;
SurfVKnots(me)
returns Array1OfReal from TColStd
---C++: return const&
raises NotDone from StdFail
is deferred;
SurfUMults(me)
returns Array1OfInteger from TColStd
---C++: return const&
raises NotDone from StdFail
is deferred;
SurfVMults(me)
returns Array1OfInteger from TColStd
---C++: return const&
raises NotDone from StdFail
is deferred;
NbCurves2d(me)
returns Integer from Standard
raises NotDone from StdFail
is deferred;
Curves2dShape(me; Degree,NbPoles,NbKnots: out Integer from Standard)
raises NotDone from StdFail,
DomainError from Standard
is deferred;
Curve2d(me; Index: Integer from Standard;
TPoles : out Array1OfPnt2d from TColgp;
TKnots : out Array1OfReal from TColStd;
TMults : out Array1OfInteger from TColStd)
raises NotDone from StdFail,
OutOfRange from Standard,
DomainError from Standard
is deferred;
Curves2dDegree(me)
returns Integer from Standard
raises NotDone from StdFail,
DomainError from Standard
is deferred;
Curve2dPoles(me; Index: Integer from Standard)
returns Array1OfPnt2d from TColgp
---C++: return const&
raises NotDone from StdFail,
OutOfRange from Standard,
DomainError from Standard
is deferred;
Curves2dKnots(me)
returns Array1OfReal from TColStd
---C++: return const&
raises NotDone from StdFail,
DomainError from Standard
is deferred;
Curves2dMults(me)
returns Array1OfInteger from TColStd
---C++: return const&
raises NotDone from StdFail,
DomainError from Standard
is deferred;
TolReached(me; Tol3d, Tol2d : out Real from Standard)
raises NotDone from StdFail
is deferred;
TolCurveOnSurf(me; Index : Integer from Standard)
returns Real from Standard
raises NotDone from StdFail
is deferred;
---C++: alias " Standard_EXPORT virtual ~AppBlend_Approx();"
end Approx;

View File

@@ -14,7 +14,11 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <AppBlend_Approx.ixx>
#include <AppBlend_Approx.hxx>
#include <Standard_DomainError.hxx>
#include <Standard_OutOfRange.hxx>
#include <StdFail_NotDone.hxx>
//=======================================================================
//function : AppBlend_Approx

View File

@@ -0,0 +1,109 @@
// Created on: 1996-08-27
// Created by: Philippe MANGIN
// Copyright (c) 1996-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 _AppBlend_Approx_HeaderFile
#define _AppBlend_Approx_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <TColgp_Array2OfPnt.hxx>
#include <TColStd_Array2OfReal.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_Array1OfInteger.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <Standard_Real.hxx>
class StdFail_NotDone;
class Standard_DomainError;
class Standard_OutOfRange;
//! Bspline approximation of a surface.
class AppBlend_Approx
{
public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT virtual Standard_Boolean IsDone() const = 0;
Standard_EXPORT virtual void SurfShape (Standard_Integer& UDegree, Standard_Integer& VDegree, Standard_Integer& NbUPoles, Standard_Integer& NbVPoles, Standard_Integer& NbUKnots, Standard_Integer& NbVKnots) const = 0;
Standard_EXPORT virtual void Surface (TColgp_Array2OfPnt& TPoles, TColStd_Array2OfReal& TWeights, TColStd_Array1OfReal& TUKnots, TColStd_Array1OfReal& TVKnots, TColStd_Array1OfInteger& TUMults, TColStd_Array1OfInteger& TVMults) const = 0;
Standard_EXPORT virtual Standard_Integer UDegree() const = 0;
Standard_EXPORT virtual Standard_Integer VDegree() const = 0;
Standard_EXPORT virtual const TColgp_Array2OfPnt& SurfPoles() const = 0;
Standard_EXPORT virtual const TColStd_Array2OfReal& SurfWeights() const = 0;
Standard_EXPORT virtual const TColStd_Array1OfReal& SurfUKnots() const = 0;
Standard_EXPORT virtual const TColStd_Array1OfReal& SurfVKnots() const = 0;
Standard_EXPORT virtual const TColStd_Array1OfInteger& SurfUMults() const = 0;
Standard_EXPORT virtual const TColStd_Array1OfInteger& SurfVMults() const = 0;
Standard_EXPORT virtual Standard_Integer NbCurves2d() const = 0;
Standard_EXPORT virtual void Curves2dShape (Standard_Integer& Degree, Standard_Integer& NbPoles, Standard_Integer& NbKnots) const = 0;
Standard_EXPORT virtual void Curve2d (const Standard_Integer Index, TColgp_Array1OfPnt2d& TPoles, TColStd_Array1OfReal& TKnots, TColStd_Array1OfInteger& TMults) const = 0;
Standard_EXPORT virtual Standard_Integer Curves2dDegree() const = 0;
Standard_EXPORT virtual const TColgp_Array1OfPnt2d& Curve2dPoles (const Standard_Integer Index) const = 0;
Standard_EXPORT virtual const TColStd_Array1OfReal& Curves2dKnots() const = 0;
Standard_EXPORT virtual const TColStd_Array1OfInteger& Curves2dMults() const = 0;
Standard_EXPORT virtual void TolReached (Standard_Real& Tol3d, Standard_Real& Tol2d) const = 0;
Standard_EXPORT virtual Standard_Real TolCurveOnSurf (const Standard_Integer Index) const = 0;
Standard_EXPORT virtual ~AppBlend_Approx();
protected:
private:
};
#endif // _AppBlend_Approx_HeaderFile

View File

@@ -1 +1,5 @@
AppBlend_Approx.cxx
AppBlend_Approx.hxx
AppBlend_AppSurf.gxx
AppBlend_AppSurf.lxx
AppBlend_Debug.cxx