Skip to main content

Browse the archive

https://github.com/pupil-labs/pupil
24 March 2024, 01:46:26 UTC
sort by:
Revision Author Date Message Commit Date
423bddb Moritz Kassner 23 April 2015, 14:24:42 UTC adding audio back to recorder. 23 April 2015, 14:24:42 UTC
c9e2ca3 Michael Barz 22 April 2015, 15:45:00 UTC added high-speed eye cam 22 April 2015, 15:45:00 UTC
7ce1186 Moritz Kassner 22 April 2015, 15:38:00 UTC fixed format planes. 22 April 2015, 15:38:00 UTC
a010665 Michael Barz 22 April 2015, 15:22:21 UTC solved #134 22 April 2015, 15:22:21 UTC
25c70d4 Michael Barz 22 April 2015, 14:02:58 UTC fixed camera info text formatting 22 April 2015, 14:02:58 UTC
00b11d5 Michael Barz 22 April 2015, 13:59:52 UTC changed info text formatting 22 April 2015, 13:59:52 UTC
2d91199 Michael Barz 22 April 2015, 13:57:47 UTC Merge branch 'master' of https://github.com/pupil-labs/pupil.git 22 April 2015, 13:57:47 UTC
860c967 Michael Barz 22 April 2015, 13:56:18 UTC removed size selection for video 22 April 2015, 13:56:18 UTC
37ca543 Moritz Kassner 22 April 2015, 11:52:52 UTC Merge branch 'master' of https://github.com/pupil-labs/pupil 22 April 2015, 11:52:52 UTC
75d0c87 Moritz Kassner 22 April 2015, 11:52:42 UTC updated pupil_remote plugin 22 April 2015, 11:52:42 UTC
c17e0e2 Moritz Kassner 22 April 2015, 11:52:24 UTC unified calibration toggle fn 22 April 2015, 11:52:24 UTC
9423f34 Michael Barz 21 April 2015, 15:12:07 UTC added first gui controls improved error handling 21 April 2015, 15:12:07 UTC
0a6977d Moritz Kassner 21 April 2015, 08:42:42 UTC fixing issue: #137 21 April 2015, 08:42:42 UTC
ece0a15 Michael Barz 18 April 2015, 16:13:44 UTC frames are cached for multiple use eye overlay works again 18 April 2015, 16:13:44 UTC
dec35d8 Moritz Kassner 17 April 2015, 11:15:12 UTC Merge branch '3d_calibration' 17 April 2015, 11:15:12 UTC
a730c64 Moritz Kassner 17 April 2015, 11:01:19 UTC catch division error as potential pitfall. 17 April 2015, 11:01:19 UTC
ac234b0 Moritz Kassner 17 April 2015, 10:43:36 UTC fix bug and improved default values. 17 April 2015, 10:43:36 UTC
bb5d983 Moritz Kassner 17 April 2015, 09:03:41 UTC cosmetics. 17 April 2015, 09:03:41 UTC
bcdf8a4 Michael Barz 16 April 2015, 16:18:40 UTC fixed zero division bug in world 16 April 2015, 16:18:40 UTC
142407f Michael Barz 16 April 2015, 16:15:23 UTC Merge branch 'master' of https://github.com/pupil-labs/pupil.git 16 April 2015, 16:15:23 UTC
75fec33 Michael Barz 16 April 2015, 16:14:41 UTC added opencv_ffmpeg dependency to bundle 16 April 2015, 16:14:41 UTC
fc5c06e Michael Barz 08 April 2015, 13:09:15 UTC fixed recording issue for windows bundle 08 April 2015, 13:09:15 UTC
bf6349e Moritz Kassner 23 March 2015, 09:31:27 UTC fixed version script bugfix 23 March 2015, 09:31:27 UTC
e09f71f Moritz Kassner 23 March 2015, 09:28:20 UTC fixed version script bug 23 March 2015, 09:28:20 UTC
5202076 Moritz Kassner 16 April 2015, 10:39:12 UTC Merge branch 'master' of https://github.com/pupil-labs/pupil 16 April 2015, 10:39:12 UTC
56213e5 Moritz Kassner 16 April 2015, 10:39:02 UTC Fixed bug and improved gui 16 April 2015, 10:39:02 UTC
1aa3058 Will Patera 16 April 2015, 01:26:19 UTC cosmetics - typo fix in comments. 16 April 2015, 01:26:19 UTC
097cc4f Will Patera 16 April 2015, 01:25:46 UTC minor fix - double check that there is really a watermark image before asking for the watermark.shape to avoid a crash. 16 April 2015, 01:25:46 UTC
c87177a Moritz Kassner 15 April 2015, 07:11:19 UTC moving files 15 April 2015, 07:11:19 UTC
e1894ff Moritz Kassner 15 April 2015, 07:10:31 UTC renamed uvc_capture to video_capture in file structure and imports. 15 April 2015, 07:10:31 UTC
2cbd4b9 Moritz Kassner 15 April 2015, 07:01:07 UTC unified size and rate properties for all video captures 15 April 2015, 07:01:07 UTC
3ffc203 Moritz Kassner 15 April 2015, 06:42:22 UTC make update textures persistent. 15 April 2015, 06:42:22 UTC
6ec8e43 Moritz Kassner 15 April 2015, 06:42:02 UTC small fixes to make dragging more robust. UI fixes to selection when multiple watermark files are available. 15 April 2015, 06:42:02 UTC
339841d Moritz Kassner 14 April 2015, 16:18:21 UTC Make sound module more robust to missing audio files as reported in issue: #106 14 April 2015, 16:18:21 UTC
d2c4b25 Moritz Kassner 14 April 2015, 14:43:52 UTC added missing user dir to g_pool in exporters. added watermark plugin. 14 April 2015, 14:43:52 UTC
00388a1 Moritz Kassner 14 April 2015, 14:07:39 UTC added watermark plugin for player and exporter 14 April 2015, 14:07:39 UTC
eed83cc Moritz Kassner 14 April 2015, 14:07:24 UTC removed unused fns. 14 April 2015, 14:07:24 UTC
7b4d317 Will Patera 10 April 2015, 07:59:42 UTC Fixing typos `accuracy` to `accuracy`. Starting to update for v0.4 using the appropriate gaze data from the gaze event not the pupil position. TODO: - Update marker rendering following `screen_marker_calibration.py` - Make controls for speed and marker size following `screen_marker_calibration.py` 10 April 2015, 07:59:42 UTC
a798b55 Moritz Kassner 21 March 2015, 21:59:31 UTC bug fix. Versions are not just strings anymore. 21 March 2015, 21:59:31 UTC
a4f9067 Moritz Kassner 20 March 2015, 15:38:04 UTC cleanup and cosmetics 20 March 2015, 15:38:04 UTC
eda3978 Moritz Kassner 20 March 2015, 15:00:24 UTC Merge branch 'player_eye_overlay_video' 20 March 2015, 15:00:24 UTC
f407781 Moritz Kassner 20 March 2015, 09:01:17 UTC code revision: simplification/cleanup 20 March 2015, 09:01:17 UTC
47852e5 Moritz Kassner 20 March 2015, 08:31:56 UTC removed all gl_fns that are not within GUI. Calling any of them in the exporter will cause a crash 20 March 2015, 08:31:56 UTC
095b569 Moritz Kassner 20 March 2015, 08:24:13 UTC cosmetics. 20 March 2015, 08:24:13 UTC
6e3ea47 Moritz Kassner 20 March 2015, 08:23:42 UTC typo errors, bug fixes. 20 March 2015, 08:23:42 UTC
8eb0a3d Moritz Kassner 20 March 2015, 08:23:18 UTC get rid of plugins that fail to initialise right away. 20 March 2015, 08:23:18 UTC
b6b0292 Moritz Kassner 20 March 2015, 08:17:16 UTC updated to 0.4 structure. 20 March 2015, 08:17:16 UTC
8ad0e57 Will Patera 20 March 2015, 08:09:58 UTC Merge branch 'master' into player_eye_overlay_video 20 March 2015, 08:09:58 UTC
c4d0c52 Will Patera 20 March 2015, 08:09:02 UTC meta_info is not available in exporter - so reverting to reading file again... 20 March 2015, 08:09:02 UTC
97ebb94 Moritz Kassner 20 March 2015, 08:06:29 UTC added more issuing values. 20 March 2015, 08:06:29 UTC
52e740c Will Patera 20 March 2015, 07:51:38 UTC Merge branch 'master' into player_eye_overlay_video 20 March 2015, 07:51:38 UTC
d91c719 Will Patera 20 March 2015, 07:50:14 UTC adding comments 20 March 2015, 07:50:14 UTC
cb612a4 Moritz Kassner 20 March 2015, 07:48:36 UTC added missing var. 20 March 2015, 07:48:36 UTC
dc68e41 Will Patera 20 March 2015, 07:05:06 UTC reverting -- not necessary because 20 March 2015, 07:05:06 UTC
bdec2d1 Will Patera 20 March 2015, 07:04:02 UTC minor update - self.g_pool 20 March 2015, 07:04:02 UTC
32f2e1d Will Patera 20 March 2015, 06:02:30 UTC incremental work - cleanup and fixing errors from copy/paste from other plugins (should clone this plugin not `Vis_Circle` :) 20 March 2015, 06:02:30 UTC
44dcec3 Will Patera 20 March 2015, 05:35:25 UTC cleaning up the eye_video_overlay plugin and updating to use the g_pool.rec_dir instead of reading it again from meta_info 20 March 2015, 05:35:25 UTC
447edd7 Will Patera 20 March 2015, 05:34:29 UTC Adding meta_info to the g_pool -- the only thing I use it for is the 'Eye Mode' so we could just append the 'Eye Mode' string to the g_pool, but other plugin developers might also want to access the entire meta_info dict. 20 March 2015, 05:34:29 UTC
a3f6238 Will Patera 20 March 2015, 05:10:53 UTC Merge branch 'master' into player_eye_overlay_video 20 March 2015, 05:10:53 UTC
c1ef327 Will Patera 20 March 2015, 05:09:19 UTC cosmetics - spacing 20 March 2015, 05:09:19 UTC
8c943be Moritz Kassner 18 March 2015, 12:14:04 UTC removed deprecated script 18 March 2015, 12:14:04 UTC
0efc4f7 Moritz Kassner 18 March 2015, 12:13:48 UTC Versioning and consistency changes proper versioning across all apps. Issue #116 attach meta_info to g_pool in player. Issue #115 rename data_dir to rec_dir like it is called everywhere else: Issue # 117 18 March 2015, 12:13:48 UTC
54dc4dc Will Patera 18 March 2015, 03:23:30 UTC incremental work - adding UI switch to flip (mirror) image over Y axis (LR flip) 18 March 2015, 03:23:30 UTC
4698787 Will Patera 18 March 2015, 03:05:08 UTC minor change - making UI controls for opacity (alpha) 18 March 2015, 03:05:08 UTC
2fc3038 mkassner 17 March 2015, 11:08:35 UTC fix issue #107 same as before but for offline marker tracker 17 March 2015, 11:08:35 UTC
db4ba0f mkassner 17 March 2015, 11:07:24 UTC fix issue #107 make sure surfaces are defined when selecting them for edits. 17 March 2015, 11:07:24 UTC
32dd6aa mkassner 17 March 2015, 11:04:25 UTC revert last commit. This fix will happen in the next commit 17 March 2015, 11:04:25 UTC
8bd1704 Will Patera 17 March 2015, 10:49:59 UTC quick fix - make sure that we actually have the uv_coords before we try to use them. This is a quick fix for issue #107 17 March 2015, 10:49:59 UTC
ac1c4f4 Will Patera 17 March 2015, 08:51:56 UTC cosmetics - cleaning up the doc string and adding some comments 17 March 2015, 08:51:56 UTC
3b81058 Will Patera 17 March 2015, 08:45:25 UTC incremental work - moved the for loop that takes care of empty empty entries in the `eye_timestamps_by_world_index` list into the `correlate_eye_world` function. The `correlate_eye_world` function now returns a list `eye_frame_index` -- this list is as long as the world timestamps. Also added a check in `update` to see if the world video is playing to reduce calls to the seek function. 17 March 2015, 08:45:25 UTC
e055453 Will Patera 17 March 2015, 05:50:55 UTC minor change - updating the target size of the ROI handle as requested in issue #112 17 March 2015, 05:50:55 UTC
24026c8 Will Patera 16 March 2015, 14:08:14 UTC incremental work - fixing formatting and minor bugs 16 March 2015, 14:08:14 UTC
e5330f8 Will Patera 16 March 2015, 11:41:27 UTC Adding `Eye_Video_Overlay` plugin to exporter. 16 March 2015, 11:41:27 UTC
58bae8e Will Patera 16 March 2015, 11:37:23 UTC Merge branch 'player_eye_overlay_video' of https://github.com/pupil-labs/pupil into player_eye_overlay_video 16 March 2015, 11:37:23 UTC
7bff685 Will Patera 16 March 2015, 11:37:03 UTC minor changes to include init dict and clone 16 March 2015, 11:37:03 UTC
66b5c03 mkassner 16 March 2015, 11:35:42 UTC Update eye_video_overlay.py implemented economical seeking. 16 March 2015, 11:35:42 UTC
9e181f6 Will Patera 16 March 2015, 04:23:29 UTC incremental work - testing less transparent image for the overlay and cleaning up the position variable (no need to calculate this twice!) 16 March 2015, 04:23:29 UTC
86cf119 Will Patera 16 March 2015, 04:19:19 UTC Merge branch 'master' of https://github.com/pupil-labs/pupil 16 March 2015, 04:19:19 UTC
f5cc56a Will Patera 16 March 2015, 04:18:59 UTC typo fix in comments: `anaymos` to `anonymous` 16 March 2015, 04:18:59 UTC
a21c694 Will Patera 16 March 2015, 04:16:54 UTC minor changes - moving the eye video overlay to the upper right hand corner and adding 10px padding to top and right hand side. 16 March 2015, 04:16:54 UTC
6fb4253 Will Patera 16 March 2015, 04:10:02 UTC Improving update function. We don't need to seek every time the update function gets called -- only if we have a **new** frame. For example - if we're paused, we don't need to be calling `seek_to_frame`. 16 March 2015, 04:10:02 UTC
db27486 Will Patera 16 March 2015, 03:59:52 UTC cleanup - user does not need a button to show/hide the eye, they can just open/close the plugin. Cleaning up comments. Implemented a hack-ish way to scrub/seek through the video by running seek on every frame -- again this is not good for performance (hence the term 'hack-ish' above). 16 March 2015, 03:59:52 UTC
c16dcd9 Will Patera 16 March 2015, 03:46:57 UTC cosmetics - adding the position offset to the image shape and switching the pos indices so that it is similar to x,y instead of numpy's row,column format. 16 March 2015, 03:46:57 UTC
8f5818d Will Patera 16 March 2015, 03:41:49 UTC Incremental work - changed eye video rendering from GL texture to numpy array. The eye video now gets displayed/called in the update function of the plugin. This will allow a user to export the overlay eye video. Added function `transparent_image_overlay` to `player_methods`. TODO: - give user control of eye video position - give user control of eye video size - fix eye playback method (currently very cpu intensive to make a seek every frame) - fix seek display of eye video 16 March 2015, 03:41:49 UTC
239301d Michael Barz 15 March 2015, 15:33:52 UTC added some logging for windows video added timebase support for win vid added workaround for os.getlogin in recorder 15 March 2015, 15:33:52 UTC
3682383 Will Patera 15 March 2015, 09:48:19 UTC incremental work - eye video now synchronized with the world video. The empty frames in the `eye_frames_by_world_index` are filled by finding the closest neighboring frame in time (either in the future in the past). Next steps: - enable seeking for the eye video - render eye video directly into the numpy world image frame - make it transparent overlay (see circle plugin) so that it can be exported with the video 15 March 2015, 09:48:19 UTC
9ad8b92 Will Patera 15 March 2015, 03:32:09 UTC incremental work - need to make sure that we don't have empty frames in the `eye_frames_by_world_index`. The recursive functions `get_past_timestamp` and `get_future_timestamp` find the most recent non empty timestamp in the `eye_frames_by_world_index`. The next step is to use these functions and determine which timestamp (past or future), based on its temporal difference from the world_timestamp at that given index. The result of filling in empty indices will result in duplicate eye frames within the list as estimations of the temporally closest eye frames to the world frame at the given time. 15 March 2015, 03:32:09 UTC
ce63261 Will Patera 14 March 2015, 08:05:02 UTC incremental work - use seek to make sure the eye video is correlated with the world video 14 March 2015, 08:05:02 UTC
cff2d4b Will Patera 14 March 2015, 07:08:49 UTC adding docstring to the `correlate_eye_world` function 14 March 2015, 07:08:49 UTC
f79ed7e Will Patera 13 March 2015, 10:57:22 UTC Incremental work to correlate (synchronize) the eye video with the world video. the `correlate_eye_world` function takes `eye_timestamps` and `world_timestamps` as arguments - similar to `correlate_gaze` function and returns a list of potential `eye_timestamps` for each world video frame. This function gets called in the init of the plugin to create a lookup table. We also create the dictionary `eye_frames_by_timestamp` with the timestamp as the key and eye frame as value for reverse lookup. 13 March 2015, 10:57:22 UTC
ffd9eea Moritz Kassner 12 March 2015, 14:03:36 UTC removed calles to frame.img.shape 12 March 2015, 14:03:36 UTC
bf7a653 Moritz Kassner 12 March 2015, 10:20:46 UTC rotate the image 180 deg instead of mirroring it. 12 March 2015, 10:20:46 UTC
50da497 Moritz Kassner 11 March 2015, 13:47:51 UTC added option to flip eye image display 11 March 2015, 13:47:51 UTC
91ba840 Will Patera 10 March 2015, 09:08:28 UTC enabling toggle show/hide toggle. 10 March 2015, 09:08:28 UTC
086e4b8 Will Patera 10 March 2015, 08:48:52 UTC changing the size of the quad on which the eye image is drawn. 10 March 2015, 08:48:52 UTC
1fb0d95 Will Patera 10 March 2015, 08:20:30 UTC showing eye video within the Player window - not yet synched or scaled 10 March 2015, 08:20:30 UTC
17064b7 Will Patera 10 March 2015, 08:05:21 UTC minor formatting changes and variable name cleanup -- not working yet 10 March 2015, 08:05:21 UTC
112f689 Will Patera 10 March 2015, 03:57:04 UTC incremental work on eye video 10 March 2015, 03:57:04 UTC
5c259f0 Will Patera 10 March 2015, 02:25:31 UTC incremental updates to the gui -- stripping out copied text from the marker detector plugin. 10 March 2015, 02:25:31 UTC
c007204 Will Patera 10 March 2015, 02:22:06 UTC changing the file and class name from `eye_overlay` to `eye_video_overlay` 10 March 2015, 02:22:06 UTC
back to top