Skip to content

Commit f53228d

Browse files
snowgoer540snowgoer540
committed
qtplasmac: make window headers/titles cohesive
1 parent f30db11 commit f53228d

6 files changed

Lines changed: 57 additions & 52 deletions

File tree

‎share/qtvcp/screens/qtplasmac/qtplasmac_handler.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.229.222'
1+
VERSION = '1.229.223'
22

33
'''
44
qtplasmac_handler.py
@@ -1023,7 +1023,7 @@ def offset_peripherals(self):
10231023
self.probeOffsetX = 0.0
10241024
self.probeOffsetY = 0.0
10251025
self.probeDelay = 0.0
1026-
head = _translate('HandlerClass', 'PREFS FILE ERROR')
1026+
head = _translate('HandlerClass', 'Prefs File Error')
10271027
# laser
10281028
try:
10291029
self.laserOffsetX = self.PREFS.getpref('X axis', 0, float, 'LASER_OFFSET')
@@ -1443,7 +1443,7 @@ def file_loaded(self, obj, filename):
14431443
self.preRflFile = ''
14441444
msgList, units, xMin, yMin, xMax, yMax = self.bounds_check('loaded', 0, 0)
14451445
if self.boundsError['loaded']:
1446-
head = _translate('HandlerClass', 'AXIS LIMIT ERROR')
1446+
head = _translate('HandlerClass', 'Axis Limit Error')
14471447
msgs = ''
14481448
for n in range(0, len(msgList), 3):
14491449
if msgList[n + 1] == 'MAX':
@@ -1698,7 +1698,7 @@ def run_clicked(self):
16981698
self.rflSelected = False
16991699
if self.developmentPin.get():
17001700
reload(RFL)
1701-
head = _translate('HandlerClass', 'GCODE ERROR')
1701+
head = _translate('HandlerClass', 'Gcode Error')
17021702
data = RFL.run_from_line_get(self.lastLoadedProgram, self.startLine)
17031703
# cannot do run from line within a subroutine or if using cutter compensation
17041704
if data['error']:
@@ -2086,7 +2086,7 @@ def file_reload_clicked(self):
20862086
self.overlayProgress.setValue(0)
20872087
ACTION.OPEN_PROGRAM(file)
20882088
else:
2089-
head = _translate('HandlerClass', 'FILE ERROR')
2089+
head = _translate('HandlerClass', 'File Error')
20902090
msg0 = _translate('HandlerClass', 'does not exist')
20912091
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} {}\n'.format(head, file, msg0))
20922092

@@ -2621,7 +2621,7 @@ def set_axes_and_joints(self):
26212621
if 'coordinates' in kinematics:
26222622
self.coordinates = kinematics.split('coordinates')[1].lower()
26232623
else:
2624-
head = _translate('HandlerClass', 'INI FILE ERROR')
2624+
head = _translate('HandlerClass', 'INI File Error')
26252625
msg0 = _translate('HandlerClass', 'Error in [KINS]KINEMATICS in the ini file')
26262626
msg1 = _translate('HandlerClass', 'reverting to default coordinates of xyz')
26272627
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n{}\n'.format(head, msg0, msg1))
@@ -2834,7 +2834,7 @@ def dialog_input(self, virtkb, title, text, btn1, btn2, delay=None):
28342834

28352835
def dialog_run_from_line(self):
28362836
rFl = QDialog(self.w)
2837-
rFl.setWindowTitle(_translate('HandlerClass', 'RUN FROM LINE'))
2837+
rFl.setWindowTitle(_translate('HandlerClass', 'Run From Line'))
28382838
lbl1 = QLabel(_translate('HandlerClass', 'USE LEADIN:'))
28392839
lbl2 = QLabel(_translate('HandlerClass', 'LEADIN LENGTH:'))
28402840
lbl3 = QLabel(_translate('HandlerClass', 'LEADIN ANGLE:'))
@@ -3181,7 +3181,7 @@ def pulse_timer_timeout(self):
31813181
except Exception as err:
31823182
self.halPulsePins[halpin][3] = 0
31833183
bNum = self.halPulsePins[halpin][4]
3184-
head = _translate('HandlerClass', 'HAL PIN ERROR')
3184+
head = _translate('HandlerClass', 'HAL Pin Error')
31853185
msg0 = _translate('HandlerClass', 'Invalid code for user button')
31863186
msg1 = _translate('HandlerClass', 'Failed to pulse HAL pin')
31873187
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n"{}" {}\n'.format(head, msg0, bNum, msg1, halpin, err))
@@ -3217,7 +3217,7 @@ def user_button_setup(self):
32173217
self.single_cut_request = False
32183218
self.oldFile = None
32193219
singleCodes = ['change-consumables', 'cut-type', 'framing', 'manual-cut', 'offsets-view', 'ohmic-test', 'probe-test', 'single-cut', 'torch-pulse']
3220-
head = _translate('HandlerClass', 'USER BUTTON ERROR')
3220+
head = _translate('HandlerClass', 'User Button Error')
32213221
for bNum in range(1,21):
32223222
self.w['button_{}'.format(str(bNum))].setEnabled(False)
32233223
bName = self.PREFS.getpref('{} Name'.format(bNum), '', str, 'BUTTONS')
@@ -3349,13 +3349,13 @@ def user_button_setup(self):
33493349
elif 'load' in bCode:
33503350
self.idleOnList.append('button_{}'.format(str(bNum)))
33513351
elif 'toggle-halpin' in bCode:
3352-
head = _translate('HandlerClass', 'HAL PIN ERROR')
3352+
head = _translate('HandlerClass', 'HAL Pin Error')
33533353
if len(bCode.split()) == 3 and 'runcritical' in bCode.lower():
33543354
critical = True
33553355
elif len(bCode.split()) == 2:
33563356
critical = False
33573357
else:
3358-
head = _translate('HandlerClass', 'USER BUTTON ERROR')
3358+
head = _translate('HandlerClass', 'User Button Error')
33593359
msg1 = _translate('HandlerClass', 'Check button code for invalid arguments')
33603360
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
33613361
continue
@@ -3392,14 +3392,14 @@ def user_button_setup(self):
33923392
code, halpin = bCode.lower().strip().split()
33933393
delay = '1.0'
33943394
except:
3395-
head = _translate('HandlerClass', 'USER BUTTON ERROR')
3395+
head = _translate('HandlerClass', 'User Button Error')
33963396
msg1 = _translate('HandlerClass', 'Check button code for invalid arguments')
33973397
code = halpin = delay = ''
33983398
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
33993399
continue
34003400
excludedHalPins = ('plasmac.torch-pulse-start', 'plasmac.ohmic-test', \
34013401
'plasmac.probe-test', 'plasmac.consumable-change')
3402-
head = _translate('HandlerClass', 'HAL PIN ERROR')
3402+
head = _translate('HandlerClass', 'HAL Pin Error')
34033403
if halpin in excludedHalPins:
34043404
msg1 = _translate('HandlerClass', 'HAL pin')
34053405
msg2 = _translate('HandlerClass', 'must be pulsed')
@@ -3419,12 +3419,12 @@ def user_button_setup(self):
34193419
try:
34203420
self.halPulsePins[halpin] = ['button_{}'.format(str(bNum)), float(delay), bLabel, 0.0, bNum]
34213421
except:
3422-
head = _translate('HandlerClass', 'USER BUTTON ERROR')
3422+
head = _translate('HandlerClass', 'User Button Error')
34233423
msg1 = _translate('HandlerClass', 'Check button code for invalid seconds argument')
34243424
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
34253425
continue
34263426
else:
3427-
head = _translate('HandlerClass', 'USER BUTTON ERROR')
3427+
head = _translate('HandlerClass', 'User Button Error')
34283428
msg1 = _translate('HandlerClass', 'Check button code for invalid arguments')
34293429
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
34303430
continue
@@ -3444,14 +3444,14 @@ def user_button_setup(self):
34443444
cmd = command.lstrip('%').lstrip(' ').split(' ', 1)[0]
34453445
reply = Popen('which {}'.format(cmd), stdout=PIPE, stderr=PIPE, shell=True).communicate()[0]
34463446
if not reply:
3447-
head = _translate('HandlerClass', 'EXTERNAL CODE ERROR')
3447+
head = _translate('HandlerClass', 'External Code Error')
34483448
msg1 = _translate('HandlerClass', 'External command')
34493449
msg2 = _translate('HandlerClass', 'does not exist')
34503450
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{} "{}" {}\n'.format(head, msg0, bNum, msg1, cmd, msg2))
34513451
else:
34523452
self.estopOnList.append('button_{}'.format(str(bNum)))
34533453
else:
3454-
head = _translate('HandlerClass', 'CODE ERROR')
3454+
head = _translate('HandlerClass', 'Code Error')
34553455
msg1 = self.w['button_{}'.format(str(bNum))].text().replace('\n',' ')
34563456
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}: "{}"\n'.format(head, msg0, bNum, msg1, command))
34573457
if 'button_{}'.format(str(bNum)) in self.idleHomedList:
@@ -3498,7 +3498,7 @@ def user_button_down(self, bNum):
34983498
else:
34993499
self.invert_pin_state(halpin)
35003500
except Exception as err:
3501-
head = _translate('HandlerClass', 'HAL PIN ERROR')
3501+
head = _translate('HandlerClass', 'HAL Pin Error')
35023502
msg0 = _translate('HandlerClass', 'Invalid code for user button')
35033503
msg1 = _translate('HandlerClass', 'Failed to toggle HAL pin')
35043504
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n"{}" {}\n'.format(head, msg0, bNum, msg1, halpin, err))
@@ -3509,7 +3509,7 @@ def user_button_down(self, bNum):
35093509
if command != 'toggle-laser':
35103510
self.user_button_command(command)
35113511
elif 'pulse-halpin' in commands.lower():
3512-
head = _translate('HandlerClass', 'HAL PIN ERROR')
3512+
head = _translate('HandlerClass', 'HAL Pin Error')
35133513
msg1 = _translate('HandlerClass', 'Failed to pulse HAL pin')
35143514
try:
35153515
code, halpin, delay = commands.lower().strip().split()
@@ -3564,7 +3564,7 @@ def user_button_down(self, bNum):
35643564
self.overlayProgress.setValue(0)
35653565
ACTION.OPEN_PROGRAM(latest)
35663566
except:
3567-
head = _translate('HandlerClass', 'FILE ERROR')
3567+
head = _translate('HandlerClass', 'File Error')
35683568
msg0 = _translate('HandlerClass', 'Cannot open latest file from user button')
35693569
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n'.format(head, msg0, bNum))
35703570
else:
@@ -3606,7 +3606,7 @@ def user_button_command(self, command):
36063606
command = command.lstrip('%').lstrip() + '&'
36073607
msg = Popen(command, stdout=PIPE, stderr=PIPE, shell=True)
36083608
else:
3609-
head = _translate('HandlerClass', 'CODE ERROR')
3609+
head = _translate('HandlerClass', 'Code Error')
36103610
msg0 = _translate('HandlerClass', 'Invalid code for user button')
36113611
msg1 = self.w['button_{}'.format(str(bNum))].text().replace('\n',' ')
36123612
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}: "{}"\n'.format(head, msg0, bNum, msg1, command))
@@ -3710,7 +3710,7 @@ def change_consumables(self, state):
37103710
else:
37113711
self.consumable_change_setup()
37123712
if self.ccFeed == 'None' or self.ccFeed < 1:
3713-
head = _translate('HandlerClass', 'USER BUTTON ERROR')
3713+
head = _translate('HandlerClass', 'User Button Error')
37143714
msg0 = _translate('HandlerClass', 'Invalid feed rate for consumable change')
37153715
msg1 = _translate('HandlerClass', 'check .prefs file settings')
37163716
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n{}\n{} Code\n'.format(head, msg0, msg1, str(button)))
@@ -3876,7 +3876,7 @@ def frame_job(self, state):
38763876
def single_cut(self):
38773877
self.set_buttons_state([self.idleList, self.idleOnList, self.idleHomedList], False)
38783878
sC = QDialog(self.w)
3879-
sC.setWindowTitle(_translate('HandlerClass', 'SINGLE CUT'))
3879+
sC.setWindowTitle(_translate('HandlerClass', 'Single Cut'))
38803880
l1 = QLabel(_translate('HandlerClass', 'X LENGTH:'))
38813881
xLength = QDoubleSpinBox()
38823882
xLength.setAlignment(Qt.AlignRight)
@@ -3970,7 +3970,7 @@ def button_normal(self, button):
39703970
#########################################################################################################################
39713971
def vkb_check(self):
39723972
if self.w.chk_soft_keyboard.isChecked() and not os.path.isfile('/usr/bin/onboard'):
3973-
head = _translate('HandlerClass', 'VIRTUAL KB ERROR')
3973+
head = _translate('HandlerClass', 'Virtual Keyboard Error')
39743974
msg0 = _translate('HandlerClass', '"onboard" virtual keyboard is not installed')
39753975
msg1 = _translate('HandlerClass', 'some keyboard functions are not available')
39763976
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n{}\n'.format(head, msg0, msg1))
@@ -4245,7 +4245,7 @@ def material_change_number_pin_changed(self, halpin):
42454245
self.w.materials_box.setCurrentIndex(self.materialList.index(halpin))
42464246

42474247
def material_change_timeout_pin_changed(self, halpin):
4248-
head = _translate('HandlerClass', 'MATERIALS ERROR')
4248+
head = _translate('HandlerClass', 'Materials Error')
42494249
if halpin:
42504250
# should we stop or pause the program if a timeout occurs???
42514251
material = int(self.w.materials_box.currentText().split(': ', 1)[0])
@@ -4432,7 +4432,7 @@ def set_saved_material(self):
44324432

44334433
def load_material_file(self):
44344434
self.getMaterialBusy = 1
4435-
head = _translate('HandlerClass', 'MATERIALS ERROR')
4435+
head = _translate('HandlerClass', 'Materials Error')
44364436
with open(self.materialFile, 'r') as f_in:
44374437
firstpass = True
44384438
material_error = False
@@ -4567,7 +4567,7 @@ def check_material_file(self):
45674567
'#GAS_PRESSURE = \n'\
45684568
'#CUT_MODE = \n'\
45694569
'\n')
4570-
head = _translate('HandlerClass', 'MATERIALS SETUP')
4570+
head = _translate('HandlerClass', 'Materials Setup')
45714571
msg0 = _translate('HandlerClass', 'Creating New Material File')
45724572
STATUS.emit('error', linuxcnc.OPERATOR_DISPLAY, '{}:\n{}: {}\n'.format(head, msg0, self.materialFile))
45734573

@@ -4578,7 +4578,7 @@ def material_exists(self, material):
45784578
if self.autoChange:
45794579
self.materialChangePin.set(-1)
45804580
self.materialChangeNumberPin.set(int(self.w.materials_box.currentText().split(': ', 1)[0]))
4581-
head = _translate('HandlerClass', 'MATERIALS ERROR')
4581+
head = _translate('HandlerClass', 'Materials Error')
45824582
msg0 = _translate('HandlerClass', 'Material #')
45834583
msg1 = _translate('HandlerClass', 'not in material list')
45844584
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{} {}\n'.format(head, msg0, int(material),msg1))
@@ -4644,7 +4644,7 @@ def laser_clicked(self):
46444644
xPos = STATUS.get_position()[0][0] - self.laserOffsetX
46454645
yPos = STATUS.get_position()[0][1] - self.laserOffsetY
46464646
if xPos < self.xMin or xPos > self.xMax or yPos < self.yMin or yPos > self.yMax:
4647-
head = _translate('HandlerClass', 'LASER ERROR')
4647+
head = _translate('HandlerClass', 'Laser Error')
46484648
msg0 = _translate('HandlerClass', 'Laser is outside the machine boundary')
46494649
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n'.format(head, msg0))
46504650
return
@@ -4662,7 +4662,7 @@ def laser_pressed(self):
46624662
xPos = STATUS.get_position()[0][0] + self.laserOffsetX
46634663
yPos = STATUS.get_position()[0][1] + self.laserOffsetY
46644664
if xPos < self.xMin or xPos > self.xMax or yPos < self.yMin or yPos > self.yMax:
4665-
head = _translate('HandlerClass', 'LASER ERROR')
4665+
head = _translate('HandlerClass', 'Laser Error')
46664666
msg0 = _translate('HandlerClass', 'Torch cannot move outside the machine boundary')
46674667
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n'.format(head, msg0))
46684668
return
@@ -4734,7 +4734,7 @@ def cam_mark_clicked(self):
47344734
xPos = STATUS.get_position()[0][0] - self.camOffsetX
47354735
yPos = STATUS.get_position()[0][1] - self.camOffsetY
47364736
if xPos < self.xMin or xPos > self.xMax or yPos < self.yMin or yPos > self.yMax:
4737-
head = _translate('HandlerClass', 'CAMERA ERROR')
4737+
head = _translate('HandlerClass', 'Camera Error')
47384738
msg0 = _translate('HandlerClass', 'Camera is outside the machine boundary')
47394739
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n'.format(head, msg0))
47404740
return
@@ -4876,7 +4876,7 @@ def pmx485_startup(self, port):
48764876
self.w.pmx485_enable.setChecked(True)
48774877

48784878
def pmx485_load(self, port):
4879-
head = _translate('HandlerClass', 'COMMS ERROR')
4879+
head = _translate('HandlerClass', 'Comms Error')
48804880
msg0 = _translate('HandlerClass', 'PMX485 component is not able to be loaded,')
48814881
msg1 = _translate('HandlerClass', 'Powermax communications are not available')
48824882
err = '{}:\n{}\n{}\n'.format(head, msg0, msg1)
@@ -4920,7 +4920,7 @@ def pmx485_enable_changed(self, state):
49204920
self.pmx485_setup()
49214921
# ensure valid parameters before trying to connect
49224922
if self.w.cut_mode.value() == 0 or self.w.cut_amps.value() == 0:
4923-
head = _translate('HandlerClass', 'MATERIALS ERROR')
4923+
head = _translate('HandlerClass', 'Materials Error')
49244924
msg0 = _translate('HandlerClass', 'Invalid Cut Mode or Cut Amps,')
49254925
msg1 = _translate('HandlerClass', 'cannot connect to Powermax')
49264926
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{}\n{}\n'.format(head, msg0, msg1))
@@ -5009,7 +5009,7 @@ def pmx485_fault_changed(self, fault):
50095009
if self.pmx485Connected:
50105010
faultRaw = '{:04.0f}'.format(fault)
50115011
self.pmx485FaultCode = '{}-{}-{}'.format(faultRaw[0], faultRaw[1:3], faultRaw[3])
5012-
head = _translate('HandlerClass', 'POWERMAX ERROR')
5012+
head = _translate('HandlerClass', 'Powermax Error')
50135013
code = _translate('HandlerClass', 'Fault Code')
50145014
text = _translate('HandlerClass', 'Powermax error')
50155015
if faultRaw == '0000':

‎share/qtvcp/screens/qtplasmac/versions.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33-
<br><b><u>v1.229.222 2022 Aug 08</u></b>
33+
<br><b><u>v1.229.223 2022 Aug 11</u></b>
34+
<ul style="margin:0;">
35+
<li>make window headers/titles cohesive</li>
36+
</ul>
37+
<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
38+
3439
<ul style="margin:0;">
3540
<li>change workflow for setting peripheral offsets</li>
3641
</ul>

0 commit comments

Comments
 (0)