Chapter 8 updates per feedback

Author: alandmoore

Chapter08/ABQ_Data_Entry/abq_data_entry/application.py

@@ -199,19 +199,19 @@ def _populate_recordlist(self):
 
   def _new_record(self, *_):
     """Open the record form with a blank record"""
-    self.recordform.load_record(None, None)
+    self.recordform.load_record(None)
     self.notebook.select(self.recordform)
 
 
   def _open_record(self, *_):
-    """Open the Record selected recordlist id in the recordform"""
+    """Open the selected id from recordlist in the recordform"""
     rowkey = self.recordlist.selected_id
     try:
       record = self.model.get_record(rowkey)
     except Exception as e:
       messagebox.showerror(
         title='Error', message='Problem reading file', detail=str(e)
       )
-      return
-    self.recordform.load_record(rowkey, record)
-    self.notebook.select(self.recordform)
+    else:
+      self.recordform.load_record(rowkey, record)
+      self.notebook.select(self.recordform)

Chapter08/ABQ_Data_Entry/abq_data_entry/models.py

@@ -62,23 +62,20 @@ def __init__(self, filename=None):
   def save_record(self, data, rownum=None):
     """Save a dict of data to the CSV file"""
 
-    print(f"save row: {data}")
     if rownum is None:
-      print('save new record')
       # This is a new record
       newfile = not self.file.exists()
 
-      with open(self.file, 'a') as fh:
+      with open(self.file, 'a', newline='') as fh:
         csvwriter = csv.DictWriter(fh, fieldnames=self.fields.keys())
         if newfile:
           csvwriter.writeheader()
         csvwriter.writerow(data)
     else:
-      print(f'update record {rownum}')
       # This is an update
       records = self.get_all_records()
       records[rownum] = data
-      with open(self.file, 'w', encoding='utf-8') as fh:
+      with open(self.file, 'w', encoding='utf-8', newline='') as fh:
         csvwriter = csv.DictWriter(fh, fieldnames=self.fields.keys())
         csvwriter.writeheader()
         csvwriter.writerows(records)

Chapter08/ABQ_Data_Entry/abq_data_entry/views.py

@@ -66,21 +66,21 @@ def __init__(self, parent, model, settings, *args, **kwargs):
       field_spec=fields['Time'],
       var=self._vars['Time'],
     ).grid(row=0, column=1)
+    w.LabelInput(
+      r_info, "Technician",
+      field_spec=fields['Technician'],
+      var=self._vars['Technician'],
+    ).grid(row=0, column=2)
+    # line 2
     w.LabelInput(
       r_info, "Lab",
       field_spec=fields['Lab'],
       var=self._vars['Lab'],
-    ).grid(row=0, column=2)
-    # line 2
+    ).grid(row=1, column=0)
     w.LabelInput(
       r_info, "Plot",
       field_spec=fields['Plot'],
       var=self._vars['Plot'],
-    ).grid(row=1, column=0)
-    w.LabelInput(
-      r_info, "Technician",
-      field_spec=fields['Technician'],
-      var=self._vars['Technician'],
     ).grid(row=1, column=1)
     w.LabelInput(
       r_info, "Seed Sample",
@@ -170,7 +170,7 @@ def __init__(self, parent, model, settings, *args, **kwargs):
     # Notes section  -- Update grid row value for ch8
     w.LabelInput(
       self, "Notes", field_spec=fields['Notes'],
-      var=self._vars['Notes'], input_args={"width": 85, "height": 10}
+      var=self._vars['Notes'], input_args={"width": 85, "height": 6}
     ).grid(sticky="nsew", row=4, column=0, padx=10, pady=10)
 
     # buttons
@@ -369,7 +369,7 @@ def __init__(self, parent, *args, **kwargs):
       self.treeview.column(
         name, anchor=anchor, minwidth=minwidth,
         width=width, stretch=stretch
-        )
+      )
 
     self.treeview.bind('<Double-1>', self._on_open_record)
     self.treeview.bind('<Return>', self._on_open_record)
@@ -389,7 +389,7 @@ def populate(self, rows):
     for row in self.treeview.get_children():
       self.treeview.delete(row)
 
