Skip to content

Commit e78cc0a

Browse files
c-morleyc-morley
committed
qtdragon family: fix reporting of limit trip at startup, add log color
Previously a limit trip was reported at start up. add level/color to some more status messages
1 parent 0635f3c commit e78cc0a

File tree

4 files changed

+46
-26
lines changed

4 files changed

+46
-26
lines changed

‎share/qtvcp/screens/qtdragon/qtdragon_handler.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -834,12 +834,14 @@ def not_all_homed(self, obj, list):
834834
self.w.btn_home_all.setText(_translate("HandlerClass","HOME\nALL"))
835835

836836
def hard_limit_tripped(self, obj, tripped, list_of_tripped):
837-
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
838-
self.w.chk_override_limits.setEnabled(tripped)
839-
if not tripped:
837+
if tripped:
838+
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
839+
self.w.chk_override_limits.setEnabled(tripped)
840+
else:
840841
self.w.chk_override_limits.setChecked(False)
842+
self.add_status(_translate("HandlerClass","Hard Limits Clear"),)
841843

842-
# keep check button in synch of external changes
844+
# keep check button in sync of external changes
843845
def _check_override_limits(self,state,data):
844846
if 0 in data:
845847
self.w.chk_override_limits.setChecked(False)
@@ -1136,7 +1138,7 @@ def cam_yscale_percent(self):
11361138

11371139
# settings tab
11381140
def chk_override_limits_checked(self, state):
1139-
# only toggle override if it's not in synch with the button
1141+
# only toggle override if it's not in sync with the button
11401142
if state and not STATUS.is_limits_override_set():
11411143
self.add_status(_translate("HandlerClass","Override limits set"), WARNING)
11421144
ACTION.TOGGLE_LIMITS_OVERRIDE()
@@ -1523,16 +1525,19 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
15231525
ACTION.JOG(joint, 0, 0, 0)
15241526

15251527
def add_status(self, message, alertLevel = DEFAULT, noLog = False):
1528+
opt = 'TIME'
15261529
if alertLevel==DEFAULT:
15271530
self.set_style_default()
15281531
elif alertLevel==WARNING:
1532+
opt += ',WARNING'
15291533
self.set_style_warning()
15301534
else:
1535+
opt += ',CRITICAL'
15311536
self.set_style_critical()
15321537
self.w.lineEdit_statusbar.setText(message)
15331538
if noLog:
15341539
return
1535-
STATUS.emit('update-machine-log', message, 'TIME')
1540+
STATUS.emit('update-machine-log', message, opt)
15361541

15371542
def enable_auto(self, state):
15381543
for widget in self.auto_list:

‎share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -857,12 +857,14 @@ def not_all_homed(self, obj, list):
857857
self.w.btn_home_all.setText(_translate("HandlerClass","HOME ALL"))
858858

859859
def hard_limit_tripped(self, obj, tripped, list_of_tripped):
860-
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
861-
self.w.chk_override_limits.setEnabled(tripped)
862-
if not tripped:
860+
if tripped:
861+
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
862+
self.w.chk_override_limits.setEnabled(tripped)
863+
else:
863864
self.w.chk_override_limits.setChecked(False)
865+
self.add_status(_translate("HandlerClass","Hard Limits Clear"))
864866

865-
# keep check button in synch of external changes
867+
# keep check button in sync of external changes
866868
def _check_override_limits(self,state,data):
867869
if 0 in data:
868870
self.w.chk_override_limits.setChecked(False)
@@ -1183,7 +1185,7 @@ def cam_yscale_percent(self):
11831185
# settings tab
11841186

11851187
def chk_override_limits_checked(self, state):
1186-
# only toggle override if it's not in synch with the button
1188+
# only toggle override if it's not in sync with the button
11871189
if state and not STATUS.is_limits_override_set():
11881190
self.add_status(_translate("HandlerClass","Override limits set"), WARNING)
11891191
ACTION.TOGGLE_LIMITS_OVERRIDE()
@@ -1581,16 +1583,19 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
15811583
ACTION.JOG(joint, 0, 0, 0)
15821584

15831585
def add_status(self, message, alertLevel = DEFAULT, noLog = False):
1586+
opt = 'TIME'
15841587
if alertLevel==DEFAULT:
15851588
self.set_style_default()
15861589
elif alertLevel==WARNING:
1590+
opt += ',WARNING'
15871591
self.set_style_warning()
15881592
else:
1593+
opt += ',CRITICAL'
15891594
self.set_style_critical()
1590-
self.w.statusbar.setText(message)
1595+
self.w.lineEdit_statusbar.setText(message)
15911596
if noLog:
15921597
return
1593-
STATUS.emit('update-machine-log', message, 'TIME')
1598+
STATUS.emit('update-machine-log', message, opt)
15941599

