March 2010 Commit Log

Commit Logs

Number of Commits:: 69
Number of Active Developers:: 2

justin 2010-03-30 15:54 #69 Rev.: 782

If numBlocks was set then the eyetracker callback would crash updateTask because a necessary check for the number of task phases was not done. Fixed.

1 lines of code changed in 1 file:

task: updateTask.m (+1 -1)

justin 2010-03-30 15:44 #68 Rev.: 781

Fixed bug in which only the first persistent variable was being set

1 lines of code changed in 1 file:

mgllib: mglGetParam.m (+1 -1)

justin 2010-03-30 15:44 #67 Rev.: 780

Gives warning if you do not have eyelink compiled

11 lines of code changed in 2 files:

task: eyeCalibDisp.m (+5 -44)
task/trackers/Eyelink: initEyelinkEyeTracker.m (+6)

justin 2010-03-30 15:43 #66 Rev.: 779

Changes necessary for setting displayDir

59 lines of code changed in 2 files:

task: initScreen.m (+10 -8), mglEditScreenParams.m (+49)

justin 2010-03-30 15:43 #65 Rev.: 778

Setting up an mgl param that can specify where display calibrations go. You set mglSetParam('displayDir','mydisplaydir',1) and then moncalib/initScreen know where to look for calibrations

7 lines of code changed in 1 file:

utils: moncalib.m (+7 -2)

justin 2010-03-30 14:05 #64 Rev.: 777

binary

0 lines of code changed in 1 file:

mgllib: mglBltTexture.mexmaci (changed)

dep 2010-03-29 11:48 #63 Rev.: 776

Commented out calibrate test message--it changes the mean luminance during autothresholding

6 lines of code changed in 1 file:

task/trackers/Eyelink: eyeCalibrationEyelink.m (+6 -3)

justin 2010-03-29 07:25 #62 Rev.: 775

Changing try/catch syntax which wasn't working on some systems.

2 lines of code changed in 1 file:

mgllib: mglMake.m (+2 -1)

dep 2010-03-27 03:28 #61 Rev.: 774

BUGFIX: type from template

1 lines of code changed in 1 file:

mgllib/mglEyelink: mglEyelinkSetup.m (+1 -1)

dep 2010-03-27 03:26 #60 Rev.: 773

Fixed checkrecording tests

5 lines of code changed in 1 file:

mgllib/mglTest: mglTestEyelink.m (+5 -1)

dep 2010-03-27 03:22 #59 Rev.: 772

BUG: exist returns 3 if it finds a mex file. Not sure why this echeck is here?

1 lines of code changed in 1 file:

mgllib/mglEyelink: mglEyelinkOpen.m (+1 -1)

justin 2010-03-26 07:04 #58 Rev.: 771

another quick typo fix

2 lines of code changed in 2 files:

utils: makeGaussian.m (+1 -1), makeGrating.m (+1 -1)

justin 2010-03-26 07:04 #57 Rev.: 770

Typo in warning line fixed

2 lines of code changed in 2 files:

utils: makeGaussian.m (+1 -1), makeGrating.m (+1 -1)

dep 2010-03-26 02:31 #56 Rev.: 769

renamed mglPrivateEyelinkCalibration -> mglPrivateEyelinkSetup

1402 lines of code changed in 11 files:

mgllib: developer.txt (+1 -1)
mgllib/mglEyelink: developer.txt (+64 -74), mglEyelinkSetup.m (+1 -1), mglPrivateEyelinkCalibration.c (del), mglPrivateEyelinkCalibration.h (del), mglPrivateEyelinkDriftCorrection.c (+1 -1), mglPrivateEyelinkSetup.c (new 1172), mglPrivateEyelinkSetup.h (new 160)
task: taskTemplate.m (+1)
task/trackers/Eyelink: eyeCalibrationEyelink.m (+1 -1), mglEyelinkTestCalibration.m (+1 -1)

dep 2010-03-26 02:24 #55 Rev.: 768

Added public interface to the eyelink calibration private mex function, not
all functionality is implemented.

19 lines of code changed in 5 files:

mgllib/mglEyelink: mglEyelinkCalibrate.m (new), mglEyelinkDriftCorrect.m (new), mglEyelinkRecordingStart.m (+4 -3), mglEyelinkSetup.m (new 15), mglEyelinkValidate.m (new)

dep 2010-03-26 01:50 #54 Rev.: 767

Doc string fix

3 lines of code changed in 1 file:

mgllib/mglEyelink: mglPrivateEyelinkOpenEDF.c (+3 -2)

justin 2010-03-25 17:27 #53 Rev.: 766

Removing unnecessary lines about setting grating phase

3 lines of code changed in 1 file:

task: taskTemplateContrast10bit.m (+3 -10)

justin 2010-03-25 17:24 #52 Rev.: 765

Updating function with a newer version with 1D textures

228 lines of code changed in 1 file:

task: taskTemplateContrast10bit.m (+228 -136)

justin 2010-03-25 14:16 #51 Rev.: 764

Adding a glDisable for the 1D textures. This seems to clear up some drawing/ordering issue that caused the fixation cross not to be displayed properly

2 lines of code changed in 3 files:

mgllib: mglBltTexture.c (+2), mglBltTexture.mexmaci (changed), mglBltTexture.mexmaci64 (changed)

justin 2010-03-24 16:00 #50 Rev.: 763

compile of digio exclusively complies digio instead of compiling everything+digio

36 lines of code changed in 1 file:

mgllib: mglMake.m (+36 -36)

justin 2010-03-24 11:05 #49 Rev.: 762

Some improvements to the robustness of moncalib for Minolta light meters
mglMakeGrating now can make 1D gratings

65 lines of code changed in 2 files:

utils: mglMakeGrating.m (+22 -11), moncalib.m (+43 -18)

justin 2010-03-24 10:13 #48 Rev.: 761

Reimporting these complied binaries (we dont have source code) to the repository that Eric removed in his branch merge

0 lines of code changed in 2 files:

utils: comm.mexmac (new), comm.mexmaci (new)

dep 2010-03-24 06:46 #47 Rev.: 760

a few more comments and added the collectEyeData field to comply with the new initTask default.

7 lines of code changed in 1 file:

task: taskTemplateGazeContingent.m (+7 -6)

dep 2010-03-24 06:45 #46 Rev.: 759

change default to not collecting eye data (for compatibility with simultaneous tasks/phases). you must explicitly specify collection on the main tasks/phases

2 lines of code changed in 1 file:

task: initTask.m (+2 -3)

dep 2010-03-24 06:15 #45 Rev.: 758

misc cleanup and message on entering simulation mode

4 lines of code changed in 1 file:

mgllib/mglTest: mglTestEyelink.m (+4 -3)

dep 2010-03-24 05:48 #44 Rev.: 757

Added more help on the ability to pass mex command line options.

5 lines of code changed in 1 file:

mgllib: mglMake.m (+5 -1)

