[root]/sandbox/eyelinkdev/task/displays
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| dep | 8 (100.0%) | 0 (-) | 0.0 |
merged eyelink, end of branch development
0 lines of code changed in 4 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
........
0 lines of code changed in 3 files:
new calibration file for the g5 stim comp
0 lines of code changed in 1 file: