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
162 lines
6.0 KiB
C++
162 lines
6.0 KiB
C++
// Created on: 1995-01-27
|
|
// Created by: Jacques GOUSSARD
|
|
// Copyright (c) 1995-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 _GeomInt_WLApprox_HeaderFile
|
|
#define _GeomInt_WLApprox_HeaderFile
|
|
|
|
#include <Standard.hxx>
|
|
#include <Standard_DefineAlloc.hxx>
|
|
#include <Standard_Handle.hxx>
|
|
|
|
#include <NCollection_Vector.hxx>
|
|
#include <GeomInt_TheComputeLineOfWLApprox.hxx>
|
|
#include <GeomInt_TheComputeLineBezierOfWLApprox.hxx>
|
|
#include <Approx_MCurvesToBSpCurve.hxx>
|
|
#include <Standard_Boolean.hxx>
|
|
#include <Standard_Real.hxx>
|
|
#include <Standard_Integer.hxx>
|
|
#include <Approx_ParametrizationType.hxx>
|
|
class Standard_OutOfRange;
|
|
class StdFail_NotDone;
|
|
class Adaptor3d_HSurface;
|
|
class Adaptor3d_HSurfaceTool;
|
|
class IntSurf_Quadric;
|
|
class IntSurf_QuadricTool;
|
|
class IntPatch_WLine;
|
|
class GeomInt_ThePrmPrmSvSurfacesOfWLApprox;
|
|
class GeomInt_TheInt2SOfThePrmPrmSvSurfacesOfWLApprox;
|
|
class GeomInt_TheImpPrmSvSurfacesOfWLApprox;
|
|
class GeomInt_TheZerImpFuncOfTheImpPrmSvSurfacesOfWLApprox;
|
|
class GeomInt_TheMultiLineOfWLApprox;
|
|
class GeomInt_TheMultiLineToolOfWLApprox;
|
|
class GeomInt_TheComputeLineOfWLApprox;
|
|
class GeomInt_MyBSplGradientOfTheComputeLineOfWLApprox;
|
|
class GeomInt_MyGradientbisOfTheComputeLineOfWLApprox;
|
|
class GeomInt_TheComputeLineBezierOfWLApprox;
|
|
class GeomInt_MyGradientOfTheComputeLineBezierOfWLApprox;
|
|
class AppParCurves_MultiBSpCurve;
|
|
|
|
struct Approx_Data
|
|
{
|
|
Approx_Data() : myBezierApprox(Standard_True),
|
|
Xo(0.0), Yo(0.0), Zo(0.0),
|
|
U1o(0.0), V1o(0.0), U2o(0.0), V2o(0.0),
|
|
ApproxXYZ(Standard_True),
|
|
ApproxU1V1(Standard_True),
|
|
ApproxU2V2(Standard_True),
|
|
indicemin(0), indicemax(0),
|
|
myNbPntMax(30), parametrization(Approx_ChordLength)
|
|
{
|
|
}
|
|
|
|
Standard_Boolean myBezierApprox;
|
|
Standard_Real Xo, Yo, Zo, U1o, V1o, U2o, V2o;
|
|
Standard_Boolean ApproxXYZ, ApproxU1V1, ApproxU2V2;
|
|
Standard_Integer indicemin, indicemax, myNbPntMax;
|
|
Approx_ParametrizationType parametrization;
|
|
};
|
|
|
|
|
|
class GeomInt_WLApprox
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
|
|
Standard_EXPORT GeomInt_WLApprox();
|
|
|
|
Standard_EXPORT void Perform (const Handle(Adaptor3d_HSurface)& Surf1, const Handle(Adaptor3d_HSurface)& Surf2, const Handle(IntPatch_WLine)& aLine, const Standard_Boolean ApproxXYZ = Standard_True, const Standard_Boolean ApproxU1V1 = Standard_True, const Standard_Boolean ApproxU2V2 = Standard_True, const Standard_Integer indicemin = 0, const Standard_Integer indicemax = 0);
|
|
|
|
Standard_EXPORT void Perform (const Handle(IntPatch_WLine)& aLine, const Standard_Boolean ApproxXYZ = Standard_True, const Standard_Boolean ApproxU1V1 = Standard_True, const Standard_Boolean ApproxU2V2 = Standard_True, const Standard_Integer indicemin = 0, const Standard_Integer indicemax = 0);
|
|
|
|
Standard_EXPORT
|
|
void SetParameters (const Standard_Real Tol3d, const Standard_Real Tol2d,
|
|
const Standard_Integer DegMin,
|
|
const Standard_Integer DegMax,
|
|
const Standard_Integer NbIterMax,
|
|
const Standard_Integer NbPntMax = 30,
|
|
const Standard_Boolean ApproxWithTangency = Standard_True,
|
|
const Approx_ParametrizationType
|
|
Parametrization = Approx_ChordLength);
|
|
Standard_EXPORT void Perform();
|
|
|
|
Standard_EXPORT Standard_Real TolReached3d() const;
|
|
|
|
Standard_EXPORT Standard_Real TolReached2d() const;
|
|
|
|
Standard_EXPORT Standard_Boolean IsDone() const;
|
|
|
|
Standard_EXPORT Standard_Integer NbMultiCurves() const;
|
|
|
|
Standard_EXPORT const AppParCurves_MultiBSpCurve& Value (const Standard_Integer Index) const;
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
Standard_EXPORT void Perform (const IntSurf_Quadric& Surf1, const Handle(Adaptor3d_HSurface)& Surf2, const Handle(IntPatch_WLine)& aLine, const Standard_Boolean ApproxXYZ, const Standard_Boolean ApproxU1V1, const Standard_Boolean ApproxU2V2, const Standard_Integer indicemin, const Standard_Integer indicemax, const Standard_Boolean isTheQuadFirst);
|
|
|
|
Standard_EXPORT void UpdateTolReached();
|
|
|
|
//! Fill data structure for intersection approximation.
|
|
Standard_EXPORT void fillData(const Handle(IntPatch_WLine)& theLine);
|
|
|
|
//! Prepare data structure for further computations.
|
|
Standard_EXPORT void prepareDS(const Standard_Boolean theApproxXYZ,
|
|
const Standard_Boolean theApproxU1V1,
|
|
const Standard_Boolean theApproxU2V2,
|
|
const Standard_Integer indicemin,
|
|
const Standard_Integer indicemax);
|
|
|
|
//! Build knot sequence.
|
|
Standard_EXPORT void buildKnots(const Handle(IntPatch_WLine)& theline,
|
|
const Standard_Address thePtrSVSurf);
|
|
|
|
//! Build curve.
|
|
Standard_EXPORT void buildCurve(const Handle(IntPatch_WLine)& theline,
|
|
const Standard_Address thePtrSVSurf);
|
|
|
|
GeomInt_TheComputeLineOfWLApprox myComputeLine;
|
|
GeomInt_TheComputeLineBezierOfWLApprox myComputeLineBezier;
|
|
Approx_MCurvesToBSpCurve myBezToBSpl;
|
|
Standard_Boolean myWithTangency;
|
|
Standard_Real myTol3d;
|
|
Standard_Real myTol2d;
|
|
Standard_Integer myDegMin;
|
|
Standard_Integer myDegMax;
|
|
Standard_Integer myNbIterMax;
|
|
Standard_Real myTolReached3d;
|
|
Standard_Real myTolReached2d;
|
|
Approx_Data myData;
|
|
NCollection_Vector<Standard_Integer> myKnots;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _GeomInt_WLApprox_HeaderFile
|