Merge branch 'dev' into task-menus

# Conflicts:
#	gui/configure_experiment_tab.py

Author: alustig3

com/data_logger.py

@@ -21,18 +21,20 @@ def set_state_machine(self, sm_info):
                            in self.sm_info['analog_inputs'].items()}
         self.analog_files = {ai['ID']: None for ai in self.sm_info['analog_inputs'].values()}
 
-    def open_data_file(self, data_dir, experiment_name, subject_ID, datetime_now=None):
+    def open_data_file(self, data_dir, experiment_name, setup_ID, subject_ID, datetime_now=None):
         '''Open data file and write header information.'''
         self.data_dir = data_dir
         self.experiment_name = experiment_name
         self.subject_ID = subject_ID
+        self.setup_ID = setup_ID
         if datetime_now is None: datetime_now = datetime.now()
         file_name = os.path.join(self.subject_ID + datetime_now.strftime('-%Y-%m-%d-%H%M%S') + '.txt')
         self.file_path = os.path.join(self.data_dir, file_name)
         self.data_file = open(self.file_path, 'w', newline = '\n')
         self.data_file.write('I Experiment name  : {}\n'.format(self.experiment_name))
         self.data_file.write('I Task name : {}\n'.format(self.sm_info['name']))
         self.data_file.write('I Task file hash : {}\n'.format(self.sm_info['task_hash']))
+        self.data_file.write('I Setup ID : {}\n'.format(self.setup_ID))
         self.data_file.write('I Subject ID : {}\n'.format(self.subject_ID))
         self.data_file.write('I Start date : ' + datetime_now.strftime('%Y/%m/%d %H:%M:%S') + '\n\n')
         self.data_file.write('S {}\n\n'.format(json.dumps(self.sm_info['states'])))

data/.gitignore

@@ -1,3 +1,3 @@
-# Ignore all contents of data folder except .gitignore needed to ensure folder is version controlled.
+# Ignore all contents of folder except .gitignore needed to ensure folder is version controlled.
 *
 !.gitignore

experiments/.gitignore

@@ -0,0 +1,3 @@
+# Ignore all contents of folder except .gitignore needed to ensure folder is version controlled.
+*
+!.gitignore

experiments/.hgempty

@@ -208,10 +208,24 @@ def __init__(self, parent, sv_dict):
 
 # Invalid experiment dialog. ---------------------------------------------------------
 
-def invalid_experiment_dialog(parent, message):
-    QtGui.QMessageBox.question(parent, 'Invalid experiment', 
+def invalid_run_experiment_dialog(parent, message):
+    QtGui.QMessageBox.warning(parent, 'Invalid experiment', 
         message + '\n\nUnable to run experiment.', QtGui.QMessageBox.Ok)
 
+def invalid_save_experiment_dialog(parent, message):
+    QtGui.QMessageBox.warning(parent, 'Invalid experiment', 
+        message + '\n\nUnable to save experiment.', QtGui.QMessageBox.Ok)
+
+# Unrun subjects warning     ---------------------------------------------------------
+
+def unrun_subjects_dialog(parent,message):
+    reply = QtGui.QMessageBox.warning(parent, 'Unrun Subjects', 
+        'The following Subjects will not be run:\n\n{}'.format(message), (QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel))
+    if reply == QtGui.QMessageBox.Ok:
+        return True
+    else:
+        return False
+        
 # Keyboard shortcuts dialog. ---------------------------------------------------------
 
 class Keyboard_shortcuts_dialog(QtGui.QDialog):

gui/configure_experiment_tab.py

@@ -290,32 +290,36 @@ def __init__(self, parent=None):
         self.subject_tabs = detachableTabWidget(self)
         self.setCentralWidget(self.subject_tabs)
         self.subject_plots = []
+        self.active_plots = []
 
     def setup_experiment(self, experiment):
         '''Create task plotters in seperate tabs for each subject.'''
-        for setup in sorted(experiment['subjects'].keys()):
+        subject_dict = experiment['subjects']
+        subjects = subject_dict.keys()
+        for subject in sorted(subjects):
             self.subject_plots.append(Task_plot(self))
             self.subject_tabs.addTab(self.subject_plots[-1],
-                '{} : {}'.format(setup, experiment['subjects'][setup]))
+                '{} : {}'.format(subject_dict[subject]['setup'], subject))
 
     def set_state_machine(self, sm_info):
         '''Provide the task plotters with the state machine info.'''
         for subject_plot in self.subject_plots:
             subject_plot.set_state_machine(sm_info)
 
-    def start_experiment(self):
-        for subject_plot in self.subject_plots:
-            subject_plot.run_start(False)
+    def start_experiment(self,rig):
+        self.subject_plots[rig].run_start(False)
+        self.active_plots.append(rig)
 
     def close_experiment(self):
         '''Remove and delete all subject plot tabs.'''
         while len(self.subject_plots) > 0:
             subject_plot = self.subject_plots.pop() 
             subject_plot.setParent(None)
             subject_plot.deleteLater()
-
+        self.close()
+        
     def update(self):
         '''Update the plots of the active tab.'''
-        for subject_plot in self.subject_plots:
-            if not subject_plot.visibleRegion().isEmpty():
+        for i,subject_plot in enumerate(self.subject_plots):
+            if not subject_plot.visibleRegion().isEmpty() and i in self.active_plots:
                 subject_plot.update()