kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

remove gp_* conversion code from TechDraw workbench

Browse Source
This commit is contained in:
captain0xff
2025-03-07 20:43:15 +05:30
parent 40e58ff580
commit 13d31711f3
17 changed files with 158 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mod/TechDraw/App/Geometry.cpp
View File

@@ -72,6 +72,7 @@
#endif // #ifndef _PreComp_
#include <Base/Console.h>
#include <Base/Converter.h>
#include <Base/Parameter.h>
#include <Base/Reader.h>
#include <Base/Tools.h>
@@ -167,7 +168,7 @@ Base::Vector3d Face::getCenter() const {
GProp_GProps faceProps;
BRepGProp::SurfaceProperties(toOccFace(), faceProps);
return DrawUtil::toVector3d(faceProps.CentreOfMass());
return Base::convertTo<Base::Vector3d>(faceProps.CentreOfMass());
}
double Face::getArea() const {
@@ -607,7 +608,7 @@ std::vector<Base::Vector3d> BaseGeom::intersection(TechDraw::BaseGeomPtr geom2)
if (!sectionShape.IsNull()) {
TopExp_Explorer explorer(sectionShape, TopAbs_VERTEX);
while (explorer.More()) {
Base::Vector3d pt(DrawUtil::toVector3d(BRep_Tool::Pnt(TopoDS::Vertex(explorer.Current()))));
Base::Vector3d pt(Base::convertTo<Base::Vector3d>(BRep_Tool::Pnt(TopoDS::Vertex(explorer.Current()))));
interPoints.push_back(pt);
explorer.Next();
}
@@ -800,9 +801,9 @@ AOC::AOC(const TopoDS_Edge &e) : Circle(e)
cw = (a < 0) ? true: false;
largeArc = (fabs(l-f) > M_PI) ? true : false;
startPnt = DU::toVector3d(s);
endPnt = DU::toVector3d(ePt);
midPnt = DU::toVector3d(m);
startPnt = Base::convertTo<Base::Vector3d>(s);
endPnt = Base::convertTo<Base::Vector3d>(ePt);
midPnt = Base::convertTo<Base::Vector3d>(m);
if (e.Orientation() == TopAbs_REVERSED) {
reversed = true;
}
@@ -848,9 +849,9 @@ AOC::AOC(Base::Vector3d c, double r, double sAng, double eAng) : Circle()
cw = (a < 0) ? true: false;
largeArc = (fabs(l-f) > M_PI) ? true : false;
startPnt = DU::toVector3d(s);
endPnt = DU::toVector3d(ePt);
midPnt = DU::toVector3d(m);
startPnt = Base::convertTo<Base::Vector3d>(s);
endPnt = Base::convertTo<Base::Vector3d>(ePt);
midPnt = Base::convertTo<Base::Vector3d>(m);
if (edge.Orientation() == TopAbs_REVERSED) {
reversed = true;
}
@@ -1379,9 +1380,9 @@ void Vertex::dump(const char* title)
TopoShape Vertex::asTopoShape(double scale)
{
Base::Vector3d point = DU::toVector3d(BRep_Tool::Pnt(getOCCVertex()));
Base::Vector3d point = Base::convertTo<Base::Vector3d>(BRep_Tool::Pnt(getOCCVertex()));
point = point / scale;
BRepBuilderAPI_MakeVertex mkVert(DU::to<gp_Pnt>(point));
BRepBuilderAPI_MakeVertex mkVert(Base::convertTo<gp_Pnt>(point));
return TopoShape(mkVert.Vertex());
}
@@ -1529,7 +1530,7 @@ bool GeometryUtils::getCircleParms(TopoDS_Edge occEdge, double& radius, Base::Ve
sumCurvature += prop.Curvature();
prop.CentreOfCurvature(curveCenter);
centers.push_back(curveCenter);
sumCenter += DrawUtil::toVector3d(curveCenter);
sumCenter += Base::convertTo<Base::Vector3d>(curveCenter);
}
}
@@ -1547,7 +1548,7 @@ bool GeometryUtils::getCircleParms(TopoDS_Edge occEdge, double& radius, Base::Ve
double errorCenter{0};
for (auto& observe : centers) {
auto error = (DU::toVector3d(observe)- avgCenter).Length();
auto error = (Base::convertTo<Base::Vector3d>(observe)- avgCenter).Length();
errorCenter += error;
}
@@ -1582,7 +1583,7 @@ TopoDS_Edge GeometryUtils::asCircle(TopoDS_Edge splineEdge, bool& arc)
throw Base::RuntimeError("GU::asCircle received non-circular edge!");
}
gp_Pnt gCenter = DU::to<gp_Pnt>(center);
gp_Pnt gCenter = Base::convertTo<gp_Pnt>(center);
gp_Dir gNormal{0, 0, 1};
Handle(Geom_Circle) circleFromParms = GC_MakeCircle(gCenter, gNormal, radius);
@@ -1624,8 +1625,8 @@ bool GeometryUtils::isLine(TopoDS_Edge occEdge)
return false;
}
Base::Vector3d vs = DrawUtil::toVector3d(s);
Base::Vector3d ve = DrawUtil::toVector3d(e);
Base::Vector3d vs = Base::convertTo<Base::Vector3d>(s);
Base::Vector3d ve = Base::convertTo<Base::Vector3d>(e);
double endLength = (vs - ve).Length();
int low = 0;
int high = spline->NbPoles() - 1;
@@ -1634,9 +1635,9 @@ bool GeometryUtils::isLine(TopoDS_Edge occEdge)
double lenTotal = 0.0;
for (int i = 0; i < high; i++) {
gp_Pnt p1 = poles(i);
Base::Vector3d v1 = DrawUtil::toVector3d(p1);
Base::Vector3d v1 = Base::convertTo<Base::Vector3d>(p1);
gp_Pnt p2 = poles(i+1);
Base::Vector3d v2 = DrawUtil::toVector3d(p2);
Base::Vector3d v2 = Base::convertTo<Base::Vector3d>(p2);
lenTotal += (v2-v1).Length();
}
@@ -1764,7 +1765,7 @@ std::vector<FacePtr> GeometryUtils::findHolesInFace(const DrawViewPart* dvp, con
iFace++;
continue;
}
auto faceCenter = DU::to<gp_Pnt>(face->getCenter());
auto faceCenter = Base::convertTo<gp_Pnt>(face->getCenter());
auto faceCenterVertex = BRepBuilderAPI_MakeVertex(faceCenter);
auto distance = DU::simpleMinDist(faceCenterVertex, bigCheeseOCCFace);
if (distance > EWTOLERANCE) {