justin 2010-03-19 11:32 #43 Rev.: 756

Minor changes to make mglEyelinkOpen fail gracefully if you do not have the eye tracker code compiled

13 lines of code changed in 2 files:

mgllib/mglEyelink: mglEyelinkOpen.m (+7 -1)
task: taskTemplateGazeContingent.m (+6 -3)

justin 2010-03-18 16:46 #42 Rev.: 755

minor changes. taskTemplateGazeContingent uses default monitor settings

4 lines of code changed in 2 files:

mgllib/mglEyelink: mglPrivateEyelinkCalibration.c (+3 -3)
task: taskTemplateGazeContingent.m (+1 -1)

justin 2010-03-18 16:11 #41 Rev.: 754

Number of minor changes here and there. The taskTemplateGazeContingent and calibrateEyeTracker sequence now display messages to get the experimenter started on what is going on.

271 lines of code changed in 7 files:

task: calibrateEyeTracker.m (+16 -29), initEyeTracker.m (+3 -1), initScreen.m (+1), taskTemplateGazeContingent.m (+81 -83)
task/trackers/Eyelink: eyeCalibrationEyelink.m (+36 -16), initEyelinkEyeTracker.m (+118 -116), mglEyelinkCallbackSaveData.m (+16 -18)

justin 2010-03-18 16:10 #40 Rev.: 753

Changed error handling to provide warning messages. If the tracker cannot be initialized it shouldn't crash the program, it should continue to run and give a warning that the tracker did not initialize. This way you can run your stimulus program on computers without trackers.

94 lines of code changed in 4 files:

mgllib/mglEyelink: mglEyelinkOpen.m (+17 -16), mglPrivateEyelinkCMDPrintF.c (+1 -1), mglPrivateEyelinkEDFGetFile.c (+12 -6), mglPrivateEyelinkOpen.c (+64 -46)

justin 2010-03-18 16:09 #39 Rev.: 752

Changed back to drawing lines for cursors. Seems to work fine now

24 lines of code changed in 2 files:

mgllib/mglEyelink: mglPrivateEyelinkCalibration.c (+23 -28), mglPrivateEyelinkCalibration.h (+1 -1)

justin 2010-03-18 16:08 #38 Rev.: 751

Minor.. Changed plot

3 lines of code changed in 1 file:

mgllib/mglTest: mglTestEyelink.m (+3 -1)

justin 2010-03-18 11:46 #37 Rev.: 750

Changing indentation and removing function/end

1319 lines of code changed in 6 files:

task: endTask.m (+29 -30), initEyeTracker.m (+35 -52), initScreen.m (+513 -516), initTask.m (+353 -354), testExperiment.m (+1), updateTask.m (+388 -393)

justin 2010-03-18 11:45 #36

Adding back binary

0 lines of code changed in 2 files:

utils: mydisp.mexmaci (new), mydisp.mexmaci64 (new)

justin 2010-03-18 11:43 #35

Adding back binaries

0 lines of code changed in 157 files:

mgllib: mglBltTexture.mexmaci (new), mglBltTexture.mexmaci64 (new), mglBltTexture.mexw32 (new), mglBltTexture.mexw64 (new), mglCharToKeycode.mexmaci (new), mglCharToKeycode.mexmaci64 (new), mglClearScreen.mexmaci (new), mglClearScreen.mexmaci64 (new), mglClearScreen.mexw32 (new), mglClearScreen.mexw64 (new), mglDisplayCursor.mexmaci (new), mglDisplayCursor.mexmaci64 (new), mglDisplayCursor.mexw32 (new), mglDisplayCursor.mexw64 (new), mglFillOval.mexmaci (new), mglFillOval.mexmaci64 (new), mglFillOval.mexw32 (new), mglFillOval.mexw64 (new), mglFillRect.mexmaci (new), mglFillRect.mexmaci64 (new), mglFillRect.mexw32 (new), mglFillRect.mexw64 (new), mglFlush.mexmaci (new), mglFlush.mexmaci64 (new), mglFlush.mexw32 (new), mglFlush.mexw64 (new), mglFrameGrab.mexmaci (new), mglFrameGrab.mexmaci64 (new), mglFrameGrab.mexw32 (new), mglFrameGrab.mexw64 (new), mglGetGammaTable.mexmaci (new), mglGetGammaTable.mexmaci64 (new), mglGetGammaTable.mexw32 (new), mglGetGammaTable.mexw64 (new), mglGetKeys.mexmaci (new), mglGetKeys.mexmaci64 (new), mglGetKeys.mexw32 (new), mglGetKeys.mexw64 (new), mglGetMouse.mexmaci (new), mglGetMouse.mexmaci64 (new), mglGetMouse.mexw32 (new), mglGetMouse.mexw64 (new), mglGetSecs.mexmaci (new), mglGetSecs.mexmaci64 (new), mglGetSecs.mexw32 (new), mglGetSecs.mexw64 (new), mglGluAnnulus.mexmaci (new), mglGluAnnulus.mexmaci64 (new), mglGluAnnulus.mexw32 (new), mglGluAnnulus.mexw64 (new), mglGluDisk.mexmaci (new), mglGluDisk.mexmaci64 (new), mglGluDisk.mexw32 (new), mglGluDisk.mexw64 (new), mglGluPartialDisk.mexmaci (new), mglGluPartialDisk.mexmaci64 (new), mglGluPartialDisk.mexw32 (new), mglGluPartialDisk.mexw64 (new), mglKeycodeToChar.mexmaci (new), mglKeycodeToChar.mexmaci64 (new), mglLines2.mexmaci (new), mglLines2.mexmaci64 (new), mglLines2.mexw32 (new), mglLines2.mexw64 (new), mglPoints2.mexmaci (new), mglPoints2.mexmaci64 (new), mglPoints2.mexw32 (new), mglPoints2.mexw64 (new), mglPoints3.mexmaci (new), mglPoints3.mexmaci64 (new), mglPoints3.mexw32 (new), mglPoints3.mexw64 (new), mglPolygon.mexmaci (new), mglPolygon.mexmaci64 (new), mglPolygon.mexw32 (new), mglPolygon.mexw64 (new), mglPrivateClose.mexmaci (new), mglPrivateClose.mexmaci64 (new), mglPrivateClose.mexw32 (new), mglPrivateClose.mexw64 (new), mglPrivateCreateTexture.mexmaci (new), mglPrivateCreateTexture.mexmaci64 (new), mglPrivateCreateTexture.mexw32 (new), mglPrivateCreateTexture.mexw64 (new), mglPrivateDeleteTexture.mexmaci (new), mglPrivateDeleteTexture.mexmaci64 (new), mglPrivateDeleteTexture.mexw32 (new), mglPrivateDeleteTexture.mexw64 (new), mglPrivateDescribeDisplays.mexmaci (new), mglPrivateDescribeDisplays.mexmaci64 (new), mglPrivateDescribeDisplays.mexw32 (new), mglPrivateDescribeDisplays.mexw64 (new), mglPrivateGetKeyEvent.mexmaci (new), mglPrivateGetKeyEvent.mexmaci64 (new), mglPrivateGetKeyEvent.mexw32 (new), mglPrivateGetKeyEvent.mexw64 (new), mglPrivateGetMouseEvent.mexmaci (new), mglPrivateGetMouseEvent.mexmaci64 (new), mglPrivateGetMouseEvent.mexw32 (new), mglPrivateGetMouseEvent.mexw64 (new), mglPrivateInstallSound.mexmaci (new), mglPrivateInstallSound.mexmaci64 (new), mglPrivateListener.mexmaci (new), mglPrivateListener.mexmaci64 (new), mglPrivateMoveWindow.mexmaci (new), mglPrivateMoveWindow.mexmaci64 (new), mglPrivateMoveWindow.mexw32 (new), mglPrivateMoveWindow.mexw64 (new), mglPrivateMovie.mexmaci (new), mglPrivateMovie.mexmaci64 (new), mglPrivateOpen.mexmaci (new), mglPrivateOpen.mexmaci64 (new), mglPrivateOpen.mexw32 (new), mglPrivateOpen.mexw64 (new), mglPrivatePlaySound.mexmaci (new), mglPrivatePlaySound.mexmaci64 (new), mglPrivatePostEvent.mexmaci (new), mglPrivatePostEvent.mexmaci64 (new), mglPrivateSwitchDisplay.mexmaci (new), mglPrivateSwitchDisplay.mexmaci64 (new), mglPrivateSwitchDisplay.mexw32 (new), mglPrivateSwitchDisplay.mexw64 (new), mglQuad.mexmaci (new), mglQuad.mexmaci64 (new), mglQuad.mexw32 (new), mglQuad.mexw64 (new), mglResolution.mexmaci (new), mglResolution.mexmaci64 (new), mglResolution.mexw32 (new), mglResolution.mexw64 (new), mglSetGammaTable.mexmaci (new), mglSetGammaTable.mexmaci64 (new), mglSetGammaTable.mexw32 (new), mglSetGammaTable.mexw64 (new), mglStencilCreateBegin.mexmaci (new), mglStencilCreateBegin.mexmaci64 (new), mglStencilCreateBegin.mexw32 (new), mglStencilCreateBegin.mexw64 (new), mglStencilCreateEnd.mexmaci (new), mglStencilCreateEnd.mexmaci64 (new), mglStencilCreateEnd.mexw32 (new), mglStencilCreateEnd.mexw64 (new), mglStencilSelect.mexmaci (new), mglStencilSelect.mexmaci64 (new), mglStencilSelect.mexw32 (new), mglStencilSelect.mexw64 (new), mglStrokeText.mexmaci (new), mglStrokeText.mexmaci64 (new), mglStrokeText.mexw32 (new), mglStrokeText.mexw64 (new), mglTestLiveTexture.mexmaci (new), mglText.mexmaci (new), mglText.mexmaci64 (new), mglTransform.mexmaci (new), mglTransform.mexmaci64 (new), mglTransform.mexw32 (new), mglTransform.mexw64 (new)

