displays
(0 files, 0 lines)
trackers
(0 files, 0 lines)
ASL
(0 files, 0 lines)
Eyelink
(0 files, 0 lines)
[root]/sandbox/eyelinkdev/task
displays
(0 files, 0 lines)
trackers
(0 files, 0 lines)
ASL
(0 files, 0 lines)
Eyelink
(0 files, 0 lines)
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| dep | 142 (100.0%) | 4993 (100.0%) | 35.1 |
merged eyelink, end of branch development
0 lines of code changed in 36 files:
Merged revisions 687-691,694-699,701-713 via svnmerge from
http://gru.brain.riken.jp/svn/mgl/trunk
........
r687 | justin | 2010-02-20 18:55:28 -0500 (Sat, 20 Feb 2010) | 5 lines
Adding changes to allow for opening a windowed context as "full screen". You can now do this by:
mglSetParam('movieMode',1);
mglOpen
........
r688 | justin | 2010-02-21 20:28:58 -0500 (Sun, 21 Feb 2010) | 2 lines
Added displayBounds to mglDecsribeDisplay to find the position of the second monitor for opening in 'movieMode' which spoofs a full screen by opening a windowed context of the screen size and moving into position over the display
........
r689 | justin | 2010-02-21 20:35:32 -0500 (Sun, 21 Feb 2010) | 2 lines
partial rebuild
........
r690 | justin | 2010-02-22 02:21:28 -0500 (Mon, 22 Feb 2010) | 2 lines
Adding minimum threshold to staircaes task
........
r691 | justin | 2010-02-23 02:30:29 -0500 (Tue, 23 Feb 2010) | 2 lines
Modified texture code to allow for 1D textures like sine wave gratings
........
r694 | justin | 2010-02-24 01:23:06 -0500 (Wed, 24 Feb 2010) | 2 lines
Tweaks to 1D textures. To use the default width in mglBltTexture you specify [x y height] instead of using nan. Also recompile
........
r695 | justin | 2010-02-24 03:14:14 -0500 (Wed, 24 Feb 2010) | 2 lines
removeda keyboard
........
r696 | justin | 2010-02-24 03:35:45 -0500 (Wed, 24 Feb 2010) | 2 lines
min/max threshold
........
r697 | justin | 2010-02-24 03:37:09 -0500 (Wed, 24 Feb 2010) | 2 lines
Fixing up mglText code which wasn't working since mglBltTexture now checkes for a field textureType to see if it is blting a 1D or 2D texture. Incidentally, mglText should be rewritten to use mglCreateTexture instead of creating the texture within the C code -- maybe a project for when mglText gets rewritten for Cocoa
........
r698 | justin | 2010-02-24 03:47:04 -0500 (Wed, 24 Feb 2010) | 2 lines
Fixing up some text drawing bugs with fixStairTest. Now you can use fixStairTest(2) for training a subject on fixation task
........
r699 | justin | 2010-02-24 03:47:57 -0500 (Wed, 24 Feb 2010) | 2 lines
default to very easy
........
r701 | justin | 2010-02-26 00:54:00 -0500 (Fri, 26 Feb 2010) | 2 lines
There appears to have been a small bug in mglIsGlobal which when asked about a field in the global that did not exist would try to dereference the non-existent field. It would cause a crash of mgl only very rarely, but seems to be fixed now. Recompiled binaries added.
........
r702 | justin | 2010-02-26 01:42:50 -0500 (Fri, 26 Feb 2010) | 2 lines
only mglClearScreen when running in training mode
........
r703 | justin | 2010-02-26 01:43:18 -0500 (Fri, 26 Feb 2010) | 2 lines
10.5 binaries
........
r704 | justin | 2010-02-26 02:05:56 -0500 (Fri, 26 Feb 2010) | 2 lines
Adding katz display calibrations
........
r705 | justin | 2010-02-26 02:14:14 -0500 (Fri, 26 Feb 2010) | 2 lines
Better handling of long text
........
r706 | justin | 2010-02-26 02:42:15 -0500 (Fri, 26 Feb 2010) | 3 lines
better line breaks
........
r707 | justin | 2010-02-28 22:37:38 -0500 (Sun, 28 Feb 2010) | 2 lines
Adding ability to do every combination
........
r708 | justin | 2010-02-28 22:38:19 -0500 (Sun, 28 Feb 2010) | 2 lines
fixing write trace
........
r709 | justin | 2010-03-01 02:09:01 -0500 (Mon, 01 Mar 2010) | 2 lines
Checking for bad stim trace values which crept in because fixStairInitTask was writing to the wrong trace number
........
r710 | justin | 2010-03-01 02:31:53 -0500 (Mon, 01 Mar 2010) | 2 lines
fixing output argument -- must have gotten messed up in last conflict resolution
........
r711 | justin | 2010-03-02 02:42:29 -0500 (Tue, 02 Mar 2010) | 2 lines
Pulling out some code that is used by both block and uniform randomization routines for initializing parameters. Also fixed up getStimvolFromVarname so that it reinitializes parameters to deal with a broken stimfile.
........
r712 | justin | 2010-03-02 22:06:00 -0500 (Tue, 02 Mar 2010) | 2 lines
Ugh, versioning problem. getTaskParameters got set to an old version in one of the last updates. Seems to be fixed now. getStimvolFromVarname has now been changed so that if on any session you don't display all of your stimulus conditions, it should still work properly (i.e. if you had orientation set to 20 values and you only displayed 15 of them).
........
r713 | justin | 2010-03-02 22:06:22 -0500 (Tue, 02 Mar 2010) | 2 lines
Allows deleting an array of textures
........
450 lines of code changed in 13 files:
Merged revisions 675-681,684 via svnmerge from
http://gru.brain.riken.jp/svn/mgl/trunk
........
r675 | justin | 2010-01-08 17:41:40 -0500 (Fri, 08 Jan 2010) | 1 line
photometer test code
........
r676 | justin | 2010-01-08 19:34:04 -0500 (Fri, 08 Jan 2010) | 2 lines
Works with Minolta CS 100A now.
........
r677 | dep | 2010-01-12 16:34:27 -0500 (Tue, 12 Jan 2010) | 3 lines
Added default define for kCGEventTapOptionDefault as this is missing from
MacOS versions <= 10.4.
........
r678 | justin | 2010-02-02 01:09:13 -0500 (Tue, 02 Feb 2010) | 2 lines
minor change to passed in parameter parsing
........
r679 | justin | 2010-02-02 01:14:58 -0500 (Tue, 02 Feb 2010) | 2 lines
Commention out CGLSetFullScreenOnDisplay since this is not available on earlier systems
........
r680 | justin | 2010-02-02 01:16:01 -0500 (Tue, 02 Feb 2010) | 2 lines
using deprecated function for compatibility
........
r681 | justin | 2010-02-02 01:16:59 -0500 (Tue, 02 Feb 2010) | 2 lines
binary change
........
r684 | dep | 2010-02-17 23:49:10 -0500 (Wed, 17 Feb 2010) | 1 line
Formatting
........
250 lines of code changed in 1 file:
Merged revisions 659-671 via svnmerge from
http://gru.brain.riken.jp/svn/mgl/trunk
........
r659 | justin | 2009-12-04 01:27:45 -0500 (Fri, 04 Dec 2009) | 2 lines
closes screen
........
r660 | justin | 2009-12-17 21:22:27 -0500 (Thu, 17 Dec 2009) | 2 lines
Changes to allow setting of position of windowed context
........
r661 | justin | 2009-12-17 21:23:16 -0500 (Thu, 17 Dec 2009) | 2 lines
Changes to allow for moving of windowed context to specific location based on setting in mglEditScreenParams. Also, saving of calibFilename that is used so that it can be displayed by mglEditScreenParams
........
r662 | justin | 2009-12-22 03:03:54 -0500 (Tue, 22 Dec 2009) | 2 lines
Make takes rebuild=2 to not check broken commands (use in case of very bad binaries)
........
r663 | justin | 2009-12-22 03:04:12 -0500 (Tue, 22 Dec 2009) | 2 lines
Testing use of different comm function "serial"
........
r664 | frakkopesto | 2009-12-22 03:08:58 -0500 (Tue, 22 Dec 2009) | 1 line
recompiled binaries for 10.5
........
r665 | frakkopesto | 2009-12-22 03:24:55 -0500 (Tue, 22 Dec 2009) | 1 line
serial function still does not work, committing with function set to use comm program
........
r666 | justin | 2009-12-23 01:06:39 -0500 (Wed, 23 Dec 2009) | 1 line
Fixing some memory leaks and changing open function slightly for stability
........
r667 | justin | 2009-12-23 02:04:25 -0500 (Wed, 23 Dec 2009) | 2 lines
Making some changes to edit screen parameters to allow for setting keyboard parameters. Also cleaned up some compatibility issues with old way of doing screen params (i.e. passing in a screenParams field on myscreen). mglMake can now compile dig i/o.
........
r668 | justin | 2009-12-23 02:10:41 -0500 (Wed, 23 Dec 2009) | 2 lines
Apparently unneeded pool drain commented out in eventDispatcher
........
r669 | justin | 2009-12-23 08:18:50 -0500 (Wed, 23 Dec 2009) | 2 lines
Changed comments
........
r670 | justin | 2009-12-23 08:19:20 -0500 (Wed, 23 Dec 2009) | 2 lines
Changed comments
........
r671 | justin | 2009-12-25 07:27:24 -0500 (Fri, 25 Dec 2009) | 1 line
initializing synchToVol to always have the correct length
........
147 lines of code changed in 9 files:
clear old screenParams after parsing
2 lines of code changed in 1 file:
removed the commented task rand state protection lines
4 lines of code changed in 1 file:
commented out obsolete blocks for randstate
45 lines of code changed in 1 file:
added eyetracker field
2 lines of code changed in 1 file:
end tracking gracefully when we don't save the data
5 lines of code changed in 2 files:
moved eyedata save into the saveStimData to capture the user choice result
eat keys after calibration
added shell for drift correct
merged in additions for testEyelink
129 lines of code changed in 4 files:
Added calculated randVars:
This provides a mechanism for user calculated random variables to be stored at the end of a trial and extracted using
the normal tools (i.e. getTaskParameters)
Added named segments:
This provides a universal mechanisms to refer to task segments by name in code, reducing confusion and allowing
easier task reformulation (i.e. adding a segment)
96 lines of code changed in 3 files:
Fixed formatting and restored lost eyetracker initialization code
478 lines of code changed in 1 file:
Merged revisions 570-623,631,633-643 via svnmerge from
http://gru.brain.riken.jp/svn/mgl/trunk
........
r570 | justin | 2009-06-04 21:54:44 -0400 (Thu, 04 Jun 2009) | 2 lines
Adding ability to use different photometers. Minolta code thanks to Taosheng Liu. Working on Topcon code
........
r571 | justin | 2009-06-05 01:46:14 -0400 (Fri, 05 Jun 2009) | 2 lines
adding back binaries for mac intel
........
r572 | justin | 2009-06-05 02:28:56 -0400 (Fri, 05 Jun 2009) | 2 lines
Working version with Tepcon photometer
........
r573 | justin | 2009-06-18 02:20:45 -0400 (Thu, 18 Jun 2009) | 2 lines
test again
........
r574 | justin | 2009-06-26 01:52:04 -0400 (Fri, 26 Jun 2009) | 2 lines
Fixing up read/writeDigPort programs so that they don't always open and close the port each time (this will allow them to operate faster). Also, the port number is now an optional input argument. Better running help is given and a test program that reads from one port and writes a 10Hz on/off signal to another port has been added.
........
r575 | justin | 2009-06-28 21:46:33 -0400 (Sun, 28 Jun 2009) | 2 lines
adding back binaries for mac 64 bit
........
r576 | justin | 2009-06-29 04:49:21 -0400 (Mon, 29 Jun 2009) | 2 lines
Adding riken specific tickScreen function. THe defualt is to run the old function, but now if you set a parameter in your screenParams you can choose your own tickScreen. This is useful for programs like mglRetinotopy that will be used by everyone -- but may need a site specific tickScreen. Also the screenParams has fields to setup the digital port reading. So, screenParams{1}{14} for example will be the name of the tickScreen function (a string) and screenParams{1}{15} will be the digin information. Set it to [] for no dig port. Set it to [portnum acqline responseline1 responseline2] if using digital pulses.
........
r577 | justin | 2009-06-29 04:50:04 -0400 (Mon, 29 Jun 2009) | 2 lines
Ability to modify the fixation cross size and the line width
........
r578 | justin | 2009-06-29 04:51:44 -0400 (Mon, 29 Jun 2009) | 2 lines
Allow for the use of site-specific tickScreen (so that at RIKEN I can use digital ports rather than the keyboard functions). Also, some minor changes to have initTask call receive myscreen, and fix missing semicolon on another line
........
r579 | justin | 2009-06-29 04:52:25 -0400 (Mon, 29 Jun 2009) | 2 lines
Command line argument to specify how long to test for
........
r580 | justin | 2009-06-29 23:41:08 -0400 (Mon, 29 Jun 2009) | 2 lines
Adding a function that runs as a thread and reads the digital IO ports from an NI card. This keeps an event queue so that we can get the precise timing of ditial IN events. It can also output digital events any time we choose.
........
r581 | justin | 2009-06-30 05:10:51 -0400 (Tue, 30 Jun 2009) | 2 lines
Adding ability to init on specified ports
........
r582 | justin | 2009-06-30 10:10:42 -0400 (Tue, 30 Jun 2009) | 2 lines
mglScreenParams can now be a structure with fields -- the old way of having a cell array was getting confusing with so many unnamed fields. One new field is digin which can contain the digin.portNum digin.acqLine (which line the acq pulse is on) digin.acqType (which type is it 0 1 or [0 1] - for whether to look for transitions to 0 or to 1 or to either), digin.responseLine and digin.responseType. This functionality use mglDigIO.m. Probably still needs some debugging to work.
........
r583 | justin | 2009-06-30 10:11:37 -0400 (Tue, 30 Jun 2009) | 2 lines
Add an m file for the private so that it does something reasonable on systems in which it is not compiled.
........
r584 | justin | 2009-06-30 10:12:39 -0400 (Tue, 30 Jun 2009) | 2 lines
Removed myscreen.tickScreen -- we are not going to do it this way, since it is annoying to have too many different versions of tickScreen. Instead initScreen will set a bit (useDigIO) which will specify whether to use digIO for reading acquisition and responses
........
r585 | justin | 2009-07-05 21:13:48 -0400 (Sun, 05 Jul 2009) | 2 lines
init of digio was in the wrong section of if statement
........
r586 | justin | 2009-07-05 21:15:05 -0400 (Sun, 05 Jul 2009) | 2 lines
Updated to add laptop
........
r587 | justin | 2009-07-05 22:38:26 -0400 (Sun, 05 Jul 2009) | 2 lines
binaries
........
r588 | justin | 2009-07-05 22:39:00 -0400 (Sun, 05 Jul 2009) | 2 lines
Something is fishy about releasing memory -- commenting out for now, but we need to go figure out what is happening -- possibly some weird interaction with mglDigIO.c
........
r589 | justin | 2009-07-05 22:39:13 -0400 (Sun, 05 Jul 2009) | 2 lines
Fixing digial IO stuff
........
r590 | justin | 2009-07-05 22:39:39 -0400 (Sun, 05 Jul 2009) | 2 lines
Fixing up mglDigIO, making sure it returns valid outputs etc.
........
r591 | justin | 2009-07-17 03:56:35 -0400 (Fri, 17 Jul 2009) | 2 lines
Some functions for update the mglScreenParams with a GUI. Note that mglEditScreenParams requires mrParamsDialog which is in mrTools
........
r592 | justin | 2009-07-17 09:21:59 -0400 (Fri, 17 Jul 2009) | 1 line
More changes to make editing screen params work better
........
r593 | justin | 2009-07-17 09:45:55 -0400 (Fri, 17 Jul 2009) | 2 lines
Still fixing mglEditScreenParams - needs grouping of digin parameters on use parameter, also default field checks, and some values should be handled as checkbox rather than numbers
........
r594 | justin | 2009-07-18 06:20:00 -0400 (Sat, 18 Jul 2009) | 2 lines
Always bringing up with window dressings for mglOpen(0). See if this improves stability
........
r595 | justin | 2009-07-18 06:20:42 -0400 (Sat, 18 Jul 2009) | 2 lines
Moved getHostaName into its own function, endScreen changed comments
........
r596 | justin | 2009-07-18 06:21:43 -0400 (Sat, 18 Jul 2009) | 2 lines
Moved mglGetHostName into its own function. Began work on mglEditScreenParamsNew - GUI interface to setting up screen parameters
........
r597 | justin | 2009-07-22 21:08:06 -0400 (Wed, 22 Jul 2009) | 2 lines
More work on set/edit/get screen params. Now the test settings feature works
........
r598 | justin | 2009-07-25 04:00:50 -0400 (Sat, 25 Jul 2009) | 1 line
function to validate screenparams, runs kinda slow though, may need some work
........
r599 | justin | 2009-07-25 04:01:41 -0400 (Sat, 25 Jul 2009) | 1 line
Added display of gamma test screen and calibration parameters to screenParams stuff
........
r600 | justin | 2009-07-25 04:02:30 -0400 (Sat, 25 Jul 2009) | 1 line
Added ability to call with displayNum set to -1 so that it will just draw the stimuli not open and close the screen so that it could be called from mglEditScreenParamsNew
........
r601 | justin | 2009-07-28 05:06:04 -0400 (Tue, 28 Jul 2009) | 2 lines
Removing old version
........
r602 | justin | 2009-07-28 05:06:41 -0400 (Tue, 28 Jul 2009) | 2 lines
Screen parameters can now test digio
........
r603 | justin | 2009-07-28 05:07:46 -0400 (Tue, 28 Jul 2009) | 2 lines
changing some minor input arguments
........
r604 | justin | 2009-07-28 05:07:57 -0400 (Tue, 28 Jul 2009) | 2 lines
Handling autoCloseScreen better
........
r605 | justin | 2009-07-28 05:08:10 -0400 (Tue, 28 Jul 2009) | 2 lines
small fix to use correct return value
........
r606 | justin | 2009-07-28 09:17:51 -0400 (Tue, 28 Jul 2009) | 2 lines
Added message on how to get mrTools utilities if needed
........
r607 | justin | 2009-07-28 09:18:20 -0400 (Tue, 28 Jul 2009) | 2 lines
This now has add/delete/revert for screen parameters
........
r608 | justin | 2009-07-28 10:32:02 -0400 (Tue, 28 Jul 2009) | 2 lines
Adding ability to hide mouse. Also mglEditScreenParams defaults to showing you your current display.
........
r609 | justin | 2009-07-28 23:19:58 -0400 (Tue, 28 Jul 2009) | 2 lines
Display what calibration was done on the display in test settings
........
r610 | justin | 2009-07-29 02:54:12 -0400 (Wed, 29 Jul 2009) | 2 lines
Give warning if NI-DAQmx Base is not installed
........
r611 | justin | 2009-07-29 07:13:23 -0400 (Wed, 29 Jul 2009) | 2 lines
Fixing code to handle computers that don't have NI-DAQmx Base installed -- will given warning and then not use digin
........
r612 | justin | 2009-07-29 07:13:53 -0400 (Wed, 29 Jul 2009) | 2 lines
Return 0 when NI-DAQmx Base not installed
........
r613 | justin | 2009-07-29 09:13:04 -0400 (Wed, 29 Jul 2009) | 2 lines
Some stability issues, handling what to do when user calls clear all and a thread is running (which will dump the therad). Adding onExit calls. mglPostEvent still seems to not be very clean, if you try to quit it twice and clear all it crashes
........
r614 | justin | 2009-08-25 02:20:45 -0400 (Tue, 25 Aug 2009) | 2 lines
Fixing digin stuff to handle correctly when digin reads a line that is not a response line
........
r615 | justin | 2009-08-25 02:55:47 -0400 (Tue, 25 Aug 2009) | 2 lines
Was not forcing the save of the backtick
........
r616 | justin | 2009-08-25 02:57:56 -0400 (Tue, 25 Aug 2009) | 2 lines
use endScreen to colose the screen
........
r617 | justin | 2009-08-26 04:22:02 -0400 (Wed, 26 Aug 2009) | 2 lines
Fixing up mglDoRetinotopy script. Now eyecalib can be at the beginning or at the end, and there is a no field for making the fixation task easier
........
r618 | justin | 2009-08-26 04:27:17 -0400 (Wed, 26 Aug 2009) | 2 lines
Fixation task can now be incrementally easier
........
r619 | justin | 2009-08-26 04:28:23 -0400 (Wed, 26 Aug 2009) | 2 lines
fixStairInitTask now has a setting for "trainingMode" in which text strings appear over the stimuli to indicate the intervals. The program fixStairTest has been added for training people on the task
........
r620 | justin | 2009-08-26 04:42:35 -0400 (Wed, 26 Aug 2009) | 2 lines
adding clear/end commands
........
r621 | justin | 2009-08-26 21:52:55 -0400 (Wed, 26 Aug 2009) | 2 lines
test
........
r622 | dep | 2009-08-26 21:56:37 -0400 (Wed, 26 Aug 2009) | 2 lines
test password
........
r623 | justin | 2009-08-26 21:57:01 -0400 (Wed, 26 Aug 2009) | 3 lines
test password one last time
........
r631 | justin | 2009-09-14 20:06:53 -0400 (Mon, 14 Sep 2009) | 2 lines
Changed comment
........
r633 | justin | 2009-09-25 00:35:04 -0400 (Fri, 25 Sep 2009) | 2 lines
Adding ability to save screen params into your home directory as a dot file. Also fixed things like what to do if screenParams is empty (i.e. you deleted all screens)
........
r634 | justin | 2009-09-25 00:35:35 -0400 (Fri, 25 Sep 2009) | 2 lines
Adding ability to make settings sticky across sessions (i.e. they get saved into a .file in the users home directory)
........
r635 | justin | 2009-09-29 23:07:05 -0400 (Tue, 29 Sep 2009) | 2 lines
Attempting to ressurect compiled windows files
........
r636 | justin | 2009-09-29 23:14:04 -0400 (Tue, 29 Sep 2009) | 2 lines
Adding back windows binaries
........
r637 | justin | 2009-10-01 21:49:23 -0400 (Thu, 01 Oct 2009) | 2 lines
Updating readme files -- they should now just say to go to the webpage
........
r638 | justin | 2009-10-08 21:25:29 -0400 (Thu, 08 Oct 2009) | 2 lines
Added a check for bad color inputs -- if you somehow passed in a cell array instead of a regular array.
........
r639 | justin | 2009-10-13 20:31:37 -0400 (Tue, 13 Oct 2009) | 3 lines
mglDoRetinotopy changed defaults
mglDispText -- fixed small bug in which boxes were apperaing after clear
........
r640 | justin | 2009-10-13 20:46:49 -0400 (Tue, 13 Oct 2009) | 2 lines
Added ability to run mglDispText to tell the subject something from the ESC dialogbox
........
r641 | justin | 2009-10-13 22:05:55 -0400 (Tue, 13 Oct 2009) | 2 lines
Added a optional text argument so that you can display text before the calibration starts (e.g. "Starting eye calibration")
........
r642 | justin | 2009-10-13 22:07:08 -0400 (Tue, 13 Oct 2009) | 2 lines
Added some ability to put up text to the subject. Default is that if you use eyeCalb at the beginning of the scan it will tell the subject which scan you are on and tell them that they should get ready for the eye calibration. You can change this in the mrParamsDialog. Also, if you ESC a scan it adds to the dialog box the ability to start an mglDispText
........
r643 | justin | 2009-10-27 23:36:09 -0400 (Tue, 27 Oct 2009) | 4 lines
Fixing a bug with mglListener in which the pool got freed twice. This caused a crash in matlab at the end of each run.
Also, mglRetinotopy did not clear the text for the subject after you hit return to skip the eye calibration
........
1591 lines of code changed in 14 files:
fixes saving bugs for eyelink,
corrects recording check
rearranging getTaskParameters
154 lines of code changed in 2 files:
Fixed eyetracker file save to not lose data on matlab crash
This should be improved, it's a bit of a hack.
6 lines of code changed in 1 file:
Just moved the location of the task phase increment to be more rational
and allow the tracker callbacks to function
19 lines of code changed in 1 file:
bugfix: catch for next phase/task callback, check against length of task
1 lines of code changed in 1 file:
set the phase of a trial in the initTrial function (as seems appropriate)
alternatively it could be attached to the task struct directly (maybe more appropriate?)
9 lines of code changed in 1 file:
Added new callbacks,
Renamed recording functions,
Added task/phase specific recording spec
Integrated start/stop recording into the task structure
12 lines of code changed in 2 files:
Create a template gaze contingent task as a base for testing
bugfix: eyepos returned -y
119 lines of code changed in 2 files:
(10 more)