From ab2c15bfccfaae7528deff984b22b9d71606ad84 Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Tue, 12 Nov 2024 23:03:58 +0100 Subject: [PATCH] Fix "Change to raw strings to fix Python SyntaxWarning" Commit 447e94a41015b812b8ffe458ba0ede1d5567c32a. --- .../usr_intf/qtplasmac/qtplasmac-materials.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py b/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py index 2154588bbc0..8a82cb4dbdb 100755 --- a/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py +++ b/src/emc/usr_intf/qtplasmac/qtplasmac-materials.py @@ -285,44 +285,44 @@ def on_convert_clicked(self): self.materialCutM = 'CUT_MODE = 1' elif 'PlasmaTool' in line: valid = True - elif line.startswith('Tool number'): + elif line.startswith(r'Tool\ number'): a,b = line.split('=') self.materialNum = '[MATERIAL_NUMBER_{}]'.format(b.strip().replace(']','')) elif line.startswith('Name='): a,b = line.split('=',1) self.materialName = 'NAME = {}'.format(b.strip()) - elif line.startswith('Kerf width'): + elif line.startswith(r'Kerf\ width'): a,b = line.split('=',1) self.materialKerf = "{id:}{val:.{i}f}".format(id='KERF_WIDTH = ', i=self.precision, val=float(b.strip()) / self.divisor) - elif line.startswith('Pierce height'): + elif line.startswith(r'Pierce\ height'): a,b = line.split('=',1) self.materialPierceH = "{id:}{val:.{i}f}".format(id='PIERCE_HEIGHT = ', i=self.precision, val=float(b.strip()) / self.divisor) - elif line.startswith('Pierce delay'): + elif line.startswith(r'Pierce\ delay'): a,b = line.split('=',1) self.materialPierceD = 'PIERCE_DELAY = {}'.format(b.strip()) - elif line.startswith('Cut height'): + elif line.startswith(r'Cut\ height'): a,b = line.split('=',1) self.materialCutH = "{id:}{val:.{i}f}".format(id='CUT_HEIGHT = ', i=self.precision, val=float(b.strip()) / self.divisor) - elif line.startswith('Feed rate'): + elif line.startswith(r'Feed\ rate'): a,b = line.split('=',1) self.materialCutS = "{id:}{val:.{i}f}".format(id='CUT_SPEED = ', i=0, val=float(b.strip()) / self.divisor) - elif line.startswith('Cut current') or (line.startswith('Preset current') and self.materialCutA == 'CUT_AMPS = 0'): + elif line.startswith(r'Cut\ current') or (line.startswith('Preset\ current') and self.materialCutA == 'CUT_AMPS = 0'): a,b = line.split('=',1) self.materialCutA = 'CUT_AMPS = {}'.format(b.strip()) - elif line.startswith('Cut voltage') or (line.startswith('Preset volts') and self.materialCutV == 'CUT_VOLTS = 0'): + elif line.startswith(r'Cut\ voltage') or (line.startswith('Preset\ volts') and self.materialCutV == 'CUT_VOLTS = 0'): a,b = line.split('=',1) self.materialCutV = 'CUT_VOLTS = {}'.format(b.strip()) - elif line.startswith('Pause at end of cut'): + elif line.startswith(r'Pause\ at\ end\ of\ cut'): a,b = line.split('=',1) self.materialPauseE = 'PAUSE_AT_END = {}'.format(b.strip()) - elif line.startswith('Gas pressure') or (line.startswith('Preset Air Pressure') and self.materialGasP == 'GAS_PRESSURE = 0'): + elif line.startswith(r'Gas\ pressure') or (line.startswith('Preset\ Air\ Pressure') and self.materialGasP == 'GAS_PRESSURE = 0'): a,b = line.split('=',1) self.materialGasp = 'GAS_PRESSURE = {}'.format(b.strip()) - elif line.startswith('Cut mode') or (line.startswith('Preset mode') and self.materialCutM == 'CUT_MODE = 1'): + elif line.startswith(r'Cut\ mode') or (line.startswith('Preset\ mode') and self.materialCutM == 'CUT_MODE = 1'): a,b = line.split('=',1) self.materialCutM = 'CUT_MODE = {}'.format(b.strip()) count += 1