Trivial manual merge operation

Christopher Stone
2 parents 56e66271 5bd2003c
Showing 2 changed files with 4 additions and 6 deletions Show diff stats
robots/little_john/telemetry/code/monitor/version1/main.py
robots/little_john/telemetry/code/monitor/version1/plot.py
@@ -21,10 +21,8 @@ from series import Series
 from plot import Plot
 from getdata import getData
-#test
-
-print('   Level        Module          Function        Message')
-# WHY WON'T THIS PRINT AT THE TOP
+print('    Type:       Module          Function        Message') 
+# This doesn't always print at the top?
 format_string = '%(levelname)8s:\t%(module)-10s \t%(funcName)s \t%(message)s'
 logging.basicConfig(format=format_string, level=logging.DEBUG)
 logging.info("Logging system active")
@@ -72,8 +72,8 @@ class Plot(pyglet.window.Window):
         yscale = float(self.series.ylimits[1]-self.series.ylimits[0])/(
                 self.bounds[1][1]-self.bounds[1][0])
         lmar = int(self.width * self.margins[0])
-        rmar = int(self.width * self.margins[1])
-        tmar = int(self.height * self.margins[0])
+        # rmar = int(self.width * self.margins[1])
+        # tmar = int(self.height * self.margins[0])
         bmar = int(self.height * self.margins[1])
         pyglet.gl.glLineWidth(2)