- Updated utility.Task_info class to show output from print_variables in the print box as earlier changes had stopped this working.

- Fixed bug introduced in recent changes where print_variables output was saved as repr(var_dict) not json.dumps(var_dict) in txt data files.

Author: ThomasAkam

com/data_logger.py

@@ -122,7 +122,7 @@ def data_to_string(self, new_data, verbose=False):
                     if nd.ID == 'print':
                         data_string += f'P {nd.time} {nd.data}\n'
                     elif nd.ID in ('set','get'):
-                        for v_name, v_value in nd.data.items():
+                        for v_name, v_value in json.loads(nd.data).items():
                             data_string += f'V {nd.time} {v_name} {v_value}\n'
                 elif nd.type == '!': # Warning
                     data_string += f'! {nd.data}\n'
@@ -140,7 +140,7 @@ def data_to_string(self, new_data, verbose=False):
                 elif nd.type == 'P': # User print output.
                     data_string += self.tsv_row_str('print', time=nd.time, value=nd.data)
                 elif nd.type == 'V': # Variable.
-                    data_string += self.tsv_row_str('variable', time=nd.time, name=nd.ID, value=json.dumps(nd.data))
+                    data_string += self.tsv_row_str('variable', time=nd.time, name=nd.ID, value=nd.data)
                 elif nd.type == '!': # Warning
                     data_string += self.tsv_row_str('warning', value=nd.data)
                 elif nd.type == '!!': # Error

com/pycboard.py

@@ -475,10 +475,10 @@ def process_data(self):
                         new_data.append(Datatuple(type=data_type,time=timestamp, data=data_str))
                     elif data_type == 'V': # Store new variable value in sm_info
                         op_ID = {'g':'get', 's':'set', 'p':'print'}[data_str[0]]
-                        var_dict = json.loads(data_str[1:])
-                        for v_name, v_value in var_dict.items():
-                            self.sm_info['variables'][v_name] = v_value
-                        new_data.append(Datatuple(type='V',time=timestamp, ID=op_ID, data=var_dict))
+                        var_json = data_str[1:]
+                        var_dict = json.loads(var_json)
+                        self.sm_info['variables'].update(var_dict)
+                        new_data.append(Datatuple(type='V',time=timestamp, ID=op_ID, data=var_json))
                 else:
                     unexpected_input.append(type_byte.decode())
             elif new_byte == b'\x04': # End of framework run.

gui/run_experiment_tab.py

@@ -444,7 +444,7 @@ def start_task(self):
         self.data_logger.open_data_file(ex['data_dir'], ex['name'], self.setup_name, self.subject, ex['file_type'], datetime.now())
         if self.subject_variables: # Write variables set pre run to data file.
             var_dict  = {v_name: eval(v_value) for v_name, v_value, pv in self.variables_set_pre_run}
-            self.data_logger.write_to_file([Datatuple(type='V',time=0, ID='set', data=var_dict)])
+            self.data_logger.write_to_file([Datatuple(type='V',time=0, ID='set', data=json.dumps(var_dict))])
         self.board.start_framework()
         self.start_stop_button.setText('Stop')
         self.start_stop_button.setIcon(QtGui.QIcon("gui/icons/stop.svg"))
@@ -479,7 +479,7 @@ def stop_task(self):
         if summary_variables:
             self.subject_sumr_vars = {v['name']: 
                 self.board.get_variable(v['name']) for v in summary_variables}
-            self.data_logger.write_to_file([Datatuple(type='V',time=self.data_logger.end_time, ID='get', data=self.subject_sumr_vars)])
+            self.data_logger.write_to_file([Datatuple(type='V',time=self.data_logger.end_time, ID='get', data=json.dumps(self.subject_sumr_vars))])
         # Close data files and disconnect from board.
         self.data_logger.close_files()
         self.board.close()

gui/utility.py

@@ -382,28 +382,28 @@ def __init__(self):
     def process_data(self, new_data):
         '''Update the state, event and print line info.'''
         try:
-            new_state = next(self.sm_info['ID2name'][nd[2]] for nd in reversed(new_data)
-                if nd[0] == 'D' and nd[2] in self.sm_info['states'].values())
+            new_state = next(self.sm_info['ID2name'][nd.ID] for nd in reversed(new_data)
+                if nd.type == 'D' and nd.ID in self.sm_info['states'].values())
             self.state_text.setText(new_state)
             self.state_text.home(False)
         except StopIteration:
             pass
         try:
-            new_event = next(self.sm_info['ID2name'][nd[2]] for nd in reversed(new_data)
-                if nd[0] == 'D' and nd[2] in self.sm_info['events'].values())
+            new_event = next(self.sm_info['ID2name'][nd.ID] for nd in reversed(new_data)
+                if nd.type == 'D' and nd.ID in self.sm_info['events'].values())
             self.event_text.setText(new_event)
             self.event_text.home(False)
         except StopIteration:
             pass
         try:
-            new_print = next(nd[-1] for nd in reversed(new_data) if nd[0] == 'P')
+            new_print = next(nd.data for nd in reversed(new_data) if nd.type == 'P' or nd.ID == 'print')
             self.print_text.setText(new_print)
             self.print_text.setStyleSheet('color: black;')
             self.print_text.home(False)
         except StopIteration:
             pass
         try:
-            new_warning = next(nd[-1] for nd in reversed(new_data) if nd[0] == '!')
+            new_warning = next(nd.data for nd in reversed(new_data) if nd.type == '!')
             self.print_text.setText('! ' + new_warning)
             self.print_text.setStyleSheet('color: orange;')
             self.print_text.home(False)