justin 2010-03-18 10:59 #34 Rev.: 745

Changing a few names of things

135 lines of code changed in 5 files:

mgllib/mglTest: mglTestEyelink.m (new 77), mglTestGetKeys.m (new 57), mglTestText.m (+1 -1), testEyelink.m (del), testGetKeys.m (del)

justin 2010-03-18 10:58 #33 Rev.: 744

Adding back everything in mglTest

1332 lines of code changed in 16 files:

mgllib/mglTest: japanese.txt (new 1), mglLogo.png (new), mglTestAlignment.m (new 109), mglTestDots.m (new 65), mglTestGamma.m (new 93), mglTestGammaGUI.fig (new), mglTestGammaGUI.m (new 146), mglTestKeys.m (new 68), mglTestLUTAnimation.m (new 73), mglTestLiveTexture.c (new 89), mglTestStencil.m (new 83), mglTestTex.m (new 187), mglTestTexMulti.m (new 141), mglTestText.m (new 143), testEyelink.m (new 77), testGetKeys.m (new 57)

justin 2010-03-18 10:57 #32 Rev.: 743

Moving mglTestResources

0 lines of code changed in 2 files:

mgllib/mglTestResources: japanese.txt (del), mglLogo.png (del)

justin 2010-03-18 10:57 #31 Rev.: 742

mglPrivateEyelinkCalibration now uses a liveBuffer to update. Actually it seems that the slowing down problem has to do with the crosshairs callbacks. Commented out for now.

Moving all test programs into mglTest.

145 lines of code changed in 16 files:

mgllib: mglCreateTexture.m (+2), mglTestAlignment.m (del), mglTestDots.m (del), mglTestGamma.m (del), mglTestGammaGUI.fig (del), mglTestGammaGUI.m (del), mglTestKeys.m (del), mglTestLUTAnimation.m (del), mglTestStencil.m (del), mglTestTex.m (del), mglTestTexMulti.m (del), mglTestText.m (del)
mgllib/mglEyelink: mglPrivateEyelinkCalibration.c (+136 -110), mglPrivateEyelinkCalibration.h (+7 -21)
mgllib/unitTests: testEyelink.m (del), testGetKeys.m (del)

justin 2010-03-18 09:48 #30 Rev.: 741

minor changes to header file

3 lines of code changed in 1 file:

mgllib/mglEyelink: mglPrivateEyelinkCalibration.h (+3 -3)

justin 2010-03-18 09:48 #29 Rev.: 740

Committing this version that now use mexCallMatlab to do texture creation/blt instead of using pasted in code. Seems to work ok at first, but slows down sometimes when displaying the eye buffer. Will next try a version which uses the liveBuffer on the mglCreateTexture function

84 lines of code changed in 1 file:

mgllib/mglEyelink: mglPrivateEyelinkCalibration.c (+84 -987)

justin 2010-03-17 16:18 #28 Rev.: 739

Adding ability to keep a "liveBuffer" that is just a c array that you can use to quickly rebind the texture -- for mglPrivateEyelinkCalibration

34 lines of code changed in 4 files:

mgllib: mglDeleteTexture.m (+1 -1), mglPrivateCreateTexture.c (+20 -5), mglPrivateDeleteTexture.c (+7 -2), mglText.c (+6 -2)

justin 2010-03-17 16:14 #27 Rev.: 738

Adds ability to keep a live buffer

4 lines of code changed in 1 file:

mgllib: mglCreateTexture.m (+4 -2)

dep 2010-03-17 12:01 #26 Rev.: 737

really, really, really basic eyetracker demo

84 lines of code changed in 1 file:

task: taskTemplateGazeContingent.m (+84 -68)

dep 2010-03-17 12:00 #25 Rev.: 736

fixed keyboard under __cocoa__
removed conflicting (outdated) eyeCalib funs

5 lines of code changed in 3 files:

