mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-06-20 11:54:07 +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
137 lines
6.3 KiB
C++
137 lines
6.3 KiB
C++
// Created on: 1995-06-06
|
|
// Created by: Jean Yves LEBEY
|
|
// 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 _BRepApprox_TheMultiLineOfApprox_HeaderFile
|
|
#define _BRepApprox_TheMultiLineOfApprox_HeaderFile
|
|
|
|
#include <Standard.hxx>
|
|
#include <Standard_DefineAlloc.hxx>
|
|
#include <Standard_Handle.hxx>
|
|
|
|
#include <Standard_Address.hxx>
|
|
#include <Standard_Integer.hxx>
|
|
#include <Standard_Boolean.hxx>
|
|
#include <Standard_Real.hxx>
|
|
#include <Approx_Status.hxx>
|
|
#include <TColgp_Array1OfPnt.hxx>
|
|
#include <TColgp_Array1OfPnt2d.hxx>
|
|
#include <TColgp_Array1OfVec.hxx>
|
|
#include <TColgp_Array1OfVec2d.hxx>
|
|
class BRepApprox_ApproxLine;
|
|
class ApproxInt_SvSurfaces;
|
|
|
|
|
|
|
|
class BRepApprox_TheMultiLineOfApprox
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
//! The class SvSurfaces is used when the approximation algorithm
|
|
//! needs some extra points on the line <line>.
|
|
//! A New line is then created which shares the same surfaces and functions.
|
|
//! SvSurfaces is a deferred class which allows several implementations of
|
|
//! this algorithm with different surfaces (bi-parametric ones, or
|
|
//! implicit and biparametric ones)
|
|
Standard_EXPORT BRepApprox_TheMultiLineOfApprox(const Handle(BRepApprox_ApproxLine)& line,
|
|
const Standard_Address PtrSvSurfaces,
|
|
const Standard_Integer NbP3d,
|
|
const Standard_Integer NbP2d,
|
|
const Standard_Real xo,
|
|
const Standard_Real yo,
|
|
const Standard_Real zo,
|
|
const Standard_Real u1o,
|
|
const Standard_Real v1o,
|
|
const Standard_Real u2o,
|
|
const Standard_Real v2o,
|
|
const Standard_Boolean P2DOnFirst,
|
|
const Standard_Integer IndMin = 0,
|
|
const Standard_Integer IndMax = 0);
|
|
|
|
//! No Extra points will be added on the current line
|
|
Standard_EXPORT BRepApprox_TheMultiLineOfApprox(const Handle(BRepApprox_ApproxLine)& line,
|
|
const Standard_Integer NbP3d,
|
|
const Standard_Integer NbP2d,
|
|
const Standard_Real xo,
|
|
const Standard_Real yo,
|
|
const Standard_Real zo,
|
|
const Standard_Real u1o,
|
|
const Standard_Real v1o,
|
|
const Standard_Real u2o,
|
|
const Standard_Real v2o,
|
|
const Standard_Boolean P2DOnFirst,
|
|
const Standard_Integer IndMin = 0,
|
|
const Standard_Integer IndMax = 0);
|
|
|
|
Standard_EXPORT Standard_Integer FirstPoint() const;
|
|
|
|
Standard_EXPORT Standard_Integer LastPoint() const;
|
|
|
|
//! Returns the number of 2d points of a TheLine.
|
|
Standard_EXPORT Standard_Integer NbP2d() const;
|
|
|
|
//! Returns the number of 3d points of a TheLine.
|
|
Standard_EXPORT Standard_Integer NbP3d() const;
|
|
|
|
Standard_EXPORT Approx_Status WhatStatus() const;
|
|
|
|
//! Returns the 3d points of the multipoint <MPointIndex> when only 3d points exist.
|
|
Standard_EXPORT void Value (const Standard_Integer MPointIndex, TColgp_Array1OfPnt& tabPt) const;
|
|
|
|
//! Returns the 2d points of the multipoint <MPointIndex> when only 2d points exist.
|
|
Standard_EXPORT void Value (const Standard_Integer MPointIndex, TColgp_Array1OfPnt2d& tabPt2d) const;
|
|
|
|
//! Returns the 3d and 2d points of the multipoint <MPointIndex>.
|
|
Standard_EXPORT void Value (const Standard_Integer MPointIndex, TColgp_Array1OfPnt& tabPt, TColgp_Array1OfPnt2d& tabPt2d) const;
|
|
|
|
//! Returns the 3d tangency points of the multipoint <MPointIndex> only when 3d points exist.
|
|
Standard_EXPORT Standard_Boolean Tangency (const Standard_Integer MPointIndex, TColgp_Array1OfVec& tabV) const;
|
|
|
|
//! Returns the 2d tangency points of the multipoint <MPointIndex> only when 2d points exist.
|
|
Standard_EXPORT Standard_Boolean Tangency (const Standard_Integer MPointIndex, TColgp_Array1OfVec2d& tabV2d) const;
|
|
|
|
//! Returns the 3d and 2d points of the multipoint <MPointIndex>.
|
|
Standard_EXPORT Standard_Boolean Tangency (const Standard_Integer MPointIndex, TColgp_Array1OfVec& tabV, TColgp_Array1OfVec2d& tabV2d) const;
|
|
|
|
Standard_EXPORT BRepApprox_TheMultiLineOfApprox MakeMLBetween (const Standard_Integer Low, const Standard_Integer High, const Standard_Integer NbPointsToInsert) const;
|
|
|
|
//! Dump of the current multi-line.
|
|
Standard_EXPORT void Dump() const;
|
|
|
|
protected:
|
|
BRepApprox_TheMultiLineOfApprox operator=(BRepApprox_TheMultiLineOfApprox&);
|
|
|
|
private:
|
|
const Standard_Address PtrOnmySvSurfaces;
|
|
const Handle(BRepApprox_ApproxLine) myLine;
|
|
const Standard_Integer indicemin;
|
|
const Standard_Integer indicemax;
|
|
const Standard_Integer nbp3d;
|
|
const Standard_Integer nbp2d;
|
|
const Standard_Boolean p2donfirst;
|
|
const Standard_Real Xo;
|
|
const Standard_Real Yo;
|
|
const Standard_Real Zo;
|
|
const Standard_Real U1o;
|
|
const Standard_Real V1o;
|
|
const Standard_Real U2o;
|
|
const Standard_Real V2o;
|
|
|
|
};
|
|
|
|
#endif // _BRepApprox_TheMultiLineOfApprox_HeaderFile
|