ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-09-22 10:42:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

[bos #36169] EDF 25230 - Conversion xyz => uv => xyz. Replace all calls of ShapeAnalysis::GetFaceUVBounds to BRepTools::UVBounds.

Browse Source
This commit is contained in:
jfa 2023-08-14 14:46:57 +01:00
parent 1e6d06f174
commit d07da73210
6 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BlockFix/BlockFix_SphereSpaceModifier.cxx
View File

@ -26,8 +26,6 @@
#include <BlockFix_SphereSpaceModifier.hxx> #include <BlockFix_SphereSpaceModifier.hxx>
#include <ShapeAnalysis.hxx>
#include <ShapeFix_Edge.hxx> #include <ShapeFix_Edge.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
@ -109,7 +107,7 @@ static Standard_Boolean ModifySurface(const TopoDS_Face& theFace,
if (aSurf->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) { if (aSurf->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) {
Standard_Real Umin, Umax, Vmin, Vmax; Standard_Real Umin, Umax, Vmin, Vmax;
ShapeAnalysis::GetFaceUVBounds (aFace, Umin, Umax, Vmin, Vmax); BRepTools::UVBounds(aFace, Umin, Umax, Vmin, Vmax);
Standard_Real PI2 = M_PI/2.; Standard_Real PI2 = M_PI/2.;
Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(aSurf); Handle(Geom_SphericalSurface) aSphere = Handle(Geom_SphericalSurface)::DownCast(aSurf);
gp_Sphere sp = aSphere->Sphere(); gp_Sphere sp = aSphere->Sphere();

5
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -73,7 +73,6 @@
#include <Geom_Plane.hxx> #include <Geom_Plane.hxx>
#include <GProp_GProps.hxx> #include <GProp_GProps.hxx>
#include <GProp_PrincipalProps.hxx> #include <GProp_PrincipalProps.hxx>
#include <ShapeAnalysis.hxx>
#include <ShapeAnalysis_Surface.hxx> #include <ShapeAnalysis_Surface.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
@ -2797,7 +2796,7 @@ Standard_Real GEOMImpl_IMeasureOperations::MaxSurfaceCurvatureByParam
//Compute the parameters //Compute the parameters
Standard_Real U1,U2,V1,V2; Standard_Real U1,U2,V1,V2;
ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2); BRepTools::UVBounds(F,U1,U2,V1,V2);
Standard_Real U = U1 + (U2-U1)*theUParam; Standard_Real U = U1 + (U2-U1)*theUParam;
Standard_Real V = V1 + (V2-V1)*theVParam; Standard_Real V = V1 + (V2-V1)*theVParam;
@ -2870,7 +2869,7 @@ Standard_Real GEOMImpl_IMeasureOperations::MinSurfaceCurvatureByParam
//Compute the parameters //Compute the parameters
Standard_Real U1,U2,V1,V2; Standard_Real U1,U2,V1,V2;
ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2); BRepTools::UVBounds(F,U1,U2,V1,V2);
Standard_Real U = U1 + (U2-U1)*theUParam; Standard_Real U = U1 + (U2-U1)*theUParam;
Standard_Real V = V1 + (V2-V1)*theVParam; Standard_Real V = V1 + (V2-V1)*theVParam;

4
src/GEOMImpl/GEOMImpl_PlaneDriver.cxx
View File

@ -33,7 +33,7 @@
#include <BRepBuilderAPI_MakeFace.hxx> #include <BRepBuilderAPI_MakeFace.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepTopAdaptor_FClass2d.hxx> #include <BRepTopAdaptor_FClass2d.hxx>
#include <ShapeAnalysis.hxx> #include <BRepTools.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
@ -152,7 +152,7 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(Handle(TFunction_Logbook)& log) c
Standard_Real aKoefU = aPI.GetParameterU(); Standard_Real aKoefU = aPI.GetParameterU();
Standard_Real aKoefV = aPI.GetParameterV(); Standard_Real aKoefV = aPI.GetParameterV();
Standard_Real aUmin,aUmax,aVmin,aVmax; Standard_Real aUmin,aUmax,aVmin,aVmax;
ShapeAnalysis::GetFaceUVBounds(aFace,aUmin,aUmax,aVmin,aVmax); BRepTools::UVBounds(aFace,aUmin,aUmax,aVmin,aVmax);
Standard_Real aDeltaU = aUmax - aUmin; Standard_Real aDeltaU = aUmax - aUmin;
Standard_Real aDeltaV = aVmax - aVmin; Standard_Real aDeltaV = aVmax - aVmin;
Standard_Real aParamU = aUmin + aDeltaU*aKoefU; Standard_Real aParamU = aUmin + aDeltaU*aKoefU;

6
src/GEOMImpl/GEOMImpl_PointDriver.cxx
View File

@ -30,13 +30,12 @@
#include <GEOM_Function.hxx> #include <GEOM_Function.hxx>
#include <GEOMAlgo_AlgoTools.hxx> #include <GEOMAlgo_AlgoTools.hxx>
#include <ShapeAnalysis.hxx>
#include <BRep_Builder.hxx> #include <BRep_Builder.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx> #include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepExtrema_DistShapeShape.hxx> #include <BRepExtrema_DistShapeShape.hxx>
#include <BRepTools.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
@ -282,8 +281,7 @@ Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_Logbook)& log) c
TopoDS_Face F = TopoDS::Face(aRefShape); TopoDS_Face F = TopoDS::Face(aRefShape);
Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F); Handle(Geom_Surface) aSurf = BRep_Tool::Surface(F);
Standard_Real U1,U2,V1,V2; Standard_Real U1,U2,V1,V2;
//aSurf->Bounds(U1,U2,V1,V2); BRepTools::UVBounds(F,U1,U2,V1,V2);
ShapeAnalysis::GetFaceUVBounds(F,U1,U2,V1,V2);
Standard_Real U = U1 + (U2-U1) * aPI.GetParameter(); Standard_Real U = U1 + (U2-U1) * aPI.GetParameter();
Standard_Real V = V1 + (V2-V1) * aPI.GetParameter2(); Standard_Real V = V1 + (V2-V1) * aPI.GetParameter2();
aPnt = aSurf->Value(U,V); aPnt = aSurf->Value(U,V);