mgllib/mglEyelink: mglPrivateEyelinkCalibration.c (+5 -2)
task/trackers: eyeCalibrationASL.m (del), eyeCalibrationEyelink.m (del)

justin 2010-03-17 10:54 #24 Rev.: 735

Eyelink should not try to compile by default since most systems wont have the libraries installed. this is now an option that you can compile by doing mglMake(eyelink)

168 lines of code changed in 1 file:

mgllib: mglMake.m (+168 -167)

justin 2010-03-17 10:53 #23 Rev.: 734

added comments

42 lines of code changed in 1 file:

mgllib/mglEyelink: mglEyelinkRecordingStart.m (+42 -29)

dep 2010-03-17 02:28 #22 Rev.: 733

restored eyecalib from eyetracker init; should be updated for new eyetracker code

1 lines of code changed in 1 file:

utils: mglRetinotopy.m (+1 -1)

dep 2010-03-17 02:25 #21 Rev.: 732

formatting

444 lines of code changed in 1 file:

task: updateTask.m (+444 -444)

dep 2010-03-17 02:19 #20 Rev.: 731

formatting

108 lines of code changed in 1 file:

task: tickScreen.m (+108 -108)

dep 2010-03-17 02:17 #19 Rev.: 730

formatting; check for callback

120 lines of code changed in 1 file:

task: saveStimData.m (+120 -120)

dep 2010-03-17 02:07 #18

reformatting

425 lines of code changed in 2 files:

task: initTask.m (+359 -359), mglValidateScreenParams.m (+66 -62)

dep 2010-03-17 02:01 #17 Rev.: 727

formatting; merge keyword list for screenParams

523 lines of code changed in 1 file:

task: initScreen.m (+523 -523)

dep 2010-03-17 01:34 #16 Rev.: 726

replaced with original

5 lines of code changed in 1 file:

task: eyeCalib9.m (+5 -1)

dep 2010-03-17 01:33 #15 Rev.: 725

formatting

334 lines of code changed in 1 file:

mgllib: mglPrivateListener.c (+334 -334)

dep 2010-03-17 01:12 #14 Rev.: 724

formatting; protection added to callback

36 lines of code changed in 1 file:

task: endTask.m (+36 -36)

dep 2010-03-16 23:51 #13 Rev.: 723

updated unit test, allows for offline testing

24 lines of code changed in 1 file:

mgllib/unitTests: testEyelink.m (+24 -8)

dep 2010-03-16 23:06 #12 Rev.: 722

fixes for recording start wrapper

30 lines of code changed in 1 file:

mgllib/mglEyelink: mglEyelinkRecordingStart.m (+30 -30)

dep 2010-03-16 22:54 #11 Rev.: 721

reformatted spacing; incorporated mglText change

1056 lines of code changed in 1 file:

mgllib/mglEyelink: mglPrivateEyelinkCalibration.c (+1056 -1030)

dep 2010-03-16 22:52 #10 Rev.: 720

reformatted spacing; options for passing define statements; default for macos 10.4 -> __carbon__

171 lines of code changed in 1 file:

mgllib: mglMake.m (+171 -168)

dep 2010-03-16 21:34 #9 Rev.: 719

