ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 02:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

bos #16247: EDF - Problem of partition

Browse Source
This commit is contained in:
jfa 2020-08-12 13:52:36 +03:00
parent fde5bbfe1c
commit 95c850c1c0
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
View File

@ -1677,9 +1677,10 @@ TopoDS_Shape GEOMImpl_ShapeDriver::MakeIsoline
Handle(Geom_Surface) aSurface = BRep_Tool::Surface(theFace); Handle(Geom_Surface) aSurface = BRep_Tool::Surface(theFace);
Handle(Geom_Curve) anIsoCurve = (IsUIso ? Handle(Geom_Curve) anIsoCurve = (IsUIso ?
aSurface->UIso(theParameter) : aSurface->VIso(theParameter)); aSurface->UIso(theParameter) : aSurface->VIso(theParameter));
Handle(Geom2d_Curve) aPIsoCurve = Handle(Geom2d_Curve) aPIsoCurve = aHatcher.GetHatching(aHatchingIndex);
aHatcher.GetHatching(aHatchingIndex);
const Standard_Real aTol = Precision::Confusion(); Standard_Real aTol = BRep_Tool::MaxTolerance(theFace, TopAbs_EDGE);
Standard_Integer anIDom = 1; Standard_Integer anIDom = 1;
Standard_Real aV1; Standard_Real aV1;
Standard_Real aV2; Standard_Real aV2;
@ -1695,6 +1696,10 @@ TopoDS_Shape GEOMImpl_ShapeDriver::MakeIsoline
// Update it with a parametric curve on face. // Update it with a parametric curve on face.
aBuilder.UpdateEdge(anEdge, aPIsoCurve, theFace, aTol); aBuilder.UpdateEdge(anEdge, aPIsoCurve, theFace, aTol);
for (TopExp_Explorer ExV (anEdge, TopAbs_VERTEX); ExV.More(); ExV.Next()) {
TopoDS_Vertex V = TopoDS::Vertex(ExV.Current());
aBuilder.UpdateVertex(V, aTol);
}
aNbEdges++; aNbEdges++;
if (aNbEdges > 1) { if (aNbEdges > 1) {

9
src/GEOMImpl/GEOMImpl_VectorDriver.cxx
View File

@ -28,6 +28,7 @@
#include "GEOM_Object.hxx" #include "GEOM_Object.hxx"
#include <BRepBuilderAPI_MakeEdge.hxx> #include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
#include <Precision.hxx> #include <Precision.hxx>
@ -120,8 +121,12 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(Handle(TFunction_Logbook)& log)
if (P1.Distance(P2) < Precision::Confusion()) { if (P1.Distance(P2) < Precision::Confusion()) {
Standard_ConstructionError::Raise("The end points are too close"); Standard_ConstructionError::Raise("The end points are too close");
} }
aShape = BRepBuilderAPI_MakeEdge(V1, V2).Shape(); TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge(V1, V2);
} Standard_Real aTol = Max(BRep_Tool::Tolerance(V1), BRep_Tool::Tolerance(V2));
BRep_Builder aBuilder;
aBuilder.UpdateEdge(anEdge, aTol);
aShape = anEdge;
}
else if (aType == VECTOR_TANGENT_CURVE_PAR) { else if (aType == VECTOR_TANGENT_CURVE_PAR) {
Handle(GEOM_Function) aRefCurve = aPI.GetCurve(); Handle(GEOM_Function) aRefCurve = aPI.GetCurve();
TopoDS_Shape aRefShape = aRefCurve->GetValue(); TopoDS_Shape aRefShape = aRefCurve->GetValue();