mirror of
https://github.com/Open-Cascade-SAS/OCCT.git
synced 2026-05-12 02:40:22 +08:00
00302ba4e7
1. Checking, if intersection curve is collapsed, is added. (file GeomInt_LineConstructor.cxx) 2. Earlier, intersection line was considered as valid if only mid-point of every interval of this line is into two intersected surfaces (with given tolerance). That's no good because after inserting of new points, old points, which is considered as valid only because they are into beginning or into end of interval (therefore, they was not checked), moved to mid of interval and became invalid. Therefore, checking for first and last points was added. (file GeomInt_LineConstructor.cxx) 3. Intersection line became valid (see bug description) after adding of new additional points into it (file IntPatch_PrmPrmIntersection.cxx). Methods for finding and adding of new points were added. (file IntWalk_PWalking_1.gxx) Some test cases were changed. Test cases for issue CR24472
191 lines
7.2 KiB
C++
191 lines
7.2 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 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.
|
|
|
|
#include <GeomInt_IntSS.ixx>
|
|
|
|
#include <Adaptor3d_TopolTool.hxx>
|
|
#include <Standard_ConstructionError.hxx>
|
|
#include <Geom_Surface.hxx>
|
|
#include <GeomAdaptor_Surface.hxx>
|
|
#include <GeomAdaptor_HSurface.hxx>
|
|
|
|
|
|
//=======================================================================
|
|
//function : Perform
|
|
//purpose : General intersection
|
|
//=======================================================================
|
|
void GeomInt_IntSS::Perform(const Handle(Geom_Surface)& S1,
|
|
const Handle(Geom_Surface)& S2,
|
|
const Standard_Real Tol,
|
|
const Standard_Boolean Approx,
|
|
const Standard_Boolean ApproxS1,
|
|
const Standard_Boolean ApproxS2)
|
|
{
|
|
myHS1 = new GeomAdaptor_HSurface(S1);
|
|
if (S1==S2)
|
|
myHS2 = myHS1;
|
|
else
|
|
myHS2 = new GeomAdaptor_HSurface(S2);
|
|
InternalPerform(Tol,Approx,ApproxS1,ApproxS2,Standard_False,0.,0.,0.,0.);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Perform
|
|
//purpose : General intersection with a Starting Point
|
|
//=======================================================================
|
|
void GeomInt_IntSS::Perform(const Handle(Geom_Surface)& S1,
|
|
const Handle(Geom_Surface)& S2,
|
|
const Standard_Real Tol,
|
|
const Standard_Real U1, const Standard_Real V1,
|
|
const Standard_Real U2, const Standard_Real V2,
|
|
const Standard_Boolean Approx,
|
|
const Standard_Boolean ApproxS1,
|
|
const Standard_Boolean ApproxS2)
|
|
{
|
|
myHS1 = new GeomAdaptor_HSurface(S1);
|
|
if (S1==S2)
|
|
myHS2 = myHS1;
|
|
else
|
|
myHS2 = new GeomAdaptor_HSurface(S2);
|
|
InternalPerform(Tol,Approx,ApproxS1,ApproxS2,Standard_True,U1,V1,U2,V2);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Internal Perform
|
|
//purpose :
|
|
//=======================================================================
|
|
void GeomInt_IntSS::InternalPerform(const Standard_Real Tol,
|
|
const Standard_Boolean Approx,
|
|
const Standard_Boolean ApproxS1,
|
|
const Standard_Boolean ApproxS2,
|
|
const Standard_Boolean useStart,
|
|
const Standard_Real U1,
|
|
const Standard_Real V1,
|
|
const Standard_Real U2,
|
|
const Standard_Real V2)
|
|
{
|
|
myTolReached2d = myTolReached3d = 0.0;
|
|
myNbrestr = 0;
|
|
sline.Clear();
|
|
Handle(Adaptor3d_TopolTool) dom1 = new Adaptor3d_TopolTool(myHS1);
|
|
Handle(Adaptor3d_TopolTool) dom2 = new Adaptor3d_TopolTool(myHS2);
|
|
myLConstruct.Load(dom1,dom2,myHS1,myHS2);
|
|
|
|
Standard_Real TolArc = Tol;
|
|
Standard_Real TolTang = Tol;
|
|
Standard_Real UVMaxStep = 0.001;
|
|
Standard_Real Deflection = 0.1;
|
|
|
|
myIntersector.SetTolerances(TolArc,TolTang,UVMaxStep,Deflection);
|
|
|
|
if(myHS1 == myHS2) {
|
|
myIntersector.Perform(myHS1,dom1,TolArc,TolTang);
|
|
}
|
|
else if (!useStart) {
|
|
myIntersector.Perform(myHS1,dom1,myHS2,dom2,TolArc,TolTang);
|
|
}
|
|
else {
|
|
myIntersector.Perform(myHS1,dom1,myHS2,dom2,U1,V1,U2,V2,TolArc,TolTang);
|
|
}
|
|
|
|
// ============================================================
|
|
if (myIntersector.IsDone()) {
|
|
const Standard_Integer nblin = myIntersector.NbLines();
|
|
for (Standard_Integer i=1; i<= nblin; i++)
|
|
{
|
|
MakeCurve(i,dom1,dom2,Tol,Approx,ApproxS1,ApproxS2);
|
|
}
|
|
}
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Line
|
|
//purpose :
|
|
//=======================================================================
|
|
const Handle(Geom_Curve) & GeomInt_IntSS::Line (const Standard_Integer Index) const
|
|
{
|
|
StdFail_NotDone_Raise_if(!myIntersector.IsDone(),"GeomInt_IntSS::Line");
|
|
return sline(Index+myNbrestr);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Boundary
|
|
//purpose :
|
|
//=======================================================================
|
|
const Handle(Geom_Curve) & GeomInt_IntSS::Boundary (const Standard_Integer Index) const
|
|
{
|
|
StdFail_NotDone_Raise_if(!myIntersector.IsDone(),"GeomInt_IntSS::Line");
|
|
Standard_OutOfRange_Raise_if(Index <= 0 || Index > myNbrestr,
|
|
"GeomInt_IntSS::Boundary");
|
|
return sline(Index);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : Pnt2d
|
|
//purpose :
|
|
//=======================================================================
|
|
gp_Pnt2d GeomInt_IntSS::Pnt2d(const Standard_Integer Index,
|
|
const Standard_Boolean OnFirst) const
|
|
{
|
|
const IntPatch_Point& thept = myIntersector.Point(Index);
|
|
Standard_Real U,V;
|
|
if (OnFirst)
|
|
thept.ParametersOnS1(U,V);
|
|
else
|
|
thept.ParametersOnS2(U,V);
|
|
return gp_Pnt2d(U,V);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : HasLineOnS1
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean GeomInt_IntSS::HasLineOnS1(const Standard_Integer index) const
|
|
{
|
|
StdFail_NotDone_Raise_if(!myIntersector.IsDone(),"GeomInt_IntSS::HasLineOnS1");
|
|
return (!slineS1(index).IsNull());
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : HasLineOnS2
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean GeomInt_IntSS::HasLineOnS2(const Standard_Integer index) const
|
|
{
|
|
StdFail_NotDone_Raise_if(!myIntersector.IsDone(),"GeomInt_IntSS::HasLineOnS2");
|
|
return (!slineS2(index).IsNull());
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : LineOnS1
|
|
//purpose :
|
|
//=======================================================================
|
|
const Handle(Geom2d_Curve) & GeomInt_IntSS::LineOnS1(const Standard_Integer Index) const
|
|
{
|
|
StdFail_NotDone_Raise_if(!myIntersector.IsDone(),"GeomInt_IntSS::LineOnS1");
|
|
return slineS1(Index);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : LineOnS2
|
|
//purpose :
|
|
//=======================================================================
|
|
const Handle(Geom2d_Curve) & GeomInt_IntSS::LineOnS2(const Standard_Integer Index) const
|
|
{
|
|
StdFail_NotDone_Raise_if(!myIntersector.IsDone(),"GeomInt_IntSS::LineOnS2");
|
|
return slineS2(Index);
|
|
}
|