Restored eyeCalibDisp (this is will need to be integrated with new eyetracker
task structure in the future.

98 lines of code changed in 1 file:

task: eyeCalibDisp.m (+98 -11)

dep 2010-03-16 14:33 #8 Rev.: 717

Merged revisions 455-463,465-466,470-471,476-488,490,492-493,496-497,500-505,508-509,516,521-522,524,527,529-534,536,539-542,544-562,564,624-625,632,644,646-649,652-653,656,658,672,674,682-683,686,692-693,700 via svnmerge from
http://gru.brain.riken.jp/svn/mgl/sandbox/eyelinkdev

................
r455 | dep | 2009-02-09 17:09:10 -0500 (Mon, 09 Feb 2009) | 8 lines

mglEyelink: a set of routines for accessing the Eyelink C API
mglPrivate funcitons are used for basic API calls
mgl functions are used for combining into useful groups (mgllib only)
There will need to be a mglEyeTracker set of funcitons for abstracting
away from specific eye trackers
There will need to be task based functions for data colleciton/gaze
contingent, trial calibration, etc.
................
r456 | dep | 2009-02-09 17:40:09 -0500 (Mon, 09 Feb 2009) | 3 lines

Added library include to the CFLAGS. This is machine dependent (e.g. could be in
the ~/Library/Frameworks or /Developer/Frameworks)
................
r457 | dep | 2009-02-09 17:42:15 -0500 (Mon, 09 Feb 2009) | 3 lines

DELETED mex binary files from this tree--they should not be updated after
builds and only source is really needed in the repository.
................
r458 | dep | 2009-02-09 17:46:35 -0500 (Mon, 09 Feb 2009) | 2 lines

Set the directories to ignore mex binaries.
................
r459 | dep | 2009-02-10 12:11:59 -0500 (Tue, 10 Feb 2009) | 2 lines

Developer information files for tracking TODOs and notes.
................
r460 | dep | 2009-02-10 15:54:15 -0500 (Tue, 10 Feb 2009) | 3 lines

Base calibration code copied from sdl plugin code example
Fixed: Added include for eyelink_core in mglEyelink/mexopts.sh
Fixed: Added frameworks to get mgl compiling on 10.4/ppc
................
r461 | dep | 2009-02-10 23:40:49 -0500 (Tue, 10 Feb 2009) | 3 lines

Bug in EyelinkOpen parsing; temp commented out
Calibration skeleton is working
................
r462 | dep | 2009-02-10 23:41:36 -0500 (Tue, 10 Feb 2009) | 2 lines

skeleton message passing
................
r463 | dep | 2009-02-11 10:26:27 -0500 (Wed, 11 Feb 2009) | 1 line

Send a command to the Eyelink
................
r465 | dep | 2009-02-11 11:57:22 -0500 (Wed, 11 Feb 2009) | 2 lines

mglMake: Changed the processing of the arguments to provide a more flexible and robust method for handling defines. The argument 'rebuild' can now be one of '1', 'rebuild', 'carbon', 'cocoa' or any define beginning with '__'. Additionally, any number of additional defines can be passed as further arguments.
mglMake: Also changed the processing of the mgl directory for sources to look in subdirectories beginning with 'mgl' and verified that 'mgl.h' actually exists in the main mgldir.
................
r466 | dep | 2009-02-11 11:59:27 -0500 (Wed, 11 Feb 2009) | 2 lines

fixed all the message sending private functions to take only a string--printf-like handling must be supported in .m files
renamed SetMode to GoOffline--this is the only command that is use to change mode prior to a series of commands (the others would be done in conjunction with beginning a trial, starting to record data etc.
................
r470 | dep | 2009-02-11 19:25:21 -0500 (Wed, 11 Feb 2009) | 3 lines

Bugfix: In mglMake when first parameter was passed as a define
Bugfix: added #ifndef protection to __eventtap__
................
r471 | dep | 2009-02-12 21:34:24 -0500 (Thu, 12 Feb 2009) | 1 line

Almost a complete working eyelink library.
................
r476 | dep | 2009-02-15 17:14:16 -0500 (Sun, 15 Feb 2009) | 2 lines

notes on textures and library
................
r477 | dep | 2009-02-15 17:15:52 -0500 (Sun, 15 Feb 2009) | 2 lines

removed mgllib notes to create a mgllib develoer.txt doc
................
r478 | dep | 2009-02-15 17:35:04 -0500 (Sun, 15 Feb 2009) | 2 lines

notes
................
r479 | dep | 2009-02-15 17:36:25 -0500 (Sun, 15 Feb 2009) | 2 lines

updated to provide options for specifying what data to be recorded
................
r480 | dep | 2009-02-15 17:36:57 -0500 (Sun, 15 Feb 2009) | 2 lines

more notes from psychtoolbox review
................
r481 | dep | 2009-02-15 17:38:09 -0500 (Sun, 15 Feb 2009) | 2 lines

display number for eye graphics
................
r482 | dep | 2009-02-15 19:04:28 -0500 (Sun, 15 Feb 2009) | 2 lines

place for developer notes for mgllib
................
r483 | dep | 2009-02-15 19:04:47 -0500 (Sun, 15 Feb 2009) | 2 lines

a wrapper for default ip
................
r484 | dep | 2009-02-15 19:05:10 -0500 (Sun, 15 Feb 2009) | 2 lines

fixed dereference bug
................
r485 | dep | 2009-02-15 19:05:38 -0500 (Sun, 15 Feb 2009) | 2 lines

updated to reflect new open wrapper
................
r486 | dep | 2009-02-15 19:05:54 -0500 (Sun, 15 Feb 2009) | 2 lines

merged in trunk line trace updates
................
r487 | dep | 2009-02-15 19:06:21 -0500 (Sun, 15 Feb 2009) | 2 lines

camera display work
................
r488 | dep | 2009-02-16 13:34:15 -0500 (Mon, 16 Feb 2009) | 1 line

added skeleton of eye camera code
................
r490 | dep | 2009-02-16 20:23:14 -0500 (Mon, 16 Feb 2009) | 2 lines

Compiles but crashes
................
r492 | dep | 2009-02-18 10:22:21 -0500 (Wed, 18 Feb 2009) | 2 lines

Fixed bug in int cast in open
basic calibration keycode framework
................
r493 | dep | 2009-02-18 10:22:54 -0500 (Wed, 18 Feb 2009) | 1 line

updated to allow general compile arguments (so it now requires -D for defines)
................
r496 | dep | 2009-02-18 18:38:25 -0500 (Wed, 18 Feb 2009) | 1 line

key code (untested)
................
r497 | dep | 2009-02-19 08:18:02 -0500 (Thu, 19 Feb 2009) | 1 line

fixed type bugs in crosshair code
................
r500 | dep | 2009-02-19 18:08:14 -0500 (Thu, 19 Feb 2009) | 1 line

Improved error message
................
r501 | dep | 2009-02-19 18:52:01 -0500 (Thu, 19 Feb 2009) | 2 lines

key events are being passed, but not all correctly
texture code is not completely failing...
................
r502 | dep | 2009-03-06 01:02:07 -0500 (Fri, 06 Mar 2009) | 2 lines

semi working version of the basic eye calibration display
................
r503 | dep | 2009-03-06 20:24:52 -0500 (Fri, 06 Mar 2009) | 2 lines

began re-factoring code to use c rather than matlab based gl texture calls
this will take a bit and could be the basis for a consoliation of the gl calls in the other texture functions
................
r504 | dep | 2009-03-07 19:06:52 -0500 (Sat, 07 Mar 2009) | 1 line

A basic version of the re-written code that uses c level gl calls based on the c mex functions that were previously used.
................
r505 | dep | 2009-03-08 15:53:55 -0400 (Sun, 08 Mar 2009) | 2 lines

Textures now blt to screen, but are the wrong shape and are are not updating correctly.
Blt does not re-bind the texture, this must be done externally, perhaps this suggests re-factoring...
................
r508 | dep | 2009-03-09 22:51:16 -0400 (Mon, 09 Mar 2009) | 3 lines

Basic work version of calibration utilities. The keyboard input is being passed correctly (except perhaps return/enter
not being different), the video works (but not the titles) but crashes/fails if you switch too many times. This is a
memory handling problem. Fixed (partially) broken carbon, non-listener code.
................
r509 | dep | 2009-03-10 14:03:54 -0400 (Tue, 10 Mar 2009) | 1 line

Working but listener is fucked.
................
r516 | dep | 2009-03-11 16:06:10 -0400 (Wed, 11 Mar 2009) | 1 line

Added unit test area and getkey test
................
r521 | dep | 2009-03-14 11:09:24 -0400 (Sat, 14 Mar 2009) | 2 lines

basic tracker outline
................
r522 | dep | 2009-03-14 13:22:03 -0400 (Sat, 14 Mar 2009) | 1 line

Check developer and global library for eyelink (should also check user)
................
r524 | dep | 2009-03-14 13:29:23 -0400 (Sat, 14 Mar 2009) | 1 line

Corrected developer framework location
................
r527 | dep | 2009-03-14 13:35:42 -0400 (Sat, 14 Mar 2009) | 1 line

decided to remove the /Developer include (use simlinks if desired) because it is more conforming with the Apple guidelines
................
r529 | dep | 2009-03-16 14:34:36 -0400 (Mon, 16 Mar 2009) | 4 lines

Began re-factoring c code into standard library format so to promote work on the mgl listener code
Eventually, the goals is to provide a general event stack which can be implemented for each platform.
Also, the goal will be to allow all mex functions to access the internal c calls used by other functions to promote
interoperability and flexibility of coding new functions. This will be demonstrated by re-factoring the texture code.
................
r530 | dep | 2009-03-16 16:53:37 -0400 (Mon, 16 Mar 2009) | 3 lines

Continuing saga of a calibration code gone wrong.
Restored separation of code, re-factoring will be too complex for now. it needs
to be done carefully and with coordination, so it is postponed.
................
r531 | dep | 2009-03-16 16:55:49 -0400 (Mon, 16 Mar 2009) | 3 lines

test change: attempt to flush the queue (which can build asyncronously) after a getkeyevent
call. this is the expected behavior, as the call should return the first event since the
last call (or you should get all keys).
................
r532 | dep | 2009-03-16 17:43:18 -0400 (Mon, 16 Mar 2009) | 1 line

Improvements/fixes to the task based callback system
................
r533 | dep | 2009-03-19 12:21:56 -0400 (Thu, 19 Mar 2009) | 2 lines

Attempt to use Carbon GetKeyEvent
................
r534 | dep | 2009-03-19 12:51:25 -0400 (Thu, 19 Mar 2009) | 1 line

Added init check and init set to determine if the tracker is initialized
................
r536 | dep | 2009-03-19 18:37:34 -0400 (Thu, 19 Mar 2009) | 9 lines

Merged revisions 535 via svnmerge from
http://yoyodyne.cns.nyu.edu/svn/mgl/trunk

........
r535 | dep | 2009-03-19 16:40:45 -0400 (Thu, 19 Mar 2009) | 2 lines

updates to (attempt) to fix listener/getkeys on carbon/10.4
........
................
r539 | dep | 2009-03-20 11:45:35 -0400 (Fri, 20 Mar 2009) | 1 line

a temporary test of Carbon Event Code
................
r540 | dep | 2009-03-20 12:38:22 -0400 (Fri, 20 Mar 2009) | 2 lines

test code
................
r541 | dep | 2009-03-20 13:12:55 -0400 (Fri, 20 Mar 2009) | 1 line

giving up on carbon events (non-threaded)
................
r542 | dep | 2009-03-20 18:19:27 -0400 (Fri, 20 Mar 2009) | 8 lines

Working mglEyelink.
This revision contains a working version of mglEyelink (the basic library calls) that
allows you to self calibrate, can return eye positions and appears (mostly) to not crash.
There is a lot of cleanup to be done in the code. Further, there MUST be a movement
towards a library based mgl with real make file and real architecture differentiation. Most
of what was tricky to make work was the eyelink calibration code (especially the eye drawing).
We still do not have working titles; we should report on state or return codes; etc.
Task integration is incomplete.
................
r544 | dep | 2009-03-20 18:39:08 -0400 (Fri, 20 Mar 2009) | 2 lines

get eye position in native or device coords
................
r545 | dep | 2009-03-21 13:51:57 -0400 (Sat, 21 Mar 2009) | 2 lines

tracker work
................
r546 | dep | 2009-03-21 14:05:55 -0400 (Sat, 21 Mar 2009) | 3 lines

use dirs for tracker code
eyelink callbacks
................
r547 | dep | 2009-03-21 15:45:52 -0400 (Sat, 21 Mar 2009) | 2 lines

baseline task support
fixed mglEyelinkOpen and dependents to allow dummy mode
................
r548 | dep | 2009-03-21 18:41:34 -0400 (Sat, 21 Mar 2009) | 2 lines

Working mglEyelink with tracking
................
r549 | dep | 2009-03-22 16:54:07 -0400 (Sun, 22 Mar 2009) | 3 lines

set physical params correctly,
fixed callbacks for trial/seg tags
................
r550 | dep | 2009-03-22 18:23:55 -0400 (Sun, 22 Mar 2009) | 2 lines

fixed callback code and changed default eye-coords
................
r551 | dep | 2009-03-24 12:09:22 -0400 (Tue, 24 Mar 2009) | 2 lines

Create a template gaze contingent task as a base for testing
bugfix: eyepos returned -y
................
r552 | dep | 2009-03-24 16:02:21 -0400 (Tue, 24 Mar 2009) | 2 lines

check to see if the save data field exists
................
r553 | dep | 2009-03-24 16:35:58 -0400 (Tue, 24 Mar 2009) | 2 lines

Added edf messages
................
r554 | dep | 2009-03-25 13:33:43 -0400 (Wed, 25 Mar 2009) | 4 lines

Added new callbacks,
Renamed recording functions,
Added task/phase specific recording spec
Integrated start/stop recording into the task structure
................
r555 | dep | 2009-03-25 17:02:54 -0400 (Wed, 25 Mar 2009) | 2 lines

Properly handle logical arrays
User friendly interface
................
r556 | dep | 2009-03-25 17:03:59 -0400 (Wed, 25 Mar 2009) | 1 line

removed system close call (unnecessary, i believe)
................
r557 | dep | 2009-03-25 17:04:18 -0400 (Wed, 25 Mar 2009) | 1 line

Checks to see if we are recording
................
r558 | dep | 2009-03-25 17:17:40 -0400 (Wed, 25 Mar 2009) | 2 lines

bugfix: integration of eye-tracker recording (mglEyelinkRecordStart) with task
................
r559 | dep | 2009-03-25 17:18:40 -0400 (Wed, 25 Mar 2009) | 2 lines

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?)
................
r560 | dep | 2009-03-25 17:20:50 -0400 (Wed, 25 Mar 2009) | 1 line

removed debugging code
................
r561 | dep | 2009-03-26 11:22:44 -0400 (Thu, 26 Mar 2009) | 1 line

Use device coords by default
................
r562 | dep | 2009-03-26 17:59:20 -0400 (Thu, 26 Mar 2009) | 2 lines

bugfix: catch for next phase/task callback, check against length of task
................
r564 | dep | 2009-04-09 18:21:38 -0400 (Thu, 09 Apr 2009) | 2 lines

bugfix: StartRecording -> RecordingStart (and stop)
................
r624 | dep | 2009-08-27 16:16:18 -0400 (Thu, 27 Aug 2009) | 3 lines

Just moved the location of the task phase increment to be more rational
and allow the tracker callbacks to function
................
r625 | dep | 2009-08-27 17:00:23 -0400 (Thu, 27 Aug 2009) | 3 lines

Fixed eyetracker file save to not lose data on matlab crash
This should be improved, it's a bit of a hack.
................
r632 | dep | 2009-09-15 14:44:18 -0400 (Tue, 15 Sep 2009) | 2 lines

Fixed lack of file protection bug!
added test calibration and close
................
r644 | dep | 2009-10-28 11:29:29 -0400 (Wed, 28 Oct 2009) | 4 lines

fixes saving bugs for eyelink,
corrects recording check
rearranging getTaskParameters
................
r646 | dep | 2009-10-28 15:15:24 -0400 (Wed, 28 Oct 2009) | 2 lines

added ingore for mex on readDigPort
................
r647 | dep | 2009-10-28 16:44:22 -0400 (Wed, 28 Oct 2009) | 1 line

Fixed formatting and restored lost eyetracker initialization code
................
r648 | dep | 2009-11-04 16:39:58 -0500 (Wed, 04 Nov 2009) | 6 lines

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)
................
r649 | dep | 2009-11-05 14:03:33 -0500 (Thu, 05 Nov 2009) | 5 lines

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
................
r652 | dep | 2009-11-18 13:19:18 -0500 (Wed, 18 Nov 2009) | 2 lines

