detect negative number

This commit is contained in:
2019-01-27 16:34:12 +01:00
parent d63a19923e
commit abb0e1c67e

View File

@@ -8,7 +8,7 @@ from math import isclose
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s - %(levelname)s: %(message)s') 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_COUNT = re.compile(r';LAYER_COUNT:(\d+)', re.MULTILINE)
RE_LAYER = re.compile(r'(;LAYER:\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('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", # 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]) # ['97.3mm', 405, 480])
GcodeFileAnalyzer.SplitFileAtLayers(r"Q:\DIY\3Dprint\Models\Thingiverse\Shuttle\Shuttle.gcode", GcodeFileAnalyzer.SplitFileAtLayers(r"Q:\DIY\3Dprint\Models\Thingiverse\Shuttle\Shuttle100.gcode",
[334]) ['87.60mm'])