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

Sketcher: Display arc angle and length constraints beyond center point (#22651)

Browse Source 
* Allow arc segment length and angle constraints to go past the center point

* fix angle helper lines

* fix linter warning

* fix arc length calculation

---------

Co-authored-by: Matthias Danner <28687794+matthiasdanner@users.noreply.github.com>
This commit is contained in:
matthiasdanner
2025-07-25 13:57:21 +02:00
committed by GitHub
parent 0270515a33
commit 57f251d742
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -1862,15 +1862,15 @@ void ViewProviderSketch::moveConstraint(Sketcher::Constraint* Constr, int constN
}
else if (geo->is<Part::GeomArcOfCircle>()) {
auto* arc = static_cast<const Part::GeomArcOfCircle*>(geo);
double radius = arc->getRadius();
Base::Vector3d center = arc->getCenter();
double startangle, endangle;
arc->getRange(startangle, endangle, /*emulateCCW=*/true);
if (Constr->Type == Distance && Constr->Second == GeoEnum::GeoUndef){
//arc length
Base::Vector3d dir = Base::Vector3d(toPos.x, toPos.y, 0.) - arc->getCenter();
Constr->LabelDistance = dir.Length();
double arcAngle = (startangle + endangle) / 2.;
Base::Vector2d arcDirection(std::cos(arcAngle), std::sin(arcAngle));
Base::Vector2d centerToToPos = toPos - Base::Vector2d(center.x, center.y);
Constr->LabelDistance = centerToToPos * arcDirection;
cleanAndDraw();
return;
@@ -1886,8 +1886,10 @@ void ViewProviderSketch::moveConstraint(Sketcher::Constraint* Constr, int constN
Base::Vector3d tmpDir = Base::Vector3d(toPos.x, toPos.y, 0) - p1;
angle = atan2(tmpDir.y, tmpDir.x);
}
if (Constr->Type == Sketcher::Diameter)
double radius = arc->getRadius();
if (Constr->Type == Sketcher::Diameter) {
p1 = center - radius * Base::Vector3d(cos(angle), sin(angle), 0.);
}
p2 = center + radius * Base::Vector3d(cos(angle), sin(angle), 0.);
}
@@ -2070,7 +2072,14 @@ void ViewProviderSketch::moveAngleConstraint(Sketcher::Constraint* constr, int c
}
else if (isArcOfCircle(*geo)) {
const auto* arc = static_cast<const Part::GeomArcOfCircle*>(geo);
p0 = arc->getCenter();
Base::Vector3d center = arc->getCenter();
double startangle, endangle;
arc->getRange(startangle, endangle, /*emulateCCW=*/true);
double arcAngle = (startangle + endangle) / 2.;
Base::Vector2d arcDirection(std::cos(arcAngle), std::sin(arcAngle));
Base::Vector2d centerToToPos = toPos - Base::Vector2d(center.x, center.y);
constr->LabelDistance = centerToToPos * arcDirection;
return;
}
else {
return;