OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0025124: [Feature request] Removal of continuity checks for offset geometries

Browse Source 
Sometimes curve or surface, which is defined as C0, has continuity G1 or above. Offset can be built from these shapes.
Therefore, this extended checking was added into SetBasisCurve and SetBasisSurface methods.

Main changes in function BRepOffset_Tool::ExtentFace(...):
*  "return" is added if intersection (in 2D-space) between two edges in a face cannot be found.

Basis curve/surface continuity value found (if G1-checking is OK) is set up as BasisContinuity (see myBasisCurveContinuity and myBasisSurfContinuity members which is returned by GetBasisCurveContinuity and GetBasisSurfContinuity() methods). This fact is used in Geom2dAdaptor and in GeomAdaptor classes.

Possibility is entered, which allows for basis elements of offset curve/surface to avoid of C0-checking.

Test cases were changed according to their new behavior.

Test-cases for issue #25124
This commit is contained in:
nbv 2014-12-10 16:18:05 +03:00 committed by bugmaster
parent 68cdb44b0a
commit 3d58dc498b
33 changed files with 1959 additions and 1336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@ -217,26 +217,6 @@ static void MakeOffset
const Standard_Boolean IsOpenResult,
const TopoDS_Vertex * Ends);
//=======================================================================
//function : CheckFace
//purpose : Check if face contains an edge with C0 continuity
//=======================================================================
//
static void CheckFace(const TopoDS_Face& theFace)
{
TopExp_Explorer ex(theFace,TopAbs_EDGE);
for(; ex.More(); ex.Next())
{
TopoDS_Edge anEdge=TopoDS::Edge(ex.Current());
Standard_Real f,l;
const Handle(Geom2d_Curve) C = BRep_Tool::CurveOnSurface(anEdge,theFace,f,l);
if (C->Continuity() == GeomAbs_C0)
Standard_ConstructionError::Raise("Initial shape contains an edge with C0 continuity");
}
}
//=======================================================================
//function : KPartCircle
//purpose :
@ -368,9 +348,6 @@ void BRepFill_OffsetWire::Init(const TopoDS_Face& Spine,
// mySpine = TopoDS::Face(Spine.Oriented(TopAbs_FORWARD));
myJoinType = Join;
myIsOpenResult = IsOpenResult;
CheckFace(mySpine);
myMap.Clear();
myMapSpine.Clear();
//------------------------------------------------------------------

32
src/BRepOffset/BRepOffset_Inter3d.cxx
View File

@ -768,7 +768,22 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
//---------------------------------------------------
const TopoDS_Shape SI = Analyse.Ancestors(E).First();
OF1 = TopoDS::Face(InitOffsetFace.Image(SI).First());
OE = TopoDS::Edge(InitOffsetEdge.Image(E).First());
OE = TopoDS::Edge(InitOffsetEdge.Image(E).First());
{
//Check if OE has pcurve in CF
Standard_Real f,l;
Handle (Geom2d_Curve) C1 = BRep_Tool::CurveOnSurface(OE,CF,f,l);
Handle (Geom2d_Curve) C2 = BRep_Tool::CurveOnSurface(OE,OF1,f,l);
if(C1.IsNull() || C2.IsNull())
{
continue;
}
}
//--------------------------------------------------
// MAJ of OE on cap CF.
//--------------------------------------------------
@ -804,6 +819,21 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
//-------------------------------------------------
OF1 = TopoDS::Face(InitOffsetFace.Image(EV).First());
OE = TopoDS::Edge(InitOffsetEdge.Image(V[i]).First());
{
//Check if OE has pcurve in CF and OF1
Standard_Real f,l;
Handle (Geom2d_Curve) C1 = BRep_Tool::CurveOnSurface(OE,CF,f,l);
Handle (Geom2d_Curve) C2 = BRep_Tool::CurveOnSurface(OE,OF1,f,l);
if(C1.IsNull() || C2.IsNull())
{
continue;
}
}
//--------------------------------------------------
// MAj of OE on cap CF.
//--------------------------------------------------

216
src/BRepOffset/BRepOffset_Tool.cxx
View File

@ -3610,101 +3610,135 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face& F,
TopoDS_Edge ERef;
TopoDS_Vertex V1,V2;
for (exp2.Init(W.Oriented(TopAbs_FORWARD),TopAbs_EDGE);
exp2.More(); exp2.Next()) {
for (exp2.Init(W.Oriented(TopAbs_FORWARD),TopAbs_EDGE); exp2.More(); exp2.Next())
{
const TopoDS_Edge& E = TopoDS::Edge(exp2.Current());
TopExp::Vertices (E,V1,V2);
BRep_Tool::Range (E,f,l);
TopoDS_Vertex V;
if (Build.IsBound(E)) {
const TopoDS_Edge& NEOnV1 = TopoDS::Edge(NOnV1(E));
if (Build.IsBound(NEOnV1) &&
(ToBuild.IsBound(E) || ToBuild.IsBound(NEOnV1))) {
if (E.IsSame(NEOnV1))
V = TopExp::FirstVertex(TopoDS::Edge(Build(E)));
else {
//---------------
// intersection.
//---------------
if (!Build.IsBound(V1)) {
Inter2d (EF,TopoDS::Edge(Build(E)),
TopoDS::Edge(Build(NEOnV1)),LV,/*TolConf*/Precision::Confusion());
if (Build(E).Orientation() == TopAbs_FORWARD) {
V = TopoDS::Vertex(LV.First());
}
else {
V = TopoDS::Vertex(LV.Last());
}
}
else {
V = TopoDS::Vertex(Build(V1));
if (MVE (V1).Extent() > 2) {
V.Orientation(TopAbs_FORWARD);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_REVERSED);
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
}
}
}
else {
//------------
//projection
//------------
V = V1;
if (ConstShapes.IsBound(V1)) V = TopoDS::Vertex(ConstShapes(V1));
V.Orientation(TopAbs_FORWARD);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_REVERSED);
if (!TryParameter (E,V,TopoDS::Edge(Build(E)),TolConf))
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
ConstShapes.Bind(V1,V);
Build.Bind (V1,V);
const TopoDS_Edge& NEOnV2 = TopoDS::Edge(NOnV2(E));
if (Build.IsBound(NEOnV2) &&
(ToBuild.IsBound(E) || ToBuild.IsBound(NEOnV2))) {
if (E.IsSame(NEOnV2))
V = TopExp::LastVertex(TopoDS::Edge(Build(E)));
else {
//--------------
// intersection.
//---------------
if (!Build.IsBound(V2)) {
Inter2d (EF,TopoDS::Edge(Build(E)),
TopoDS::Edge(Build(NEOnV2)),LV,/*TolConf*/Precision::Confusion());
if (Build(E).Orientation() == TopAbs_FORWARD) {
V = TopoDS::Vertex(LV.Last());
}
else {
V = TopoDS::Vertex(LV.First());
}
}
else {
V = TopoDS::Vertex(Build(V2));
if (MVE (V2).Extent() > 2) {
V.Orientation(TopAbs_REVERSED);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_FORWARD);
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
}
}
}
else {
//------------
//projection
//------------
V = V2;
if (ConstShapes.IsBound(V2)) V = TopoDS::Vertex(ConstShapes(V2));
V.Orientation(TopAbs_REVERSED);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_FORWARD);
if (!TryParameter (E,V,TopoDS::Edge(Build(E)),TolConf))
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
ConstShapes.Bind(V2,V);
Build.Bind(V2,V);
if (Build.IsBound(E))
{
const TopoDS_Edge& NEOnV1 = TopoDS::Edge(NOnV1(E));
if (Build.IsBound(NEOnV1) && (ToBuild.IsBound(E) || ToBuild.IsBound(NEOnV1)))
{
if (E.IsSame(NEOnV1))
V = TopExp::FirstVertex(TopoDS::Edge(Build(E)));
else
{
//---------------
// intersection.
//---------------
if (!Build.IsBound(V1))
{
Inter2d (EF,TopoDS::Edge(Build(E)), TopoDS::Edge(Build(NEOnV1)),LV,/*TolConf*/Precision::Confusion());
if(!LV.IsEmpty())
{
if (Build(E).Orientation() == TopAbs_FORWARD)
{
V = TopoDS::Vertex(LV.First());
}
else
{
V = TopoDS::Vertex(LV.Last());
}
}
else
{
return;
}
}
else
{
V = TopoDS::Vertex(Build(V1));
if (MVE (V1).Extent() > 2)
{
V.Orientation(TopAbs_FORWARD);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_REVERSED);
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
}
}
}
else
{
//------------
//projection
//------------
V = V1;
if (ConstShapes.IsBound(V1)) V = TopoDS::Vertex(ConstShapes(V1));
V.Orientation(TopAbs_FORWARD);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_REVERSED);
if (!TryParameter (E,V,TopoDS::Edge(Build(E)),TolConf))
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
ConstShapes.Bind(V1,V);
Build.Bind (V1,V);
const TopoDS_Edge& NEOnV2 = TopoDS::Edge(NOnV2(E));
if (Build.IsBound(NEOnV2) && (ToBuild.IsBound(E) || ToBuild.IsBound(NEOnV2)))
{
if (E.IsSame(NEOnV2))
V = TopExp::LastVertex(TopoDS::Edge(Build(E)));
else
{
//--------------
// intersection.
//---------------
if (!Build.IsBound(V2))
{
Inter2d (EF,TopoDS::Edge(Build(E)), TopoDS::Edge(Build(NEOnV2)),LV,/*TolConf*/Precision::Confusion());
if(!LV.IsEmpty())
{
if (Build(E).Orientation() == TopAbs_FORWARD)
{
V = TopoDS::Vertex(LV.Last());
}
else
{
V = TopoDS::Vertex(LV.First());
}
}
else
{
return;
}
}
else
{
V = TopoDS::Vertex(Build(V2));
if (MVE (V2).Extent() > 2)
{
V.Orientation(TopAbs_REVERSED);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_FORWARD);
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
}
}
}
else
{
//------------
//projection
//------------
V = V2;
if (ConstShapes.IsBound(V2))
V = TopoDS::Vertex(ConstShapes(V2));
V.Orientation(TopAbs_REVERSED);
if (Build(E).Orientation() == TopAbs_REVERSED)
V.Orientation(TopAbs_FORWARD);
if (!TryParameter (E,V,TopoDS::Edge(Build(E)),TolConf))
ProjectVertexOnEdge(V,TopoDS::Edge(Build(E)),TolConf);
}
ConstShapes.Bind(V2,V);
Build.Bind(V2,V);
}
}

11
src/BSplCLib/BSplCLib.cxx
View File

@ -1175,7 +1175,8 @@ void BSplCLib::Bohm(const Standard_Real U,
for (j = Degm1; j >= i; j--) {
jDmi--;
*pole -= *tbis; *pole /= (knot[jDmi] - knot[j]);
*pole -= *tbis;
*pole = (knot[jDmi] == knot[j]) ? 0.0 : *pole / (knot[jDmi] - knot[j]);
pole--;
tbis--;
}
@ -1219,7 +1220,7 @@ void BSplCLib::Bohm(const Standard_Real U,
for (j = Degm1; j >= i; j--) {
jDmi--;
coef = 1. / (knot[jDmi] - knot[j]);
coef = (knot[jDmi] == knot[j]) ? 0.0 : 1. / (knot[jDmi] - knot[j]);
*pole -= *tbis; *pole *= coef; pole++; tbis++;
*pole -= *tbis; *pole *= coef;
pole -= 3;
@ -1267,7 +1268,7 @@ void BSplCLib::Bohm(const Standard_Real U,
for (j = Degm1; j >= i; j--) {
jDmi--;
coef = 1. / (knot[jDmi] - knot[j]);
coef = (knot[jDmi] == knot[j]) ? 0.0 : 1. / (knot[jDmi] - knot[j]);
*pole -= *tbis; *pole *= coef; pole++; tbis++;
*pole -= *tbis; *pole *= coef; pole++; tbis++;
*pole -= *tbis; *pole *= coef;
@ -1318,7 +1319,7 @@ void BSplCLib::Bohm(const Standard_Real U,
for (j = Degm1; j >= i; j--) {
jDmi--;
coef = 1. / (knot[jDmi] - knot[j]);
coef = (knot[jDmi] == knot[j]) ? 0.0 : 1. /(knot[jDmi] - knot[j]) ;
*pole -= *tbis; *pole *= coef; pole++; tbis++;
*pole -= *tbis; *pole *= coef; pole++; tbis++;
*pole -= *tbis; *pole *= coef; pole++; tbis++;
@ -1374,7 +1375,7 @@ void BSplCLib::Bohm(const Standard_Real U,
for (j = Degm1; j >= i; j--) {
jDmi--;
coef = 1. / (knot[jDmi] - knot[j]);
coef = (knot[jDmi] == knot[j]) ? 0.0 : 1. / (knot[jDmi] - knot[j]);
for (k = 0; k < Dimension; k++) {
*pole -= *tbis; *pole *= coef; pole++; tbis++;

8
src/Geom/Geom_BSplineCurve.cdl
View File

@ -563,6 +563,14 @@ is
raises RangeError;
---Purpose : Raised if N < 0.
IsG1 (me; theTf, theTl, theAngTol : Real) returns Boolean;
---Purpose :
-- Check if curve has at least G1 continuity in interval [theTf, theTl]
-- Returns true if IsCN(1)
-- or
-- angle betweem "left" and "right" first derivatives at
-- knots with C0 continuity is less then theAngTol
-- only knots in interval [theTf, theTl] is checked
IsClosed (me) returns Boolean;
---Purpose :

78
src/Geom/Geom_BSplineCurve_1.cxx
View File

@ -62,6 +62,84 @@ Standard_Boolean Geom_BSplineCurve::IsCN ( const Standard_Integer N) const
return Standard_False;
}
}
//=======================================================================
//function : IsG1
//purpose :
//=======================================================================
Standard_Boolean Geom_BSplineCurve::IsG1 ( const Standard_Real theTf,
const Standard_Real theTl,
const Standard_Real theAngTol) const
{
if(IsCN(1))
{
return Standard_True;
}
Standard_Integer start = FirstUKnotIndex()+1,
finish = LastUKnotIndex()-1;
Standard_Integer aDeg = Degree();
for(Standard_Integer aNKnot = start; aNKnot <= finish; aNKnot++)
{
const Standard_Real aTpar = Knot(aNKnot);
if(aTpar < theTf)
continue;
if(aTpar > theTl)
break;
Standard_Integer mult = Multiplicity(aNKnot);
if (mult < aDeg)
continue;
gp_Pnt aP1, aP2;
gp_Vec aV1, aV2;
LocalD1(aTpar, aNKnot-1, aNKnot, aP1, aV1);
LocalD1(aTpar, aNKnot, aNKnot+1, aP2, aV2);
if((aV1.SquareMagnitude() <= gp::Resolution()) ||
aV2.SquareMagnitude() <= gp::Resolution())
{
return Standard_False;
}
if(Abs(aV1.Angle(aV2)) > theAngTol)
return Standard_False;
}
if(!IsPeriodic())
return Standard_True;
const Standard_Real aFirstParam = FirstParameter(),
aLastParam = LastParameter();
if( ((aFirstParam - theTf)*(theTl - aFirstParam) < 0.0) &&
((aLastParam - theTf)*(theTl - aLastParam) < 0.0))
{
//Range [theTf, theTl] does not intersect curve bounadries
return Standard_True;
}
//Curve is closed or periodic and range [theTf, theTl]
//intersect curve boundary. Therefore, it is necessary to
//check if curve is smooth in its first and last point.
gp_Pnt aP;
gp_Vec aV1, aV2;
D1(Knot(FirstUKnotIndex()), aP, aV1);
D1(Knot(LastUKnotIndex()), aP, aV2);
if((aV1.SquareMagnitude() <= gp::Resolution()) ||
aV2.SquareMagnitude() <= gp::Resolution())
{
return Standard_False;
}
if(Abs(aV1.Angle(aV2)) > theAngTol)
return Standard_False;
return Standard_True;
}
//=======================================================================
//function : IsClosed

23
src/Geom/Geom_OffsetCurve.cdl
View File

@ -84,7 +84,10 @@ is
Create (C : Curve from Geom; Offset : Real; V : Dir)
Create (C : Curve from Geom;
Offset : Real;
V : Dir;
isNotCheckC0 : Boolean = Standard_False)
returns OffsetCurve
---Purpose :
-- C is the basis curve, Offset is the distance between <me> and
@ -94,6 +97,8 @@ is
-- at this point, the corresponding point on the offset curve is
-- in the direction of the vector-product N = V ^ T where
-- N is a unitary vector.
-- If isNotCheckC0 = TRUE checking if basis curve has C0-continuity
-- is not made.
-- Warnings :
-- In this package the entities are not shared. The OffsetCurve is
-- built with a copy of the curve C. So when C is modified the
@ -122,9 +127,14 @@ is
-- the point of parameter U on this offset curve.
SetBasisCurve (me : mutable; C : Curve from Geom)
SetBasisCurve ( me : mutable;
C : Curve from Geom;
isNotCheckC0 : Boolean = Standard_False)
raises ConstructionError;
---Purpose : Changes this offset curve by assigning C as the basis curve from which it is built.
---Purpose : Changes this offset curve by assigning C
-- as the basis curve from which it is built.
-- If isNotCheckC0 = TRUE checking if basis curve
-- has C0-continuity is not made.
-- Exceptions
-- Standard_ConstructionError if the curve C is not at least "C1" continuous.
@ -348,10 +358,15 @@ is
Copy (me) returns like me;
---Purpose: Creates a new object which is a copy of this offset curve.
GetBasisCurveContinuity(me)
returns Shape from GeomAbs;
---Purpose: Returns continuity of the basis curve.
fields
basisCurve : Curve from Geom;
direction : Dir;
offsetValue : Real;
myBasisCurveContinuity : Shape from GeomAbs;
end;

133
src/Geom/Geom_OffsetCurve.cxx
View File

@ -59,6 +59,7 @@ typedef gp_XYZ XYZ;
//derivee non nulle
static const int maxDerivOrder = 3;
static const Standard_Real MinStep = 1e-7;
static const Standard_Real MyAngularToleranceForG1 = Precision::Angular();
@ -79,34 +80,17 @@ Handle(Geom_Geometry) Geom_OffsetCurve::Copy () const {
//=======================================================================
//function : Geom_OffsetCurve
//purpose :
//purpose : Basis curve cannot be an Offset curve or trimmed from
// offset curve.
//=======================================================================
Geom_OffsetCurve::Geom_OffsetCurve (const Handle(Curve)& C,
const Standard_Real Offset,
const Dir& V )
: direction(V), offsetValue(Offset)
Geom_OffsetCurve::Geom_OffsetCurve (const Handle(Geom_Curve)& theCurve,
const Standard_Real theOffset,
const gp_Dir& theDir,
const Standard_Boolean isTheNotCheckC0)
: direction(theDir), offsetValue(theOffset)
{
if (C->DynamicType() == STANDARD_TYPE(Geom_OffsetCurve)) {
Handle(OffsetCurve) OC = Handle(OffsetCurve)::DownCast(C);
SetBasisCurve (OC->BasisCurve());
Standard_Real PrevOff = OC->Offset();
gp_Vec V1(OC->Direction());
gp_Vec V2(direction);
gp_Vec Vdir(PrevOff*V1 + offsetValue*V2);
if (Offset >= 0.) {
offsetValue = Vdir.Magnitude();
direction.SetXYZ(Vdir.XYZ());
} else {
offsetValue = -Vdir.Magnitude();
direction.SetXYZ((-Vdir).XYZ());
}
}
else {
SetBasisCurve(C);
}
SetBasisCurve (theCurve, isTheNotCheckC0);
}
@ -182,36 +166,78 @@ Standard_Real Geom_OffsetCurve::Period () const
//purpose :
//=======================================================================
void Geom_OffsetCurve::SetBasisCurve (const Handle(Curve)& C)
void Geom_OffsetCurve::SetBasisCurve (const Handle(Curve)& C,
const Standard_Boolean isNotCheckC0)
{
Handle(Curve) aBasisCurve = Handle(Curve)::DownCast(C->Copy());
const Standard_Real aUf = C->FirstParameter(),
aUl = C->LastParameter();
Handle(Curve) aCheckingCurve = Handle(Curve)::DownCast(C->Copy());
Standard_Boolean isTrimmed = Standard_False;
while(aCheckingCurve->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)) ||
aCheckingCurve->IsKind(STANDARD_TYPE(Geom_OffsetCurve)))
{
if (aCheckingCurve->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)))
{
Handle(Geom_TrimmedCurve) aTrimC =
Handle(Geom_TrimmedCurve)::DownCast(aCheckingCurve);
aCheckingCurve = aTrimC->BasisCurve();
isTrimmed = Standard_True;
}
if (aCheckingCurve->IsKind(STANDARD_TYPE(Geom_OffsetCurve)))
{
Handle(Geom_OffsetCurve) aOC =
Handle(Geom_OffsetCurve)::DownCast(aCheckingCurve);
aCheckingCurve = aOC->BasisCurve();
Standard_Real PrevOff = aOC->Offset();
gp_Vec V1(aOC->Direction());
gp_Vec V2(direction);
gp_Vec Vdir(PrevOff*V1 + offsetValue*V2);
if (offsetValue >= 0.)
{
offsetValue = Vdir.Magnitude();
direction.SetXYZ(Vdir.XYZ());
}
else
{
offsetValue = -Vdir.Magnitude();
direction.SetXYZ((-Vdir).XYZ());
}
}
}
myBasisCurveContinuity = aCheckingCurve->Continuity();
Standard_Boolean isC0 = !isNotCheckC0 &&
(myBasisCurveContinuity == GeomAbs_C0);
// Basis curve must be at least C1
if (aBasisCurve->Continuity() == GeomAbs_C0)
if (isC0 && aCheckingCurve->IsKind(STANDARD_TYPE(Geom_BSplineCurve)))
{
// For B-splines it is sometimes possible to increase continuity by removing
// unnecessarily duplicated knots
if (aBasisCurve->IsKind(STANDARD_TYPE(Geom_BSplineCurve)))
Handle(Geom_BSplineCurve) aBC = Handle(Geom_BSplineCurve)::DownCast(aCheckingCurve);
if(aBC->IsG1(aUf, aUl, MyAngularToleranceForG1))
{
Handle(Geom_BSplineCurve) aBCurve = Handle(Geom_BSplineCurve)::DownCast(aBasisCurve);
Standard_Integer degree = aBCurve->Degree();
Standard_Real Toler = Precision::Confusion();
Standard_Integer start = aBCurve->IsPeriodic() ? 1 : aBCurve->FirstUKnotIndex(),
finish = aBCurve->IsPeriodic() ? aBCurve->NbKnots() : aBCurve->LastUKnotIndex();
for (Standard_Integer i = start; i <= finish; i++)
{
Standard_Integer mult = aBCurve->Multiplicity(i);
if ( mult == degree )
aBCurve->RemoveKnot(i,degree - 1, Toler);
}
//Checking if basis curve has more smooth (C1, G2 and above) is not done.
//It can be done in case of need.
myBasisCurveContinuity = GeomAbs_G1;
isC0 = Standard_False;
}
// Raise exception if still C0
if (aBasisCurve->Continuity() == GeomAbs_C0)
if (isC0)
Standard_ConstructionError::Raise("Offset on C0 curve");
}
basisCurve = aBasisCurve;
//
if(isTrimmed)
{
basisCurve = new Geom_TrimmedCurve(aCheckingCurve, aUf, aUl);
}
else
{
basisCurve = aCheckingCurve;
}
}
@ -235,7 +261,7 @@ Handle(Curve) Geom_OffsetCurve::BasisCurve () const
GeomAbs_Shape Geom_OffsetCurve::Continuity () const {
GeomAbs_Shape OffsetShape=GeomAbs_C0;
switch (basisCurve->Continuity()) {
switch (myBasisCurveContinuity) {
case GeomAbs_C0 : OffsetShape = GeomAbs_C0; break;
case GeomAbs_C1 : OffsetShape = GeomAbs_C0; break;
case GeomAbs_C2 : OffsetShape = GeomAbs_C1; break;
@ -825,13 +851,13 @@ Standard_Real Geom_OffsetCurve::Offset () const { return offsetValue; }
void Geom_OffsetCurve::Value (const Standard_Real theU, Pnt& theP,
Pnt& thePbasis, Vec& theV1basis) const
{
if (basisCurve->Continuity() == GeomAbs_C0)
{
if (myBasisCurveContinuity == GeomAbs_C0)
Geom_UndefinedValue::Raise("Exception: Basis curve is C0 continuity!");
basisCurve->D1(theU, thePbasis, theV1basis);
D0(theU,theP);
}
}
//=======================================================================
@ -894,3 +920,12 @@ const
{
return basisCurve->ParametricTransformation(T);
}
//=======================================================================
//function : GetBasisCurveContinuity
//purpose :
//=======================================================================
GeomAbs_Shape Geom_OffsetCurve::GetBasisCurveContinuity() const
{
return myBasisCurveContinuity;
}

19
src/Geom/Geom_OffsetSurface.cdl
View File

@ -68,7 +68,10 @@ is
Create (S : Surface from Geom; Offset : Real) returns OffsetSurface
Create (S : Surface from Geom;
Offset : Real;
isNotCheckC0 : Boolean = Standard_False)
returns OffsetSurface
---Purpose : Constructs a surface offset from the basis surface
-- S, where Offset is the distance between the offset
-- surface and the basis surface at any point.
@ -81,6 +84,8 @@ is
-- which the offset value is measured is indicated by
-- this normal vector if Offset is positive, or is the
-- inverse sense if Offset is negative.
-- If isNotCheckC0 = TRUE checking if basis surface has C0-continuity
-- is not made.
-- Warnings :
-- - The offset surface is built with a copy of the
-- surface S. Therefore, when S is modified the
@ -95,12 +100,16 @@ is
SetBasisSurface (me : mutable; S : Surface from Geom)
SetBasisSurface ( me : mutable;
S : Surface from Geom;
isNotCheckC0 : Boolean = Standard_False)
raises ConstructionError;
---Purpose : Raised if S is not at least C1.
-- Warnings :
-- No check is done to verify that a unique normal direction is
-- defined at any point of the basis surface S.
-- If isNotCheckC0 = TRUE checking if basis surface has C0-continuity
-- is not made.
-- Exceptions
-- Standard_ConstructionError if the surface S is not
-- at least "C1" continuous.
@ -484,11 +493,15 @@ is
-- these vectors have opposite direction.
returns Boolean from Standard;
GetBasisSurfContinuity(me)
returns Shape from GeomAbs;
---Purpose: Returns continuity of the basis surface.
fields
basisSurf : Surface from Geom;
equivSurf : Surface from Geom;
offsetValue : Real;
myOscSurf : OsculatingSurface from Geom;
myBasisSurfContinuity : Shape from GeomAbs;
end;

1210
src/Geom/Geom_OffsetSurface.cxx
View File

File diff suppressed because it is too large Load Diff

959
src/Geom/Geom_OsculatingSurface.cxx
View File

File diff suppressed because it is too large Load Diff

8
src/Geom2d/Geom2d_BSplineCurve.cdl
View File

@ -614,6 +614,14 @@ is
-- Exceptions Standard_RangeError if N is negative.
raises RangeError;
IsG1 (me; theTf, theTl, theAngTol : Real) returns Boolean;
---Purpose :
-- Check if curve has at least G1 continuity in interval [theTf, theTl]
-- Returns true if IsCN(1)
-- or
-- angle betweem "left" and "right" first derivatives at
-- knots with C0 continuity is less then theAngTol
-- only knots in interval [theTf, theTl] is checked
IsClosed (me) returns Boolean;
--- Purpose :

81
src/Geom2d/Geom2d_BSplineCurve_1.cxx
View File

@ -61,6 +61,87 @@ Standard_Boolean Geom2d_BSplineCurve::IsCN ( const Standard_Integer N) const
return Standard_False;
}
}
//=======================================================================
//function : IsG1
//purpose :
//=======================================================================
Standard_Boolean Geom2d_BSplineCurve::IsG1 ( const Standard_Real theTf,
const Standard_Real theTl,
const Standard_Real theAngTol) const
{
if(IsCN(1))
{
return Standard_True;
}
Standard_Integer start = FirstUKnotIndex()+1,
finish = LastUKnotIndex()-1;
Standard_Integer aDeg = Degree();
for(Standard_Integer aNKnot = start; aNKnot <= finish; aNKnot++)
{
const Standard_Real aTpar = Knot(aNKnot);
if(aTpar < theTf)
continue;
if(aTpar > theTl)
break;
Standard_Integer mult = Multiplicity(aNKnot);
if (mult < aDeg)
continue;
gp_Pnt2d aP1, aP2;
gp_Vec2d aV1, aV2;
LocalD1(aTpar, aNKnot-1, aNKnot, aP1, aV1);
LocalD1(aTpar, aNKnot, aNKnot+1, aP2, aV2);
if((aV1.SquareMagnitude() <= gp::Resolution()) ||
aV2.SquareMagnitude() <= gp::Resolution())
{
return Standard_False;
}
if(Abs(aV1.Angle(aV2)) > theAngTol)
return Standard_False;
}
if(!IsPeriodic())
return Standard_True;
const Standard_Real aFirstParam = FirstParameter(),
aLastParam = LastParameter();
if( ((aFirstParam - theTf)*(theTl - aFirstParam) < 0.0) &&
((aLastParam - theTf)*(theTl - aLastParam) < 0.0))
{
//Range [theTf, theTl] does not intersect curve bounadries
return Standard_True;
}
//Curve is closed or periodic and range [theTf, theTl]
//intersect curve boundary. Therefore, it is necessary to
//check if curve is smooth in its first and last point.
gp_Pnt2d aP;
gp_Vec2d aV1, aV2;
D1(Knot(FirstUKnotIndex()), aP, aV1);
D1(Knot(LastUKnotIndex()), aP, aV2);
if((aV1.SquareMagnitude() <= gp::Resolution()) ||
aV2.SquareMagnitude() <= gp::Resolution())
{
return Standard_False;
}
if(Abs(aV1.Angle(aV2)) > theAngTol)
return Standard_False;
return Standard_True;
}
//=======================================================================
//function : IsClosed

27
src/Geom2d/Geom2d_OffsetCurve.cdl
View File

@ -77,7 +77,11 @@ raises ConstructionError from Standard,
is
Create (C : Curve from Geom2d; Offset : Real) returns OffsetCurve
Create (C : Curve from Geom2d;
Offset : Real;
isNotCheckC0 : Boolean = Standard_False)
returns OffsetCurve
--- Purpose : Constructs a curve offset from the basis curve C,
-- where Offset is the distance between the offset
-- curve and the basis curve at any point.
@ -89,11 +93,14 @@ is
-- the offset value is measured is indicated by this
-- normal vector if Offset is positive, or in the inverse
-- sense if Offset is negative.
-- If isNotCheckC0 = TRUE checking if basis curve has C0-continuity
-- is not made.
-- Warnings :
-- In this package the entities are not shared. The OffsetCurve is
-- built with a copy of the curve C. So when C is modified the
-- OffsetCurve is not modified
-- Warning! ConstructionError raised if the basis curve C is not at least C1.
-- Warning! if isNotCheckC0 = false,
-- ConstructionError raised if the basis curve C is not at least C1.
-- No check is done to know if ||V^Z|| != 0.0 at any point.
raises ConstructionError;
@ -115,11 +122,16 @@ is
-- the point of parameter U on this offset curve.
SetBasisCurve (me : mutable; C : Curve from Geom2d)
SetBasisCurve ( me : mutable;
C : Curve from Geom2d;
isNotCheckC0 : Boolean = Standard_False)
raises ConstructionError;
--- Purpose : Changes this offset curve by assigning C as the
-- basis curve from which it is built.
-- If isNotCheckC0 = TRUE checking if basis curve has C0-continuity
-- is not made.
-- Exceptions
-- if isNotCheckC0 = false,
-- Standard_ConstructionError if the curve C is not at least "C1" continuous.
SetOffsetValue (me : mutable; D : Real);
@ -329,10 +341,17 @@ is
Copy (me) returns like me;
---Purpose: Creates a new object, which is a copy of this offset curve.
---Purpose: Creates a new object, which is a copy of this offset curve.
GetBasisCurveContinuity(me)
returns Shape from GeomAbs;
---Purpose: Returns continuity of the basis curve.
fields
basisCurve : Curve from Geom2d;
offsetValue : Real;
myBasisCurveContinuity : Shape from GeomAbs;
end;

101
src/Geom2d/Geom2d_OffsetCurve.cxx
View File

@ -34,6 +34,7 @@
#include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <gp_XY.hxx>
#include <Precision.hxx>
typedef Handle(Geom2d_OffsetCurve) Handle(OffsetCurve);
typedef Geom2d_OffsetCurve OffsetCurve;
@ -51,7 +52,7 @@ typedef gp_XY XY;
//derivee non nulle
static const int maxDerivOrder = 3;
static const Standard_Real MinStep = 1e-7;
static const Standard_Real MyAngularToleranceForG1 = Precision::Angular();
//=======================================================================
//function : Copy
@ -68,21 +69,16 @@ Handle(Geom2d_Geometry) Geom2d_OffsetCurve::Copy () const
//=======================================================================
//function : Geom2d_OffsetCurve
//purpose :
//purpose : Basis curve cannot be an Offset curve or trimmed from
// offset curve.
//=======================================================================
Geom2d_OffsetCurve::Geom2d_OffsetCurve (const Handle(Curve)& C,
const Standard_Real Offset)
: offsetValue (Offset)
Geom2d_OffsetCurve::Geom2d_OffsetCurve (const Handle(Geom2d_Curve)& theCurve,
const Standard_Real theOffset,
const Standard_Boolean isTheNotCheckC0)
: offsetValue (theOffset)
{
if (C->DynamicType() == STANDARD_TYPE(Geom2d_OffsetCurve)) {
Handle(OffsetCurve) OC = Handle(OffsetCurve)::DownCast(C);
SetBasisCurve (OC->BasisCurve());
offsetValue += OC->Offset();
}
else {
SetBasisCurve(C);
}
SetBasisCurve (theCurve, isTheNotCheckC0);
}
//=======================================================================
@ -111,36 +107,65 @@ Standard_Real Geom2d_OffsetCurve::ReversedParameter( const Standard_Real U) cons
//purpose :
//=======================================================================
void Geom2d_OffsetCurve::SetBasisCurve (const Handle(Curve)& C)
void Geom2d_OffsetCurve::SetBasisCurve (const Handle(Curve)& C,
const Standard_Boolean isNotCheckC0)
{
Handle(Geom2d_Curve) aBasisCurve = Handle(Geom2d_Curve)::DownCast(C->Copy());
const Standard_Real aUf = C->FirstParameter(),
aUl = C->LastParameter();
Handle(Geom2d_Curve) aCheckingCurve = C;
Standard_Boolean isTrimmed = Standard_False;
while(aCheckingCurve->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve)) ||
aCheckingCurve->IsKind(STANDARD_TYPE(Geom2d_OffsetCurve)))
{
if (aCheckingCurve->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve)))
{
Handle(Geom2d_TrimmedCurve) aTrimC =
Handle(Geom2d_TrimmedCurve)::DownCast(aCheckingCurve);
aCheckingCurve = aTrimC->BasisCurve();
isTrimmed = Standard_True;
}
if (aCheckingCurve->IsKind(STANDARD_TYPE(Geom2d_OffsetCurve)))
{
Handle(Geom2d_OffsetCurve) aOC =
Handle(Geom2d_OffsetCurve)::DownCast(aCheckingCurve);
aCheckingCurve = aOC->BasisCurve();
offsetValue += aOC->Offset();
}
}
myBasisCurveContinuity = aCheckingCurve->Continuity();
Standard_Boolean isC0 = !isNotCheckC0 &&
(myBasisCurveContinuity == GeomAbs_C0);
// Basis curve must be at least C1
if (aBasisCurve->Continuity() == GeomAbs_C0)
if (isC0 && aCheckingCurve->IsKind(STANDARD_TYPE(Geom2d_BSplineCurve)))
{
// For B-splines it is sometimes possible to increase continuity by removing
// unnecessarily duplicated knots
if (aBasisCurve->IsKind(STANDARD_TYPE(Geom2d_BSplineCurve)))
Handle(Geom2d_BSplineCurve) aBC = Handle(Geom2d_BSplineCurve)::DownCast(aCheckingCurve);
if(aBC->IsG1(aUf, aUl, MyAngularToleranceForG1))
{
Handle(Geom2d_BSplineCurve) aBCurve = Handle(Geom2d_BSplineCurve)::DownCast(aBasisCurve);
Standard_Integer degree = aBCurve->Degree();
Standard_Real Toler = 1e-7;
Standard_Integer start = aBCurve->IsPeriodic() ? 1 : aBCurve->FirstUKnotIndex(),
finish = aBCurve->IsPeriodic() ? aBCurve->NbKnots() : aBCurve->LastUKnotIndex();
for (Standard_Integer i = start; i <= finish; i++)
{
Standard_Integer mult = aBCurve->Multiplicity(i);
if ( mult == degree )
aBCurve->RemoveKnot(i,degree - 1, Toler);
}
//Checking if basis curve has more smooth (C1, G2 and above) is not done.
//It can be done in case of need.
myBasisCurveContinuity = GeomAbs_G1;
isC0 = Standard_False;
}
// Raise exception if still C0
if (aBasisCurve->Continuity() == GeomAbs_C0)
if (isC0)
Standard_ConstructionError::Raise("Offset on C0 curve");
}
//
if(isTrimmed)
{
basisCurve = new Geom2d_TrimmedCurve(aCheckingCurve, aUf, aUl);
}
else
{
basisCurve = aCheckingCurve;
}
basisCurve = aBasisCurve;
}
//=======================================================================
@ -168,7 +193,7 @@ Handle(Curve) Geom2d_OffsetCurve::BasisCurve () const
GeomAbs_Shape Geom2d_OffsetCurve::Continuity () const
{
GeomAbs_Shape OffsetShape=GeomAbs_C0;
switch (basisCurve->Continuity()) {
switch (myBasisCurveContinuity) {
case GeomAbs_C0 : OffsetShape = GeomAbs_C0; break;
case GeomAbs_C1 : OffsetShape = GeomAbs_C0; break;
case GeomAbs_C2 : OffsetShape = GeomAbs_C1; break;
@ -177,6 +202,7 @@ GeomAbs_Shape Geom2d_OffsetCurve::Continuity () const
case GeomAbs_G1 : OffsetShape = GeomAbs_G1; break;
case GeomAbs_G2 : OffsetShape = GeomAbs_G2; break;
}
return OffsetShape;
}
@ -926,3 +952,12 @@ Standard_Real Geom2d_OffsetCurve::ParametricTransformation(const gp_Trsf2d& T) c
{
return basisCurve->ParametricTransformation(T);
}
//=======================================================================
//function : GetBasisCurveContinuity
//purpose :
//=======================================================================
GeomAbs_Shape Geom2d_OffsetCurve::GetBasisCurveContinuity() const
{
return myBasisCurveContinuity;
}

5
src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx
View File

@ -214,12 +214,15 @@ GeomAbs_Shape Geom2dAdaptor_Curve::Continuity() const
}
else if (myCurve->IsKind(STANDARD_TYPE(Geom2d_OffsetCurve))){
GeomAbs_Shape S =
(*((Handle(Geom2d_OffsetCurve)*)&myCurve))->BasisCurve()->Continuity();
(*((Handle(Geom2d_OffsetCurve)*)&myCurve))->GetBasisCurveContinuity();
switch(S){
case GeomAbs_CN: return GeomAbs_CN;
case GeomAbs_C3: return GeomAbs_C2;
case GeomAbs_C2: return GeomAbs_C1;
case GeomAbs_C1: return GeomAbs_C0;
case GeomAbs_G1: return GeomAbs_G1;
case GeomAbs_G2: return GeomAbs_G2;
default:
Standard_NoSuchObject::Raise("Geom2dAdaptor_Curve::Continuity");
}

8
src/GeomAdaptor/GeomAdaptor_Curve.cxx
View File

@ -179,15 +179,17 @@ GeomAbs_Shape GeomAdaptor_Curve::Continuity() const
if (myCurve->IsKind(STANDARD_TYPE(Geom_OffsetCurve)))
{
const GeomAbs_Shape S =
(*((Handle(Geom_OffsetCurve)*)&myCurve))->BasisCurve()->Continuity();
(*((Handle(Geom_OffsetCurve)*)&myCurve))->GetBasisCurveContinuity();
switch(S)
{
case GeomAbs_CN: return GeomAbs_CN;
case GeomAbs_C3: return GeomAbs_C2;
case GeomAbs_C2: return GeomAbs_C1;
case GeomAbs_C1: return GeomAbs_C0;
case GeomAbs_C1: return GeomAbs_C0;
case GeomAbs_G1: return GeomAbs_G1;
case GeomAbs_G2: return GeomAbs_G2;
default:
Standard_NoSuchObject::Raise("GeomAdaptor_Curve::Continuity");
Standard_NoSuchObject::Raise("GeomAdaptor_Curve::Continuity");
}
}
else if (myTypeCurve == GeomAbs_OtherCurve) {

33
tests/bugs/modalg_5/bug25124_1 Normal file
View File

@ -0,0 +1,33 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
set ver_info_1 "\n\n*********** Dump of cc *************\nTrimmed curve\nParameters : 2 5\nBasis curve :\nOffsetCurveOffset : 10\nDirection : 0, 0, 1 \nBasis curve :\nTrimmed curve\nParameters : 1 6\nBasis curve :\nCircle"
set ver_info_2 "\n\n*********** Dump of oc *************\nOffsetCurveOffset : 20\nDirection : 0, 0, 1 \nBasis curve :\nTrimmed curve\nParameters : 2 5\nBasis curve :\nCircle"
point pp 0 0 1
circle cc 20 40 30 20
trim cc cc 1 6
offsetcurve oc cc 10 pp
trim cc oc 2 5
set bug_info_1 [dump cc]
offsetcurve oc cc 10 pp
set bug_info_2 [dump oc]
if {[string first $ver_info_1 $bug_info_1] == -1} {
puts "ERROR: OCC25124 is reproduced (dump of cc)."
}
if {[string first $ver_info_2 $bug_info_2] == -1} {
puts "ERROR: OCC25124 is reproduced (dump of oc)."
}
donly oc cc
fit
set only_screen_axo 1

32
tests/bugs/modalg_5/bug25124_2 Normal file
View File

@ -0,0 +1,32 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
set ver_info_1 "\n\n*********** Dump of cc *************\nTrimmed curve\nParameters : 2 5\nBasis curve :\nOffsetCurveOffset : 10\nBasis curve :\nTrimmed curve\nParameters : 1 6\nBasis curve :\nCircle"
set ver_info_2 "\n\n*********** Dump of oc *************\nOffsetCurveOffset : 20\nBasis curve :\nTrimmed curve\nParameters : 2 5\nBasis curve :\nCircle"
circle cc 20 40 20
trim cc cc 1 6
offset2dcurve oc cc 10
trim cc oc 2 5
set bug_info_1 [dump cc]
offset2dcurve oc cc 10
set bug_info_2 [dump oc]
if {[string first $ver_info_1 $bug_info_1] == -1} {
puts "ERROR: OCC25124 is reproduced (dump of cc)."
}
if {[string first $ver_info_2 $bug_info_2] == -1} {
puts "ERROR: OCC25124 is reproduced (dump of oc)."
}
donly oc cc
fit
set only_screen_axo 1

32
tests/bugs/modalg_5/bug25124_3 Normal file
View File

@ -0,0 +1,32 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
set ver_info_1 "\n\n*********** Dump of ss *************\nRectangularTrimmedSurface\nParameters : 1 5.5 -0.8 0.5\nBasisSurface :\nOffsetSurface\nOffset : 10\nBasisSurface :\nRectangularTrimmedSurface\nParameters : 1 5.5 -0.8 0.5\nBasisSurface :\nSphericalSurface"
set ver_info_2 "\n\n*********** Dump of os *************\nOffsetSurface\nOffset : 20\nBasisSurface :\nRectangularTrimmedSurface\nParameters : 1 5.5 -0.8 0.5\nBasisSurface :\nSphericalSurface"
sphere ss 30
trim ss ss 0.5 6 -1 1
offset os ss 10
trim ss os 1 5.5 -0.8 0.5
set bug_info_1 [dump ss]
offset os ss 10
set bug_info_2 [dump os]
if {[string first $ver_info_1 $bug_info_1] == -1} {
puts "ERROR: OCC25124 is reproduced (dump of ss)."
}
if {[string first $ver_info_2 $bug_info_2] == -1} {
puts "ERROR: OCC25124 is reproduced (dump of os)."
}
donly os ss
fit
set only_screen_axo 1

38
tests/bugs/modalg_5/bug25124_4 Normal file
View File

@ -0,0 +1,38 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
point pp 0 0 1
circle cc 20 40 30 20
convert bc cc
trim bc bc 1 6
offsetcurve oc bc 10 pp
trim bc oc 2 5
extsurf se bc 0 0 1
offset os se 15
set bug_info [getsurfcontinuity se]
getsurfcontinuity os
if {[string compare $bug_info "se has G1 continuity.\n"] != 0} {
puts "ERROR: OCC25124 is reproduced (se does not have G1 continuity)."
}
set bug_info_1 [dump se]
set bug_info_1 [string range $bug_info_1 39 [expr {[string length $bug_info_1] -1}]]
set bug_info_2 [dump os]
set bug_info_2 [string range $bug_info_2 39 [expr {[string length $bug_info_2] -1}]]
if {[string compare $bug_info_1 $bug_info_2] == 0} {
puts "ERROR: OCC25124 is reproduced (se = os)."
}
donly os se
fit
set only_screen_axo 1

38
tests/bugs/modalg_5/bug25124_5 Normal file
View File

@ -0,0 +1,38 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
point pp 0 0 1
circle cc 20 40 30 20
convert bc cc
trim bc bc 1 6
offsetcurve oc bc 10 pp
trim bc oc 2 5
revsurf se bc 0 0 0 0 1 0
offset os se 15
set bug_info [getsurfcontinuity se]
getsurfcontinuity os
if {[string compare $bug_info "se has G1 continuity.\n"] != 0} {
puts "ERROR: OCC25124 is reproduced (se does not have G1 continuity)."
}
set bug_info_1 [dump se]
set bug_info_1 [string range $bug_info_1 39 [expr {[string length $bug_info_1] -1}]]
set bug_info_2 [dump os]
set bug_info_2 [string range $bug_info_2 39 [expr {[string length $bug_info_2] -1}]]
if {[string compare $bug_info_1 $bug_info_2] == 0} {
puts "ERROR: OCC25124 is reproduced (se = os)."
}
donly os se
fit
set only_screen_axo 1

27
tests/bugs/modalg_5/bug25124_6 Normal file
View File

@ -0,0 +1,27 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
restore [locate_data_file OCC25124_a_2999.draw] a1
getsurfcontinuity a1
offset o1 a1 20
getsurfcontinuity o1
set bug_info_1 [dump a1]
set bug_info_1 [string range $bug_info_1 39 [expr {[string length $bug_info_1] -1}]]
set bug_info_2 [dump o1]
set bug_info_2 [string range $bug_info_2 39 [expr {[string length $bug_info_2] -1}]]
if {[string compare $bug_info_1 $bug_info_2] == 0} {
puts "ERROR: OCC25124 is reproduced (a1 = o1)."
}
donly a1 o1
fit
set only_screen_axo 1

27
tests/bugs/modalg_5/bug25124_7 Normal file
View File

@ -0,0 +1,27 @@
puts "========"
puts "OCC25124"
puts "========"
puts ""
######################################################
# Removal of continuity checks for offset geometries
######################################################
smallview
restore [locate_data_file OCC25124_a_15592.draw] a2
getsurfcontinuity a2
offset o2 a2 20
getsurfcontinuity o2
set bug_info_1 [dump a2]
set bug_info_1 [string range $bug_info_1 39 [expr {[string length $bug_info_1] -1}]]
set bug_info_2 [dump o2]
set bug_info_2 [string range $bug_info_2 39 [expr {[string length $bug_info_2] -1}]]
if {[string compare $bug_info_1 $bug_info_2] == 0} {
puts "ERROR: OCC25124 is reproduced (a2 = o2)."
}
donly a2 o2
fit
set only_screen_axo 1

14
tests/offset/wire_unclosed_outside_0_005/B3
View File

@ -1,13 +1,9 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC25124068 ALL: Error : big tolerance of shape result"
restore [locate_data_file offset_wire_034.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 910.505
set nbsh_v 14
set nbsh_e 14
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_005/B4
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file case_3_wire2.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 910.505
set nbsh_v 30
set nbsh_e 30
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_005/B6
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_058.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 3316.27
set nbsh_v 62
set nbsh_e 62
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_025/B2
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_033.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 68.7414
set nbsh_v 61
set nbsh_e 61
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_025/B4
View File

@ -1,13 +1,9 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
puts "TODO OCC25109 ALL: Faulty shapes in variables"
restore [locate_data_file case_3_wire2.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 957.647
set nbsh_v 86
set nbsh_e 86
set nbsh_w 2

14
tests/offset/wire_unclosed_outside_0_025/B6
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_058.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 2582.56
set nbsh_v 47
set nbsh_e 47
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_075/B1
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_032.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 92.0671
set nbsh_v 41
set nbsh_e 41
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_075/B2
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_033.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 78.0343
set nbsh_v 60
set nbsh_e 60
set nbsh_w 1

14
tests/offset/wire_unclosed_outside_0_075/B6
View File

@ -1,13 +1,7 @@
puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
puts "TODO ?OCC23068 ALL: An exception was caught"
puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
puts "TODO ?OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_058.brep] s
set length 0
set nbsh_v 0
set nbsh_e 0
set nbsh_w 0
set length 3127.75
set nbsh_v 39
set nbsh_e 39
set nbsh_w 1