[root]/sandbox/eyelinkdev
mgllib
(0 files, 0 lines)
mglEyelink
(0 files, 0 lines)
unitTests
(0 files, 0 lines)
task
(0 files, 0 lines)
displays
(0 files, 0 lines)
trackers
(0 files, 0 lines)
ASL
(0 files, 0 lines)
Eyelink
(0 files, 0 lines)
utils
(0 files, 0 lines)
readDigPort
(0 files, 0 lines)
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| dep | 12 (100.0%) | 25 (100.0%) | 2.0 |
merged eyelink, end of branch development
0 lines of code changed in 4 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
........
1 lines of code changed in 2 files:
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
........
1 lines of code changed in 2 files:
notes
7 lines of code changed in 1 file:
removed mgllib notes to create a mgllib develoer.txt doc
2 lines of code changed in 1 file:
notes on textures and library
14 lines of code changed in 1 file:
Developer information files for tracking TODOs and notes.
0 lines of code changed in 1 file: