mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
4e14c88f77
This branch contains fixes for 26675 and 26431 bugs. 1. Normalization has been eliminated. 2. Interfaces of AppDef_Compute::Parametrization(...) and BRepAlgo_BooleanOperations::SetApproxParameters() methods have been changed. 3. Overloaded methods for ApproxInt_Approx::SetParameters(...), TopOpeBRepTool_GeomTool::GetTolerances(...) and TopOpeBRepTool_GeomTool::SetTolerances(...) have been removed (because some fields of these classes are not used more). 4. Comments for some methods have been changed in BRepApprox_TheMultiLineOfApprox.hxx and GeomInt_TheMultiLineOfWLApprox.hxx files. 5. Some fields have been deleted from ApproxInt_MultiLine class. Kept members have become constant. 6. Interface of ksection DRAW-command has been changed. 7. Now, 2dintersect DRAW-command prints information about found segments. 8. Some code fragments have been rewritten to make them easier. 9. Algorithm of splitting WLine, which goes through pole of sphere has been improved. 10. Improve approximation algorithm in order to it will compute correct 2D- and 3D-tangent at the end of bezier constraints (including case when curve goes through or finishes on singular points). 11. Interface of IntPatch_WLine::Dump(...) method has been corrected. 12. Some methods for working with Walking-line are made more universal (available for both GeomInt and IntTools packages). 13. Problem in BRepLib::SameParameter(...) method has been fixed (see corresponding comment). 14. Small correction in Draft package. 15. Any outputs in IntPatch_Intersection::Dump(...) method have become disabled because they are useless. If anybody need in this outputs he/she will correct this method himself/herself. Adjusting some test cases according to their new behavior. Creation of new test cases. ---------------------------------------------------------------------------------------------------------------------------- Some explanation of new behavior of some test cases: 1. Regressions: a) blend simple X4 The problem is described in the issue #0026740. According to this description, the result on the current MASTER seems to be wrong indeed. b) boolean bcommon_complex C7 and boolean bcut_complex Q1 These test case use same shapes with different Boolean operation (COMMON and CUT). They are already BAD (on the MASTER). Now, some sub-shapes have become not-shared, simply. In my opinion, we shall apply new behavior of these tests. c) boolean bsection M3 The problem described in the issue #0026777 exists even on the current MASTER. d) boolean bsection M9 The problem is described in the message http://tracker.dev.opencascade.org/view.php?id=26815#c47546. Here, we have really regression in the picture. e) boolean bsection N2 The problem is described in issue #0026814. f) boolean volumemaker G1 The problem is described in issue #26020. g) bugs modalg_1 bug1255 (and bug1255_1) The problem is described in issue #26815. h) bugs modalg_2 bug5805_18, bugs modalg_2 bug5805_42, bugs modalg_2 bug5805_46 The problem is described in issue #25925. i) bugs modalg_3 bug602 The problem is describes in issue #602. j) bugs modalg_5 bug24915 The problem is described in the message http://tracker.dev.opencascade.org/view.php?id=25929#c48565. It is not fixed by this issue. k) bugs modalg_5 bug25838 The main reason is described in issue #0026816. ---------------------------------------------------------------------------- 2. Improvements: a) boolean volumemaker F9 b) bugs modalg_1 bug10160_3 c) bugs modalg_2 bug22557 d) bugs modalg_5 bug25319_1 (_2) e) draft angle G2 f) offset shape A1 g) offset with_intersect_80 N7
191 lines
8.6 KiB
C++
191 lines
8.6 KiB
C++
// Created on: 1991-12-02
|
|
// Created by: Laurent PAINNOT
|
|
// Copyright (c) 1991-1999 Matra Datavision
|
|
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
|
//
|
|
// This file is part of Open CASCADE Technology software library.
|
|
//
|
|
// This library is free software; you can redistribute it and/or modify it under
|
|
// the terms of the GNU Lesser General Public License version 2.1 as published
|
|
// by the Free Software Foundation, with special exception defined in the file
|
|
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
|
// distribution for complete text of the license and disclaimer of any warranty.
|
|
//
|
|
// Alternatively, this file may be used under the terms of Open CASCADE
|
|
// commercial license or contractual agreement.
|
|
|
|
#ifndef _AppDef_Compute_HeaderFile
|
|
#define _AppDef_Compute_HeaderFile
|
|
|
|
#include <Standard.hxx>
|
|
#include <Standard_DefineAlloc.hxx>
|
|
#include <Standard_Handle.hxx>
|
|
|
|
#include <AppParCurves_SequenceOfMultiCurve.hxx>
|
|
#include <AppParCurves_MultiCurve.hxx>
|
|
#include <AppParCurves_MultiBSpCurve.hxx>
|
|
#include <Standard_Boolean.hxx>
|
|
#include <Approx_ParametrizationType.hxx>
|
|
#include <TColStd_HArray1OfReal.hxx>
|
|
#include <Approx_SequenceOfHArray1OfReal.hxx>
|
|
#include <TColStd_SequenceOfReal.hxx>
|
|
#include <AppParCurves_HArray1OfConstraintCouple.hxx>
|
|
#include <Standard_Integer.hxx>
|
|
#include <Standard_Real.hxx>
|
|
#include <AppParCurves_Constraint.hxx>
|
|
#include <math_Vector.hxx>
|
|
#include <TColStd_Array1OfReal.hxx>
|
|
class AppDef_MultiLine;
|
|
class AppDef_MyLineTool;
|
|
class AppDef_MyGradientOfCompute;
|
|
class AppDef_ParLeastSquareOfMyGradientOfCompute;
|
|
class AppDef_ResConstraintOfMyGradientOfCompute;
|
|
class AppDef_ParFunctionOfMyGradientOfCompute;
|
|
class AppDef_Gradient_BFGSOfMyGradientOfCompute;
|
|
class AppParCurves_MultiCurve;
|
|
class AppParCurves_MultiBSpCurve;
|
|
|
|
|
|
|
|
class AppDef_Compute
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
|
|
//! The MultiLine <Line> will be approximated until tolerances
|
|
//! will be reached.
|
|
//! The approximation will be done from degreemin to degreemax
|
|
//! with a cutting if the corresponding boolean is True.
|
|
//! If <Squares> is True, the computation will be done with
|
|
//! no iteration at all.
|
|
Standard_EXPORT AppDef_Compute(const AppDef_MultiLine& Line, const Standard_Integer degreemin = 4, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-3, const Standard_Real Tolerance2d = 1.0e-6, const Standard_Integer NbIterations = 5, const Standard_Boolean cutting = Standard_True, const Approx_ParametrizationType parametrization = Approx_ChordLength, const Standard_Boolean Squares = Standard_False);
|
|
|
|
//! The MultiLine <Line> will be approximated until tolerances
|
|
//! will be reached.
|
|
//! The approximation will be done from degreemin to degreemax
|
|
//! with a cutting if the corresponding boolean is True.
|
|
//! If <Squares> is True, the computation will be done with
|
|
//! no iteration at all.
|
|
Standard_EXPORT AppDef_Compute(const AppDef_MultiLine& Line, const math_Vector& Parameters, const Standard_Integer degreemin = 4, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-03, const Standard_Real Tolerance2d = 1.0e-06, const Standard_Integer NbIterations = 5, const Standard_Boolean cutting = Standard_True, const Standard_Boolean Squares = Standard_False);
|
|
|
|
//! Initializes the fields of the algorithm.
|
|
Standard_EXPORT AppDef_Compute(const math_Vector& Parameters, const Standard_Integer degreemin = 4, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-03, const Standard_Real Tolerance2d = 1.0e-06, const Standard_Integer NbIterations = 5, const Standard_Boolean cutting = Standard_True, const Standard_Boolean Squares = Standard_False);
|
|
|
|
//! Initializes the fields of the algorithm.
|
|
Standard_EXPORT AppDef_Compute(const Standard_Integer degreemin = 4, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-03, const Standard_Real Tolerance2d = 1.0e-06, const Standard_Integer NbIterations = 5, const Standard_Boolean cutting = Standard_True, const Approx_ParametrizationType parametrization = Approx_ChordLength, const Standard_Boolean Squares = Standard_False);
|
|
|
|
//! Initializes the fields of the algorithm.
|
|
Standard_EXPORT void Init (const Standard_Integer degreemin = 4, const Standard_Integer degreemax = 8, const Standard_Real Tolerance3d = 1.0e-03, const Standard_Real Tolerance2d = 1.0e-06, const Standard_Integer NbIterations = 5, const Standard_Boolean cutting = Standard_True, const Approx_ParametrizationType parametrization = Approx_ChordLength, const Standard_Boolean Squares = Standard_False);
|
|
|
|
//! runs the algorithm after having initialized the fields.
|
|
Standard_EXPORT void Perform (const AppDef_MultiLine& Line);
|
|
|
|
//! changes the degrees of the approximation.
|
|
Standard_EXPORT void SetDegrees (const Standard_Integer degreemin, const Standard_Integer degreemax);
|
|
|
|
//! Changes the tolerances of the approximation.
|
|
Standard_EXPORT void SetTolerances (const Standard_Real Tolerance3d, const Standard_Real Tolerance2d);
|
|
|
|
//! changes the first and the last constraint points.
|
|
Standard_EXPORT void SetConstraints (const AppParCurves_Constraint firstC, const AppParCurves_Constraint lastC);
|
|
|
|
//! returns False if at a moment of the approximation,
|
|
//! the status NoApproximation has been sent by the user
|
|
//! when more points were needed.
|
|
Standard_EXPORT Standard_Boolean IsAllApproximated() const;
|
|
|
|
//! returns False if the status NoPointsAdded has been sent.
|
|
Standard_EXPORT Standard_Boolean IsToleranceReached() const;
|
|
|
|
//! 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;
|
|
|
|
//! Returns the number of MultiCurve doing the approximation
|
|
//! of the MultiLine.
|
|
Standard_EXPORT Standard_Integer NbMultiCurves() const;
|
|
|
|
//! returns the result of the approximation.
|
|
Standard_EXPORT const AppParCurves_MultiCurve& Value (const Standard_Integer Index = 1) const;
|
|
|
|
//! returns the result of the approximation.
|
|
Standard_EXPORT AppParCurves_MultiCurve& ChangeValue (const Standard_Integer Index = 1);
|
|
|
|
//! returns the result of the approximation.
|
|
Standard_EXPORT const AppParCurves_MultiBSpCurve& SplineValue();
|
|
|
|
//! returns the type of parametrization
|
|
Standard_EXPORT Approx_ParametrizationType Parametrization () const;
|
|
|
|
//! returns the new parameters of the approximation
|
|
//! corresponding to the points of the multicurve <Index>.
|
|
Standard_EXPORT const TColStd_Array1OfReal& Parameters (const Standard_Integer Index = 1) const;
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
//! is internally used in the algorithm.
|
|
Standard_EXPORT Standard_Boolean Compute (const AppDef_MultiLine& Line, const Standard_Integer fpt, const Standard_Integer lpt, math_Vector& Para, Standard_Real& TheTol3d, Standard_Real& TheTol2d);
|
|
|
|
//! is internally used in the algorithm.
|
|
Standard_EXPORT Standard_Boolean ComputeCurve (const AppDef_MultiLine& Line, const Standard_Integer firspt, const Standard_Integer lastpt);
|
|
|
|
//! computes new parameters between firstP and lastP.
|
|
Standard_EXPORT void Parameters (const AppDef_MultiLine& Line, const Standard_Integer firstP, const Standard_Integer LastP, math_Vector& TheParameters) const;
|
|
|
|
Standard_EXPORT Standard_Real SearchFirstLambda (const AppDef_MultiLine& Line, const math_Vector& Para, const math_Vector& V, const Standard_Integer index) const;
|
|
|
|
Standard_EXPORT Standard_Real SearchLastLambda (const AppDef_MultiLine& Line, const math_Vector& Para, const math_Vector& V, const Standard_Integer index) const;
|
|
|
|
Standard_EXPORT void FirstTangencyVector (const AppDef_MultiLine& Line, const Standard_Integer index, math_Vector& V) const;
|
|
|
|
Standard_EXPORT void LastTangencyVector (const AppDef_MultiLine& Line, const Standard_Integer index, math_Vector& V) const;
|
|
|
|
|
|
AppParCurves_SequenceOfMultiCurve myMultiCurves;
|
|
AppParCurves_MultiCurve TheMultiCurve;
|
|
AppParCurves_MultiBSpCurve myspline;
|
|
Standard_Boolean alldone;
|
|
Standard_Boolean tolreached;
|
|
Approx_ParametrizationType Par;
|
|
Handle(TColStd_HArray1OfReal) myParameters;
|
|
Handle(TColStd_HArray1OfReal) myfirstParam;
|
|
Approx_SequenceOfHArray1OfReal myPar;
|
|
TColStd_SequenceOfReal Tolers3d;
|
|
TColStd_SequenceOfReal Tolers2d;
|
|
Handle(AppParCurves_HArray1OfConstraintCouple) myConstraints;
|
|
Standard_Integer mydegremin;
|
|
Standard_Integer mydegremax;
|
|
Standard_Real mytol3d;
|
|
Standard_Real mytol2d;
|
|
Standard_Real currenttol3d;
|
|
Standard_Real currenttol2d;
|
|
Standard_Boolean mycut;
|
|
Standard_Boolean mysquares;
|
|
Standard_Integer myitermax;
|
|
AppParCurves_Constraint myfirstC;
|
|
AppParCurves_Constraint mylastC;
|
|
Standard_Integer myMultiLineNb;
|
|
Standard_Boolean myIsClear;
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _AppDef_Compute_HeaderFile
|