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

Adds a small convenience function to get arc of circle angle.

Browse Source
This commit is contained in:
Paddle
2023-09-12 10:40:30 +02:00
parent 41cae1a561
commit b97a2ef6dc
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Part/App/Geometry.cpp
View File

@@ -2428,11 +2428,24 @@ void GeomArcOfCircle::setRadius(double Radius)
}
}
/*!
* \brief GeomArcOfCircle::getAngle
* \param emulateCCWXY: if true, the arc will pretend to be a CCW arc in XY plane.
* For this to work, the arc must lie in XY plane (i.e. Axis is either +Z or -Z).
*/
double GeomArcOfCircle::getAngle(bool emulateCCWXY) const
{
double startangle, endangle;
getRange(startangle, endangle, emulateCCWXY);
double angle = endangle - startangle;
return angle;
}
/*!
* \brief GeomArcOfCircle::getRange
* \param u [out] start angle of the arc, in radians.
* \param v [out] end angle of the arc, in radians.
* \param emulateCCWXY: if true, the arc will pretent to be a CCW arc in XY plane.
* \param emulateCCWXY: if true, the arc will pretend to be a CCW arc in XY plane.
* For this to work, the arc must lie in XY plane (i.e. Axis is either +Z or -Z).
* Additionally, arc's rotation as a whole will be included in the returned u,v
* (ArcOfCircle specific).

2
src/Mod/Part/App/Geometry.h
View File

@@ -502,6 +502,8 @@ public:
double getRadius() const;
void setRadius(double Radius);
double getAngle(bool emulateCCWXY) const;
void getRange(double& u, double& v, bool emulateCCWXY) const override;
void setRange(double u, double v, bool emulateCCWXY) override;

6
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -8772,7 +8772,7 @@ void CmdSketcherConstrainAngle::activated(int iMsg)
return;
}
}
else if (isEdge(GeoId1, PosId1)) {// line angle
else if (isEdge(GeoId1, PosId1)) {// line angle or arc angle
if (GeoId1 < 0 && GeoId1 >= Sketcher::GeoEnum::VAxis) {
Gui::TranslatedUserWarning(
Obj,
@@ -8812,9 +8812,7 @@ void CmdSketcherConstrainAngle::activated(int iMsg)
}
else if (isArcOfCircle(*geom)) {
auto arc = static_cast<const Part::GeomArcOfCircle*>(geom);
double startangle, endangle;
arc->getRange(startangle, endangle, /*EmulateCCWXY=*/true);
double angle = endangle - startangle;
double angle = arc->getAngle(/*EmulateCCWXY=*/true);
openCommand(QT_TRANSLATE_NOOP("Command", "Add angle constraint"));
Gui::cmdAppObjectArgs(selection[0].getObject(),