kindred/create
1
1
Fork 0
Code Issues 37 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

63
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@@ -58,6 +58,7 @@
#include <App/Application.h>
#include <App/Document.h>
#include <Base/Console.h>
#include <Base/Converter.h>
#include <Base/Parameter.h>
#include <Base/Quantity.h>
#include <Base/Tools.h>
@@ -842,7 +843,7 @@ pointPair DrawViewDimension::getPointsOneEdge(ReferenceVector references)
gp_Pnt gEnd0 = BRep_Tool::Pnt(TopExp::FirstVertex(edge));
gp_Pnt gEnd1 = BRep_Tool::Pnt(TopExp::LastVertex(edge));
pointPair pts(DrawUtil::toVector3d(gEnd0), DrawUtil::toVector3d(gEnd1));
pointPair pts(Base::convertTo<Base::Vector3d>(gEnd0), Base::convertTo<Base::Vector3d>(gEnd1));
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
return pts;
@@ -911,7 +912,7 @@ pointPair DrawViewDimension::getPointsTwoVerts(ReferenceVector references)
gp_Pnt gPoint0 = BRep_Tool::Pnt(vertex0);
gp_Pnt gPoint1 = BRep_Tool::Pnt(vertex1);
pointPair pts(DrawUtil::toVector3d(gPoint0), DrawUtil::toVector3d(gPoint1));
pointPair pts(Base::convertTo<Base::Vector3d>(gPoint0), Base::convertTo<Base::Vector3d>(gPoint1));
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
return pts;
@@ -1117,23 +1118,23 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge)
double pLast = adapt.LastParameter();
double pMid = (pFirst + pLast) / 2;
BRepLProp_CLProps props(adapt, pFirst, 0, Precision::Confusion());
pts.arcEnds.first(DrawUtil::toVector3d(props.Value()));
pts.arcEnds.first(Base::convertTo<Base::Vector3d>(props.Value()));
props.SetParameter(pLast);
pts.arcEnds.second(DrawUtil::toVector3d(props.Value()));
pts.arcEnds.second(Base::convertTo<Base::Vector3d>(props.Value()));
props.SetParameter(pMid);
pts.onCurve.first(DrawUtil::toVector3d(props.Value()));
pts.onCurve.second(DrawUtil::toVector3d(props.Value()));
pts.midArc = DrawUtil::toVector3d(props.Value());
pts.onCurve.first(Base::convertTo<Base::Vector3d>(props.Value()));
pts.onCurve.second(Base::convertTo<Base::Vector3d>(props.Value()));
pts.midArc = Base::convertTo<Base::Vector3d>(props.Value());
if (adapt.GetType() == GeomAbs_Circle) {
gp_Circ circle = adapt.Circle();
pts.center = DrawUtil::toVector3d(circle.Location());
pts.center = Base::convertTo<Base::Vector3d>(circle.Location());
pts.radius = circle.Radius();
if (pts.isArc) {
// part of circle
gp_Ax1 axis = circle.Axis();
gp_Vec startVec = DrawUtil::to<gp_Vec>(pts.arcEnds.first() - pts.center);
gp_Vec endVec = DrawUtil::to<gp_Vec>(pts.arcEnds.second() - pts.center);
gp_Vec startVec = Base::convertTo<gp_Vec>(pts.arcEnds.first() - pts.center);
gp_Vec endVec = Base::convertTo<gp_Vec>(pts.arcEnds.second() - pts.center);
double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ());
pts.arcCW = (angle < 0.0);
}
@@ -1147,13 +1148,13 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge)
}
else if (adapt.GetType() == GeomAbs_Ellipse) {
gp_Elips ellipse = adapt.Ellipse();
pts.center = DrawUtil::toVector3d(ellipse.Location());
pts.center = Base::convertTo<Base::Vector3d>(ellipse.Location());
pts.radius = (ellipse.MajorRadius() + ellipse.MinorRadius()) / 2.0;
if (pts.isArc) {
// part of ellipse
gp_Ax1 axis = ellipse.Axis();
gp_Vec startVec = DrawUtil::to<gp_Vec>(pts.arcEnds.first() - pts.center);
gp_Vec endVec = DrawUtil::to<gp_Vec>(pts.arcEnds.second() - pts.center);
gp_Vec startVec = Base::convertTo<gp_Vec>(pts.arcEnds.first() - pts.center);
gp_Vec endVec = Base::convertTo<gp_Vec>(pts.arcEnds.second() - pts.center);
double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ());
pts.arcCW = (angle < 0.0);
}
@@ -1176,13 +1177,13 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge)
}
gp_Circ circle = adapt.Circle();
// TODO: same code as above. reuse opportunity.
pts.center = DrawUtil::toVector3d(circle.Location());
pts.center = Base::convertTo<Base::Vector3d>(circle.Location());
pts.radius = circle.Radius();
if (pts.isArc) {
// part of circle
gp_Ax1 axis = circle.Axis();
gp_Vec startVec = DrawUtil::to<gp_Vec>(pts.arcEnds.first() - pts.center);
gp_Vec endVec = DrawUtil::to<gp_Vec>(pts.arcEnds.second() - pts.center);
gp_Vec startVec = Base::convertTo<gp_Vec>(pts.arcEnds.first() - pts.center);
gp_Vec endVec = Base::convertTo<gp_Vec>(pts.arcEnds.second() - pts.center);
double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ());
pts.arcCW = (angle < 0.0);
}
@@ -1310,15 +1311,15 @@ anglePoints DrawViewDimension::getAnglePointsTwoEdges(ReferenceVector references
gp_Pnt gEnd1 = BRep_Tool::Pnt(TopExp::LastVertex(edge1));
gp_Vec gDir1(gEnd1.XYZ() - gStart1.XYZ());
Base::Vector3d vApex;
bool haveIntersection = DrawUtil::intersect2Lines3d(DrawUtil::toVector3d(gStart0),
DrawUtil::toVector3d(gDir0),
DrawUtil::toVector3d(gStart1),
DrawUtil::toVector3d(gDir1),
bool haveIntersection = DrawUtil::intersect2Lines3d(Base::convertTo<Base::Vector3d>(gStart0),
Base::convertTo<Base::Vector3d>(gDir0),
Base::convertTo<Base::Vector3d>(gStart1),
Base::convertTo<Base::Vector3d>(gDir1),
vApex);
if (!haveIntersection) {
throw Base::RuntimeError("Geometry for 3d angle dimension does not intersect");
}
gp_Pnt gApex = DrawUtil::to<gp_Pnt>(vApex);
gp_Pnt gApex = Base::convertTo<gp_Pnt>(vApex);
gp_Pnt gFar0 = gEnd0;
if (gStart0.Distance(gApex) > gEnd0.Distance(gApex)) {
@@ -1329,9 +1330,9 @@ anglePoints DrawViewDimension::getAnglePointsTwoEdges(ReferenceVector references
if (gStart1.Distance(gApex) > gEnd1.Distance(gApex)) {
gFar1 = gStart1;
}
anglePoints pts(DrawUtil::toVector3d(gApex),
DrawUtil::toVector3d(gFar0),
DrawUtil::toVector3d(gFar1));
anglePoints pts(Base::convertTo<Base::Vector3d>(gApex),
Base::convertTo<Base::Vector3d>(gFar0),
Base::convertTo<Base::Vector3d>(gFar1));
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
return pts;
@@ -1376,9 +1377,9 @@ anglePoints DrawViewDimension::getAnglePointsThreeVerts(ReferenceVector referenc
gp_Pnt point1 = BRep_Tool::Pnt(vertex1);
TopoDS_Vertex vertex2 = TopoDS::Vertex(geometry2);
gp_Pnt point2 = BRep_Tool::Pnt(vertex2);
anglePoints pts(DrawUtil::toVector3d(point1),
DrawUtil::toVector3d(point0),
DrawUtil::toVector3d(point2));
anglePoints pts(Base::convertTo<Base::Vector3d>(point1),
Base::convertTo<Base::Vector3d>(point0),
Base::convertTo<Base::Vector3d>(point2));
pts.move(getViewPart()->getCurrentCentroid());
pts.project(getViewPart());
return pts;
@@ -1435,7 +1436,7 @@ Base::Vector3d DrawViewDimension::getFaceCenter(const TopoDS_Face& face)
{
GProp_GProps props;
BRepGProp::SurfaceProperties(face, props);
auto center = DrawUtil::toVector3d(props.CentreOfMass());
auto center = Base::convertTo<Base::Vector3d>(props.CentreOfMass());
return center;
}
@@ -1718,9 +1719,9 @@ double DrawViewDimension::getArcAngle(Base::Vector3d center, Base::Vector3d star
auto leg0 = startPoint - center;
auto leg1 = endPoint - startPoint;
auto referenceDirection = leg0.Cross(leg1);
gp_Ax1 axis{DU::to<gp_Pnt>(center), DU::to<gp_Vec>(referenceDirection)};
gp_Vec startVec = DrawUtil::to<gp_Vec>(leg0);
gp_Vec endVec = DrawUtil::to<gp_Vec>(leg1);
gp_Ax1 axis{Base::convertTo<gp_Pnt>(center), Base::convertTo<gp_Vec>(referenceDirection)};
gp_Vec startVec = Base::convertTo<gp_Vec>(leg0);
gp_Vec endVec = Base::convertTo<gp_Vec>(leg1);
double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ());
return angle;
}