From 18f1ee73e24051c513e9201b58da145abe313d4b Mon Sep 17 00:00:00 2001 From: Michael Tan Date: Fri, 25 Oct 2019 14:24:35 -0500 Subject: [PATCH] Changing instruction displays to work better on a smaller screen. Can change to optimize when the actual screen is chosen. -MT --- SaccadePursuit.py | 3 ++- SaccadePursuitEyeTracking.py | 6 +++--- template.py | 13 ++++++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/SaccadePursuit.py b/SaccadePursuit.py index fbaa27c..a699af7 100755 --- a/SaccadePursuit.py +++ b/SaccadePursuit.py @@ -168,7 +168,8 @@ class SPtask(template.BaseExperiment): trial_list.append(trial) counter += 1 - random.shuffle(trial_list) + if not condition=='Pursuit': + random.shuffle(trial_list) return trial_list diff --git a/SaccadePursuitEyeTracking.py b/SaccadePursuitEyeTracking.py index ac6f910..d26d1be 100755 --- a/SaccadePursuitEyeTracking.py +++ b/SaccadePursuitEyeTracking.py @@ -31,7 +31,7 @@ distance_to_monitor = 74 monitor_px = [1440,900] window_screen = 1 -disableTracker = True # For Debugging +disableTracker = False # For Debugging isi_time = 2 # Interstimulus Interval data_directory = os.path.join( os.path.expanduser('~'), 'Desktop', 'ExperimentalData', 'SaccadePursuitEyeTracking') @@ -48,7 +48,7 @@ stim_color = [1,-1,-1] saccade_fixation_color = [255,255,255] saccade_dot_color = [100,100,100] antisaccade_instruct_file = os.path.join(image_directory,'AntiSaccadeInstruct2.tif') -antisaccade_file_scale = 2.5 +antisaccade_file_scale = 1 # Pursuit Parameters number_of_pursuit_trials = 1 @@ -407,7 +407,7 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask): self.display_text_screen(text='Remember:\n\n' + pursuit_instruct_text) elif condition=='Necker': self.display_text_screen(text='Remember:\n\n' + necker_instruct_text, - image_file=self.response_box_file, + image_file=self.necker_response_box_file, image_scale=self.necker_response_box_scale) elif condition=='Rivalry': self.display_text_screen(text='Remember:\n\n' + rivalry_instruct_text, diff --git a/template.py b/template.py index 1256a44..514a5aa 100755 --- a/template.py +++ b/template.py @@ -353,18 +353,25 @@ class BaseExperiment(object): self.experiment_window, text=text, color=text_color, units='pix', height=text_height, alignHoriz='center', alignVert='center', wrapWidth=round(.8*self.experiment_window.size[0]), **kwargs) - textObject.draw() + #textObject.draw() if image_file: # Display image immediately below text. + textObject.pos = (0,self.experiment_window.size[1]/2-5) + textObject.alignVert = 'top' + textObject.draw() imageObject = psychopy.visual.ImageStim( self.experiment_window, units='pix', image=image_file) sizex = int(round(imageObject.size[0])*image_scale) sizey = int(round(imageObject.size[1])*image_scale) - belowText = int(math.floor(-textObject.boundingBox[1]/2-sizey/2)) + #belowText = int(math.floor(-textObject.boundingBox[1]/2-sizey/2)) + bottomOfScreen = int(math.floor(-self.experiment_window.size[1]/2+sizey/2))+5 imageObject.size = [sizex,sizey] - imageObject.pos = (0,belowText) + #imageObject.pos = (0,belowText) + imageObject.pos = (0,bottomOfScreen) imageObject.draw() + else: + textObject.draw() self.experiment_window.flip()