Skip to content

qtplasmac: fix conversational circle M3 vs M03 bug #4580

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 1 commit into from
Sep 24, 2026
+14 −8
Merged

qtplasmac: fix conversational circle M3 vs M03 bug #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/python/plasmac/circle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
circle.py

Copyright (C) 2020 - 2024 Phillip A Carter
Copyright (C) 2020 - 2024 Gregory D Carl
Copyright (C) 2020 - 2026 Gregory D Carl

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Expand Down Expand Up @@ -159,7 +159,7 @@ def preview(Conv, fTmp, fNgc, fNgcBkp,
outTmp.write(f'G03 X{xS:.6f} Y{yS:.6f} I{xlcenter - xlStart:.6f} J{ylcenter - ylStart:.6f}\n')
else:
outTmp.write(f'G00 X{xS:.6f} Y{yS:.6f}\n')
outTmp.write('M3 $0 S1\n')
outTmp.write('M03 $0 S1\n')
if sHole:
outTmp.write(f'M67 E3 Q{smallHoleSpeed} (reduce feed rate to 60%)\n')
if isExternal:
Expand Down
10 changes: 5 additions & 5 deletions lib/python/qtvcp/lib/qtplasmac/conversational.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
conversational.py

Copyright (C) 2019 - 2025 Phillip A Carter
Copyright (C) 2020 - 2025 Gregory D Carl
Copyright (C) 2020 - 2026 Gregory D Carl

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Expand Down Expand Up @@ -502,7 +502,7 @@ def conv_entry_changed(P, W, widget, circleType=False):
cursor_position = widget.cursorPosition()
if name in ['intEntry', 'hsEntry', 'cnEntry', 'rnEntry']:
good = '0123456789'
elif name in ['xsEntry', 'ysEntry', 'aEntry', 'csEntry', 'rsEntry', 'neg']:
elif name in ['xsEntry', 'ysEntry', 'aEntry', 'oxEntry', 'oyEntry', 'rtEntry', 'csEntry', 'rsEntry', 'neg']:
good = '-.0123456789'
else:
good = '.0123456789'
Expand Down Expand Up @@ -767,13 +767,13 @@ def conv_widgets(P, W):
W.rsLabel = QLabel(_translate('Conversational', 'SPACING'))
W.oLabel = QLabel(_translate('Conversational', 'ORIGIN'))
W.oxLabel = QLabel(_translate('Conversational', 'X OFFSET'))
W.oxEntry = QLineEdit('0.0', objectName='xsEntry')
W.oyEntry = QLineEdit('0.0', objectName='ysEntry')
W.oxEntry = QLineEdit('0.0', objectName='oxEntry')
W.oyEntry = QLineEdit('0.0', objectName='oyEntry')
W.oyLabel = QLabel(_translate('Conversational', 'Y OFFSET'))
W.ptLabel = QLabel(_translate('Conversational', 'PATTERN'))
W.scLabel = QLabel(_translate('Conversational', 'SCALE'))
W.scEntry = QLineEdit('1.0', objectName='scEntry')
W.rtEntry = QLineEdit('0.0', objectName='aEntry')
W.rtEntry = QLineEdit('0.0', objectName='rtEntry')
W.rtLabel = QLabel(_translate('Conversational', 'ROTATION'))
W.mirror = QPushButton(_translate('Conversational', 'MIRROR'))
W.mirror.setFocusPolicy(Qt.ClickFocus)
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 = '016.088'
VERSION = '016.089'
LCNCVER = '2.10'

'''
Expand Down
6 changes: 6 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,12 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
</table>
<br>
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
<br><b><u>016.089 2026 Sep 22</u></b>
<ul style="margin:0;">
<li>fix conversational circle M3 vs M03 bug</li>
<li>fix copy/paste error in conversational.py</li>
</ul>

<br><b><u>016.088 2026 Sep 12</u></b>
<ul style="margin:0;">
<li>fix cut recovery bug</li>
Expand Down
Loading