15951600
def enable_auto(self, state):
15961601
if state is True:

‎share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -857,12 +857,14 @@ def not_all_homed(self, obj, list):
857857
self.w.btn_home_all.setText(_translate("HandlerClass","HOME ALL"))
858858

859859
def hard_limit_tripped(self, obj, tripped, list_of_tripped):
860-
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
861-
self.w.chk_override_limits.setEnabled(tripped)
862-
if not tripped:
860+
if tripped:
861+
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
862+
self.w.chk_override_limits.setEnabled(tripped)
863+
else:
863864
self.w.chk_override_limits.setChecked(False)
865+
self.add_status(_translate("HandlerClass","Hard Limits Clear"))
864866

865-
# keep check button in synch of external changes
867+
# keep check button in sync of external changes
866868
def _check_override_limits(self,state,data):
867869
if 0 in data:
868870
self.w.chk_override_limits.setChecked(False)
@@ -1183,7 +1185,7 @@ def cam_yscale_percent(self):
11831185
# settings tab
11841186

11851187
def chk_override_limits_checked(self, state):
1186-
# only toggle override if it's not in synch with the button
1188+
# only toggle override if it's not in sync with the button
11871189
if state and not STATUS.is_limits_override_set():
11881190
self.add_status(_translate("HandlerClass","Override limits set"), WARNING)
11891191
ACTION.TOGGLE_LIMITS_OVERRIDE()
@@ -1581,16 +1583,19 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
15811583
ACTION.JOG(joint, 0, 0, 0)
15821584

15831585
def add_status(self, message, alertLevel = DEFAULT, noLog = False):
1586+
opt = 'TIME'
15841587
if alertLevel==DEFAULT:
15851588
self.set_style_default()
15861589
elif alertLevel==WARNING:
1590+
opt += ',WARNING'
15871591
self.set_style_warning()
15881592
else:
1593+
opt += ',CRITICAL'
15891594
self.set_style_critical()
1590-
self.w.statusbar.setText(message)
1595+
self.w.lineEdit_statusbar.setText(message)
15911596
if noLog:
15921597
return
1593-
STATUS.emit('update-machine-log', message, 'TIME')
1598+
STATUS.emit('update-machine-log', message, opt)
15941599

15951600
def enable_auto(self, state):
15961601
if state is True:

‎share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -826,12 +826,14 @@ def not_all_homed(self, obj, list):
826826
self.w.btn_home_all.setText(_translate("HandlerClass","HOME\nALL"))
827827

828828
def hard_limit_tripped(self, obj, tripped, list_of_tripped):
829-
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
830-
self.w.chk_override_limits.setEnabled(tripped)
831-
if not tripped:
829+
if tripped:
830+
self.add_status(_translate("HandlerClass","Hard limits tripped"), CRITICAL)
831+
self.w.chk_override_limits.setEnabled(tripped)
832+
else:
832833
self.w.chk_override_limits.setChecked(False)
834+
self.add_status(_translate("HandlerClass","Hard Limits Clear"))
833835

834-
# keep check button in synch of external changes
836+
# keep check button in sync of external changes
835837
def _check_override_limits(self,state,data):
836838
if 0 in data:
837839
self.w.chk_override_limits.setChecked(False)
@@ -1139,7 +1141,7 @@ def cam_yscale_percent(self):
11391141

11401142
# settings tab
11411143
def chk_override_limits_checked(self, state):
1142-
# only toggle override if it's not in synch with the button
1144+
# only toggle override if it's not in sync with the button
11431145
if state and not STATUS.is_limits_override_set():
11441146
self.add_status(_translate("HandlerClass","Override limits set"), WARNING)
11451147
ACTION.TOGGLE_LIMITS_OVERRIDE()
@@ -1527,16 +1529,19 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
15271529
ACTION.JOG(joint, 0, 0, 0)
15281530

15291531
def add_status(self, message, alertLevel = DEFAULT, noLog = False):
1532+
opt = 'TIME'
15301533
if alertLevel==DEFAULT:
15311534
self.set_style_default()
15321535
elif alertLevel==WARNING:
1536+
opt += ',WARNING'
15331537
self.set_style_warning()
15341538
else:
1539+
opt += ',CRITICAL'
15351540
self.set_style_critical()
15361541
self.w.lineEdit_statusbar.setText(message)
15371542
if noLog:
15381543
return
1539-
STATUS.emit('update-machine-log', message, 'TIME')
1544+
STATUS.emit('update-machine-log', message, opt)
15401545

15411546
def enable_auto(self, state):
15421547
for widget in self.auto_list:

0 commit comments

Comments
 (0)