replace with pynput

and fix other type issues

Author: pellet

eegnb/analysis/streaming_utils.py

@@ -25,6 +25,7 @@
 from eegnb import _get_recording_dir
 from eegnb.devices.eeg import EEG
 #from eegnb.devices.utils import EEG_INDICES, SAMPLE_FREQS
+from eegnb.analysis.utils import thres_stds
 
 # this should probably not be done here
 sns.set_context("talk")

eegnb/analysis/utils.py

@@ -25,6 +25,7 @@
 from eegnb import _get_recording_dir
 from eegnb.devices.eeg import EEG
 from eegnb.devices.utils import EEG_INDICES, SAMPLE_FREQS
+from pynput import keyboard
 
 # this should probably not be done here
 sns.set_context("talk")
@@ -529,14 +530,22 @@ def check_report(eeg: EEG, n_times: int=60, pause_time=5, thres_std_low=None, th
             print(f"\n\nLooks like you still have {len(bad_channels)} bad channels after {loop_index+1} tries\n")
 
             prompt_time = time()
-            print(f"Starting next cycle in 5 seconds, press C and enter to cancel")    
+            print(f"Starting next cycle in 5 seconds, press C and enter to cancel")
+            c_key_pressed = False
+
+            def update_key_press(key):
+                if key.char == 'c':
+                    globals().update(c_key_pressed=True)
+            listener = keyboard.Listener(on_press=update_key_press)
+            listener.start()
             while time() < prompt_time + 5:  
-                if keyboard.is_pressed('c'): 
+                if c_key_pressed:
                     print("\nStopping signal quality checks!")
                     flag = True
-                    break  
+                    break
+            listener.stop()
         if flag: 
-            break  
+            break
 
 def fix_musemissinglines(orig_f,new_f=''):
 

eegnb/cli/__main__.py

@@ -63,7 +63,7 @@ def runexp(
         eeg, experiment, recdur, outfname = intro_prompt()
     else:
         # Random values for outfile for now
-        outfname = generate_save_fn(eegdevice, experiment,7, 7)
+        outfname = str(generate_save_fn(str(eegdevice), experiment,7, 7))
         if eegdevice == "ganglion":
             # if the ganglion is chosen a MAC address should also be provided
             eeg = EEG(device=eegdevice, mac_addr=macaddr)

examples/visual_n170/02r__n170_decoding.py

@@ -127,7 +127,7 @@
 results = pd.DataFrame(data=auc, columns=['AUC'])
 results['Method'] = methods
 
-fig = plt.figure(figsize=[8,4])
+fig = plt.figure(figsize=(8, 4))
 sns.barplot(data=results, x='AUC', y='Method')
 plt.xlim(0.4, 0.9)
 sns.despine()

examples/visual_p300/02r__p300_decoding.py

@@ -118,7 +118,7 @@
 results = pd.DataFrame(data=auc, columns=['AUC'])
 results['Method'] = methods
 
-plt.figure(figsize=[8,4])
+plt.figure(figsize=(8, 4))
 sns.barplot(data=results, x='AUC', y='Method')
 plt.xlim(0.2, 0.85)
 sns.despine()

examples/visual_ssvep/02r__ssvep_decoding.py

@@ -151,7 +151,7 @@
 results = pd.DataFrame(data=auc, columns=['AUC'])
 results['Method'] = methods
 
-fig = plt.figure(figsize=[8,4])
+fig = plt.figure(figsize=(8, 4))
 sns.barplot(data=results, x='AUC', y='Method')
 plt.xlim(0.4, 1)
 sns.despine()