end tracking gracefully when we don't save the data
................
r653 | dep | 2009-11-18 13:20:10 -0500 (Wed, 18 Nov 2009) | 2 lines

added eyetracker field
................
r656 | dep | 2009-12-03 15:54:30 -0500 (Thu, 03 Dec 2009) | 2 lines

commented out obsolete blocks for randstate
................
r658 | dep | 2009-12-03 17:38:53 -0500 (Thu, 03 Dec 2009) | 1 line

removed the commented task rand state protection lines
................
r672 | dep | 2009-12-30 12:38:35 -0500 (Wed, 30 Dec 2009) | 2 lines

clear old screenParams after parsing
................
r674 | dep | 2009-12-30 16:34:04 -0500 (Wed, 30 Dec 2009) | 4 lines

merged in mglMake from trunk (digio)
removed 10.6 dependency by allowing __carbon__ to build without CG 10.6 full
screen call
................
r682 | dep | 2010-02-02 17:12:49 -0500 (Tue, 02 Feb 2010) | 1 line

Moved start recording from task to block callback.
................
r683 | dep | 2010-02-06 18:24:35 -0500 (Sat, 06 Feb 2010) | 2 lines

new calibration file for the g5 stim comp
................
r686 | dep | 2010-02-19 10:07:37 -0500 (Fri, 19 Feb 2010) | 3 lines

