Skip to content

Commit 9135c07

Browse files
committed
qtdragon/hd/lathe -fix external status message function
noLog logic was wrong and typoed
1 parent 6760143 commit 9135c07

3 files changed

Lines changed: 27 additions & 30 deletions

File tree

share/qtvcp/screens/qtdragon/qtdragon_handler.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -852,16 +852,15 @@ def set_button_response_state(self, state):
852852
self.w[i].setEnabled(not state)
853853

854854
def add_external_status(self, message, option):
855-
level = option.get('LEVEL') or 0
856-
log = option.get("LOG") or True
857-
title = message.get('TITLE')
858-
mess = message.get('SHORTTEXT')
859-
logtext = message.get('DETAILS')
860-
861-
self.add_status(mess,level,False)
862-
if noLog:
863-
return
864-
STATUS.emit('update-machine-log', "{}\n{}".format(title, logtext), 'TIME')
855+
level = option.get('LEVEL', STATUS.DEFAULT)
856+
log = option.get("LOG", True)
857+
title = message.get('TITLE', '')
858+
mess = message.get('SHORTTEXT', '')
859+
logtext = message.get('DETAILS', '')
860+
861+
self.add_status(mess, level, noLog=True)
862+
if log:
863+
STATUS.emit('update-machine-log', "{}\n{}".format(title, logtext), 'TIME')
865864

866865
#######################
867866
# CALLBACKS FROM FORM #

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -871,16 +871,15 @@ def _check_override_limits(self,state,data):
871871
self.w.chk_override_limits.setChecked(True)
872872

873873
def add_external_status(self, message, option):
874-
level = option.get('LEVEL') or 0
875-
log = option.get("LOG") or True
876-
title = message.get('TITLE')
877-
mess = message.get('SHORTTEXT')
878-
logtext = message.get('DETAILS')
879-
880-
self.add_status(mess,level,False)
881-
if noLog:
882-
return
883-
STATUS.emit('update-machine-log', "{}\n{}".format(title, logtext), 'TIME')
874+
level = option.get('LEVEL', STATUS.DEFAULT)
875+
log = option.get("LOG", True)
876+
title = message.get('TITLE', '')
877+
mess = message.get('SHORTTEXT', '')
878+
logtext = message.get('DETAILS', '')
879+
880+
self.add_status(mess, level, noLog=True)
881+
if log:
882+
STATUS.emit('update-machine-log', "{}\n{}".format(title, logtext), 'TIME')
884883

885884
#######################
886885
# CALLBACKS FROM FORM #

share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -844,16 +844,15 @@ def set_button_response_state(self, state):
844844
self.w[i].setEnabled(not state)
845845

846846
def add_external_status(self, message, option):
847-
level = option.get('LEVEL') or 0
848-
log = option.get("LOG") or True
849-
title = message.get('TITLE')
850-
mess = message.get('SHORTTEXT')
851-
logtext = message.get('DETAILS')
852-
853-
self.add_status(mess,level,False)
854-
if noLog:
855-
return
856-
STATUS.emit('update-machine-log', "{}\n{}".format(title, logtext), 'TIME')
847+
level = option.get('LEVEL', STATUS.DEFAULT)
848+
log = option.get("LOG", True)
849+
title = message.get('TITLE', '')
850+
mess = message.get('SHORTTEXT', '')
851+
logtext = message.get('DETAILS', '')
852+
853+
self.add_status(mess, level, noLog=True)
854+
if log:
855+
STATUS.emit('update-machine-log', "{}\n{}".format(title, logtext), 'TIME')
857856

858857
#######################
859858
# CALLBACKS FROM FORM #

0 commit comments

Comments
 (0)