qtplasmac: conv_line: fix start point

Author: snowgoer540

lib/python/qtvcp/lib/qtplasmac/conv_line.py

@@ -28,6 +28,9 @@
 _translate = QCoreApplication.translate
 
 def preview(P, W, Conv):
+    if P.xLineEnd != Conv.conv_is_float(W.entry1.text())[1] or \
+       P.yLineEnd != Conv.conv_is_float(W.entry2.text())[1]:
+        P.convAddSegment = 0
     if W.lType.currentText() == _translate('Conversational', 'LINE POINT ~ POINT'):
         reply = LINE.do_line_point_to_point(Conv, W.entry1.text(), W.entry2.text(), W.entry3.text(), \
                                                   W.entry4.text())
@@ -83,6 +86,8 @@ def preview(P, W, Conv):
     if P.convAddSegment == 1:
         LINE.next_segment(P.fTmp, P.fNgc)
     else:
+        valid, P.xLineStart = Conv.conv_is_float(W.entry1.text())
+        valid, P.yLineStart = Conv.conv_is_float(W.entry2.text())
         LINE.first_segment(P.fTmp, P.fNgc, P.fNgcBkp, P.preAmble, \
                            W.lType.currentText(), P.xLineStart, P.yLineStart, \
                            int(W.conv_material.currentText().split(':')[0]), \
@@ -112,15 +117,6 @@ def auto_preview(P, W, Conv):
               (W.lType.currentText() == _translate('Conversational', 'ARC ANGLE +RADIUS') and W.entry5.text()):
                 preview(P, W, Conv)
 
-def entry_changed(P, W, Conv, widget, entry):
-    if widget == W.entry4 and \
-            (W.lType.currentText() == _translate('Conversational', 'LINE BY ANGLE') or \
-             W.lType.currentText() == _translate('Conversational', 'ARC ANGLE +RADIUS')):
-        widget.setObjectName('aEntry')
-    else:
-        widget.setObjectName(None)
-    Conv.conv_entry_changed(P, W, widget)
-
 def line_type_changed(P, W, refresh):
     W.entry3.setFocus()
     if W.lType.currentText() == _translate('Conversational', 'LINE POINT ~ POINT'):
@@ -192,6 +188,7 @@ def set_line_point_to_point(P, W):
     for n in '34':
         W['entry{}'.format(n)].setText('')
         W['entry{}'.format(n)].show()
+    W.entry3.setObjectName('neg')
 
 def set_line_by_angle(P, W):
     clear_widgets(P, W, P.conv_line_angle)
@@ -201,6 +198,7 @@ def set_line_by_angle(P, W):
     for n in '34':
         W['entry{}'.format(n)].setText('')
         W['entry{}'.format(n)].show()
+    W.entry3.setObjectName(None)
 
 def set_arc_3_points(P, W):
     clear_widgets(P, W, P.conv_line_3p)
@@ -211,6 +209,7 @@ def set_arc_3_points(P, W):
     for n in '3456':
         W['entry{}'.format(n)].setText('')
         W['entry{}'.format(n)].show()
+        W['entry{}'.format(n)].setObjectName('neg')
 
 def set_arc_2_points_radius(P, W):
     clear_widgets(P, W, P.conv_line_2pr)
@@ -223,6 +222,8 @@ def set_arc_2_points_radius(P, W):
     for n in '345':
         W['entry{}'.format(n)].setText('')
         W['entry{}'.format(n)].show()
+    W.entry3.setObjectName('neg')
+    W.entry5.setObjectName(None)
 
 def set_arc_by_angle_radius(P, W):
     clear_widgets(P, W, P.conv_arc_angle)
@@ -235,6 +236,8 @@ def set_arc_by_angle_radius(P, W):
     for n in '345':
         W['entry{}'.format(n)].setText('')
         W['entry{}'.format(n)].show()
+    W.entry3.setObjectName(None)
+    W.entry5.setObjectName(None)
 
 def set_arc_widgets(P, W):
     W.entries.removeWidget(W.g23Arc)
@@ -279,8 +282,8 @@ def widgets(P, W, Conv):
     P.convAddSegment = 0
     P.conv_gcodeLine = ''
     P.conv_gcodeSave = ''
-    P.xLineStart = 0.000
-    P.yLineStart = 0.000
+    P.xLineStart = P.xLineEnd = 0.000
+    P.yLineStart = P.yLineEnd = 0.000
     #connections
     W.conv_material.currentTextChanged.connect(lambda:auto_preview(P, W, Conv))
     W.preview.pressed.connect(lambda:preview(P, W, Conv))
@@ -290,7 +293,7 @@ def widgets(P, W, Conv):
     W.g23Arc.toggled.connect(lambda:auto_preview(P, W, Conv))
     entries = ['entry1', 'entry2', 'entry3', 'entry4', 'entry5', 'entry6']
     for entry in entries:
-        W[entry].textChanged.connect(lambda w:entry_changed(P, W, Conv, W.sender(), w))
+        W[entry].textChanged.connect(lambda w:Conv.conv_entry_changed(P, W, W.sender()))
         W[entry].returnPressed.connect(lambda:preview(P, W, Conv))
     #add to layout
     if P.landscape:

lib/python/qtvcp/lib/qtplasmac/conversational.py

@@ -50,8 +50,8 @@ def conv_setup(P, W):
     P.validShape = False
     P.savedSettings = {'origin':None, 'intext':None, 'in':None, 'out':None}
     P.invalidLeads = 0
-    W.preview = QPushButton(_translate('Conversational', 'PREVIEW'))
-    W.undo = QPushButton(_translate('Conversational', 'RELOAD'))
+    if not P.convWidgetsLoaded or P.developmentPin.get():
+        conv_widgets(P, W)
     if not ACTION.prefilter_path:
         W.undo.setEnabled(False)
     conv_preview_button(P, W, False)
@@ -85,8 +85,6 @@ def conv_setup(P, W):
     P.xSaved = '0.000'
     P.ySaved = '0.000'
     P.convBlock = [False, False]
-    if not P.convWidgetsLoaded or P.developmentPin.get():
-        conv_widgets(P, W)
     if not P.oldConvButton:
         conv_shape_request(P, W, 'conv_line', True)
     else:
@@ -112,6 +110,8 @@ def conv_new_pressed(P, W, button):
             CONVLINE.set_arc_2_points_radius(P, W)
         elif W.lType.currentText() == _translate('Conversational', 'ARC ANGLE +RADIUS'):
             CONVLINE.set_arc_by_angle_radius(P, W)
+        W.entry1.setText('0.000')
+        W.entry2.setText('0.000')
     with open(P.fNgc, 'w') as outNgc:
         outNgc.write('(new conversational file)\nM2\n')
     COPY(P.fNgc, P.fTmp)
@@ -376,7 +376,7 @@ def conv_entry_changed(P, W, widget, circleType=False):
     if value:
         if name in ['intEntry', 'hsEntry', 'cnEntry', 'rnEntry']:
             good = '0123456789'
-        elif name in ['xsEntry', 'ysEntry', 'aEntry', 'coEntry', 'roEntry']:
+        elif name in ['xsEntry', 'ysEntry', 'aEntry', 'coEntry', 'roEntry', 'neg']:
             good = '-.0123456789'
         else:
             good = '.0123456789'
@@ -539,20 +539,22 @@ def conv_auto_preview_button(P, W, button):
 # create all required widgets without showing them
 def conv_widgets(P, W):
     # common
+    W.preview = QPushButton(_translate('Conversational', 'PREVIEW'))
+    W.undo = QPushButton(_translate('Conversational', 'RELOAD'))
     W.centLeft = QPushButton(_translate('Conversational', 'BTM LEFT'), objectName='centLeft')
     W.centLeft.setCheckable(True)
     W.intExt = QPushButton(_translate('Conversational', 'EXTERNAL'), objectName='intExt')
     W.intExt.setCheckable(True)
     W.liLabel = QLabel(_translate('Conversational', 'LEAD IN'))
-    W.liEntry = QLineEdit(str(P.leadIn), objectName='liEntry')
+    W.liEntry = QLineEdit(objectName='liEntry')
     W.loLabel = QLabel(_translate('Conversational', 'LEAD OUT'))
-    W.loEntry = QLineEdit(str(P.leadOut), objectName='loEntry')
+    W.loEntry = QLineEdit(objectName='loEntry')
     W.ctLabel = QLabel(_translate('Conversational', 'CUT TYPE'))
     W.spLabel = QLabel(_translate('Conversational', 'START'))
     W.xsLabel = QLabel(_translate('Conversational', 'X ORIGIN'))
-    W.xsEntry = QLineEdit(str(P.xSaved), objectName='xsEntry')
+    W.xsEntry = QLineEdit(objectName='xsEntry')
     W.ysLabel = QLabel(_translate('Conversational', 'Y ORIGIN'))
-    W.ysEntry = QLineEdit(str(P.ySaved), objectName='ysEntry')
+    W.ysEntry = QLineEdit(objectName='ysEntry')
     W.overcut = QPushButton(_translate('Conversational', 'OVER CUT'))
     W.overcut.setEnabled(False)
     W.overcut.setCheckable(True)
@@ -641,17 +643,17 @@ def conv_widgets(P, W):
     # lines and arcs
     W.lType = QComboBox()
     W.label1 = QLabel()
-    W.entry1 = QLineEdit()
+    W.entry1 = QLineEdit(objectName='neg')
     W.label2 = QLabel()
-    W.entry2 = QLineEdit()
+    W.entry2 = QLineEdit(objectName='neg')
     W.label3 = QLabel()
     W.entry3 = QLineEdit()
     W.label4 = QLabel()
-    W.entry4 = QLineEdit()
+    W.entry4 = QLineEdit(objectName='neg')
     W.label5 = QLabel()
     W.entry5 = QLineEdit()
     W.label6 = QLabel()
-    W.entry6 = QLineEdit()
+    W.entry6 = QLineEdit(objectName='neg')
     W.g23Arc = QPushButton('CW - G2')
     W.g23Arc.setCheckable(True)
     # settings

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.227.215'
+VERSION = '1.227.216'
 
 '''
 qtplasmac_handler.py

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,6 +30,11 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.227.216 2022 July 08</u></b>
+<ul style="margin:0;">
+  <li>conv_line: fix start point</li>
+</ul>
+
 <br><b><u>v1.227.215 2022 July 08</u></b>
 <ul style="margin:0;">
   <li>update to make use of new motion.jog-stop pin</li>