Skip to content

Make it run with pyglet2 #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EtherGraf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make it run with pyglet2 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3968477
Port to python3
hyperair Dec 24, 2019
9fa9506
Make yagv running with pyglet2
EtherGraf Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions gcodeParser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import math
import re

class GcodeParser:
class GcodeParser(object):

def __init__(self):
self.model = GcodeModel(self)
Expand Down Expand Up @@ -100,10 +100,10 @@ def parse_G92(self, args):
self.model.do_G92(self.parseArgs(args))

def warn(self, msg):
print "[WARN] Line %d: %s (Text:'%s')" % (self.lineNb, msg, self.line)
print("[WARN] Line %d: %s (Text:'%s')" % (self.lineNb, msg, self.line))

def error(self, msg):
print "[ERROR] Line %d: %s (Text:'%s')" % (self.lineNb, msg, self.line)
print("[ERROR] Line %d: %s (Text:'%s')" % (self.lineNb, msg, self.line))
raise Exception("[ERROR] Line %d: %s (Text:'%s')" % (self.lineNb, msg, self.line))

class BBox(object):
Expand Down Expand Up @@ -139,7 +139,7 @@ def extend(self, coords):
self.zmin = min(self.zmin, coords["Z"])
self.zmax = max(self.zmax, coords["Z"])

class GcodeModel:
class GcodeModel(object):

def __init__(self, parser):
# save parser for messages
Expand Down Expand Up @@ -172,7 +172,7 @@ def do_G1(self, args, type):
coords = dict(self.relative)
# update changed coords
for axis in args.keys():
if coords.has_key(axis):
if axis in coords:
if self.isRelative:
coords[axis] += args[axis]
else:
Expand Down Expand Up @@ -205,11 +205,11 @@ def do_G92(self, args):
# this changes the current coords, without moving, so do not generate a segment

# no axes mentioned == all axes to 0
if not len(args.keys()):
if not args:
args = {"X":0.0, "Y":0.0, "Z":0.0, "E":0.0}
# update specified axes
for axis in args.keys():
if self.offset.has_key(axis):
if axis in self.offset:
# transfer value from relative to offset
self.offset[axis] += self.relative[axis] - args[axis]
self.relative[axis] = args[axis]
Expand Down Expand Up @@ -376,7 +376,7 @@ def postProcess(self):
def __str__(self):
return "<GcodeModel: len(segments)=%d, len(layers)=%d, distance=%f, extrudate=%f, bbox=%s>"%(len(self.segments), len(self.layers), self.distance, self.extrudate, self.bbox)

class Segment:
class Segment(object):
def __init__(self, type, coords, lineNb, line):
self.type = type
self.coords = coords
Expand All @@ -389,7 +389,7 @@ def __init__(self, type, coords, lineNb, line):
def __str__(self):
return "<Segment: type=%s, lineNb=%d, style=%s, layerIdx=%d, distance=%f, extrudate=%f>"%(self.type, self.lineNb, self.style, self.layerIdx, self.distance, self.extrudate)

class Layer:
class Layer(object):
def __init__(self, Z):
self.Z = Z
self.segments = []
Expand All @@ -406,4 +406,4 @@ def __str__(self):
parser = GcodeParser()
model = parser.parseFile(path)

print model
print(model)
Loading