allow compile on 10.4
mgltestcal initScreens and load a low contrast grey
................
r692 | dep | 2010-02-23 14:51:54 -0500 (Tue, 23 Feb 2010) | 1 line

Updated to handle (hopefully) multiple tasks and remove the 'reset' at block boundaries until it can be implemented in a more coherent way.
................
r693 | dep | 2010-02-23 16:02:16 -0500 (Tue, 23 Feb 2010) | 2 lines

Allows a task to specify whether to stop recording at block, task or trial boundaries; allows for multiple tasks so long as only one task (optionally with multiple phases) has the 'collectEyeData' field set.
BY DEFAULT, EVEN IF YOU INIT THE EYE TRACKER, NO DATA IS RECORDED...
................
r700 | dep | 2010-02-24 11:27:13 -0500 (Wed, 24 Feb 2010) | 1 line

fixed typo
................

6831 lines of code changed in 223 files:

developer.txt (new 26)
mgllib: developer.txt (new 36), mexopts.sh (+1 -1), mgl.h (+2), mglBltTexture.mexmaci (changed), mglBltTexture.mexmaci64 (changed), mglBltTexture.mexw32 (changed), mglBltTexture.mexw64 (changed), mglCharToKeycode.mexmaci (changed), mglCharToKeycode.mexmaci64 (changed), mglClearScreen.mexmaci (changed), mglClearScreen.mexmaci64 (changed), mglClearScreen.mexw32 (changed), mglClearScreen.mexw64 (changed), mglDisplayCursor.mexmaci (changed), mglDisplayCursor.mexmaci64 (changed), mglDisplayCursor.mexw32 (changed), mglDisplayCursor.mexw64 (changed), mglFillOval.mexmaci (changed), mglFillOval.mexmaci64 (changed), mglFillOval.mexw32 (changed), mglFillOval.mexw64 (changed), mglFillRect.mexmaci (changed), mglFillRect.mexmaci64 (changed), mglFillRect.mexw32 (changed), mglFillRect.mexw64 (changed), mglFlush.mexmaci (changed), mglFlush.mexmaci64 (changed), mglFlush.mexw32 (changed), mglFlush.mexw64 (changed), mglFrameGrab.mexmaci (changed), mglFrameGrab.mexmaci64 (changed), mglFrameGrab.mexw32 (changed), mglFrameGrab.mexw64 (changed), mglGetGammaTable.mexmaci (changed), mglGetGammaTable.mexmaci64 (changed), mglGetGammaTable.mexw32 (changed), mglGetGammaTable.mexw64 (changed), mglGetKeys.mexmaci (changed), mglGetKeys.mexmaci64 (changed), mglGetKeys.mexw32 (changed), mglGetKeys.mexw64 (changed), mglGetMouse.mexmaci (changed), mglGetMouse.mexmaci64 (changed), mglGetMouse.mexw32 (changed), mglGetMouse.mexw64 (changed), mglGetSecs.mexmaci (changed), mglGetSecs.mexmaci64 (changed), mglGetSecs.mexw32 (changed), mglGetSecs.mexw64 (changed), mglGluAnnulus.mexmaci (changed), mglGluAnnulus.mexmaci64 (changed), mglGluAnnulus.mexw32 (changed), mglGluAnnulus.mexw64 (changed), mglGluDisk.mexmaci (changed), mglGluDisk.mexmaci64 (changed), mglGluDisk.mexw32 (changed), mglGluDisk.mexw64 (changed), mglGluPartialDisk.mexmaci (changed), mglGluPartialDisk.mexmaci64 (changed), mglGluPartialDisk.mexw32 (changed), mglGluPartialDisk.mexw64 (changed), mglKeycodeToChar.mexmaci (changed), mglKeycodeToChar.mexmaci64 (changed), mglLines2.mexmaci (changed), mglLines2.mexmaci64 (changed), mglLines2.mexw32 (changed), mglLines2.mexw64 (changed), mglMake.m (+180 -134), mglPoints2.mexmaci (changed), mglPoints2.mexmaci64 (changed), mglPoints2.mexw32 (changed), mglPoints2.mexw64 (changed), mglPoints3.mexmaci (changed), mglPoints3.mexmaci64 (changed), mglPoints3.mexw32 (changed), mglPoints3.mexw64 (changed), mglPolygon.mexmaci (changed), mglPolygon.mexmaci64 (changed), mglPolygon.mexw32 (changed), mglPolygon.mexw64 (changed), mglPrivateClose.mexmaci (changed), mglPrivateClose.mexmaci64 (changed), mglPrivateClose.mexw32 (changed), mglPrivateClose.mexw64 (changed), mglPrivateCreateTexture.mexmaci (changed), mglPrivateCreateTexture.mexmaci64 (changed), mglPrivateCreateTexture.mexw32 (changed), mglPrivateCreateTexture.mexw64 (changed), mglPrivateDeleteTexture.mexmaci (changed), mglPrivateDeleteTexture.mexmaci64 (changed), mglPrivateDeleteTexture.mexw32 (changed), mglPrivateDeleteTexture.mexw64 (changed), mglPrivateDescribeDisplays.mexmaci (changed), mglPrivateDescribeDisplays.mexmaci64 (changed), mglPrivateDescribeDisplays.mexw32 (changed), mglPrivateDescribeDisplays.mexw64 (changed), mglPrivateGetKeyEvent.mexmaci (changed), mglPrivateGetKeyEvent.mexmaci64 (changed), mglPrivateGetKeyEvent.mexw32 (changed), mglPrivateGetKeyEvent.mexw64 (changed), mglPrivateGetMouseEvent.mexmaci (changed), mglPrivateGetMouseEvent.mexmaci64 (changed), mglPrivateGetMouseEvent.mexw32 (changed), mglPrivateGetMouseEvent.mexw64 (changed), mglPrivateInstallSound.mexmaci (changed), mglPrivateInstallSound.mexmaci64 (changed), mglPrivateListener.c (+364 -364), mglPrivateListener.mexmaci (changed), mglPrivateListener.mexmaci64 (changed), mglPrivateMoveWindow.mexmaci (changed), mglPrivateMoveWindow.mexmaci64 (changed), mglPrivateMoveWindow.mexw32 (changed), mglPrivateMoveWindow.mexw64 (changed), mglPrivateMovie.mexmaci (changed), mglPrivateMovie.mexmaci64 (changed), mglPrivateOpen.c (+3 -1), mglPrivateOpen.mexmaci (changed), mglPrivateOpen.mexmaci64 (changed), mglPrivateOpen.mexw32 (changed), mglPrivateOpen.mexw64 (changed), mglPrivatePlaySound.mexmaci (changed), mglPrivatePlaySound.mexmaci64 (changed), mglPrivatePostEvent.mexmaci (changed), mglPrivatePostEvent.mexmaci64 (changed), mglPrivateSwitchDisplay.mexmaci (changed), mglPrivateSwitchDisplay.mexmaci64 (changed), mglPrivateSwitchDisplay.mexw32 (changed), mglPrivateSwitchDisplay.mexw64 (changed), mglQuad.mexmaci (changed), mglQuad.mexmaci64 (changed), mglQuad.mexw32 (changed), mglQuad.mexw64 (changed), mglResolution.mexmaci (changed), mglResolution.mexmaci64 (changed), mglResolution.mexw32 (changed), mglResolution.mexw64 (changed), mglSetGammaTable.mexmaci (changed), mglSetGammaTable.mexmaci64 (changed), mglSetGammaTable.mexw32 (changed), mglSetGammaTable.mexw64 (changed), mglStencilCreateBegin.mexmaci (changed), mglStencilCreateBegin.mexmaci64 (changed), mglStencilCreateBegin.mexw32 (changed), mglStencilCreateBegin.mexw64 (changed), mglStencilCreateEnd.mexmaci (changed), mglStencilCreateEnd.mexmaci64 (changed), mglStencilCreateEnd.mexw32 (changed), mglStencilCreateEnd.mexw64 (changed), mglStencilSelect.mexmaci (changed), mglStencilSelect.mexmaci64 (changed), mglStencilSelect.mexw32 (changed), mglStencilSelect.mexw64 (changed), mglStrokeText.mexmaci (changed), mglStrokeText.mexmaci64 (changed), mglStrokeText.mexw32 (changed), mglStrokeText.mexw64 (changed), mglText.mexmaci (changed), mglText.mexmaci64 (changed), mglTransform.mexmaci (changed), mglTransform.mexmaci64 (changed), mglTransform.mexw32 (changed), mglTransform.mexw64 (changed)
mgllib/mglEyelink: developer.txt (new 146), mexopts.sh (new 286), mglEyelinkCMDPrintF.m (new 13), mglEyelinkClose.m (new 18), mglEyelinkEDFPrintF.m (new 13), mglEyelinkGetCurrentEyePos.m (new 20), mglEyelinkOpen.m (new 29), mglEyelinkRecordingCheck.c (new 41), mglEyelinkRecordingStart.m (new 35), mglEyelinkRecordingStop.c (new 38), mglPrivateEyelinkCMDPrintF.c (new 79), mglPrivateEyelinkCalibration.c (new 2025), mglPrivateEyelinkCalibration.h (new 174), mglPrivateEyelinkClose.c (new 41), mglPrivateEyelinkDriftCorrection.c (new 101), mglPrivateEyelinkEDFGetFile.c (new 63), mglPrivateEyelinkEDFOpen.c (new), mglPrivateEyelinkEDFPrintF.c (new 58), mglPrivateEyelinkGetCurrentSample.c (new 120), mglPrivateEyelinkGoOffline.c (new 45), mglPrivateEyelinkOpen.c (new 91), mglPrivateEyelinkOpenEDF.c (new 59), mglPrivateEyelinkRecordingStart.c (new 70), mglPrivateEyelinkSendCommand.c (new 78)
mgllib/unitTests: testEyelink.m (new 61), testGetKeys.m (new 57)
task: calculatedRandomization.m (new 54), calibrateEyeTracker.m (new 45), endTask.m (+36 -23), eyeCalib9.m (+1 -5), eyeCalibDisp.m (+11 -98), initEyeTracker.m (new 64), initScreen.m (+532 -481), initTask.m (+348 -310), mglValidateScreenParams.m (+2 -1), saveStimData.m (+125 -111), taskTemplateGazeContingent.m (new 114), tickScreen.m (+112 -103), updateTask.m (+454 -406)
task/displays: 0005_stimulus-g5_projector_100206.mat (new)
task/trackers/ASL: eyeCalibrationASL.m (new 106), initASLEyeTracker.m (new 54)
task/trackers/Eyelink: eyeCalibrationEyelink.m (new 39), initEyelinkEyeTracker.m (new 153), mglEyelinkCallbackCloseTracker.m (new 23), mglEyelinkCallbackGetPosition.m (new 18), mglEyelinkCallbackNextTask.m (new 26), mglEyelinkCallbackSaveData.m (new 33), mglEyelinkCallbackStartBlock.m (new 22), mglEyelinkCallbackStartSegment.m (new 17), mglEyelinkCallbackTrialEnd.m (new 21), mglEyelinkCallbackTrialStart.m (new 22), mglEyelinkTestCalibration.m (new 9)
utils: comm.mexmac (changed), comm.mexmaci (changed), mglRetinotopy.m (+1 -1), mydisp.mexmac (del), mydisp.mexmaci (changed), mydisp.mexmaci64 (changed)
utils/readDigPort: mexopts.sh (+16 -48)