10
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
View File

@ -56,9 +56,9 @@
#include <BRepClass3d_SolidClassifier.hxx> #include <BRepClass3d_SolidClassifier.hxx>
#include <BRepLib.hxx> #include <BRepLib.hxx>
#include <BRepLib_MakeEdge.hxx> #include <BRepLib_MakeEdge.hxx>
#include <BRepTools.hxx>
#include <BRepTools_WireExplorer.hxx> #include <BRepTools_WireExplorer.hxx>
#include <ShapeAnalysis.hxx>
#include <ShapeAnalysis_FreeBounds.hxx> #include <ShapeAnalysis_FreeBounds.hxx>
#include <TNaming_CopyShape.hxx> #include <TNaming_CopyShape.hxx>
@ -869,7 +869,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) c
// Construct a real geometric parameter. // Construct a real geometric parameter.
aFace.Orientation(TopAbs_FORWARD); aFace.Orientation(TopAbs_FORWARD);
ShapeAnalysis::GetFaceUVBounds(aFace,U1,U2,V1,V2); BRepTools::UVBounds(aFace,U1,U2,V1,V2);
if (isUIso) { if (isUIso) {
aParam = U1 + (U2 - U1)*aParam; aParam = U1 + (U2 - U1)*aParam;
@ -934,7 +934,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) c
// Get U, V bounds of the face. // Get U, V bounds of the face.
aFace.Orientation(TopAbs_FORWARD); aFace.Orientation(TopAbs_FORWARD);
ShapeAnalysis::GetFaceUVBounds(aFace, aU1, aU2, aV1, aV2); BRepTools::UVBounds(aFace, aU1, aU2, aV1, aV2);
// Get the surface of original type // Get the surface of original type
while (aType == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { while (aType == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) {
@ -1820,7 +1820,7 @@ TopoDS_Shape GEOMImpl_ShapeDriver::ExtendFace
Standard_Real aV2; Standard_Real aV2;
// Get U, V bounds of the face. // Get U, V bounds of the face.
ShapeAnalysis::GetFaceUVBounds(theFace, aU1, aU2, aV1, aV2); BRepTools::UVBounds(theFace, aU1, aU2, aV1, aV2);
const Standard_Real aURange = aU2 - aU1; const Standard_Real aURange = aU2 - aU1;
const Standard_Real aVRange = aV2 - aV1; const Standard_Real aVRange = aV2 - aV1;
@ -2045,6 +2045,7 @@ GetCreationInformation(std::string& theOperationName,
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver) IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver)
//modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f //modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f
/*
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include <TopTools_HSequenceOfShape.hxx> #include <TopTools_HSequenceOfShape.hxx>
#include <ShapeAnalysis_FreeBounds.hxx> #include <ShapeAnalysis_FreeBounds.hxx>
@ -2057,7 +2058,6 @@ IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver)
//function : KeepEdgesOrder //function : KeepEdgesOrder
//purpose : //purpose :
//======================================================================= //=======================================================================
/*
void KeepEdgesOrder(const Handle(TopTools_HSequenceOfShape)& aEdges, void KeepEdgesOrder(const Handle(TopTools_HSequenceOfShape)& aEdges,
const Handle(TopTools_HSequenceOfShape)& aWires) const Handle(TopTools_HSequenceOfShape)& aWires)
{ {

5
src/GEOMUtils/GEOMUtils.cxx
View File

@ -87,7 +87,6 @@
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
#include <gp_Lin.hxx> #include <gp_Lin.hxx>
#include <ShapeAnalysis.hxx>
#include <ShapeFix_Shape.hxx> #include <ShapeFix_Shape.hxx>
#include <ShapeFix_ShapeTolerance.hxx> #include <ShapeFix_ShapeTolerance.hxx>
@ -180,9 +179,7 @@ namespace
// non solid case or any periodic surface (Mantis 22454). // non solid case or any periodic surface (Mantis 22454).
double U1,U2,V1,V2; double U1,U2,V1,V2;
// changes for 0020677: EDF 1219 GEOM: MinDistance gives 0 instead of 20.88 BRepTools::UVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
//S->Bounds(U1,U2,V1,V2); changed by
ShapeAnalysis::GetFaceUVBounds(TopoDS::Face(theModifiedShape),U1,U2,V1,V2);
// end of changes for 020677 (dmv) // end of changes for 020677 (dmv)
Handle(Geom_RectangularTrimmedSurface) TrS1 = Handle(Geom_RectangularTrimmedSurface) TrS1 =
new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2); new Geom_RectangularTrimmedSurface(S,U1,(U1+U2)/2.,V1,V2);