-    cids = list(self.column_defs.keys())[1:]
+    cids = self.treeview.cget('columns')
     for rownum, rowdata in enumerate(rows):
       values = [rowdata[cid] for cid in cids]
       self.treeview.insert('', 'end', iid=str(rownum),
@@ -401,6 +401,9 @@ def populate(self, rows):
       self.treeview.focus('0')
 
   def _on_open_record(self, *args):
-
-    self.selected_id = int(self.treeview.selection()[0])
     self.event_generate('<<OpenRecord>>')
+
+  @property
+  def selected_id(self):
+    selection = self.treeview.selection()
+    return int(selection[0]) if selection else None

Chapter08/ABQ_Data_Entry/abq_data_entry/widgets.py

@@ -190,7 +190,7 @@ def _set_focus_update_var(self, event):
     if self.focus_update_var and not self.error.get():
       self.focus_update_var.set(value)
 
-  def _set_minimum(self, *args):
+  def _set_minimum(self, *_):
     current = self.get()
     try:
       new_min = self.min_var.get()
@@ -203,7 +203,7 @@ def _set_minimum(self, *args):
       self.variable.set(current)
     self.trigger_focusout_validation()
 
-  def _set_maximum(self, *args):
+  def _set_maximum(self, *_):
     current = self.get()
     try:
       new_max = self.max_var.get()
@@ -219,13 +219,13 @@ def _set_maximum(self, *args):
   def _key_validate(
     self, char, index, current, proposed, action, **kwargs
   ):
+    if action == '0':
+      return True
     valid = True
     min_val = self.cget('from')
     max_val = self.cget('to')
     no_negative = min_val >= 0
     no_decimal = self.precision >= 0
-    if action == '0':
-      return True
 
     # First, filter out obviously invalid keystrokes
     if any([
@@ -260,55 +260,69 @@ def _focusout_validate(self, **kwargs):
     max_val = self.cget('to')
 
     try:
-      value = Decimal(value)
+      d_value = Decimal(value)
     except InvalidOperation:
-      self.error.set('Invalid number string: {}'.format(value))
+      self.error.set(f'Invalid number string: {value}')
       return False
 
-    if value < min_val:
-      self.error.set('Value is too low (min {})'.format(min_val))
+    if d_value < min_val:
+      self.error.set(f'Value is too low (min {min_val})')
+      valid = False
+    if d_value > max_val:
+      self.error.set(f'Value is too high (max {max_val})')
       valid = False
-    if value > max_val:
-      self.error.set('Value is too high (max {})'.format(max_val))
 
     return valid
 
+class ValidatedRadioGroup(ttk.Frame):
+  """A validated radio button group"""
+
+  def __init__(
+    self, *args, variable=None, error_var=None,
+    values=None, button_args=None, **kwargs
+  ):
+    super().__init__(*args, **kwargs)
+    self.variable = variable or tk.StringVar()
+    self.error = error_var or tk.StringVar()
+    self.values = values or list()
+    button_args = button_args or dict()
+
+    for v in self.values:
+      button = ttk.Radiobutton(
+        self, value=v, text=v, variable=self.variable, **button_args
+      )
+      button.pack(side=tk.LEFT, ipadx=10, ipady=2, expand=True, fill='x')
+    self.bind('<FocusOut>', self.trigger_focusout_validation)
+
+  def trigger_focusout_validation(self, *_):
+    self.error.set('')
+    if not self.variable.get():
+      self.error.set('A value is required')
+
+
 class BoundText(tk.Text):
   """A Text widget with a bound variable."""
 
   def __init__(self, *args, textvariable=None, **kwargs):
     super().__init__(*args, **kwargs)
     self._variable = textvariable
-    self._modifying = False
     if self._variable:
       # insert any default value
       self.insert('1.0', self._variable.get())
       self._variable.trace_add('write', self._set_content)
       self.bind('<<Modified>>', self._set_var)
 
-  def _clear_modified_flag(self):
-    # This also triggers a '<<Modified>>' Event
-    self.tk.call(self._w, 'edit', 'modified', 0)
-
   def _set_var(self, *_):
     """Set the variable to the text contents"""
-    if self._modifying:
-      return
-    self._modifying = True
-    # remove trailing newline from content
-    content = self.get('1.0', tk.END)[:-1]
-    self._variable.set(content)
-    self._clear_modified_flag()
-    self._modifying = False
+    if self.edit_modified():
+      content = self.get('1.0', 'end-1chars')
+      self._variable.set(content)
+      self.edit_modified(False)
 
   def _set_content(self, *_):
     """Set the text contents to the variable"""
-    if self._modifying:
-      return
-    self._modifying = True
     self.delete('1.0', tk.END)
     self.insert('1.0', self._variable.get())
-    self._modifying = False
 
 
 ###########################
@@ -322,7 +336,7 @@ class LabelInput(ttk.Frame):
   field_types = {
     FT.string: RequiredEntry,
     FT.string_list: ValidatedCombobox,
-    FT.short_string_list: ttk.Radiobutton,
+    FT.short_string_list: ValidatedRadioGroup,
     FT.iso_date_string: DateEntry,
     FT.long_string: BoundText,
     FT.decimal: ValidatedSpinbox,
@@ -365,7 +379,9 @@ def __init__(
       self.label.grid(row=0, column=0, sticky=(tk.W + tk.E))
 
     # setup the variable
-    if input_class in (ttk.Checkbutton, ttk.Button, ttk.Radiobutton):
+    if input_class in (
+        ttk.Checkbutton, ttk.Button, ttk.Radiobutton, ValidatedRadioGroup
+    ):
       input_args["variable"] = self.variable
     else:
       input_args["textvariable"] = self.variable
@@ -375,12 +391,12 @@ def __init__(
       # for Radiobutton, create one input per value
       self.input = tk.Frame(self)
       for v in input_args.pop('values', []):
-        button = ttk.Radiobutton(
-          self.input, value=v, text=v, **input_args)
+        button = input_class(
+          self.input, value=v, text=v, **input_args
+        )
         button.pack(side=tk.LEFT, ipadx=10, ipady=2, expand=True, fill='x')
     else:
       self.input = input_class(self, **input_args)
-
     self.input.grid(row=1, column=0, sticky=(tk.W + tk.E))
     self.columnconfigure(0, weight=1)
 

Chapter08/hierarchy_example.py

@@ -0,0 +1,32 @@
+import tkinter as tk
+from tkinter import ttk
+
+berries = [
+    {'number': '1', 'parent': '',  'value': 'Raspberry'},
+    {'number': '4', 'parent': '1', 'value': 'Red Raspberry'},
+    {'number': '5', 'parent': '1', 'value': 'Blackberry'},
+    {'number': '2', 'parent': '', 'value': 'Banana'},
+    {'number': '3', 'parent': '', 'value': 'Strawberry'}
+]
+
+root = tk.Tk()
+
+tv = ttk.Treeview(root, columns=['value'])
+tv.heading('#0', text='Node')
+tv.heading('value', text='Value')
+tv.grid(sticky='news')
+
+for berry in berries:
+    tv.insert(
+        berry['parent'],
+        'end',
+        iid=berry['number'],
+        text=berry['number'],
+        values=[berry['value']]
+    )
+
+
+
+
+
+root.mainloop()

Chapter08/notebook_demo.py

@@ -14,7 +14,7 @@
 banana_facts = [
     'Banana trees are of the genus Musa.',
     'Bananas are technically berries.',
-    'All bananas contain small amounts of radioactive postssium.'
+    'All bananas contain small amounts of radioactive potassium.'
     'Bananas are used in paper and textile manufacturing.'
 ]
 

Chapter08/treeview_demo.py

@@ -11,7 +11,7 @@
 
 # Create and configure treeview
 tv = ttk.Treeview(
-    root, columns=['size', 'modified'], selectmode='none'
+  root, columns=['size', 'modified'], selectmode='none'
 )
 tv.heading('#0', text='Name')
 tv.heading('size', text='Size', anchor='center')
@@ -65,4 +65,18 @@ def sort(tv, col, parent='', reverse=False):
   tv.heading(cid, command=lambda col=cid: sort(tv, col))
 
 
+status = tk.StringVar()
+tk.Label(root, textvariable=status).pack(side=tk.BOTTOM)
+
+def show_directory_stats(*_):
+  clicked_path = Path(tv.focus())
+  num_children = len(list(clicked_path.iterdir()))
+  status.set(
+    f'Directory: {clicked_path.name}, {num_children} children'
+  )
+
+
+tv.bind('<<TreeviewOpen>>', show_directory_stats)
+tv.bind('<<TreeviewClose>>', lambda _: status.set(''))
+
 root.mainloop()