justin 2010-03-03 12:06 #7 Rev.: 713

Allows deleting an array of textures

5 lines of code changed in 1 file:

mgllib: mglDeleteTexture.m (+5 -2)

justin 2010-03-03 12:06 #6 Rev.: 712

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).

150 lines of code changed in 2 files:

task: getStimvolFromVarname.m (+1 -1), getTaskParameters.m (+149 -52)

justin 2010-03-02 16:42 #5 Rev.: 711

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.

90 lines of code changed in 4 files:

task: blockRandomization.m (+10 -21), getStimvolFromVarname.m (+9 -2), initRandomization.m (new 69), uniformRandomization.m (+2 -22)

justin 2010-03-01 16:31 #4 Rev.: 710

fixing output argument -- must have gotten messed up in last conflict resolution

9 lines of code changed in 1 file:

task: getTaskParameters.m (+9 -7)

justin 2010-03-01 16:09 #3 Rev.: 709

Checking for bad stim trace values which crept in because fixStairInitTask was writing to the wrong trace number

184 lines of code changed in 2 files:

task: getTaskParameters.m (+179 -251), makeTraces.m (+5 -1)

justin 2010-03-01 12:38 #2 Rev.: 708

fixing write trace

6 lines of code changed in 1 file:

task: fixStairInitTask.m (+6 -5)

justin 2010-03-01 12:37 #1 Rev.: 707

Adding ability to do every combination

39 lines of code changed in 1 file:

task: getStimvolFromVarname.m (+39)

February 2010 »

Generated by StatSVN 0.4.1