diff --git a/GcodeFileSplitter.py b/GcodeFileSplitter.py index b3655be..7620a72 100644 --- a/GcodeFileSplitter.py +++ b/GcodeFileSplitter.py @@ -8,7 +8,7 @@ from math import isclose logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s: %(message)s') -FLOAT_OR_INT = r'\d+(\.\d*)?' +FLOAT_OR_INT = r'-?\d+(\.\d*)?' RE_LAYER_COUNT = re.compile(r';LAYER_COUNT:(\d+)', re.MULTILINE) RE_LAYER = re.compile(r'(;LAYER:\d+)', re.MULTILINE) @@ -211,5 +211,5 @@ if __name__ == '__main__': # GcodeFileAnalyzer.SplitFileAtLayers('test/BigL.gcode', ['2.8001mm', 300]) # GcodeFileAnalyzer.SplitFileAtLayers(r"Q:\DIY\3Dprint\Models\Thingiverse\Murmelbahnen\The_Cyclone_triple_lift_triple_track_marble_machine\files\gcode\Marble_machine.gcode", # ['97.3mm', 405, 480]) - GcodeFileAnalyzer.SplitFileAtLayers(r"Q:\DIY\3Dprint\Models\Thingiverse\Shuttle\Shuttle.gcode", - [334]) + GcodeFileAnalyzer.SplitFileAtLayers(r"Q:\DIY\3Dprint\Models\Thingiverse\Shuttle\Shuttle100.gcode", + ['87.60mm'])