Skip to content

Commit aba660a

Browse files
committed
gscreen -fix INI parsing of jog increments that uses space as a delimiter
adding a missing ', continuous' before parsing broke the assumptions. Now we add a missing 'continuous' after parsing.
1 parent 1ed967b commit aba660a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/emc/usr_intf/gscreen/gscreen.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,12 +648,12 @@ def __init__(self):
648648
# jogging increments
649649
increments = self.inifile.find("DISPLAY", "INCREMENTS")
650650
if increments:
651-
if not "continuous" in increments:
652-
increments +=",continuous"
653651
if "," in increments:
654652
self.data.jog_increments = [i.strip() for i in increments.split(",")]
655653
else:
656654
self.data.jog_increments = increments.split()
655+
if not "continuous" in increments.lower():
656+
self.data.jog_increments += ["continuous"]
657657
else:
658658
if self.machine_units_mm ==self.data._MM:
659659
self.data.jog_increments = [".001 mm",".01 mm",".1 mm","1 mm","continuous"]
@@ -664,12 +664,12 @@ def __init__(self):
664664
# angular jogging increments
665665
increments = self.inifile.find("DISPLAY", "ANGULAR_INCREMENTS")
666666
if increments:
667-
if not "continuous" in increments:
668-
increments +=",continuous"
669667
if "," in increments:
670668
self.data.angular_jog_increments = [i.strip() for i in increments.split(",")]
671669
else:
672670
self.data.angular_jog_increments = increments.split()
671+
if not "continuous" in increments.lower():
672+
self.data.angular_jog_increments += ["continuous"]
673673
else:
674674
self.data.angular_jog_increments = ["1","45","180","360","continuous"]
675675
self.add_alarm_entry(_("No default angular jog increments entry found in [DISPLAY] of INI file"))

0 commit comments

Comments
 (0)