mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
8c37cf59fa
test bugs modalg_7 bug22821 failed on fillet shape with 5-th edge.
Experimentally has been found that reducing of parameter
ChFi3d_Builder::tolesp for this task solves the issue.
So, as soluton it is proposed to link parameter toleps with parameter range of
spine curve. So, production coefficient has been set to pass all tests and
2 teset was extended: tests/blend/complex/A6, tests/bugs/modalg_7/bug22821
first has been extended to test different scaling factors,
second has been extended to make fillet on all edges from 12.
Additionally:
- fixed misusage of tolesp in contexts where tolerance of point in 3d is excepted;
In some context usage of tol_esp is irrelevant, because its essentiality - tolerance of the parameter on the 3d curve.
So, in such context it has been replaced with new parameter tol3d (with fix value 1.0e-4).
Get rid of tolapp3d duplication constant - tol_3d
- tolesp = 5.0e-5 * (umax - umin)
- tolesp replaced by tolpoint2d/tolpoint3d in several classes.
Blend_Walking
BRepBlend_SurfRstLineBuilder
BRepBlend_RstRstLineBuilder
Blend_CSWalking
Instead `tolesp` - `tolgui` is employed in contexts where tolerance of guide curve parameter is excepted.
Instead `tolesp` - `tolpoint2d` or `tolpoint3d` is employed in contexts where tolerance of point in 2d or 3d space is excepted.
- Replace tolesp with tolpoint2d/tolpoint3d in BBPP function argument.
- Use tolapp3d instead tolesp in BonVoisin function,
156 lines
6.4 KiB
C++
156 lines
6.4 KiB
C++
// Created on: 1997-01-23
|
|
// Created by: Laurent BOURESCHE
|
|
// Copyright (c) 1997-1999 Matra Datavision
|
|
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
|
//
|
|
// This file is part of Open CASCADE Technology software library.
|
|
//
|
|
// This library is free software; you can redistribute it and/or modify it under
|
|
// the terms of the GNU Lesser General Public License version 2.1 as published
|
|
// by the Free Software Foundation, with special exception defined in the file
|
|
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
|
// distribution for complete text of the license and disclaimer of any warranty.
|
|
//
|
|
// Alternatively, this file may be used under the terms of Open CASCADE
|
|
// commercial license or contractual agreement.
|
|
|
|
#ifndef _BRepBlend_SurfRstLineBuilder_HeaderFile
|
|
#define _BRepBlend_SurfRstLineBuilder_HeaderFile
|
|
|
|
#include <Adaptor3d_Surface.hxx>
|
|
#include <math_Vector.hxx>
|
|
#include <Blend_Point.hxx>
|
|
#include <Blend_Status.hxx>
|
|
#include <TopAbs_State.hxx>
|
|
|
|
class BRepBlend_Line;
|
|
class Adaptor3d_TopolTool;
|
|
class Blend_SurfRstFunction;
|
|
class Blend_FuncInv;
|
|
class Blend_SurfPointFuncInv;
|
|
class Blend_SurfCurvFuncInv;
|
|
class gp_Pnt2d;
|
|
class Adaptor3d_HVertex;
|
|
class IntSurf_Transition;
|
|
class BRepBlend_Extremity;
|
|
|
|
//! This class processes data resulting from
|
|
//! Blend_CSWalking taking in consideration the Surface
|
|
//! supporting the curve to detect the breakpoint.
|
|
//!
|
|
//! The criteria of distribution of points on the line are detailed
|
|
//! because it is to be used in the calculatuon of values approached
|
|
//! by an approximation of functions continued basing on
|
|
//! Blend_SurfRstFunction.
|
|
//!
|
|
//! Thus this pseudo path necessitates 3 criteria of regrouping :
|
|
//!
|
|
//! 1) exit of the domain of the curve
|
|
//!
|
|
//! 2) exit of the domain of the surface
|
|
//!
|
|
//! 3) stall as there is a solution to the problem
|
|
//! surf/surf within the domain of the surface
|
|
//! of support of the restriction.
|
|
//!
|
|
//! Construction of a BRepBlend_Line between a surface and
|
|
//! a pcurve on surface from an approached
|
|
//! starting solution. The output entries of this builder
|
|
//! are of the same nature as of the traditional walking
|
|
//! but the requirements on the Line are not the same
|
|
//! If the determination of validity range is always
|
|
//! guaranteed, the criteria of correct repartition of sections
|
|
//! before smoothing are not respected. The resulting Line
|
|
//! is f(t) oriented.
|
|
class BRepBlend_SurfRstLineBuilder
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
|
|
Standard_EXPORT BRepBlend_SurfRstLineBuilder(const Handle(Adaptor3d_Surface)& Surf1, const Handle(Adaptor3d_TopolTool)& Domain1, const Handle(Adaptor3d_Surface)& Surf2, const Handle(Adaptor2d_Curve2d)& Rst, const Handle(Adaptor3d_TopolTool)& Domain2);
|
|
|
|
Standard_EXPORT void Perform (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
|
|
|
|
Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real& Psol, math_Vector& ParSol);
|
|
|
|
Standard_EXPORT Standard_Boolean Complete (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pmin);
|
|
|
|
Standard_EXPORT Standard_Integer ArcToRecadre (const math_Vector& Sol, const Standard_Integer PrevIndex, gp_Pnt2d& pt2d, gp_Pnt2d& lastpt2d, Standard_Real& ponarc);
|
|
|
|
Standard_Boolean IsDone() const;
|
|
|
|
const Handle(BRepBlend_Line)& Line() const;
|
|
|
|
Standard_Boolean DecrochStart() const;
|
|
|
|
Standard_Boolean DecrochEnd() const;
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
Standard_EXPORT void InternalPerform (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Bound);
|
|
|
|
Standard_EXPORT Standard_Boolean Recadre (Blend_SurfCurvFuncInv& FinvC, math_Vector& Solinv, Handle(Adaptor2d_Curve2d)& Arc, Standard_Boolean& IsVtx, Handle(Adaptor3d_HVertex)& Vtx);
|
|
|
|
Standard_EXPORT Standard_Boolean Recadre (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, math_Vector& Solinv, Standard_Boolean& IsVtx, Handle(Adaptor3d_HVertex)& Vtx);
|
|
|
|
Standard_EXPORT Standard_Boolean Recadre (Blend_SurfPointFuncInv& FinvP, math_Vector& Solinv, Standard_Boolean& IsVtx, Handle(Adaptor3d_HVertex)& Vtx);
|
|
|
|
Standard_EXPORT void Transition (const Standard_Boolean OnFirst, const Handle(Adaptor2d_Curve2d)& Arc, const Standard_Real Param, IntSurf_Transition& TLine, IntSurf_Transition& TArc);
|
|
|
|
Standard_EXPORT void MakeExtremity (BRepBlend_Extremity& Extrem, const Standard_Boolean OnFirst, const Handle(Adaptor2d_Curve2d)& Arc, const Standard_Real Param, const Standard_Boolean IsVtx, const Handle(Adaptor3d_HVertex)& Vtx);
|
|
|
|
Standard_EXPORT Blend_Status CheckDeflectionOnSurf (const Blend_Point& CurPoint);
|
|
|
|
Standard_EXPORT Blend_Status CheckDeflectionOnRst (const Blend_Point& CurPoint);
|
|
|
|
Standard_EXPORT Blend_Status TestArret (Blend_SurfRstFunction& Func, const Standard_Boolean TestDeflection, const Blend_Status State);
|
|
|
|
Standard_EXPORT Standard_Boolean CheckInside (Blend_SurfRstFunction& Func, TopAbs_State& SituOnC, TopAbs_State& SituOnS, Standard_Boolean& Decroch);
|
|
|
|
|
|
Standard_Boolean done;
|
|
Handle(BRepBlend_Line) line;
|
|
math_Vector sol;
|
|
Handle(Adaptor3d_Surface) surf1;
|
|
Handle(Adaptor3d_TopolTool) domain1;
|
|
Handle(Adaptor3d_Surface) surf2;
|
|
Handle(Adaptor2d_Curve2d) rst;
|
|
Handle(Adaptor3d_TopolTool) domain2;
|
|
Standard_Real tolpoint3d;
|
|
Standard_Real tolpoint2d;
|
|
Standard_Real tolgui;
|
|
Standard_Real pasmax;
|
|
Standard_Real fleche;
|
|
Standard_Real param;
|
|
Blend_Point previousP;
|
|
Standard_Boolean rebrou;
|
|
Standard_Boolean iscomplete;
|
|
Standard_Boolean comptra;
|
|
Standard_Real sens;
|
|
Standard_Boolean decrochdeb;
|
|
Standard_Boolean decrochfin;
|
|
|
|
|
|
};
|
|
|
|
|
|
#include <BRepBlend_SurfRstLineBuilder.lxx>
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _BRepBlend_SurfRstLineBuilder_HeaderFile
|