Commit 5bd2003cb918905fe21b1921b517324851e59183
1 parent
03c11d81
Exists in
master
PEP8 changes
Showing
2 changed files
with
8 additions
and
6 deletions
Show diff stats
robots/little_john/telemetry/code/monitor/version1/main.py
@@ -20,7 +20,7 @@ from series import Series | @@ -20,7 +20,7 @@ from series import Series | ||
20 | from plot import Plot | 20 | from plot import Plot |
21 | from getdata import getData | 21 | from getdata import getData |
22 | 22 | ||
23 | -print(' Error: Module Function Message') | 23 | +print(' Type: Module Function Message') |
24 | # WHY WON'T THIS PRINT AT THE TOP | 24 | # WHY WON'T THIS PRINT AT THE TOP |
25 | format_string = '%(levelname)8s:\t%(module)-10s \t%(funcName)s \t%(message)s' | 25 | format_string = '%(levelname)8s:\t%(module)-10s \t%(funcName)s \t%(message)s' |
26 | logging.basicConfig(format=format_string, level=logging.DEBUG) | 26 | logging.basicConfig(format=format_string, level=logging.DEBUG) |
robots/little_john/telemetry/code/monitor/version1/plot.py
@@ -72,14 +72,16 @@ class Plot(pyglet.window.Window): | @@ -72,14 +72,16 @@ class Plot(pyglet.window.Window): | ||
72 | yscale = float(self.series.ylimits[1]-self.series.ylimits[0])/( | 72 | yscale = float(self.series.ylimits[1]-self.series.ylimits[0])/( |
73 | self.bounds[1][1]-self.bounds[1][0]) | 73 | self.bounds[1][1]-self.bounds[1][0]) |
74 | lmar = int(self.width * self.margins[0]) | 74 | lmar = int(self.width * self.margins[0]) |
75 | - rmar = int(self.width * self.margins[1]) | ||
76 | - tmar = int(self.height * self.margins[0]) | 75 | + # rmar = int(self.width * self.margins[1]) |
76 | + # tmar = int(self.height * self.margins[0]) | ||
77 | bmar = int(self.height * self.margins[1]) | 77 | bmar = int(self.height * self.margins[1]) |
78 | - | 78 | + |
79 | pyglet.gl.glLineWidth(2) | 79 | pyglet.gl.glLineWidth(2) |
80 | 80 | ||
81 | - linecolours = [(255, 0, 0, 255, 0, 0), (0, 220, 0, 0, 220, 0), (0, 0, 255, 0, 0, 255)] | ||
82 | - | 81 | + linecolours = [(255, 0, 0, 255, 0, 0), |
82 | + (0, 220, 0, 0, 220, 0), | ||
83 | + (0, 0, 255, 0, 0, 255)] | ||
84 | + | ||
83 | try: | 85 | try: |
84 | for m in range(len(series.data[0])-1): | 86 | for m in range(len(series.data[0])-1): |
85 | for n in range(len(series.data) - 1): | 87 | for n in range(len(series.data) - 1): |