Fixed bug in axis-labelling code, lower limits were being calculated incorrectly

Christopher Stone
1 parent 2cb884e3
Showing 1 changed file with 4 additions and 5 deletions Show diff stats
telemetry/code/monitor/graph_plotter.py
@@ -34,12 +34,12 @@ def drawgrid(xlines, ylines, xlimits, ylimits):
     pyglet.gl.glColor4f(0.5, 0.5, 0.5, 1.0) 
     for xpos in range(0, window.width, window.width/xlines):
         pyglet.graphics.draw(2, pyglet.gl.GL_LINES, ('v2i', (xpos, 0, xpos, window.height)))
-        tagtext = str(round((xlimits[1]-xlimits[0])*(float(xpos)/window.width), 1))
+        tagtext = str(round((xlimits[1]-xlimits[0])*(float(xpos)/window.width) + xlimits[0], 1))
         tag = pyglet.text.Label(tagtext, font_name='Arkhip', font_size=10, x=xpos-2, y=0, anchor_x='right', anchor_y='bottom')
         tag.draw()
-    for ypos in range(0, window.width, window.width/ylines):
+    for ypos in range(0, window.width, window.height/ylines):
         pyglet.graphics.draw(2, pyglet.gl.GL_LINES, ('v2i', (0, ypos, window.width, ypos)))
-        tagtext = str(round((ylimits[1]-ylimits[0])*(float(ypos)/window.height), 1))
+        tagtext = str(round((ylimits[1]-ylimits[0])*(float(ypos)/window.height) + ylimits[0], 1))
         tag = pyglet.text.Label(tagtext, font_name='Arkhip', font_size=10, x=0, y=ypos-2, anchor_x='left', anchor_y='top')
         tag.draw()
  
@@ -70,7 +70,6 @@ ydata = [0]
 @window.event
 def on_draw():
     window.clear()
-    #ydata.append(random.uniform(0, 10))
     value = datafeed.readline()
     try:
         value = float(value)
@@ -83,7 +82,7 @@ def on_draw():
             del xdata[0]
     except:
         pass
-    drawgrid(10, 12, [min(xdata), max(xdata)], [min(ydata), max(ydata)])
+    drawgrid(10, 10, [min(xdata), max(xdata)], [min(ydata), max(ydata)])
     plotline(xdata, ydata)