Commit 90aad4d42035a0f703abd061c5bede5f104c9359

Authored by Christopher Stone
2 parents 56e66271 5bd2003c
Exists in master

Trivial manual merge operation

robots/little_john/telemetry/code/monitor/version1/main.py
... ... @@ -21,10 +21,8 @@ from series import Series
21 21 from plot import Plot
22 22 from getdata import getData
23 23  
24   -#test
25   -
26   -print(' Level Module Function Message')
27   -# WHY WON'T THIS PRINT AT THE TOP
  24 +print(' Type: Module Function Message')
  25 +# This doesn't always print at the top?
28 26 format_string = '%(levelname)8s:\t%(module)-10s \t%(funcName)s \t%(message)s'
29 27 logging.basicConfig(format=format_string, level=logging.DEBUG)
30 28 logging.info("Logging system active")
... ...
robots/little_john/telemetry/code/monitor/version1/plot.py
... ... @@ -72,8 +72,8 @@ class Plot(pyglet.window.Window):
72 72 yscale = float(self.series.ylimits[1]-self.series.ylimits[0])/(
73 73 self.bounds[1][1]-self.bounds[1][0])
74 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 77 bmar = int(self.height * self.margins[1])
78 78  
79 79 pyglet.gl.glLineWidth(2)
... ...