From e81be05ce137cdfffbd0f9ee5bc3677d8cec3f9f Mon Sep 17 00:00:00 2001 From: Greg Carl <26096779+snowgoer540@users.noreply.github.com> Date: Wed, 23 Sep 2026 20:40:49 -0400 Subject: [PATCH] qtplasmac: fix conversational circle M3 vs M03 bug For conversational circle, the torch on commands would be written as M3 instead of the M03 convention used by all of the other shapes. This caused errors with conversational block (specifically array in my testing but maybe others). Fixed an objectname copy/paste error in convesrational.py that prevented proper resetting between screen changes, as well as prevented proper valid character checking. --- lib/python/plasmac/circle.py | 4 ++-- lib/python/qtvcp/lib/qtplasmac/conversational.py | 10 +++++----- share/qtvcp/screens/qtplasmac/qtplasmac_handler.py | 2 +- share/qtvcp/screens/qtplasmac/versions.html | 6 ++++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/python/plasmac/circle.py b/lib/python/plasmac/circle.py index 634475d6e27..efdd28a39c7 100644 --- a/lib/python/plasmac/circle.py +++ b/lib/python/plasmac/circle.py @@ -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 @@ -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: diff --git a/lib/python/qtvcp/lib/qtplasmac/conversational.py b/lib/python/qtvcp/lib/qtplasmac/conversational.py index 224a5c1bfb7..48d4643c20f 100644 --- a/lib/python/qtvcp/lib/qtplasmac/conversational.py +++ b/lib/python/qtvcp/lib/qtplasmac/conversational.py @@ -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 @@ -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' @@ -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) diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py index 23e54a2518f..b93f2efc6b6 100644 --- a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py +++ b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py @@ -1,4 +1,4 @@ -VERSION = '016.088' +VERSION = '016.089' LCNCVER = '2.10' ''' diff --git a/share/qtvcp/screens/qtplasmac/versions.html b/share/qtvcp/screens/qtplasmac/versions.html index 08ff5099e4f..468bd58606e 100644 --- a/share/qtvcp/screens/qtplasmac/versions.html +++ b/share/qtvcp/screens/qtplasmac/versions.html @@ -26,6 +26,12 @@

QtPlasmaC Version History - LinuxCNC 2.10


+
016.089 2026 Sep 22 + +
016.088 2026 Sep 12