Skip to content

Commit

Permalink
Merge pull request #3228 from LinuxCNC/revert-3194-qt_istat-log-string
Browse files Browse the repository at this point in the history
Revert "qt_istat: remove "Error" from logger strings"
  • Loading branch information
hansu authored Dec 15, 2024
2 parents 79ca442 + cdb73ad commit 058f77c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/python/qtvcp/qt_istat.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ def update(self):
self.MAX_FEED_OVERRIDE = float(self.get_error_safe_setting("DISPLAY", "MAX_FEED_OVERRIDE", 1.5)) * 100
if self.INI.find("TRAJ", "MAX_LINEAR_VELOCITY") is None:
if self.LINUXCNC_IS_RUNNING:
log.critical('INI Parsing: No MAX_LINEAR_VELOCITY Entry in TRAJ')
log.critical('INI Parsing Error, No MAX_LINEAR_VELOCITY Entry in TRAJ')
self.MAX_TRAJ_VELOCITY = float(self.get_error_safe_setting("TRAJ", "MAX_LINEAR_VELOCITY",
self.get_error_safe_setting("AXIS_X", "MAX_VELOCITY", 5))) * 60

Expand Down Expand Up @@ -648,7 +648,7 @@ def get_error_safe_setting(self, heading, detail, default=None):
('ANGULAR' in detail and not self.HAS_ANGULAR_JOINT):
return default
else:
log.warning('INI Parsing: No {} Entry in {}, Using: {}'.format(detail, heading, default))
log.warning('INI Parsing Error, No {} Entry in {}, Using: {}'.format(detail, heading, default))
return default

# return a found float or else None by default, anything else by option
Expand Down Expand Up @@ -731,7 +731,7 @@ def get_all_valid_extensions(self):
temp.append('.ngc')
return temp
except Exception as e:
log.warning('Valid Extension Parsing: {}\n Using Default: *'.format(e))
log.warning('Valid Extension Parsing Error: {}\n Using Default: *'.format(e))
return ('*')

def get_filters_extensions(self):
Expand All @@ -747,7 +747,7 @@ def get_filters_extensions(self):
all_extensions.append(['All (*)', ['*']])
return all_extensions
except Exception as e:
log.warning('filter Extension Parsing: {}\n Using Default: ALL (*)'.format(e))
log.warning('filter Extension Parsing Error: {}\n Using Default: ALL (*)'.format(e))
return [['All (*)', ['*']]]

# get filter extensions in QT format
Expand All @@ -764,7 +764,7 @@ def get_qt_filter_extensions(self):
temp = '%s %s' % (temp, i)
return temp
except Exception as e:
log.warning('Qt filter Extension Parsing: {}\n Using Default: ALL (*)'.format(e))
log.warning('Qt filter Extension Parsing Error: {}\n Using Default: ALL (*)'.format(e))
return ('All (*)')

def program_extension_valid(self, fname):
Expand Down

0 comments on commit 058f77c

Please sign in to comment.