Add files via upload

Updated plot library

Author: HughMaingauche

VGA/VGA_plot.py

@@ -43,19 +43,20 @@ def __init__(self, display, ul_x=1, ul_y=1, br_x=400, br_y=300,ax_color=WHITE, m
         self.max_y=max_y
         self.x_ticks_num=x_ticks_num
         self.y_ticks_num=y_ticks_num
-        # Load a small font
-        self.x_font_size=8
-        self.y_font_size=10
-        self.display.font=Font('fonts/Small_Fonts8x10.c', self.x_font_size, self.y_font_size,char_spacing=0, line_spacing=1)
+        # Choose defaut font here
+        self.display.defaut_font=Font('fonts/Small_Fonts8x10.c', width=8, height=10,start_letter=32, letter_count=96,char_spacing=1, line_spacing=2)
+        self.display.font=self.display.defaut_font
         # Define and draw plotting area (taking out space for the ticks and labels)
         self.tick_size=3
-        self.top_margin=int(self.y_font_size/2)+1
+        self.top_margin=int(self.display.font.height/2)+1
         self.bottom_margin=12
         self.left_margin=20
         self.x_origin=self.ul_x+self.left_margin
         self.x_range=self.br_x-self.x_origin
+        self.x_origin+=int(abs(self.x_range*(self.min_x/(self.max_x-self.min_x))))
         self.y_origin=self.br_y-self.bottom_margin
         self.y_range=self.y_origin-self.top_margin-self.ul_y
+        self.y_origin-=int(abs(self.y_range*(self.min_y/(self.max_y-self.min_y))))
         self.display.draw_rect(self.ul_x+self.left_margin, self.ul_y+self.top_margin, self.br_x, self.br_y-self.bottom_margin,self.ax_color)
         self.display.settextcolor(self.ax_color)
         # prepare for legend
@@ -79,19 +80,21 @@ def draw_axes_y(self):
         for i in range(self.y_ticks_num+1):
             y_tick=self.br_y-self.bottom_margin-int(i*self.y_range/self.y_ticks_num)
             self.display.draw_fastHline(self.ul_x+self.left_margin,self.ul_x+self.left_margin+self.tick_size,y_tick,self.ax_color)
-            self.display.settextcursor(self.ul_x, y_tick-int(self.y_font_size/2))
+            self.display.settextcursor(self.ul_x, y_tick-int(self.display.font.height/2))
             y_tick_val=round(self.min_y+(i*(self.max_y-self.min_y)/self.y_ticks_num),2)
             self.display.printh(str(y_tick_val))
 
     def draw_labels(self):
+        #Choose font for labels
+        self.display.font=Font('fonts/Small_Fonts9x11.c', width=9, height=11, start_letter=32, letter_count=96,char_spacing=1, line_spacing=2)
         x1_line=self.x_origin+10
         for i in range(len(self.line_labels)):
-            y1_line=self.top_margin+self.ul_y+int(self.y_font_size/2)+i*self.y_font_size+1
+            y1_line=self.top_margin+self.ul_y+int(self.display.font.width/2)+i*self.display.font.height+1
             self.display.draw_fastHline(x1_line,x1_line+10,y1_line,self.line_colors[i])
-            self.display.settextcursor(x1_line+10+2, y1_line-int(self.y_font_size/2))
+            self.display.settextcursor(x1_line+10+4, y1_line-int(self.display.font.height/2))
             self.display.settextcolor(self.line_colors[i])
             self.display.printh(self.line_labels[i])
-
+        self.display.font=self.display.defaut_font
 
 class Line:
     """An x.y graph object (line) for the VGA 800x600 display.
@@ -159,6 +162,9 @@ def add_data_ns(self,x,y,draw_line=True):
             self.ploty0=self.plot.y_origin-int((y*self.plot.y_range/(self.plot.max_y-self.plot.min_y)))
             self.plot.display.draw_pix(self.plotx0,self.ploty0,self.color)
             self.is_first_point=False
+            print("first point")
+            print("self.plotx0",self.plotx0)
+            print("self.plot.x_origin",self.plot.x_origin)
         else:
             plotx=self.plot.x_origin+int((x*self.plot.x_range/(self.plot.max_x-self.plot.min_x)))
             ploty=self.plot.y_origin-int((y*self.plot.y_range/(self.plot.max_y-self.plot.min_y)))