Resructured axes title and tag scaling

now axes titles and text scale at the same rate, to avoid the ugly situation of uneven overlaps. May want to change scaling factors in the future so that titles are larger than lables, but that can be done easily.

Resructured axes title and tag scaling
now axes titles and text scale at the same rate, to avoid the ugly situation of uneven overlaps. May want to change scaling factors in the future so that titles are larger than lables, but that can be done easily.
Hugo Stephens
1 parent 9f810b17
Showing 1 changed file with 5 additions and 4 deletions Show diff stats
robots/little_john/telemetry/code/monitor/graph_plotter_rewrite.py
@@ -129,6 +129,7 @@ class Plot(pyglet.window.Window):
         """Handle a resize event from the pyglet event loop"""
         self.bounds = ((int(self.width * self.margins[0]), int(self.width * (1 - self.margins[0]))),
                 (int(self.height * self.margins[1]), int(self.height * (1 - self.margins[1]))))
+        self.tag_size = min(self.height*self.margins[1]*0.3,self.width*self.margins[0]*0.3)
         # This sometimes seems to throw an error ('AttributeError: 'Plot' object has no attribute 'margins') when started for a second time from the same instance. Interesting. Causes the plot windows to freeze
         pyglet.window.Window.on_resize(self, width, height)
  
@@ -173,11 +174,11 @@ class Plot(pyglet.window.Window):
                 pyglet.graphics.draw(2, pyglet.gl.GL_LINES, ('v2i', (pos, limita, pos, limitb)),
                                  ('c3B', (0, 0, 0, 0, 0, 0)))
                 tag = pyglet.text.Label(tagtext, color=BLACK,
-                                        font_name=self.font, font_size=self.height*self.margins[1]*0.3,
+                                        font_name=self.font, font_size=self.tag_size,
                                         x=pos, y=self.height*self.margins[1],
                                         anchor_x='left', anchor_y='top')
                 axistitle = pyglet.text.Label(self.series.xname, color=BLACK,
-                                                font_name=self.font, font_size=self.height*self.margins[1]*0.3,
+                                                font_name=self.font, font_size=self.tag_size,
                                                 x=self.width/2, y=0,
                                                 anchor_x='center', anchor_y='bottom')
                 axistitle.draw()
@@ -188,11 +189,11 @@ class Plot(pyglet.window.Window):
                 pyglet.graphics.draw(2, pyglet.gl.GL_LINES, ('v2i', (limita, pos, limitb, pos)),
                                  ('c3B', (0, 0, 0, 0, 0, 0)))
                 tag = pyglet.text.Label(tagtext, color=BLACK,
-                                        font_name=self.font, font_size=self.width*self.margins[0]*0.2,
+                                        font_name=self.font, font_size=self.tag_size,
                                         x=self.width*self.margins[0]*0.9, y=pos,
                                         anchor_x='right', anchor_y='center')
                 axistitle = pyglet.text.Label(self.series.yname, color=BLACK,
-                                                font_name=self.font, font_size=self.height*self.margins[0]*0.3,
+                                                font_name=self.font, font_size=self.tag_size,
                                                 x=0, y=self.height/2,
                                                 anchor_x='center', anchor_y='top')
                 pyglet.gl.glPushMatrix()   # Set up a new context to avoid confusing the main one