mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-10 18:51:21 +03:00
e2e0498b17
The root of the problem is incorrect processing of cases when intersection line goes through the apex(es) of sphere. The fix improves this situation. The algorithm is taken from DecomposeResult(...) function (see IntPatch_ImpPrmIntersection.cxx file). Before the fix, faltering steps were done to solve this problem. As result, it worked in some particular cases. Now, its possibilities have been extended significantly. Following changes have been made in the fix: 1. Class IntPatch_ALineToWLine has been rewritten cardinally. It touches as interfaces of existing methods as adding/removing some methods/fields. Correction touches both cases: going through seam of Cone/Sphere and through pole(s) of sphere. Old interface did not allow making some actions with analytical line (ALine), e.g. splitting it on several Walking-lines (WLine). 2. Restriction-line support has been removed from Implicit-Implicit intersection result (see IntPatch_Intersection::GeomGeomPerfom(...) method). It connects with the fact that the intersection algorithm itself returns precise intersection line in analytical cases (in compare with parametric intersector). Therefore, we do not need in additional (restriction) line. 3. New class IntPatch_SpecialPoints has been added. This class contains methods to add some special points (such as apex of cone, pole of sphere, point on surface boundary etc.) in intersection line (IntPatch_PointLine). It is based on the static functions, which already exist in IntPatch_ImpPrmIntersection.cxx file (these functions have been moved to the new class). 4. Method IntPatch_WLineTool::ExtendTwoWlinesToEachOther(...) has been renamed to IntPatch_WLineTool::ExtendTwoWLines(...). It is connected with changing main idea of the method. Now it allows extending WLine to the surface boundary or to the singular point (if it is possible): cone apex, sphere pole etc. Interface of this method has been corrected, too. At that, old functionality (extending to each other) has been kept. For implementation of this algorithm, new enumeration "IntPatchWT_WLsConnectionType" has been created. 5. Method IntPatch_PointLine::CurvatureRadiusOfIntersLine(...) has been added. See IntPatch_PointLine.hxx for detail information. It allows correct step computing depended on the local curvature of the intersection line. This method uses geometrical properties of intersected surfaces to compute local curvature. Therefore, it can be applied in wide range of cases even if the intersection curve is not represented in explicit form (e.g. in case of param-param-intersection). 6. Method IntSurf::SetPeriod(...) has been created. 7. Additional check has been added in Draft_Modification::Perform() method for better choice of correct fragment of intersection line for processing DRAFT operation. 8. New overload method IntPatch_Point::SetValue() has been added. 9. Some refactoring of the code has been made. Creation of test case for issue #27431. --------------------------------------------------------------------------------------------- Some test cases have been adjusted according to their new behavior. tests\bugs\modalg_4\bug62 It is really IMPROVEMENT (but fortuitous). tests\bugs\modalg_5\bug25838 The behavior of this test has been reverted to the state before fixing the issue #27341. Main problem has not been fixed in #27341. It was fortuitous improvement. tests\bugs\moddata_2\bug565 Quality of intersection curve was not checked. And the curve is bad on both MASTER and FIX. Input data are really wrong: plane-like-cone. However, on the MASTER, four intersection curves (the quality is insignificant) are expected. On the fix, not empty intersection result is expected simply. tests\boolean\volumemaker\A8 Differences in images and CPU is expected. Difference in images is expected to be fixed in the issue #26020. Now, we should apply this behavior. Much CPU time is spent by IntTools_FaceFace::ComputeTolReached3d(...) and GeomInt_IntSS::BuildPCurves(...) methods calling. These methods are not touched by the algorithm. It is the result of change of intersection curve(s) form. However, the new Curve(s) seems to be valid and can be applied. As result, new behavior can be applied, too. tests\boolean\volumemaker\F8 tests\boolean\volumemaker\F9 tests\boolean\volumemaker\G5 tests\boolean\volumemaker\G6 CPU difference is expected. Much CPU time is spent by IntPatch_PointLine::CurvatureRadiusOfIntersLine(...) method calling. This method is really new (it does not exist on the MASTER) and is really useful. Therefore, we should apply new behavior. tests\boolean\volumemaker\G1 CPU difference is expected. Much CPU time is spent by IntTools_WLineTool::DecompositionOfWLine(...) and IntTools_FaceFace::ComputeTolReached3d(...) methods calling. These methods are not touched by the algorithm. It is the result of change of intersection curve(s) form. However, the new Curve(s) seems to be valid and can be applied. As result, new behavior can be applied, too. tests\bugs\modalg_6\bug26619 Differences in images is expected. The test keeps its BAD status on the FIX. But the result on the fix is nearer to expected than on the MASTER. Issue #27014 is still actual. As before, it is not clear, why the number of entities is different. The number of section curves has not been changed. Interfered entities are the same as on the MASTER. tests\bugs\modalg_5\bug25319_1(2) The reason is described in the issue #27896. Small correction in the test case
99 lines
4.7 KiB
C++
99 lines
4.7 KiB
C++
// 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 _IntPatch_WLineTool_HeaderFile
|
|
#define _IntPatch_WLineTool_HeaderFile
|
|
|
|
#include <IntPatch_SequenceOfLine.hxx>
|
|
#include <IntPatch_WLine.hxx>
|
|
#include <Standard_Macro.hxx>
|
|
|
|
class Adaptor3d_TopolTool;
|
|
|
|
//! IntPatch_WLineTool provides set of static methods related to walking lines.
|
|
class IntPatch_WLineTool
|
|
{
|
|
public:
|
|
|
|
DEFINE_STANDARD_ALLOC
|
|
|
|
//! I
|
|
//! Removes equal points (leave one of equal points) from theWLine
|
|
//! and recompute vertex parameters.
|
|
//!
|
|
//! II
|
|
//! Removes point out of borders in case of non periodic surfaces.
|
|
//! This step is done only if theRestrictLine is true.
|
|
//!
|
|
//! III
|
|
//! Removes exceed points using tube criteria:
|
|
//! delete 7D point if it lies near to expected lines in 2d and 3d.
|
|
//! Each task (2d, 2d, 3d) have its own tolerance and checked separately.
|
|
//!
|
|
//! Returns new WLine or null WLine if the number
|
|
//! of the points is less than 2.
|
|
Standard_EXPORT static
|
|
Handle(IntPatch_WLine) ComputePurgedWLine(const Handle(IntPatch_WLine) &theWLine,
|
|
const Handle(Adaptor3d_HSurface) &theS1,
|
|
const Handle(Adaptor3d_HSurface) &theS2,
|
|
const Handle(Adaptor3d_TopolTool) &theDom1,
|
|
const Handle(Adaptor3d_TopolTool) &theDom2,
|
|
const Standard_Boolean theRestrictLine);
|
|
|
|
//! Joins all WLines from theSlin to one if it is possible and records
|
|
//! the result into theSlin again. Lines will be kept to be splitted if:
|
|
//! a) they are separated (has no common points);
|
|
//! b) resulted line (after joining) go through seam-edges or surface boundaries.
|
|
//!
|
|
//! In addition, if points in theSPnt lies at least in one of the line in theSlin,
|
|
//! this point will be deleted.
|
|
Standard_EXPORT static void JoinWLines(IntPatch_SequenceOfLine& theSlin,
|
|
IntPatch_SequenceOfPoint& theSPnt,
|
|
const Standard_Real theTol3D,
|
|
const Standard_Real theU1Period,
|
|
const Standard_Real theU2Period,
|
|
const Standard_Real theV1Period,
|
|
const Standard_Real theV2Period,
|
|
const Standard_Real theUfSurf1,
|
|
const Standard_Real theUlSurf1,
|
|
const Standard_Real theVfSurf1,
|
|
const Standard_Real theVlSurf1,
|
|
const Standard_Real theUfSurf2,
|
|
const Standard_Real theUlSurf2,
|
|
const Standard_Real theVfSurf2,
|
|
const Standard_Real theVlSurf2);
|
|
|
|
|
|
//! Extends every line from theSlin (if it is possible) to be started/finished
|
|
//! in strictly determined point (in the place of joint of two lines).
|
|
//! As result, some gaps between two lines will vanish.
|
|
//! The Walking lines are supposed (algorithm will do nothing for not-Walking line)
|
|
//! to be computed as a result of intersection. Both theS1 and theS2
|
|
//! must be quadrics. Other cases are not supported.
|
|
//! theArrPeriods must be filled as follows:
|
|
//! {<U-period of 1st surface>, <V-period of 1st surface>,
|
|
//! <U-period of 2nd surface>, <V-period of 2nd surface>}.
|
|
Standard_EXPORT static void
|
|
ExtendTwoWLines(IntPatch_SequenceOfLine& theSlin,
|
|
const Handle(Adaptor3d_HSurface)& theS1,
|
|
const Handle(Adaptor3d_HSurface)& theS2,
|
|
const Standard_Real theToler3D,
|
|
const Standard_Real* const theArrPeriods,
|
|
const Bnd_Box2d& theBoxS1,
|
|
const Bnd_Box2d& theBoxS2);
|
|
|
|
//! Max angle to concatenate two WLines to avoid result with C0-continuity
|
|
static const Standard_Real myMaxConcatAngle;
|
|
};
|
|
|
|
#endif |