Chapter 6 revisions

Author: alandmoore

Chapter06/ABQ_Data_Entry/abq_data_entry/__main__.py

@@ -0,0 +1,7 @@
+from abq_data_entry.application import Application
+import os
+
+print(os.getcwd())
+
+app = Application()
+app.mainloop()

Chapter06/ABQ_Data_Entry/abq_data_entry/application.py

@@ -46,12 +46,12 @@ def _on_save(self, *_):
         "Cannot save, error in fields: {}"
         .format(', '.join(errors.keys()))
       )
-      return False
+      return
 
     data = self.recordform.get()
     self.model.save_record(data)
     self.records_saved += 1
     self.status.set(
-      "{} records saved this session".format(self.records_saved)
+      f"{self.records_saved} records saved this session"
     )
     self.recordform.reset()

Chapter06/ABQ_Data_Entry/abq_data_entry/models.py

@@ -10,30 +10,48 @@ class CSVModel:
 
   fields = {
     "Date": {'req': True, 'type': FT.iso_date_string},
-    "Time": {'req': True, 'type': FT.string_list,
-             'values': ['8:00', '12:00', '16:00', '20:00']},
+    "Time": {
+      'req': True, 'type': FT.string_list,
+      'values': ['8:00', '12:00', '16:00', '20:00']
+    },
     "Technician": {'req': True, 'type':  FT.string},
-    "Lab": {'req': True, 'type': FT.short_string_list,
-            'values': ['A', 'B', 'C']},
-    "Plot": {'req': True, 'type': FT.string_list,
-             'values': [str(x) for x in range(1, 21)]},
+    "Lab": {
+      'req': True, 'type': FT.short_string_list,
+      'values': ['A', 'B', 'C']
+    },
+    "Plot": {
+      'req': True, 'type': FT.string_list,
+      'values': [str(x) for x in range(1, 21)]
+    },
     "Seed Sample":  {'req': True, 'type': FT.string},
-    "Humidity": {'req': True, 'type': FT.decimal,
-                 'min': 0.5, 'max': 52.0, 'inc': .01},
-    "Light": {'req': True, 'type': FT.decimal,
-              'min': 0, 'max': 100.0, 'inc': .01},
-    "Temperature": {'req': True, 'type': FT.decimal,
-                    'min': 4, 'max': 40, 'inc': .01},
+    "Humidity": {
+      'req': True, 'type': FT.decimal,
+      'min': 0.5, 'max': 52.0, 'inc': .01
+    },
+    "Light": {
+      'req': True, 'type': FT.decimal,
+      'min': 0, 'max': 100.0, 'inc': .01
+    },
+    "Temperature": {
+      'req': True, 'type': FT.decimal,
+      'min': 4, 'max': 40, 'inc': .01
+    },
     "Equipment Fault": {'req': False, 'type': FT.boolean},
     "Plants": {'req': True, 'type': FT.integer, 'min': 0, 'max': 20},
     "Blossoms": {'req': True, 'type': FT.integer, 'min': 0, 'max': 1000},
     "Fruit": {'req': True, 'type': FT.integer, 'min': 0, 'max': 1000},
-    "Min Height": {'req': True, 'type': FT.decimal,
-                   'min': 0, 'max': 1000, 'inc': .01},
-    "Max Height": {'req': True, 'type': FT.decimal,
-                   'min': 0, 'max': 1000, 'inc': .01},
-    "Med Height": {'req': True, 'type': FT.decimal,
-                   'min': 0, 'max': 1000, 'inc': .01},
+    "Min Height": {
+      'req': True, 'type': FT.decimal,
+      'min': 0, 'max': 1000, 'inc': .01
+    },
+    "Max Height": {
+      'req': True, 'type': FT.decimal,
+      'min': 0, 'max': 1000, 'inc': .01
+    },
+    "Med Height": {
+      'req': True, 'type': FT.decimal,
+      'min': 0, 'max': 1000, 'inc': .01
+    },
     "Notes": {'req': False, 'type': FT.long_string}
   }
 
@@ -60,7 +78,7 @@ def save_record(self, data):
     """Save a dict of data to the CSV file"""
     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()

Chapter06/ABQ_Data_Entry/abq_data_entry/views.py

@@ -56,21 +56,21 @@ def __init__(self, parent, model, *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",

Chapter06/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,16 +260,17 @@ 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
 
@@ -279,36 +280,23 @@ class BoundText(tk.Text):
   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
 
 
 ###########################