Skip to content

qtplasmac: misshaped conversational rectangle #3478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snowgoer540 merged 2 commits into from
Jun 19, 2025
Merged

qtplasmac: misshaped conversational rectangle #3478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d60c62
qtplasmac: misshaped conversational rectangle
phillc54 Jun 19, 2025
affd991
qtplasmac: misshaped conversational rectangle
phillc54 Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions lib/python/plasmac/rectangle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,8 @@ def preview(Conv, fTmp, fNgc, fNgcBkp,
else:
outTmp.write(f'G00 X{xS:.6f} Y{yS:.6f}\n')
outTmp.write('M03 $0 S1\n')
if radius1:
x1 = xS + ((xLT - (radius1 - radius2)) / 2) * math.cos(angle + left)
y1 = yS + ((xLT - (radius1 - radius2)) / 2) * math.sin(angle + left)
else:
x1 = xS - (width / 2)
y1 = yS
x1 = xS + ((xLT - (radius1 - radius2)) / 2) * math.cos(angle + left)
y1 = yS + ((xLT - (radius1 - radius2)) / 2) * math.sin(angle + left)
outTmp.write(f'G01 X{x1:.6f} Y{y1:.6f}\n')
if radius1:
if styleR1 == 'intRadius':
Expand Down
2 changes: 1 addition & 1 deletion share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = '008.065'
VERSION = '008.066'
LCNCVER = '2.10'

'''
Expand Down
5 changes: 5 additions & 0 deletions share/qtvcp/screens/qtplasmac/versions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
</table>
<br>
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
<br><b><u>008.066 2025 June 19</u></b>
<ul style="margin:0;">
<li>fix misshaped conversational internal angled rectangles</li>
</ul>

<br><b><u>008.065 2025 June 06</u></b>
<ul style="margin:0;">
<li>start conversational shapes at origin</li>
Expand Down
Loading