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

14
src/Gui/SoDatumLabel.cpp
View File

@@ -1438,21 +1438,23 @@ void SoDatumLabel::drawAngle(const SbVec3f* points, float& angle, SbVec3f& textO
SbVec3f v0(cos(startangle+range/2),sin(startangle+range/2),0);
// leave some space for the text
double textMargin = std::min(0.2F * abs(range), this->imgWidth / (2 * r));
float textMargin = std::min(0.2F * abs(range), this->imgWidth / (2 * r));
textOffset = p0 + v0 * r;
// Draw
glDrawArc(p0, r, startangle, startangle+range/2.-textMargin);
glDrawArc(p0, r, startangle+range/2.+textMargin, endangle);
// Direction vectors for start and end lines
SbVec3f v1(cos(startangle), sin(startangle), 0);
SbVec3f v2(cos(endangle), sin(endangle), 0);
if (range < 0) {
float textMarginDir = 1.;
if (range < 0 || length < 0) {
std::swap(v1, v2);
textMarginDir = -1.;
}
// Draw
glDrawArc(p0, r, startangle, startangle + range / 2.F - textMarginDir * textMargin);
glDrawArc(p0, r, startangle + range / 2.F + textMarginDir * textMargin, endangle);
SbVec3f pnt1 = p0 + (r - endLineLength1) * v1;
SbVec3f pnt2 = p0 + (r + endLineLength12) * v1;