Merge remote-tracking branch 'cpp-lln-lab/master'

Author: marcobarilari

.travis.yml

@@ -27,5 +27,5 @@ jobs:
     - stage: "Tests and linter"
       name: "Unit Tests" # names the first job
       script: octave $OCTFLAGS --eval "results = runTests; assert(all(~[results.Failed]))"
-    - script: cd .. && mh_style.py `pwd`
+    - script: cd .. && mh_style `pwd`
       name: "miss_hit linter" # names the second job

checkDependencies.m renamed to checkPtbVersion.m

@@ -1,4 +1,4 @@
-function checkDependencies()
+function checkPtbVersion()
     % Checks that the right dependencies are installed.
 
     printCredits();

eyeTracker.m

@@ -72,7 +72,8 @@
                 % SET UP TRACKER CONFIGURATION
                 % Setting the proper recording resolution, proper calibration type,
                 %   as well as the data file content;
-                %            Eyelink('command', 'add_file_preamble_text ''Recorded by EyelinkToolbox demo-experiment''');
+                %            Eyelink('command', 'add_file_preamble_text ''Recorded by 
+                %EyelinkToolbox demo-experiment''');
 
                 % This command is crucial to map the gaze positions from the tracker to
                 %  screen pixel positions to determine fixation
@@ -89,7 +90,7 @@
                 Eyelink('command', 'generate_default_targets = YES');
                 % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
 
-                %         % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
+                %         % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
                 %         % CUSTOM CALIBRATION
                 %         % (SET MANUALLY THE DOTS COORDINATES, HERE FOR 6 DOTS)
                 %         Eyelink('command', 'calibration_type = HV5');
@@ -101,7 +102,8 @@
                 %         [width, height]=Screen('WindowSize', screenNumber);
                 %         Eyelink('command','calibration_samples = 6');
                 %         Eyelink('command','calibration_sequence = 0,1,2,3,4,5');
-                %         Eyelink('command','calibration_targets = %d,%d %d,%d %d,%d %d,%d %d,%d',...
+                %         Eyelink('command','calibration_targets = ...
+                %             %d,%d %d,%d %d,%d %d,%d %d,%d',...
                 %             640,512, ... %width/2,height/2
                 %             640,102, ... %width/2,height*0.1
                 %             640,614, ... %width/2,height*0.6
@@ -110,13 +112,14 @@
                 %
                 %         Eyelink('command','validation_samples = 5');
                 %         Eyelink('command','validation_sequence = 0,1,2,3,4,5');
-                %         Eyelink('command','validation_targets = %d,%d %d,%d %d,%d %d,%d %d,%d',...
+                %         Eyelink('command','validation_targets = ...
+                %             %d,%d %d,%d %d,%d %d,%d %d,%d',...
                 %             640,512, ... %width/2,height/2
                 %             640,102, ... %width/2,height*0.1
                 %             640,614, ... %width/2,height*0.6
                 %             128,341, ... %width*0.1,height*1/3
                 %             1152,341 );  %width-width*0.1,height*1/3
-                %         % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
+                %         % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
 
                 %             % set parser (conservative saccade thresholds)
                 %             Eyelink('command', 'saccade_velocity_threshold = 35');
@@ -199,12 +202,15 @@
                 % download data file
                 try
                     fprintf('Receiving data file ''%s''\n', edfFileName);
-                    status = Eyelink('ReceiveFile', '', [expParameters.outputDir, filesep, 'eyetracker', filesep, edfFileName]);
+                    status = Eyelink('ReceiveFile', '', ...
+                        [expParameters.outputDir, filesep, 'eyetracker', filesep, edfFileName]);
                     if status > 0
                         fprintf('ReceiveFile status %d\n', status);
                     end
-                    if 2 == exist([expParameters.outputDir, filesep, 'eyetracker', filesep, edfFileName], 'file')
-                        fprintf('Data file ''%s'' can be found in ''%s''\n', edfFileName, [expParameters.outputDir, filesep, 'eyetracker', filesep]);
+                    if 2 == exist([expParameters.outputDir, filesep, 'eyetracker', ...
+                            filesep, edfFileName], 'file')
+                        fprintf('Data file ''%s'' can be found in ''%s''\n', edfFileName, ...
+                            [expParameters.outputDir, filesep, 'eyetracker', filesep]);
                     end
                 catch
                     fprintf('Problem receiving data file ''%s''\n', edfFileName);

initPTB.m

@@ -41,7 +41,7 @@
     % TO DO
     % - We might want to add a couple of IF in case the experiment does not use audio for example.
 
-    checkDependencies();
+    checkPtbVersion();
 
     % For octave: to avoid displaying messenging one screen at a time
     more off;
@@ -51,12 +51,10 @@
 
     cfg = setDefaultsPTB(cfg);
 
-    initDebug(cfg);
-
-    %% Keyboard
     initKeyboard;
+    initDebug(cfg);
 
-    %% Mouse
+    % Mouse
     HideCursor;
 
     %% Audio
@@ -72,9 +70,9 @@
     % window size info
     [cfg.winWidth, cfg.winHeight] = WindowSize(cfg.win);
 
-    if strcmpi(cfg.stimPosition, 'mri')
-        cfg.winRect(1, 4) = cfg.winRect(1, 4) * 2 / 3;
-    end
+%     if strcmpi(cfg.stimPosition, 'mri')
+%         cfg.winRect(1, 4) = cfg.winRect(1, 4) * 2 / 3;
+%     end
 
     % Get the Center of the Screen
     cfg.center = [cfg.winRect(3), cfg.winRect(4)] / 2;
@@ -118,7 +116,7 @@ function initDebug(cfg)
 
         Screen('Preference', 'SkipSyncTests', 2);
         Screen('Preference', 'Verbosity', 0);
-        Screen('Preferences', 'SuppressAllWarnings', 2);
+        Screen('Preference', 'SuppressAllWarnings', 1); 
 
         fprintf('\n\n\n\n');
         fprintf('########################################\n');
@@ -218,8 +216,8 @@ function initDebug(cfg)
 
 function initText(cfg)
 
-    Screen('TextFont', cfg.win, cfg.text.Font);
-    Screen('TextSize', cfg.win, cfg.text.Size);
-    Screen('TextStyle', cfg.win, cfg.text.Style);
+    Screen('TextFont', cfg.win, cfg.text.font);
+    Screen('TextSize', cfg.win, cfg.text.size);
+    Screen('TextStyle', cfg.win, cfg.text.style);
 
 end