fixes following ch15 revision

Author: alandmoore

Chapter15/ABQ_Data_Entry/abq_data_entry/application.py

@@ -12,7 +12,6 @@
 from . import models as m
 from .mainmenu import get_main_menu_for_os
 from . import images
-from . import network as n
 
 
 class Application(tk.Tk):
@@ -502,7 +501,7 @@ def show_yield_chart(self, *_):
     popup = tk.Toplevel()
     chart = v.YieldChartView(
       popup,
-      'Average plot humidity', 'Average Plot temperature',
+      'Average plot humidity', 'Average plot temperature',
       'Yield as a product of humidity and temperature'
     )
     chart.pack(fill='both', expand=True)

Chapter15/ABQ_Data_Entry/abq_data_entry/models.py

@@ -203,7 +203,7 @@ def get_growth_by_lab(self):
 
   def get_yield_by_plot(self):
     query = (
-      'SELECT lab_id, plot, seed_sample, MAX(fruit) AS yield, '
+      'SELECT seed_sample, MAX(fruit) AS yield, '
       'AVG(humidity) AS avg_humidity, '
       'AVG(temperature) AS avg_temperature '
       'FROM plot_checks WHERE NOT equipment_fault '

Chapter15/ABQ_Data_Entry/abq_data_entry/views.py

@@ -610,20 +610,24 @@ def __init__(
     )
     # Draw chart
     self.origin = (self.margin, view_height - self.margin)
-    self.create_line(
-      self.origin, (self.margin, self.margin), width=2
-    )
+    # X axis
     self.create_line(
       self.origin,
       (view_width - self.margin, view_height - self.margin)
     )
+    # Y axis
+    self.create_line(
+      self.origin, (self.margin, self.margin), width=2
+    )
+    # X axis label
     self.create_text(
       (view_width // 2, view_height - self.margin),
       text=x_field, anchor='n'
     )
+    # Y axis label
     self.create_text(
-       (self.margin, view_height // 2),
-       text=y_field, angle=90, anchor='s'
+      (self.margin, view_height // 2),
+      text=y_field, angle=90, anchor='s'
     )
     self.plot_area = tk.Canvas(
       self, background='#555',
@@ -635,8 +639,8 @@ def __init__(
 
     # Draw legend and lines
     plot_names = sorted(set([
-        row[self.plot_by_field]
-        for row in self.data
+      row[self.plot_by_field]
+      for row in self.data
     ]))
 
     color_map = list(zip(plot_names, self.colors))
@@ -669,10 +673,11 @@ def _plot_line(self, data, color):
 
   def _draw_legend(self, color_map):
     # determine legend
-    y = 10
-    for label, color in color_map:
-      self.plot_area.create_text((10, y), text=label, fill=color, anchor='w')
-      y += 20
+    for i, (label, color) in enumerate(color_map):
+      self.plot_area.create_text(
+        (10, 10 + (i * 20)),
+        text=label, fill=color, anchor='w'
+      )
 
 
 class YieldChartView(tk.Frame):
@@ -692,10 +697,10 @@ def __init__(self, parent, x_axis, y_axis, title):
     self.scatter_labels = list()
 
   def draw_scatter(self, data, color, label):
-    x, y, s = zip(*data)
-    s = [(x ** 2)//2 for x in s]
+    x, y, size = zip(*data)
+    scaled_size = [(s ** 2)//2 for s in size]
     scatter = self.axes.scatter(
-      x, y, s,
+      x, y, scaled_size,
       c=color, label=label, alpha=0.5
     )
     self.scatters.append(scatter)

Chapter15/bug_race.py

@@ -1,8 +1,14 @@
+"""Bug Race
+
+A demo for the Tkinter Canvas
+"""
+
 import tkinter as tk
 from queue import Queue
 from random import randint
 
 class App(tk.Tk):
+  """Main application class"""
 
   def __init__(self):
     super().__init__()
@@ -29,14 +35,15 @@ def setup(self):
       Racer(self.canvas, 'red'),
       Racer(self.canvas, 'green')
     ]
-    self.check_for_winner()
+    self.execute_frame()
 
-  def check_for_winner(self):
+  def execute_frame(self):
     for racer in self.racers:
+      racer.next_move()
       if self.finish_line in racer.overlapping:
         self.declare_winner(racer)
         return
-    self.after(Racer.FRAME_RES, self.check_for_winner)
+    self.after(Racer.FRAME_RES, self.execute_frame)
 
   def declare_winner(self, racer):
 
@@ -50,8 +57,7 @@ def declare_winner(self, racer):
     self.canvas.tag_bind(wintext, '<Button-1>', self.reset)
 
   def reset(self, *args):
-    for item in self.canvas.find_all():
-      self.canvas.delete(item)
+    self.canvas.delete('all')
     self.setup()
 
 
@@ -80,9 +86,8 @@ def __init__(self, canvas, color):
       (canvas.left + size, canvas.center_y + size),
       fill=color
     )
-    self.animation_queue = Queue()
+    self.movement_queue = Queue()
     self.plot_course()
-    self.animate()
 
   def plot_course(self):
     start_x = self.canvas.left
@@ -101,11 +106,10 @@ def plot_course(self):
       total_dx += dx
       total_dy += dy
 
-  def animate(self):
-    if not self.animation_queue.empty():
-      nextmove = self.animation_queue.get()
+  def next_move(self):
+    if not self.movement_queue.empty():
+      nextmove = self.movement_queue.get()
       self.canvas.move(self.id, *nextmove)
-    self.canvas.after(self.FRAME_RES, self.animate)
 
   def queue_move(self, dx, dy, time):
     num_steps = time // self.FRAME_RES
@@ -114,7 +118,7 @@ def queue_move(self, dx, dy, time):
       self.partition(dy, num_steps))
 
     for step in steps:
-      self.animation_queue.put(step)
+      self.movement_queue.put(step)
 
   @property
   def overlapping(self):

Chapter15/canvas_scroll.py

@@ -4,23 +4,26 @@
 # Create root and canvas
 root = tk.Tk()
 
+width = 1024
+height = 768
+
 canvas = tk.Canvas(
   root, background='black',
-  width=1024, height=768,
+  width=width, height=height,
 )
 canvas.grid(row=0, column=0)
 
 # Draw stars
 colors = ['#FCC', '#CFC', '#CCF', '#FFC', '#FFF', '#CFF']
 for _ in range(1000):
-  x = randint(0, 2048)
-  y = randint(0, 1536)
+  x = randint(0, width * 2)
+  y = randint(0, height * 2)
   z = randint(1, 10)
   c = choice(colors)
   canvas.create_oval((x - z, y - z), (x + z, y + z), fill=c)
 
 # configure the scroll region
-canvas.configure(scrollregion=(0, 0, 2048, 1536))
+canvas.configure(scrollregion=(0, 0, width * 2, height * 2))
 
 # create scrollbars and connect to canvas
 xscroll = tk.Scrollbar(