OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

Coding - Add clang-format configuration #246

Browse Source 
New clang-format configuration added to determinate code style.
The default version is 16.
Extend CMake to copy config file to build root.
Method/function separator deprecation:
  In case if function/method has declaration in header,
    definition must not have related comment.
    Only //==== [100 chars] ==== is allowed as a not connected
    separator.
  In case if function/method has  NOT declaration in header,
    definition must have related comment in doxygen style:
    // Descriptions
    // @param
    // @return
    Or just function/method separator:
    //==== [100 chars] ====
  All old separators with no description must be replaced to
    //==== [100 chars] ====
This commit is contained in:
dpasukhi 2025-01-06 12:35:56 +00:00
parent e9855c9335
commit fe1382f3c2
49 changed files with 5690 additions and 5029 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.clang-format Normal file
View File

@ -0,0 +1,40 @@
# clang-format configuration file trying to apply OCCT coding style
#
# Clang formatting rules: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
# The clang-format npm package (https://github.com/angular/clang-format) uses
# a pre-built clang-format.exe from http://llvm.org/builds/
#
# We use defaults from the Microsoft style
BasedOnStyle: Microsoft
#
# Style options
AllowAllParametersOfDeclarationOnNextLine: false
AllowAllArgumentsOnNextLine: false
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: Consecutive
AlignConsecutiveDeclarations: Consecutive
AlignTrailingComments: true
AllowShortFunctionsOnASingleLine: Inline
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeTernaryOperators: true
ColumnLimit: 100
ContinuationIndentWidth: 2
IndentCaseLabels: true
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
PackConstructorInitializers: Never
PointerAlignment: Left
ReferenceAlignment: Left
SeparateDefinitionBlocks: Always
SortIncludes: true
UseTab: Never
#
# OCCT specific settings
StatementMacros:
- Standard_FALLTHROUGH
TypenameMacros:
- Handle

3
CMakeLists.txt
View File

@ -723,6 +723,9 @@ endif()
# the name of the project # the name of the project
project (OCCT) project (OCCT)
# copying clang-format file to the root of the project
file(COPY ${CMAKE_SOURCE_DIR}/.clang-format DESTINATION ${CMAKE_SOURCE_DIR})
# Get all used variables: OS_WITH_BIT, COMPILER # Get all used variables: OS_WITH_BIT, COMPILER
OCCT_MAKE_OS_WITH_BITNESS() OCCT_MAKE_OS_WITH_BITNESS()
OCCT_MAKE_COMPILER_SHORT_NAME() OCCT_MAKE_COMPILER_SHORT_NAME()

1
src/Approx/Approx_Array1OfAdHSurface.hxx
View File

@ -22,5 +22,4 @@
typedef NCollection_Array1<Handle(Adaptor3d_Surface)> Approx_Array1OfAdHSurface; typedef NCollection_Array1<Handle(Adaptor3d_Surface)> Approx_Array1OfAdHSurface;
#endif #endif

3
src/Approx/Approx_Array1OfGTrsf2d.hxx
View File

@ -17,10 +17,9 @@
#ifndef Approx_Array1OfGTrsf2d_HeaderFile #ifndef Approx_Array1OfGTrsf2d_HeaderFile
#define Approx_Array1OfGTrsf2d_HeaderFile #define Approx_Array1OfGTrsf2d_HeaderFile
#include <gp_GTrsf2d.hxx>
#include <NCollection_Array1.hxx> #include <NCollection_Array1.hxx>
#include <gp_GTrsf2d.hxx>
typedef NCollection_Array1<gp_GTrsf2d> Approx_Array1OfGTrsf2d; typedef NCollection_Array1<gp_GTrsf2d> Approx_Array1OfGTrsf2d;
#endif #endif

55
src/Approx/Approx_Curve2d.cxx
View File

@ -14,7 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Adaptor2d_Curve2d.hxx> #include <Adaptor2d_Curve2d.hxx>
#include <AdvApprox_ApproxAFunction.hxx> #include <AdvApprox_ApproxAFunction.hxx>
#include <AdvApprox_PrefAndRec.hxx> #include <AdvApprox_PrefAndRec.hxx>
@ -23,16 +22,19 @@
#include <Precision.hxx> #include <Precision.hxx>
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
//======================================================================= //=================================================================================================
//class : Approx_Curve2d_Eval
//purpose: evaluator class for approximation
//=======================================================================
class Approx_Curve2d_Eval : public AdvApprox_EvaluatorFunction class Approx_Curve2d_Eval : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_Curve2d_Eval(const Handle(Adaptor2d_Curve2d)& theFunc, Approx_Curve2d_Eval(const Handle(Adaptor2d_Curve2d)& theFunc,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct(theFunc)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -57,11 +59,13 @@ void Approx_Curve2d_Eval::Evaluate (Standard_Integer *Dimension,
Standard_Real par = *Param; Standard_Real par = *Param;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension!=2) { if (*Dimension != 2)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
// Parameter is incorrect // Parameter is incorrect
if ( par < StartEnd[0] || par > StartEnd[1] ) { if (par < StartEnd[0] || par > StartEnd[1])
{
*ErrorCode = 2; *ErrorCode = 2;
} }
if (StartEnd[0] != StartEndSav[0] || StartEnd[1] != StartEndSav[1]) if (StartEnd[0] != StartEndSav[0] || StartEnd[1] != StartEndSav[1])
@ -73,7 +77,8 @@ void Approx_Curve2d_Eval::Evaluate (Standard_Integer *Dimension,
gp_Pnt2d pnt; gp_Pnt2d pnt;
gp_Vec2d v1, v2; gp_Vec2d v1, v2;
switch (*Order) { switch (*Order)
{
case 0: case 0:
pnt = fonct->Value(par); pnt = fonct->Value(par);
Result[0] = pnt.X(); Result[0] = pnt.X();
@ -96,7 +101,14 @@ void Approx_Curve2d_Eval::Evaluate (Standard_Integer *Dimension,
} }
} }
Approx_Curve2d::Approx_Curve2d(const Handle(Adaptor2d_Curve2d)& C2D,const Standard_Real First,const Standard_Real Last,const Standard_Real TolU,const Standard_Real TolV,const GeomAbs_Shape Continuity,const Standard_Integer MaxDegree,const Standard_Integer MaxSegments) Approx_Curve2d::Approx_Curve2d(const Handle(Adaptor2d_Curve2d)& C2D,
const Standard_Real First,
const Standard_Real Last,
const Standard_Real TolU,
const Standard_Real TolV,
const GeomAbs_Shape Continuity,
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments)
{ {
C2D->Trim(First, Last, Precision::PConfusion()); C2D->Trim(First, Last, Precision::PConfusion());
@ -119,16 +131,25 @@ void Approx_Curve2d_Eval::Evaluate (Standard_Integer *Dimension,
myMaxError2dV = 0; myMaxError2dV = 0;
Approx_Curve2d_Eval ev(C2D, First, Last); Approx_Curve2d_Eval ev(C2D, First, Last);
AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, AdvApprox_ApproxAFunction aApprox(Num1DSS,
OneDTol, TwoDTolNul, ThreeDTolNul, Num2DSS,
First, Last, Continuity, Num3DSS,
MaxDegree, MaxSegments, OneDTol,
ev, CutTool); TwoDTolNul,
ThreeDTolNul,
First,
Last,
Continuity,
MaxDegree,
MaxSegments,
ev,
CutTool);
myIsDone = aApprox.IsDone(); myIsDone = aApprox.IsDone();
myHasResult = aApprox.HasResult(); myHasResult = aApprox.HasResult();
if (myHasResult) { if (myHasResult)
{
TColgp_Array1OfPnt2d Poles2d(1, aApprox.NbPoles()); TColgp_Array1OfPnt2d Poles2d(1, aApprox.NbPoles());
TColStd_Array1OfReal Poles1dU(1, aApprox.NbPoles()); TColStd_Array1OfReal Poles1dU(1, aApprox.NbPoles());
aApprox.Poles1d(1, Poles1dU); aApprox.Poles1d(1, Poles1dU);

15
src/Approx/Approx_Curve2d.hxx
View File

@ -18,18 +18,23 @@
#define _Approx_Curve2d_HeaderFile #define _Approx_Curve2d_HeaderFile
#include <Adaptor2d_Curve2d.hxx> #include <Adaptor2d_Curve2d.hxx>
#include <GeomAbs_Shape.hxx>
#include <Geom2d_BSplineCurve.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <GeomAbs_Shape.hxx>
//! Makes an approximation for HCurve2d from Adaptor3d //! Makes an approximation for HCurve2d from Adaptor3d
class Approx_Curve2d class Approx_Curve2d
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
Standard_EXPORT Approx_Curve2d(const Handle(Adaptor2d_Curve2d)& C2D,
Standard_EXPORT Approx_Curve2d(const Handle(Adaptor2d_Curve2d)& C2D, const Standard_Real First, const Standard_Real Last, const Standard_Real TolU, const Standard_Real TolV, const GeomAbs_Shape Continuity, const Standard_Integer MaxDegree, const Standard_Integer MaxSegments); const Standard_Real First,
const Standard_Real Last,
const Standard_Real TolU,
const Standard_Real TolV,
const GeomAbs_Shape Continuity,
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments);
Standard_EXPORT Standard_Boolean IsDone() const; Standard_EXPORT Standard_Boolean IsDone() const;
@ -42,13 +47,11 @@ public:
Standard_EXPORT Standard_Real MaxError2dV() const; Standard_EXPORT Standard_Real MaxError2dV() const;
private: private:
Handle(Geom2d_BSplineCurve) myCurve; Handle(Geom2d_BSplineCurve) myCurve;
Standard_Boolean myIsDone; Standard_Boolean myIsDone;
Standard_Boolean myHasResult; Standard_Boolean myHasResult;
Standard_Real myMaxError2dU; Standard_Real myMaxError2dU;
Standard_Real myMaxError2dV; Standard_Real myMaxError2dV;
}; };
#endif // _Approx_Curve2d_HeaderFile #endif // _Approx_Curve2d_HeaderFile

53
src/Approx/Approx_Curve3d.cxx
View File

@ -19,24 +19,27 @@
#include <Adaptor3d_Curve.hxx> #include <Adaptor3d_Curve.hxx>
#include <AdvApprox_ApproxAFunction.hxx> #include <AdvApprox_ApproxAFunction.hxx>
#include <AdvApprox_PrefAndRec.hxx> #include <AdvApprox_PrefAndRec.hxx>
#include <Geom_BSplineCurve.hxx>
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Precision.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <Precision.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColStd_HArray1OfReal.hxx>
//======================================================================= //=================================================================================================
//class : Approx_Curve3d_Eval
//purpose: evaluator class for approximation
//=======================================================================
class Approx_Curve3d_Eval : public AdvApprox_EvaluatorFunction class Approx_Curve3d_Eval : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_Curve3d_Eval(const Handle(Adaptor3d_Curve)& theFunc, Approx_Curve3d_Eval(const Handle(Adaptor3d_Curve)& theFunc,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct(theFunc)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -61,7 +64,8 @@ void Approx_Curve3d_Eval::Evaluate (Standard_Integer *Dimension,
Standard_Real par = *Param; Standard_Real par = *Param;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension!=3) { if (*Dimension != 3)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
@ -75,7 +79,8 @@ void Approx_Curve3d_Eval::Evaluate (Standard_Integer *Dimension,
gp_Pnt pnt; gp_Pnt pnt;
gp_Vec v1, v2; gp_Vec v1, v2;
switch (*Order) { switch (*Order)
{
case 0: case 0:
pnt = fonct->Value(par); pnt = fonct->Value(par);
Result[0] = pnt.X(); Result[0] = pnt.X();
@ -111,8 +116,7 @@ Approx_Curve3d::Approx_Curve3d(const Handle(Adaptor3d_Curve)& Curve,
Standard_Integer Num1DSS = 0, Num2DSS = 0, Num3DSS = 1; Standard_Integer Num1DSS = 0, Num2DSS = 0, Num3DSS = 1;
Handle(TColStd_HArray1OfReal) OneDTolNul, TwoDTolNul; Handle(TColStd_HArray1OfReal) OneDTolNul, TwoDTolNul;
Handle(TColStd_HArray1OfReal) ThreeDTol = Handle(TColStd_HArray1OfReal) ThreeDTol = new TColStd_HArray1OfReal(1, Num3DSS);
new TColStd_HArray1OfReal(1,Num3DSS);
ThreeDTol->Init(Tol3d); ThreeDTol->Init(Tol3d);
Standard_Real First = Curve->FirstParameter(); Standard_Real First = Curve->FirstParameter();
@ -130,16 +134,25 @@ Approx_Curve3d::Approx_Curve3d(const Handle(Adaptor3d_Curve)& Curve,
myMaxError = 0; myMaxError = 0;
Approx_Curve3d_Eval ev(Curve, First, Last); Approx_Curve3d_Eval ev(Curve, First, Last);
AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, AdvApprox_ApproxAFunction aApprox(Num1DSS,
OneDTolNul, TwoDTolNul, ThreeDTol, Num2DSS,
First, Last, Order, Num3DSS,
MaxDegree, MaxSegments, OneDTolNul,
ev, CutTool); TwoDTolNul,
ThreeDTol,
First,
Last,
Order,
MaxDegree,
MaxSegments,
ev,
CutTool);
myIsDone = aApprox.IsDone(); myIsDone = aApprox.IsDone();
myHasResult = aApprox.HasResult(); myHasResult = aApprox.HasResult();
if (myHasResult) { if (myHasResult)
{
TColgp_Array1OfPnt Poles(1, aApprox.NbPoles()); TColgp_Array1OfPnt Poles(1, aApprox.NbPoles());
aApprox.Poles(1, Poles); aApprox.Poles(1, Poles);
Handle(TColStd_HArray1OfReal) Knots = aApprox.Knots(); Handle(TColStd_HArray1OfReal) Knots = aApprox.Knots();

10
src/Approx/Approx_Curve3d.hxx
View File

@ -24,13 +24,15 @@
class Approx_Curve3d class Approx_Curve3d
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! Approximation of a curve with respect of the //! Approximation of a curve with respect of the
//! required tolerance Tol3D. //! required tolerance Tol3D.
Standard_EXPORT Approx_Curve3d(const Handle(Adaptor3d_Curve)& Curve, const Standard_Real Tol3d, const GeomAbs_Shape Order, const Standard_Integer MaxSegments, const Standard_Integer MaxDegree); Standard_EXPORT Approx_Curve3d(const Handle(Adaptor3d_Curve)& Curve,
const Standard_Real Tol3d,
const GeomAbs_Shape Order,
const Standard_Integer MaxSegments,
const Standard_Integer MaxDegree);
Standard_EXPORT Handle(Geom_BSplineCurve) Curve() const; Standard_EXPORT Handle(Geom_BSplineCurve) Curve() const;
@ -51,12 +53,10 @@ public:
Standard_EXPORT void Dump(Standard_OStream& o) const; Standard_EXPORT void Dump(Standard_OStream& o) const;
private: private:
Standard_Boolean myIsDone; Standard_Boolean myIsDone;
Standard_Boolean myHasResult; Standard_Boolean myHasResult;
Handle(Geom_BSplineCurve) myBSplCurve; Handle(Geom_BSplineCurve) myBSplCurve;
Standard_Real myMaxError; Standard_Real myMaxError;
}; };
#endif // _Approx_Curve3d_HeaderFile #endif // _Approx_Curve3d_HeaderFile

182
src/Approx/Approx_CurveOnSurface.cxx
View File

@ -24,36 +24,39 @@
#include <AdvApprox_ApproxAFunction.hxx> #include <AdvApprox_ApproxAFunction.hxx>
#include <AdvApprox_DichoCutting.hxx> #include <AdvApprox_DichoCutting.hxx>
#include <AdvApprox_PrefAndRec.hxx> #include <AdvApprox_PrefAndRec.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <Geom2d_BSplineCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx> #include <Geom2dAdaptor_Curve.hxx>
#include <Geom_RectangularTrimmedSurface.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <Geom_TrimmedCurve.hxx> #include <Geom2d_BezierCurve.hxx>
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <GeomConvert.hxx> #include <GeomConvert.hxx>
#include <Geom_RectangularTrimmedSurface.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <Precision.hxx>
#include <Standard_ConstructionError.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <gp_Lin2d.hxx> #include <gp_Lin2d.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <Precision.hxx>
#include <Standard_ConstructionError.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_HArray1OfReal.hxx>
//======================================================================= //=================================================================================================
//class : Approx_CurveOnSurface_Eval
//purpose: evaluator class for approximation of both 2d and 3d curves
//=======================================================================
class Approx_CurveOnSurface_Eval : public AdvApprox_EvaluatorFunction class Approx_CurveOnSurface_Eval : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_CurveOnSurface_Eval(const Handle(Adaptor3d_Curve)& theFunc, Approx_CurveOnSurface_Eval(const Handle(Adaptor3d_Curve)& theFunc,
const Handle(Adaptor2d_Curve2d)& theFunc2d, const Handle(Adaptor2d_Curve2d)& theFunc2d,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc), fonct2d(theFunc2d) Standard_Real Last)
{ StartEndSav[0] = First; StartEndSav[1] = Last; } : fonct(theFunc),
fonct2d(theFunc2d)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -79,7 +82,8 @@ void Approx_CurveOnSurface_Eval::Evaluate (Standard_Integer *Dimension,
Standard_Real par = *Param; Standard_Real par = *Param;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension != 5) { if (*Dimension != 5)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
@ -87,19 +91,17 @@ void Approx_CurveOnSurface_Eval::Evaluate (Standard_Integer *Dimension,
if (StartEnd[0] != StartEndSav[0] || StartEnd[1] != StartEndSav[1]) if (StartEnd[0] != StartEndSav[0] || StartEnd[1] != StartEndSav[1])
{ {
fonct = fonct->Trim(StartEnd[0], StartEnd[1], Precision::PConfusion()); fonct = fonct->Trim(StartEnd[0], StartEnd[1], Precision::PConfusion());
fonct2d = fonct2d->Trim(StartEnd[0],StartEnd[1], fonct2d = fonct2d->Trim(StartEnd[0], StartEnd[1], Precision::PConfusion());
Precision::PConfusion());
StartEndSav[0] = StartEnd[0]; StartEndSav[0] = StartEnd[0];
StartEndSav[1] = StartEnd[1]; StartEndSav[1] = StartEnd[1];
} }
gp_Pnt pnt; gp_Pnt pnt;
gp_Pnt2d pnt2d; gp_Pnt2d pnt2d;
switch (*Order) { switch (*Order)
case 0:
{ {
case 0: {
fonct2d->D0(par, pnt2d); fonct2d->D0(par, pnt2d);
fonct->D0(par, pnt); fonct->D0(par, pnt);
Result[0] = pnt2d.X(); Result[0] = pnt2d.X();
@ -109,8 +111,7 @@ void Approx_CurveOnSurface_Eval::Evaluate (Standard_Integer *Dimension,
Result[4] = pnt.Z(); Result[4] = pnt.Z();
break; break;
} }
case 1: case 1: {
{
gp_Vec v1; gp_Vec v1;
gp_Vec2d v21; gp_Vec2d v21;
fonct2d->D1(par, pnt2d, v21); fonct2d->D1(par, pnt2d, v21);
@ -122,8 +123,7 @@ void Approx_CurveOnSurface_Eval::Evaluate (Standard_Integer *Dimension,
Result[4] = v1.Z(); Result[4] = v1.Z();
break; break;
} }
case 2: case 2: {
{
gp_Vec v1, v2; gp_Vec v1, v2;
gp_Vec2d v21, v22; gp_Vec2d v21, v22;
fonct2d->D2(par, pnt2d, v21, v22); fonct2d->D2(par, pnt2d, v21, v22);
@ -142,17 +142,19 @@ void Approx_CurveOnSurface_Eval::Evaluate (Standard_Integer *Dimension,
} }
} }
//======================================================================= //=================================================================================================
//class : Approx_CurveOnSurface_Eval3d
//purpose: evaluator class for approximation of 3d curve
//=======================================================================
class Approx_CurveOnSurface_Eval3d : public AdvApprox_EvaluatorFunction class Approx_CurveOnSurface_Eval3d : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_CurveOnSurface_Eval3d(const Handle(Adaptor3d_Curve)& theFunc, Approx_CurveOnSurface_Eval3d(const Handle(Adaptor3d_Curve)& theFunc,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct(theFunc)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -177,7 +179,8 @@ void Approx_CurveOnSurface_Eval3d::Evaluate (Standard_Integer *Dimension,
Standard_Real par = *Param; Standard_Real par = *Param;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension != 3) { if (*Dimension != 3)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
@ -191,15 +194,15 @@ void Approx_CurveOnSurface_Eval3d::Evaluate (Standard_Integer *Dimension,
gp_Pnt pnt; gp_Pnt pnt;
switch (*Order) { switch (*Order)
{
case 0: case 0:
pnt = fonct->Value(par); pnt = fonct->Value(par);
Result[0] = pnt.X(); Result[0] = pnt.X();
Result[1] = pnt.Y(); Result[1] = pnt.Y();
Result[2] = pnt.Z(); Result[2] = pnt.Z();
break; break;
case 1: case 1: {
{
gp_Vec v1; gp_Vec v1;
fonct->D1(par, pnt, v1); fonct->D1(par, pnt, v1);
Result[0] = v1.X(); Result[0] = v1.X();
@ -207,8 +210,7 @@ void Approx_CurveOnSurface_Eval3d::Evaluate (Standard_Integer *Dimension,
Result[2] = v1.Z(); Result[2] = v1.Z();
break; break;
} }
case 2: case 2: {
{
gp_Vec v1, v2; gp_Vec v1, v2;
fonct->D2(par, pnt, v1, v2); fonct->D2(par, pnt, v1, v2);
Result[0] = v2.X(); Result[0] = v2.X();
@ -223,17 +225,19 @@ void Approx_CurveOnSurface_Eval3d::Evaluate (Standard_Integer *Dimension,
} }
} }
//======================================================================= //=================================================================================================
//class : Approx_CurveOnSurface_Eval2d
//purpose: evaluator class for approximation of 2d curve
//=======================================================================
class Approx_CurveOnSurface_Eval2d : public AdvApprox_EvaluatorFunction class Approx_CurveOnSurface_Eval2d : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_CurveOnSurface_Eval2d(const Handle(Adaptor2d_Curve2d)& theFunc2d, Approx_CurveOnSurface_Eval2d(const Handle(Adaptor2d_Curve2d)& theFunc2d,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct2d(theFunc2d) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct2d(theFunc2d)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -258,7 +262,8 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
Standard_Real par = *Param; Standard_Real par = *Param;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension != 2) { if (*Dimension != 2)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
@ -272,24 +277,22 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
gp_Pnt2d pnt; gp_Pnt2d pnt;
switch (*Order) { switch (*Order)
case 0:
{ {
case 0: {
pnt = fonct2d->Value(par); pnt = fonct2d->Value(par);
Result[0] = pnt.X(); Result[0] = pnt.X();
Result[1] = pnt.Y(); Result[1] = pnt.Y();
break; break;
} }
case 1: case 1: {
{
gp_Vec2d v1; gp_Vec2d v1;
fonct2d->D1(par, pnt, v1); fonct2d->D1(par, pnt, v1);
Result[0] = v1.X(); Result[0] = v1.X();
Result[1] = v1.Y(); Result[1] = v1.Y();
break; break;
} }
case 2: case 2: {
{
gp_Vec2d v1, v2; gp_Vec2d v1, v2;
fonct2d->D2(par, pnt, v1, v2); fonct2d->D2(par, pnt, v1, v2);
Result[0] = v2.X(); Result[0] = v2.X();
@ -303,10 +306,8 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
} }
} }
//============================================================================= //=================================================================================================
//function : Approx_CurveOnSurface
//purpose : Constructor
//=============================================================================
Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& C2D, Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& C2D,
const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_Surface)& Surf,
const Standard_Real First, const Standard_Real First,
@ -331,10 +332,8 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
Perform(MaxSegments, MaxDegree, S, only3d, only2d); Perform(MaxSegments, MaxDegree, S, only3d, only2d);
} }
//============================================================================= //=================================================================================================
//function : Approx_CurveOnSurface
//purpose : Constructor
//=============================================================================
Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& theC2D, Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& theC2D,
const Handle(Adaptor3d_Surface)& theSurf, const Handle(Adaptor3d_Surface)& theSurf,
const Standard_Real theFirst, const Standard_Real theFirst,
@ -353,10 +352,8 @@ void Approx_CurveOnSurface_Eval2d::Evaluate (Standard_Integer *Dimension,
{ {
} }
//============================================================================= //=================================================================================================
//function : Perform
//purpose :
//=============================================================================
void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments, void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
const Standard_Integer theMaxDegree, const Standard_Integer theMaxDegree,
const GeomAbs_Shape theContinuity, const GeomAbs_Shape theContinuity,
@ -369,7 +366,8 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
myError2dV = 0.0; myError2dV = 0.0;
myError3d = 0.0; myError3d = 0.0;
if(theOnly3d && theOnly2d) throw Standard_ConstructionError(); if (theOnly3d && theOnly2d)
throw Standard_ConstructionError();
GeomAbs_Shape aContinuity = theContinuity; GeomAbs_Shape aContinuity = theContinuity;
if (aContinuity == GeomAbs_G1) if (aContinuity == GeomAbs_G1)
@ -405,12 +403,16 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
Approx_CurveOnSurface_Eval2d Eval2dCvOnSurf(TrimmedC2D, myFirst, myLast); Approx_CurveOnSurface_Eval2d Eval2dCvOnSurf(TrimmedC2D, myFirst, myLast);
Approx_CurveOnSurface_Eval EvalCvOnSurf(HCOnS, TrimmedC2D, myFirst, myLast); Approx_CurveOnSurface_Eval EvalCvOnSurf(HCOnS, TrimmedC2D, myFirst, myLast);
AdvApprox_EvaluatorFunction* EvalPtr; AdvApprox_EvaluatorFunction* EvalPtr;
if ( theOnly3d ) EvalPtr = &Eval3dCvOnSurf; if (theOnly3d)
else if ( theOnly2d ) EvalPtr = &Eval2dCvOnSurf; EvalPtr = &Eval3dCvOnSurf;
else EvalPtr = &EvalCvOnSurf; else if (theOnly2d)
EvalPtr = &Eval2dCvOnSurf;
else
EvalPtr = &EvalCvOnSurf;
// Initialization for 2d approximation // Initialization for 2d approximation
if(!theOnly3d) { if (!theOnly3d)
{
Num1DSS = 2; Num1DSS = 2;
OneDTol = new TColStd_HArray1OfReal(1, Num1DSS); OneDTol = new TColStd_HArray1OfReal(1, Num1DSS);
@ -439,7 +441,8 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
OneDTol->SetValue(2, TolV); OneDTol->SetValue(2, TolV);
} }
if(!theOnly2d) { if (!theOnly2d)
{
Num3DSS = 1; Num3DSS = 1;
ThreeDTol = new TColStd_HArray1OfReal(1, Num3DSS); ThreeDTol = new TColStd_HArray1OfReal(1, Num3DSS);
ThreeDTol->Init(myTol / 2); ThreeDTol->Init(myTol / 2);
@ -447,9 +450,8 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
AdvApprox_Cutting* CutTool; AdvApprox_Cutting* CutTool;
if (aContinuity <= myC2D->Continuity() && if (aContinuity <= myC2D->Continuity() && aContinuity <= mySurf->UContinuity()
aContinuity <= mySurf->UContinuity() && && aContinuity <= mySurf->VContinuity())
aContinuity <= mySurf->VContinuity())
{ {
CutTool = new AdvApprox_DichoCutting(); CutTool = new AdvApprox_DichoCutting();
} }
@ -476,18 +478,27 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
CutTool = new AdvApprox_PrefAndRec(CutPnts_C2, CutPnts_C3); CutTool = new AdvApprox_PrefAndRec(CutPnts_C2, CutPnts_C3);
} }
AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, AdvApprox_ApproxAFunction aApprox(Num1DSS,
OneDTol, TwoDTolNul, ThreeDTol, Num2DSS,
myFirst, myLast, aContinuity, Num3DSS,
theMaxDegree, theMaxSegments, OneDTol,
*EvalPtr, *CutTool); TwoDTolNul,
ThreeDTol,
myFirst,
myLast,
aContinuity,
theMaxDegree,
theMaxSegments,
*EvalPtr,
*CutTool);
delete CutTool; delete CutTool;
myIsDone = aApprox.IsDone(); myIsDone = aApprox.IsDone();
myHasResult = aApprox.HasResult(); myHasResult = aApprox.HasResult();
if (myHasResult) { if (myHasResult)
{
Handle(TColStd_HArray1OfReal) Knots = aApprox.Knots(); Handle(TColStd_HArray1OfReal) Knots = aApprox.Knots();
Handle(TColStd_HArray1OfInteger) Mults = aApprox.Multiplicities(); Handle(TColStd_HArray1OfInteger) Mults = aApprox.Multiplicities();
Standard_Integer Degree = aApprox.Degree(); Standard_Integer Degree = aApprox.Degree();
@ -514,7 +525,6 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
myError2dV = aApprox.MaxError(1, 2); myError2dV = aApprox.MaxError(1, 2);
} }
} }
} }
Standard_Boolean Approx_CurveOnSurface::IsDone() const Standard_Boolean Approx_CurveOnSurface::IsDone() const
@ -552,10 +562,8 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
return myError2dV; return myError2dV;
} }
//============================================================================= //=================================================================================================
//function : isIsoLine
//purpose :
//=============================================================================
Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D, Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
Standard_Boolean& theIsU, Standard_Boolean& theIsU,
Standard_Real& theParam, Standard_Real& theParam,
@ -634,10 +642,8 @@ Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d
#include <GeomLib.hxx> #include <GeomLib.hxx>
//============================================================================= //=================================================================================================
//function : buildC3dOnIsoLine
//purpose :
//=============================================================================
Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D, Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
const Standard_Boolean theIsU, const Standard_Boolean theIsU,
const Standard_Real theParam, const Standard_Real theParam,

18
src/Approx/Approx_CurveOnSurface.hxx
View File

@ -28,12 +28,21 @@ class Geom2d_BSplineCurve;
class Approx_CurveOnSurface class Approx_CurveOnSurface
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! This constructor calls perform method. This constructor is deprecated. //! This constructor calls perform method. This constructor is deprecated.
Standard_DEPRECATED("This constructor is deprecated. Use other constructor and perform method instead.") Standard_DEPRECATED(
Standard_EXPORT Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& C2D, const Handle(Adaptor3d_Surface)& Surf, const Standard_Real First, const Standard_Real Last, const Standard_Real Tol, const GeomAbs_Shape Continuity, const Standard_Integer MaxDegree, const Standard_Integer MaxSegments, const Standard_Boolean Only3d = Standard_False, const Standard_Boolean Only2d = Standard_False); "This constructor is deprecated. Use other constructor and perform method instead.")
Standard_EXPORT Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& C2D,
const Handle(Adaptor3d_Surface)& Surf,
const Standard_Real First,
const Standard_Real Last,
const Standard_Real Tol,
const GeomAbs_Shape Continuity,
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments,
const Standard_Boolean Only3d = Standard_False,
const Standard_Boolean Only2d = Standard_False);
//! This constructor does not call perform method. //! This constructor does not call perform method.
//! @param theC2D 2D Curve to be approximated in 3D. //! @param theC2D 2D Curve to be approximated in 3D.
@ -77,7 +86,6 @@ public:
const Standard_Boolean theOnly2d = Standard_False); const Standard_Boolean theOnly2d = Standard_False);
protected: protected:
//! Checks whether the 2d curve is a isoline. It can be represented by b-spline, bezier, //! Checks whether the 2d curve is a isoline. It can be represented by b-spline, bezier,
//! or geometric line. This line should have natural parameterization. //! or geometric line. This line should have natural parameterization.
//! @param theC2D Trimmed curve to be checked. //! @param theC2D Trimmed curve to be checked.
@ -106,7 +114,6 @@ private:
Approx_CurveOnSurface& operator=(const Approx_CurveOnSurface&); Approx_CurveOnSurface& operator=(const Approx_CurveOnSurface&);
private: private:
//! Input curve. //! Input curve.
const Handle(Adaptor2d_Curve2d) myC2D; const Handle(Adaptor2d_Curve2d) myC2D;
@ -129,7 +136,6 @@ private:
Standard_Real myError3d; Standard_Real myError3d;
Standard_Real myError2dU; Standard_Real myError2dU;
Standard_Real myError2dV; Standard_Real myError2dV;
}; };
#endif // _Approx_CurveOnSurface_HeaderFile #endif // _Approx_CurveOnSurface_HeaderFile

203
src/Approx/Approx_CurvilinearParameter.cxx
View File

@ -23,26 +23,27 @@
#include <AdvApprox_PrefAndRec.hxx> #include <AdvApprox_PrefAndRec.hxx>
#include <Approx_CurvlinFunc.hxx> #include <Approx_CurvlinFunc.hxx>
#include <Geom2d_BSplineCurve.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <Geom_BSplineCurve.hxx>
#include <GeomAbs_Shape.hxx> #include <GeomAbs_Shape.hxx>
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Precision.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <math_Vector.hxx> #include <math_Vector.hxx>
#include <Precision.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_HArray1OfReal.hxx>
#ifdef OCCT_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
#include <OSD_Timer.hxx> #include <OSD_Timer.hxx>
static OSD_Chronometer chr_total, chr_init, chr_approx; static OSD_Chronometer chr_total, chr_init, chr_approx;
Standard_Real t_total, t_init, t_approx; Standard_Real t_total, t_init, t_approx;
void InitChron(OSD_Chronometer& ch) void InitChron(OSD_Chronometer& ch)
{ {
ch.Reset(); ch.Reset();
@ -61,17 +62,19 @@ Standard_IMPORT Standard_Integer uparam_count;
Standard_IMPORT Standard_Real t_uparam; Standard_IMPORT Standard_Real t_uparam;
#endif #endif
//======================================================================= //=================================================================================================
//class : Approx_CurvilinearParameter_EvalCurv
//purpose : case of a free 3D curve
//=======================================================================
class Approx_CurvilinearParameter_EvalCurv : public AdvApprox_EvaluatorFunction class Approx_CurvilinearParameter_EvalCurv : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_CurvilinearParameter_EvalCurv(const Handle(Approx_CurvlinFunc)& theFunc, Approx_CurvilinearParameter_EvalCurv(const Handle(Approx_CurvlinFunc)& theFunc,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct(theFunc)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -98,11 +101,13 @@ void Approx_CurvilinearParameter_EvalCurv::Evaluate (Standard_Integer * Dimensio
Standard_Integer i; Standard_Integer i;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension != 3) { if (*Dimension != 3)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
// Parameter is incorrect // Parameter is incorrect
if ( S < StartEnd[0] || S > StartEnd[1] ) { if (S < StartEnd[0] || S > StartEnd[1])
{
*ErrorCode = 2; *ErrorCode = 2;
} }
@ -113,7 +118,8 @@ void Approx_CurvilinearParameter_EvalCurv::Evaluate (Standard_Integer * Dimensio
StartEndSav[1] = StartEnd[1]; StartEndSav[1] = StartEnd[1];
} }
if(!fonct->EvalCase1(S, *Order, Res)) { if (!fonct->EvalCase1(S, *Order, Res))
{
*ErrorCode = 3; *ErrorCode = 3;
} }
@ -166,11 +172,19 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
#endif #endif
Approx_CurvilinearParameter_EvalCurv evC(fonct, FirstS, LastS); Approx_CurvilinearParameter_EvalCurv evC(fonct, FirstS, LastS);
AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, AdvApprox_ApproxAFunction aApprox(Num1DSS,
OneDTolNul, TwoDTolNul, ThreeDTol, Num2DSS,
FirstS, LastS, Order, Num3DSS,
MaxDegree, MaxSegments, OneDTolNul,
evC, CutTool); TwoDTolNul,
ThreeDTol,
FirstS,
LastS,
Order,
MaxDegree,
MaxSegments,
evC,
CutTool);
#ifdef OCCT_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx, t_approx); ResultChron(chr_approx, t_approx);
@ -179,7 +193,8 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
myDone = aApprox.IsDone(); myDone = aApprox.IsDone();
myHasResult = aApprox.HasResult(); myHasResult = aApprox.HasResult();
if (myHasResult) { if (myHasResult)
{
TColgp_Array1OfPnt Poles(1, aApprox.NbPoles()); TColgp_Array1OfPnt Poles(1, aApprox.NbPoles());
aApprox.Poles(1, Poles); aApprox.Poles(1, Poles);
Handle(TColStd_HArray1OfReal) Knots = aApprox.Knots(); Handle(TColStd_HArray1OfReal) Knots = aApprox.Knots();
@ -200,17 +215,19 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
#endif #endif
} }
//======================================================================= //=================================================================================================
//class : Approx_CurvilinearParameter_EvalCurvOnSurf
//purpose : case of a curve on one surface
//=======================================================================
class Approx_CurvilinearParameter_EvalCurvOnSurf : public AdvApprox_EvaluatorFunction class Approx_CurvilinearParameter_EvalCurvOnSurf : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_CurvilinearParameter_EvalCurvOnSurf(const Handle(Approx_CurvlinFunc)& theFunc, Approx_CurvilinearParameter_EvalCurvOnSurf(const Handle(Approx_CurvlinFunc)& theFunc,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct(theFunc)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -237,11 +254,13 @@ void Approx_CurvilinearParameter_EvalCurvOnSurf::Evaluate (Standard_Integer * Di
Standard_Integer i; Standard_Integer i;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension != 5) { if (*Dimension != 5)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
// Parameter is incorrect // Parameter is incorrect
if ( S < StartEnd[0] || S > StartEnd[1] ) { if (S < StartEnd[0] || S > StartEnd[1])
{
*ErrorCode = 2; *ErrorCode = 2;
} }
@ -252,7 +271,8 @@ void Approx_CurvilinearParameter_EvalCurvOnSurf::Evaluate (Standard_Integer * Di
StartEndSav[1] = StartEnd[1]; StartEndSav[1] = StartEnd[1];
} }
if(!fonct->EvalCase2(S, *Order, Res)) { if (!fonct->EvalCase2(S, *Order, Res))
{
*ErrorCode = 3; *ErrorCode = 3;
} }
@ -316,11 +336,19 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
#endif #endif
Approx_CurvilinearParameter_EvalCurvOnSurf evCOnS(fonct, FirstS, LastS); Approx_CurvilinearParameter_EvalCurvOnSurf evCOnS(fonct, FirstS, LastS);
AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, AdvApprox_ApproxAFunction aApprox(Num1DSS,
OneDTol, TwoDTolNul, ThreeDTol, Num2DSS,
FirstS, LastS, Order, Num3DSS,
MaxDegree, MaxSegments, OneDTol,
evCOnS, CutTool); TwoDTolNul,
ThreeDTol,
FirstS,
LastS,
Order,
MaxDegree,
MaxSegments,
evCOnS,
CutTool);
#ifdef OCCT_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx, t_approx); ResultChron(chr_approx, t_approx);
@ -329,7 +357,8 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
myDone = aApprox.IsDone(); myDone = aApprox.IsDone();
myHasResult = aApprox.HasResult(); myHasResult = aApprox.HasResult();
if (myHasResult) { if (myHasResult)
{
Standard_Integer NbPoles = aApprox.NbPoles(); Standard_Integer NbPoles = aApprox.NbPoles();
TColgp_Array1OfPnt Poles(1, NbPoles); TColgp_Array1OfPnt Poles(1, NbPoles);
TColgp_Array1OfPnt2d Poles2d(1, NbPoles); TColgp_Array1OfPnt2d Poles2d(1, NbPoles);
@ -361,17 +390,19 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
#endif #endif
} }
//======================================================================= //=================================================================================================
//function : Approx_CurvilinearParameter_EvalCurvOn2Surf
//purpose : case of a curve on two surfaces
//=======================================================================
class Approx_CurvilinearParameter_EvalCurvOn2Surf : public AdvApprox_EvaluatorFunction class Approx_CurvilinearParameter_EvalCurvOn2Surf : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_CurvilinearParameter_EvalCurvOn2Surf(const Handle(Approx_CurvlinFunc)& theFunc, Approx_CurvilinearParameter_EvalCurvOn2Surf(const Handle(Approx_CurvlinFunc)& theFunc,
Standard_Real First, Standard_Real Last) Standard_Real First,
: fonct(theFunc) { StartEndSav[0] = First; StartEndSav[1] = Last; } Standard_Real Last)
: fonct(theFunc)
{
StartEndSav[0] = First;
StartEndSav[1] = Last;
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -398,11 +429,13 @@ void Approx_CurvilinearParameter_EvalCurvOn2Surf::Evaluate (Standard_Integer * D
Standard_Integer i; Standard_Integer i;
// Dimension is incorrect // Dimension is incorrect
if (*Dimension != 7) { if (*Dimension != 7)
{
*ErrorCode = 1; *ErrorCode = 1;
} }
// Parameter is incorrect // Parameter is incorrect
if ( S < StartEnd[0] || S > StartEnd[1] ) { if (S < StartEnd[0] || S > StartEnd[1])
{
*ErrorCode = 2; *ErrorCode = 2;
} }
@ -413,7 +446,8 @@ void Approx_CurvilinearParameter_EvalCurvOn2Surf::Evaluate (Standard_Integer * D
StartEndSav[1]=StartEnd[1]; StartEndSav[1]=StartEnd[1];
} }
*/ */
if(!fonct->EvalCase3(S, *Order, Res)) { if (!fonct->EvalCase3(S, *Order, Res))
{
*ErrorCode = 3; *ErrorCode = 3;
} }
@ -481,11 +515,19 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
#endif #endif
Approx_CurvilinearParameter_EvalCurvOn2Surf evCOn2S(fonct, FirstS, LastS); Approx_CurvilinearParameter_EvalCurvOn2Surf evCOn2S(fonct, FirstS, LastS);
AdvApprox_ApproxAFunction aApprox (Num1DSS, Num2DSS, Num3DSS, AdvApprox_ApproxAFunction aApprox(Num1DSS,
OneDTol, TwoDTolNul, ThreeDTol, Num2DSS,
FirstS, LastS, Order, Num3DSS,
MaxDegree, MaxSegments, OneDTol,
evCOn2S, CutTool); TwoDTolNul,
ThreeDTol,
FirstS,
LastS,
Order,
MaxDegree,
MaxSegments,
evCOn2S,
CutTool);
#ifdef OCCT_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
ResultChron(chr_approx, t_approx); ResultChron(chr_approx, t_approx);
@ -494,7 +536,8 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
myDone = aApprox.IsDone(); myDone = aApprox.IsDone();
myHasResult = aApprox.HasResult(); myHasResult = aApprox.HasResult();
if (myHasResult) { if (myHasResult)
{
Standard_Integer NbPoles = aApprox.NbPoles(); Standard_Integer NbPoles = aApprox.NbPoles();
TColgp_Array1OfPnt Poles(1, NbPoles); TColgp_Array1OfPnt Poles(1, NbPoles);
TColgp_Array1OfPnt2d Poles2d(1, NbPoles); TColgp_Array1OfPnt2d Poles2d(1, NbPoles);
@ -534,92 +577,74 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor2d_
#endif #endif
} }
//======================================================================= //=================================================================================================
//function : IsDone
//purpose :
//=======================================================================
Standard_Boolean Approx_CurvilinearParameter::IsDone() const Standard_Boolean Approx_CurvilinearParameter::IsDone() const
{ {
return myDone; return myDone;
} }
//======================================================================= //=================================================================================================
//function : HasResult
//purpose :
//=======================================================================
Standard_Boolean Approx_CurvilinearParameter::HasResult() const Standard_Boolean Approx_CurvilinearParameter::HasResult() const
{ {
return myHasResult; return myHasResult;
} }
//======================================================================= //=================================================================================================
//function : Curve3d
//purpose : returns the Bspline curve corresponding to the reparametrized 3D curve
//=======================================================================
Handle(Geom_BSplineCurve) Approx_CurvilinearParameter::Curve3d() const Handle(Geom_BSplineCurve) Approx_CurvilinearParameter::Curve3d() const
{ {
return myCurve3d; return myCurve3d;
} }
//======================================================================= //=================================================================================================
//function : MaxError3d
//purpose : returns the maximum error on the reparametrized 3D curve
//=======================================================================
Standard_Real Approx_CurvilinearParameter::MaxError3d() const Standard_Real Approx_CurvilinearParameter::MaxError3d() const
{ {
return myMaxError3d; return myMaxError3d;
} }
//======================================================================= //=================================================================================================
// function : Curve2d1 // function : Curve2d1
// purpose : returns the BsplineCurve representing the reparametrized 2D curve on the // purpose : returns the BsplineCurve representing the reparametrized 2D curve on the
// first surface (case of a curve on one or two surfaces) // first surface (case of a curve on one or two surfaces)
//======================================================================= //=================================================================================================
Handle(Geom2d_BSplineCurve) Approx_CurvilinearParameter::Curve2d1() const Handle(Geom2d_BSplineCurve) Approx_CurvilinearParameter::Curve2d1() const
{ {
return myCurve2d1; return myCurve2d1;
} }
//======================================================================= //=================================================================================================
//function : MaxError2d1
//purpose : returns the maximum error on the first reparametrized 2D curve
//=======================================================================
Standard_Real Approx_CurvilinearParameter::MaxError2d1() const Standard_Real Approx_CurvilinearParameter::MaxError2d1() const
{ {
return myMaxError2d1; return myMaxError2d1;
} }
//======================================================================= //=================================================================================================
// function : Curve2d2 // function : Curve2d2
// purpose : returns the BsplineCurve representing the reparametrized 2D curve on the // purpose : returns the BsplineCurve representing the reparametrized 2D curve on the
// second surface (case of a curve on two surfaces) // second surface (case of a curve on two surfaces)
//======================================================================= //=================================================================================================
Handle(Geom2d_BSplineCurve) Approx_CurvilinearParameter::Curve2d2() const Handle(Geom2d_BSplineCurve) Approx_CurvilinearParameter::Curve2d2() const
{ {
return myCurve2d2; return myCurve2d2;
} }
//======================================================================= //=================================================================================================
//function : MaxError2d2
//purpose : returns the maximum error on the second reparametrized 2D curve
//=======================================================================
Standard_Real Approx_CurvilinearParameter::MaxError2d2() const Standard_Real Approx_CurvilinearParameter::MaxError2d2() const
{ {
return myMaxError2d2; return myMaxError2d2;
} }
//======================================================================= //=================================================================================================
// function : Dump // function : Dump
// purpose : print the maximum errors(s) // purpose : print the maximum errors(s)
//======================================================================= //=================================================================================================
void Approx_CurvilinearParameter::Dump(Standard_OStream& o) const void Approx_CurvilinearParameter::Dump(Standard_OStream& o) const
{ {
@ -631,26 +656,24 @@ void Approx_CurvilinearParameter::Dump(Standard_OStream& o) const
o << "myMaxError3d = " << myMaxError3d << std::endl; o << "myMaxError3d = " << myMaxError3d << std::endl;
} }
//======================================================================= //=================================================================================================
//function : ToleranceComputation
//purpose :
//=======================================================================
void Approx_CurvilinearParameter::ToleranceComputation(const Handle(Adaptor2d_Curve2d)& C2D, void Approx_CurvilinearParameter::ToleranceComputation(const Handle(Adaptor2d_Curve2d)& C2D,
const Handle(Adaptor3d_Surface)& S, const Handle(Adaptor3d_Surface)& S,
const Standard_Integer MaxNumber, const Standard_Integer MaxNumber,
const Standard_Real Tol, const Standard_Real Tol,
Standard_Real &TolV, Standard_Real &TolW) Standard_Real& TolV,
Standard_Real& TolW)
{ {
Standard_Real FirstU = C2D->FirstParameter(), Standard_Real FirstU = C2D->FirstParameter(), LastU = C2D->LastParameter();
LastU = C2D->LastParameter();
// Standard_Real parU, Max_dS_dv=1.,Max_dS_dw=1.; // Standard_Real parU, Max_dS_dv=1.,Max_dS_dw=1.;
Standard_Real Max_dS_dv = 1., Max_dS_dw = 1.; Standard_Real Max_dS_dv = 1., Max_dS_dw = 1.;
gp_Pnt P; gp_Pnt P;
gp_Pnt2d pntVW; gp_Pnt2d pntVW;
gp_Vec dS_dv, dS_dw; gp_Vec dS_dv, dS_dw;
for (Standard_Integer i=1; i<=MaxNumber; i++) { for (Standard_Integer i = 1; i <= MaxNumber; i++)
{
pntVW = C2D->Value(FirstU + (i - 1) * (LastU - FirstU) / (MaxNumber - 1)); pntVW = C2D->Value(FirstU + (i - 1) * (LastU - FirstU) / (MaxNumber - 1));
S->D1(pntVW.X(), pntVW.Y(), P, dS_dv, dS_dw); S->D1(pntVW.X(), pntVW.Y(), P, dS_dv, dS_dw);
Max_dS_dv = Max(Max_dS_dv, dS_dv.Magnitude()); Max_dS_dv = Max(Max_dS_dv, dS_dv.Magnitude());

34
src/Approx/Approx_CurvilinearParameter.hxx
View File

@ -36,18 +36,32 @@
class Approx_CurvilinearParameter class Approx_CurvilinearParameter
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! case of a free 3D curve //! case of a free 3D curve
Standard_EXPORT Approx_CurvilinearParameter(const Handle(Adaptor3d_Curve)& C3D, const Standard_Real Tol, const GeomAbs_Shape Order, const Standard_Integer MaxDegree, const Standard_Integer MaxSegments); Standard_EXPORT Approx_CurvilinearParameter(const Handle(Adaptor3d_Curve)& C3D,
const Standard_Real Tol,
const GeomAbs_Shape Order,
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments);
//! case of a curve on one surface //! case of a curve on one surface
Standard_EXPORT Approx_CurvilinearParameter(const Handle(Adaptor2d_Curve2d)& C2D, const Handle(Adaptor3d_Surface)& Surf, const Standard_Real Tol, const GeomAbs_Shape Order, const Standard_Integer MaxDegree, const Standard_Integer MaxSegments); Standard_EXPORT Approx_CurvilinearParameter(const Handle(Adaptor2d_Curve2d)& C2D,
const Handle(Adaptor3d_Surface)& Surf,
const Standard_Real Tol,
const GeomAbs_Shape Order,
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments);
//! case of a curve on two surfaces //! case of a curve on two surfaces
Standard_EXPORT Approx_CurvilinearParameter(const Handle(Adaptor2d_Curve2d)& C2D1, const Handle(Adaptor3d_Surface)& Surf1, const Handle(Adaptor2d_Curve2d)& C2D2, const Handle(Adaptor3d_Surface)& Surf2, const Standard_Real Tol, const GeomAbs_Shape Order, const Standard_Integer MaxDegree, const Standard_Integer MaxSegments); Standard_EXPORT Approx_CurvilinearParameter(const Handle(Adaptor2d_Curve2d)& C2D1,
const Handle(Adaptor3d_Surface)& Surf1,
const Handle(Adaptor2d_Curve2d)& C2D2,
const Handle(Adaptor3d_Surface)& Surf2,
const Standard_Real Tol,
const GeomAbs_Shape Order,
const Standard_Integer MaxDegree,
const Standard_Integer MaxSegments);
Standard_EXPORT Standard_Boolean IsDone() const; Standard_EXPORT Standard_Boolean IsDone() const;
@ -77,11 +91,14 @@ public:
Standard_EXPORT void Dump(Standard_OStream& o) const; Standard_EXPORT void Dump(Standard_OStream& o) const;
private: private:
Standard_EXPORT static void ToleranceComputation(const Handle(Adaptor2d_Curve2d)& C2D,
Standard_EXPORT static void ToleranceComputation (const Handle(Adaptor2d_Curve2d)& C2D, const Handle(Adaptor3d_Surface)& S, const Standard_Integer MaxNumber, const Standard_Real Tol, Standard_Real& TolV, Standard_Real& TolW); const Handle(Adaptor3d_Surface)& S,
const Standard_Integer MaxNumber,
const Standard_Real Tol,
Standard_Real& TolV,
Standard_Real& TolW);
private: private:
Standard_Integer myCase; Standard_Integer myCase;
Standard_Boolean myDone; Standard_Boolean myDone;
Standard_Boolean myHasResult; Standard_Boolean myHasResult;
@ -91,7 +108,6 @@ private:
Standard_Real myMaxError2d1; Standard_Real myMaxError2d1;
Handle(Geom2d_BSplineCurve) myCurve2d2; Handle(Geom2d_BSplineCurve) myCurve2d2;
Standard_Real myMaxError2d2; Standard_Real myMaxError2d2;
}; };
#endif // _Approx_CurvilinearParameter_HeaderFile #endif // _Approx_CurvilinearParameter_HeaderFile

190
src/Approx/Approx_CurvlinFunc.cxx
View File

@ -65,24 +65,32 @@ static void findfourpoints(const Standard_Real ,
const Handle(TColStd_HArray1OfReal)& Si, const Handle(TColStd_HArray1OfReal)& Si,
Handle(TColStd_HArray1OfReal)& Ui, Handle(TColStd_HArray1OfReal)& Ui,
const Standard_Real prevS, const Standard_Real prevS,
const Standard_Real prevU, Standard_Real *Xi, const Standard_Real prevU,
Standard_Real* Xi,
Standard_Real* Yi) Standard_Real* Yi)
{ {
Standard_Integer i, j; Standard_Integer i, j;
Standard_Integer NbInt = Si->Length() - 1; Standard_Integer NbInt = Si->Length() - 1;
if (NbInt < 3) throw Standard_ConstructionError("Approx_CurvlinFunc::GetUParameter"); if (NbInt < 3)
throw Standard_ConstructionError("Approx_CurvlinFunc::GetUParameter");
if(NInterval < 1) NInterval = 1; if (NInterval < 1)
else if(NInterval > NbInt - 2) NInterval = NbInt - 2; NInterval = 1;
else if (NInterval > NbInt - 2)
NInterval = NbInt - 2;
for(i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
{
Xi[i] = Si->Value(NInterval - 1 + i); Xi[i] = Si->Value(NInterval - 1 + i);
Yi[i] = Ui->Value(NInterval - 1 + i); Yi[i] = Ui->Value(NInterval - 1 + i);
} }
// try to insert (S, U) // try to insert (S, U)
for(i = 0; i < 3; i++) { for (i = 0; i < 3; i++)
if(Xi[i] < prevS && prevS < Xi[i+1]) { {
for(j = 0; j < i; j++) { if (Xi[i] < prevS && prevS < Xi[i + 1])
{
for (j = 0; j < i; j++)
{
Xi[j] = Xi[j + 1]; Xi[j] = Xi[j + 1];
Yi[j] = Yi[j + 1]; Yi[j] = Yi[j + 1];
} }
@ -110,7 +118,8 @@ static void findfourpoints(const Standard_Real ,
} }
*/ */
Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const Standard_Real Tol) : myC3D(C), Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const Standard_Real Tol)
: myC3D(C),
myCase(1), myCase(1),
myFirstS(0), myFirstS(0),
myLastS(1), myLastS(1),
@ -121,8 +130,10 @@ Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const S
Init(); Init();
} }
Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D, const Handle(Adaptor3d_Surface)& S, const Standard_Real Tol) : Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D,
myC2D1(C2D), const Handle(Adaptor3d_Surface)& S,
const Standard_Real Tol)
: myC2D1(C2D),
mySurf1(S), mySurf1(S),
myCase(2), myCase(2),
myFirstS(0), myFirstS(0),
@ -134,8 +145,12 @@ Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D, con
Init(); Init();
} }
Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D1, const Handle(Adaptor2d_Curve2d)& C2D2, const Handle(Adaptor3d_Surface)& S1, const Handle(Adaptor3d_Surface)& S2, const Standard_Real Tol) : Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D1,
myC2D1(C2D1), const Handle(Adaptor2d_Curve2d)& C2D2,
const Handle(Adaptor3d_Surface)& S1,
const Handle(Adaptor3d_Surface)& S2,
const Standard_Real Tol)
: myC2D1(C2D1),
myC2D2(C2D2), myC2D2(C2D2),
mySurf1(S1), mySurf1(S1),
mySurf2(S2), mySurf2(S2),
@ -153,7 +168,8 @@ void Approx_CurvlinFunc::Init()
{ {
Adaptor3d_CurveOnSurface CurOnSur; Adaptor3d_CurveOnSurface CurOnSur;
switch(myCase) { switch (myCase)
{
case 1: case 1:
Init(*myC3D, mySi_1, myUi_1); Init(*myC3D, mySi_1, myUi_1);
myFirstU1 = myC3D->FirstParameter(); myFirstU1 = myC3D->FirstParameter();
@ -184,13 +200,14 @@ void Approx_CurvlinFunc::Init()
Length(); Length();
} }
//=================================================================================================
//=======================================================================
// function : Init // function : Init
// purpose : Init the values // purpose : Init the values
// history : 23/10/1998 PMN : Cut at curve's discontinuities // history : 23/10/1998 PMN : Cut at curve's discontinuities
//======================================================================= //=================================================================================================
void Approx_CurvlinFunc::Init(Adaptor3d_Curve& C, Handle(TColStd_HArray1OfReal)& Si,
void Approx_CurvlinFunc::Init(Adaptor3d_Curve& C,
Handle(TColStd_HArray1OfReal)& Si,
Handle(TColStd_HArray1OfReal)& Ui) const Handle(TColStd_HArray1OfReal)& Ui) const
{ {
Standard_Real Step, FirstU, LastU; Standard_Real Step, FirstU, LastU;
@ -202,10 +219,12 @@ void Approx_CurvlinFunc::Init(Adaptor3d_Curve& C, Handle(TColStd_HArray1OfReal)&
NbIntC3 = C.NbIntervals(GeomAbs_C3); NbIntC3 = C.NbIntervals(GeomAbs_C3);
TColStd_Array1OfReal Disc(1, NbIntC3 + 1); TColStd_Array1OfReal Disc(1, NbIntC3 + 1);
if (NbIntC3 >1) { if (NbIntC3 > 1)
{
C.Intervals(Disc, GeomAbs_C3); C.Intervals(Disc, GeomAbs_C3);
} }
else { else
{
Disc(1) = FirstU; Disc(1) = FirstU;
Disc(2) = LastU; Disc(2) = LastU;
} }
@ -216,9 +235,11 @@ void Approx_CurvlinFunc::Init(Adaptor3d_Curve& C, Handle(TColStd_HArray1OfReal)&
Ui->SetValue(0, FirstU); Ui->SetValue(0, FirstU);
Si->SetValue(0, 0); Si->SetValue(0, 0);
for(j = 1, i=1; j<=NbIntC3; j++) { for (j = 1, i = 1; j <= NbIntC3; j++)
{
Step = (Disc(j + 1) - Disc(j)) / NbInt; Step = (Disc(j + 1) - Disc(j)) / NbInt;
for(k = 1; k <= NbInt; k++, i++) { for (k = 1; k <= NbInt; k++, i++)
{
Ui->ChangeValue(i) = Ui->Value(i - 1) + Step; Ui->ChangeValue(i) = Ui->Value(i - 1) + Step;
Si->ChangeValue(i) = Si->Value(i - 1) + Length(C, Ui->Value(i - 1), Ui->Value(i)); Si->ChangeValue(i) = Si->Value(i - 1) + Length(C, Ui->Value(i - 1), Ui->Value(i));
} }
@ -252,7 +273,8 @@ Standard_Integer Approx_CurvlinFunc::NbIntervals(const GeomAbs_Shape S) const
{ {
Adaptor3d_CurveOnSurface CurOnSur; Adaptor3d_CurveOnSurface CurOnSur;
switch(myCase) { switch (myCase)
{
case 1: case 1:
return myC3D->NbIntervals(S); return myC3D->NbIntervals(S);
case 2: case 2:
@ -286,7 +308,8 @@ void Approx_CurvlinFunc::Intervals(TColStd_Array1OfReal& T, const GeomAbs_Shape
Adaptor3d_CurveOnSurface CurOnSur; Adaptor3d_CurveOnSurface CurOnSur;
Standard_Integer i; Standard_Integer i;
switch(myCase) { switch (myCase)
{
case 1: case 1:
myC3D->Intervals(T, S); myC3D->Intervals(T, S);
break; break;
@ -319,16 +342,21 @@ void Approx_CurvlinFunc::Intervals(TColStd_Array1OfReal& T, const GeomAbs_Shape
T.ChangeValue(i) = GetSParameter(T.Value(i)); T.ChangeValue(i) = GetSParameter(T.Value(i));
} }
void Approx_CurvlinFunc::Trim(const Standard_Real First, const Standard_Real Last, const Standard_Real Tol) void Approx_CurvlinFunc::Trim(const Standard_Real First,
const Standard_Real Last,
const Standard_Real Tol)
{ {
if (First < 0 || Last >1) throw Standard_OutOfRange("Approx_CurvlinFunc::Trim"); if (First < 0 || Last > 1)
if ((Last - First) < Tol) return; throw Standard_OutOfRange("Approx_CurvlinFunc::Trim");
if ((Last - First) < Tol)
return;
Standard_Real FirstU, LastU; Standard_Real FirstU, LastU;
Adaptor3d_CurveOnSurface CurOnSur; Adaptor3d_CurveOnSurface CurOnSur;
Handle(Adaptor3d_CurveOnSurface) HCurOnSur; Handle(Adaptor3d_CurveOnSurface) HCurOnSur;
switch(myCase) { switch (myCase)
{
case 1: case 1:
myC3D = myC3D->Trim(myFirstU1, myLastU1, Tol); myC3D = myC3D->Trim(myFirstU1, myLastU1, Tol);
FirstU = GetUParameter(*myC3D, First, 1); FirstU = GetUParameter(*myC3D, First, 1);
@ -338,7 +366,8 @@ void Approx_CurvlinFunc::Trim(const Standard_Real First, const Standard_Real Las
case 3: case 3:
CurOnSur.Load(myC2D2); CurOnSur.Load(myC2D2);
CurOnSur.Load(mySurf2); CurOnSur.Load(mySurf2);
HCurOnSur = Handle(Adaptor3d_CurveOnSurface)::DownCast (CurOnSur.Trim(myFirstU2, myLastU2, Tol)); HCurOnSur =
Handle(Adaptor3d_CurveOnSurface)::DownCast(CurOnSur.Trim(myFirstU2, myLastU2, Tol));
myC2D2 = HCurOnSur->GetCurve(); myC2D2 = HCurOnSur->GetCurve();
mySurf2 = HCurOnSur->GetSurface(); mySurf2 = HCurOnSur->GetSurface();
CurOnSur.Load(myC2D2); CurOnSur.Load(myC2D2);
@ -354,7 +383,8 @@ void Approx_CurvlinFunc::Trim(const Standard_Real First, const Standard_Real Las
case 2: case 2:
CurOnSur.Load(myC2D1); CurOnSur.Load(myC2D1);
CurOnSur.Load(mySurf1); CurOnSur.Load(mySurf1);
HCurOnSur = Handle(Adaptor3d_CurveOnSurface)::DownCast (CurOnSur.Trim(myFirstU1, myLastU1, Tol)); HCurOnSur =
Handle(Adaptor3d_CurveOnSurface)::DownCast(CurOnSur.Trim(myFirstU1, myLastU1, Tol));
myC2D1 = HCurOnSur->GetCurve(); myC2D1 = HCurOnSur->GetCurve();
mySurf1 = HCurOnSur->GetSurface(); mySurf1 = HCurOnSur->GetSurface();
CurOnSur.Load(myC2D1); CurOnSur.Load(myC2D1);
@ -375,7 +405,8 @@ void Approx_CurvlinFunc::Length()
Adaptor3d_CurveOnSurface CurOnSur; Adaptor3d_CurveOnSurface CurOnSur;
Standard_Real FirstU, LastU; Standard_Real FirstU, LastU;
switch(myCase){ switch (myCase)
{
case 1: case 1:
FirstU = myC3D->FirstParameter(); FirstU = myC3D->FirstParameter();
LastU = myC3D->LastParameter(); LastU = myC3D->LastParameter();
@ -405,8 +436,9 @@ void Approx_CurvlinFunc::Length()
} }
} }
Standard_Real Approx_CurvlinFunc::Length(Adaptor3d_Curve& C,
Standard_Real Approx_CurvlinFunc::Length(Adaptor3d_Curve& C, const Standard_Real FirstU, const Standard_Real LastU) const const Standard_Real FirstU,
const Standard_Real LastU) const
{ {
Standard_Real Length; Standard_Real Length;
@ -414,7 +446,6 @@ Standard_Real Approx_CurvlinFunc::Length(Adaptor3d_Curve& C, const Standard_Real
return Length; return Length;
} }
Standard_Real Approx_CurvlinFunc::GetLength() const Standard_Real Approx_CurvlinFunc::GetLength() const
{ {
return myLength; return myLength;
@ -425,7 +456,8 @@ Standard_Real Approx_CurvlinFunc::GetSParameter(const Standard_Real U) const
Standard_Real S = 0, S1, S2; Standard_Real S = 0, S1, S2;
Adaptor3d_CurveOnSurface CurOnSur; Adaptor3d_CurveOnSurface CurOnSur;
switch (myCase) { switch (myCase)
{
case 1: case 1:
S = GetSParameter(*myC3D, U, myLength); S = GetSParameter(*myC3D, U, myLength);
break; break;
@ -446,8 +478,6 @@ Standard_Real Approx_CurvlinFunc::GetSParameter(const Standard_Real U) const
return S; return S;
} }
Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C, Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
const Standard_Real S, const Standard_Real S,
const Standard_Integer NumberOfCurve) const const Standard_Integer NumberOfCurve) const
@ -458,9 +488,11 @@ Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
#ifdef OCCT_DEBUG_CHRONO #ifdef OCCT_DEBUG_CHRONO
InitChron(chr_uparam); InitChron(chr_uparam);
#endif #endif
if(S < 0 || S > 1) throw Standard_ConstructionError("Approx_CurvlinFunc::GetUParameter"); if (S < 0 || S > 1)
throw Standard_ConstructionError("Approx_CurvlinFunc::GetUParameter");
if(NumberOfCurve == 1) { if (NumberOfCurve == 1)
{
InitUArray = myUi_1; InitUArray = myUi_1;
InitSArray = mySi_1; InitSArray = mySi_1;
if (myCase == 3) if (myCase == 3)
@ -468,7 +500,8 @@ Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
else else
Length = myLength; Length = myLength;
} }
else { else
{
InitUArray = myUi_2; InitUArray = myUi_2;
InitSArray = mySi_2; InitSArray = mySi_2;
Length = myLength2; Length = myLength2;
@ -476,18 +509,23 @@ Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
NbInt = InitUArray->Length() - 1; NbInt = InitUArray->Length() - 1;
if(S == 1) NInterval = NbInt - 1; if (S == 1)
else { NInterval = NbInt - 1;
for(i = 0; i < NbInt; i++) { else
{
for (i = 0; i < NbInt; i++)
{
if ((InitSArray->Value(i) <= S && S < InitSArray->Value(i + 1))) if ((InitSArray->Value(i) <= S && S < InitSArray->Value(i + 1)))
break; break;
} }
NInterval = i; NInterval = i;
} }
if(S==InitSArray->Value(NInterval)) { if (S == InitSArray->Value(NInterval))
{
return InitUArray->Value(NInterval); return InitUArray->Value(NInterval);
} }
if(S==InitSArray->Value(NInterval+1)) { if (S == InitSArray->Value(NInterval + 1))
{
return InitUArray->Value(NInterval + 1); return InitUArray->Value(NInterval + 1);
} }
@ -513,7 +551,9 @@ Standard_Real Approx_CurvlinFunc::GetUParameter(Adaptor3d_Curve& C,
return U; return U;
} }
Standard_Real Approx_CurvlinFunc::GetSParameter(Adaptor3d_Curve& C, const Standard_Real U, const Standard_Real Len) const Standard_Real Approx_CurvlinFunc::GetSParameter(Adaptor3d_Curve& C,
const Standard_Real U,
const Standard_Real Len) const
{ {
Standard_Real S, Origin; Standard_Real S, Origin;
@ -522,9 +562,12 @@ Standard_Real Approx_CurvlinFunc::GetSParameter(Adaptor3d_Curve& C, const Standa
return S; return S;
} }
Standard_Boolean Approx_CurvlinFunc::EvalCase1(const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result) const Standard_Boolean Approx_CurvlinFunc::EvalCase1(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result) const
{ {
if(myCase != 1) throw Standard_ConstructionError("Approx_CurvlinFunc::EvalCase1"); if (myCase != 1)
throw Standard_ConstructionError("Approx_CurvlinFunc::EvalCase1");
gp_Pnt C; gp_Pnt C;
gp_Vec dC_dU, dC_dS, d2C_dU2, d2C_dS2; gp_Vec dC_dU, dC_dS, d2C_dU2, d2C_dS2;
@ -532,7 +575,8 @@ Standard_Boolean Approx_CurvlinFunc::EvalCase1(const Standard_Real S, const Stan
U = GetUParameter(*myC3D, S, 1); U = GetUParameter(*myC3D, S, 1);
switch(Order) { switch (Order)
{
case 0: case 0:
myC3D->D0(U, C); myC3D->D0(U, C);
@ -565,15 +609,19 @@ Standard_Boolean Approx_CurvlinFunc::EvalCase1(const Standard_Real S, const Stan
Result(2) = d2C_dS2.Z(); Result(2) = d2C_dS2.Z();
break; break;
default: Result(0) = Result(1) = Result(2) = 0; default:
Result(0) = Result(1) = Result(2) = 0;
return Standard_False; return Standard_False;
} }
return Standard_True; return Standard_True;
} }
Standard_Boolean Approx_CurvlinFunc::EvalCase2(const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result) const Standard_Boolean Approx_CurvlinFunc::EvalCase2(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result) const
{ {
if(myCase != 2) throw Standard_ConstructionError("Approx_CurvlinFunc::EvalCase2"); if (myCase != 2)
throw Standard_ConstructionError("Approx_CurvlinFunc::EvalCase2");
Standard_Boolean Done; Standard_Boolean Done;
@ -582,9 +630,12 @@ Standard_Boolean Approx_CurvlinFunc::EvalCase2(const Standard_Real S, const Stan
return Done; return Done;
} }
Standard_Boolean Approx_CurvlinFunc::EvalCase3(const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result) Standard_Boolean Approx_CurvlinFunc::EvalCase3(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result)
{ {
if(myCase != 3) throw Standard_ConstructionError("Approx_CurvlinFunc::EvalCase3"); if (myCase != 3)
throw Standard_ConstructionError("Approx_CurvlinFunc::EvalCase3");
TColStd_Array1OfReal tmpRes1(0, 4), tmpRes2(0, 4); TColStd_Array1OfReal tmpRes1(0, 4), tmpRes2(0, 4);
Standard_Boolean Done; Standard_Boolean Done;
@ -604,21 +655,28 @@ Standard_Boolean Approx_CurvlinFunc::EvalCase3(const Standard_Real S, const Stan
return Done; return Done;
} }
Standard_Boolean Approx_CurvlinFunc::EvalCurOnSur(const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result, const Standard_Integer NumberOfCurve) const Standard_Boolean Approx_CurvlinFunc::EvalCurOnSur(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result,
const Standard_Integer NumberOfCurve) const
{ {
Handle(Adaptor2d_Curve2d) Cur2D; Handle(Adaptor2d_Curve2d) Cur2D;
Handle(Adaptor3d_Surface) Surf; Handle(Adaptor3d_Surface) Surf;
Standard_Real U = 0, Length = 0; Standard_Real U = 0, Length = 0;
if (NumberOfCurve == 1) { if (NumberOfCurve == 1)
{
Cur2D = myC2D1; Cur2D = myC2D1;
Surf = mySurf1; Surf = mySurf1;
Adaptor3d_CurveOnSurface CurOnSur(myC2D1, mySurf1); Adaptor3d_CurveOnSurface CurOnSur(myC2D1, mySurf1);
U = GetUParameter(CurOnSur, S, 1); U = GetUParameter(CurOnSur, S, 1);
if(myCase == 3) Length = myLength1; if (myCase == 3)
else Length = myLength; Length = myLength1;
else
Length = myLength;
} }
else if (NumberOfCurve == 2) { else if (NumberOfCurve == 2)
{
Cur2D = myC2D2; Cur2D = myC2D2;
Surf = mySurf2; Surf = mySurf2;
Adaptor3d_CurveOnSurface CurOnSur(myC2D2, mySurf2); Adaptor3d_CurveOnSurface CurOnSur(myC2D2, mySurf2);
@ -634,7 +692,8 @@ Standard_Boolean Approx_CurvlinFunc::EvalCurOnSur(const Standard_Real S, const S
gp_Vec2d dC2D_dU, d2C2D_dU2; gp_Vec2d dC2D_dU, d2C2D_dU2;
gp_Vec dC_dU, d2C_dU2, dC_dS, d2C_dS2, dS_dV, dS_dW, d2S_dV2, d2S_dW2, d2S_dVdW; gp_Vec dC_dU, d2C_dU2, dC_dS, d2C_dS2, dS_dV, dS_dW, d2S_dV2, d2S_dW2, d2S_dVdW;
switch(Order) { switch (Order)
{
case 0: case 0:
Cur2D->D0(U, C2D); Cur2D->D0(U, C2D);
Surf->D0(C2D.X(), C2D.Y(), C); Surf->D0(C2D.X(), C2D.Y(), C);
@ -674,8 +733,8 @@ Standard_Boolean Approx_CurvlinFunc::EvalCurOnSur(const Standard_Real S, const S
d2W_dU2 = d2C2D_dU2.Y(); d2W_dU2 = d2C2D_dU2.Y();
Surf->D2(C2D.X(), C2D.Y(), C, dS_dV, dS_dW, d2S_dV2, d2S_dW2, d2S_dVdW); Surf->D2(C2D.X(), C2D.Y(), C, dS_dV, dS_dW, d2S_dV2, d2S_dW2, d2S_dVdW);
dC_dU = dS_dV * dV_dU + dS_dW * dW_dU; dC_dU = dS_dV * dV_dU + dS_dW * dW_dU;
d2C_dU2 = (d2S_dV2*dV_dU + d2S_dVdW*dW_dU)*dV_dU + dS_dV*d2V_dU2 + d2C_dU2 = (d2S_dV2 * dV_dU + d2S_dVdW * dW_dU) * dV_dU + dS_dV * d2V_dU2
(d2S_dVdW*dV_dU + d2S_dW2*dW_dU)*dW_dU + dS_dW*d2W_dU2; + (d2S_dVdW * dV_dU + d2S_dW2 * dW_dU) * dW_dU + dS_dW * d2W_dU2;
Mag = dC_dU.Magnitude(); Mag = dC_dU.Magnitude();
dU_dS = Length / Mag; dU_dS = Length / Mag;
d2U_dS2 = -Length * dC_dU.Dot(d2C_dU2) * dU_dS / (Mag * Mag * Mag); d2U_dS2 = -Length * dC_dU.Dot(d2C_dU2) * dU_dS / (Mag * Mag * Mag);
@ -686,8 +745,8 @@ Standard_Boolean Approx_CurvlinFunc::EvalCurOnSur(const Standard_Real S, const S
d2W_dS2 = d2W_dU2 * dU_dS * dU_dS + dW_dU * d2U_dS2; d2W_dS2 = d2W_dU2 * dU_dS * dU_dS + dW_dU * d2U_dS2;
d2U_dS2 = -dC_dU.Dot(d2C_dU2) * dU_dS / (Mag * Mag); d2U_dS2 = -dC_dU.Dot(d2C_dU2) * dU_dS / (Mag * Mag);
d2C_dS2 = (d2S_dV2 * dV_dS + d2S_dVdW * dW_dS) * dV_dS + dS_dV * d2V_dS2 + d2C_dS2 = (d2S_dV2 * dV_dS + d2S_dVdW * dW_dS) * dV_dS + dS_dV * d2V_dS2
(d2S_dW2 * dW_dS + d2S_dVdW * dV_dS) * dW_dS + dS_dW * d2W_dS2; + (d2S_dW2 * dW_dS + d2S_dVdW * dV_dS) * dW_dS + dS_dW * d2W_dS2;
Result(0) = d2V_dS2; Result(0) = d2V_dS2;
Result(1) = d2W_dS2; Result(1) = d2W_dS2;
@ -696,7 +755,8 @@ Standard_Boolean Approx_CurvlinFunc::EvalCurOnSur(const Standard_Real S, const S
Result(4) = d2C_dS2.Z(); Result(4) = d2C_dS2.Z();
break; break;
default: Result(0) = Result(1) = Result(2) = Result(3) = Result(4) = 0; default:
Result(0) = Result(1) = Result(2) = Result(3) = Result(4) = 0;
return Standard_False; return Standard_False;
} }
return Standard_True; return Standard_True;

66
src/Approx/Approx_CurvlinFunc.hxx
View File

@ -31,13 +31,17 @@ class Approx_CurvlinFunc : public Standard_Transient
{ {
public: public:
Standard_EXPORT Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const Standard_Real Tol); Standard_EXPORT Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const Standard_Real Tol);
Standard_EXPORT Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D, const Handle(Adaptor3d_Surface)& S, const Standard_Real Tol); Standard_EXPORT Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D,
const Handle(Adaptor3d_Surface)& S,
const Standard_Real Tol);
Standard_EXPORT Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D1, const Handle(Adaptor2d_Curve2d)& C2D2, const Handle(Adaptor3d_Surface)& S1, const Handle(Adaptor3d_Surface)& S2, const Standard_Real Tol); Standard_EXPORT Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D1,
const Handle(Adaptor2d_Curve2d)& C2D2,
const Handle(Adaptor3d_Surface)& S1,
const Handle(Adaptor3d_Surface)& S2,
const Standard_Real Tol);
//! ---Purpose Update the tolerance to used //! ---Purpose Update the tolerance to used
Standard_EXPORT void SetTol(const Standard_Real Tol); Standard_EXPORT void SetTol(const Standard_Real Tol);
@ -58,54 +62,64 @@ public:
Standard_EXPORT void Intervals(TColStd_Array1OfReal& T, const GeomAbs_Shape S) const; Standard_EXPORT void Intervals(TColStd_Array1OfReal& T, const GeomAbs_Shape S) const;
//! if First < 0 or Last > 1 //! if First < 0 or Last > 1
Standard_EXPORT void Trim (const Standard_Real First, const Standard_Real Last, const Standard_Real Tol); Standard_EXPORT void Trim(const Standard_Real First,
const Standard_Real Last,
const Standard_Real Tol);
//! Computes length of the curve. //! Computes length of the curve.
Standard_EXPORT void Length(); Standard_EXPORT void Length();
//! Computes length of the curve segment. //! Computes length of the curve segment.
Standard_EXPORT Standard_Real Length (Adaptor3d_Curve& C, const Standard_Real FirstU, const Standard_Real LasrU) const; Standard_EXPORT Standard_Real Length(Adaptor3d_Curve& C,
const Standard_Real FirstU,
const Standard_Real LasrU) const;
Standard_EXPORT Standard_Real GetLength() const; Standard_EXPORT Standard_Real GetLength() const;
//! returns original parameter corresponding S. if //! returns original parameter corresponding S. if
//! Case == 1 computation is performed on myC2D1 and mySurf1, //! Case == 1 computation is performed on myC2D1 and mySurf1,
//! otherwise it is done on myC2D2 and mySurf2. //! otherwise it is done on myC2D2 and mySurf2.
Standard_EXPORT Standard_Real GetUParameter (Adaptor3d_Curve& C, const Standard_Real S, const Standard_Integer NumberOfCurve) const; Standard_EXPORT Standard_Real GetUParameter(Adaptor3d_Curve& C,
const Standard_Real S,
const Standard_Integer NumberOfCurve) const;
//! returns original parameter corresponding S. //! returns original parameter corresponding S.
Standard_EXPORT Standard_Real GetSParameter(const Standard_Real U) const; Standard_EXPORT Standard_Real GetSParameter(const Standard_Real U) const;
//! if myCase != 1 //! if myCase != 1
Standard_EXPORT Standard_Boolean EvalCase1 (const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result) const; Standard_EXPORT Standard_Boolean EvalCase1(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result) const;
//! if myCase != 2 //! if myCase != 2
Standard_EXPORT Standard_Boolean EvalCase2 (const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result) const; Standard_EXPORT Standard_Boolean EvalCase2(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result) const;
//! if myCase != 3 //! if myCase != 3
Standard_EXPORT Standard_Boolean EvalCase3 (const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result); Standard_EXPORT Standard_Boolean EvalCase3(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result);
DEFINE_STANDARD_RTTIEXT(Approx_CurvlinFunc, Standard_Transient) DEFINE_STANDARD_RTTIEXT(Approx_CurvlinFunc, Standard_Transient)
protected: protected:
private: private:
Standard_EXPORT void Init(); Standard_EXPORT void Init();
Standard_EXPORT void Init (Adaptor3d_Curve& C, Handle(TColStd_HArray1OfReal)& Si, Handle(TColStd_HArray1OfReal)& Ui) const; Standard_EXPORT void Init(Adaptor3d_Curve& C,
Handle(TColStd_HArray1OfReal)& Si,
Handle(TColStd_HArray1OfReal)& Ui) const;
//! returns curvilinear parameter corresponding U. //! returns curvilinear parameter corresponding U.
Standard_EXPORT Standard_Real GetSParameter (Adaptor3d_Curve& C, const Standard_Real U, const Standard_Real Length) const; Standard_EXPORT Standard_Real GetSParameter(Adaptor3d_Curve& C,
const Standard_Real U,
const Standard_Real Length) const;
Standard_EXPORT Standard_Boolean EvalCurOnSur (const Standard_Real S, const Standard_Integer Order, TColStd_Array1OfReal& Result, const Standard_Integer NumberOfCurve) const; Standard_EXPORT Standard_Boolean EvalCurOnSur(const Standard_Real S,
const Standard_Integer Order,
TColStd_Array1OfReal& Result,
const Standard_Integer NumberOfCurve) const;
Handle(Adaptor3d_Curve) myC3D; Handle(Adaptor3d_Curve) myC3D;
Handle(Adaptor2d_Curve2d) myC2D1; Handle(Adaptor2d_Curve2d) myC2D1;
@ -129,14 +143,6 @@ private:
Handle(TColStd_HArray1OfReal) mySi_1; Handle(TColStd_HArray1OfReal) mySi_1;
Handle(TColStd_HArray1OfReal) myUi_2; Handle(TColStd_HArray1OfReal) myUi_2;
Handle(TColStd_HArray1OfReal) mySi_2; Handle(TColStd_HArray1OfReal) mySi_2;
}; };
#endif // _Approx_CurvlinFunc_HeaderFile #endif // _Approx_CurvlinFunc_HeaderFile

75
src/Approx/Approx_FitAndDivide.hxx
View File

@ -20,43 +20,57 @@
#include <Standard.hxx> #include <Standard.hxx>
#include <Standard_DefineAlloc.hxx> #include <Standard_DefineAlloc.hxx>
#include <AppParCurves_SequenceOfMultiCurve.hxx>
#include <TColStd_SequenceOfReal.hxx>
#include <AppParCurves_MultiCurve.hxx>
#include <Standard_Integer.hxx>
#include <AppParCurves_Constraint.hxx>
#include <AppCont_Function.hxx> #include <AppCont_Function.hxx>
#include <AppParCurves_Constraint.hxx>
#include <AppParCurves_MultiCurve.hxx>
#include <AppParCurves_SequenceOfMultiCurve.hxx>
#include <Standard_Integer.hxx>
#include <TColStd_SequenceOfReal.hxx>
class AppParCurves_MultiCurve; class AppParCurves_MultiCurve;
class Approx_FitAndDivide class Approx_FitAndDivide
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! The MultiLine <Line> will be approximated until tolerances //! The MultiLine <Line> will be approximated until tolerances
//! will be reached. //! will be reached.
//! The approximation will be done from degreemin to degreemax //! The approximation will be done from degreemin to degreemax
//! with a cutting if the corresponding boolean is True. //! with a cutting if the corresponding boolean is True.
Standard_EXPORT Approx_FitAndDivide(const AppCont_Function& Line, const Standard_Integer degreemin = 3, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-5, const Standard_Real Tolerance2d = 1.0e-5, const Standard_Boolean cutting = Standard_False, const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint, const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint); Standard_EXPORT Approx_FitAndDivide(
const AppCont_Function& Line,
const Standard_Integer degreemin = 3,
const Standard_Integer degreemax = 8,
const Standard_Real Tolerance3d = 1.0e-5,
const Standard_Real Tolerance2d = 1.0e-5,
const Standard_Boolean cutting = Standard_False,
const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint,
const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint);
//! Initializes the fields of the algorithm. //! Initializes the fields of the algorithm.
Standard_EXPORT Approx_FitAndDivide(const Standard_Integer degreemin = 3, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-05, const Standard_Real Tolerance2d = 1.0e-05, const Standard_Boolean cutting = Standard_False, const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint, const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint); Standard_EXPORT Approx_FitAndDivide(
const Standard_Integer degreemin = 3,
const Standard_Integer degreemax = 8,
const Standard_Real Tolerance3d = 1.0e-05,
const Standard_Real Tolerance2d = 1.0e-05,
const Standard_Boolean cutting = Standard_False,
const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint,
const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint);
//! runs the algorithm after having initialized the fields. //! runs the algorithm after having initialized the fields.
Standard_EXPORT void Perform(const AppCont_Function& Line); Standard_EXPORT void Perform(const AppCont_Function& Line);
//! changes the degrees of the approximation. //! changes the degrees of the approximation.
Standard_EXPORT void SetDegrees (const Standard_Integer degreemin, const Standard_Integer degreemax); Standard_EXPORT void SetDegrees(const Standard_Integer degreemin,
const Standard_Integer degreemax);
//! Changes the tolerances of the approximation. //! Changes the tolerances of the approximation.
Standard_EXPORT void SetTolerances (const Standard_Real Tolerance3d, const Standard_Real Tolerance2d); Standard_EXPORT void SetTolerances(const Standard_Real Tolerance3d,
const Standard_Real Tolerance2d);
//! Changes the constraints of the approximation. //! Changes the constraints of the approximation.
Standard_EXPORT void SetConstraints (const AppParCurves_Constraint FirstC, const AppParCurves_Constraint LastC); Standard_EXPORT void SetConstraints(const AppParCurves_Constraint FirstC,
const AppParCurves_Constraint LastC);
//! Changes the max number of segments, which is allowed for cutting. //! Changes the max number of segments, which is allowed for cutting.
Standard_EXPORT void SetMaxSegments(const Standard_Integer theMaxSegments); Standard_EXPORT void SetMaxSegments(const Standard_Integer theMaxSegments);
@ -82,7 +96,9 @@ public:
Standard_EXPORT Standard_Boolean IsToleranceReached() const; Standard_EXPORT Standard_Boolean IsToleranceReached() const;
//! returns the tolerances 2d and 3d of the <Index> MultiCurve. //! returns the tolerances 2d and 3d of the <Index> MultiCurve.
Standard_EXPORT void Error (const Standard_Integer Index, Standard_Real& tol3d, Standard_Real& tol2d) const; Standard_EXPORT void Error(const Standard_Integer Index,
Standard_Real& tol3d,
Standard_Real& tol2d) const;
//! Returns the number of MultiCurve doing the approximation //! Returns the number of MultiCurve doing the approximation
//! of the MultiLine. //! of the MultiLine.
@ -91,23 +107,18 @@ public:
//! returns the approximation MultiCurve of range <Index>. //! returns the approximation MultiCurve of range <Index>.
Standard_EXPORT AppParCurves_MultiCurve Value(const Standard_Integer Index = 1) const; Standard_EXPORT AppParCurves_MultiCurve Value(const Standard_Integer Index = 1) const;
Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& firstp, Standard_Real& lastp) const; Standard_EXPORT void Parameters(const Standard_Integer Index,
Standard_Real& firstp,
Standard_Real& lastp) const;
protected: protected:
private: private:
//! is internally used by the algorithms. //! is internally used by the algorithms.
Standard_EXPORT Standard_Boolean Compute (const AppCont_Function& Line, const Standard_Real Ufirst, const Standard_Real Ulast, Standard_Real& TheTol3d, Standard_Real& TheTol2d); Standard_EXPORT Standard_Boolean Compute(const AppCont_Function& Line,
const Standard_Real Ufirst,
const Standard_Real Ulast,
Standard_Real& TheTol3d,
Standard_Real& TheTol2d);
AppParCurves_SequenceOfMultiCurve myMultiCurves; AppParCurves_SequenceOfMultiCurve myMultiCurves;
TColStd_SequenceOfReal myfirstparam; TColStd_SequenceOfReal myfirstparam;
@ -129,14 +140,6 @@ private:
Standard_Integer myMaxSegments; Standard_Integer myMaxSegments;
Standard_Boolean myInvOrder; Standard_Boolean myInvOrder;
Standard_Boolean myHangChecking; Standard_Boolean myHangChecking;
}; };
#endif // _Approx_FitAndDivide_HeaderFile #endif // _Approx_FitAndDivide_HeaderFile

74
src/Approx/Approx_FitAndDivide2d.hxx
View File

@ -20,43 +20,57 @@
#include <Standard.hxx> #include <Standard.hxx>
#include <Standard_DefineAlloc.hxx> #include <Standard_DefineAlloc.hxx>
#include <AppParCurves_SequenceOfMultiCurve.hxx>
#include <TColStd_SequenceOfReal.hxx>
#include <AppParCurves_MultiCurve.hxx>
#include <Standard_Integer.hxx>
#include <AppParCurves_Constraint.hxx>
#include <AppCont_Function.hxx> #include <AppCont_Function.hxx>
#include <AppParCurves_Constraint.hxx>
#include <AppParCurves_MultiCurve.hxx>
#include <AppParCurves_SequenceOfMultiCurve.hxx>
#include <Standard_Integer.hxx>
#include <TColStd_SequenceOfReal.hxx>
class AppParCurves_MultiCurve; class AppParCurves_MultiCurve;
class Approx_FitAndDivide2d class Approx_FitAndDivide2d
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! The MultiLine <Line> will be approximated until tolerances //! The MultiLine <Line> will be approximated until tolerances
//! will be reached. //! will be reached.
//! The approximation will be done from degreemin to degreemax //! The approximation will be done from degreemin to degreemax
//! with a cutting if the corresponding boolean is True. //! with a cutting if the corresponding boolean is True.
Standard_EXPORT Approx_FitAndDivide2d(const AppCont_Function& Line, const Standard_Integer degreemin = 3, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-5, const Standard_Real Tolerance2d = 1.0e-5, const Standard_Boolean cutting = Standard_False, const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint, const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint); Standard_EXPORT Approx_FitAndDivide2d(
const AppCont_Function& Line,
const Standard_Integer degreemin = 3,
const Standard_Integer degreemax = 8,
const Standard_Real Tolerance3d = 1.0e-5,
const Standard_Real Tolerance2d = 1.0e-5,
const Standard_Boolean cutting = Standard_False,
const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint,
const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint);
//! Initializes the fields of the algorithm. //! Initializes the fields of the algorithm.
Standard_EXPORT Approx_FitAndDivide2d(const Standard_Integer degreemin = 3, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-05, const Standard_Real Tolerance2d = 1.0e-05, const Standard_Boolean cutting = Standard_False, const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint, const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint); Standard_EXPORT Approx_FitAndDivide2d(
const Standard_Integer degreemin = 3,
const Standard_Integer degreemax = 8,
const Standard_Real Tolerance3d = 1.0e-05,
const Standard_Real Tolerance2d = 1.0e-05,
const Standard_Boolean cutting = Standard_False,
const AppParCurves_Constraint FirstC = AppParCurves_TangencyPoint,
const AppParCurves_Constraint LastC = AppParCurves_TangencyPoint);
//! runs the algorithm after having initialized the fields. //! runs the algorithm after having initialized the fields.
Standard_EXPORT void Perform(const AppCont_Function& Line); Standard_EXPORT void Perform(const AppCont_Function& Line);
//! changes the degrees of the approximation. //! changes the degrees of the approximation.
Standard_EXPORT void SetDegrees (const Standard_Integer degreemin, const Standard_Integer degreemax); Standard_EXPORT void SetDegrees(const Standard_Integer degreemin,
const Standard_Integer degreemax);
//! Changes the tolerances of the approximation. //! Changes the tolerances of the approximation.
Standard_EXPORT void SetTolerances (const Standard_Real Tolerance3d, const Standard_Real Tolerance2d); Standard_EXPORT void SetTolerances(const Standard_Real Tolerance3d,
const Standard_Real Tolerance2d);
//! Changes the constraints of the approximation. //! Changes the constraints of the approximation.
Standard_EXPORT void SetConstraints (const AppParCurves_Constraint FirstC, const AppParCurves_Constraint LastC); Standard_EXPORT void SetConstraints(const AppParCurves_Constraint FirstC,
const AppParCurves_Constraint LastC);
//! Changes the max number of segments, which is allowed for cutting. //! Changes the max number of segments, which is allowed for cutting.
Standard_EXPORT void SetMaxSegments(const Standard_Integer theMaxSegments); Standard_EXPORT void SetMaxSegments(const Standard_Integer theMaxSegments);
@ -82,7 +96,9 @@ public:
Standard_EXPORT Standard_Boolean IsToleranceReached() const; Standard_EXPORT Standard_Boolean IsToleranceReached() const;
//! returns the tolerances 2d and 3d of the <Index> MultiCurve. //! returns the tolerances 2d and 3d of the <Index> MultiCurve.
Standard_EXPORT void Error (const Standard_Integer Index, Standard_Real& tol3d, Standard_Real& tol2d) const; Standard_EXPORT void Error(const Standard_Integer Index,
Standard_Real& tol3d,
Standard_Real& tol2d) const;
//! Returns the number of MultiCurve doing the approximation //! Returns the number of MultiCurve doing the approximation
//! of the MultiLine. //! of the MultiLine.
@ -91,23 +107,18 @@ public:
//! returns the approximation MultiCurve of range <Index>. //! returns the approximation MultiCurve of range <Index>.
Standard_EXPORT AppParCurves_MultiCurve Value(const Standard_Integer Index = 1) const; Standard_EXPORT AppParCurves_MultiCurve Value(const Standard_Integer Index = 1) const;
Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& firstp, Standard_Real& lastp) const; Standard_EXPORT void Parameters(const Standard_Integer Index,
Standard_Real& firstp,
Standard_Real& lastp) const;
protected: protected:
private: private:
//! is internally used by the algorithms. //! is internally used by the algorithms.
Standard_EXPORT Standard_Boolean Compute (const AppCont_Function& Line, const Standard_Real Ufirst, const Standard_Real Ulast, Standard_Real& TheTol3d, Standard_Real& TheTol2d); Standard_EXPORT Standard_Boolean Compute(const AppCont_Function& Line,
const Standard_Real Ufirst,
const Standard_Real Ulast,
Standard_Real& TheTol3d,
Standard_Real& TheTol2d);
AppParCurves_SequenceOfMultiCurve myMultiCurves; AppParCurves_SequenceOfMultiCurve myMultiCurves;
TColStd_SequenceOfReal myfirstparam; TColStd_SequenceOfReal myfirstparam;
@ -129,13 +140,6 @@ private:
Standard_Integer myMaxSegments; Standard_Integer myMaxSegments;
Standard_Boolean myInvOrder; Standard_Boolean myInvOrder;
Standard_Boolean myHangChecking; Standard_Boolean myHangChecking;
}; };
#endif // _Approx_FitAndDivide2d_HeaderFile #endif // _Approx_FitAndDivide2d_HeaderFile

2
src/Approx/Approx_FitAndDivide2d_0.cxx
View File

@ -18,10 +18,8 @@
#include <AppParCurves_MultiCurve.hxx> #include <AppParCurves_MultiCurve.hxx>
#define MultiLine AppCont_Function #define MultiLine AppCont_Function
#define MultiLine_hxx <AppCont_Function.hxx> #define MultiLine_hxx <AppCont_Function.hxx>
#define Approx_ComputeCLine Approx_FitAndDivide2d #define Approx_ComputeCLine Approx_FitAndDivide2d
#define Approx_ComputeCLine_hxx <Approx_FitAndDivide2d.hxx> #define Approx_ComputeCLine_hxx <Approx_FitAndDivide2d.hxx>
#include "../Approx/Approx_ComputeCLine.gxx" #include "../Approx/Approx_ComputeCLine.gxx"

2
src/Approx/Approx_FitAndDivide_0.cxx
View File

@ -18,10 +18,8 @@
#include <AppParCurves_MultiCurve.hxx> #include <AppParCurves_MultiCurve.hxx>
#define MultiLine AppCont_Function #define MultiLine AppCont_Function
#define MultiLine_hxx <AppCont_Function.hxx> #define MultiLine_hxx <AppCont_Function.hxx>
#define Approx_ComputeCLine Approx_FitAndDivide #define Approx_ComputeCLine Approx_FitAndDivide
#define Approx_ComputeCLine_hxx <Approx_FitAndDivide.hxx> #define Approx_ComputeCLine_hxx <Approx_FitAndDivide.hxx>
#include "../Approx/Approx_ComputeCLine.gxx" #include "../Approx/Approx_ComputeCLine.gxx"

1
src/Approx/Approx_HArray1OfAdHSurface.hxx
View File

@ -23,5 +23,4 @@
DEFINE_HARRAY1(Approx_HArray1OfAdHSurface, Approx_Array1OfAdHSurface) DEFINE_HARRAY1(Approx_HArray1OfAdHSurface, Approx_Array1OfAdHSurface)
#endif #endif

1
src/Approx/Approx_HArray1OfGTrsf2d.hxx
View File

@ -22,5 +22,4 @@
DEFINE_HARRAY1(Approx_HArray1OfGTrsf2d, Approx_Array1OfGTrsf2d) DEFINE_HARRAY1(Approx_HArray1OfGTrsf2d, Approx_Array1OfGTrsf2d)
#endif #endif

146
src/Approx/Approx_MCurvesToBSpCurve.cxx
View File

@ -12,46 +12,49 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <AppParCurves_MultiPoint.hxx> #include <AppParCurves_MultiPoint.hxx>
#include <Approx_MCurvesToBSpCurve.hxx> #include <Approx_MCurvesToBSpCurve.hxx>
#include <BSplCLib.hxx> #include <BSplCLib.hxx>
#include <Convert_CompBezierCurves2dToBSplineCurve2d.hxx> #include <Convert_CompBezierCurves2dToBSplineCurve2d.hxx>
#include <Convert_CompBezierCurvesToBSplineCurve.hxx> #include <Convert_CompBezierCurvesToBSplineCurve.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
static void DEBUG(const AppParCurves_MultiCurve& MC) { static void DEBUG(const AppParCurves_MultiCurve& MC)
{
Standard_Integer i, j; Standard_Integer i, j;
Standard_Integer nbcu = MC.NbCurves(); Standard_Integer nbcu = MC.NbCurves();
Standard_Integer nbpoles = MC.NbPoles(); Standard_Integer nbpoles = MC.NbPoles();
TColgp_Array1OfPnt Poles(1, nbpoles); TColgp_Array1OfPnt Poles(1, nbpoles);
TColgp_Array1OfPnt2d Poles2d(1, nbpoles); TColgp_Array1OfPnt2d Poles2d(1, nbpoles);
for (i = 1; i <= nbcu; i++) { for (i = 1; i <= nbcu; i++)
{
std::cout << " Curve No. " << i << std::endl; std::cout << " Curve No. " << i << std::endl;
if (MC.Dimension(i) == 3) { if (MC.Dimension(i) == 3)
{
MC.Curve(i, Poles); MC.Curve(i, Poles);
for (j = 1; j <= nbpoles; j++) { for (j = 1; j <= nbpoles; j++)
std::cout<< " Pole = " << Poles(j).X() <<" "<<Poles(j).Y()<<" "<<Poles(j).Z()<< std::endl; {
std::cout << " Pole = " << Poles(j).X() << " " << Poles(j).Y() << " " << Poles(j).Z()
<< std::endl;
} }
} }
else { else
{
MC.Curve(i, Poles2d); MC.Curve(i, Poles2d);
for (j = 1; j <= nbpoles; j++) { for (j = 1; j <= nbpoles; j++)
{
std::cout << " Pole = " << Poles2d(j).X() << " " << Poles2d(j).Y() << std::endl; std::cout << " Pole = " << Poles2d(j).X() << " " << Poles2d(j).Y() << std::endl;
} }
} }
} }
} }
#endif #endif
Approx_MCurvesToBSpCurve::Approx_MCurvesToBSpCurve() Approx_MCurvesToBSpCurve::Approx_MCurvesToBSpCurve()
{ {
myDone = Standard_False; myDone = Standard_False;
@ -68,14 +71,12 @@ void Approx_MCurvesToBSpCurve::Append(const AppParCurves_MultiCurve& MC)
myCurves.Append(MC); myCurves.Append(MC);
} }
void Approx_MCurvesToBSpCurve::Perform() void Approx_MCurvesToBSpCurve::Perform()
{ {
Perform(myCurves); Perform(myCurves);
} }
void Approx_MCurvesToBSpCurve::Perform void Approx_MCurvesToBSpCurve::Perform(const AppParCurves_SequenceOfMultiCurve& TheSeq)
(const AppParCurves_SequenceOfMultiCurve& TheSeq)
{ {
Standard_Integer i, j, deg = 0; Standard_Integer i, j, deg = 0;
@ -86,7 +87,8 @@ void Approx_MCurvesToBSpCurve::Perform
Standard_Boolean debug = Standard_False; Standard_Boolean debug = Standard_False;
#endif #endif
if (nbcu == 1) { if (nbcu == 1)
{
CU = TheSeq.Value(1); CU = TheSeq.Value(1);
deg = CU.Degree(); deg = CU.Degree();
TColStd_Array1OfReal Knots(1, 2); TColStd_Array1OfReal Knots(1, 2);
@ -96,7 +98,8 @@ void Approx_MCurvesToBSpCurve::Perform
Mults(1) = Mults(2) = deg + 1; Mults(1) = Mults(2) = deg + 1;
mySpline = AppParCurves_MultiBSpCurve(CU, Knots, Mults); mySpline = AppParCurves_MultiBSpCurve(CU, Knots, Mults);
} }
else { else
{
AppParCurves_MultiPoint P = TheSeq.Value(nbcu).Value(1); AppParCurves_MultiPoint P = TheSeq.Value(nbcu).Value(1);
Standard_Integer nb3d = P.NbPoints(); Standard_Integer nb3d = P.NbPoints();
@ -105,8 +108,10 @@ void Approx_MCurvesToBSpCurve::Perform
Convert_CompBezierCurvesToBSplineCurve conv; Convert_CompBezierCurvesToBSplineCurve conv;
Convert_CompBezierCurves2dToBSplineCurve2d conv2d; Convert_CompBezierCurves2dToBSplineCurve2d conv2d;
if (nb3d != 0) { if (nb3d != 0)
for (i = 1; i <= nbcu; i++) { {
for (i = 1; i <= nbcu; i++)
{
CU = TheSeq.Value(i); CU = TheSeq.Value(i);
TColgp_Array1OfPnt ThePoles3d(1, CU.NbPoles()); TColgp_Array1OfPnt ThePoles3d(1, CU.NbPoles());
CU.Curve(1, ThePoles3d); CU.Curve(1, ThePoles3d);
@ -115,9 +120,10 @@ void Approx_MCurvesToBSpCurve::Perform
conv.Perform(); conv.Perform();
} }
else if (nb2d != 0)
else if (nb2d != 0) { {
for (i = 1; i <= nbcu; i++) { for (i = 1; i <= nbcu; i++)
{
CU = TheSeq.Value(i); CU = TheSeq.Value(i);
TColgp_Array1OfPnt2d ThePoles2d(1, CU.NbPoles()); TColgp_Array1OfPnt2d ThePoles2d(1, CU.NbPoles());
CU.Curve(1 + nb3d, ThePoles2d); CU.Curve(1 + nb3d, ThePoles2d);
@ -126,13 +132,14 @@ void Approx_MCurvesToBSpCurve::Perform
conv2d.Perform(); conv2d.Perform();
} }
// Recuperation: // Recuperation:
if (nb3d != 0) { if (nb3d != 0)
{
nbpolesspl = conv.NbPoles(); nbpolesspl = conv.NbPoles();
nbknots = conv.NbKnots(); nbknots = conv.NbKnots();
} }
else if (nb2d != 0) { else if (nb2d != 0)
{
nbpolesspl = conv2d.NbPoles(); nbpolesspl = conv2d.NbPoles();
nbknots = conv2d.NbKnots(); nbknots = conv2d.NbKnots();
} }
@ -143,24 +150,28 @@ void Approx_MCurvesToBSpCurve::Perform
TColStd_Array1OfInteger TheMults(1, nbknots); TColStd_Array1OfInteger TheMults(1, nbknots);
TColStd_Array1OfReal TheKnots(1, nbknots); TColStd_Array1OfReal TheKnots(1, nbknots);
if (nb3d != 0) { if (nb3d != 0)
{
conv.KnotsAndMults(TheKnots, TheMults); conv.KnotsAndMults(TheKnots, TheMults);
conv.Poles(PolesSpl); conv.Poles(PolesSpl);
deg = conv.Degree(); deg = conv.Degree();
} }
else if (nb2d != 0) { else if (nb2d != 0)
{
conv2d.KnotsAndMults(TheKnots, TheMults); conv2d.KnotsAndMults(TheKnots, TheMults);
conv2d.Poles(PolesSpl2d); conv2d.Poles(PolesSpl2d);
deg = conv2d.Degree(); deg = conv2d.Degree();
} }
for (j = 1; j <= nbpolesspl; j++)
for (j = 1; j <= nbpolesspl; j++) { {
AppParCurves_MultiPoint MP(nb3d, nb2d); AppParCurves_MultiPoint MP(nb3d, nb2d);
if (nb3d!=0) { if (nb3d != 0)
{
MP.SetPoint(1, PolesSpl(j)); MP.SetPoint(1, PolesSpl(j));
} }
else if (nb2d!=0) { else if (nb2d != 0)
{
MP.SetPoint2d(1 + nb3d, PolesSpl2d(j)); MP.SetPoint2d(1 + nb3d, PolesSpl2d(j));
} }
tabMU.SetValue(j, MP); tabMU.SetValue(j, MP);
@ -169,55 +180,79 @@ void Approx_MCurvesToBSpCurve::Perform
Standard_Integer kpol = 1, kpoles3d = 1, kpoles2d = 1; Standard_Integer kpol = 1, kpoles3d = 1, kpoles2d = 1;
Standard_Integer mydegre, k; Standard_Integer mydegre, k;
Standard_Integer first, last, Inc, thefirst; Standard_Integer first, last, Inc, thefirst;
if (nb3d != 0) thefirst = 1; if (nb3d != 0)
else thefirst = 2; thefirst = 1;
else
thefirst = 2;
for (i = 1; i <= nbcu; i++) { for (i = 1; i <= nbcu; i++)
{
CU = TheSeq.Value(i); CU = TheSeq.Value(i);
mydegre = CU.Degree(); mydegre = CU.Degree();
if (TheMults(i+1) == deg) last = deg+1; // Continuite C0 if (TheMults(i + 1) == deg)
else last = deg; // Continuite C1 last = deg + 1; // Continuite C0
if (i==nbcu) {last = deg+1;} else
last = deg; // Continuite C1
if (i == nbcu)
{
last = deg + 1;
}
first = 1; first = 1;
if (i==1) first = 1; if (i == 1)
else if ((TheMults(i)== deg-1) || (TheMults(i)==deg)) first = 2; first = 1;
else if ((TheMults(i) == deg - 1) || (TheMults(i) == deg))
first = 2;
for (j = 2; j <= nb3d; j++) { for (j = 2; j <= nb3d; j++)
{
kpol = kpoles3d; kpol = kpoles3d;
TColgp_Array1OfPnt ThePoles(1, CU.NbPoles()); TColgp_Array1OfPnt ThePoles(1, CU.NbPoles());
CU.Curve(j, ThePoles); CU.Curve(j, ThePoles);
Inc = deg - mydegre; Inc = deg - mydegre;
TColgp_Array1OfPnt Points(1, deg + 1); TColgp_Array1OfPnt Points(1, deg + 1);
if (Inc > 0) { if (Inc > 0)
BSplCLib::IncreaseDegree(deg, ThePoles, BSplCLib::NoWeights(), {
Points, BSplCLib::NoWeights()); BSplCLib::IncreaseDegree(deg,
ThePoles,
BSplCLib::NoWeights(),
Points,
BSplCLib::NoWeights());
} }
else { else
{
Points = ThePoles; Points = ThePoles;
} }
for (k = first; k <= last; k++) { for (k = first; k <= last; k++)
{
tabMU.ChangeValue(kpol++).SetPoint(j, Points(k)); tabMU.ChangeValue(kpol++).SetPoint(j, Points(k));
} }
} }
kpoles3d = kpol; kpoles3d = kpol;
for (j = thefirst; j <= nb2d; j++) { for (j = thefirst; j <= nb2d; j++)
{
kpol = kpoles2d; kpol = kpoles2d;
TColgp_Array1OfPnt2d ThePoles2d(1, CU.NbPoles()); TColgp_Array1OfPnt2d ThePoles2d(1, CU.NbPoles());
CU.Curve(j + nb3d, ThePoles2d); CU.Curve(j + nb3d, ThePoles2d);
Inc = deg - mydegre; Inc = deg - mydegre;
TColgp_Array1OfPnt2d Points2d(1, deg + 1); TColgp_Array1OfPnt2d Points2d(1, deg + 1);
if (Inc > 0) { if (Inc > 0)
BSplCLib::IncreaseDegree(deg, ThePoles2d, BSplCLib::NoWeights(), {
Points2d, BSplCLib::NoWeights()); BSplCLib::IncreaseDegree(deg,
ThePoles2d,
BSplCLib::NoWeights(),
Points2d,
BSplCLib::NoWeights());
} }
else { else
{
Points2d = ThePoles2d; Points2d = ThePoles2d;
} }
for (k = first; k <= last; k++) { for (k = first; k <= last; k++)
{
tabMU.ChangeValue(kpol++).SetPoint2d(j + nb3d, Points2d(k)); tabMU.ChangeValue(kpol++).SetPoint2d(j + nb3d, Points2d(k));
} }
} }
@ -227,22 +262,19 @@ void Approx_MCurvesToBSpCurve::Perform
mySpline = AppParCurves_MultiBSpCurve(tabMU, TheKnots, TheMults); mySpline = AppParCurves_MultiBSpCurve(tabMU, TheKnots, TheMults);
} }
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
if(debug) DEBUG(mySpline); if (debug)
DEBUG(mySpline);
#endif #endif
myDone = Standard_True; myDone = Standard_True;
} }
const AppParCurves_MultiBSpCurve& Approx_MCurvesToBSpCurve::Value() const const AppParCurves_MultiBSpCurve& Approx_MCurvesToBSpCurve::Value() const
{ {
return mySpline; return mySpline;
} }
const AppParCurves_MultiBSpCurve& Approx_MCurvesToBSpCurve::ChangeValue() const AppParCurves_MultiBSpCurve& Approx_MCurvesToBSpCurve::ChangeValue()
{ {
return mySpline; return mySpline;
} }

23
src/Approx/Approx_MCurvesToBSpCurve.hxx
View File

@ -24,15 +24,11 @@
#include <AppParCurves_SequenceOfMultiCurve.hxx> #include <AppParCurves_SequenceOfMultiCurve.hxx>
class AppParCurves_MultiCurve; class AppParCurves_MultiCurve;
class Approx_MCurvesToBSpCurve class Approx_MCurvesToBSpCurve
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
Standard_EXPORT Approx_MCurvesToBSpCurve(); Standard_EXPORT Approx_MCurvesToBSpCurve();
Standard_EXPORT void Reset(); Standard_EXPORT void Reset();
@ -49,30 +45,11 @@ public:
//! return the composite MultiCurves as a MultiBSpCurve. //! return the composite MultiCurves as a MultiBSpCurve.
Standard_EXPORT const AppParCurves_MultiBSpCurve& ChangeValue(); Standard_EXPORT const AppParCurves_MultiBSpCurve& ChangeValue();
protected: protected:
private: private:
AppParCurves_MultiBSpCurve mySpline; AppParCurves_MultiBSpCurve mySpline;
Standard_Boolean myDone; Standard_Boolean myDone;
AppParCurves_SequenceOfMultiCurve myCurves; AppParCurves_SequenceOfMultiCurve myCurves;
}; };
#endif // _Approx_MCurvesToBSpCurve_HeaderFile #endif // _Approx_MCurvesToBSpCurve_HeaderFile

4
src/Approx/Approx_ParametrizationType.hxx
View File

@ -17,11 +17,11 @@
#ifndef _Approx_ParametrizationType_HeaderFile #ifndef _Approx_ParametrizationType_HeaderFile
#define _Approx_ParametrizationType_HeaderFile #define _Approx_ParametrizationType_HeaderFile
enum Approx_ParametrizationType enum Approx_ParametrizationType
{ {
Approx_ChordLength, //!< parameters of points are proportionate to distances between them Approx_ChordLength, //!< parameters of points are proportionate to distances between them
Approx_Centripetal, //!< parameters of points are proportionate to square roots of distances between them Approx_Centripetal, //!< parameters of points are proportionate to square roots of distances
//!< between them
Approx_IsoParametric //!< parameters of points are distributed uniformly Approx_IsoParametric //!< parameters of points are distributed uniformly
}; };

234
src/Approx/Approx_SameParameter.cxx
View File

@ -17,25 +17,23 @@
#include <Approx_SameParameter.hxx> #include <Approx_SameParameter.hxx>
#include <Adaptor2d_Curve2d.hxx> #include <Adaptor2d_Curve2d.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Adaptor3d_Curve.hxx> #include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_CurveOnSurface.hxx>
#include <Adaptor3d_Surface.hxx> #include <Adaptor3d_Surface.hxx>
#include <Extrema_ExtPC.hxx> #include <Extrema_ExtPC.hxx>
#include <Extrema_LocateExtPC.hxx> #include <Extrema_LocateExtPC.hxx>
#include <Geom2dAdaptor.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom2d_BSplineCurve.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_Curve.hxx> #include <Geom2d_Curve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <GeomLib_MakeCurvefromApprox.hxx> #include <GeomLib_MakeCurvefromApprox.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <Geom2dAdaptor.hxx>
//======================================================================= //=================================================================================================
//class : Approx_SameParameter_Evaluator
//purpose : Used in same parameterization curve approximation.
//=======================================================================
class Approx_SameParameter_Evaluator : public AdvApprox_EvaluatorFunction class Approx_SameParameter_Evaluator : public AdvApprox_EvaluatorFunction
{ {
public: public:
@ -44,7 +42,9 @@ public:
const Handle(Adaptor2d_Curve2d)& theHCurve2d) const Handle(Adaptor2d_Curve2d)& theHCurve2d)
: FlatKnots(theFlatKnots), : FlatKnots(theFlatKnots),
Poles(thePoles), Poles(thePoles),
HCurve2d(theHCurve2d) {} HCurve2d(theHCurve2d)
{
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -59,10 +59,8 @@ private:
Handle(Adaptor2d_Curve2d) HCurve2d; Handle(Adaptor2d_Curve2d) HCurve2d;
}; };
//======================================================================= //=================================================================================================
//function : Evaluate
//purpose :
//=======================================================================
void Approx_SameParameter_Evaluator::Evaluate(Standard_Integer*, /*Dimension*/ void Approx_SameParameter_Evaluator::Evaluate(Standard_Integer*, /*Dimension*/
Standard_Real /*StartEnd*/[2], Standard_Real /*StartEnd*/[2],
Standard_Real* Parameter, Standard_Real* Parameter,
@ -103,10 +101,8 @@ void Approx_SameParameter_Evaluator::Evaluate (Standard_Integer *,/*Dimension*/
ReturnCode[0] = 0; ReturnCode[0] = 0;
} }
//======================================================================= //=================================================================================================
//function : ProjectPointOnCurve
//purpose :
//=======================================================================
static void ProjectPointOnCurve(const Standard_Real InitValue, static void ProjectPointOnCurve(const Standard_Real InitValue,
const gp_Pnt& APoint, const gp_Pnt& APoint,
const Standard_Real Tolerance, const Standard_Real Tolerance,
@ -119,8 +115,7 @@ static void ProjectPointOnCurve(const Standard_Real InitValue,
gp_Pnt a_point; gp_Pnt a_point;
gp_Vec vector, d1, d2; gp_Vec vector, d1, d2;
Standard_Real func, func_derivative, Standard_Real func, func_derivative, param = InitValue;
param = InitValue;
Status = Standard_False; Status = Standard_False;
do do
{ {
@ -151,10 +146,8 @@ static void ProjectPointOnCurve(const Standard_Real InitValue,
Result = param; Result = param;
} }
//======================================================================= //=================================================================================================
//function : ComputeTolReached
//purpose :
//=======================================================================
static Standard_Real ComputeTolReached(const Handle(Adaptor3d_Curve)& c3d, static Standard_Real ComputeTolReached(const Handle(Adaptor3d_Curve)& c3d,
const Adaptor3d_CurveOnSurface& cons, const Adaptor3d_CurveOnSurface& cons,
const Standard_Integer nbp) const Standard_Integer nbp)
@ -177,9 +170,8 @@ static Standard_Real ComputeTolReached(const Handle(Adaptor3d_Curve)& c3d,
d2 = Precision::Infinite(); d2 = Precision::Infinite();
break; break;
} }
if (Precision::IsInfinite(Pcons.X()) || if (Precision::IsInfinite(Pcons.X()) || Precision::IsInfinite(Pcons.Y())
Precision::IsInfinite(Pcons.Y()) || || Precision::IsInfinite(Pcons.Z()))
Precision::IsInfinite(Pcons.Z()))
{ {
d2 = Precision::Infinite(); d2 = Precision::Infinite();
break; break;
@ -193,10 +185,8 @@ static Standard_Real ComputeTolReached(const Handle(Adaptor3d_Curve)& c3d,
return aDeviation; return aDeviation;
} }
//======================================================================= //=================================================================================================
//function : Check
//purpose : Check current interpolation for validity.
//=======================================================================
static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots, static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
const TColStd_Array1OfReal& Poles, const TColStd_Array1OfReal& Poles,
const Standard_Integer nbp, const Standard_Integer nbp,
@ -237,11 +227,17 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
Standard_Real tc3d = pc3d[0] * (1.0 - t) + pc3d[nbp - 1] * t; // weight function. Standard_Real tc3d = pc3d[0] * (1.0 - t) + pc3d[nbp - 1] * t; // weight function.
gp_Pnt Pc3d = c3d->Value(tc3d); gp_Pnt Pc3d = c3d->Value(tc3d);
Standard_Real tcons; Standard_Real tcons;
BSplCLib::Eval(tc3d, Standard_False, 0, extrap_mode[0], BSplCLib::Eval(tc3d,
aDegree, FlatKnots, 1, (Standard_Real&)Poles(1), tcons); Standard_False,
0,
extrap_mode[0],
aDegree,
FlatKnots,
1,
(Standard_Real&)Poles(1),
tcons);
if (tcons < tprev || if (tcons < tprev || tcons > aParamLast)
tcons > aParamLast)
{ {
tol = Precision::Infinite(); tol = Precision::Infinite();
return Standard_False; return Standard_False;
@ -249,7 +245,8 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
tprev = tcons; tprev = tcons;
gp_Pnt Pcons = cons.Value(tcons); gp_Pnt Pcons = cons.Value(tcons);
Standard_Real temp = Pc3d.SquareDistance(Pcons); Standard_Real temp = Pc3d.SquareDistance(Pcons);
if(temp > d2) d2 = temp; if (temp > d2)
d2 = temp;
} }
tol = sqrt(d2); tol = sqrt(d2);
@ -266,10 +263,8 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
return (tol <= d || tol > 0.8 * oldtol); return (tol <= d || tol > 0.8 * oldtol);
} }
//======================================================================= //=================================================================================================
//function : Approx_SameParameter
//purpose :
//=======================================================================
Approx_SameParameter::Approx_SameParameter(const Handle(Geom_Curve)& C3D, Approx_SameParameter::Approx_SameParameter(const Handle(Geom_Curve)& C3D,
const Handle(Geom2d_Curve)& C2D, const Handle(Geom2d_Curve)& C2D,
const Handle(Geom_Surface)& S, const Handle(Geom_Surface)& S,
@ -284,10 +279,8 @@ Approx_SameParameter::Approx_SameParameter(const Handle(Geom_Curve)& C3D,
Build(Tol); Build(Tol);
} }
//======================================================================= //=================================================================================================
//function : Approx_SameParameter
//purpose :
//=======================================================================
Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D, Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
const Handle(Geom2d_Curve)& C2D, const Handle(Geom2d_Curve)& C2D,
const Handle(Adaptor3d_Surface)& S, const Handle(Adaptor3d_Surface)& S,
@ -302,10 +295,8 @@ Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
Build(Tol); Build(Tol);
} }
//======================================================================= //=================================================================================================
//function : Approx_SameParameter
//purpose :
//=======================================================================
Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D, Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
const Handle(Adaptor2d_Curve2d)& C2D, const Handle(Adaptor2d_Curve2d)& C2D,
const Handle(Adaptor3d_Surface)& S, const Handle(Adaptor3d_Surface)& S,
@ -320,10 +311,8 @@ Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
Build(Tol); Build(Tol);
} }
//======================================================================= //=================================================================================================
//function : Build
//purpose :
//=======================================================================
void Approx_SameParameter::Build(const Standard_Real Tolerance) void Approx_SameParameter::Build(const Standard_Real Tolerance)
{ {
// Algorithm: // Algorithm:
@ -332,8 +321,8 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
// 2.2) Compute parameters in 2d space if not same parameter. // 2.2) Compute parameters in 2d space if not same parameter.
// 3) Loop over poles number and try to interpolate 2d curve. // 3) Loop over poles number and try to interpolate 2d curve.
// 4) If loop is failed build 2d curve forcibly or use original pcurve. // 4) If loop is failed build 2d curve forcibly or use original pcurve.
Standard_Real qpcons[myMaxArraySize], qnewpcons[myMaxArraySize], Standard_Real qpcons[myMaxArraySize], qnewpcons[myMaxArraySize], qpc3d[myMaxArraySize],
qpc3d[myMaxArraySize], qnewpc3d[myMaxArraySize]; qnewpc3d[myMaxArraySize];
// Create and fill data structure. // Create and fill data structure.
Approx_SameParameter_Data aData; Approx_SameParameter_Data aData;
@ -399,12 +388,11 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
// Try to build B-spline approximation curve using interpolation with degree 3. // Try to build B-spline approximation curve using interpolation with degree 3.
// The loop is organized over number of poles. // The loop is organized over number of poles.
GeomAbs_Shape aContinuity = myHCurve2d->Continuity(); GeomAbs_Shape aContinuity = myHCurve2d->Continuity();
if(aContinuity > GeomAbs_C1) aContinuity = GeomAbs_C1; if (aContinuity > GeomAbs_C1)
aContinuity = GeomAbs_C1;
Standard_Real besttol2 = aData.myTol * aData.myTol, Standard_Real besttol2 = aData.myTol * aData.myTol, tolsov = Precision::Infinite();
tolsov = Precision::Infinite(); Standard_Boolean interpolok = Standard_False, hasCountChanged = Standard_False;
Standard_Boolean interpolok = Standard_False,
hasCountChanged = Standard_False;
do do
{ {
// Interpolation data. // Interpolation data.
@ -423,8 +411,8 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
} }
Standard_Real algtol = sqrt(besttol2); Standard_Real algtol = sqrt(besttol2);
interpolok = Check (FlatKnots, Poles, aData.myNbPnt+1, aData.myPC3d, interpolok =
myC3d, aData.myCOnS, algtol, tolsov); Check(FlatKnots, Poles, aData.myNbPnt + 1, aData.myPC3d, myC3d, aData.myCOnS, algtol, tolsov);
tolsov = algtol; tolsov = algtol;
// Try to build 2d curve and check it for validity. // Try to build 2d curve and check it for validity.
@ -439,8 +427,18 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
Approx_SameParameter_Evaluator ev(FlatKnots, Poles, myHCurve2d); Approx_SameParameter_Evaluator ev(FlatKnots, Poles, myHCurve2d);
Standard_Integer aMaxDeg = 11, aMaxSeg = 1000; Standard_Integer aMaxDeg = 11, aMaxSeg = 1000;
AdvApprox_ApproxAFunction anApproximator(2,0,0,tol1d,tol2d,tol3d,aData.myC3dPF,aData.myC3dPL, AdvApprox_ApproxAFunction anApproximator(2,
aContinuity,aMaxDeg,aMaxSeg,ev); 0,
0,
tol1d,
tol2d,
tol3d,
aData.myC3dPF,
aData.myC3dPL,
aContinuity,
aMaxDeg,
aMaxSeg,
ev);
if (anApproximator.IsDone() || anApproximator.HasResult()) if (anApproximator.IsDone() || anApproximator.HasResult())
{ {
@ -473,13 +471,13 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
if (!interpolok) if (!interpolok)
hasCountChanged = IncreaseNbPoles(Poles, FlatKnots, aData, besttol2); hasCountChanged = IncreaseNbPoles(Poles, FlatKnots, aData, besttol2);
} while (!interpolok && hasCountChanged); } while (!interpolok && hasCountChanged);
if (!myDone) if (!myDone)
{ {
// Loop is finished unsuccessfully. Fix tolerance by maximal deviation, // Loop is finished unsuccessfully. Fix tolerance by maximal deviation,
// using data from the last loop iteration or initial data. Use data set with minimal deflection. // using data from the last loop iteration or initial data. Use data set with minimal
// deflection.
// Original 2d curve. // Original 2d curve.
aData.myCOnS.Load(myHCurve2d); aData.myCOnS.Load(myHCurve2d);
@ -492,8 +490,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
TColStd_Array1OfReal Poles(1, num_poles); TColStd_Array1OfReal Poles(1, num_poles);
TColStd_Array1OfReal FlatKnots(1, num_knots); TColStd_Array1OfReal FlatKnots(1, num_knots);
Interpolate(aData, tangent[0], tangent[1], Interpolate(aData, tangent[0], tangent[1], Poles, FlatKnots);
Poles, FlatKnots);
Standard_Real besttol = sqrt(besttol2); Standard_Real besttol = sqrt(besttol2);
Handle(TColStd_HArray1OfReal) tol1d, tol2d, tol3d; Handle(TColStd_HArray1OfReal) tol1d, tol2d, tol3d;
@ -502,11 +499,20 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
tol1d->SetValue(2, mySurf->VResolution(besttol)); tol1d->SetValue(2, mySurf->VResolution(besttol));
Approx_SameParameter_Evaluator ev(FlatKnots, Poles, myHCurve2d); Approx_SameParameter_Evaluator ev(FlatKnots, Poles, myHCurve2d);
AdvApprox_ApproxAFunction anApproximator(2,0,0,tol1d,tol2d,tol3d,aData.myC3dPF,aData.myC3dPL, AdvApprox_ApproxAFunction anApproximator(2,
aContinuity,11,40,ev); 0,
0,
tol1d,
tol2d,
tol3d,
aData.myC3dPF,
aData.myC3dPL,
aContinuity,
11,
40,
ev);
if (!anApproximator.IsDone() && if (!anApproximator.IsDone() && !anApproximator.HasResult())
!anApproximator.HasResult() )
{ {
myDone = Standard_False; myDone = Standard_False;
return; return;
@ -530,11 +536,13 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
myCurveOnSurface = Handle(Adaptor3d_CurveOnSurface)::DownCast(aData.myCOnS.ShallowCopy()); myCurveOnSurface = Handle(Adaptor3d_CurveOnSurface)::DownCast(aData.myCOnS.ShallowCopy());
} }
//======================================================================= //=================================================================================================
// function : BuildInitialDistribution // function : BuildInitialDistribution
// purpose : Sub-method in Build. // purpose : Sub-method in Build.
//======================================================================= //=================================================================================================
Standard_Boolean Approx_SameParameter::BuildInitialDistribution(Approx_SameParameter_Data &theData) const
Standard_Boolean Approx_SameParameter::BuildInitialDistribution(
Approx_SameParameter_Data& theData) const
{ {
// Take a multiple of the sample pof CheckShape, // Take a multiple of the sample pof CheckShape,
// at least the control points will be correct. // at least the control points will be correct.
@ -569,20 +577,24 @@ Standard_Boolean Approx_SameParameter::BuildInitialDistribution(Approx_SameParam
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : IncreaseInitialNbSamples // function : IncreaseInitialNbSamples
// purpose : Get number of C1 intervals and build new distribution on them. // purpose : Get number of C1 intervals and build new distribution on them.
// Sub-method in BuildInitialDistribution. // Sub-method in BuildInitialDistribution.
//======================================================================= //=================================================================================================
Standard_Boolean Approx_SameParameter::IncreaseInitialNbSamples(Approx_SameParameter_Data &theData) const
Standard_Boolean Approx_SameParameter::IncreaseInitialNbSamples(
Approx_SameParameter_Data& theData) const
{ {
Standard_Integer NbInt = myHCurve2d->NbIntervals(GeomAbs_C1) + 1; Standard_Integer NbInt = myHCurve2d->NbIntervals(GeomAbs_C1) + 1;
TColStd_Array1OfReal aC1Intervals(1, NbInt); TColStd_Array1OfReal aC1Intervals(1, NbInt);
myHCurve2d->Intervals(aC1Intervals, GeomAbs_C1); myHCurve2d->Intervals(aC1Intervals, GeomAbs_C1);
Standard_Integer inter = 1; Standard_Integer inter = 1;
while(inter <= NbInt && aC1Intervals(inter) <= theData.myC3dPF + myDeltaMin) inter++; while (inter <= NbInt && aC1Intervals(inter) <= theData.myC3dPF + myDeltaMin)
while(NbInt > 0 && aC1Intervals(NbInt) >= theData.myC3dPL - myDeltaMin) NbInt--; inter++;
while (NbInt > 0 && aC1Intervals(NbInt) >= theData.myC3dPL - myDeltaMin)
NbInt--;
// Compute new parameters. // Compute new parameters.
TColStd_SequenceOfReal aNewPar; TColStd_SequenceOfReal aNewPar;
@ -631,10 +643,11 @@ Standard_Boolean Approx_SameParameter::IncreaseInitialNbSamples(Approx_SameParam
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : CheckSameParameter // function : CheckSameParameter
// purpose : Sub-method in Build. // purpose : Sub-method in Build.
//======================================================================= //=================================================================================================
Standard_Boolean Approx_SameParameter::CheckSameParameter(Approx_SameParameter_Data& theData, Standard_Boolean Approx_SameParameter::CheckSameParameter(Approx_SameParameter_Data& theData,
Standard_Real& theSqDist) const Standard_Real& theSqDist) const
{ {
@ -667,8 +680,10 @@ Standard_Boolean Approx_SameParameter::CheckSameParameter(Approx_SameParameter_D
dist2 = Pcons.SquareDistance(Pc3d); dist2 = Pcons.SquareDistance(Pc3d);
// Same parameter point. // Same parameter point.
Standard_Boolean isUseParam = (dist2 <= Tol2 && // Good distance. Standard_Boolean isUseParam =
(theData.myPC3d[ii] > theData.myPC3d[count-1] + myDeltaMin)); // Point is separated from previous. (dist2 <= Tol2 && // Good distance.
(theData.myPC3d[ii]
> theData.myPC3d[count - 1] + myDeltaMin)); // Point is separated from previous.
if (isUseParam) if (isUseParam)
{ {
if (dmax2 < dist2) if (dmax2 < dist2)
@ -743,10 +758,11 @@ Standard_Boolean Approx_SameParameter::CheckSameParameter(Approx_SameParameter_D
return isSameParam; return isSameParam;
} }
//======================================================================= //=================================================================================================
// function : ComputeTangents // function : ComputeTangents
// purpose : Sub-method in Build. // purpose : Sub-method in Build.
//======================================================================= //=================================================================================================
Standard_Boolean Approx_SameParameter::ComputeTangents(const Adaptor3d_CurveOnSurface& theCOnS, Standard_Boolean Approx_SameParameter::ComputeTangents(const Adaptor3d_CurveOnSurface& theCOnS,
Standard_Real& theFirstTangent, Standard_Real& theFirstTangent,
Standard_Real& theLastTangent) const Standard_Real& theLastTangent) const
@ -780,10 +796,11 @@ Standard_Boolean Approx_SameParameter::ComputeTangents(const Adaptor3d_CurveOnSu
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : Interpolate // function : Interpolate
// purpose : Sub-method in Build. // purpose : Sub-method in Build.
//======================================================================= //=================================================================================================
Standard_Boolean Approx_SameParameter::Interpolate(const Approx_SameParameter_Data& theData, Standard_Boolean Approx_SameParameter::Interpolate(const Approx_SameParameter_Data& theData,
const Standard_Real aTangFirst, const Standard_Real aTangFirst,
const Standard_Real aTangLast, const Standard_Real aTangLast,
@ -799,11 +816,13 @@ Standard_Boolean Approx_SameParameter::Interpolate(const Approx_SameParameter_Da
ContactOrder(2) = ContactOrder(num_poles - 1) = 1; ContactOrder(2) = ContactOrder(num_poles - 1) = 1;
theFlatKnots(1) = theFlatKnots(2) = theFlatKnots(3) = theFlatKnots(4) = theData.myC3dPF; theFlatKnots(1) = theFlatKnots(2) = theFlatKnots(3) = theFlatKnots(4) = theData.myC3dPF;
theFlatKnots(num_poles + 1) = theFlatKnots(num_poles + 2) = theFlatKnots(num_poles + 1) = theFlatKnots(num_poles + 2) = theFlatKnots(num_poles + 3) =
theFlatKnots(num_poles + 3) = theFlatKnots(num_poles + 4) = theData.myC3dPL; theFlatKnots(num_poles + 4) = theData.myC3dPL;
thePoles(1) = theData.myC2dPF; thePoles(num_poles) = theData.myC2dPL; thePoles(1) = theData.myC2dPF;
thePoles(2) = aTangFirst; thePoles(num_poles - 1) = aTangLast; thePoles(num_poles) = theData.myC2dPL;
thePoles(2) = aTangFirst;
thePoles(num_poles - 1) = aTangLast;
aParameters(1) = aParameters(2) = theData.myC3dPF; aParameters(1) = aParameters(2) = theData.myC3dPF;
aParameters(num_poles - 1) = aParameters(num_poles) = theData.myC3dPL; aParameters(num_poles - 1) = aParameters(num_poles) = theData.myC3dPL;
@ -814,8 +833,13 @@ Standard_Boolean Approx_SameParameter::Interpolate(const Approx_SameParameter_Da
aParameters(ii) = theFlatKnots(ii + 2) = theData.myPC3d[ii - 2]; aParameters(ii) = theFlatKnots(ii + 2) = theData.myPC3d[ii - 2];
} }
Standard_Integer inversion_problem; Standard_Integer inversion_problem;
BSplCLib::Interpolate(3,theFlatKnots,aParameters,ContactOrder, BSplCLib::Interpolate(3,
1,thePoles(1),inversion_problem); theFlatKnots,
aParameters,
ContactOrder,
1,
thePoles(1),
inversion_problem);
if (inversion_problem) if (inversion_problem)
{ {
return Standard_False; return Standard_False;
@ -824,10 +848,11 @@ Standard_Boolean Approx_SameParameter::Interpolate(const Approx_SameParameter_Da
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : IncreaseNbPoles // function : IncreaseNbPoles
// purpose : Sub-method in Build. // purpose : Sub-method in Build.
//======================================================================= //=================================================================================================
Standard_Boolean Approx_SameParameter::IncreaseNbPoles(const TColStd_Array1OfReal& thePoles, Standard_Boolean Approx_SameParameter::IncreaseNbPoles(const TColStd_Array1OfReal& thePoles,
const TColStd_Array1OfReal& theFlatKnots, const TColStd_Array1OfReal& theFlatKnots,
Approx_SameParameter_Data& theData, Approx_SameParameter_Data& theData,
@ -851,10 +876,18 @@ Standard_Boolean Approx_SameParameter::IncreaseNbPoles(const TColStd_Array1OfRea
theData.myNewPC3d[newcount] = theData.myPC3d[ii]; theData.myNewPC3d[newcount] = theData.myPC3d[ii];
newcount++; newcount++;
if(theData.myNbPnt - ii + newcount == myMaxArraySize) continue; if (theData.myNbPnt - ii + newcount == myMaxArraySize)
continue;
BSplCLib::Eval(0.5*(theData.myPC3d[ii]+theData.myPC3d[ii+1]), Standard_False, DerivativeRequest, BSplCLib::Eval(0.5 * (theData.myPC3d[ii] + theData.myPC3d[ii + 1]),
extrap_mode[0], 3, theFlatKnots, 1, PolesArray[0], eval_result); Standard_False,
DerivativeRequest,
extrap_mode[0],
3,
theFlatKnots,
1,
PolesArray[0],
eval_result);
if (eval_result < theData.myPC2d[ii] || eval_result > theData.myPC2d[ii + 1]) if (eval_result < theData.myPC2d[ii] || eval_result > theData.myPC2d[ii + 1])
{ {
@ -868,7 +901,8 @@ Standard_Boolean Approx_SameParameter::IncreaseNbPoles(const TColStd_Array1OfRea
{ {
curp = Projector.Point().Parameter(); curp = Projector.Point().Parameter();
Standard_Real dist_2 = Projector.SquareDistance(); Standard_Real dist_2 = Projector.SquareDistance();
if(dist_2 > theBestSqTol) theBestSqTol = dist_2; if (dist_2 > theBestSqTol)
theBestSqTol = dist_2;
projok = 1; projok = 1;
} }
else else
@ -904,7 +938,8 @@ Standard_Boolean Approx_SameParameter::IncreaseNbPoles(const TColStd_Array1OfRea
theData.myNewPC2d[newcount] = theData.myPC2d[n]; theData.myNewPC2d[newcount] = theData.myPC2d[n];
newcount++; newcount++;
if(theData.myNbPnt - n + newcount == myMaxArraySize) continue; if (theData.myNbPnt - n + newcount == myMaxArraySize)
continue;
Standard_Real ucons = 0.5 * (theData.myPC2d[n] + theData.myPC2d[n + 1]); Standard_Real ucons = 0.5 * (theData.myPC2d[n] + theData.myPC2d[n + 1]);
Standard_Real uc3d = 0.5 * (theData.myPC3d[n] + theData.myPC3d[n + 1]); Standard_Real uc3d = 0.5 * (theData.myPC3d[n] + theData.myPC3d[n + 1]);
@ -916,7 +951,8 @@ Standard_Boolean Approx_SameParameter::IncreaseNbPoles(const TColStd_Array1OfRea
{ {
curp = Projector.Point().Parameter(); curp = Projector.Point().Parameter();
Standard_Real dist_2 = Projector.SquareDistance(); Standard_Real dist_2 = Projector.SquareDistance();
if(dist_2 > theBestSqTol) theBestSqTol = dist_2; if (dist_2 > theBestSqTol)
theBestSqTol = dist_2;
projok = 1; projok = 1;
} }
else else

33
src/Approx/Approx_SameParameter.hxx
View File

@ -30,7 +30,6 @@ class Geom_Surface;
class Approx_SameParameter class Approx_SameParameter
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! Warning: the C3D and C2D must have the same parametric domain. //! Warning: the C3D and C2D must have the same parametric domain.
@ -53,51 +52,32 @@ public:
//!@Returns .false. if calculations failed, //!@Returns .false. if calculations failed,
//! .true. if calculations succeed //! .true. if calculations succeed
Standard_Boolean IsDone() const Standard_Boolean IsDone() const { return myDone; }
{
return myDone;
}
//!@Returns tolerance (maximal distance) between 3d curve //!@Returns tolerance (maximal distance) between 3d curve
//! and curve on surface, generated by 2d curve and surface. //! and curve on surface, generated by 2d curve and surface.
Standard_Real TolReached() const Standard_Real TolReached() const { return myTolReached; }
{
return myTolReached;
}
//! Tells whether the original data had already the same //! Tells whether the original data had already the same
//! parameter up to the tolerance : in that case nothing //! parameter up to the tolerance : in that case nothing
//! is done. //! is done.
Standard_Boolean IsSameParameter() const Standard_Boolean IsSameParameter() const { return mySameParameter; }
{
return mySameParameter;
}
//! Returns the 2D curve that has the same parameter as //! Returns the 2D curve that has the same parameter as
//! the 3D curve once evaluated on the surface up to the //! the 3D curve once evaluated on the surface up to the
//! specified tolerance. //! specified tolerance.
Handle(Geom2d_Curve) Curve2d() const Handle(Geom2d_Curve) Curve2d() const { return myCurve2d; }
{
return myCurve2d;
}
//! Returns the 3D curve that has the same parameter as //! Returns the 3D curve that has the same parameter as
//! the 3D curve once evaluated on the surface up to the //! the 3D curve once evaluated on the surface up to the
//! specified tolerance. //! specified tolerance.
Handle(Adaptor3d_Curve) Curve3d() const Handle(Adaptor3d_Curve) Curve3d() const { return myC3d; }
{
return myC3d;
}
//! Returns the 3D curve on surface that has the same parameter as //! Returns the 3D curve on surface that has the same parameter as
//! the 3D curve up to the specified tolerance. //! the 3D curve up to the specified tolerance.
Handle(Adaptor3d_CurveOnSurface) CurveOnSurface() const Handle(Adaptor3d_CurveOnSurface) CurveOnSurface() const { return myCurveOnSurface; }
{
return myCurveOnSurface;
}
private: private:
//! Internal data structure to unify access to the most actively used data. //! Internal data structure to unify access to the most actively used data.
//! This structure is not intended to be class field since //! This structure is not intended to be class field since
//! a lot of memory is used in intermediate computations. //! a lot of memory is used in intermediate computations.
@ -138,7 +118,6 @@ private:
} }
}; };
Approx_SameParameter(const Approx_SameParameter&); Approx_SameParameter(const Approx_SameParameter&);
Approx_SameParameter& operator=(const Approx_SameParameter&); Approx_SameParameter& operator=(const Approx_SameParameter&);

3
src/Approx/Approx_SequenceOfHArray1OfReal.hxx
View File

@ -17,10 +17,9 @@
#ifndef Approx_SequenceOfHArray1OfReal_HeaderFile #ifndef Approx_SequenceOfHArray1OfReal_HeaderFile
#define Approx_SequenceOfHArray1OfReal_HeaderFile #define Approx_SequenceOfHArray1OfReal_HeaderFile
#include <TColStd_HArray1OfReal.hxx>
#include <NCollection_Sequence.hxx> #include <NCollection_Sequence.hxx>
#include <TColStd_HArray1OfReal.hxx>
typedef NCollection_Sequence<Handle(TColStd_HArray1OfReal)> Approx_SequenceOfHArray1OfReal; typedef NCollection_Sequence<Handle(TColStd_HArray1OfReal)> Approx_SequenceOfHArray1OfReal;
#endif #endif

411
src/Approx/Approx_SweepApproximation.cxx
View File

@ -14,28 +14,27 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <AdvApprox_ApproxAFunction.hxx> #include <AdvApprox_ApproxAFunction.hxx>
#include <AdvApprox_DichoCutting.hxx> #include <AdvApprox_DichoCutting.hxx>
#include <AdvApprox_PrefAndRec.hxx> #include <AdvApprox_PrefAndRec.hxx>
#include <Approx_SweepApproximation.hxx> #include <Approx_SweepApproximation.hxx>
#include <Approx_SweepFunction.hxx> #include <Approx_SweepFunction.hxx>
#include <BSplCLib.hxx> #include <BSplCLib.hxx>
#include <gp_XYZ.hxx>
#include <Standard_DomainError.hxx> #include <Standard_DomainError.hxx>
#include <StdFail_NotDone.hxx> #include <StdFail_NotDone.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <gp_XYZ.hxx>
//=================================================================================================
//=======================================================================
//class : Approx_SweepApproximation_Eval
//purpose: evaluator class for approximation
//=======================================================================
class Approx_SweepApproximation_Eval : public AdvApprox_EvaluatorFunction class Approx_SweepApproximation_Eval : public AdvApprox_EvaluatorFunction
{ {
public: public:
Approx_SweepApproximation_Eval(Approx_SweepApproximation& theTool) Approx_SweepApproximation_Eval(Approx_SweepApproximation& theTool)
: Tool(theTool) {} : Tool(theTool)
{
}
virtual void Evaluate(Standard_Integer* Dimension, virtual void Evaluate(Standard_Integer* Dimension,
Standard_Real StartEnd[2], Standard_Real StartEnd[2],
@ -55,18 +54,17 @@ void Approx_SweepApproximation_Eval::Evaluate (Standard_Integer *,/*Dimension*/
Standard_Real* Result, // [Dimension] Standard_Real* Result, // [Dimension]
Standard_Integer* ErrorCode) Standard_Integer* ErrorCode)
{ {
*ErrorCode = Tool.Eval (*Parameter, *DerivativeRequest, *ErrorCode = Tool.Eval(*Parameter, *DerivativeRequest, StartEnd[0], StartEnd[1], Result[0]);
StartEnd[0], StartEnd[1], Result[0]);
} }
Approx_SweepApproximation:: Approx_SweepApproximation::Approx_SweepApproximation(const Handle(Approx_SweepFunction)& Func)
Approx_SweepApproximation(const Handle(Approx_SweepFunction)& Func)
{ {
myFunc = Func; myFunc = Func;
// Init of variables of control // Init of variables of control
myParam = 0; myParam = 0;
myOrder = -1; myOrder = -1;
first = 1.e100; last = -1.e100; first = 1.e100;
last = -1.e100;
done = Standard_False; done = Standard_False;
} }
@ -100,46 +98,56 @@ void Approx_SweepApproximation::Perform(const Standard_Real First,
OneDTol = new (TColStd_HArray1OfReal)(1, Num3DSS); OneDTol = new (TColStd_HArray1OfReal)(1, Num3DSS);
ThreeDTol = new (TColStd_HArray1OfReal)(1, Num3DSS); ThreeDTol = new (TColStd_HArray1OfReal)(1, Num3DSS);
myFunc->GetTolerance(BoundTol, Tol3d, TolAngular, myFunc->GetTolerance(BoundTol, Tol3d, TolAngular, ThreeDTol->ChangeArray1());
ThreeDTol->ChangeArray1());
for (ii = 1; ii <= Num3DSS; ii++) for (ii = 1; ii <= Num3DSS; ii++)
if (ThreeDTol->Value(ii) < Tol3dMin) Tol3dMin = ThreeDTol->Value(ii); if (ThreeDTol->Value(ii) < Tol3dMin)
Tol3dMin = ThreeDTol->Value(ii);
if (myFunc->IsRational()) { if (myFunc->IsRational())
{
Standard_Real Size; Standard_Real Size;
Num1DSS = NbPolSect; Num1DSS = NbPolSect;
TColStd_Array1OfReal Wmin(1, Num1DSS); TColStd_Array1OfReal Wmin(1, Num1DSS);
myFunc->GetMinimalWeight(Wmin); myFunc->GetMinimalWeight(Wmin);
Size = myFunc->MaximalSection(); Size = myFunc->MaximalSection();
Translation.SetXYZ Translation.SetXYZ(myFunc->BarycentreOfSurf().XYZ());
(myFunc->BarycentreOfSurf().XYZ()); for (ii = 1; ii <= Num3DSS; ii++)
for (ii=1; ii<=Num3DSS; ii++) { {
Tol = ThreeDTol->Value(ii) / 2; // To take account of the error on the final result. Tol = ThreeDTol->Value(ii) / 2; // To take account of the error on the final result.
OneDTol->SetValue(ii, Tol * Wmin(ii) / Size); OneDTol->SetValue(ii, Tol * Wmin(ii) / Size);
Tol *= Wmin(ii); // Factor of projection Tol *= Wmin(ii); // Factor of projection
ThreeDTol->SetValue(ii, Max(Tol, 1.e-20)); ThreeDTol->SetValue(ii, Max(Tol, 1.e-20));
} }
} }
else { Num1DSS = 0; } else
{
Num1DSS = 0;
}
// (2.2) Tolerance and Transformation 2d. // (2.2) Tolerance and Transformation 2d.
if (Num2DSS == 0) {TwoDTol.Nullify();} if (Num2DSS == 0)
else { {
TwoDTol.Nullify();
}
else
{
// for 2d define affinity using resolutions, to // for 2d define affinity using resolutions, to
// avoid homogeneous tolerance of approximation (u/v and 2d/3d) // avoid homogeneous tolerance of approximation (u/v and 2d/3d)
Standard_Real res, tolu, tolv; Standard_Real res, tolu, tolv;
TwoDTol = new (TColStd_HArray1OfReal)(1, Num2DSS); TwoDTol = new (TColStd_HArray1OfReal)(1, Num2DSS);
AAffin = new (Approx_HArray1OfGTrsf2d)(1, Num2DSS); AAffin = new (Approx_HArray1OfGTrsf2d)(1, Num2DSS);
The3D2DTol = 0.9 * BoundTol; // 10% of security The3D2DTol = 0.9 * BoundTol; // 10% of security
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
myFunc->Resolution(ii, The3D2DTol, tolu, tolv); myFunc->Resolution(ii, The3D2DTol, tolu, tolv);
if ( tolu> tolv ) { if (tolu > tolv)
{
res = tolv; res = tolv;
AAffin->ChangeValue(ii).SetValue(1, 1, tolv / tolu); AAffin->ChangeValue(ii).SetValue(1, 1, tolv / tolu);
} }
else { else
{
res = tolu; res = tolu;
AAffin->ChangeValue(ii).SetValue(2, 2, tolu / tolv); AAffin->ChangeValue(ii).SetValue(2, 2, tolu / tolv);
} }
@ -174,25 +182,39 @@ void Approx_SweepApproximation::Perform(const Standard_Real First,
} }
// Checks if myFunc->D2 is implemented // Checks if myFunc->D2 is implemented
if (continuity >= GeomAbs_C2) { if (continuity >= GeomAbs_C2)
{
Standard_Boolean B; Standard_Boolean B;
B = myFunc->D2(First, First, Last, B = myFunc->D2(First,
myPoles->ChangeArray1(), myDPoles->ChangeArray1(), First,
Last,
myPoles->ChangeArray1(),
myDPoles->ChangeArray1(),
myD2Poles->ChangeArray1(), myD2Poles->ChangeArray1(),
myPoles2d->ChangeArray1(), myDPoles2d->ChangeArray1(), myPoles2d->ChangeArray1(),
myDPoles2d->ChangeArray1(),
myD2Poles2d->ChangeArray1(), myD2Poles2d->ChangeArray1(),
myWeigths->ChangeArray1(), myDWeigths->ChangeArray1(), myWeigths->ChangeArray1(),
myDWeigths->ChangeArray1(),
myD2Weigths->ChangeArray1()); myD2Weigths->ChangeArray1());
if (!B) continuity = GeomAbs_C1; if (!B)
continuity = GeomAbs_C1;
} }
// Checks if myFunc->D1 is implemented // Checks if myFunc->D1 is implemented
if (continuity == GeomAbs_C1) { if (continuity == GeomAbs_C1)
{
Standard_Boolean B; Standard_Boolean B;
B = myFunc->D1(First, First, Last, B = myFunc->D1(First,
myPoles->ChangeArray1(), myDPoles->ChangeArray1(), First,
myPoles2d->ChangeArray1(), myDPoles2d->ChangeArray1(), Last,
myWeigths->ChangeArray1(), myDWeigths->ChangeArray1()); myPoles->ChangeArray1(),
if (!B) continuity = GeomAbs_C0; myDPoles->ChangeArray1(),
myPoles2d->ChangeArray1(),
myDPoles2d->ChangeArray1(),
myWeigths->ChangeArray1(),
myDWeigths->ChangeArray1());
if (!B)
continuity = GeomAbs_C0;
} }
// So that F was at least 20 times more exact than its approx // So that F was at least 20 times more exact than its approx
@ -201,51 +223,61 @@ void Approx_SweepApproximation::Perform(const Standard_Real First,
Standard_Integer NbIntervalC2 = myFunc->NbIntervals(GeomAbs_C2); Standard_Integer NbIntervalC2 = myFunc->NbIntervals(GeomAbs_C2);
Standard_Integer NbIntervalC3 = myFunc->NbIntervals(GeomAbs_C3); Standard_Integer NbIntervalC3 = myFunc->NbIntervals(GeomAbs_C3);
if (NbIntervalC3 > 1) { if (NbIntervalC3 > 1)
{
// (3.1) Approximation with preferential cut // (3.1) Approximation with preferential cut
TColStd_Array1OfReal Param_de_decoupeC2(1, NbIntervalC2 + 1); TColStd_Array1OfReal Param_de_decoupeC2(1, NbIntervalC2 + 1);
myFunc->Intervals(Param_de_decoupeC2, GeomAbs_C2); myFunc->Intervals(Param_de_decoupeC2, GeomAbs_C2);
TColStd_Array1OfReal Param_de_decoupeC3(1, NbIntervalC3 + 1); TColStd_Array1OfReal Param_de_decoupeC3(1, NbIntervalC3 + 1);
myFunc->Intervals(Param_de_decoupeC3, GeomAbs_C3); myFunc->Intervals(Param_de_decoupeC3, GeomAbs_C3);
AdvApprox_PrefAndRec Preferentiel(Param_de_decoupeC2, Param_de_decoupeC3);
AdvApprox_PrefAndRec Preferentiel(Param_de_decoupeC2,
Param_de_decoupeC3);
Approx_SweepApproximation_Eval ev(*this); Approx_SweepApproximation_Eval ev(*this);
Approximation(OneDTol, TwoDTol, ThreeDTol, Approximation(OneDTol,
TwoDTol,
ThreeDTol,
The3D2DTol, The3D2DTol,
First, Last, First,
Last,
continuity, continuity,
Degmax, Segmax, Degmax,
Segmax,
ev, ev,
Preferentiel); Preferentiel);
} }
else { else
{
// (3.2) Approximation without preferential cut // (3.2) Approximation without preferential cut
AdvApprox_DichoCutting Dichotomie; AdvApprox_DichoCutting Dichotomie;
Approx_SweepApproximation_Eval ev(*this); Approx_SweepApproximation_Eval ev(*this);
Approximation(OneDTol, TwoDTol, ThreeDTol, Approximation(OneDTol,
TwoDTol,
ThreeDTol,
The3D2DTol, The3D2DTol,
First, Last, First,
Last,
continuity, continuity,
Degmax, Segmax, Degmax,
Segmax,
ev, ev,
Dichotomie); Dichotomie);
} }
} }
//======================================================================== //=================================================================================================
// function : Approximation // function : Approximation
// purpose : Call F(t) and store the results // purpose : Call F(t) and store the results
//======================================================================== //=================================================================================================
void Approx_SweepApproximation::
Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol, void Approx_SweepApproximation::Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
const Handle(TColStd_HArray1OfReal)& TwoDTol, const Handle(TColStd_HArray1OfReal)& TwoDTol,
const Handle(TColStd_HArray1OfReal)& ThreeDTol, const Handle(TColStd_HArray1OfReal)& ThreeDTol,
const Standard_Real BoundTol, const Standard_Real BoundTol,
const Standard_Real First,const Standard_Real Last, const Standard_Real First,
const GeomAbs_Shape Continuity,const Standard_Integer Degmax, const Standard_Real Last,
const GeomAbs_Shape Continuity,
const Standard_Integer Degmax,
const Standard_Integer Segmax, const Standard_Integer Segmax,
const AdvApprox_EvaluatorFunction& TheApproxFunction, const AdvApprox_EvaluatorFunction& TheApproxFunction,
const AdvApprox_Cutting& TheCuttingTool) const AdvApprox_Cutting& TheCuttingTool)
@ -265,7 +297,8 @@ Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
TheCuttingTool); TheCuttingTool);
done = Approx.HasResult(); done = Approx.HasResult();
if (done) { if (done)
{
// --> Fill Champs of the surface ---- // --> Fill Champs of the surface ----
Standard_Integer ii, jj; Standard_Integer ii, jj;
@ -273,16 +306,17 @@ Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
// Unfortunately Adv_Approx stores the transposition of the required // Unfortunately Adv_Approx stores the transposition of the required
// so, writing tabPoles = Approx.Poles() will give an erroneous result // so, writing tabPoles = Approx.Poles() will give an erroneous result
// It is only possible to allocate and recopy term by term... // It is only possible to allocate and recopy term by term...
tabPoles = new (TColgp_HArray2OfPnt) tabPoles = new (TColgp_HArray2OfPnt)(1, Num3DSS, 1, Approx.NbPoles());
(1, Num3DSS, 1, Approx.NbPoles()); tabWeights = new (TColStd_HArray2OfReal)(1, Num3DSS, 1, Approx.NbPoles());
tabWeights = new (TColStd_HArray2OfReal)
(1, Num3DSS, 1, Approx.NbPoles());
if (Num1DSS == Num3DSS) { if (Num1DSS == Num3DSS)
{
Standard_Real wpoid; Standard_Real wpoid;
gp_Pnt P; gp_Pnt P;
for (ii=1; ii <=Num3DSS; ii++) { for (ii = 1; ii <= Num3DSS; ii++)
for (jj=1; jj <=Approx.NbPoles() ; jj++) { {
for (jj = 1; jj <= Approx.NbPoles(); jj++)
{
P = Approx.Poles()->Value(jj, ii); P = Approx.Poles()->Value(jj, ii);
wpoid = Approx.Poles1d()->Value(jj, ii); wpoid = Approx.Poles1d()->Value(jj, ii);
P.ChangeCoord() /= wpoid; // It is necessary to divide poles by weight P.ChangeCoord() /= wpoid; // It is necessary to divide poles by weight
@ -292,10 +326,13 @@ Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
} }
} }
} }
else { else
{
tabWeights->Init(1); tabWeights->Init(1);
for (ii=1; ii <=Num3DSS; ii++) { for (ii = 1; ii <= Num3DSS; ii++)
for (jj=1; jj <=Approx.NbPoles() ; jj++) { {
for (jj = 1; jj <= Approx.NbPoles(); jj++)
{
tabPoles->SetValue(ii, jj, Approx.Poles()->Value(jj, ii)); tabPoles->SetValue(ii, jj, Approx.Poles()->Value(jj, ii));
} }
} }
@ -305,22 +342,22 @@ Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
tabVKnots = Approx.Knots(); tabVKnots = Approx.Knots();
tabVMults = Approx.Multiplicities(); tabVMults = Approx.Multiplicities();
// --> Filling of curves 2D ---------- // --> Filling of curves 2D ----------
if (Num2DSS>0) { if (Num2DSS > 0)
{
gp_GTrsf2d TrsfInv; gp_GTrsf2d TrsfInv;
deg2d = vdeg; deg2d = vdeg;
tab2dKnots = Approx.Knots(); tab2dKnots = Approx.Knots();
tab2dMults = Approx.Multiplicities(); tab2dMults = Approx.Multiplicities();
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
TrsfInv = AAffin->Value(ii).Inverted(); TrsfInv = AAffin->Value(ii).Inverted();
Handle(TColgp_HArray1OfPnt2d) P2d = Handle(TColgp_HArray1OfPnt2d) P2d = new (TColgp_HArray1OfPnt2d)(1, Approx.NbPoles());
new (TColgp_HArray1OfPnt2d) (1, Approx.NbPoles());
Approx.Poles2d(ii, P2d->ChangeArray1()); Approx.Poles2d(ii, P2d->ChangeArray1());
// do not forget to apply inverted homothety. // do not forget to apply inverted homothety.
for (jj=1; jj<=Approx.NbPoles(); jj++) { for (jj = 1; jj <= Approx.NbPoles(); jj++)
{
TrsfInv.Transforms(P2d->ChangeValue(jj).ChangeCoord()); TrsfInv.Transforms(P2d->ChangeValue(jj).ChangeCoord());
} }
seqPoles2d.Append(P2d); seqPoles2d.Append(P2d);
@ -329,28 +366,32 @@ Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
// ---> Filling of errors // ---> Filling of errors
MError3d = new (TColStd_HArray1OfReal)(1, Num3DSS); MError3d = new (TColStd_HArray1OfReal)(1, Num3DSS);
AError3d = new (TColStd_HArray1OfReal)(1, Num3DSS); AError3d = new (TColStd_HArray1OfReal)(1, Num3DSS);
for (ii=1; ii<=Num3DSS; ii++) { for (ii = 1; ii <= Num3DSS; ii++)
{
MError3d->SetValue(ii, Approx.MaxError(3, ii)); MError3d->SetValue(ii, Approx.MaxError(3, ii));
AError3d->SetValue(ii, Approx.AverageError(3, ii)); AError3d->SetValue(ii, Approx.AverageError(3, ii));
} }
if (myFunc->IsRational()) { if (myFunc->IsRational())
{
MError1d = new (TColStd_HArray1OfReal)(1, Num3DSS); MError1d = new (TColStd_HArray1OfReal)(1, Num3DSS);
AError1d = new (TColStd_HArray1OfReal)(1, Num3DSS); AError1d = new (TColStd_HArray1OfReal)(1, Num3DSS);
for (ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
{
MError1d->SetValue(ii, Approx.MaxError(1, ii)); MError1d->SetValue(ii, Approx.MaxError(1, ii));
AError1d->SetValue(ii, Approx.AverageError(1, ii)); AError1d->SetValue(ii, Approx.AverageError(1, ii));
} }
} }
if (Num2DSS>0) { if (Num2DSS > 0)
{
tab2dError = new (TColStd_HArray1OfReal)(1, Num2DSS); tab2dError = new (TColStd_HArray1OfReal)(1, Num2DSS);
Ave2dError = new (TColStd_HArray1OfReal)(1, Num2DSS); Ave2dError = new (TColStd_HArray1OfReal)(1, Num2DSS);
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
tab2dError->SetValue(ii, Approx.MaxError(2, ii)); tab2dError->SetValue(ii, Approx.MaxError(2, ii));
Ave2dError->SetValue(ii, Approx.AverageError(2, ii)); Ave2dError->SetValue(ii, Approx.AverageError(2, ii));
COnSurfErr->SetValue(ii, COnSurfErr->SetValue(ii, (tab2dError->Value(ii) / TwoDTol->Value(ii)) * BoundTol);
(tab2dError->Value(ii)/TwoDTol->Value(ii))*BoundTol);
} }
} }
} }
@ -363,7 +404,8 @@ Standard_Integer Approx_SweepApproximation::Eval(const Standard_Real Parameter,
Standard_Real& Result) Standard_Real& Result)
{ {
Standard_Integer ier = 0; Standard_Integer ier = 0;
switch (DerivativeRequest) { switch (DerivativeRequest)
{
case 0: case 0:
ier = (!D0(Parameter, First, Last, Result)); ier = (!D0(Parameter, First, Last, Result));
break; break;
@ -389,28 +431,31 @@ Standard_Boolean Approx_SweepApproximation::D0(const Standard_Real Param,
Standard_Real* LocalResult = &Result; Standard_Real* LocalResult = &Result;
// Management of limits // Management of limits
if ((first!=First) || (Last!=last)) { if ((first != First) || (Last != last))
{
myFunc->SetInterval(First, Last); myFunc->SetInterval(First, Last);
} }
if (! ( (Param==myParam) && (myOrder>=0) if (!((Param == myParam) && (myOrder >= 0) && (first == First) && (Last == last)))
&& (first==First) && (Last==last)) ) { {
// Positioning in case when the last operation is not repeated. // Positioning in case when the last operation is not repeated.
Ok = myFunc->D0(Param, First, Last, Ok = myFunc->D0(Param,
First,
Last,
myPoles->ChangeArray1(), myPoles->ChangeArray1(),
myPoles2d->ChangeArray1(), myPoles2d->ChangeArray1(),
myWeigths->ChangeArray1()); myWeigths->ChangeArray1());
// poles3d are multiplied by weight after translation. // poles3d are multiplied by weight after translation.
for (ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
myPoles->ChangeValue(ii).ChangeCoord() {
-= Translation.XYZ(); myPoles->ChangeValue(ii).ChangeCoord() -= Translation.XYZ();
myPoles->ChangeValue(ii).ChangeCoord() myPoles->ChangeValue(ii).ChangeCoord() *= myWeigths->Value(ii);
*= myWeigths->Value(ii);
} }
// The transformation is applied to poles 2d. // The transformation is applied to poles 2d.
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
AAffin->Value(ii).Transforms(myPoles2d->ChangeValue(ii).ChangeCoord()); AAffin->Value(ii).Transforms(myPoles2d->ChangeValue(ii).ChangeCoord());
} }
@ -423,16 +468,19 @@ Standard_Boolean Approx_SweepApproximation::D0(const Standard_Real Param,
// Extraction of results // Extraction of results
index = 0; index = 0;
for (ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
{
LocalResult[index] = myWeigths->Value(ii); LocalResult[index] = myWeigths->Value(ii);
index++; index++;
} }
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
LocalResult[index] = myPoles2d->Value(ii).X(); LocalResult[index] = myPoles2d->Value(ii).X();
LocalResult[index + 1] = myPoles2d->Value(ii).Y(); LocalResult[index + 1] = myPoles2d->Value(ii).Y();
index += 2; index += 2;
} }
for (ii=1; ii<=Num3DSS; ii++, index+=3) { for (ii = 1; ii <= Num3DSS; ii++, index += 3)
{
LocalResult[index] = myPoles->Value(ii).X(); LocalResult[index] = myPoles->Value(ii).X();
LocalResult[index + 1] = myPoles->Value(ii).Y(); LocalResult[index + 1] = myPoles->Value(ii).Y();
LocalResult[index + 2] = myPoles->Value(ii).Z(); LocalResult[index + 2] = myPoles->Value(ii).Z();
@ -452,16 +500,18 @@ Standard_Boolean Approx_SweepApproximation::D1(const Standard_Real Param,
Standard_Boolean Ok = Standard_True; Standard_Boolean Ok = Standard_True;
Standard_Real* LocalResult = &Result; Standard_Real* LocalResult = &Result;
if ((first != First) || (Last != last))
if ((first!=First) || (Last!=last)) { {
myFunc->SetInterval(First, Last); myFunc->SetInterval(First, Last);
} }
if (! ( (Param==myParam) && (myOrder>=1) if (!((Param == myParam) && (myOrder >= 1) && (first == First) && (Last == last)))
&& (first==First) && (Last==last)) ){ {
// Positioning // Positioning
Ok = myFunc->D1(Param, First, Last, Ok = myFunc->D1(Param,
First,
Last,
myPoles->ChangeArray1(), myPoles->ChangeArray1(),
myDPoles->ChangeArray1(), myDPoles->ChangeArray1(),
myPoles2d->ChangeArray1(), myPoles2d->ChangeArray1(),
@ -471,10 +521,10 @@ Standard_Boolean Approx_SweepApproximation::D1(const Standard_Real Param,
// Take into account the multiplication of poles3d by weights. // Take into account the multiplication of poles3d by weights.
// and the translation. // and the translation.
for ( ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
{
// Translation on the section // Translation on the section
myPoles->ChangeValue(ii).ChangeCoord() myPoles->ChangeValue(ii).ChangeCoord() -= Translation.XYZ();
-= Translation.XYZ();
// Homothety on all. // Homothety on all.
const Standard_Real aWeight = myWeigths->Value(ii); const Standard_Real aWeight = myWeigths->Value(ii);
myDPoles->ChangeValue(ii) *= aWeight; myDPoles->ChangeValue(ii) *= aWeight;
@ -483,9 +533,9 @@ Standard_Boolean Approx_SweepApproximation::D1(const Standard_Real Param,
myPoles->ChangeValue(ii).ChangeCoord() *= aWeight; // for the cash myPoles->ChangeValue(ii).ChangeCoord() *= aWeight; // for the cash
} }
// Apply transformation 2d to suitable vectors // Apply transformation 2d to suitable vectors
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
Vcoord = myDPoles2d->Value(ii).XY(); Vcoord = myDPoles2d->Value(ii).XY();
AAffin->Value(ii).Transforms(Vcoord); AAffin->Value(ii).Transforms(Vcoord);
myDPoles2d->ChangeValue(ii).SetXY(Vcoord); myDPoles2d->ChangeValue(ii).SetXY(Vcoord);
@ -501,16 +551,19 @@ Standard_Boolean Approx_SweepApproximation::D1(const Standard_Real Param,
// Extraction of results // Extraction of results
index = 0; index = 0;
for (ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
{
LocalResult[index] = myDWeigths->Value(ii); LocalResult[index] = myDWeigths->Value(ii);
index++; index++;
} }
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
LocalResult[index] = myDPoles2d->Value(ii).X(); LocalResult[index] = myDPoles2d->Value(ii).X();
LocalResult[index + 1] = myDPoles2d->Value(ii).Y(); LocalResult[index + 1] = myDPoles2d->Value(ii).Y();
index += 2; index += 2;
} }
for (ii=1; ii<=Num3DSS; ii++, index+=3) { for (ii = 1; ii <= Num3DSS; ii++, index += 3)
{
LocalResult[index] = myDPoles->Value(ii).X(); LocalResult[index] = myDPoles->Value(ii).X();
LocalResult[index + 1] = myDPoles->Value(ii).Y(); LocalResult[index + 1] = myDPoles->Value(ii).Y();
LocalResult[index + 2] = myDPoles->Value(ii).Z(); LocalResult[index + 2] = myDPoles->Value(ii).Z();
@ -530,14 +583,17 @@ Standard_Boolean Approx_SweepApproximation::D2(const Standard_Real Param,
Standard_Real* LocalResult = &Result; Standard_Real* LocalResult = &Result;
// management of limits // management of limits
if ((first!=First) || (Last!=last)) { if ((first != First) || (Last != last))
{
myFunc->SetInterval(First, Last); myFunc->SetInterval(First, Last);
} }
if (! ( (Param==myParam) && (myOrder>=2) if (!((Param == myParam) && (myOrder >= 2) && (first == First) && (Last == last)))
&& (first==First) && (Last==last)) ) { {
// Positioning in case when the last operation is not repeated // Positioning in case when the last operation is not repeated
Ok = myFunc->D2(Param, First, Last, Ok = myFunc->D2(Param,
First,
Last,
myPoles->ChangeArray1(), myPoles->ChangeArray1(),
myDPoles->ChangeArray1(), myDPoles->ChangeArray1(),
myD2Poles->ChangeArray1(), myD2Poles->ChangeArray1(),
@ -549,10 +605,10 @@ Standard_Boolean Approx_SweepApproximation::D2(const Standard_Real Param,
myD2Weigths->ChangeArray1()); myD2Weigths->ChangeArray1());
// Multiply poles3d by the weight after translations. // Multiply poles3d by the weight after translations.
for (ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
{
// First translate // First translate
myPoles->ChangeValue(ii).ChangeCoord() myPoles->ChangeValue(ii).ChangeCoord() -= Translation.XYZ();
-= Translation.XYZ();
// Calculate the second derivative // Calculate the second derivative
myD2Poles->ChangeValue(ii) *= myWeigths->Value(ii); myD2Poles->ChangeValue(ii) *= myWeigths->Value(ii);
@ -565,12 +621,12 @@ Standard_Boolean Approx_SweepApproximation::D2(const Standard_Real Param,
myDPoles->ChangeValue(ii) *= myWeigths->Value(ii); myDPoles->ChangeValue(ii) *= myWeigths->Value(ii);
Vaux.SetXYZ(myPoles->Value(ii).Coord()); Vaux.SetXYZ(myPoles->Value(ii).Coord());
myDPoles->ChangeValue(ii) += myDWeigths->Value(ii) * Vaux; myDPoles->ChangeValue(ii) += myDWeigths->Value(ii) * Vaux;
myPoles->ChangeValue(ii).ChangeCoord() myPoles->ChangeValue(ii).ChangeCoord() *= myWeigths->Value(ii);
*= myWeigths->Value(ii);
} }
// Apply transformation to poles 2d. // Apply transformation to poles 2d.
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
Vcoord = myD2Poles2d->Value(ii).XY(); Vcoord = myD2Poles2d->Value(ii).XY();
AAffin->Value(ii).Transforms(Vcoord); AAffin->Value(ii).Transforms(Vcoord);
myD2Poles2d->ChangeValue(ii).SetXY(Vcoord); myD2Poles2d->ChangeValue(ii).SetXY(Vcoord);
@ -589,16 +645,19 @@ Standard_Boolean Approx_SweepApproximation::D2(const Standard_Real Param,
// Extraction of results // Extraction of results
index = 0; index = 0;
for (ii=1; ii<=Num1DSS; ii++) { for (ii = 1; ii <= Num1DSS; ii++)
{
LocalResult[index] = myD2Weigths->Value(ii); LocalResult[index] = myD2Weigths->Value(ii);
index++; index++;
} }
for (ii=1; ii<=Num2DSS; ii++) { for (ii = 1; ii <= Num2DSS; ii++)
{
LocalResult[index] = myD2Poles2d->Value(ii).X(); LocalResult[index] = myD2Poles2d->Value(ii).X();
LocalResult[index + 1] = myD2Poles2d->Value(ii).Y(); LocalResult[index + 1] = myD2Poles2d->Value(ii).Y();
index += 2; index += 2;
} }
for (ii=1; ii<=Num3DSS; ii++, index+=3) { for (ii = 1; ii <= Num3DSS; ii++, index += 3)
{
LocalResult[index] = myD2Poles->Value(ii).X(); LocalResult[index] = myD2Poles->Value(ii).X();
LocalResult[index + 1] = myD2Poles->Value(ii).Y(); LocalResult[index + 1] = myD2Poles->Value(ii).Y();
LocalResult[index + 2] = myD2Poles->Value(ii).Z(); LocalResult[index + 2] = myD2Poles->Value(ii).Z();
@ -607,14 +666,17 @@ Standard_Boolean Approx_SweepApproximation::D2(const Standard_Real Param,
return Ok; return Ok;
} }
void Approx_SweepApproximation:: void Approx_SweepApproximation::SurfShape(Standard_Integer& UDegree,
SurfShape(Standard_Integer& UDegree, Standard_Integer& VDegree,
Standard_Integer& VDegree,Standard_Integer& NbUPoles, Standard_Integer& NbUPoles,
Standard_Integer& NbVPoles, Standard_Integer& NbVPoles,
Standard_Integer& NbUKnots, Standard_Integer& NbUKnots,
Standard_Integer& NbVKnots) const Standard_Integer& NbVKnots) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
UDegree = udeg; UDegree = udeg;
VDegree = vdeg; VDegree = vdeg;
NbUPoles = tabPoles->ColLength(); NbUPoles = tabPoles->ColLength();
@ -623,15 +685,17 @@ SurfShape(Standard_Integer& UDegree,
NbVKnots = tabVKnots->Length(); NbVKnots = tabVKnots->Length();
} }
void Approx_SweepApproximation:: void Approx_SweepApproximation::Surface(TColgp_Array2OfPnt& TPoles,
Surface(TColgp_Array2OfPnt& TPoles,
TColStd_Array2OfReal& TWeights, TColStd_Array2OfReal& TWeights,
TColStd_Array1OfReal& TUKnots, TColStd_Array1OfReal& TUKnots,
TColStd_Array1OfReal& TVKnots, TColStd_Array1OfReal& TVKnots,
TColStd_Array1OfInteger& TUMults, TColStd_Array1OfInteger& TUMults,
TColStd_Array1OfInteger& TVMults) const TColStd_Array1OfInteger& TVMults) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
TPoles = tabPoles->Array2(); TPoles = tabPoles->Array2();
TWeights = tabWeights->Array2(); TWeights = tabWeights->Array2();
TUKnots = tabUKnots->Array1(); TUKnots = tabUKnots->Array1();
@ -644,21 +708,30 @@ Standard_Real Approx_SweepApproximation::MaxErrorOnSurf() const
{ {
Standard_Integer ii; Standard_Integer ii;
Standard_Real MaxError = 0, err; Standard_Real MaxError = 0, err;
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
if (myFunc->IsRational()) { if (myFunc->IsRational())
{
TColStd_Array1OfReal Wmin(1, Num1DSS); TColStd_Array1OfReal Wmin(1, Num1DSS);
myFunc->GetMinimalWeight(Wmin); myFunc->GetMinimalWeight(Wmin);
Standard_Real Size = myFunc->MaximalSection(); Standard_Real Size = myFunc->MaximalSection();
for (ii=1; ii<=Num3DSS; ii++) { for (ii = 1; ii <= Num3DSS; ii++)
{
err = (Size * MError1d->Value(ii) + MError3d->Value(ii)) / Wmin(ii); err = (Size * MError1d->Value(ii) + MError3d->Value(ii)) / Wmin(ii);
if (err>MaxError) MaxError = err; if (err > MaxError)
MaxError = err;
} }
} }
else { else
for (ii=1; ii<=Num3DSS; ii++) { {
for (ii = 1; ii <= Num3DSS; ii++)
{
err = MError3d->Value(ii); err = MError3d->Value(ii);
if (err>MaxError) MaxError = err; if (err > MaxError)
MaxError = err;
} }
} }
return MaxError; return MaxError;
@ -668,19 +741,26 @@ Standard_Real Approx_SweepApproximation::MaxErrorOnSurf() const
{ {
Standard_Integer ii; Standard_Integer ii;
Standard_Real MoyError = 0, err; Standard_Real MoyError = 0, err;
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
if (myFunc->IsRational()) { if (myFunc->IsRational())
{
TColStd_Array1OfReal Wmin(1, Num1DSS); TColStd_Array1OfReal Wmin(1, Num1DSS);
myFunc->GetMinimalWeight(Wmin); myFunc->GetMinimalWeight(Wmin);
Standard_Real Size = myFunc->MaximalSection(); Standard_Real Size = myFunc->MaximalSection();
for (ii=1; ii<=Num3DSS; ii++) { for (ii = 1; ii <= Num3DSS; ii++)
{
err = (Size * AError1d->Value(ii) + AError3d->Value(ii)) / Wmin(ii); err = (Size * AError1d->Value(ii) + AError3d->Value(ii)) / Wmin(ii);
MoyError += err; MoyError += err;
} }
} }
else { else
for (ii=1; ii<=Num3DSS; ii++) { {
for (ii = 1; ii <= Num3DSS; ii++)
{
err = AError3d->Value(ii); err = AError3d->Value(ii);
MoyError += err; MoyError += err;
} }
@ -688,13 +768,18 @@ Standard_Real Approx_SweepApproximation::MaxErrorOnSurf() const
return MoyError / Num3DSS; return MoyError / Num3DSS;
} }
void Approx_SweepApproximation::Curves2dShape(Standard_Integer& Degree, void Approx_SweepApproximation::Curves2dShape(Standard_Integer& Degree,
Standard_Integer& NbPoles, Standard_Integer& NbPoles,
Standard_Integer& NbKnots) const Standard_Integer& NbKnots) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
if (seqPoles2d.Length() == 0) {throw Standard_DomainError("Approx_SweepApproximation");} {
throw StdFail_NotDone("Approx_SweepApproximation");
}
if (seqPoles2d.Length() == 0)
{
throw Standard_DomainError("Approx_SweepApproximation");
}
Degree = deg2d; Degree = deg2d;
NbPoles = seqPoles2d(1)->Length(); NbPoles = seqPoles2d(1)->Length();
NbKnots = tab2dKnots->Length(); NbKnots = tab2dKnots->Length();
@ -705,8 +790,14 @@ void Approx_SweepApproximation::Curve2d(const Standard_Integer Index,
TColStd_Array1OfReal& TKnots, TColStd_Array1OfReal& TKnots,
TColStd_Array1OfInteger& TMults) const TColStd_Array1OfInteger& TMults) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
if (seqPoles2d.Length() == 0) {throw Standard_DomainError("Approx_SweepApproximation");} {
throw StdFail_NotDone("Approx_SweepApproximation");
}
if (seqPoles2d.Length() == 0)
{
throw Standard_DomainError("Approx_SweepApproximation");
}
TPoles = seqPoles2d(Index)->Array1(); TPoles = seqPoles2d(Index)->Array1();
TKnots = tab2dKnots->Array1(); TKnots = tab2dKnots->Array1();
TMults = tab2dMults->Array1(); TMults = tab2dMults->Array1();
@ -714,37 +805,51 @@ void Approx_SweepApproximation::Curve2d(const Standard_Integer Index,
Standard_Real Approx_SweepApproximation::Max2dError(const Standard_Integer Index) const Standard_Real Approx_SweepApproximation::Max2dError(const Standard_Integer Index) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
return tab2dError->Value(Index); return tab2dError->Value(Index);
} }
Standard_Real Approx_SweepApproximation::Average2dError(const Standard_Integer Index) const Standard_Real Approx_SweepApproximation::Average2dError(const Standard_Integer Index) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
return Ave2dError->Value(Index); return Ave2dError->Value(Index);
} }
Standard_Real Approx_SweepApproximation::TolCurveOnSurf(const Standard_Integer Index) const Standard_Real Approx_SweepApproximation::TolCurveOnSurf(const Standard_Integer Index) const
{ {
if (!done) {throw StdFail_NotDone("Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone("Approx_SweepApproximation");
}
return COnSurfErr->Value(Index); return COnSurfErr->Value(Index);
} }
void Approx_SweepApproximation::Dump(Standard_OStream& o) const void Approx_SweepApproximation::Dump(Standard_OStream& o) const
{ {
o << "Dump of SweepApproximation" << std::endl; o << "Dump of SweepApproximation" << std::endl;
if (done) { if (done)
{
o << "Error 3d = " << MaxErrorOnSurf() << std::endl; o << "Error 3d = " << MaxErrorOnSurf() << std::endl;
if (Num2DSS>0) { if (Num2DSS > 0)
{
o << "Error 2d = "; o << "Error 2d = ";
for (Standard_Integer ii = 1; ii <= Num2DSS; ii++) for (Standard_Integer ii = 1; ii <= Num2DSS; ii++)
{ o << Max2dError(ii); {
if (ii < Num2DSS) o << " , " << std::endl; o << Max2dError(ii);
if (ii < Num2DSS)
o << " , " << std::endl;
} }
std::cout << std::endl; std::cout << std::endl;
} }
o << tabVKnots->Length() - 1 << " Segment(s) of degree " << vdeg << std::endl; o << tabVKnots->Length() - 1 << " Segment(s) of degree " << vdeg << std::endl;
} }
else std::cout << " Not Done " << std::endl; else
std::cout << " Not Done " << std::endl;
} }

117
src/Approx/Approx_SweepApproximation.hxx
View File

@ -21,30 +21,29 @@
#include <Standard_DefineAlloc.hxx> #include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx> #include <Standard_Handle.hxx>
#include <Standard_Integer.hxx> #include <AdvApprox_EvaluatorFunction.hxx>
#include <TColgp_HArray2OfPnt.hxx>
#include <TColStd_HArray2OfReal.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TColgp_SequenceOfArray1OfPnt2d.hxx>
#include <Approx_HArray1OfGTrsf2d.hxx> #include <Approx_HArray1OfGTrsf2d.hxx>
#include <gp_Vec.hxx> #include <GeomAbs_Shape.hxx>
#include <Standard_Integer.hxx>
#include <Standard_OStream.hxx>
#include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_Array2OfReal.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColStd_HArray2OfReal.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColgp_Array2OfPnt.hxx>
#include <TColgp_HArray1OfPnt.hxx> #include <TColgp_HArray1OfPnt.hxx>
#include <TColgp_HArray1OfPnt2d.hxx> #include <TColgp_HArray1OfPnt2d.hxx>
#include <TColgp_HArray1OfVec.hxx> #include <TColgp_HArray1OfVec.hxx>
#include <TColgp_HArray1OfVec2d.hxx> #include <TColgp_HArray1OfVec2d.hxx>
#include <GeomAbs_Shape.hxx> #include <TColgp_HArray2OfPnt.hxx>
#include <AdvApprox_EvaluatorFunction.hxx> #include <TColgp_SequenceOfArray1OfPnt2d.hxx>
#include <TColgp_Array2OfPnt.hxx> #include <gp_Vec.hxx>
#include <TColStd_Array2OfReal.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColStd_Array1OfInteger.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <Standard_OStream.hxx>
class Approx_SweepFunction; class Approx_SweepFunction;
class AdvApprox_Cutting; class AdvApprox_Cutting;
//! Approximation of an Surface S(u,v) //! Approximation of an Surface S(u,v)
//! (and eventually associate 2d Curves) defined //! (and eventually associate 2d Curves) defined
//! by section's law. //! by section's law.
@ -57,10 +56,8 @@ class AdvApprox_Cutting;
class Approx_SweepApproximation class Approx_SweepApproximation
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
Standard_EXPORT Approx_SweepApproximation(const Handle(Approx_SweepFunction)& Func); Standard_EXPORT Approx_SweepApproximation(const Handle(Approx_SweepFunction)& Func);
//! Perform the Approximation //! Perform the Approximation
@ -78,17 +75,39 @@ public:
//! Segmax : The maximum number of span in v required on //! Segmax : The maximum number of span in v required on
//! the surface //! the surface
//! Warning : The continuity ci can be obtained only if Ft is Ci //! Warning : The continuity ci can be obtained only if Ft is Ci
Standard_EXPORT void Perform (const Standard_Real First, const Standard_Real Last, const Standard_Real Tol3d, const Standard_Real BoundTol, const Standard_Real Tol2d, const Standard_Real TolAngular, const GeomAbs_Shape Continuity = GeomAbs_C0, const Standard_Integer Degmax = 11, const Standard_Integer Segmax = 50); Standard_EXPORT void Perform(const Standard_Real First,
const Standard_Real Last,
const Standard_Real Tol3d,
const Standard_Real BoundTol,
const Standard_Real Tol2d,
const Standard_Real TolAngular,
const GeomAbs_Shape Continuity = GeomAbs_C0,
const Standard_Integer Degmax = 11,
const Standard_Integer Segmax = 50);
//! The EvaluatorFunction from AdvApprox; //! The EvaluatorFunction from AdvApprox;
Standard_EXPORT Standard_Integer Eval (const Standard_Real Parameter, const Standard_Integer DerivativeRequest, const Standard_Real First, const Standard_Real Last, Standard_Real& Result); Standard_EXPORT Standard_Integer Eval(const Standard_Real Parameter,
const Standard_Integer DerivativeRequest,
const Standard_Real First,
const Standard_Real Last,
Standard_Real& Result);
//! returns if we have an result //! returns if we have an result
Standard_Boolean IsDone() const; Standard_Boolean IsDone() const;
Standard_EXPORT void SurfShape (Standard_Integer& UDegree, Standard_Integer& VDegree, Standard_Integer& NbUPoles, Standard_Integer& NbVPoles, Standard_Integer& NbUKnots, Standard_Integer& NbVKnots) const; Standard_EXPORT void SurfShape(Standard_Integer& UDegree,
Standard_Integer& VDegree,
Standard_Integer& NbUPoles,
Standard_Integer& NbVPoles,
Standard_Integer& NbUKnots,
Standard_Integer& NbVKnots) const;
Standard_EXPORT void Surface (TColgp_Array2OfPnt& TPoles, TColStd_Array2OfReal& TWeights, TColStd_Array1OfReal& TUKnots, TColStd_Array1OfReal& TVKnots, TColStd_Array1OfInteger& TUMults, TColStd_Array1OfInteger& TVMults) const; Standard_EXPORT void Surface(TColgp_Array2OfPnt& TPoles,
TColStd_Array2OfReal& TWeights,
TColStd_Array1OfReal& TUKnots,
TColStd_Array1OfReal& TVKnots,
TColStd_Array1OfInteger& TUMults,
TColStd_Array1OfInteger& TVMults) const;
Standard_Integer UDegree() const; Standard_Integer UDegree() const;
@ -114,9 +133,14 @@ public:
Standard_Integer NbCurves2d() const; Standard_Integer NbCurves2d() const;
Standard_EXPORT void Curves2dShape (Standard_Integer& Degree, Standard_Integer& NbPoles, Standard_Integer& NbKnots) const; Standard_EXPORT void Curves2dShape(Standard_Integer& Degree,
Standard_Integer& NbPoles,
Standard_Integer& NbKnots) const;
Standard_EXPORT void Curve2d (const Standard_Integer Index, TColgp_Array1OfPnt2d& TPoles, TColStd_Array1OfReal& TKnots, TColStd_Array1OfInteger& TMults) const; Standard_EXPORT void Curve2d(const Standard_Integer Index,
TColgp_Array1OfPnt2d& TPoles,
TColStd_Array1OfReal& TKnots,
TColStd_Array1OfInteger& TMults) const;
Standard_Integer Curves2dDegree() const; Standard_Integer Curves2dDegree() const;
@ -141,26 +165,34 @@ public:
//! display information on approximation. //! display information on approximation.
Standard_EXPORT void Dump(Standard_OStream& o) const; Standard_EXPORT void Dump(Standard_OStream& o) const;
protected: protected:
private: private:
Standard_EXPORT void Approximation(const Handle(TColStd_HArray1OfReal)& OneDTol,
const Handle(TColStd_HArray1OfReal)& TwoDTol,
const Handle(TColStd_HArray1OfReal)& ThreeDTol,
const Standard_Real BounTol,
const Standard_Real First,
const Standard_Real Last,
const GeomAbs_Shape Continuity,
const Standard_Integer Degmax,
const Standard_Integer Segmax,
const AdvApprox_EvaluatorFunction& TheApproxFunction,
const AdvApprox_Cutting& TheCuttingTool);
Standard_EXPORT Standard_Boolean D0(const Standard_Real Param,
const Standard_Real First,
const Standard_Real Last,
Standard_Real& Result);
Standard_EXPORT void Approximation (const Handle(TColStd_HArray1OfReal)& OneDTol, const Handle(TColStd_HArray1OfReal)& TwoDTol, const Handle(TColStd_HArray1OfReal)& ThreeDTol, const Standard_Real BounTol, const Standard_Real First, const Standard_Real Last, const GeomAbs_Shape Continuity, const Standard_Integer Degmax, const Standard_Integer Segmax, const AdvApprox_EvaluatorFunction& TheApproxFunction, const AdvApprox_Cutting& TheCuttingTool); Standard_EXPORT Standard_Boolean D1(const Standard_Real Param,
const Standard_Real First,
Standard_EXPORT Standard_Boolean D0 (const Standard_Real Param, const Standard_Real First, const Standard_Real Last, Standard_Real& Result); const Standard_Real Last,
Standard_Real& Result);
Standard_EXPORT Standard_Boolean D1 (const Standard_Real Param, const Standard_Real First, const Standard_Real Last, Standard_Real& Result);
Standard_EXPORT Standard_Boolean D2 (const Standard_Real Param, const Standard_Real First, const Standard_Real Last, Standard_Real& Result);
Standard_EXPORT Standard_Boolean D2(const Standard_Real Param,
const Standard_Real First,
const Standard_Real Last,
Standard_Real& Result);
Handle(Approx_SweepFunction) myFunc; Handle(Approx_SweepFunction) myFunc;
Standard_Boolean done; Standard_Boolean done;
@ -201,15 +233,8 @@ private:
Standard_Real myParam; Standard_Real myParam;
Standard_Real first; Standard_Real first;
Standard_Real last; Standard_Real last;
}; };
#include <Approx_SweepApproximation.lxx> #include <Approx_SweepApproximation.lxx>
#endif // _Approx_SweepApproximation_HeaderFile #endif // _Approx_SweepApproximation_HeaderFile

109
src/Approx/Approx_SweepApproximation.lxx
View File

@ -15,109 +15,148 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <StdFail_NotDone.hxx> #include <StdFail_NotDone.hxx>
#include <TColgp_HArray2OfPnt.hxx>
#include <TColgp_HArray1OfPnt2d.hxx>
#include <TColStd_HArray2OfReal.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColStd_HArray1OfInteger.hxx> #include <TColStd_HArray1OfInteger.hxx>
#include <TColStd_HArray1OfReal.hxx>
#include <TColStd_HArray2OfReal.hxx>
#include <TColgp_HArray1OfPnt2d.hxx>
#include <TColgp_HArray2OfPnt.hxx>
inline Standard_Boolean Approx_SweepApproximation::IsDone() const inline Standard_Boolean Approx_SweepApproximation::IsDone() const
{ {
return done; return done;
} }
inline Standard_Integer Approx_SweepApproximation::UDegree() const inline Standard_Integer Approx_SweepApproximation::UDegree() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return udeg; return udeg;
} }
inline Standard_Integer Approx_SweepApproximation::VDegree() const inline Standard_Integer Approx_SweepApproximation::VDegree() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return vdeg; return vdeg;
} }
inline const TColgp_Array2OfPnt& Approx_SweepApproximation::SurfPoles() const inline const TColgp_Array2OfPnt& Approx_SweepApproximation::SurfPoles() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return tabPoles->Array2(); return tabPoles->Array2();
} }
inline const TColStd_Array2OfReal& Approx_SweepApproximation::SurfWeights() const inline const TColStd_Array2OfReal& Approx_SweepApproximation::SurfWeights() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return tabWeights->Array2(); return tabWeights->Array2();
} }
inline const TColStd_Array1OfReal& Approx_SweepApproximation::SurfUKnots() const inline const TColStd_Array1OfReal& Approx_SweepApproximation::SurfUKnots() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return tabUKnots->Array1(); return tabUKnots->Array1();
} }
inline const TColStd_Array1OfReal& Approx_SweepApproximation::SurfVKnots() const inline const TColStd_Array1OfReal& Approx_SweepApproximation::SurfVKnots() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return tabVKnots->Array1(); return tabVKnots->Array1();
} }
inline const TColStd_Array1OfInteger& Approx_SweepApproximation::SurfUMults() const inline const TColStd_Array1OfInteger& Approx_SweepApproximation::SurfUMults() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return tabUMults->Array1(); return tabUMults->Array1();
} }
inline const TColStd_Array1OfInteger& Approx_SweepApproximation::SurfVMults() const inline const TColStd_Array1OfInteger& Approx_SweepApproximation::SurfVMults() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return tabVMults->Array1(); return tabVMults->Array1();
} }
inline Standard_Integer Approx_SweepApproximation::NbCurves2d() const inline Standard_Integer Approx_SweepApproximation::NbCurves2d() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
{
throw StdFail_NotDone(" Approx_SweepApproximation");
}
return Num2DSS; return Num2DSS;
} }
inline Standard_Integer Approx_SweepApproximation::Curves2dDegree() const inline Standard_Integer Approx_SweepApproximation::Curves2dDegree() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
if (seqPoles2d.Length() == 0) {throw Standard_DomainError();} {
throw StdFail_NotDone(" Approx_SweepApproximation");
}
if (seqPoles2d.Length() == 0)
{
throw Standard_DomainError();
}
return deg2d; return deg2d;
} }
inline const TColgp_Array1OfPnt2d& Approx_SweepApproximation::Curve2dPoles(
inline const TColgp_Array1OfPnt2d& Approx_SweepApproximation::Curve2dPoles(const Standard_Integer Index) const const Standard_Integer Index) const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
if (seqPoles2d.Length() == 0) {throw Standard_DomainError();} {
throw StdFail_NotDone(" Approx_SweepApproximation");
}
if (seqPoles2d.Length() == 0)
{
throw Standard_DomainError();
}
return seqPoles2d(Index)->Array1(); return seqPoles2d(Index)->Array1();
} }
inline const TColStd_Array1OfReal& Approx_SweepApproximation::Curves2dKnots() const inline const TColStd_Array1OfReal& Approx_SweepApproximation::Curves2dKnots() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
if (seqPoles2d.Length() == 0) {throw Standard_DomainError();} {
throw StdFail_NotDone(" Approx_SweepApproximation");
}
if (seqPoles2d.Length() == 0)
{
throw Standard_DomainError();
}
return tab2dKnots->Array1(); return tab2dKnots->Array1();
} }
inline const TColStd_Array1OfInteger& Approx_SweepApproximation::Curves2dMults() const inline const TColStd_Array1OfInteger& Approx_SweepApproximation::Curves2dMults() const
{ {
if (!done) {throw StdFail_NotDone(" Approx_SweepApproximation");} if (!done)
if (seqPoles2d.Length() == 0) {throw Standard_DomainError();} {
throw StdFail_NotDone(" Approx_SweepApproximation");
}
if (seqPoles2d.Length() == 0)
{
throw Standard_DomainError();
}
return tab2dMults->Array1(); return tab2dMults->Array1();
} }

45
src/Approx/Approx_SweepFunction.cxx
View File

@ -14,28 +14,57 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Approx_SweepFunction.hxx> #include <Approx_SweepFunction.hxx>
#include <gp_Pnt.hxx>
#include <Standard_NotImplemented.hxx> #include <Standard_NotImplemented.hxx>
#include <Standard_Type.hxx> #include <Standard_Type.hxx>
#include <gp_Pnt.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Approx_SweepFunction, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(Approx_SweepFunction, Standard_Transient)
// Standard_Boolean Approx_SweepFunction::D1(const Standard_Real Param,const Standard_Real First,const Standard_Real Last,TColgp_Array1OfPnt& Poles,TColgp_Array1OfVec& DPoles,TColgp_Array1OfPnt2d& Poles2d,TColgp_Array1OfVec2d& DPoles2d,TColStd_Array1OfReal& Weigths,TColStd_Array1OfReal& DWeigths) // Standard_Boolean Approx_SweepFunction::D1(const Standard_Real Param,const Standard_Real
Standard_Boolean Approx_SweepFunction::D1(const Standard_Real ,const Standard_Real ,const Standard_Real ,TColgp_Array1OfPnt& ,TColgp_Array1OfVec& ,TColgp_Array1OfPnt2d& ,TColgp_Array1OfVec2d& ,TColStd_Array1OfReal& ,TColStd_Array1OfReal& ) // First,const Standard_Real Last,TColgp_Array1OfPnt& Poles,TColgp_Array1OfVec&
// DPoles,TColgp_Array1OfPnt2d& Poles2d,TColgp_Array1OfVec2d& DPoles2d,TColStd_Array1OfReal&
// Weigths,TColStd_Array1OfReal& DWeigths)
Standard_Boolean Approx_SweepFunction::D1(const Standard_Real,
const Standard_Real,
const Standard_Real,
TColgp_Array1OfPnt&,
TColgp_Array1OfVec&,
TColgp_Array1OfPnt2d&,
TColgp_Array1OfVec2d&,
TColStd_Array1OfReal&,
TColStd_Array1OfReal&)
{ {
throw Standard_NotImplemented("Approx_SweepFunction::D1"); throw Standard_NotImplemented("Approx_SweepFunction::D1");
} }
// Standard_Boolean Approx_SweepFunction::D2(const Standard_Real Param,const Standard_Real First,const Standard_Real Last,TColgp_Array1OfPnt& Poles,TColgp_Array1OfVec& DPoles,TColgp_Array1OfVec& D2Poles,TColgp_Array1OfPnt2d& Poles2d,TColgp_Array1OfVec2d& DPoles2d,TColgp_Array1OfVec2d& D2Poles2d,TColStd_Array1OfReal& Weigths,TColStd_Array1OfReal& DWeigths,TColStd_Array1OfReal& D2Weigths) // Standard_Boolean Approx_SweepFunction::D2(const Standard_Real Param,const Standard_Real
Standard_Boolean Approx_SweepFunction::D2(const Standard_Real ,const Standard_Real ,const Standard_Real ,TColgp_Array1OfPnt& ,TColgp_Array1OfVec& ,TColgp_Array1OfVec& ,TColgp_Array1OfPnt2d& ,TColgp_Array1OfVec2d& ,TColgp_Array1OfVec2d& ,TColStd_Array1OfReal& ,TColStd_Array1OfReal& ,TColStd_Array1OfReal& ) // First,const Standard_Real Last,TColgp_Array1OfPnt& Poles,TColgp_Array1OfVec&
// DPoles,TColgp_Array1OfVec& D2Poles,TColgp_Array1OfPnt2d& Poles2d,TColgp_Array1OfVec2d&
// DPoles2d,TColgp_Array1OfVec2d& D2Poles2d,TColStd_Array1OfReal& Weigths,TColStd_Array1OfReal&
// DWeigths,TColStd_Array1OfReal& D2Weigths)
Standard_Boolean Approx_SweepFunction::D2(const Standard_Real,
const Standard_Real,
const Standard_Real,
TColgp_Array1OfPnt&,
TColgp_Array1OfVec&,
TColgp_Array1OfVec&,
TColgp_Array1OfPnt2d&,
TColgp_Array1OfVec2d&,
TColgp_Array1OfVec2d&,
TColStd_Array1OfReal&,
TColStd_Array1OfReal&,
TColStd_Array1OfReal&)
{ {
throw Standard_NotImplemented("Approx_SweepFunction::D2"); throw Standard_NotImplemented("Approx_SweepFunction::D2");
} }
// void Approx_SweepFunction::Resolution(const Standard_Integer Index,const Standard_Real Tol,Standard_Real& TolU,Standard_Real& TolV) const // void Approx_SweepFunction::Resolution(const Standard_Integer Index,const Standard_Real
void Approx_SweepFunction::Resolution(const Standard_Integer ,const Standard_Real ,Standard_Real& ,Standard_Real& ) const // Tol,Standard_Real& TolU,Standard_Real& TolV) const
void Approx_SweepFunction::Resolution(const Standard_Integer,
const Standard_Real,
Standard_Real&,
Standard_Real&) const
{ {
throw Standard_NotImplemented("Approx_SweepFunction::Resolution"); throw Standard_NotImplemented("Approx_SweepFunction::Resolution");
} }

77
src/Approx/Approx_SweepFunction.hxx
View File

@ -19,19 +19,18 @@
#include <Standard.hxx> #include <Standard.hxx>
#include <Standard_Transient.hxx> #include <GeomAbs_Shape.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx> #include <Standard_Real.hxx>
#include <Standard_Transient.hxx>
#include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx> #include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfVec.hxx> #include <TColgp_Array1OfVec.hxx>
#include <TColgp_Array1OfVec2d.hxx> #include <TColgp_Array1OfVec2d.hxx>
#include <Standard_Integer.hxx>
#include <TColStd_Array1OfInteger.hxx>
#include <GeomAbs_Shape.hxx>
class gp_Pnt; class gp_Pnt;
class Approx_SweepFunction; class Approx_SweepFunction;
DEFINE_STANDARD_HANDLE(Approx_SweepFunction, Standard_Transient) DEFINE_STANDARD_HANDLE(Approx_SweepFunction, Standard_Transient)
@ -41,26 +40,50 @@ class Approx_SweepFunction : public Standard_Transient
{ {
public: public:
//! compute the section for v = param //! compute the section for v = param
Standard_EXPORT virtual Standard_Boolean D0 (const Standard_Real Param, const Standard_Real First, const Standard_Real Last, TColgp_Array1OfPnt& Poles, TColgp_Array1OfPnt2d& Poles2d, TColStd_Array1OfReal& Weigths) = 0; Standard_EXPORT virtual Standard_Boolean D0(const Standard_Real Param,
const Standard_Real First,
const Standard_Real Last,
TColgp_Array1OfPnt& Poles,
TColgp_Array1OfPnt2d& Poles2d,
TColStd_Array1OfReal& Weigths) = 0;
//! compute the first derivative in v direction of the //! compute the first derivative in v direction of the
//! section for v = param //! section for v = param
//! Warning : It used only for C1 or C2 approximation //! Warning : It used only for C1 or C2 approximation
Standard_EXPORT virtual Standard_Boolean D1 (const Standard_Real Param, const Standard_Real First, const Standard_Real Last, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths); Standard_EXPORT virtual Standard_Boolean D1(const Standard_Real Param,
const Standard_Real First,
const Standard_Real Last,
TColgp_Array1OfPnt& Poles,
TColgp_Array1OfVec& DPoles,
TColgp_Array1OfPnt2d& Poles2d,
TColgp_Array1OfVec2d& DPoles2d,
TColStd_Array1OfReal& Weigths,
TColStd_Array1OfReal& DWeigths);
//! compute the second derivative in v direction of the //! compute the second derivative in v direction of the
//! section for v = param //! section for v = param
//! Warning : It used only for C2 approximation //! Warning : It used only for C2 approximation
Standard_EXPORT virtual Standard_Boolean D2 (const Standard_Real Param, const Standard_Real First, const Standard_Real Last, TColgp_Array1OfPnt& Poles, TColgp_Array1OfVec& DPoles, TColgp_Array1OfVec& D2Poles, TColgp_Array1OfPnt2d& Poles2d, TColgp_Array1OfVec2d& DPoles2d, TColgp_Array1OfVec2d& D2Poles2d, TColStd_Array1OfReal& Weigths, TColStd_Array1OfReal& DWeigths, TColStd_Array1OfReal& D2Weigths); Standard_EXPORT virtual Standard_Boolean D2(const Standard_Real Param,
const Standard_Real First,
const Standard_Real Last,
TColgp_Array1OfPnt& Poles,
TColgp_Array1OfVec& DPoles,
TColgp_Array1OfVec& D2Poles,
TColgp_Array1OfPnt2d& Poles2d,
TColgp_Array1OfVec2d& DPoles2d,
TColgp_Array1OfVec2d& D2Poles2d,
TColStd_Array1OfReal& Weigths,
TColStd_Array1OfReal& DWeigths,
TColStd_Array1OfReal& D2Weigths);
//! get the number of 2d curves to approximate. //! get the number of 2d curves to approximate.
Standard_EXPORT virtual Standard_Integer Nb2dCurves() const = 0; Standard_EXPORT virtual Standard_Integer Nb2dCurves() const = 0;
//! get the format of an section //! get the format of an section
Standard_EXPORT virtual void SectionShape (Standard_Integer& NbPoles, Standard_Integer& NbKnots, Standard_Integer& Degree) const = 0; Standard_EXPORT virtual void SectionShape(Standard_Integer& NbPoles,
Standard_Integer& NbKnots,
Standard_Integer& Degree) const = 0;
//! get the Knots of the section //! get the Knots of the section
Standard_EXPORT virtual void Knots(TColStd_Array1OfReal& TKnots) const = 0; Standard_EXPORT virtual void Knots(TColStd_Array1OfReal& TKnots) const = 0;
@ -92,17 +115,24 @@ public:
//! Returns the resolutions in the sub-space 2d <Index> //! Returns the resolutions in the sub-space 2d <Index>
//! This information is usfull to find an good tolerance in //! This information is usfull to find an good tolerance in
//! 2d approximation. //! 2d approximation.
Standard_EXPORT virtual void Resolution (const Standard_Integer Index, const Standard_Real Tol, Standard_Real& TolU, Standard_Real& TolV) const; Standard_EXPORT virtual void Resolution(const Standard_Integer Index,
const Standard_Real Tol,
Standard_Real& TolU,
Standard_Real& TolV) const;
//! Returns the tolerance to reach in approximation //! Returns the tolerance to reach in approximation
//! to satisfy. //! to satisfy.
//! BoundTol error at the Boundary //! BoundTol error at the Boundary
//! AngleTol tangent error at the Boundary (in radian) //! AngleTol tangent error at the Boundary (in radian)
//! SurfTol error inside the surface. //! SurfTol error inside the surface.
Standard_EXPORT virtual void GetTolerance (const Standard_Real BoundTol, const Standard_Real SurfTol, const Standard_Real AngleTol, TColStd_Array1OfReal& Tol3d) const = 0; Standard_EXPORT virtual void GetTolerance(const Standard_Real BoundTol,
const Standard_Real SurfTol,
const Standard_Real AngleTol,
TColStd_Array1OfReal& Tol3d) const = 0;
//! Is useful, if (me) have to run numerical algorithm to perform D0, D1 or D2 //! Is useful, if (me) have to run numerical algorithm to perform D0, D1 or D2
Standard_EXPORT virtual void SetTolerance (const Standard_Real Tol3d, const Standard_Real Tol2d) = 0; Standard_EXPORT virtual void SetTolerance(const Standard_Real Tol3d,
const Standard_Real Tol2d) = 0;
//! Get the barycentre of Surface. //! Get the barycentre of Surface.
//! An very poor estimation is sufficient. //! An very poor estimation is sufficient.
@ -120,27 +150,10 @@ public:
//! Warning: Used only if <me> IsRational //! Warning: Used only if <me> IsRational
Standard_EXPORT virtual void GetMinimalWeight(TColStd_Array1OfReal& Weigths) const; Standard_EXPORT virtual void GetMinimalWeight(TColStd_Array1OfReal& Weigths) const;
DEFINE_STANDARD_RTTIEXT(Approx_SweepFunction, Standard_Transient) DEFINE_STANDARD_RTTIEXT(Approx_SweepFunction, Standard_Transient)
protected: protected:
private: private:
}; };
#endif // _Approx_SweepFunction_HeaderFile #endif // _Approx_SweepFunction_HeaderFile

335
src/ApproxInt/ApproxInt_Approx.gxx
View File

@ -15,13 +15,13 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <AppParCurves_Constraint.hxx> #include <AppParCurves_Constraint.hxx>
#include <ApproxInt_KnotTools.hxx>
#include <GeomAbs_SurfaceType.hxx> #include <GeomAbs_SurfaceType.hxx>
#include <IntSurf_PntOn2S.hxx>
#include <IntSurf_Quadric.hxx> #include <IntSurf_Quadric.hxx>
#include <Precision.hxx>
#include <gp_Trsf.hxx> #include <gp_Trsf.hxx>
#include <gp_Trsf2d.hxx> #include <gp_Trsf2d.hxx>
#include <IntSurf_PntOn2S.hxx>
#include <Precision.hxx>
#include <ApproxInt_KnotTools.hxx>
// If quantity of points is less than aMinNbPointsForApprox // If quantity of points is less than aMinNbPointsForApprox
// then interpolation is used. // then interpolation is used.
@ -30,10 +30,8 @@ const Standard_Integer aMinNbPointsForApprox = 5;
// This constant should be removed in the future. // This constant should be removed in the future.
const Standard_Real RatioTol = 1.5; const Standard_Real RatioTol = 1.5;
//======================================================================= //=================================================================================================
//function : ComputeTrsf3d
//purpose :
//=======================================================================
static void ComputeTrsf3d(const Handle(TheWLine)& theline, static void ComputeTrsf3d(const Handle(TheWLine)& theline,
Standard_Real& theXo, Standard_Real& theXo,
Standard_Real& theYo, Standard_Real& theYo,
@ -54,10 +52,8 @@ static void ComputeTrsf3d(const Handle(TheWLine)& theline,
theZo = -aZmin; theZo = -aZmin;
} }
//======================================================================= //=================================================================================================
//function : ComputeTrsf2d
//purpose :
//=======================================================================
static void ComputeTrsf2d(const Handle(TheWLine)& theline, static void ComputeTrsf2d(const Handle(TheWLine)& theline,
const Standard_Boolean onFirst, const Standard_Boolean onFirst,
Standard_Real& theUo, Standard_Real& theUo,
@ -87,10 +83,8 @@ static void ComputeTrsf2d(const Handle(TheWLine)& theline,
theVo = -aVmin; theVo = -aVmin;
} }
//======================================================================= //=================================================================================================
//function : Parameters
//purpose :
//=======================================================================
void ApproxInt_Approx::Parameters(const ApproxInt_TheMultiLine& Line, void ApproxInt_Approx::Parameters(const ApproxInt_TheMultiLine& Line,
const Standard_Integer firstP, const Standard_Integer firstP,
const Standard_Integer lastP, const Standard_Integer lastP,
@ -100,12 +94,15 @@ void ApproxInt_Approx::Parameters(const ApproxInt_TheMultiLine& Line,
Standard_Integer i, j, nbP2d, nbP3d; Standard_Integer i, j, nbP2d, nbP3d;
Standard_Real dist; Standard_Real dist;
if (Par == Approx_ChordLength || Par == Approx_Centripetal) { if (Par == Approx_ChordLength || Par == Approx_Centripetal)
{
nbP3d = ApproxInt_TheMultiLineTool::NbP3d(Line); nbP3d = ApproxInt_TheMultiLineTool::NbP3d(Line);
nbP2d = ApproxInt_TheMultiLineTool::NbP2d(Line); nbP2d = ApproxInt_TheMultiLineTool::NbP2d(Line);
Standard_Integer mynbP3d = nbP3d, mynbP2d = nbP2d; Standard_Integer mynbP3d = nbP3d, mynbP2d = nbP2d;
if (nbP3d == 0) mynbP3d = 1; if (nbP3d == 0)
if (nbP2d == 0) mynbP2d = 1; mynbP3d = 1;
if (nbP2d == 0)
mynbP2d = 1;
TheParameters(firstP) = 0.0; TheParameters(firstP) = 0.0;
dist = 0.0; dist = 0.0;
@ -114,23 +111,30 @@ void ApproxInt_Approx::Parameters(const ApproxInt_TheMultiLine& Line,
TColgp_Array1OfPnt2d tabP2d(1, mynbP2d); TColgp_Array1OfPnt2d tabP2d(1, mynbP2d);
TColgp_Array1OfPnt2d tabPP2d(1, mynbP2d); TColgp_Array1OfPnt2d tabPP2d(1, mynbP2d);
for (i = firstP+1; i <= lastP; i++) { for (i = firstP + 1; i <= lastP; i++)
if (nbP3d != 0 && nbP2d != 0) ApproxInt_TheMultiLineTool::Value(Line, i-1, tabP, tabP2d); {
else if (nbP2d != 0) ApproxInt_TheMultiLineTool::Value(Line, i-1, tabP2d); if (nbP3d != 0 && nbP2d != 0)
else if (nbP3d != 0) ApproxInt_TheMultiLineTool::Value(Line, i-1, tabP); ApproxInt_TheMultiLineTool::Value(Line, i - 1, tabP, tabP2d);
else if (nbP2d != 0)
ApproxInt_TheMultiLineTool::Value(Line, i - 1, tabP2d);
else if (nbP3d != 0)
ApproxInt_TheMultiLineTool::Value(Line, i - 1, tabP);
if (nbP3d != 0 && nbP2d != 0) ApproxInt_TheMultiLineTool::Value(Line, i, tabPP, tabPP2d); if (nbP3d != 0 && nbP2d != 0)
else if (nbP2d != 0) ApproxInt_TheMultiLineTool::Value(Line, i, tabPP2d); ApproxInt_TheMultiLineTool::Value(Line, i, tabPP, tabPP2d);
else if (nbP3d != 0) ApproxInt_TheMultiLineTool::Value(Line, i, tabPP); else if (nbP2d != 0)
ApproxInt_TheMultiLineTool::Value(Line, i, tabPP2d);
else if (nbP3d != 0)
ApproxInt_TheMultiLineTool::Value(Line, i, tabPP);
dist = 0; dist = 0;
for (j = 1; j <= nbP3d; j++) { for (j = 1; j <= nbP3d; j++)
const gp_Pnt &aP1 = tabP(j), {
&aP2 = tabPP(j); const gp_Pnt &aP1 = tabP(j), &aP2 = tabPP(j);
dist += aP2.SquareDistance(aP1); dist += aP2.SquareDistance(aP1);
} }
for (j = 1; j <= nbP2d; j++) { for (j = 1; j <= nbP2d; j++)
const gp_Pnt2d &aP12d = tabP2d(j), {
&aP22d = tabPP2d(j); const gp_Pnt2d &aP12d = tabP2d(j), &aP22d = tabPP2d(j);
dist += aP22d.SquareDistance(aP12d); dist += aP22d.SquareDistance(aP12d);
} }
@ -145,20 +149,21 @@ void ApproxInt_Approx::Parameters(const ApproxInt_TheMultiLine& Line,
TheParameters(i) = TheParameters(i - 1) + Sqrt(dist); TheParameters(i) = TheParameters(i - 1) + Sqrt(dist);
} }
} }
for (i = firstP; i <= lastP; i++) TheParameters(i) /= TheParameters(lastP); for (i = firstP; i <= lastP; i++)
TheParameters(i) /= TheParameters(lastP);
} }
else { else
for (i = firstP; i <= lastP; i++) { {
TheParameters(i) = (Standard_Real(i)-firstP)/ for (i = firstP; i <= lastP; i++)
(Standard_Real(lastP)-Standard_Real(firstP)); {
TheParameters(i) =
(Standard_Real(i) - firstP) / (Standard_Real(lastP) - Standard_Real(firstP));
} }
} }
} }
//======================================================================= //=================================================================================================
//function : Default constructor
//purpose :
//=======================================================================
ApproxInt_Approx::ApproxInt_Approx() : ApproxInt_Approx::ApproxInt_Approx() :
myComputeLine(4, 8, 0.001, 0.001, 5), myComputeLine(4, 8, 0.001, 0.001, 5),
myComputeLineBezier(4, 8, 0.001, 0.001, 5), myComputeLineBezier(4, 8, 0.001, 0.001, 5),
@ -175,10 +180,8 @@ ApproxInt_Approx::ApproxInt_Approx():
// myComputeLineBezier.SetContinuity(2); // myComputeLineBezier.SetContinuity(2);
} }
//======================================================================= //=================================================================================================
//function : Perform
//purpose : Build without surfaces information.
//=======================================================================
void ApproxInt_Approx::Perform(const Handle(TheWLine)& theline, void ApproxInt_Approx::Perform(const Handle(TheWLine)& theline,
const Standard_Boolean ApproxXYZ, const Standard_Boolean ApproxXYZ,
const Standard_Boolean ApproxU1V1, const Standard_Boolean ApproxU1V1,
@ -200,25 +203,27 @@ void ApproxInt_Approx::Perform(const Handle(TheWLine)& theline,
// Build knots. // Build knots.
buildKnots(theline, NULL); buildKnots(theline, NULL);
if (myKnots.Length() == 2 && if (myKnots.Length() == 2 && indicemax - indicemin > 2 * myData.myNbPntMax)
indicemax - indicemin > 2 * myData.myNbPntMax)
{ {
// At least 3 knots for BrepApprox. // At least 3 knots for BrepApprox.
myKnots.ChangeLast() = (indicemax - indicemin) / 2; myKnots.ChangeLast() = (indicemax - indicemin) / 2;
myKnots.Append(indicemax); myKnots.Append(indicemax);
} }
myComputeLine.Init (myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, Standard_True, myData.parametrization); myComputeLine
myComputeLineBezier.Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, Standard_True, myData.parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, Standard_True, myData.parametrization);
myComputeLineBezier
.Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, Standard_True, myData.parametrization);
buildCurve(theline, NULL); buildCurve(theline, NULL);
} }
//======================================================================= //=================================================================================================
// function : Perform // function : Perform
// purpose : Definition of next steps according to surface types // purpose : Definition of next steps according to surface types
// (i.e. coordination algorithm). // (i.e. coordination algorithm).
//======================================================================= //=================================================================================================
void ApproxInt_Approx::Perform(const ThePSurface& Surf1, void ApproxInt_Approx::Perform(const ThePSurface& Surf1,
const ThePSurface& Surf2, const ThePSurface& Surf2,
const Handle(TheWLine)& theline, const Handle(TheWLine)& theline,
@ -234,14 +239,10 @@ void ApproxInt_Approx::Perform(const ThePSurface& Surf1,
const GeomAbs_SurfaceType typeS1 = ThePSurfaceTool::GetType(Surf1); const GeomAbs_SurfaceType typeS1 = ThePSurfaceTool::GetType(Surf1);
const GeomAbs_SurfaceType typeS2 = ThePSurfaceTool::GetType(Surf2); const GeomAbs_SurfaceType typeS2 = ThePSurfaceTool::GetType(Surf2);
const Standard_Boolean isQuadric = ((typeS1 == GeomAbs_Plane) || const Standard_Boolean isQuadric =
(typeS1 == GeomAbs_Cylinder) || ((typeS1 == GeomAbs_Plane) || (typeS1 == GeomAbs_Cylinder) || (typeS1 == GeomAbs_Sphere) ||
(typeS1 == GeomAbs_Sphere) || (typeS1 == GeomAbs_Cone) || (typeS2 == GeomAbs_Plane) || (typeS2 == GeomAbs_Cylinder) ||
(typeS1 == GeomAbs_Cone) || (typeS2 == GeomAbs_Sphere) || (typeS2 == GeomAbs_Cone));
(typeS2 == GeomAbs_Plane) ||
(typeS2 == GeomAbs_Cylinder) ||
(typeS2 == GeomAbs_Sphere) ||
(typeS2 == GeomAbs_Cone));
if (isQuadric) if (isQuadric)
{ {
@ -265,8 +266,7 @@ void ApproxInt_Approx::Perform(const ThePSurface& Surf1,
Quad.SetValue(ThePSurfaceTool::Cone(Surf1)); Quad.SetValue(ThePSurfaceTool::Cone(Surf1));
break; break;
default: default: {
{
SecondIsImplicit = Standard_True; SecondIsImplicit = Standard_True;
switch (typeS2) switch (typeS2)
{ {
@ -294,9 +294,15 @@ void ApproxInt_Approx::Perform(const ThePSurface& Surf1,
break; break;
} // switch (typeS1) } // switch (typeS1)
Perform(Quad, (SecondIsImplicit? Surf1: Surf2), theline, Perform(Quad,
ApproxXYZ, ApproxU1V1, ApproxU2V2, (SecondIsImplicit ? Surf1 : Surf2),
indicemin, indicemax, !SecondIsImplicit); theline,
ApproxXYZ,
ApproxU1V1,
ApproxU2V2,
indicemin,
indicemax,
!SecondIsImplicit);
return; return;
} }
@ -329,18 +335,19 @@ void ApproxInt_Approx::Perform(const ThePSurface& Surf1,
// Build knots. // Build knots.
buildKnots(theline, ptrsvsurf); buildKnots(theline, ptrsvsurf);
myComputeLine.Init ( myDegMin, myDegMax, myTol3d, myTol2d, myComputeLine
myNbIterMax, cut, myData.parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, cut, myData.parametrization);
myComputeLineBezier.Init( myDegMin, myDegMax, myTol3d, myTol2d, myComputeLineBezier
myNbIterMax, cut, myData.parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, cut, myData.parametrization);
buildCurve(theline, ptrsvsurf); buildCurve(theline, ptrsvsurf);
} }
//======================================================================= //=================================================================================================
// function : Perform // function : Perform
// purpose : Analytic-Param perform. // purpose : Analytic-Param perform.
//======================================================================= //=================================================================================================
void ApproxInt_Approx::Perform(const TheISurface& ISurf, void ApproxInt_Approx::Perform(const TheISurface& ISurf,
const ThePSurface& PSurf, const ThePSurface& PSurf,
const Handle(TheWLine)& theline, const Handle(TheWLine)& theline,
@ -356,8 +363,8 @@ void ApproxInt_Approx::Perform(const TheISurface& ISurf,
// Non-analytical case: Analytic-Param perform. // Non-analytical case: Analytic-Param perform.
ApproxInt_TheImpPrmSvSurfaces myImpPrmSvSurfaces = ApproxInt_TheImpPrmSvSurfaces myImpPrmSvSurfaces =
isTheQuadFirst? ApproxInt_TheImpPrmSvSurfaces(ISurf, PSurf): isTheQuadFirst ? ApproxInt_TheImpPrmSvSurfaces(ISurf, PSurf)
ApproxInt_TheImpPrmSvSurfaces(PSurf, ISurf); : ApproxInt_TheImpPrmSvSurfaces(PSurf, ISurf);
myImpPrmSvSurfaces.SetUseSolver(Standard_False); myImpPrmSvSurfaces.SetUseSolver(Standard_False);
@ -380,18 +387,16 @@ void ApproxInt_Approx::Perform(const TheISurface& ISurf,
// Build knots. // Build knots.
buildKnots(theline, ptrsvsurf); buildKnots(theline, ptrsvsurf);
myComputeLine.Init ( myDegMin, myDegMax, myTol3d, myTol2d, myComputeLine
myNbIterMax, cut, myData.parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, cut, myData.parametrization);
myComputeLineBezier.Init( myDegMin, myDegMax, myTol3d, myTol2d, myComputeLineBezier
myNbIterMax, cut, myData.parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, cut, myData.parametrization);
buildCurve(theline, ptrsvsurf); buildCurve(theline, ptrsvsurf);
} }
//======================================================================= //=================================================================================================
//function : SetParameters
//purpose :
//=======================================================================
void ApproxInt_Approx::SetParameters(const Standard_Real Tol3d, void ApproxInt_Approx::SetParameters(const Standard_Real Tol3d,
const Standard_Real Tol2d, const Standard_Real Tol2d,
const Standard_Integer DegMin, const Standard_Integer DegMin,
@ -409,10 +414,10 @@ void ApproxInt_Approx::SetParameters( const Standard_Real Tol3d,
myDegMax = DegMax; myDegMax = DegMax;
myNbIterMax = NbIterMax; myNbIterMax = NbIterMax;
myComputeLine.Init ( myDegMin, myDegMax, myTol3d, myTol2d, myComputeLine
myNbIterMax, Standard_True, Parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, Standard_True, Parametrization);
myComputeLineBezier.Init( myDegMin, myDegMax, myTol3d, myTol2d, myComputeLineBezier
myNbIterMax, Standard_True, Parametrization); .Init(myDegMin, myDegMax, myTol3d, myTol2d, myNbIterMax, Standard_True, Parametrization);
if (!ApproxWithTangency) if (!ApproxWithTangency)
{ {
@ -423,19 +428,15 @@ void ApproxInt_Approx::SetParameters( const Standard_Real Tol3d,
myData.myBezierApprox = Standard_True; myData.myBezierApprox = Standard_True;
} }
//======================================================================= //=================================================================================================
//function : NbMultiCurves
//purpose :
//=======================================================================
Standard_Integer ApproxInt_Approx::NbMultiCurves() const Standard_Integer ApproxInt_Approx::NbMultiCurves() const
{ {
return 1; return 1;
} }
//======================================================================= //=================================================================================================
//function : UpdateTolReached
//purpose :
//=======================================================================
void ApproxInt_Approx::UpdateTolReached() void ApproxInt_Approx::UpdateTolReached()
{ {
if (myData.myBezierApprox) if (myData.myBezierApprox)
@ -455,28 +456,22 @@ void ApproxInt_Approx::UpdateTolReached()
} }
} }
//======================================================================= //=================================================================================================
//function : TolReached3d
//purpose :
//=======================================================================
Standard_Real ApproxInt_Approx::TolReached3d() const Standard_Real ApproxInt_Approx::TolReached3d() const
{ {
return myTolReached3d * RatioTol; return myTolReached3d * RatioTol;
} }
//======================================================================= //=================================================================================================
//function : TolReached2d
//purpose :
//=======================================================================
Standard_Real ApproxInt_Approx::TolReached2d() const Standard_Real ApproxInt_Approx::TolReached2d() const
{ {
return myTolReached2d * RatioTol; return myTolReached2d * RatioTol;
} }
//======================================================================= //=================================================================================================
//function : IsDone
//purpose :
//=======================================================================
Standard_Boolean ApproxInt_Approx::IsDone() const Standard_Boolean ApproxInt_Approx::IsDone() const
{ {
if (myData.myBezierApprox) if (myData.myBezierApprox)
@ -489,10 +484,8 @@ Standard_Boolean ApproxInt_Approx::IsDone() const
} }
} }
//======================================================================= //=================================================================================================
//function : Value
//purpose :
//=======================================================================
const AppParCurves_MultiBSpCurve& ApproxInt_Approx::Value(const Standard_Integer) const const AppParCurves_MultiBSpCurve& ApproxInt_Approx::Value(const Standard_Integer) const
{ {
if (myData.myBezierApprox) if (myData.myBezierApprox)
@ -505,10 +498,8 @@ const AppParCurves_MultiBSpCurve& ApproxInt_Approx::Value(const Standard_Integer
} }
} }
//======================================================================= //=================================================================================================
//function : fillData
//purpose : Fill ApproxInt data structure.
//=======================================================================
void ApproxInt_Approx::fillData(const Handle(TheWLine)& theline) void ApproxInt_Approx::fillData(const Handle(TheWLine)& theline)
{ {
if (myData.ApproxXYZ) if (myData.ApproxXYZ)
@ -527,10 +518,8 @@ void ApproxInt_Approx::fillData(const Handle(TheWLine)& theline)
myData.U2o = myData.V2o = 0.0; myData.U2o = myData.V2o = 0.0;
} }
//======================================================================= //=================================================================================================
//function : prepareDS
//purpose :
//=======================================================================
void ApproxInt_Approx::prepareDS(const Standard_Boolean theApproxXYZ, void ApproxInt_Approx::prepareDS(const Standard_Boolean theApproxXYZ,
const Standard_Boolean theApproxU1V1, const Standard_Boolean theApproxU1V1,
const Standard_Boolean theApproxU2V2, const Standard_Boolean theApproxU2V2,
@ -546,10 +535,8 @@ void ApproxInt_Approx::prepareDS(const Standard_Boolean theApproxXYZ,
myData.parametrization = myComputeLineBezier.Parametrization(); myData.parametrization = myComputeLineBezier.Parametrization();
} }
//======================================================================= //=================================================================================================
//function : buildKnots
//purpose :
//=======================================================================
void ApproxInt_Approx::buildKnots(const Handle(TheWLine)& theline, void ApproxInt_Approx::buildKnots(const Handle(TheWLine)& theline,
const Standard_Address thePtrSVSurf) const Standard_Address thePtrSVSurf)
{ {
@ -561,17 +548,25 @@ void ApproxInt_Approx::buildKnots(const Handle(TheWLine)& theline,
return; return;
} }
const ApproxInt_TheMultiLine aTestLine( theline, thePtrSVSurf, const ApproxInt_TheMultiLine aTestLine(theline,
thePtrSVSurf,
((myData.ApproxXYZ) ? 1 : 0), ((myData.ApproxXYZ) ? 1 : 0),
((myData.ApproxU1V1)? 1: 0) + ((myData.ApproxU2V2)? 1: 0), ((myData.ApproxU1V1) ? 1 : 0) +
myData.ApproxU1V1, myData.ApproxU2V2, ((myData.ApproxU2V2) ? 1 : 0),
myData.Xo, myData.Yo, myData.Zo,
myData.U1o, myData.V1o, myData.U2o, myData.V2o,
myData.ApproxU1V1, myData.ApproxU1V1,
myData.indicemin, myData.indicemax); myData.ApproxU2V2,
myData.Xo,
myData.Yo,
myData.Zo,
myData.U1o,
myData.V1o,
myData.U2o,
myData.V2o,
myData.ApproxU1V1,
myData.indicemin,
myData.indicemax);
const Standard_Integer nbp3d = aTestLine.NbP3d(), const Standard_Integer nbp3d = aTestLine.NbP3d(), nbp2d = aTestLine.NbP2d();
nbp2d = aTestLine.NbP2d();
TColgp_Array1OfPnt aTabPnt3d(1, Max(1, nbp3d)); TColgp_Array1OfPnt aTabPnt3d(1, Max(1, nbp3d));
TColgp_Array1OfPnt2d aTabPnt2d(1, Max(1, nbp2d)); TColgp_Array1OfPnt2d aTabPnt2d(1, Max(1, nbp2d));
TColgp_Array1OfPnt aPntXYZ(myData.indicemin, myData.indicemax); TColgp_Array1OfPnt aPntXYZ(myData.indicemin, myData.indicemax);
@ -580,9 +575,12 @@ void ApproxInt_Approx::buildKnots(const Handle(TheWLine)& theline,
for (Standard_Integer i = myData.indicemin; i <= myData.indicemax; ++i) for (Standard_Integer i = myData.indicemin; i <= myData.indicemax; ++i)
{ {
if (nbp3d != 0 && nbp2d != 0) aTestLine.Value(i, aTabPnt3d, aTabPnt2d); if (nbp3d != 0 && nbp2d != 0)
else if (nbp2d != 0) aTestLine.Value(i, aTabPnt2d); aTestLine.Value(i, aTabPnt3d, aTabPnt2d);
else if (nbp3d != 0) aTestLine.Value(i, aTabPnt3d); else if (nbp2d != 0)
aTestLine.Value(i, aTabPnt2d);
else if (nbp3d != 0)
aTestLine.Value(i, aTabPnt3d);
// //
if (nbp3d > 0) if (nbp3d > 0)
{ {
@ -612,14 +610,19 @@ void ApproxInt_Approx::buildKnots(const Handle(TheWLine)& theline,
math_Vector aPars(myData.indicemin, myData.indicemax); math_Vector aPars(myData.indicemin, myData.indicemax);
Parameters(aTestLine, myData.indicemin, myData.indicemax, myData.parametrization, aPars); Parameters(aTestLine, myData.indicemin, myData.indicemax, myData.parametrization, aPars);
ApproxInt_KnotTools::BuildKnots(aPntXYZ, aPntU1V1, aPntU2V2, aPars, ApproxInt_KnotTools::BuildKnots(aPntXYZ,
myData.ApproxXYZ, myData.ApproxU1V1, myData.ApproxU2V2, aMinNbPnts, myKnots); aPntU1V1,
aPntU2V2,
aPars,
myData.ApproxXYZ,
myData.ApproxU1V1,
myData.ApproxU2V2,
aMinNbPnts,
myKnots);
} }
//======================================================================= //=================================================================================================
//function : buildCurve
//purpose :
//=======================================================================
void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline, void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline,
const Standard_Address thePtrSVSurf) const Standard_Address thePtrSVSurf)
{ {
@ -636,12 +639,23 @@ void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline,
// Base cycle: iterate over knots. // Base cycle: iterate over knots.
imin = myKnots(kind); imin = myKnots(kind);
imax = myKnots(kind + 1); imax = myKnots(kind + 1);
ApproxInt_TheMultiLine myMultiLine(theline, thePtrSVSurf, ApproxInt_TheMultiLine myMultiLine(theline,
thePtrSVSurf,
((myData.ApproxXYZ) ? 1 : 0), ((myData.ApproxXYZ) ? 1 : 0),
((myData.ApproxU1V1)? 1: 0) + ((myData.ApproxU2V2)? 1: 0), ((myData.ApproxU1V1) ? 1 : 0) +
myData.ApproxU1V1, myData.ApproxU2V2, ((myData.ApproxU2V2) ? 1 : 0),
myData.Xo, myData.Yo, myData.Zo, myData.U1o, myData.V1o, myData.ApproxU1V1,
myData.U2o, myData.V2o, myData.ApproxU1V1, imin, imax); myData.ApproxU2V2,
myData.Xo,
myData.Yo,
myData.Zo,
myData.U1o,
myData.V1o,
myData.U2o,
myData.V2o,
myData.ApproxU1V1,
imin,
imax);
if (myData.myBezierApprox) if (myData.myBezierApprox)
{ {
@ -657,28 +671,42 @@ void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline,
UpdateTolReached(); UpdateTolReached();
Standard_Integer indice3d = 1, indice2d1 = 2, indice2d2 = 3; Standard_Integer indice3d = 1, indice2d1 = 2, indice2d2 = 3;
if(!myData.ApproxXYZ) { indice2d1--; indice2d2--; } if (!myData.ApproxXYZ)
if(!myData.ApproxU1V1) { indice2d2--; } {
indice2d1--;
indice2d2--;
}
if (!myData.ApproxU1V1)
{
indice2d2--;
}
if (myData.ApproxXYZ) if (myData.ApproxXYZ)
{ {
if (myData.myBezierApprox) if (myData.myBezierApprox)
{ {
for (Standard_Integer nbmc = myComputeLineBezier.NbMultiCurves(); nbmc >= 1; nbmc--) for (Standard_Integer nbmc = myComputeLineBezier.NbMultiCurves(); nbmc >= 1; nbmc--)
{ {
myComputeLineBezier.ChangeValue(nbmc).Transform(indice3d, -myData.Xo, 1.0, -myData.Yo, 1.0, -myData.Zo, 1.0); myComputeLineBezier.ChangeValue(nbmc)
.Transform(indice3d, -myData.Xo, 1.0, -myData.Yo, 1.0, -myData.Zo, 1.0);
} }
} }
else else
{ {
myComputeLine.ChangeValue().Transform(indice3d, -myData.Xo, 1.0, -myData.Yo, 1.0, -myData.Zo, 1.0); myComputeLine.ChangeValue()
.Transform(indice3d, -myData.Xo, 1.0, -myData.Yo, 1.0, -myData.Zo, 1.0);
} }
} }
if (myData.ApproxU1V1) if (myData.ApproxU1V1)
{ {
if(myData.myBezierApprox) { if (myData.myBezierApprox)
{
for (Standard_Integer nbmc = myComputeLineBezier.NbMultiCurves(); nbmc >= 1; nbmc--) for (Standard_Integer nbmc = myComputeLineBezier.NbMultiCurves(); nbmc >= 1; nbmc--)
{ {
myComputeLineBezier.ChangeValue(nbmc).Transform2d(indice2d1, -myData.U1o, 1.0, -myData.V1o, 1.0); myComputeLineBezier.ChangeValue(nbmc).Transform2d(indice2d1,
-myData.U1o,
1.0,
-myData.V1o,
1.0);
} }
} }
else else
@ -692,7 +720,11 @@ void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline,
{ {
for (Standard_Integer nbmc = myComputeLineBezier.NbMultiCurves(); nbmc >= 1; nbmc--) for (Standard_Integer nbmc = myComputeLineBezier.NbMultiCurves(); nbmc >= 1; nbmc--)
{ {
myComputeLineBezier.ChangeValue(nbmc).Transform2d(indice2d2, -myData.U2o, 1.0, -myData.V2o, 1.0); myComputeLineBezier.ChangeValue(nbmc).Transform2d(indice2d2,
-myData.U2o,
1.0,
-myData.V2o,
1.0);
} }
} }
else else
@ -704,9 +736,7 @@ void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline,
OtherInter = Standard_False; OtherInter = Standard_False;
if (myData.myBezierApprox) if (myData.myBezierApprox)
{ {
for(Standard_Integer nbmc = 1; for (Standard_Integer nbmc = 1; nbmc <= myComputeLineBezier.NbMultiCurves(); nbmc++)
nbmc <= myComputeLineBezier.NbMultiCurves();
nbmc++)
{ {
myBezToBSpl.Append(myComputeLineBezier.Value(nbmc)); myBezToBSpl.Append(myComputeLineBezier.Value(nbmc));
} }
@ -716,8 +746,7 @@ void ApproxInt_Approx::buildCurve(const Handle(TheWLine)& theline,
OtherInter = Standard_True; OtherInter = Standard_True;
} }
} }
} } while (OtherInter);
while(OtherInter);
if (myData.myBezierApprox) if (myData.myBezierApprox)
{ {

332
src/ApproxInt/ApproxInt_ImpPrmSvSurfaces.gxx
View File

@ -14,20 +14,21 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <GeomAbs_SurfaceType.hxx>
#include <IntSurf_PntOn2S.hxx> #include <IntSurf_PntOn2S.hxx>
#include <Precision.hxx>
#include <StdFail_NotDone.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <math_FunctionSetRoot.hxx> #include <math_FunctionSetRoot.hxx>
#include <StdFail_NotDone.hxx>
#include <GeomAbs_SurfaceType.hxx>
#include <Precision.hxx>
//======================================================================= //=================================================================================================
// function : IsSingular // function : IsSingular
// purpose : Returns TRUE if vectors theDU || theDV or if at least one // purpose : Returns TRUE if vectors theDU || theDV or if at least one
// of them has null-magnitude. // of them has null-magnitude.
// theSqLinTol is square of linear tolerance. // theSqLinTol is square of linear tolerance.
// theAngTol is angular tolerance. // theAngTol is angular tolerance.
//======================================================================= //=================================================================================================
static Standard_Boolean IsSingular(const gp_Vec& theDU, static Standard_Boolean IsSingular(const gp_Vec& theDU,
const gp_Vec& theDV, const gp_Vec& theDV,
const Standard_Real theSqLinTol, const Standard_Real theSqLinTol,
@ -35,8 +36,7 @@ static Standard_Boolean IsSingular( const gp_Vec& theDU,
{ {
gp_Vec aDU(theDU), aDV(theDV); gp_Vec aDU(theDU), aDV(theDV);
const Standard_Real aSqMagnDU = aDU.SquareMagnitude(), const Standard_Real aSqMagnDU = aDU.SquareMagnitude(), aSqMagnDV = aDV.SquareMagnitude();
aSqMagnDV = aDV.SquareMagnitude();
if (aSqMagnDU < theSqLinTol) if (aSqMagnDU < theSqLinTol)
return Standard_True; return Standard_True;
@ -56,7 +56,7 @@ static Standard_Boolean IsSingular( const gp_Vec& theDU,
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : SingularProcessing // function : SingularProcessing
// purpose : Computes 2D-representation (in UV-coordinates) of // purpose : Computes 2D-representation (in UV-coordinates) of
// theTg3D vector on the surface in case when // theTg3D vector on the surface in case when
@ -75,7 +75,8 @@ static Standard_Boolean IsSingular( const gp_Vec& theDU,
// More over, vector Tg has to be NORMALIZED // More over, vector Tg has to be NORMALIZED
// (if theIsTo3DTgCompute == TRUE then new computed vector will // (if theIsTo3DTgCompute == TRUE then new computed vector will
// always have magnitude 1.0). // always have magnitude 1.0).
//======================================================================= //=================================================================================================
static Standard_Boolean SingularProcessing(const gp_Vec& theDU, static Standard_Boolean SingularProcessing(const gp_Vec& theDU,
const gp_Vec& theDV, const gp_Vec& theDV,
const Standard_Boolean theIsTo3DTgCompute, const Standard_Boolean theIsTo3DTgCompute,
@ -89,8 +90,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// Really, vector theTg3D has to be normalized (if theIsTo3DTgCompute == FALSE). // Really, vector theTg3D has to be normalized (if theIsTo3DTgCompute == FALSE).
const Standard_Real aSQTan = theTg3D.SquareMagnitude(); const Standard_Real aSQTan = theTg3D.SquareMagnitude();
const Standard_Real aSqMagnDU = theDU.SquareMagnitude(), const Standard_Real aSqMagnDU = theDU.SquareMagnitude(), aSqMagnDV = theDV.SquareMagnitude();
aSqMagnDV = theDV.SquareMagnitude();
// There are some reasons of singularity // There are some reasons of singularity
@ -125,8 +125,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// theTg3D is already defined. // theTg3D is already defined.
// Here we check only, if this tangent is parallel to theDV. // Here we check only, if this tangent is parallel to theDV.
if(theDV.Crossed(theTg3D).SquareMagnitude() < if (theDV.Crossed(theTg3D).SquareMagnitude() < theAngTol * theAngTol * aSqMagnDV * aSQTan)
theAngTol*theAngTol*aSqMagnDV*aSQTan)
{ {
// theTg3D is parallel to theDV // theTg3D is parallel to theDV
@ -168,8 +167,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// theTg3D is already defined. // theTg3D is already defined.
// Here we check only, if this tangent is parallel to theDU. // Here we check only, if this tangent is parallel to theDU.
if(theDU.Crossed(theTg3D).SquareMagnitude() < if (theDU.Crossed(theTg3D).SquareMagnitude() < theAngTol * theAngTol * aSqMagnDU * aSQTan)
theAngTol*theAngTol*aSqMagnDU*aSQTan)
{ {
// theTg3D is parallel to theDU // theTg3D is parallel to theDU
@ -192,8 +190,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// 4. If aSqMagnDU > 0.0 && aSqMagnDV > 0.0 but theDV || theDU. // 4. If aSqMagnDU > 0.0 && aSqMagnDV > 0.0 but theDV || theDU.
const Standard_Real aLenU = sqrt(aSqMagnDU), const Standard_Real aLenU = sqrt(aSqMagnDU), aLenV = sqrt(aSqMagnDV);
aLenV = sqrt(aSqMagnDV);
// aLenSum > 0.0 definitely // aLenSum > 0.0 definitely
const Standard_Real aLenSum = aLenU + aLenV; const Standard_Real aLenSum = aLenU + aLenV;
@ -213,8 +210,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// Here we check only, if this tangent is parallel to theDU // Here we check only, if this tangent is parallel to theDU
//(and theDV together). //(and theDV together).
if(theDU.Crossed(theTg3D).SquareMagnitude() < if (theDU.Crossed(theTg3D).SquareMagnitude() < theAngTol * theAngTol * aSqMagnDU * aSQTan)
theAngTol*theAngTol*aSqMagnDU*aSQTan)
{ {
// theTg3D is parallel to theDU // theTg3D is parallel to theDU
@ -250,8 +246,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// Here we check only, if this tangent is parallel to theDU // Here we check only, if this tangent is parallel to theDU
//(and theDV together). //(and theDV together).
if(theDU.Crossed(theTg3D).SquareMagnitude() < if (theDU.Crossed(theTg3D).SquareMagnitude() < theAngTol * theAngTol * aSqMagnDU * aSQTan)
theAngTol*theAngTol*aSqMagnDU*aSQTan)
{ {
// theTg3D is parallel to theDU // theTg3D is parallel to theDU
@ -272,7 +267,7 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : NonSingularProcessing // function : NonSingularProcessing
// purpose : Computes 2D-representation (in UV-coordinates) of // purpose : Computes 2D-representation (in UV-coordinates) of
// theTg3D vector on the surface in case when // theTg3D vector on the surface in case when
@ -287,7 +282,8 @@ static Standard_Boolean SingularProcessing( const gp_Vec& theDU,
// Tg=theDU*theTg2D.X()+theDV*theTg2D.Y() // Tg=theDU*theTg2D.X()+theDV*theTg2D.Y()
// has to be satisfied strictly. // has to be satisfied strictly.
// More over, vector Tg has always to be NORMALIZED. // More over, vector Tg has always to be NORMALIZED.
//======================================================================= //=================================================================================================
static Standard_Boolean NonSingularProcessing(const gp_Vec& theDU, static Standard_Boolean NonSingularProcessing(const gp_Vec& theDU,
const gp_Vec& theDV, const gp_Vec& theDV,
const gp_Vec& theTg3D, const gp_Vec& theTg3D,
@ -301,9 +297,7 @@ static Standard_Boolean NonSingularProcessing(const gp_Vec& theDU,
if (IsSingular(theDU, theDV, theLinTol, theAngTol)) if (IsSingular(theDU, theDV, theLinTol, theAngTol))
{ {
gp_Vec aTg(theTg3D); gp_Vec aTg(theTg3D);
return return SingularProcessing(theDU, theDV, Standard_False, theLinTol, theAngTol, aTg, theTg2D);
SingularProcessing(theDU, theDV, Standard_False,
theLinTol, theAngTol, aTg, theTg2D);
} }
// If @\vec{T}=\vec{A}*U+\vec{B}*V@ then // If @\vec{T}=\vec{A}*U+\vec{B}*V@ then
@ -326,9 +320,10 @@ static Standard_Boolean NonSingularProcessing(const gp_Vec& theDU,
return Standard_True; return Standard_True;
} }
//-------------------------------------------------------------------------------- //=================================================================================================
ApproxInt_ImpPrmSvSurfaces::ApproxInt_ImpPrmSvSurfaces( const TheISurface& ISurf
,const ThePSurface& PSurf): ApproxInt_ImpPrmSvSurfaces::ApproxInt_ImpPrmSvSurfaces(const TheISurface& ISurf,
const ThePSurface& PSurf) :
MyIsTangent(Standard_False), MyIsTangent(Standard_False),
MyHasBeenComputed(Standard_False), MyHasBeenComputed(Standard_False),
MyIsTangentbis(Standard_False), MyIsTangentbis(Standard_False),
@ -338,9 +333,11 @@ ApproxInt_ImpPrmSvSurfaces::ApproxInt_ImpPrmSvSurfaces( const TheISurface& ISurf
{ {
SetUseSolver(Standard_True); SetUseSolver(Standard_True);
} }
//--------------------------------------------------------------------------------
ApproxInt_ImpPrmSvSurfaces::ApproxInt_ImpPrmSvSurfaces( const ThePSurface& PSurf //=================================================================================================
,const TheISurface& ISurf):
ApproxInt_ImpPrmSvSurfaces::ApproxInt_ImpPrmSvSurfaces(const ThePSurface& PSurf,
const TheISurface& ISurf) :
MyIsTangent(Standard_False), MyIsTangent(Standard_False),
MyHasBeenComputed(Standard_False), MyHasBeenComputed(Standard_False),
MyIsTangentbis(Standard_False), MyIsTangentbis(Standard_False),
@ -350,12 +347,15 @@ ApproxInt_ImpPrmSvSurfaces::ApproxInt_ImpPrmSvSurfaces( const ThePSurface& PSurf
{ {
SetUseSolver(Standard_True); SetUseSolver(Standard_True);
} }
//--------------------------------------------------------------------------------
//=================================================================================================
void ApproxInt_ImpPrmSvSurfaces::Pnt(const Standard_Real u1, void ApproxInt_ImpPrmSvSurfaces::Pnt(const Standard_Real u1,
const Standard_Real v1, const Standard_Real v1,
const Standard_Real u2, const Standard_Real u2,
const Standard_Real v2, const Standard_Real v2,
gp_Pnt& P) { gp_Pnt& P)
{
gp_Pnt aP; gp_Pnt aP;
gp_Vec aT; gp_Vec aT;
gp_Vec2d aTS1, aTS2; gp_Vec2d aTS1, aTS2;
@ -366,12 +366,15 @@ void ApproxInt_ImpPrmSvSurfaces::Pnt(const Standard_Real u1,
this->Compute(tu1, tv1, tu2, tv2, aP, aT, aTS1, aTS2); this->Compute(tu1, tv1, tu2, tv2, aP, aT, aTS1, aTS2);
P = MyPnt; P = MyPnt;
} }
//--------------------------------------------------------------------------------
//=================================================================================================
Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Tangency(const Standard_Real u1, Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Tangency(const Standard_Real u1,
const Standard_Real v1, const Standard_Real v1,
const Standard_Real u2, const Standard_Real u2,
const Standard_Real v2, const Standard_Real v2,
gp_Vec& T) { gp_Vec& T)
{
gp_Pnt aP; gp_Pnt aP;
gp_Vec aT; gp_Vec aT;
gp_Vec2d aTS1, aTS2; gp_Vec2d aTS1, aTS2;
@ -383,12 +386,15 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Tangency(const Standard_Real u1,
T = MyTg; T = MyTg;
return (t); return (t);
} }
//--------------------------------------------------------------------------------
//=================================================================================================
Standard_Boolean ApproxInt_ImpPrmSvSurfaces::TangencyOnSurf1(const Standard_Real u1, Standard_Boolean ApproxInt_ImpPrmSvSurfaces::TangencyOnSurf1(const Standard_Real u1,
const Standard_Real v1, const Standard_Real v1,
const Standard_Real u2, const Standard_Real u2,
const Standard_Real v2, const Standard_Real v2,
gp_Vec2d& T) { gp_Vec2d& T)
{
gp_Pnt aP; gp_Pnt aP;
gp_Vec aT; gp_Vec aT;
gp_Vec2d aTS1, aTS2; gp_Vec2d aTS1, aTS2;
@ -400,12 +406,15 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::TangencyOnSurf1(const Standard_Real
T = MyTguv1; T = MyTguv1;
return (t); return (t);
} }
//--------------------------------------------------------------------------------
//=================================================================================================
Standard_Boolean ApproxInt_ImpPrmSvSurfaces::TangencyOnSurf2(const Standard_Real u1, Standard_Boolean ApproxInt_ImpPrmSvSurfaces::TangencyOnSurf2(const Standard_Real u1,
const Standard_Real v1, const Standard_Real v1,
const Standard_Real u2, const Standard_Real u2,
const Standard_Real v2, const Standard_Real v2,
gp_Vec2d& T) { gp_Vec2d& T)
{
gp_Pnt aP; gp_Pnt aP;
gp_Vec aT; gp_Vec aT;
gp_Vec2d aTS1, aTS2; gp_Vec2d aTS1, aTS2;
@ -418,11 +427,12 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::TangencyOnSurf2(const Standard_Real
return (t); return (t);
} }
//======================================================================= //=================================================================================================
// function : Compute // function : Compute
// purpose : Computes point on curve, 3D and 2D-tangents of a curve and // purpose : Computes point on curve, 3D and 2D-tangents of a curve and
// parameters on the surfaces. // parameters on the surfaces.
//======================================================================= //=================================================================================================
Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute(Standard_Real& u1, Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute(Standard_Real& u1,
Standard_Real& v1, Standard_Real& v1,
Standard_Real& u2, Standard_Real& u2,
@ -438,8 +448,7 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
gp_Vec2d& aPrmTg = MyImplicitFirst ? Tguv2 : Tguv1; gp_Vec2d& aPrmTg = MyImplicitFirst ? Tguv2 : Tguv1;
// for square // for square
constexpr Standard_Real aNullValue = Precision::Approximation()* constexpr Standard_Real aNullValue = Precision::Approximation() * Precision::Approximation(),
Precision::Approximation(),
anAngTol = Precision::Angular(); anAngTol = Precision::Angular();
Standard_Real tu1 = u1; Standard_Real tu1 = u1;
@ -447,12 +456,15 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
Standard_Real tv1 = v1; Standard_Real tv1 = v1;
Standard_Real tv2 = v2; Standard_Real tv2 = v2;
if(MyHasBeenComputed) { if (MyHasBeenComputed)
if( (MyParOnS1.X()==u1)&&(MyParOnS1.Y()==v1) {
&&(MyParOnS2.X()==u2)&&(MyParOnS2.Y()==v2)) { if ((MyParOnS1.X() == u1) && (MyParOnS1.Y() == v1) && (MyParOnS2.X() == u2) &&
(MyParOnS2.Y() == v2))
{
return (MyIsTangent); return (MyIsTangent);
} }
else if(MyHasBeenComputedbis == Standard_False) { else if (MyHasBeenComputedbis == Standard_False)
{
MyTgbis = MyTg; MyTgbis = MyTg;
MyTguv1bis = MyTguv1; MyTguv1bis = MyTguv1;
MyTguv2bis = MyTguv2; MyTguv2bis = MyTguv2;
@ -464,9 +476,11 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
} }
} }
if(MyHasBeenComputedbis) { if (MyHasBeenComputedbis)
if( (MyParOnS1bis.X()==u1)&&(MyParOnS1bis.Y()==v1) {
&&(MyParOnS2bis.X()==u2)&&(MyParOnS2bis.Y()==v2)) { if ((MyParOnS1bis.X() == u1) && (MyParOnS1bis.Y() == v1) && (MyParOnS2bis.X() == u2) &&
(MyParOnS2bis.Y() == v2))
{
gp_Vec TV(MyTg); gp_Vec TV(MyTg);
gp_Vec2d TV1(MyTguv1); gp_Vec2d TV1(MyTguv1);
@ -499,20 +513,30 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
math_Vector X(1, 2); math_Vector X(1, 2);
math_Vector BornInf(1, 2), BornSup(1, 2), Tolerance(1, 2); math_Vector BornInf(1, 2), BornSup(1, 2), Tolerance(1, 2);
//--- ThePSurfaceTool::GetResolution(aPSurf,Tolerance(1),Tolerance(2)); //--- ThePSurfaceTool::GetResolution(aPSurf,Tolerance(1),Tolerance(2));
Tolerance(1) = 1.0e-8; Tolerance(2) = 1.0e-8; Tolerance(1) = 1.0e-8;
Tolerance(2) = 1.0e-8;
Standard_Real binfu, bsupu, binfv, bsupv; Standard_Real binfu, bsupu, binfv, bsupv;
binfu = ThePSurfaceTool::FirstUParameter(aPSurf); binfu = ThePSurfaceTool::FirstUParameter(aPSurf);
binfv = ThePSurfaceTool::FirstVParameter(aPSurf); binfv = ThePSurfaceTool::FirstVParameter(aPSurf);
bsupu = ThePSurfaceTool::LastUParameter(aPSurf); bsupu = ThePSurfaceTool::LastUParameter(aPSurf);
bsupv = ThePSurfaceTool::LastVParameter(aPSurf); bsupv = ThePSurfaceTool::LastVParameter(aPSurf);
BornInf(1) = binfu; BornSup(1) = bsupu; BornInf(1) = binfu;
BornInf(2) = binfv; BornSup(2) = bsupv; BornSup(1) = bsupu;
BornInf(2) = binfv;
BornSup(2) = bsupv;
Standard_Real TranslationU = 0., TranslationV = 0.; Standard_Real TranslationU = 0., TranslationV = 0.;
if (!FillInitialVectorOfSolution(u1, v1, u2, v2, if (!FillInitialVectorOfSolution(u1,
binfu, bsupu, binfv, bsupv, v1,
u2,
v2,
binfu,
bsupu,
binfv,
bsupv,
X, X,
TranslationU, TranslationV)) TranslationU,
TranslationV))
{ {
MyIsTangent = MyIsTangentbis = Standard_False; MyIsTangent = MyIsTangentbis = Standard_False;
MyHasBeenComputed = MyHasBeenComputedbis = Standard_False; MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
@ -540,8 +564,7 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
MyPnt = P = ThePSurfaceTool::Value(aPSurf, X(1), X(2)); MyPnt = P = ThePSurfaceTool::Value(aPSurf, X(1), X(2));
if( (DistAvantApresV <= 0.001 ) && if ((DistAvantApresV <= 0.001) && (DistAvantApresU <= 0.001))
(DistAvantApresU <= 0.001 ))
{ {
gp_Vec aD1uPrm, aD1vPrm; gp_Vec aD1uPrm, aD1vPrm;
gp_Vec aD1uQuad, aD1vQuad; gp_Vec aD1uQuad, aD1vQuad;
@ -553,8 +576,10 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
if (aQSurf.TypeQuadric() != GeomAbs_Plane) if (aQSurf.TypeQuadric() != GeomAbs_Plane)
{ {
while(u1-tu1>M_PI) u1-=M_PI+M_PI; while (u1 - tu1 > M_PI)
while(tu1-u1>M_PI) u1+=M_PI+M_PI; u1 -= M_PI + M_PI;
while (tu1 - u1 > M_PI)
u1 += M_PI + M_PI;
} }
MyParOnS1.SetCoord(tu1, tv1); MyParOnS1.SetCoord(tu1, tv1);
@ -575,8 +600,10 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
// aQSurf.Parameters(P, u2, v2); // aQSurf.Parameters(P, u2, v2);
if (aQSurf.TypeQuadric() != GeomAbs_Plane) if (aQSurf.TypeQuadric() != GeomAbs_Plane)
{ {
while(u2-tu2>M_PI) u2-=M_PI+M_PI; while (u2 - tu2 > M_PI)
while(tu2-u2>M_PI) u2+=M_PI+M_PI; u2 -= M_PI + M_PI;
while (tu2 - u2 > M_PI)
u2 += M_PI + M_PI;
} }
MyParOnS1.SetCoord(tu1, tv1); MyParOnS1.SetCoord(tu1, tv1);
@ -594,20 +621,17 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
MyPnt = P; MyPnt = P;
// Normals to the surfaces // Normals to the surfaces
gp_Vec aNormalPrm(aD1uPrm.Crossed(aD1vPrm)), gp_Vec aNormalPrm(aD1uPrm.Crossed(aD1vPrm)), aNormalImp(aQSurf.Normale(MyPnt));
aNormalImp(aQSurf.Normale(MyPnt));
const Standard_Real aSQMagnPrm = aNormalPrm.SquareMagnitude(), const Standard_Real aSQMagnPrm = aNormalPrm.SquareMagnitude(),
aSQMagnImp = aNormalImp.SquareMagnitude(); aSQMagnImp = aNormalImp.SquareMagnitude();
Standard_Boolean isPrmSingular = Standard_False, Standard_Boolean isPrmSingular = Standard_False, isImpSingular = Standard_False;
isImpSingular = Standard_False;
if (IsSingular(aD1uPrm, aD1vPrm, aNullValue, anAngTol)) if (IsSingular(aD1uPrm, aD1vPrm, aNullValue, anAngTol))
{ {
isPrmSingular = Standard_True; isPrmSingular = Standard_True;
if(!SingularProcessing(aD1uPrm, aD1vPrm, Standard_True, if (!SingularProcessing(aD1uPrm, aD1vPrm, Standard_True, aNullValue, anAngTol, Tg, aPrmTg))
aNullValue, anAngTol, Tg, aPrmTg))
{ {
MyIsTangent = Standard_False; MyIsTangent = Standard_False;
MyHasBeenComputed = MyHasBeenComputedbis = Standard_False; MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
@ -626,8 +650,13 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
{ {
isImpSingular = Standard_True; isImpSingular = Standard_True;
if(!SingularProcessing(aD1uQuad, aD1vQuad, !isPrmSingular, if (!SingularProcessing(aD1uQuad,
aNullValue, anAngTol, Tg, aQuadTg)) aD1vQuad,
!isPrmSingular,
aNullValue,
anAngTol,
Tg,
aQuadTg))
{ {
MyIsTangent = Standard_False; MyIsTangent = Standard_False;
MyHasBeenComputed = MyHasBeenComputedbis = Standard_False; MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
@ -721,7 +750,8 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
return Standard_True; return Standard_True;
} }
else { else
{
//-- cout<<" ApproxInt_ImpImpSvSurfaces.gxx : Distance apres recadrage Trop Grande "<<endl; //-- cout<<" ApproxInt_ImpImpSvSurfaces.gxx : Distance apres recadrage Trop Grande "<<endl;
MyIsTangent = Standard_False; MyIsTangent = Standard_False;
@ -729,23 +759,26 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::Compute( Standard_Real& u1,
return Standard_False; return Standard_False;
} }
} }
else { else
{
MyIsTangent = Standard_False; MyIsTangent = Standard_False;
MyHasBeenComputed = MyHasBeenComputedbis = Standard_False; MyHasBeenComputed = MyHasBeenComputedbis = Standard_False;
return Standard_False; return Standard_False;
} }
} }
//======================================================================= //=================================================================================================
// function : SeekPoint // function : SeekPoint
// purpose : Computes point on curve and // purpose : Computes point on curve and
// parameters on the surfaces. // parameters on the surfaces.
//======================================================================= //=================================================================================================
Standard_Boolean ApproxInt_ImpPrmSvSurfaces::SeekPoint(const Standard_Real u1, Standard_Boolean ApproxInt_ImpPrmSvSurfaces::SeekPoint(const Standard_Real u1,
const Standard_Real v1, const Standard_Real v1,
const Standard_Real u2, const Standard_Real u2,
const Standard_Real v2, const Standard_Real v2,
IntSurf_PntOn2S& Point) { IntSurf_PntOn2S& Point)
{
gp_Pnt aP; gp_Pnt aP;
gp_Vec aT; gp_Vec aT;
gp_Vec2d aTS1, aTS2; gp_Vec2d aTS1, aTS2;
@ -755,20 +788,30 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::SeekPoint(const Standard_Real u1,
math_Vector X(1, 2); math_Vector X(1, 2);
math_Vector BornInf(1, 2), BornSup(1, 2), Tolerance(1, 2); math_Vector BornInf(1, 2), BornSup(1, 2), Tolerance(1, 2);
//--- ThePSurfaceTool::GetResolution(aPSurf,Tolerance(1),Tolerance(2)); //--- ThePSurfaceTool::GetResolution(aPSurf,Tolerance(1),Tolerance(2));
Tolerance(1) = 1.0e-8; Tolerance(2) = 1.0e-8; Tolerance(1) = 1.0e-8;
Tolerance(2) = 1.0e-8;
Standard_Real binfu, bsupu, binfv, bsupv; Standard_Real binfu, bsupu, binfv, bsupv;
binfu = ThePSurfaceTool::FirstUParameter(aPSurf); binfu = ThePSurfaceTool::FirstUParameter(aPSurf);
binfv = ThePSurfaceTool::FirstVParameter(aPSurf); binfv = ThePSurfaceTool::FirstVParameter(aPSurf);
bsupu = ThePSurfaceTool::LastUParameter(aPSurf); bsupu = ThePSurfaceTool::LastUParameter(aPSurf);
bsupv = ThePSurfaceTool::LastVParameter(aPSurf); bsupv = ThePSurfaceTool::LastVParameter(aPSurf);
BornInf(1) = binfu; BornSup(1) = bsupu; BornInf(1) = binfu;
BornInf(2) = binfv; BornSup(2) = bsupv; BornSup(1) = bsupu;
BornInf(2) = binfv;
BornSup(2) = bsupv;
Standard_Real TranslationU = 0., TranslationV = 0.; Standard_Real TranslationU = 0., TranslationV = 0.;
if (!FillInitialVectorOfSolution(u1, v1, u2, v2, if (!FillInitialVectorOfSolution(u1,
binfu, bsupu, binfv, bsupv, v1,
u2,
v2,
binfu,
bsupu,
binfv,
bsupv,
X, X,
TranslationU, TranslationV)) TranslationU,
TranslationV))
return Standard_False; return Standard_False;
Standard_Real NewU1, NewV1, NewU2, NewV2; Standard_Real NewU1, NewV1, NewU2, NewV2;
@ -776,7 +819,8 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::SeekPoint(const Standard_Real u1,
math_FunctionSetRoot Rsnld(MyZerImpFunc); math_FunctionSetRoot Rsnld(MyZerImpFunc);
Rsnld.SetTolerance(Tolerance); Rsnld.SetTolerance(Tolerance);
Rsnld.Perform(MyZerImpFunc, X, BornInf, BornSup); Rsnld.Perform(MyZerImpFunc, X, BornInf, BornSup);
if(Rsnld.IsDone()) { if (Rsnld.IsDone())
{
MyHasBeenComputed = Standard_True; MyHasBeenComputed = Standard_True;
Rsnld.Root(X); Rsnld.Root(X);
@ -817,10 +861,11 @@ Standard_Boolean ApproxInt_ImpPrmSvSurfaces::SeekPoint(const Standard_Real u1,
Point.SetValue(MyPnt, NewU1, NewV1, NewU2, NewV2); Point.SetValue(MyPnt, NewU1, NewV1, NewU2, NewV2);
return Standard_True; return Standard_True;
} }
//--------------------------------------------------------------------------------
Standard_Boolean //=================================================================================================
ApproxInt_ImpPrmSvSurfaces::FillInitialVectorOfSolution(const Standard_Real u1,
Standard_Boolean ApproxInt_ImpPrmSvSurfaces::FillInitialVectorOfSolution(
const Standard_Real u1,
const Standard_Real v1, const Standard_Real v1,
const Standard_Real u2, const Standard_Real u2,
const Standard_Real v2, const Standard_Real v2,
@ -839,35 +884,56 @@ ApproxInt_ImpPrmSvSurfaces::FillInitialVectorOfSolution(const Standard_Real u1,
TranslationU = 0.0; TranslationU = 0.0;
TranslationV = 0.0; TranslationV = 0.0;
if(MyImplicitFirst) { if (MyImplicitFirst)
if(u2<binfu-0.0000000001) { {
if(ThePSurfaceTool::IsUPeriodic(aPSurf)) { if (u2 < binfu - 0.0000000001)
{
if (ThePSurfaceTool::IsUPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf);
do { TranslationU+=d; } while(u2+TranslationU < binfu); do
{
TranslationU += d;
} while (u2 + TranslationU < binfu);
} }
else else
return (Standard_False); return (Standard_False);
} }
else if(u2>bsupu+0.0000000001) { else if (u2 > bsupu + 0.0000000001)
if(ThePSurfaceTool::IsUPeriodic(aPSurf)) { {
if (ThePSurfaceTool::IsUPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf);
do { TranslationU-=d; } while(u2+TranslationU > bsupu); do
{
TranslationU -= d;
} while (u2 + TranslationU > bsupu);
} }
else else
return (Standard_False); return (Standard_False);
} }
if(v2<binfv-0.0000000001) { if (v2 < binfv - 0.0000000001)
if(ThePSurfaceTool::IsVPeriodic(aPSurf)) { {
if (ThePSurfaceTool::IsVPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf);
do { TranslationV+=d; } while(v2+TranslationV < binfv); do
{
TranslationV += d;
} while (v2 + TranslationV < binfv);
} }
else else
return (Standard_False); return (Standard_False);
} }
else if(v2>bsupv+0.0000000001) { else if (v2 > bsupv + 0.0000000001)
if(ThePSurfaceTool::IsVPeriodic(aPSurf)) { {
if (ThePSurfaceTool::IsVPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf);
do { TranslationV-=d; } while(v2+TranslationV > bsupv); do
{
TranslationV -= d;
} while (v2 + TranslationV > bsupv);
} }
else else
return (Standard_False); return (Standard_False);
@ -875,35 +941,56 @@ ApproxInt_ImpPrmSvSurfaces::FillInitialVectorOfSolution(const Standard_Real u1,
X(1) = u2 + TranslationU; X(1) = u2 + TranslationU;
X(2) = v2 + TranslationV; X(2) = v2 + TranslationV;
} }
else { else
if(u1<binfu-0.0000000001) { {
if(ThePSurfaceTool::IsUPeriodic(aPSurf)) { if (u1 < binfu - 0.0000000001)
{
if (ThePSurfaceTool::IsUPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf);
do { TranslationU+=d; } while(u1+TranslationU < binfu); do
{
TranslationU += d;
} while (u1 + TranslationU < binfu);
} }
else else
return (Standard_False); return (Standard_False);
} }
else if(u1>bsupu+0.0000000001) { else if (u1 > bsupu + 0.0000000001)
if(ThePSurfaceTool::IsUPeriodic(aPSurf)) { {
if (ThePSurfaceTool::IsUPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::UPeriod(aPSurf);
do { TranslationU-=d; } while(u1+TranslationU > bsupu); do
{
TranslationU -= d;
} while (u1 + TranslationU > bsupu);
} }
else else
return (Standard_False); return (Standard_False);
} }
if(v1<binfv-0.0000000001) { if (v1 < binfv - 0.0000000001)
if(ThePSurfaceTool::IsVPeriodic(aPSurf)) { {
if (ThePSurfaceTool::IsVPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf);
do { TranslationV+=d; } while(v1+TranslationV < binfv); do
{
TranslationV += d;
} while (v1 + TranslationV < binfv);
} }
else else
return (Standard_False); return (Standard_False);
} }
else if(v1>bsupv+0.0000000001) { else if (v1 > bsupv + 0.0000000001)
if(ThePSurfaceTool::IsVPeriodic(aPSurf)) { {
if (ThePSurfaceTool::IsVPeriodic(aPSurf))
{
Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf); Standard_Real d = ThePSurfaceTool::VPeriod(aPSurf);
do { TranslationV-=d; } while(v1+TranslationV > bsupv); do
{
TranslationV -= d;
} while (v1 + TranslationV > bsupv);
} }
else else
return (Standard_False); return (Standard_False);
@ -912,17 +999,24 @@ ApproxInt_ImpPrmSvSurfaces::FillInitialVectorOfSolution(const Standard_Real u1,
X(2) = v1 + TranslationV; X(2) = v1 + TranslationV;
} }
//---------------------------------------------------- //=================================================================================================
// Make a small step from boundaries in order to avoid // Make a small step from boundaries in order to avoid
// finding "outboundaried" solution (Rsnld -> NotDone). // finding "outboundaried" solution (Rsnld -> NotDone).
if (GetUseSolver()) if (GetUseSolver())
{ {
Standard_Real du = Max(Precision::Confusion(), ThePSurfaceTool::UResolution(aPSurf, Precision::Confusion())); Standard_Real du =
Standard_Real dv = Max(Precision::Confusion(), ThePSurfaceTool::VResolution(aPSurf, Precision::Confusion())); Max(Precision::Confusion(), ThePSurfaceTool::UResolution(aPSurf, Precision::Confusion()));
if (X(1) - 0.0000000001 <= binfu) X(1) = X(1) + du; Standard_Real dv =
if (X(1) + 0.0000000001 >= bsupu) X(1) = X(1) - du; Max(Precision::Confusion(), ThePSurfaceTool::VResolution(aPSurf, Precision::Confusion()));
if (X(2) - 0.0000000001 <= binfv) X(2) = X(2) + dv; if (X(1) - 0.0000000001 <= binfu)
if (X(2) + 0.0000000001 >= bsupv) X(2) = X(2) - dv; X(1) = X(1) + du;
if (X(1) + 0.0000000001 >= bsupu)
X(1) = X(1) - du;
if (X(2) - 0.0000000001 <= binfv)
X(2) = X(2) + dv;
if (X(2) + 0.0000000001 >= bsupv)
X(2) = X(2) - dv;
} }
return Standard_True; return Standard_True;

131
src/ApproxInt/ApproxInt_KnotTools.cxx
View File

@ -12,28 +12,29 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <ApproxInt_KnotTools.hxx> #include <ApproxInt_KnotTools.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <math_Vector.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom2d_BSplineCurve.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <GeomInt_TheMultiLineOfWLApprox.hxx>
#include <GeomInt_WLApprox.hxx>
#include <Geom_BSplineCurve.hxx>
#include <NCollection_Sequence.hxx> #include <NCollection_Sequence.hxx>
#include <NCollection_Vector.hxx>
#include <PLib.hxx> #include <PLib.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <NCollection_Vector.hxx> #include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx> #include <TColgp_Array1OfPnt.hxx>
#include <GeomInt_WLApprox.hxx> #include <TColgp_Array1OfPnt2d.hxx>
#include <GeomInt_TheMultiLineOfWLApprox.hxx> #include <math_Vector.hxx>
// (Sqrt(5.0) - 1.0) / 4.0 // (Sqrt(5.0) - 1.0) / 4.0
// static const Standard_Real aSinCoeff = 0.30901699437494742410229341718282; // static const Standard_Real aSinCoeff = 0.30901699437494742410229341718282;
static const Standard_Real aSinCoeff2 = 0.09549150281252627; // aSinCoeff^2 = (3. - Sqrt(5.)) / 8. static const Standard_Real aSinCoeff2 = 0.09549150281252627; // aSinCoeff^2 = (3. - Sqrt(5.)) / 8.
static const Standard_Integer aMaxPntCoeff = 15; static const Standard_Integer aMaxPntCoeff = 15;
//======================================================================= //=================================================================================================
// function : EvalCurv // function : EvalCurv
// purpose : Evaluate curvature in dim-dimension point. // purpose : Evaluate curvature in dim-dimension point.
//======================================================================= //=================================================================================================
static Standard_Real EvalCurv(const Standard_Real dim, static Standard_Real EvalCurv(const Standard_Real dim,
const Standard_Real* V1, const Standard_Real* V1,
const Standard_Real* V2) const Standard_Real* V2)
@ -86,13 +87,9 @@ static Standard_Real EvalCurv(const Standard_Real dim,
return curv; return curv;
} }
//======================================================================= //=================================================================================================
//function : BuildCurvature
//purpose :
//=======================================================================
void ApproxInt_KnotTools::BuildCurvature( void ApproxInt_KnotTools::BuildCurvature(const NCollection_LocalArray<Standard_Real>& theCoords,
const NCollection_LocalArray<Standard_Real>& theCoords,
const Standard_Integer theDim, const Standard_Integer theDim,
const math_Vector& thePars, const math_Vector& thePars,
TColStd_Array1OfReal& theCurv, TColStd_Array1OfReal& theCurv,
@ -171,13 +168,10 @@ void ApproxInt_KnotTools::BuildCurvature(
{ {
theMaxCurv = theCurv(i); theMaxCurv = theCurv(i);
} }
} }
//======================================================================= //=================================================================================================
//function : ComputeKnotInds
//purpose :
//=======================================================================
void ApproxInt_KnotTools::ComputeKnotInds(const NCollection_LocalArray<Standard_Real>& theCoords, void ApproxInt_KnotTools::ComputeKnotInds(const NCollection_LocalArray<Standard_Real>& theCoords,
const Standard_Integer theDim, const Standard_Integer theDim,
const math_Vector& thePars, const math_Vector& thePars,
@ -208,13 +202,11 @@ void ApproxInt_KnotTools::ComputeKnotInds(const NCollection_LocalArray<Standard_
// II: Find extremas of curvature. // II: Find extremas of curvature.
// Not used Precision::PConfusion, by different from "param space" eps nature. // Not used Precision::PConfusion, by different from "param space" eps nature.
Standard_Real eps = 1.0e-9, Standard_Real eps = 1.0e-9, eps1 = 1.0e3 * eps;
eps1 = 1.0e3 * eps;
for (i = aCurv.Lower() + 1; i < aCurv.Upper(); ++i) for (i = aCurv.Lower() + 1; i < aCurv.Upper(); ++i)
{ {
Standard_Real d1 = aCurv(i) - aCurv(i - 1), Standard_Real d1 = aCurv(i) - aCurv(i - 1), d2 = aCurv(i) - aCurv(i + 1), ad1 = Abs(d1),
d2 = aCurv(i) - aCurv(i + 1), ad2 = Abs(d2);
ad1 = Abs(d1), ad2 = Abs(d2);
if (d1 * d2 > 0. && ad1 > eps && ad2 > eps) if (d1 * d2 > 0. && ad1 > eps && ad2 > eps)
{ {
@ -261,8 +253,7 @@ void ApproxInt_KnotTools::ComputeKnotInds(const NCollection_LocalArray<Standard_
{ {
i--; i--;
} }
} } while (i < theInds.Length());
while(i < theInds.Length());
// IV: Checking feature points. // IV: Checking feature points.
j = 2; j = 2;
@ -340,11 +331,8 @@ void ApproxInt_KnotTools::ComputeKnotInds(const NCollection_LocalArray<Standard_
// //
} }
//=================================================================================================
//=======================================================================
//function : FilterKnots
//purpose :
//=======================================================================
void ApproxInt_KnotTools::FilterKnots(NCollection_Sequence<Standard_Integer>& theInds, void ApproxInt_KnotTools::FilterKnots(NCollection_Sequence<Standard_Integer>& theInds,
const Standard_Integer theMinNbPnts, const Standard_Integer theMinNbPnts,
NCollection_Vector<Standard_Integer>& theLKnots) NCollection_Vector<Standard_Integer>& theLKnots)
@ -389,9 +377,8 @@ void ApproxInt_KnotTools::FilterKnots(NCollection_Sequence<Standard_Integer>& th
anIdx--; anIdx--;
Standard_Integer aMidIdx = (theInds(anIdx) + anIndsPrev) / 2; Standard_Integer aMidIdx = (theInds(anIdx) + anIndsPrev) / 2;
if (aMidIdx - anIndsPrev < theMinNbPnts && if (aMidIdx - anIndsPrev < theMinNbPnts && aMidIdx - theInds(anIdx) < theMinNbPnts
aMidIdx - theInds(anIdx) < theMinNbPnts && && theInds(anIdx) - anIndsPrev >= aMinNbStep)
theInds(anIdx) - anIndsPrev >= aMinNbStep)
{ {
if (theInds(anIdx) - anIndsPrev > 2 * theMinNbPnts) if (theInds(anIdx) - anIndsPrev > 2 * theMinNbPnts)
{ {
@ -462,11 +449,11 @@ void ApproxInt_KnotTools::FilterKnots(NCollection_Sequence<Standard_Integer>& th
} }
} }
} }
//=======================================================================
//function : InsKnotBefI //=================================================================================================
//purpose :
//======================================================================= Standard_Boolean ApproxInt_KnotTools::InsKnotBefI(
Standard_Boolean ApproxInt_KnotTools::InsKnotBefI(const Standard_Integer theI, const Standard_Integer theI,
const TColStd_Array1OfReal& theCurv, const TColStd_Array1OfReal& theCurv,
const NCollection_LocalArray<Standard_Real>& theCoords, const NCollection_LocalArray<Standard_Real>& theCoords,
const Standard_Integer theDim, const Standard_Integer theDim,
@ -490,11 +477,10 @@ Standard_Boolean ApproxInt_KnotTools::InsKnotBefI(const Standard_Integer theI,
// I: Curvature change criteria: // I: Curvature change criteria:
// Non-null curvature. // Non-null curvature.
if (theCurv(j) > Precision::Confusion() && if (theCurv(j) > Precision::Confusion() && theCurv(anInd) > Precision::Confusion())
theCurv(anInd) > Precision::Confusion() )
{ {
if (theCurv(j) / theCurv(anInd) > aLimitCurvatureChange || if (theCurv(j) / theCurv(anInd) > aLimitCurvatureChange
theCurv(j) / theCurv(anInd) < 1.0 / aLimitCurvatureChange) || theCurv(j) / theCurv(anInd) < 1.0 / aLimitCurvatureChange)
{ {
// Curvature on current interval changed more than 3 times. // Curvature on current interval changed more than 3 times.
mid = j; mid = j;
@ -570,10 +556,8 @@ Standard_Boolean ApproxInt_KnotTools::InsKnotBefI(const Standard_Integer theI,
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
//function : BuildKnots
//purpose :
//=======================================================================
void ApproxInt_KnotTools::BuildKnots(const TColgp_Array1OfPnt& thePntsXYZ, void ApproxInt_KnotTools::BuildKnots(const TColgp_Array1OfPnt& thePntsXYZ,
const TColgp_Array1OfPnt2d& thePntsU1V1, const TColgp_Array1OfPnt2d& thePntsU1V1,
const TColgp_Array1OfPnt2d& thePntsU2V2, const TColgp_Array1OfPnt2d& thePntsU2V2,
@ -646,12 +630,10 @@ void ApproxInt_KnotTools::BuildKnots(const TColgp_Array1OfPnt& thePntsXYZ,
std::cout << i << " : " << theKnots(i) << std::endl; std::cout << i << " : " << theKnots(i) << std::endl;
} }
#endif #endif
} }
//=======================================================================
//function : MaxParamRatio //=================================================================================================
//purpose :
//=======================================================================
static Standard_Real MaxParamRatio(const math_Vector& thePars) static Standard_Real MaxParamRatio(const math_Vector& thePars)
{ {
Standard_Integer i; Standard_Integer i;
@ -667,17 +649,15 @@ static Standard_Real MaxParamRatio(const math_Vector& thePars)
} }
return aMaxRatio; return aMaxRatio;
} }
//=======================================================================
//function : DefineParType //=================================================================================================
//purpose :
//======================================================================= Approx_ParametrizationType ApproxInt_KnotTools::DefineParType(const Handle(IntPatch_WLine)& theWL,
Approx_ParametrizationType ApproxInt_KnotTools::DefineParType( const Standard_Integer theFpar,
const Handle(IntPatch_WLine)& theWL, const Standard_Integer theLpar,
const Standard_Integer theFpar, const Standard_Integer theLpar,
const Standard_Boolean theApproxXYZ, const Standard_Boolean theApproxXYZ,
const Standard_Boolean theApproxU1V1, const Standard_Boolean theApproxU1V1,
const Standard_Boolean theApproxU2V2 const Standard_Boolean theApproxU2V2)
)
{ {
if (theLpar - theFpar == 1) if (theLpar - theFpar == 1)
return Approx_IsoParametric; return Approx_IsoParametric;
@ -685,8 +665,21 @@ Approx_ParametrizationType ApproxInt_KnotTools::DefineParType(
const Standard_Integer nbp3d = theApproxXYZ ? 1 : 0, const Standard_Integer nbp3d = theApproxXYZ ? 1 : 0,
nbp2d = (theApproxU1V1 ? 1 : 0) + (theApproxU2V2 ? 1 : 0); nbp2d = (theApproxU1V1 ? 1 : 0) + (theApproxU2V2 ? 1 : 0);
GeomInt_TheMultiLineOfWLApprox aTestLine(theWL, nbp3d, nbp2d, theApproxU1V1, theApproxU2V2, GeomInt_TheMultiLineOfWLApprox aTestLine(theWL,
0., 0., 0., 0., 0., 0., 0., theApproxU1V1, theFpar, theLpar); nbp3d,
nbp2d,
theApproxU1V1,
theApproxU2V2,
0.,
0.,
0.,
0.,
0.,
0.,
0.,
theApproxU1V1,
theFpar,
theLpar);
TColgp_Array1OfPnt aTabPnt3d(1, Max(1, nbp3d)); TColgp_Array1OfPnt aTabPnt3d(1, Max(1, nbp3d));
TColgp_Array1OfPnt2d aTabPnt2d(1, Max(1, nbp2d)); TColgp_Array1OfPnt2d aTabPnt2d(1, Max(1, nbp2d));
@ -698,9 +691,12 @@ Approx_ParametrizationType ApproxInt_KnotTools::DefineParType(
for (i = theFpar; i <= theLpar; ++i) for (i = theFpar; i <= theLpar; ++i)
{ {
if (nbp3d != 0 && nbp2d != 0) aTestLine.Value(i, aTabPnt3d, aTabPnt2d); if (nbp3d != 0 && nbp2d != 0)
else if (nbp2d != 0) aTestLine.Value(i, aTabPnt2d); aTestLine.Value(i, aTabPnt3d, aTabPnt2d);
else if (nbp3d != 0) aTestLine.Value(i, aTabPnt3d); else if (nbp2d != 0)
aTestLine.Value(i, aTabPnt2d);
else if (nbp3d != 0)
aTestLine.Value(i, aTabPnt3d);
// //
if (nbp3d > 0) if (nbp3d > 0)
{ {
@ -773,8 +769,7 @@ Approx_ParametrizationType ApproxInt_KnotTools::DefineParType(
Standard_Real aMaxCurv = 0.; Standard_Real aMaxCurv = 0.;
BuildCurvature(aCoords, aDim, aPars, aCurv, aMaxCurv); BuildCurvature(aCoords, aDim, aPars, aCurv, aMaxCurv);
if (aMaxCurv < Precision::PConfusion() if (aMaxCurv < Precision::PConfusion() || Precision::IsPositiveInfinite(aMaxCurv))
|| Precision::IsPositiveInfinite(aMaxCurv))
{ {
// Linear case // Linear case
return aParType; return aParType;

41
src/ApproxInt/ApproxInt_KnotTools.hxx
View File

@ -14,20 +14,20 @@
#ifndef _ApproxInt_KnotTools_HeaderFile #ifndef _ApproxInt_KnotTools_HeaderFile
#define _ApproxInt_KnotTools_HeaderFile #define _ApproxInt_KnotTools_HeaderFile
#include <Standard_DefineAlloc.hxx>
#include <Standard_Macro.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <NCollection_Sequence.hxx>
#include <NCollection_List.hxx>
#include <math_Vector.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <NCollection_LocalArray.hxx>
#include <NCollection_Vector.hxx>
#include <Approx_ParametrizationType.hxx> #include <Approx_ParametrizationType.hxx>
#include <NCollection_List.hxx>
#include <NCollection_LocalArray.hxx>
#include <NCollection_Sequence.hxx>
#include <NCollection_Vector.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Macro.hxx>
#include <Standard_Real.hxx>
#include <TColStd_Array1OfReal.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <math_Vector.hxx>
class IntPatch_WLine; class IntPatch_WLine;
@ -35,7 +35,8 @@ class IntPatch_WLine;
// Debug information is also printed when OCCT_DEBUG defined. // Debug information is also printed when OCCT_DEBUG defined.
// #define APPROXINT_KNOTTOOLS_DEBUG // #define APPROXINT_KNOTTOOLS_DEBUG
//! This class intended to build knots sequence on discrete set of points for further approximation into bspline curve. //! This class intended to build knots sequence on discrete set of points for further approximation
//! into bspline curve.
//! //!
//! Short description of algorithm: //! Short description of algorithm:
//! 1) Build discrete curvature on points set. //! 1) Build discrete curvature on points set.
@ -47,7 +48,6 @@ class IntPatch_WLine;
class ApproxInt_KnotTools class ApproxInt_KnotTools
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! Main function to build optimal knot sequence. //! Main function to build optimal knot sequence.
@ -72,23 +72,22 @@ public:
NCollection_Vector<Standard_Integer>& theKnots); NCollection_Vector<Standard_Integer>& theKnots);
//! Builds discrete curvature //! Builds discrete curvature
Standard_EXPORT static void BuildCurvature( Standard_EXPORT static void BuildCurvature(const NCollection_LocalArray<Standard_Real>& theCoords,
const NCollection_LocalArray<Standard_Real>& theCoords,
const Standard_Integer theDim, const Standard_Integer theDim,
const math_Vector& thePars, const math_Vector& thePars,
TColStd_Array1OfReal& theCurv, TColStd_Array1OfReal& theCurv,
Standard_Real& theMaxCurv); Standard_Real& theMaxCurv);
//! Defines preferable parametrization type for theWL //! Defines preferable parametrization type for theWL
Standard_EXPORT static Approx_ParametrizationType DefineParType(const Handle(IntPatch_WLine)& theWL, Standard_EXPORT static Approx_ParametrizationType DefineParType(
const Standard_Integer theFpar, const Standard_Integer theLpar, const Handle(IntPatch_WLine)& theWL,
const Standard_Integer theFpar,
const Standard_Integer theLpar,
const Standard_Boolean theApproxXYZ, const Standard_Boolean theApproxXYZ,
const Standard_Boolean theApproxU1V1, const Standard_Boolean theApproxU1V1,
const Standard_Boolean theApproxU2V2); const Standard_Boolean theApproxU2V2);
private: private:
//! Compute indices of knots: //! Compute indices of knots:
//! //!
//! I: Build discrete curvature in points set, //! I: Build discrete curvature in points set,

157
src/ApproxInt/ApproxInt_MultiLineTool.lxx
View File

@ -23,99 +23,151 @@
#include <Approx_Status.hxx> #include <Approx_Status.hxx>
//================================================================================ //=================================================================================================
inline Standard_Integer ApproxInt_MultiLineTool::NbP2d(const TheMultiLine& ML) {
inline Standard_Integer ApproxInt_MultiLineTool::NbP2d(const TheMultiLine& ML)
{
return (ML.NbP2d()); return (ML.NbP2d());
} }
//--------------------------------------------------------------------------------
inline Standard_Integer ApproxInt_MultiLineTool::NbP3d(const TheMultiLine& ML) { //=================================================================================================
inline Standard_Integer ApproxInt_MultiLineTool::NbP3d(const TheMultiLine& ML)
{
return (ML.NbP3d()); return (ML.NbP3d());
} }
//--------------------------------------------------------------------------------
inline Standard_Integer ApproxInt_MultiLineTool::FirstPoint(const TheMultiLine& ML) { //=================================================================================================
inline Standard_Integer ApproxInt_MultiLineTool::FirstPoint(const TheMultiLine& ML)
{
return (ML.FirstPoint()); return (ML.FirstPoint());
} }
//--------------------------------------------------------------------------------
inline Standard_Integer ApproxInt_MultiLineTool::LastPoint(const TheMultiLine& ML) { //=================================================================================================
inline Standard_Integer ApproxInt_MultiLineTool::LastPoint(const TheMultiLine& ML)
{
return (ML.LastPoint()); return (ML.LastPoint());
} }
//--------------------------------------------------------------------------------
inline void ApproxInt_MultiLineTool::Value( const TheMultiLine& ML //=================================================================================================
,const Standard_Integer Index
,TColgp_Array1OfPnt& TabPnt) { inline void ApproxInt_MultiLineTool::Value(const TheMultiLine& ML,
const Standard_Integer Index,
TColgp_Array1OfPnt& TabPnt)
{
ML.Value(Index, TabPnt); ML.Value(Index, TabPnt);
} }
//--------------------------------------------------------------------------------
inline void ApproxInt_MultiLineTool::Value( const TheMultiLine& ML //=================================================================================================
,const Standard_Integer Index
,TColgp_Array1OfPnt2d& TabPnt2d) { inline void ApproxInt_MultiLineTool::Value(const TheMultiLine& ML,
const Standard_Integer Index,
TColgp_Array1OfPnt2d& TabPnt2d)
{
ML.Value(Index, TabPnt2d); ML.Value(Index, TabPnt2d);
} }
//--------------------------------------------------------------------------------
inline void ApproxInt_MultiLineTool::Value( const TheMultiLine& ML //=================================================================================================
,const Standard_Integer Index
,TColgp_Array1OfPnt& TabPnt inline void ApproxInt_MultiLineTool::Value(const TheMultiLine& ML,
,TColgp_Array1OfPnt2d& TabPnt2d) { const Standard_Integer Index,
TColgp_Array1OfPnt& TabPnt,
TColgp_Array1OfPnt2d& TabPnt2d)
{
ML.Value(Index, TabPnt, TabPnt2d); ML.Value(Index, TabPnt, TabPnt2d);
} }
//--------------------------------------------------------------------------------
inline Standard_Boolean ApproxInt_MultiLineTool::Tangency( const TheMultiLine& ML //=================================================================================================
,const Standard_Integer Index
,TColgp_Array1OfVec& TabVec) { inline Standard_Boolean ApproxInt_MultiLineTool::Tangency(const TheMultiLine& ML,
const Standard_Integer Index,
TColgp_Array1OfVec& TabVec)
{
return (ML.Tangency(Index, TabVec)); return (ML.Tangency(Index, TabVec));
} }
//--------------------------------------------------------------------------------
inline Standard_Boolean ApproxInt_MultiLineTool::Tangency( const TheMultiLine& ML //=================================================================================================
,const Standard_Integer Index
,TColgp_Array1OfVec2d& TabVec2d) { inline Standard_Boolean ApproxInt_MultiLineTool::Tangency(const TheMultiLine& ML,
const Standard_Integer Index,
TColgp_Array1OfVec2d& TabVec2d)
{
return (ML.Tangency(Index, TabVec2d)); return (ML.Tangency(Index, TabVec2d));
} }
//--------------------------------------------------------------------------------
inline Standard_Boolean ApproxInt_MultiLineTool::Tangency( const TheMultiLine& ML //=================================================================================================
,const Standard_Integer Index
,TColgp_Array1OfVec& TabVec inline Standard_Boolean ApproxInt_MultiLineTool::Tangency(const TheMultiLine& ML,
,TColgp_Array1OfVec2d& TabVec2d) { const Standard_Integer Index,
TColgp_Array1OfVec& TabVec,
TColgp_Array1OfVec2d& TabVec2d)
{
return (ML.Tangency(Index, TabVec, TabVec2d)); return (ML.Tangency(Index, TabVec, TabVec2d));
} }
//-------------------------------------------------------------------------------- //=================================================================================================
inline Standard_Boolean ApproxInt_MultiLineTool::Curvature(const TheMultiLine& // ML inline Standard_Boolean ApproxInt_MultiLineTool::Curvature(const TheMultiLine& // ML
,const Standard_Integer //Index ,
,TColgp_Array1OfVec& ) { //TabVec const Standard_Integer // Index
,
TColgp_Array1OfVec&)
{ // TabVec
return Standard_False; return Standard_False;
} }
//--------------------------------------------------------------------------------
//=================================================================================================
inline Standard_Boolean ApproxInt_MultiLineTool::Curvature(const TheMultiLine& // ML inline Standard_Boolean ApproxInt_MultiLineTool::Curvature(const TheMultiLine& // ML
,const Standard_Integer //Index ,
,TColgp_Array1OfVec2d& ) { //TabVec2d const Standard_Integer // Index
,
TColgp_Array1OfVec2d&)
{ // TabVec2d
return Standard_False; return Standard_False;
} }
//--------------------------------------------------------------------------------
//=================================================================================================
inline Standard_Boolean ApproxInt_MultiLineTool::Curvature(const TheMultiLine& // ML inline Standard_Boolean ApproxInt_MultiLineTool::Curvature(const TheMultiLine& // ML
,const Standard_Integer //Index ,
,TColgp_Array1OfVec& //TabVec const Standard_Integer // Index
,TColgp_Array1OfVec2d& ) { //TabVec2d ,
TColgp_Array1OfVec& // TabVec
,
TColgp_Array1OfVec2d&)
{ // TabVec2d
return Standard_False; return Standard_False;
} }
//--------------------------------------------------------------------------------
inline Approx_Status ApproxInt_MultiLineTool::WhatStatus(const TheMultiLine& ML //=================================================================================================
,const Standard_Integer
,const Standard_Integer) { inline Approx_Status ApproxInt_MultiLineTool::WhatStatus(const TheMultiLine& ML,
const Standard_Integer,
const Standard_Integer)
{
//-- PointsAdded, //-- PointsAdded,
//-- NoPointsAdded, //-- NoPointsAdded,
//-- NoApproximation //-- NoApproximation
//-- Approx_PointsAdded //-- Approx_PointsAdded
return (ML.WhatStatus()); return (ML.WhatStatus());
} }
//--------------------------------------------------------------------------------
//=================================================================================================
inline TheMultiLine ApproxInt_MultiLineTool::MakeMLBetween(const TheMultiLine& ML, inline TheMultiLine ApproxInt_MultiLineTool::MakeMLBetween(const TheMultiLine& ML,
const Standard_Integer I1, const Standard_Integer I1,
const Standard_Integer I2, const Standard_Integer I2,
const Standard_Integer NbPMin) { const Standard_Integer NbPMin)
{
return (ML.MakeMLBetween(I1, I2, NbPMin)); return (ML.MakeMLBetween(I1, I2, NbPMin));
} }
//--------------------------------------------------------------------------------
//=================================================================================================
inline Standard_Boolean ApproxInt_MultiLineTool::MakeMLOneMorePoint(const TheMultiLine& ML, inline Standard_Boolean ApproxInt_MultiLineTool::MakeMLOneMorePoint(const TheMultiLine& ML,
const Standard_Integer I1, const Standard_Integer I1,
const Standard_Integer I2, const Standard_Integer I2,
@ -129,4 +181,5 @@ inline void ApproxInt_MultiLineTool::Dump(const TheMultiLine& ML)
{ {
ML.Dump(); ML.Dump();
} }
//================================================================================
//=================================================================================================

10
src/ApproxInt/ApproxInt_SvSurfaces.cxx
View File

@ -12,13 +12,11 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <ApproxInt_SvSurfaces.hxx> #include <ApproxInt_SvSurfaces.hxx>
//======================================================================= //=================================================================================================
// function : ~ApproxInt_SvSurfaces // function : ~ApproxInt_SvSurfaces
// purpose : Destructor // purpose : Destructor
//======================================================================= //=================================================================================================
ApproxInt_SvSurfaces::~ApproxInt_SvSurfaces()
{ ApproxInt_SvSurfaces::~ApproxInt_SvSurfaces() {}
}

46
src/ApproxInt/ApproxInt_SvSurfaces.hxx
View File

@ -36,35 +36,45 @@ class IntSurf_PntOn2S;
//! if myUseSolver = true, input parameters u1, v1, u2, v2 are considered as first approximation of //! if myUseSolver = true, input parameters u1, v1, u2, v2 are considered as first approximation of
//! exact intersection point, then coordinates u1, v1, u2, v2 are refined with help of //! exact intersection point, then coordinates u1, v1, u2, v2 are refined with help of
//! the solver used in intersection algorithm and required values are calculated. //! the solver used in intersection algorithm and required values are calculated.
//! if myUseSolver = false, u1, v1, u2, v2 are considered as "exact" intersection points on two surfaces //! if myUseSolver = false, u1, v1, u2, v2 are considered as "exact" intersection points on two
//! and required values are calculated directly using u1, v1, u2, v2 //! surfaces and required values are calculated directly using u1, v1, u2, v2
class ApproxInt_SvSurfaces class ApproxInt_SvSurfaces
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
ApproxInt_SvSurfaces() : myUseSolver (false) {} ApproxInt_SvSurfaces()
: myUseSolver(false)
{
}
//! returns True if Tg,Tguv1 Tguv2 can be computed. //! returns True if Tg,Tguv1 Tguv2 can be computed.
Standard_EXPORT virtual Standard_Boolean Compute (Standard_Real& u1, Standard_Real& v1, Standard_EXPORT virtual Standard_Boolean Compute(Standard_Real& u1,
Standard_Real& u2, Standard_Real& v2, Standard_Real& v1,
Standard_Real& u2,
Standard_Real& v2,
gp_Pnt& Pt, gp_Pnt& Pt,
gp_Vec& Tg, gp_Vec& Tg,
gp_Vec2d& Tguv1, gp_Vec2d& Tguv1,
gp_Vec2d& Tguv2) = 0; gp_Vec2d& Tguv2) = 0;
Standard_EXPORT virtual void Pnt (const Standard_Real u1, const Standard_Real v1, Standard_EXPORT virtual void Pnt(const Standard_Real u1,
const Standard_Real u2, const Standard_Real v2, const Standard_Real v1,
const Standard_Real u2,
const Standard_Real v2,
gp_Pnt& P) = 0; gp_Pnt& P) = 0;
//! computes point on curve and parameters on the surfaces //! computes point on curve and parameters on the surfaces
Standard_EXPORT virtual Standard_Boolean SeekPoint(const Standard_Real u1, const Standard_Real v1, Standard_EXPORT virtual Standard_Boolean SeekPoint(const Standard_Real u1,
const Standard_Real u2, const Standard_Real v2, const Standard_Real v1,
const Standard_Real u2,
const Standard_Real v2,
IntSurf_PntOn2S& Point) = 0; IntSurf_PntOn2S& Point) = 0;
Standard_EXPORT virtual Standard_Boolean Tangency (const Standard_Real u1, const Standard_Real v1, Standard_EXPORT virtual Standard_Boolean Tangency(const Standard_Real u1,
const Standard_Real u2, const Standard_Real v2, const Standard_Real v1,
const Standard_Real u2,
const Standard_Real v2,
gp_Vec& Tg) = 0; gp_Vec& Tg) = 0;
Standard_EXPORT virtual Standard_Boolean TangencyOnSurf1(const Standard_Real u1, Standard_EXPORT virtual Standard_Boolean TangencyOnSurf1(const Standard_Real u1,
@ -80,20 +90,12 @@ public:
gp_Vec2d& Tg) = 0; gp_Vec2d& Tg) = 0;
Standard_EXPORT virtual ~ApproxInt_SvSurfaces(); Standard_EXPORT virtual ~ApproxInt_SvSurfaces();
void SetUseSolver (const Standard_Boolean theUseSol) void SetUseSolver(const Standard_Boolean theUseSol) { myUseSolver = theUseSol; }
{
myUseSolver = theUseSol;
}
virtual Standard_Boolean GetUseSolver() const virtual Standard_Boolean GetUseSolver() const { return myUseSolver; }
{
return myUseSolver;
}
private: private:
Standard_Boolean myUseSolver; Standard_Boolean myUseSolver;
}; };
#endif // _ApproxInt_SvSurfaces_HeaderFile #endif // _ApproxInt_SvSurfaces_HeaderFile

127
src/DE/DE_ConfigurationContext.cxx
View File

@ -15,9 +15,9 @@
#include <Message.hxx> #include <Message.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
#include <OSD_StreamBuffer.hxx>
#include <OSD_Path.hxx> #include <OSD_Path.hxx>
#include <OSD_Protection.hxx> #include <OSD_Protection.hxx>
#include <OSD_StreamBuffer.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TCollection_HAsciiString.hxx> #include <TCollection_HAsciiString.hxx>
@ -34,10 +34,8 @@ enum DE_ConfigurationContext_KindOfLine
namespace namespace
{ {
//======================================================================= //=================================================================================================
//function : GetLine
//purpose :
//=======================================================================
static Standard_Boolean GetLine(OSD_File& theFile, TCollection_AsciiString& theLine) static Standard_Boolean GetLine(OSD_File& theFile, TCollection_AsciiString& theLine)
{ {
TCollection_AsciiString aBuffer; TCollection_AsciiString aBuffer;
@ -63,10 +61,8 @@ namespace
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
//function : WhatKindOfLine
//purpose :
//=======================================================================
static DE_ConfigurationContext_KindOfLine WhatKindOfLine(const TCollection_AsciiString& theLine, static DE_ConfigurationContext_KindOfLine WhatKindOfLine(const TCollection_AsciiString& theLine,
TCollection_AsciiString& theToken1, TCollection_AsciiString& theToken1,
TCollection_AsciiString& theToken2) TCollection_AsciiString& theToken2)
@ -76,7 +72,8 @@ namespace
TCollection_AsciiString aLine(theLine); TCollection_AsciiString aLine(theLine);
aLine.LeftAdjust(); aLine.LeftAdjust();
aLine.RightAdjust(); aLine.RightAdjust();
if (!aLine.EndsWith(':') && (!aLine.EndsWith(' ') || !aLine.EndsWith('\t') || !aLine.EndsWith('\n'))) if (!aLine.EndsWith(':')
&& (!aLine.EndsWith(' ') || !aLine.EndsWith('\t') || !aLine.EndsWith('\n')))
{ {
aLine.InsertAfter(aLine.Length(), " "); aLine.InsertAfter(aLine.Length(), " ");
} }
@ -97,7 +94,8 @@ namespace
return DE_ConfigurationContext_KindOfLine_Error; return DE_ConfigurationContext_KindOfLine_Error;
} }
for (aPos = aPos2 - 1; aLine.Value(aPos) == '\t' || aLine.Value(aPos) == ' '; aPos--); for (aPos = aPos2 - 1; aLine.Value(aPos) == '\t' || aLine.Value(aPos) == ' '; aPos--)
;
theToken1 = aLine.SubString(aPos1, aPos); theToken1 = aLine.SubString(aPos1, aPos);
if (aPos2 != aLine.Length()) if (aPos2 != aLine.Length())
@ -132,10 +130,8 @@ namespace
return DE_ConfigurationContext_KindOfLine_Resource; return DE_ConfigurationContext_KindOfLine_Resource;
} }
//======================================================================= //=================================================================================================
//function : MakeName
//purpose :
//=======================================================================
static TCollection_AsciiString MakeName(const TCollection_AsciiString& theScope, static TCollection_AsciiString MakeName(const TCollection_AsciiString& theScope,
const TCollection_AsciiString& theParam) const TCollection_AsciiString& theParam)
{ {
@ -147,19 +143,14 @@ namespace
aStr += theParam; aStr += theParam;
return aStr; return aStr;
} }
} } // namespace
//======================================================================= //=================================================================================================
//function : DE_ConfigurationContext
//purpose : DE_ConfigurationContext::DE_ConfigurationContext() {}
//=======================================================================
DE_ConfigurationContext::DE_ConfigurationContext() //=================================================================================================
{}
//=======================================================================
//function : Load
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::Load(const TCollection_AsciiString& theConfiguration) Standard_Boolean DE_ConfigurationContext::Load(const TCollection_AsciiString& theConfiguration)
{ {
OSD_Path aPath = theConfiguration; OSD_Path aPath = theConfiguration;
@ -181,10 +172,8 @@ Standard_Boolean DE_ConfigurationContext::Load(const TCollection_AsciiString& th
return true; return true;
} }
//======================================================================= //=================================================================================================
//function : LoadFile
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::LoadFile(const TCollection_AsciiString& theFile) Standard_Boolean DE_ConfigurationContext::LoadFile(const TCollection_AsciiString& theFile)
{ {
myResource.Clear(); myResource.Clear();
@ -209,10 +198,8 @@ Standard_Boolean DE_ConfigurationContext::LoadFile(const TCollection_AsciiString
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
//function : LoadStr
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::LoadStr(const TCollection_AsciiString& theResource) Standard_Boolean DE_ConfigurationContext::LoadStr(const TCollection_AsciiString& theResource)
{ {
myResource.Clear(); myResource.Clear();
@ -236,10 +223,8 @@ Standard_Boolean DE_ConfigurationContext::LoadStr(const TCollection_AsciiString&
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
//function : IsParamSet
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::IsParamSet(const TCollection_AsciiString& theParam, Standard_Boolean DE_ConfigurationContext::IsParamSet(const TCollection_AsciiString& theParam,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
{ {
@ -247,10 +232,8 @@ Standard_Boolean DE_ConfigurationContext::IsParamSet(const TCollection_AsciiStri
return myResource.IsBound(aResource); return myResource.IsBound(aResource);
} }
//======================================================================= //=================================================================================================
//function : RealVal
//purpose :
//=======================================================================
Standard_Real DE_ConfigurationContext::RealVal(const TCollection_AsciiString& theParam, Standard_Real DE_ConfigurationContext::RealVal(const TCollection_AsciiString& theParam,
const Standard_Real theDefValue, const Standard_Real theDefValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -259,10 +242,8 @@ Standard_Real DE_ConfigurationContext::RealVal(const TCollection_AsciiString& th
return GetReal(theParam, aVal, theScope) ? aVal : theDefValue; return GetReal(theParam, aVal, theScope) ? aVal : theDefValue;
} }
//======================================================================= //=================================================================================================
//function : IntegerVal
//purpose :
//=======================================================================
Standard_Integer DE_ConfigurationContext::IntegerVal(const TCollection_AsciiString& theParam, Standard_Integer DE_ConfigurationContext::IntegerVal(const TCollection_AsciiString& theParam,
const Standard_Integer theDefValue, const Standard_Integer theDefValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -271,10 +252,8 @@ Standard_Integer DE_ConfigurationContext::IntegerVal(const TCollection_AsciiStri
return GetInteger(theParam, aVal, theScope) ? aVal : theDefValue; return GetInteger(theParam, aVal, theScope) ? aVal : theDefValue;
} }
//======================================================================= //=================================================================================================
//function : BooleanVal
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::BooleanVal(const TCollection_AsciiString& theParam, Standard_Boolean DE_ConfigurationContext::BooleanVal(const TCollection_AsciiString& theParam,
const Standard_Boolean theDefValue, const Standard_Boolean theDefValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -283,11 +262,10 @@ Standard_Boolean DE_ConfigurationContext::BooleanVal(const TCollection_AsciiStri
return GetBoolean(theParam, aVal, theScope) ? aVal : theDefValue; return GetBoolean(theParam, aVal, theScope) ? aVal : theDefValue;
} }
//======================================================================= //=================================================================================================
//function : StringVal
//purpose : TCollection_AsciiString DE_ConfigurationContext::StringVal(
//======================================================================= const TCollection_AsciiString& theParam,
TCollection_AsciiString DE_ConfigurationContext::StringVal(const TCollection_AsciiString& theParam,
const TCollection_AsciiString& theDefValue, const TCollection_AsciiString& theDefValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
{ {
@ -295,10 +273,8 @@ TCollection_AsciiString DE_ConfigurationContext::StringVal(const TCollection_Asc
return GetString(theParam, aVal, theScope) ? aVal : theDefValue; return GetString(theParam, aVal, theScope) ? aVal : theDefValue;
} }
//======================================================================= //=================================================================================================
//function : GetReal
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::GetReal(const TCollection_AsciiString& theParam, Standard_Boolean DE_ConfigurationContext::GetReal(const TCollection_AsciiString& theParam,
Standard_Real& theValue, Standard_Real& theValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -316,10 +292,8 @@ Standard_Boolean DE_ConfigurationContext::GetReal(const TCollection_AsciiString&
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
//function : GetInteger
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::GetInteger(const TCollection_AsciiString& theParam, Standard_Boolean DE_ConfigurationContext::GetInteger(const TCollection_AsciiString& theParam,
Standard_Integer& theValue, Standard_Integer& theValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -337,10 +311,8 @@ Standard_Boolean DE_ConfigurationContext::GetInteger(const TCollection_AsciiStri
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
//function : GetBoolean
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::GetBoolean(const TCollection_AsciiString& theParam, Standard_Boolean DE_ConfigurationContext::GetBoolean(const TCollection_AsciiString& theParam,
Standard_Boolean& theValue, Standard_Boolean& theValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -358,10 +330,8 @@ Standard_Boolean DE_ConfigurationContext::GetBoolean(const TCollection_AsciiStri
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
//function : GetString
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::GetString(const TCollection_AsciiString& theParam, Standard_Boolean DE_ConfigurationContext::GetString(const TCollection_AsciiString& theParam,
TCollection_AsciiString& theStr, TCollection_AsciiString& theStr,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
@ -370,11 +340,10 @@ Standard_Boolean DE_ConfigurationContext::GetString(const TCollection_AsciiStrin
return myResource.Find(aResource, theStr); return myResource.Find(aResource, theStr);
} }
//======================================================================= //=================================================================================================
//function : GetStringSeq
//purpose : Standard_Boolean DE_ConfigurationContext::GetStringSeq(
//======================================================================= const TCollection_AsciiString& theParam,
Standard_Boolean DE_ConfigurationContext::GetStringSeq(const TCollection_AsciiString& theParam,
TColStd_ListOfAsciiString& theValue, TColStd_ListOfAsciiString& theValue,
const TCollection_AsciiString& theScope) const const TCollection_AsciiString& theScope) const
{ {
@ -401,10 +370,8 @@ Standard_Boolean DE_ConfigurationContext::GetStringSeq(const TCollection_AsciiSt
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
//function : load
//purpose :
//=======================================================================
Standard_Boolean DE_ConfigurationContext::load(const TCollection_AsciiString& theResourceLine) Standard_Boolean DE_ConfigurationContext::load(const TCollection_AsciiString& theResourceLine)
{ {
if (theResourceLine.IsEmpty()) if (theResourceLine.IsEmpty())

6
src/DE/DE_ConfigurationContext.hxx
View File

@ -135,7 +135,8 @@ public:
//! @param[in] theDefValue value by default if param is not found or has wrong type //! @param[in] theDefValue value by default if param is not found or has wrong type
//! @param[in] theScope base parameter name //! @param[in] theScope base parameter name
//! @return specific type value //! @return specific type value
Standard_EXPORT TCollection_AsciiString StringVal(const TCollection_AsciiString& theParam, Standard_EXPORT TCollection_AsciiString
StringVal(const TCollection_AsciiString& theParam,
const TCollection_AsciiString& theDefValue, const TCollection_AsciiString& theDefValue,
const TCollection_AsciiString& theScope = "") const; const TCollection_AsciiString& theScope = "") const;
@ -144,16 +145,13 @@ public:
Standard_EXPORT const DE_ResourceMap& GetInternalMap() const { return myResource; } Standard_EXPORT const DE_ResourceMap& GetInternalMap() const { return myResource; }
protected: protected:
//! Update the resource with param value from the line //! Update the resource with param value from the line
//! @paramp[in] theResourceLine line contains the parameter //! @paramp[in] theResourceLine line contains the parameter
//! @return true if theResourceLine has loaded correctly //! @return true if theResourceLine has loaded correctly
Standard_Boolean load(const TCollection_AsciiString& theResourceLine); Standard_Boolean load(const TCollection_AsciiString& theResourceLine);
private: private:
DE_ResourceMap myResource; //!< Internal parameters map DE_ResourceMap myResource; //!< Internal parameters map
}; };
#endif // _DE_ConfigurationContext_HeaderFile #endif // _DE_ConfigurationContext_HeaderFile

66
src/DE/DE_ConfigurationNode.cxx
View File

@ -13,9 +13,9 @@
#include <DE_ConfigurationNode.hxx> #include <DE_ConfigurationNode.hxx>
#include <DE_ConfigurationContext.hxx>
#include <DE_Provider.hxx> #include <DE_Provider.hxx>
#include <DE_Wrapper.hxx> #include <DE_Wrapper.hxx>
#include <DE_ConfigurationContext.hxx>
#include <Message.hxx> #include <Message.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
#include <OSD_Path.hxx> #include <OSD_Path.hxx>
@ -23,28 +23,23 @@
IMPLEMENT_STANDARD_RTTIEXT(DE_ConfigurationNode, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(DE_ConfigurationNode, Standard_Transient)
//======================================================================= //=================================================================================================
// function : DE_ConfigurationNode
// purpose : DE_ConfigurationNode::DE_ConfigurationNode()
//======================================================================= : myIsEnabled(Standard_True)
DE_ConfigurationNode::DE_ConfigurationNode() : {
myIsEnabled(Standard_True) }
{}
//=================================================================================================
//=======================================================================
// function : DE_ConfigurationNode
// purpose :
//=======================================================================
DE_ConfigurationNode::DE_ConfigurationNode(const Handle(DE_ConfigurationNode)& theConfigurationNode) DE_ConfigurationNode::DE_ConfigurationNode(const Handle(DE_ConfigurationNode)& theConfigurationNode)
{ {
GlobalParameters = theConfigurationNode->GlobalParameters; GlobalParameters = theConfigurationNode->GlobalParameters;
myIsEnabled = theConfigurationNode->IsEnabled(); myIsEnabled = theConfigurationNode->IsEnabled();
} }
//======================================================================= //=================================================================================================
// function : Load
// purpose :
//=======================================================================
bool DE_ConfigurationNode::Load(const TCollection_AsciiString& theResourcePath) bool DE_ConfigurationNode::Load(const TCollection_AsciiString& theResourcePath)
{ {
Handle(DE_ConfigurationContext) aResource = new DE_ConfigurationContext(); Handle(DE_ConfigurationContext) aResource = new DE_ConfigurationContext();
@ -52,10 +47,8 @@ bool DE_ConfigurationNode::Load(const TCollection_AsciiString& theResourcePath)
return Load(aResource); return Load(aResource);
} }
//======================================================================= //=================================================================================================
// function : Save
// purpose :
//=======================================================================
bool DE_ConfigurationNode::Save(const TCollection_AsciiString& theResourcePath) const bool DE_ConfigurationNode::Save(const TCollection_AsciiString& theResourcePath) const
{ {
OSD_Path aPath = theResourcePath; OSD_Path aPath = theResourcePath;
@ -84,10 +77,8 @@ bool DE_ConfigurationNode::Save(const TCollection_AsciiString& theResourcePath)
return true; return true;
} }
//======================================================================= //=================================================================================================
// function : UpdateLoad
// purpose :
//=======================================================================
bool DE_ConfigurationNode::UpdateLoad(const Standard_Boolean theToImport, bool DE_ConfigurationNode::UpdateLoad(const Standard_Boolean theToImport,
const Standard_Boolean theToKeep) const Standard_Boolean theToKeep)
{ {
@ -96,28 +87,22 @@ bool DE_ConfigurationNode::UpdateLoad(const Standard_Boolean theToImport,
return true; return true;
} }
//======================================================================= //=================================================================================================
// function : IsImportSupported
// purpose :
//=======================================================================
bool DE_ConfigurationNode::IsImportSupported() const bool DE_ConfigurationNode::IsImportSupported() const
{ {
return false; return false;
} }
//======================================================================= //=================================================================================================
// function : IsExportSupported
// purpose :
//=======================================================================
bool DE_ConfigurationNode::IsExportSupported() const bool DE_ConfigurationNode::IsExportSupported() const
{ {
return false; return false;
} }
//======================================================================= //=================================================================================================
// function : CheckForSupport
// purpose :
//=======================================================================
bool DE_ConfigurationNode::CheckExtension(const TCollection_AsciiString& theExtension) const bool DE_ConfigurationNode::CheckExtension(const TCollection_AsciiString& theExtension) const
{ {
TCollection_AsciiString anExtension(theExtension); TCollection_AsciiString anExtension(theExtension);
@ -130,8 +115,7 @@ bool DE_ConfigurationNode::CheckExtension(const TCollection_AsciiString& theExte
anExtension.Remove(1); anExtension.Remove(1);
} }
const TColStd_ListOfAsciiString& anExtensions = GetExtensions(); const TColStd_ListOfAsciiString& anExtensions = GetExtensions();
for (TColStd_ListOfAsciiString::Iterator anIter(anExtensions); for (TColStd_ListOfAsciiString::Iterator anIter(anExtensions); anIter.More(); anIter.Next())
anIter.More(); anIter.Next())
{ {
if (TCollection_AsciiString::IsSameString(anIter.Value(), anExtension, Standard_False)) if (TCollection_AsciiString::IsSameString(anIter.Value(), anExtension, Standard_False))
{ {
@ -141,10 +125,8 @@ bool DE_ConfigurationNode::CheckExtension(const TCollection_AsciiString& theExte
return false; return false;
} }
//======================================================================= //=================================================================================================
// function : CheckForSupport
// purpose :
//=======================================================================
bool DE_ConfigurationNode::CheckContent(const Handle(NCollection_Buffer)& theBuffer) const bool DE_ConfigurationNode::CheckContent(const Handle(NCollection_Buffer)& theBuffer) const
{ {
(void)theBuffer; (void)theBuffer;

25
src/DE/DE_ConfigurationNode.hxx
View File

@ -50,7 +50,6 @@ class DE_ConfigurationNode : public Standard_Transient
{ {
DEFINE_STANDARD_RTTIEXT(DE_ConfigurationNode, Standard_Transient) DEFINE_STANDARD_RTTIEXT(DE_ConfigurationNode, Standard_Transient)
public: public:
//! Initializes all field by default //! Initializes all field by default
Standard_EXPORT DE_ConfigurationNode(); Standard_EXPORT DE_ConfigurationNode();
@ -93,7 +92,6 @@ public:
const Standard_Boolean theToKeep); const Standard_Boolean theToKeep);
public: public:
//! Checks the import supporting //! Checks the import supporting
//! @return Standard_True if import is support //! @return Standard_True if import is support
Standard_EXPORT virtual bool IsImportSupported() const; Standard_EXPORT virtual bool IsImportSupported() const;
@ -125,20 +123,13 @@ public:
Standard_EXPORT virtual bool CheckContent(const Handle(NCollection_Buffer)& theBuffer) const; Standard_EXPORT virtual bool CheckContent(const Handle(NCollection_Buffer)& theBuffer) const;
public: public:
//! Gets the provider loading status //! Gets the provider loading status
//! @return Standard_True if the load is correct //! @return Standard_True if the load is correct
Standard_Boolean IsEnabled() const Standard_Boolean IsEnabled() const { return myIsEnabled; }
{
return myIsEnabled;
}
//! Sets the provider loading status //! Sets the provider loading status
//! @param[in] theIsLoaded input load status //! @param[in] theIsLoaded input load status
void SetEnabled(const Standard_Boolean theIsLoaded) void SetEnabled(const Standard_Boolean theIsLoaded) { myIsEnabled = theIsLoaded; }
{
myIsEnabled = theIsLoaded;
}
//! Custom function to activate commercial DE component. //! Custom function to activate commercial DE component.
//! The input is special sequence of values that described in //! The input is special sequence of values that described in
@ -150,18 +141,18 @@ public:
Standard_EXPORT virtual void CustomActivation(const TColStd_ListOfAsciiString&) {}; Standard_EXPORT virtual void CustomActivation(const TColStd_ListOfAsciiString&) {};
public: public:
//!< Internal parameters for transfer process //!< Internal parameters for transfer process
struct DE_SectionGlobal struct DE_SectionGlobal
{ {
Standard_Real LengthUnit = 1.0; //!< Target Unit (scaling based on MM) for the transfer process, default 1.0 (MM) Standard_Real LengthUnit =
Standard_Real SystemUnit = 1.0; //!< System Unit (scaling based on MM) to be used when initial unit is unknown, default 1.0 (MM) 1.0; //!< Target Unit (scaling based on MM) for the transfer process, default 1.0 (MM)
Standard_Real SystemUnit = 1.0; //!< System Unit (scaling based on MM) to be used when initial
//!< unit is unknown, default 1.0 (MM)
} GlobalParameters; } GlobalParameters;
private: private:
Standard_Boolean
Standard_Boolean myIsEnabled; //!< Flag to use a current provider for Read or Write process via DE_Wrapper myIsEnabled; //!< Flag to use a current provider for Read or Write process via DE_Wrapper
}; };
#endif // _DE_ConfigurationNode_HeaderFile #endif // _DE_ConfigurationNode_HeaderFile

98
src/DE/DE_Provider.cxx
View File

@ -18,25 +18,19 @@
IMPLEMENT_STANDARD_RTTIEXT(DE_Provider, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(DE_Provider, Standard_Transient)
//======================================================================= //=================================================================================================
// function : DE_Provider
// purpose : DE_Provider::DE_Provider() {}
//=======================================================================
DE_Provider::DE_Provider() //=================================================================================================
{}
//=======================================================================
// function : DE_Provider
// purpose :
//=======================================================================
DE_Provider::DE_Provider(const Handle(DE_ConfigurationNode)& theNode) DE_Provider::DE_Provider(const Handle(DE_ConfigurationNode)& theNode)
: myNode(theNode) : myNode(theNode)
{} {
}
//=================================================================================================
//=======================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -46,15 +40,13 @@ Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
(void)theDocument; (void)theDocument;
(void)theWS; (void)theWS;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() <<" doesn't support read operation"; << " doesn't support read operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -64,15 +56,13 @@ Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
(void)theDocument; (void)theDocument;
(void)theWS; (void)theWS;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support write operation"; << " doesn't support write operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -80,15 +70,13 @@ Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
(void)thePath; (void)thePath;
(void)theDocument; (void)theDocument;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support read operation"; << " doesn't support read operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -96,15 +84,13 @@ Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
(void)thePath; (void)thePath;
(void)theDocument; (void)theDocument;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support write operation"; << " doesn't support write operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -114,15 +100,13 @@ Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
(void)theShape; (void)theShape;
(void)theWS; (void)theWS;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support read operation"; << " doesn't support read operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -132,15 +116,13 @@ Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
(void)theShape; (void)theShape;
(void)theWS; (void)theWS;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support write operation"; << " doesn't support write operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -148,15 +130,13 @@ Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
(void)thePath; (void)thePath;
(void)theShape; (void)theShape;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support read operation"; << " doesn't support read operation";
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -164,7 +144,7 @@ Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
(void)thePath; (void)thePath;
(void)theShape; (void)theShape;
(void)theProgress; (void)theProgress;
Message::SendFail() << "Error: provider " << GetFormat() << Message::SendFail() << "Error: provider " << GetFormat() << " " << GetVendor()
" " << GetVendor() << " doesn't support write operation"; << " doesn't support write operation";
return Standard_False; return Standard_False;
} }

38
src/DE/DE_Provider.hxx
View File

@ -44,7 +44,6 @@ public:
DEFINE_STANDARD_RTTIEXT(DE_Provider, Standard_Transient) DEFINE_STANDARD_RTTIEXT(DE_Provider, Standard_Transient)
public: public:
//! Default constructor //! Default constructor
//! Configure translation process with global configuration //! Configure translation process with global configuration
Standard_EXPORT DE_Provider(); Standard_EXPORT DE_Provider();
@ -54,14 +53,14 @@ public:
Standard_EXPORT DE_Provider(const Handle(DE_ConfigurationNode)& theNode); Standard_EXPORT DE_Provider(const Handle(DE_ConfigurationNode)& theNode);
public: public:
//! Reads a CAD file, according internal configuration //! Reads a CAD file, according internal configuration
//! @param[in] thePath path to the import CAD file //! @param[in] thePath path to the import CAD file
//! @param[out] theDocument document to save result //! @param[out] theDocument document to save result
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Read was successful //! @return True if Read was successful
Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Read(
const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -72,7 +71,8 @@ public:
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Write was successful //! @return True if Write was successful
Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Write(
const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -82,7 +82,8 @@ public:
//! @param[out] theDocument document to save result //! @param[out] theDocument document to save result
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Read was successful //! @return True if Read was successful
Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Read(
const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -91,7 +92,8 @@ public:
//! @param[out] theDocument document to export //! @param[out] theDocument document to export
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Write was successful //! @return True if Write was successful
Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Write(
const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -101,7 +103,8 @@ public:
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Read was successful //! @return True if Read was successful
Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Read(
const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -112,7 +115,8 @@ public:
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Write was successful //! @return True if Write was successful
Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Write(
const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -122,7 +126,8 @@ public:
//! @param[out] theShape shape to save result //! @param[out] theShape shape to save result
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Read was successful //! @return True if Read was successful
Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Read(
const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -131,12 +136,12 @@ public:
//! @param[out] theShape shape to export //! @param[out] theShape shape to export
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return True if Write was successful //! @return True if Write was successful
Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT virtual Standard_Boolean Write(
const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
public: public:
//! Gets CAD format name of associated provider //! Gets CAD format name of associated provider
//! @return provider CAD format //! @return provider CAD format
Standard_EXPORT virtual TCollection_AsciiString GetFormat() const = 0; Standard_EXPORT virtual TCollection_AsciiString GetFormat() const = 0;
@ -147,20 +152,13 @@ public:
//! Gets internal configuration node //! Gets internal configuration node
//! @return configuration node object //! @return configuration node object
Handle(DE_ConfigurationNode) GetNode() const Handle(DE_ConfigurationNode) GetNode() const { return myNode; }
{
return myNode;
}
//! Sets internal configuration node //! Sets internal configuration node
//! @param[in] theNode configuration node to set //! @param[in] theNode configuration node to set
void SetNode(const Handle(DE_ConfigurationNode)& theNode) void SetNode(const Handle(DE_ConfigurationNode)& theNode) { myNode = theNode; }
{
myNode = theNode;
}
private: private:
Handle(DE_ConfigurationNode) myNode; //!< Internal configuration for the own format Handle(DE_ConfigurationNode) myNode; //!< Internal configuration for the own format
}; };

578
src/DE/DE_ShapeFixConfigurationNode.cxx
View File

@ -26,146 +26,255 @@ namespace
static const TCollection_AsciiString aScope = "provider"; static const TCollection_AsciiString aScope = "provider";
return aScope; return aScope;
} }
} } // namespace
//=================================================================================================
//=======================================================================
// function : DE_ShapeFixConfigurationNode
// purpose :
//=======================================================================
DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode() DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode()
: DE_ConfigurationNode() : DE_ConfigurationNode()
{} {
}
//======================================================================= //=================================================================================================
// function : DE_ShapeFixConfigurationNode
// purpose : DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode(
//======================================================================= const Handle(DE_ShapeFixConfigurationNode)& theNode)
DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode(const Handle(DE_ShapeFixConfigurationNode)& theNode)
: DE_ConfigurationNode(theNode) : DE_ConfigurationNode(theNode)
{ {
} }
//======================================================================= //=================================================================================================
// function : Load
// purpose :
//=======================================================================
bool DE_ShapeFixConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource) bool DE_ShapeFixConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theResource)
{ {
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing"; TCollection_AsciiString aScope =
THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing";
HealingParameters.Tolerance3d = theResource->RealVal("tolerance3d", HealingParameters.Tolerance3d, aScope); HealingParameters.Tolerance3d =
HealingParameters.MaxTolerance3d = theResource->RealVal("max.tolerance3d", HealingParameters.MaxTolerance3d, aScope); theResource->RealVal("tolerance3d", HealingParameters.Tolerance3d, aScope);
HealingParameters.MinTolerance3d = theResource->RealVal("min.tolerance3d", HealingParameters.MinTolerance3d, aScope); HealingParameters.MaxTolerance3d =
HealingParameters.FixFreeShellMode = (DE_ShapeFixParameters::FixMode) theResource->RealVal("max.tolerance3d", HealingParameters.MaxTolerance3d, aScope);
theResource->IntegerVal("free.shell", (int)HealingParameters.FixFreeShellMode, aScope); HealingParameters.MinTolerance3d =
HealingParameters.FixFreeFaceMode = (DE_ShapeFixParameters::FixMode) theResource->RealVal("min.tolerance3d", HealingParameters.MinTolerance3d, aScope);
theResource->IntegerVal("free.face", (int)HealingParameters.FixFreeFaceMode, aScope); HealingParameters.FixFreeShellMode =
HealingParameters.FixFreeWireMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.shell",
theResource->IntegerVal("free.wire", (int)HealingParameters.FixFreeWireMode, aScope); (int)HealingParameters.FixFreeShellMode,
HealingParameters.FixSameParameterMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("same.parameter", (int)HealingParameters.FixSameParameterMode, aScope); HealingParameters.FixFreeFaceMode =
HealingParameters.FixSolidMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.face",
theResource->IntegerVal("solid", (int)HealingParameters.FixSolidMode, aScope); (int)HealingParameters.FixFreeFaceMode,
HealingParameters.FixShellOrientationMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("shell.orientation", (int)HealingParameters.FixShellOrientationMode, aScope); HealingParameters.FixFreeWireMode =
HealingParameters.CreateOpenSolidMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("free.wire",
theResource->IntegerVal("create.open.solid", (int)HealingParameters.CreateOpenSolidMode, aScope); (int)HealingParameters.FixFreeWireMode,
HealingParameters.FixShellMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("shell", (int)HealingParameters.FixShellMode, aScope); HealingParameters.FixSameParameterMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.FixFaceOrientationMode = (DE_ShapeFixParameters::FixMode) "same.parameter",
theResource->IntegerVal("face.orientation", (int)HealingParameters.FixFaceOrientationMode, aScope); (int)HealingParameters.FixSameParameterMode,
HealingParameters.FixFaceMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("face", (int)HealingParameters.FixFaceMode, aScope); HealingParameters.FixSolidMode =
HealingParameters.FixWireMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("solid",
theResource->IntegerVal("wire", (int)HealingParameters.FixWireMode, aScope); (int)HealingParameters.FixSolidMode,
HealingParameters.FixOrientationMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("orientation", (int)HealingParameters.FixOrientationMode, aScope); HealingParameters.FixShellOrientationMode =
HealingParameters.FixAddNaturalBoundMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
theResource->IntegerVal("add.natural.bound", (int)HealingParameters.FixAddNaturalBoundMode, aScope); "shell.orientation",
HealingParameters.FixMissingSeamMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixShellOrientationMode,
theResource->IntegerVal("missing.seam", (int)HealingParameters.FixMissingSeamMode, aScope); aScope);
HealingParameters.FixSmallAreaWireMode = (DE_ShapeFixParameters::FixMode) HealingParameters.CreateOpenSolidMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
theResource->IntegerVal("small.area.wire", (int)HealingParameters.FixSmallAreaWireMode, aScope); "create.open.solid",
HealingParameters.RemoveSmallAreaFaceMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.CreateOpenSolidMode,
theResource->IntegerVal("remove.small.area.face", (int)HealingParameters.RemoveSmallAreaFaceMode, aScope); aScope);
HealingParameters.FixIntersectingWiresMode = (DE_ShapeFixParameters::FixMode) HealingParameters.FixShellMode =
theResource->IntegerVal("intersecting.wires", (int)HealingParameters.FixIntersectingWiresMode, aScope); (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("shell",
HealingParameters.FixLoopWiresMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixShellMode,
theResource->IntegerVal("loop.wires", (int)HealingParameters.FixLoopWiresMode, aScope); aScope);
HealingParameters.FixSplitFaceMode = (DE_ShapeFixParameters::FixMode) HealingParameters.FixFaceOrientationMode =
theResource->IntegerVal("split.face", (int)HealingParameters.FixSplitFaceMode, aScope); (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.AutoCorrectPrecisionMode = (DE_ShapeFixParameters::FixMode) "face.orientation",
theResource->IntegerVal("auto.correct.precision", (int)HealingParameters.AutoCorrectPrecisionMode, aScope); (int)HealingParameters.FixFaceOrientationMode,
HealingParameters.ModifyTopologyMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("modify.topology", (int)HealingParameters.ModifyTopologyMode, aScope); HealingParameters.FixFaceMode =
HealingParameters.ModifyGeometryMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("face",
theResource->IntegerVal("modify.geometry", (int)HealingParameters.ModifyGeometryMode, aScope); (int)HealingParameters.FixFaceMode,
HealingParameters.ClosedWireMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("closed.wire", (int)HealingParameters.ClosedWireMode, aScope); HealingParameters.FixWireMode =
HealingParameters.PreferencePCurveMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("wire",
theResource->IntegerVal("preference.pcurve", (int)HealingParameters.PreferencePCurveMode, aScope); (int)HealingParameters.FixWireMode,
HealingParameters.FixReorderMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("reorder.edges", (int)HealingParameters.FixReorderMode, aScope); HealingParameters.FixOrientationMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.FixSmallMode = (DE_ShapeFixParameters::FixMode) "orientation",
theResource->IntegerVal("remove.small.edges", (int)HealingParameters.FixSmallMode, aScope); (int)HealingParameters.FixOrientationMode,
HealingParameters.FixConnectedMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("connected.edges", (int)HealingParameters.FixConnectedMode, aScope); HealingParameters.FixAddNaturalBoundMode =
HealingParameters.FixEdgeCurvesMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
theResource->IntegerVal("edge.curves", (int)HealingParameters.FixEdgeCurvesMode, aScope); "add.natural.bound",
HealingParameters.FixDegeneratedMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixAddNaturalBoundMode,
theResource->IntegerVal("add.degenerated.edges", (int)HealingParameters.FixDegeneratedMode, aScope); aScope);
HealingParameters.FixLackingMode = (DE_ShapeFixParameters::FixMode) HealingParameters.FixMissingSeamMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
theResource->IntegerVal("add.lacking.edges", (int)HealingParameters.FixLackingMode, aScope); "missing.seam",
HealingParameters.FixSelfIntersectionMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixMissingSeamMode,
theResource->IntegerVal("selfintersection", (int)HealingParameters.FixSelfIntersectionMode, aScope); aScope);
HealingParameters.RemoveLoopMode = (DE_ShapeFixParameters::FixMode) HealingParameters.FixSmallAreaWireMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
theResource->IntegerVal("remove.loop", (int)HealingParameters.RemoveLoopMode, aScope); "small.area.wire",
HealingParameters.FixReversed2dMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixSmallAreaWireMode,
theResource->IntegerVal("reversed2d", (int)HealingParameters.FixReversed2dMode, aScope); aScope);
HealingParameters.FixRemovePCurveMode = (DE_ShapeFixParameters::FixMode) HealingParameters.RemoveSmallAreaFaceMode =
theResource->IntegerVal("remove.pcurve", (int)HealingParameters.FixRemovePCurveMode, aScope); (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.FixRemoveCurve3dMode = (DE_ShapeFixParameters::FixMode) "remove.small.area.face",
theResource->IntegerVal("remove.curve3d", (int)HealingParameters.FixRemoveCurve3dMode, aScope); (int)HealingParameters.RemoveSmallAreaFaceMode,
HealingParameters.FixAddPCurveMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("add.pcurve", (int)HealingParameters.FixAddPCurveMode, aScope); HealingParameters.FixIntersectingWiresMode =
HealingParameters.FixAddCurve3dMode = (DE_ShapeFixParameters::FixMode) (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
theResource->IntegerVal("add.curve3d", (int)HealingParameters.FixAddCurve3dMode, aScope); "intersecting.wires",
HealingParameters.FixSeamMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixIntersectingWiresMode,
theResource->IntegerVal("correct.order.in.seam", (int)HealingParameters.FixSeamMode, aScope); aScope);
HealingParameters.FixShiftedMode = (DE_ShapeFixParameters::FixMode) HealingParameters.FixLoopWiresMode =
theResource->IntegerVal("shifted", (int)HealingParameters.FixShiftedMode, aScope); (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("loop.wires",
HealingParameters.FixEdgeSameParameterMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixLoopWiresMode,
theResource->IntegerVal("edge.same.parameter", (int)HealingParameters.FixEdgeSameParameterMode, aScope); aScope);
HealingParameters.FixNotchedEdgesMode = (DE_ShapeFixParameters::FixMode) HealingParameters.FixSplitFaceMode =
theResource->IntegerVal("notched.edges", (int)HealingParameters.FixNotchedEdgesMode, aScope); (DE_ShapeFixParameters::FixMode)theResource->IntegerVal("split.face",
HealingParameters.FixTailMode = (DE_ShapeFixParameters::FixMode) (int)HealingParameters.FixSplitFaceMode,
theResource->IntegerVal("tail", (int)HealingParameters.FixTailMode, aScope); aScope);
HealingParameters.MaxTailAngle = (DE_ShapeFixParameters::FixMode) HealingParameters.AutoCorrectPrecisionMode =
theResource->IntegerVal("max.tail.angle", (int)HealingParameters.MaxTailAngle, aScope); (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.MaxTailWidth = (DE_ShapeFixParameters::FixMode) "auto.correct.precision",
theResource->IntegerVal("max.tail.width", (int)HealingParameters.MaxTailWidth, aScope); (int)HealingParameters.AutoCorrectPrecisionMode,
HealingParameters.FixSelfIntersectingEdgeMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("selfintersecting.edge", (int)HealingParameters.FixSelfIntersectingEdgeMode, aScope); HealingParameters.ModifyTopologyMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.FixIntersectingEdgesMode = (DE_ShapeFixParameters::FixMode) "modify.topology",
theResource->IntegerVal("intersecting.edges", (int)HealingParameters.FixIntersectingEdgesMode, aScope); (int)HealingParameters.ModifyTopologyMode,
HealingParameters.FixNonAdjacentIntersectingEdgesMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("nonadjacent.intersecting.edges", (int)HealingParameters.FixNonAdjacentIntersectingEdgesMode, aScope); HealingParameters.ModifyGeometryMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
HealingParameters.FixVertexPositionMode = (DE_ShapeFixParameters::FixMode) "modify.geometry",
theResource->IntegerVal("vertex.position", (int)HealingParameters.FixVertexPositionMode, aScope); (int)HealingParameters.ModifyGeometryMode,
HealingParameters.FixVertexToleranceMode = (DE_ShapeFixParameters::FixMode) aScope);
theResource->IntegerVal("vertex.tolerance", (int)HealingParameters.FixVertexToleranceMode, aScope); HealingParameters.ClosedWireMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("closed.wire",
(int)HealingParameters.ClosedWireMode,
aScope);
HealingParameters.PreferencePCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"preference.pcurve",
(int)HealingParameters.PreferencePCurveMode,
aScope);
HealingParameters.FixReorderMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("reorder.edges",
(int)HealingParameters.FixReorderMode,
aScope);
HealingParameters.FixSmallMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("remove.small.edges",
(int)HealingParameters.FixSmallMode,
aScope);
HealingParameters.FixConnectedMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("connected.edges",
(int)HealingParameters.FixConnectedMode,
aScope);
HealingParameters.FixEdgeCurvesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"edge.curves",
(int)HealingParameters.FixEdgeCurvesMode,
aScope);
HealingParameters.FixDegeneratedMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"add.degenerated.edges",
(int)HealingParameters.FixDegeneratedMode,
aScope);
HealingParameters.FixLackingMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("add.lacking.edges",
(int)HealingParameters.FixLackingMode,
aScope);
HealingParameters.FixSelfIntersectionMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"selfintersection",
(int)HealingParameters.FixSelfIntersectionMode,
aScope);
HealingParameters.RemoveLoopMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("remove.loop",
(int)HealingParameters.RemoveLoopMode,
aScope);
HealingParameters.FixReversed2dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"reversed2d",
(int)HealingParameters.FixReversed2dMode,
aScope);
HealingParameters.FixRemovePCurveMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"remove.pcurve",
(int)HealingParameters.FixRemovePCurveMode,
aScope);
HealingParameters.FixRemoveCurve3dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"remove.curve3d",
(int)HealingParameters.FixRemoveCurve3dMode,
aScope);
HealingParameters.FixAddPCurveMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("add.pcurve",
(int)HealingParameters.FixAddPCurveMode,
aScope);
HealingParameters.FixAddCurve3dMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"add.curve3d",
(int)HealingParameters.FixAddCurve3dMode,
aScope);
HealingParameters.FixSeamMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("correct.order.in.seam",
(int)HealingParameters.FixSeamMode,
aScope);
HealingParameters.FixShiftedMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("shifted",
(int)HealingParameters.FixShiftedMode,
aScope);
HealingParameters.FixEdgeSameParameterMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"edge.same.parameter",
(int)HealingParameters.FixEdgeSameParameterMode,
aScope);
HealingParameters.FixNotchedEdgesMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"notched.edges",
(int)HealingParameters.FixNotchedEdgesMode,
aScope);
HealingParameters.FixTailMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("tail",
(int)HealingParameters.FixTailMode,
aScope);
HealingParameters.MaxTailAngle =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("max.tail.angle",
(int)HealingParameters.MaxTailAngle,
aScope);
HealingParameters.MaxTailWidth =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal("max.tail.width",
(int)HealingParameters.MaxTailWidth,
aScope);
HealingParameters.FixSelfIntersectingEdgeMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"selfintersecting.edge",
(int)HealingParameters.FixSelfIntersectingEdgeMode,
aScope);
HealingParameters.FixIntersectingEdgesMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"intersecting.edges",
(int)HealingParameters.FixIntersectingEdgesMode,
aScope);
HealingParameters.FixNonAdjacentIntersectingEdgesMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"nonadjacent.intersecting.edges",
(int)HealingParameters.FixNonAdjacentIntersectingEdgesMode,
aScope);
HealingParameters.FixVertexPositionMode = (DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"vertex.position",
(int)HealingParameters.FixVertexPositionMode,
aScope);
HealingParameters.FixVertexToleranceMode =
(DE_ShapeFixParameters::FixMode)theResource->IntegerVal(
"vertex.tolerance",
(int)HealingParameters.FixVertexToleranceMode,
aScope);
return true; return true;
} }
//======================================================================= //=================================================================================================
// function : Save
// purpose :
//=======================================================================
TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const
{ {
TCollection_AsciiString aResult; TCollection_AsciiString aResult;
TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing"; TCollection_AsciiString aScope =
THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor() + ".healing";
aResult += "!\n"; aResult += "!\n";
aResult += "!Shape healing parameters:\n"; aResult += "!Shape healing parameters:\n";
@ -191,301 +300,376 @@ TCollection_AsciiString DE_ShapeFixConfigurationNode::Save() const
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Shell for ShapeFix_Shape\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Shell for ShapeFix_Shape\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "free.shell :\t " + (int)HealingParameters.FixFreeShellMode + "\n"; aResult += aScope + "free.shell :\t " + (int)HealingParameters.FixFreeShellMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Face for ShapeFix_Shape\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Face for ShapeFix_Shape\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "free.face :\t " + (int)HealingParameters.FixFreeFaceMode + "\n"; aResult += aScope + "free.face :\t " + (int)HealingParameters.FixFreeFaceMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Wire for ShapeFix_Shape\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Wire for ShapeFix_Shape\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "free.wire :\t " + (int)HealingParameters.FixFreeWireMode + "\n"; aResult += aScope + "free.wire :\t " + (int)HealingParameters.FixFreeWireMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying ShapeFix::SameParameter after all fixes\n"; aResult += "!Defines the mode for applying ShapeFix::SameParameter after all fixes\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "same.parameter :\t " + (int)HealingParameters.FixSameParameterMode + "\n"; aResult += aScope + "same.parameter :\t " + (int)HealingParameters.FixSameParameterMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Solid\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Solid\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "solid :\t " + (int)HealingParameters.FixSolidMode + "\n"; aResult += aScope + "solid :\t " + (int)HealingParameters.FixSolidMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying analysis and fixes of orientation of shells in the solid\n"; aResult +=
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "!Defines the mode for applying analysis and fixes of orientation of shells in the solid\n";
aResult += aScope + "shell.orientation :\t " + (int)HealingParameters.FixShellOrientationMode + "\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult +=
aScope + "shell.orientation :\t " + (int)HealingParameters.FixShellOrientationMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for creation of solids. If operation is executed then solids are created from open shells "; aResult += "!Defines the mode for creation of solids. If operation is executed then solids are "
"created from open shells ";
aResult += "else solids are created from closed shells only\n"; aResult += "else solids are created from closed shells only\n";
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "create.open.solid :\t " + (int)HealingParameters.CreateOpenSolidMode + "\n"; aResult += aScope + "create.open.solid :\t " + (int)HealingParameters.CreateOpenSolidMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Shell for ShapeFix_Solid\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Shell for ShapeFix_Solid\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "shell :\t " + (int)HealingParameters.FixShellMode + "\n"; aResult += aScope + "shell :\t " + (int)HealingParameters.FixShellMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying analysis and fixes of orientation of faces in the shell\n"; aResult +=
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "!Defines the mode for applying analysis and fixes of orientation of faces in the shell\n";
aResult += aScope + "face.orientation :\t " + (int)HealingParameters.FixFaceOrientationMode + "\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult +=
aScope + "face.orientation :\t " + (int)HealingParameters.FixFaceOrientationMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Face\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Face\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "face :\t " + (int)HealingParameters.FixFaceMode + "\n"; aResult += aScope + "face :\t " + (int)HealingParameters.FixFaceMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying fixes of ShapeFix_Wire\n"; aResult += "!Defines the mode for applying fixes of ShapeFix_Wire\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "wire :\t " + (int)HealingParameters.FixWireMode + "\n"; aResult += aScope + "wire :\t " + (int)HealingParameters.FixWireMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying a fix for the orientation of faces in the shell\n"; aResult += "!Defines the mode for applying a fix for the orientation of faces in the shell\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "orientation :\t " + (int)HealingParameters.FixOrientationMode + "\n"; aResult += aScope + "orientation :\t " + (int)HealingParameters.FixOrientationMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the add natural bound mode. If operation is executed then natural boundary is added on faces that miss them\n"; aResult += "!Defines the add natural bound mode. If operation is executed then natural boundary "
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "is added on faces that miss them\n";
aResult += aScope + "add.natural.bound :\t " + (int)HealingParameters.FixAddNaturalBoundMode + "\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult +=
aScope + "add.natural.bound :\t " + (int)HealingParameters.FixAddNaturalBoundMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the fix missing seam mode (tries to insert seam is missed)\n"; aResult += "!Defines the fix missing seam mode (tries to insert seam is missed)\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "missing.seam :\t " + (int)HealingParameters.FixMissingSeamMode + "\n"; aResult += aScope + "missing.seam :\t " + (int)HealingParameters.FixMissingSeamMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the fix small area wire mode (drops small wires)\n"; aResult += "!Defines the fix small area wire mode (drops small wires)\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "small.area.wire :\t " + (int)HealingParameters.FixSmallAreaWireMode + "\n"; aResult += aScope + "small.area.wire :\t " + (int)HealingParameters.FixSmallAreaWireMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the remove face with small area (drops faces with small outer wires)\n"; aResult += "!Defines the remove face with small area (drops faces with small outer wires)\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "remove.small.area.face :\t " + (int)HealingParameters.RemoveSmallAreaFaceMode + "\n"; "\"Fix\"(1)\n";
aResult +=
aScope + "remove.small.area.face :\t " + (int)HealingParameters.RemoveSmallAreaFaceMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the fix intersecting wires mode in ShapeFix_Face\n"; aResult += "!Defines the fix intersecting wires mode in ShapeFix_Face\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "intersecting.wires :\t " + (int)HealingParameters.FixIntersectingWiresMode + "\n"; "\"Fix\"(1)\n";
aResult +=
aScope + "intersecting.wires :\t " + (int)HealingParameters.FixIntersectingWiresMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the fix loop wires mode in ShapeFix_Face\n"; aResult += "!Defines the fix loop wires mode in ShapeFix_Face\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "loop.wires :\t " + (int)HealingParameters.FixLoopWiresMode + "\n"; aResult += aScope + "loop.wires :\t " + (int)HealingParameters.FixLoopWiresMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the fix split face mode in ShapeFix_Face\n"; aResult += "!Defines the fix split face mode in ShapeFix_Face\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "split.face :\t " + (int)HealingParameters.FixSplitFaceMode + "\n"; aResult += aScope + "split.face :\t " + (int)HealingParameters.FixSplitFaceMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the auto-correct precision mode in ShapeFix_Face\n"; aResult += "!Defines the auto-correct precision mode in ShapeFix_Face\n";
aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult +=
aResult += aScope + "auto.correct.precision :\t " + (int)HealingParameters.AutoCorrectPrecisionMode + "\n"; "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n";
aResult +=
aScope + "auto.correct.precision :\t " + (int)HealingParameters.AutoCorrectPrecisionMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to modify topology of the wire during fixing (adding/removing edges etc.)\n"; aResult += "!Defines the mode allowed to modify topology of the wire during fixing "
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "(adding/removing edges etc.)\n";
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "modify.topology :\t " + (int)HealingParameters.ModifyTopologyMode + "\n"; aResult += aScope + "modify.topology :\t " + (int)HealingParameters.ModifyTopologyMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to modify geometry of the edges and vertices\n"; aResult += "!Defines the mode allowed to modify geometry of the edges and vertices\n";
aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult +=
"!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n";
aResult += aScope + "modify.geometry :\t " + (int)HealingParameters.ModifyGeometryMode + "\n"; aResult += aScope + "modify.geometry :\t " + (int)HealingParameters.ModifyGeometryMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to defines whether the wire is to be closed (by calling methods like FixDegenerated() "; aResult += "!Defines the mode allowed to defines whether the wire is to be closed (by calling "
"methods like FixDegenerated() ";
aResult += "!and FixConnected() for lastand first edges\n"; aResult += "!and FixConnected() for lastand first edges\n";
aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult +=
"!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n";
aResult += aScope + "closed.wire :\t " + (int)HealingParameters.ClosedWireMode + "\n"; aResult += aScope + "closed.wire :\t " + (int)HealingParameters.ClosedWireMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to defines the 2d representation of the wire is preferable over 3d one "; aResult += "!Defines the mode allowed to defines the 2d representation of the wire is preferable "
"over 3d one ";
aResult += "(in the case of ambiguity in FixEdgeCurves)\n"; aResult += "(in the case of ambiguity in FixEdgeCurves)\n";
aResult += "!and FixConnected() for lastand first edges\n"; aResult += "!and FixConnected() for lastand first edges\n";
aResult += "!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult +=
"!Default value: \"Fix\"(1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n";
aResult += aScope + "preference.pcurve :\t " + (int)HealingParameters.PreferencePCurveMode + "\n"; aResult += aScope + "preference.pcurve :\t " + (int)HealingParameters.PreferencePCurveMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to reorder edges in the wire\n"; aResult += "!Defines the mode allowed to reorder edges in the wire\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "reorder.edges :\t " + (int)HealingParameters.FixReorderMode + "\n"; aResult += aScope + "reorder.edges :\t " + (int)HealingParameters.FixReorderMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to remove small edges\n"; aResult += "!Defines the mode allowed to remove small edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "remove.small.edges :\t " + (int)HealingParameters.FixSmallMode + "\n"; aResult += aScope + "remove.small.edges :\t " + (int)HealingParameters.FixSmallMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix connecting edges in the wire\n"; aResult += "!Defines the mode for fix connecting edges in the wire\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "connected.edges :\t " + (int)HealingParameters.FixConnectedMode + "\n"; aResult += aScope + "connected.edges :\t " + (int)HealingParameters.FixConnectedMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix edges (3Dcurves and 2D curves)\n"; aResult += "!Defines the mode for fix edges (3Dcurves and 2D curves)\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "edge.curves :\t " + (int)HealingParameters.FixEdgeCurvesMode + "\n"; aResult += aScope + "edge.curves :\t " + (int)HealingParameters.FixEdgeCurvesMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for add degenerated edges\n"; aResult += "!Defines the mode for add degenerated edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "add.degenerated.edges :\t " + (int)HealingParameters.FixDegeneratedMode + "\n"; "\"Fix\"(1)\n";
aResult +=
aScope + "add.degenerated.edges :\t " + (int)HealingParameters.FixDegeneratedMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for add lacking edges\n"; aResult += "!Defines the mode for add lacking edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "add.lacking.edges :\t " + (int)HealingParameters.FixLackingMode + "\n"; aResult += aScope + "add.lacking.edges :\t " + (int)HealingParameters.FixLackingMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix selfintersection edges\n"; aResult += "!Defines the mode for fix selfintersection edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "selfintersection :\t " + (int)HealingParameters.FixSelfIntersectionMode + "\n"; "\"Fix\"(1)\n";
aResult +=
aScope + "selfintersection :\t " + (int)HealingParameters.FixSelfIntersectionMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to remove loop\n"; aResult += "!Defines the mode allowed to remove loop\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "remove.loop :\t " + (int)HealingParameters.RemoveLoopMode + "\n"; aResult += aScope + "remove.loop :\t " + (int)HealingParameters.RemoveLoopMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to fix edge if pcurve is directed opposite to 3d curve\n"; aResult += "!Defines the mode allowed to fix edge if pcurve is directed opposite to 3d curve\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "reversed2d :\t " + (int)HealingParameters.FixReversed2dMode + "\n"; aResult += aScope + "reversed2d :\t " + (int)HealingParameters.FixReversed2dMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to remove the pcurve(s) of the edge if it does not match the vertices\n"; aResult += "!Defines the mode allowed to remove the pcurve(s) of the edge if it does not match "
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "the vertices\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "remove.pcurve :\t " + (int)HealingParameters.FixRemovePCurveMode + "\n"; aResult += aScope + "remove.pcurve :\t " + (int)HealingParameters.FixRemovePCurveMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to remove 3d curve of the edge if it does not match the vertices\n"; aResult +=
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "!Defines the mode allowed to remove 3d curve of the edge if it does not match the vertices\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "remove.curve3d :\t " + (int)HealingParameters.FixRemoveCurve3dMode + "\n"; aResult += aScope + "remove.curve3d :\t " + (int)HealingParameters.FixRemoveCurve3dMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to add pcurve(s) of the edge if missing (by projecting 3d curve)\n"; aResult +=
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "!Defines the mode allowed to add pcurve(s) of the edge if missing (by projecting 3d curve)\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "add.pcurve :\t " + (int)HealingParameters.FixAddPCurveMode + "\n"; aResult += aScope + "add.pcurve :\t " + (int)HealingParameters.FixAddPCurveMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to build 3d curve of the edge if missing\n"; aResult += "!Defines the mode allowed to build 3d curve of the edge if missing\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "add.curve3d :\t " + (int)HealingParameters.FixAddCurve3dMode + "\n"; aResult += aScope + "add.curve3d :\t " + (int)HealingParameters.FixAddCurve3dMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to correct order of pcurves in the seam edge depends on its orientation\n"; aResult += "!Defines the mode allowed to correct order of pcurves in the seam edge depends on "
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "its orientation\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "correct.order.in.seam :\t " + (int)HealingParameters.FixSeamMode + "\n"; aResult += aScope + "correct.order.in.seam :\t " + (int)HealingParameters.FixSeamMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode allowed to shifts wrong 2D curves back, ensuring that the 2D curves of the edges in the wire are connected\n"; aResult += "!Defines the mode allowed to shifts wrong 2D curves back, ensuring that the 2D "
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "curves of the edges in the wire are connected\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "shifted :\t " + (int)HealingParameters.FixShiftedMode + "\n"; aResult += aScope + "shifted :\t " + (int)HealingParameters.FixShiftedMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying EdgeSameParameter\n"; aResult += "!Defines the mode for applying EdgeSameParameter\n";
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "edge.same.parameter :\t " + (int)HealingParameters.FixEdgeSameParameterMode + "\n"; "\"Fix\"(1)\n";
aResult +=
aScope + "edge.same.parameter :\t " + (int)HealingParameters.FixEdgeSameParameterMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix notched edges\n"; aResult += "!Defines the mode for fix notched edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "notched.edges :\t " + (int)HealingParameters.FixNotchedEdgesMode + "\n"; aResult += aScope + "notched.edges :\t " + (int)HealingParameters.FixNotchedEdgesMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix tail in wire\n"; aResult += "!Defines the mode for fix tail in wire\n";
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "tail :\t " + (int)HealingParameters.FixTailMode + "\n"; aResult += aScope + "tail :\t " + (int)HealingParameters.FixTailMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for max angle of the tails\n"; aResult += "!Defines the mode for max angle of the tails\n";
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "max.tail.angle :\t " + (int)HealingParameters.MaxTailAngle + "\n"; aResult += aScope + "max.tail.angle :\t " + (int)HealingParameters.MaxTailAngle + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for max tail width\n"; aResult += "!Defines the mode for max tail width\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "max.tail.width :\t " + (int)HealingParameters.MaxTailWidth + "\n"; aResult += aScope + "max.tail.width :\t " + (int)HealingParameters.MaxTailWidth + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix selfintersecting of edge\n"; aResult += "!Defines the mode for fix selfintersecting of edge\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "selfintersecting.edge :\t " + (int)HealingParameters.FixSelfIntersectingEdgeMode + "\n"; "\"Fix\"(1)\n";
aResult += aScope + "selfintersecting.edge :\t "
+ (int)HealingParameters.FixSelfIntersectingEdgeMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix intersecting edges\n"; aResult += "!Defines the mode for fix intersecting edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "intersecting.edges :\t " + (int)HealingParameters.FixIntersectingEdgesMode + "\n"; "\"Fix\"(1)\n";
aResult +=
aScope + "intersecting.edges :\t " + (int)HealingParameters.FixIntersectingEdgesMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for fix non adjacent intersecting edges\n"; aResult += "!Defines the mode for fix non adjacent intersecting edges\n";
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
aResult += aScope + "nonadjacent.intersecting.edges :\t " + (int)HealingParameters.FixNonAdjacentIntersectingEdgesMode + "\n"; "\"Fix\"(1)\n";
aResult += aScope + "nonadjacent.intersecting.edges :\t "
+ (int)HealingParameters.FixNonAdjacentIntersectingEdgesMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for applying ShapeFix::FixVertexPosition before all fixes\n"; aResult += "!Defines the mode for applying ShapeFix::FixVertexPosition before all fixes\n";
aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; aResult += "!Default value: \"NotFix\"(0). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult += aScope + "vertex.position :\t " + (int)HealingParameters.FixVertexPositionMode + "\n"; aResult += aScope + "vertex.position :\t " + (int)HealingParameters.FixVertexPositionMode + "\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!\n"; aResult += "!\n";
aResult += "!Defines the mode for increases the tolerances of the edge vertices to comprise "; aResult += "!Defines the mode for increases the tolerances of the edge vertices to comprise ";
aResult += "!the ends of 3d curve and pcurve on the given face (first method) or all pcurves stored in an edge (second one)\n"; aResult += "!the ends of 3d curve and pcurve on the given face (first method) or all pcurves "
aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), \"Fix\"(1)\n"; "stored in an edge (second one)\n";
aResult += aScope + "vertex.tolerance :\t " + (int)HealingParameters.FixVertexToleranceMode + "\n"; aResult += "!Default value: \"FixOrNot\"(-1). Available values: \"FixOrNot\"(-1), \"NotFix\"(0), "
"\"Fix\"(1)\n";
aResult +=
aScope + "vertex.tolerance :\t " + (int)HealingParameters.FixVertexToleranceMode + "\n";
aResult += "!\n"; aResult += "!\n";
return aResult; return aResult;

9
src/DE/DE_ShapeFixConfigurationNode.hxx
View File

@ -25,27 +25,26 @@ class DE_ShapeFixConfigurationNode : public DE_ConfigurationNode
{ {
DEFINE_STANDARD_RTTIEXT(DE_ShapeFixConfigurationNode, DE_ConfigurationNode) DEFINE_STANDARD_RTTIEXT(DE_ShapeFixConfigurationNode, DE_ConfigurationNode)
public: public:
//! Initializes all field by default //! Initializes all field by default
Standard_EXPORT DE_ShapeFixConfigurationNode(); Standard_EXPORT DE_ShapeFixConfigurationNode();
//! Copies values of all fields //! Copies values of all fields
//! @param[in] theConfigurationNode object to copy //! @param[in] theConfigurationNode object to copy
Standard_EXPORT DE_ShapeFixConfigurationNode(const Handle(DE_ShapeFixConfigurationNode)& theConfigurationNode); Standard_EXPORT DE_ShapeFixConfigurationNode(
const Handle(DE_ShapeFixConfigurationNode)& theConfigurationNode);
//! Updates values according the resource //! Updates values according the resource
//! @param[in] theResource input resource to use //! @param[in] theResource input resource to use
//! @return True if Load was successful //! @return True if Load was successful
Standard_EXPORT virtual bool Load(const Handle(DE_ConfigurationContext)& theResource) Standard_OVERRIDE; Standard_EXPORT virtual bool Load(const Handle(DE_ConfigurationContext)& theResource)
Standard_OVERRIDE;
//! Writes configuration to the string //! Writes configuration to the string
//! @return result resource string //! @return result resource string
Standard_EXPORT virtual TCollection_AsciiString Save() const Standard_OVERRIDE; Standard_EXPORT virtual TCollection_AsciiString Save() const Standard_OVERRIDE;
public: public:
DE_ShapeFixParameters HealingParameters; //!< Shape healing parameters DE_ShapeFixParameters HealingParameters; //!< Shape healing parameters
}; };
#endif // _DE_ShapeFixConfigurationNode_HeaderFile #endif // _DE_ShapeFixConfigurationNode_HeaderFile

261
src/DE/DE_Wrapper.cxx
View File

@ -19,8 +19,8 @@
#include <Message_ProgressRange.hxx> #include <Message_ProgressRange.hxx>
#include <NCollection_Buffer.hxx> #include <NCollection_Buffer.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
#include <OSD_Path.hxx>
#include <OSD_FileSystem.hxx> #include <OSD_FileSystem.hxx>
#include <OSD_Path.hxx>
#include <OSD_Protection.hxx> #include <OSD_Protection.hxx>
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
@ -40,20 +40,17 @@ namespace
static Handle(DE_Wrapper) aConf = new DE_Wrapper(); static Handle(DE_Wrapper) aConf = new DE_Wrapper();
return aConf; return aConf;
} }
} } // namespace
//=================================================================================================
//=======================================================================
// function : DE_Wrapper
// purpose :
//=======================================================================
DE_Wrapper::DE_Wrapper() DE_Wrapper::DE_Wrapper()
: myKeepUpdates(Standard_False) : myKeepUpdates(Standard_False)
{} {
}
//=================================================================================================
//=======================================================================
// function : DE_Wrapper
// purpose :
//=======================================================================
DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper) DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
: DE_Wrapper() : DE_Wrapper()
{ {
@ -62,11 +59,11 @@ DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
return; return;
} }
GlobalParameters = theWrapper->GlobalParameters; GlobalParameters = theWrapper->GlobalParameters;
for (DE_ConfigurationFormatMap::Iterator aFormatIter(theWrapper->Nodes()); for (DE_ConfigurationFormatMap::Iterator aFormatIter(theWrapper->Nodes()); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
Bind(aVendorIter.Value()); Bind(aVendorIter.Value());
} }
@ -74,19 +71,15 @@ DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
theWrapper->myKeepUpdates = myKeepUpdates; theWrapper->myKeepUpdates = myKeepUpdates;
} }
//======================================================================= //=================================================================================================
// function : GlobalWrapper
// purpose :
//=======================================================================
const Handle(DE_Wrapper)& DE_Wrapper::GlobalWrapper() const Handle(DE_Wrapper)& DE_Wrapper::GlobalWrapper()
{ {
return THE_GLOBAL_CONFIGURATION(); return THE_GLOBAL_CONFIGURATION();
} }
//======================================================================= //=================================================================================================
// function : SetGlobalWrapper
// purpose :
//=======================================================================
void DE_Wrapper::SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper) void DE_Wrapper::SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper)
{ {
if (!theWrapper.IsNull()) if (!theWrapper.IsNull())
@ -95,20 +88,16 @@ void DE_Wrapper::SetGlobalWrapper(const Handle(DE_Wrapper)& theWrapper)
} }
} }
//======================================================================= //=================================================================================================
// function : GlobalLoadMutex
// purpose :
//=======================================================================
Standard_Mutex& DE_Wrapper::GlobalLoadMutex() Standard_Mutex& DE_Wrapper::GlobalLoadMutex()
{ {
static Standard_Mutex THE_GLOBAL_LOAD_MUTEX; static Standard_Mutex THE_GLOBAL_LOAD_MUTEX;
return THE_GLOBAL_LOAD_MUTEX; return THE_GLOBAL_LOAD_MUTEX;
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -130,10 +119,8 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
return aProvider->Read(thePath, theDocument, theWS, theProgress); return aProvider->Read(thePath, theDocument, theWS, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -155,10 +142,8 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
return aProvider->Write(thePath, theDocument, theWS, theProgress); return aProvider->Write(thePath, theDocument, theWS, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -175,10 +160,8 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
return aProvider->Read(thePath, theDocument, theProgress); return aProvider->Read(thePath, theDocument, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -195,10 +178,8 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
return aProvider->Write(thePath, theDocument, theProgress); return aProvider->Write(thePath, theDocument, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -216,10 +197,8 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
return aProvider->Read(thePath, theShape, theWS, theProgress); return aProvider->Read(thePath, theShape, theWS, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
@ -237,10 +216,8 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
return aProvider->Write(thePath, theShape, theWS, theProgress); return aProvider->Write(thePath, theShape, theWS, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Read
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -254,10 +231,8 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
return aProvider->Read(thePath, theShape, theProgress); return aProvider->Read(thePath, theShape, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Write
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress) const Message_ProgressRange& theProgress)
@ -270,10 +245,8 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
return aProvider->Write(thePath, theShape, theProgress); return aProvider->Write(thePath, theShape, theProgress);
} }
//======================================================================= //=================================================================================================
// function : Load
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Load(const TCollection_AsciiString& theResource, Standard_Boolean DE_Wrapper::Load(const TCollection_AsciiString& theResource,
const Standard_Boolean theIsRecursive) const Standard_Boolean theIsRecursive)
{ {
@ -282,22 +255,24 @@ Standard_Boolean DE_Wrapper::Load(const TCollection_AsciiString& theResource,
return Load(aResource, theIsRecursive); return Load(aResource, theIsRecursive);
} }
//======================================================================= //=================================================================================================
// function : Load
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Load(const Handle(DE_ConfigurationContext)& theResource, Standard_Boolean DE_Wrapper::Load(const Handle(DE_ConfigurationContext)& theResource,
const Standard_Boolean theIsRecursive) const Standard_Boolean theIsRecursive)
{ {
GlobalParameters.LengthUnit = theResource->RealVal("general.length.unit", GlobalParameters.LengthUnit, THE_CONFIGURATION_SCOPE()); GlobalParameters.LengthUnit = theResource->RealVal("general.length.unit",
GlobalParameters.SystemUnit = theResource->RealVal("general.system.unit", GlobalParameters.SystemUnit, THE_CONFIGURATION_SCOPE()); GlobalParameters.LengthUnit,
THE_CONFIGURATION_SCOPE());
GlobalParameters.SystemUnit = theResource->RealVal("general.system.unit",
GlobalParameters.SystemUnit,
THE_CONFIGURATION_SCOPE());
if (theIsRecursive) if (theIsRecursive)
{ {
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
aVendorIter.Value()->Load(theResource); aVendorIter.Value()->Load(theResource);
} }
@ -307,10 +282,8 @@ Standard_Boolean DE_Wrapper::Load(const Handle(DE_ConfigurationContext)& theReso
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : Save
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Save(const TCollection_AsciiString& theResourcePath, Standard_Boolean DE_Wrapper::Save(const TCollection_AsciiString& theResourcePath,
const Standard_Boolean theIsRecursive, const Standard_Boolean theIsRecursive,
const TColStd_ListOfAsciiString& theFormats, const TColStd_ListOfAsciiString& theFormats,
@ -340,10 +313,8 @@ Standard_Boolean DE_Wrapper::Save(const TCollection_AsciiString& theResourcePath
return Standard_True; return Standard_True;
} }
//======================================================================= //=================================================================================================
// function : Save
// purpose :
//=======================================================================
TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive, TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
const TColStd_ListOfAsciiString& theFormats, const TColStd_ListOfAsciiString& theFormats,
const TColStd_ListOfAsciiString& theVendors) const TColStd_ListOfAsciiString& theVendors)
@ -359,13 +330,13 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
aResult += "!*****************************************************************************\n"; aResult += "!*****************************************************************************\n";
aResult += "!DE_Wrapper\n"; aResult += "!DE_Wrapper\n";
aResult += "!Priority vendor list. For every CAD format set indexed list of vendors\n"; aResult += "!Priority vendor list. For every CAD format set indexed list of vendors\n";
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
const TCollection_AsciiString& aFormat = aFormatIter.Key(); const TCollection_AsciiString& aFormat = aFormatIter.Key();
aResult += THE_CONFIGURATION_SCOPE() + '.' + "priority" + '.' + aFormat + " :\t "; aResult += THE_CONFIGURATION_SCOPE() + '.' + "priority" + '.' + aFormat + " :\t ";
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
const TCollection_AsciiString& aVendorName = aVendorIter.Value()->GetVendor(); const TCollection_AsciiString& aVendorName = aVendorIter.Value()->GetVendor();
aResult += aVendorName + " "; aResult += aVendorName + " ";
@ -374,20 +345,22 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
} }
aResult += "!Global parameters. Used for all providers\n"; aResult += "!Global parameters. Used for all providers\n";
aResult += "!Length scale unit value. Should be more than 0. Default value: 1.0(MM)\n"; aResult += "!Length scale unit value. Should be more than 0. Default value: 1.0(MM)\n";
aResult += THE_CONFIGURATION_SCOPE() + ".general.length.unit :\t " + GlobalParameters.LengthUnit + "\n"; aResult +=
THE_CONFIGURATION_SCOPE() + ".general.length.unit :\t " + GlobalParameters.LengthUnit + "\n";
aResult += "!System unit value. Should be more than 0. Default value: 1.0(MM)\n"; aResult += "!System unit value. Should be more than 0. Default value: 1.0(MM)\n";
aResult += THE_CONFIGURATION_SCOPE() + ".general.system.unit :\t " + GlobalParameters.SystemUnit + "\n"; aResult +=
THE_CONFIGURATION_SCOPE() + ".general.system.unit :\t " + GlobalParameters.SystemUnit + "\n";
if (theIsRecursive) if (theIsRecursive)
{ {
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
if (!theFormats.IsEmpty() && !theFormats.Contains(aFormatIter.Key())) if (!theFormats.IsEmpty() && !theFormats.Contains(aFormatIter.Key()))
{ {
continue; continue;
} }
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
if (!theVendors.IsEmpty() && !theVendors.Contains(aVendorIter.Key())) if (!theVendors.IsEmpty() && !theVendors.Contains(aVendorIter.Key()))
{ {
@ -403,10 +376,8 @@ TCollection_AsciiString DE_Wrapper::Save(const Standard_Boolean theIsRecursive,
return aResult; return aResult;
} }
//======================================================================= //=================================================================================================
// function : Bind
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Bind(const Handle(DE_ConfigurationNode)& theNode) Standard_Boolean DE_Wrapper::Bind(const Handle(DE_ConfigurationNode)& theNode)
{ {
if (theNode.IsNull()) if (theNode.IsNull())
@ -424,10 +395,8 @@ Standard_Boolean DE_Wrapper::Bind(const Handle(DE_ConfigurationNode)& theNode)
return aVendorMap->Add(aVendorName, theNode) > 0; return aVendorMap->Add(aVendorName, theNode) > 0;
} }
//======================================================================= //=================================================================================================
// function : UnBind
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::UnBind(const Handle(DE_ConfigurationNode)& theNode) Standard_Boolean DE_Wrapper::UnBind(const Handle(DE_ConfigurationNode)& theNode)
{ {
if (theNode.IsNull()) if (theNode.IsNull())
@ -446,10 +415,8 @@ Standard_Boolean DE_Wrapper::UnBind(const Handle(DE_ConfigurationNode)& theNode)
return aVendorMap->Size() != aPrevSize; return aVendorMap->Size() != aPrevSize;
} }
//======================================================================= //=================================================================================================
// function : Find
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::Find(const TCollection_AsciiString& theFormat, Standard_Boolean DE_Wrapper::Find(const TCollection_AsciiString& theFormat,
const TCollection_AsciiString& theVendor, const TCollection_AsciiString& theVendor,
Handle(DE_ConfigurationNode)& theNode) const Handle(DE_ConfigurationNode)& theNode) const
@ -458,10 +425,8 @@ Standard_Boolean DE_Wrapper::Find(const TCollection_AsciiString& theFormat,
return aVendorMap != nullptr && aVendorMap->FindFromKey(theVendor, theNode); return aVendorMap != nullptr && aVendorMap->FindFromKey(theVendor, theNode);
} }
//======================================================================= //=================================================================================================
// function : ChangePriority
// purpose :
//=======================================================================
void DE_Wrapper::ChangePriority(const TCollection_AsciiString& theFormat, void DE_Wrapper::ChangePriority(const TCollection_AsciiString& theFormat,
const TColStd_ListOfAsciiString& theVendorPriority, const TColStd_ListOfAsciiString& theVendorPriority,
const Standard_Boolean theToDisable) const Standard_Boolean theToDisable)
@ -473,8 +438,8 @@ void DE_Wrapper::ChangePriority(const TCollection_AsciiString& theFormat,
} }
DE_ConfigurationVendorMap aNewVendorMap; DE_ConfigurationVendorMap aNewVendorMap;
// Sets according to the input priority // Sets according to the input priority
for (TColStd_ListOfAsciiString::Iterator aPriorIter(theVendorPriority); for (TColStd_ListOfAsciiString::Iterator aPriorIter(theVendorPriority); aPriorIter.More();
aPriorIter.More(); aPriorIter.Next()) aPriorIter.Next())
{ {
const TCollection_AsciiString& aVendorName = aPriorIter.Value(); const TCollection_AsciiString& aVendorName = aPriorIter.Value();
Handle(DE_ConfigurationNode) aNode; Handle(DE_ConfigurationNode) aNode;
@ -485,8 +450,8 @@ void DE_Wrapper::ChangePriority(const TCollection_AsciiString& theFormat,
} }
} }
// Sets not used elements // Sets not used elements
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aVendorMap); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aVendorMap); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
const TCollection_AsciiString& aVendorName = aVendorIter.Key(); const TCollection_AsciiString& aVendorName = aVendorIter.Key();
if (!theVendorPriority.Contains(aVendorName)) if (!theVendorPriority.Contains(aVendorName))
@ -502,42 +467,34 @@ void DE_Wrapper::ChangePriority(const TCollection_AsciiString& theFormat,
myConfiguration.Bind(theFormat, aNewVendorMap); myConfiguration.Bind(theFormat, aNewVendorMap);
} }
//======================================================================= //=================================================================================================
// function : ChangePriority
// purpose :
//=======================================================================
void DE_Wrapper::ChangePriority(const TColStd_ListOfAsciiString& theVendorPriority, void DE_Wrapper::ChangePriority(const TColStd_ListOfAsciiString& theVendorPriority,
const Standard_Boolean theToDisable) const Standard_Boolean theToDisable)
{ {
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
ChangePriority(aFormatIter.Key(), theVendorPriority, theToDisable); ChangePriority(aFormatIter.Key(), theVendorPriority, theToDisable);
} }
} }
//======================================================================= //=================================================================================================
// function : Nodes
// purpose :
//=======================================================================
const DE_ConfigurationFormatMap& DE_Wrapper::Nodes() const const DE_ConfigurationFormatMap& DE_Wrapper::Nodes() const
{ {
return myConfiguration; return myConfiguration;
} }
//======================================================================= //=================================================================================================
// function : Copy
// purpose :
//=======================================================================
Handle(DE_Wrapper) DE_Wrapper::Copy() const Handle(DE_Wrapper) DE_Wrapper::Copy() const
{ {
return new DE_Wrapper(*this); return new DE_Wrapper(*this);
} }
//======================================================================= //=================================================================================================
// function : FindProvider
// purpose :
//=======================================================================
Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath, Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath,
const Standard_Boolean theToImport, const Standard_Boolean theToImport,
Handle(DE_Provider)& theProvider) const Handle(DE_Provider)& theProvider) const
@ -546,7 +503,8 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
if (theToImport) if (theToImport)
{ {
const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem(); const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
std::shared_ptr<std::istream> aStream = aFileSystem->OpenIStream(thePath, std::ios::in | std::ios::binary); std::shared_ptr<std::istream> aStream =
aFileSystem->OpenIStream(thePath, std::ios::in | std::ios::binary);
if (aStream.get() != nullptr) if (aStream.get() != nullptr)
{ {
aBuffer = new NCollection_Buffer(NCollection_BaseAllocator::CommonBaseAllocator(), 2048); aBuffer = new NCollection_Buffer(NCollection_BaseAllocator::CommonBaseAllocator(), 2048);
@ -556,19 +514,18 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
} }
OSD_Path aPath(thePath); OSD_Path aPath(thePath);
const TCollection_AsciiString anExtr = aPath.Extension(); const TCollection_AsciiString anExtr = aPath.Extension();
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
const Handle(DE_ConfigurationNode)& aNode = aVendorIter.Value(); const Handle(DE_ConfigurationNode)& aNode = aVendorIter.Value();
if (aNode->IsEnabled() && if (aNode->IsEnabled()
((theToImport && aNode->IsImportSupported()) || && ((theToImport && aNode->IsImportSupported())
(!theToImport && aNode->IsExportSupported())) && || (!theToImport && aNode->IsExportSupported()))
(aNode->CheckExtension(anExtr) || && (aNode->CheckExtension(anExtr) || (theToImport && aNode->CheckContent(aBuffer)))
(theToImport && aNode->CheckContent(aBuffer))) && && aNode->UpdateLoad(theToImport, myKeepUpdates))
aNode->UpdateLoad(theToImport, myKeepUpdates))
{ {
theProvider = aNode->BuildProvider(); theProvider = aNode->BuildProvider();
aNode->GlobalParameters = GlobalParameters; aNode->GlobalParameters = GlobalParameters;
@ -579,17 +536,15 @@ Standard_Boolean DE_Wrapper::FindProvider(const TCollection_AsciiString& thePath
return Standard_False; return Standard_False;
} }
//======================================================================= //=================================================================================================
// function : UpdateLoad
// purpose :
//=======================================================================
Standard_EXPORT void DE_Wrapper::UpdateLoad(const Standard_Boolean theToForceUpdate) const Standard_EXPORT void DE_Wrapper::UpdateLoad(const Standard_Boolean theToForceUpdate) const
{ {
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); for (DE_ConfigurationVendorMap::Iterator aVendorIter(aFormatIter.Value()); aVendorIter.More();
aVendorIter.More(); aVendorIter.Next()) aVendorIter.Next())
{ {
const Handle(DE_ConfigurationNode)& aNode = aVendorIter.Value(); const Handle(DE_ConfigurationNode)& aNode = aVendorIter.Value();
aNode->UpdateLoad(Standard_True, Standard_True); aNode->UpdateLoad(Standard_True, Standard_True);
@ -601,15 +556,13 @@ Standard_EXPORT void DE_Wrapper::UpdateLoad(const Standard_Boolean theToForceUpd
} }
} }
//======================================================================= //=================================================================================================
// function : sort
// purpose :
//=======================================================================
void DE_Wrapper::sort(const Handle(DE_ConfigurationContext)& theResource) void DE_Wrapper::sort(const Handle(DE_ConfigurationContext)& theResource)
{ {
const TCollection_AsciiString aScope(THE_CONFIGURATION_SCOPE() + '.' + "priority"); const TCollection_AsciiString aScope(THE_CONFIGURATION_SCOPE() + '.' + "priority");
for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); for (DE_ConfigurationFormatMap::Iterator aFormatIter(myConfiguration); aFormatIter.More();
aFormatIter.More(); aFormatIter.Next()) aFormatIter.Next())
{ {
TColStd_ListOfAsciiString aVendorPriority; TColStd_ListOfAsciiString aVendorPriority;
if (!theResource->GetStringSeq(aFormatIter.Key(), aVendorPriority, aScope)) if (!theResource->GetStringSeq(aFormatIter.Key(), aVendorPriority, aScope))

51
src/DE/DE_Wrapper.hxx
View File

@ -25,8 +25,10 @@ class TopoDS_Shape;
class XSControl_WorkSession; class XSControl_WorkSession;
class TDocStd_Document; class TDocStd_Document;
typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(DE_ConfigurationNode)> DE_ConfigurationVendorMap; typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(DE_ConfigurationNode)>
typedef NCollection_DataMap<TCollection_AsciiString, DE_ConfigurationVendorMap> DE_ConfigurationFormatMap; DE_ConfigurationVendorMap;
typedef NCollection_DataMap<TCollection_AsciiString, DE_ConfigurationVendorMap>
DE_ConfigurationFormatMap;
//! The main class for working with CAD file exchange. //! The main class for working with CAD file exchange.
//! Loads and Saves special CAD transfer property. //! Loads and Saves special CAD transfer property.
@ -54,7 +56,6 @@ class DE_Wrapper : public Standard_Transient
DEFINE_STANDARD_RTTIEXT(DE_Wrapper, Standard_Transient) DEFINE_STANDARD_RTTIEXT(DE_Wrapper, Standard_Transient)
public: public:
//! Initializes all field by default //! Initializes all field by default
Standard_EXPORT DE_Wrapper(); Standard_EXPORT DE_Wrapper();
@ -74,14 +75,14 @@ public:
Standard_EXPORT static Standard_Mutex& GlobalLoadMutex(); Standard_EXPORT static Standard_Mutex& GlobalLoadMutex();
public: public:
//! Reads a CAD file, according internal configuration //! Reads a CAD file, according internal configuration
//! @param[in] thePath path to the import CAD file //! @param[in] thePath path to the import CAD file
//! @param[out] theDocument document to save result //! @param[out] theDocument document to save result
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Read operation has ended correctly //! @return true if Read operation has ended correctly
Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Read(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -92,7 +93,8 @@ public:
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Write operation has ended correctly //! @return true if Write operation has ended correctly
Standard_EXPORT Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Write(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -102,7 +104,8 @@ public:
//! @param[out] theDocument document to save result //! @param[out] theDocument document to save result
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Read operation has ended correctly //! @return true if Read operation has ended correctly
Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Read(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -111,7 +114,8 @@ public:
//! @param[out] theDocument document to export //! @param[out] theDocument document to export
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Write operation has ended correctly //! @return true if Write operation has ended correctly
Standard_EXPORT Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Write(const TCollection_AsciiString& thePath,
const Handle(TDocStd_Document)& theDocument, const Handle(TDocStd_Document)& theDocument,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -121,7 +125,8 @@ public:
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Read operation has ended correctly //! @return true if Read operation has ended correctly
Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Read(const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -132,7 +137,8 @@ public:
//! @param[in] theWS current work session //! @param[in] theWS current work session
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Write operation has ended correctly //! @return true if Write operation has ended correctly
Standard_EXPORT Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Write(const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
Handle(XSControl_WorkSession)& theWS, Handle(XSControl_WorkSession)& theWS,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -142,7 +148,8 @@ public:
//! @param[out] theShape shape to save result //! @param[out] theShape shape to save result
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Read operation has ended correctly //! @return true if Read operation has ended correctly
Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Read(const TCollection_AsciiString& thePath,
TopoDS_Shape& theShape, TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
@ -151,12 +158,12 @@ public:
//! @param[out] theShape shape to export //! @param[out] theShape shape to export
//! @param[in] theProgress progress indicator //! @param[in] theProgress progress indicator
//! @return true if Write operation has ended correctly //! @return true if Write operation has ended correctly
Standard_EXPORT Standard_Boolean Write(const TCollection_AsciiString& thePath, Standard_EXPORT Standard_Boolean
Write(const TCollection_AsciiString& thePath,
const TopoDS_Shape& theShape, const TopoDS_Shape& theShape,
const Message_ProgressRange& theProgress = Message_ProgressRange()); const Message_ProgressRange& theProgress = Message_ProgressRange());
public: public:
//! Updates values according the resource file //! Updates values according the resource file
//! @param[in] theResource file path to resource or resource value //! @param[in] theResource file path to resource or resource value
//! @param[in] theIsRecursive flag to update all nodes //! @param[in] theIsRecursive flag to update all nodes
@ -177,7 +184,8 @@ public:
//! @param[in] theFormats list of formats to save. If empty, saves all available //! @param[in] theFormats list of formats to save. If empty, saves all available
//! @param[in] theVendors list of providers to save. If empty, saves all available //! @param[in] theVendors list of providers to save. If empty, saves all available
//! @return true if the Configuration has saved correctly //! @return true if the Configuration has saved correctly
Standard_EXPORT Standard_Boolean Save(const TCollection_AsciiString& theResourcePath, Standard_EXPORT Standard_Boolean
Save(const TCollection_AsciiString& theResourcePath,
const Standard_Boolean theIsRecursive = Standard_True, const Standard_Boolean theIsRecursive = Standard_True,
const TColStd_ListOfAsciiString& theFormats = TColStd_ListOfAsciiString(), const TColStd_ListOfAsciiString& theFormats = TColStd_ListOfAsciiString(),
const TColStd_ListOfAsciiString& theVendors = TColStd_ListOfAsciiString()); const TColStd_ListOfAsciiString& theVendors = TColStd_ListOfAsciiString());
@ -187,7 +195,8 @@ public:
//! @param[in] theFormats list of formats to save. If empty, saves all available //! @param[in] theFormats list of formats to save. If empty, saves all available
//! @param[in] theVendors list of providers to save. If empty, saves all available //! @param[in] theVendors list of providers to save. If empty, saves all available
//! @return result resource string //! @return result resource string
Standard_EXPORT TCollection_AsciiString Save(const Standard_Boolean theIsRecursive = Standard_True, Standard_EXPORT TCollection_AsciiString
Save(const Standard_Boolean theIsRecursive = Standard_True,
const TColStd_ListOfAsciiString& theFormats = TColStd_ListOfAsciiString(), const TColStd_ListOfAsciiString& theFormats = TColStd_ListOfAsciiString(),
const TColStd_ListOfAsciiString& theVendors = TColStd_ListOfAsciiString()); const TColStd_ListOfAsciiString& theVendors = TColStd_ListOfAsciiString());
@ -235,7 +244,8 @@ public:
Handle(DE_Provider)& theProvider) const; Handle(DE_Provider)& theProvider) const;
//! Updates all registered nodes, all changes will be saved in nodes //! Updates all registered nodes, all changes will be saved in nodes
//! @param[in] theToForceUpdate flag that turns on/of nodes, according to updated ability to import/export //! @param[in] theToForceUpdate flag that turns on/of nodes, according to updated ability to
//! import/export
Standard_EXPORT void UpdateLoad(const Standard_Boolean theToForceUpdate = Standard_False) const; Standard_EXPORT void UpdateLoad(const Standard_Boolean theToForceUpdate = Standard_False) const;
//! Gets flag that keeps changes on configuration nodes which are being updated, false by default //! Gets flag that keeps changes on configuration nodes which are being updated, false by default
@ -253,7 +263,6 @@ public:
Standard_EXPORT virtual Handle(DE_Wrapper) Copy() const; Standard_EXPORT virtual Handle(DE_Wrapper) Copy() const;
protected: protected:
//! Sorts the vendors according to the priority to work //! Sorts the vendors according to the priority to work
//! Formats omitted from the resource are not modified //! Formats omitted from the resource are not modified
//! Vendors omitted from the format scope are disabled //! Vendors omitted from the format scope are disabled
@ -261,12 +270,12 @@ protected:
void sort(const Handle(DE_ConfigurationContext)& theResource); void sort(const Handle(DE_ConfigurationContext)& theResource);
public: public:
DE_ConfigurationNode::DE_SectionGlobal
DE_ConfigurationNode::DE_SectionGlobal GlobalParameters; //!< Internal parameters for the all translators GlobalParameters; //!< Internal parameters for the all translators
private: private:
Standard_Boolean
Standard_Boolean myKeepUpdates; //!< Flag that keeps changes on configuration nodes which are being updated myKeepUpdates; //!< Flag that keeps changes on configuration nodes which are being updated
DE_ConfigurationFormatMap myConfiguration; //!< Internal map of formats DE_ConfigurationFormatMap myConfiguration; //!< Internal map of formats
}; };