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
d240069 Pablo Prietz 25 January 2017, 15:18:12 UTC Fix blink detector and use 2D confidence for 3D gaze positions 25 January 2017, 15:18:12 UTC
69d287d Pablo Prietz 20 January 2017, 10:53:58 UTC Plugin clean up + add UI to unload plugin 20 January 2017, 10:53:58 UTC
8ce6a9d Pablo Prietz 20 January 2017, 10:47:18 UTC Merge branch 'master' into blink_detector # Conflicts: # pupil_src/capture/world.py 20 January 2017, 10:47:18 UTC
785159a mkassner 20 January 2017, 10:11:10 UTC Merge pull request #592 from papr/master Fix annotation export bug 20 January 2017, 10:11:10 UTC
22cb657 Pablo Prietz 20 January 2017, 09:42:58 UTC Fix duplicate typo, make first usage of `raise exc from orig_exc` 20 January 2017, 09:42:58 UTC
0f966b9 Moritz Kassner 20 January 2017, 07:44:12 UTC require v0.91 of pyuvc 20 January 2017, 07:44:12 UTC
11cfe14 Pablo Prietz 19 January 2017, 22:31:10 UTC Fix annotation export bug #591 and missing catch for IsADirectoryError in player methods 19 January 2017, 22:31:10 UTC
4db249a mkassner 19 January 2017, 13:33:02 UTC Merge pull request #557 from pupil-labs/non_blocking_capture Non blocking capture 19 January 2017, 13:33:02 UTC
28c8450 mkassner 19 January 2017, 13:32:44 UTC Merge pull request #589 from papr/nonblock Final fixes 19 January 2017, 13:32:44 UTC
ffe3988 Pablo Prietz 19 January 2017, 11:06:56 UTC Merge branch 'master' into nonblock # Conflicts: # pupil_src/player/main.py # pupil_src/player/vis_eye_video_overlay.py # pupil_src/player/vis_scan_path.py 19 January 2017, 11:06:56 UTC
7c103a6 Pablo Prietz 19 January 2017, 10:46:00 UTC Update recordings from bytes to unicode, make load_/save_object consistent Other fixes: - Move user directory section where it belongs - Should fix #583 19 January 2017, 10:46:00 UTC
13afefe mkassner 18 January 2017, 14:41:59 UTC Merge pull request #586 from papr/nonblock Recent changes and fixes 18 January 2017, 14:41:59 UTC
a2c449a Pablo Prietz 18 January 2017, 13:28:10 UTC Merge remote-tracking branch 'pupil-labs/master' 18 January 2017, 13:28:10 UTC
02f8379 Pablo Prietz 18 January 2017, 13:27:01 UTC Revert "Fix #585 by also looking for library `glfw` if `glfw3` is not found" This reverts commit 15d87a1b61e980ccf38fa98f77d09397de2bd31c. Fixed differently in ab6c6d0e3b8c99aa87c89248ee532aa94c130381 18 January 2017, 13:27:01 UTC
ab6c6d0 Pablo Prietz 18 January 2017, 13:20:38 UTC Default to `glfw` lib instead of `glfw3` for macOS; add deprecation warning 18 January 2017, 13:20:38 UTC
6662dc8 Pablo Prietz 18 January 2017, 09:55:45 UTC Replace Python 2.7 `super(class, self)` occurrences with Python 3 `super()` Used Sublime Text Regex-replace `super\(.*, ?self\)` with `super()` 18 January 2017, 09:55:45 UTC
601f469 Pablo Prietz 18 January 2017, 09:42:28 UTC Fix missing cleanup, fix NoneType error in NDSI backend 18 January 2017, 09:42:28 UTC
cc8d224 Pablo Prietz 16 January 2017, 17:21:09 UTC Fix #585 by also looking for library `glfw` if `glfw3` is not found 16 January 2017, 17:25:39 UTC
15d87a1 Pablo Prietz 16 January 2017, 17:21:09 UTC Fix #585 by also looking for library `glfw` if `glfw3` is not found 16 January 2017, 17:21:09 UTC
56bbf50 Pablo Prietz 16 January 2017, 16:11:08 UTC Reapply PEP 8 changes 16 January 2017, 16:11:08 UTC
ff1485c Pablo Prietz 16 January 2017, 16:08:26 UTC Merge pull request #5 from marc-tonsen/blink-papr Blink papr 16 January 2017, 16:08:26 UTC
dbc3b36 Marc Tonsen 16 January 2017, 16:05:06 UTC Updated Copiright notice 16 January 2017, 16:05:06 UTC
5412334 Pablo Prietz 16 January 2017, 16:04:15 UTC Revert "Update plugin doc string and move `history` creation to history length setter" This reverts commit 3454ef3714681b7a3294f5b49084a2da3ff37f7a. 16 January 2017, 16:04:15 UTC
397ebaf Marc Tonsen 16 January 2017, 15:44:54 UTC Merge with papr's prior commit 16 January 2017, 15:57:43 UTC
561bb09 mkassner 16 January 2017, 15:56:36 UTC Merge pull request #565 from cpicanco/rename Rename visualization plugins as such 16 January 2017, 15:56:36 UTC
dcde2a4 cpicanco 16 January 2017, 15:30:46 UTC Merge branch 'master' of https://github.com/pupil-labs/pupil into rename - rename branch from https://github.com/cpicanco/pupil Conflicts: pupil_src/player/exporter.py pupil_src/player/main.py 16 January 2017, 15:30:46 UTC
ea2fe96 Pablo Prietz 13 January 2017, 11:11:50 UTC Plugin.py PEP changes 13 January 2017, 11:11:50 UTC
fd340a5 Pablo Prietz 13 January 2017, 11:04:58 UTC Remove Show_Calibration from Player plugin list 13 January 2017, 11:04:58 UTC
3454ef3 Pablo Prietz 13 January 2017, 10:50:23 UTC Update plugin doc string and move `history` creation to history length setter 13 January 2017, 10:50:23 UTC
0356a99 Pablo Prietz 13 January 2017, 10:39:30 UTC Code improvements - PEP 8 changes - header update - create blink filter when `history_length` changes only 13 January 2017, 10:39:30 UTC
60f60c4 Will Patera 13 January 2017, 10:16:02 UTC shared modules do not exist unless appended to path Move `sys.path.append` so that it precedes the imports of file_methods or other shared_modules 13 January 2017, 10:16:02 UTC
3e67c22 Will Patera 13 January 2017, 10:14:23 UTC python3 fixes - print requires parens 13 January 2017, 10:14:23 UTC
75b83be Marc Tonsen 13 January 2017, 08:59:18 UTC Cherry pick blink detector into current master branch copy 13 January 2017, 09:42:24 UTC
3b3db32 Pablo Prietz 13 January 2017, 09:31:53 UTC Code layout changes 13 January 2017, 09:31:53 UTC
50cd3bf Will Patera 13 January 2017, 05:13:45 UTC updating `.bat` file for Pupil Player on Windows 13 January 2017, 05:13:45 UTC
58ad395 Will 13 January 2017, 05:11:07 UTC Merge pull request #574 from PolynomialDivision/PolynomialDivision-patch-batchscript Update Pupil Capture `.bat` script for Windows to add pupil_external `.dll`s to the system path only for the current cmd prompt session. 13 January 2017, 05:11:07 UTC
72ec146 mkassner 11 January 2017, 17:14:22 UTC Merge pull request #578 from papr/nonblock Resolve merge conflicts 11 January 2017, 17:14:22 UTC
3acb813 Pablo Prietz 11 January 2017, 16:55:46 UTC Merge remote-tracking branch 'pupil-labs/non_blocking_capture' into nonblock # Conflicts: # pupil_src/capture/world.py # pupil_src/player/eye_video_overlay.py # pupil_src/player/main.py 11 January 2017, 16:55:46 UTC
e6ee25b Pablo Prietz 11 January 2017, 16:39:01 UTC Resolve merge conflicts 11 January 2017, 16:39:01 UTC
e39a3e2 Moritz Kassner 11 January 2017, 16:34:30 UTC fixed merge conflict 11 January 2017, 16:34:30 UTC
36e2048 Pablo Prietz 11 January 2017, 15:55:22 UTC Resolve ndsi_backend merge conflicts 11 January 2017, 15:55:22 UTC
87f90f2 Moritz Kassner 11 January 2017, 15:44:57 UTC fixed merge conflict 11 January 2017, 15:44:57 UTC
e450650 Moritz Kassner 11 January 2017, 15:36:53 UTC use refresh method from eye window in world window as well. 11 January 2017, 15:36:53 UTC
6e27231 Moritz Kassner 11 January 2017, 15:31:10 UTC adding un-merged files with conflicts. Please fix! 11 January 2017, 15:31:10 UTC
3f0b838 Moritz Kassner 11 January 2017, 15:30:12 UTC Merge branch 'master' into non_blocking_capture Conflicts: pupil_src/capture/eye.py pupil_src/capture/recorder.py pupil_src/capture/world.py pupil_src/player/eye_video_overlay.py pupil_src/player/main.py pupil_src/shared_modules/plugin.py pupil_src/shared_modules/video_capture/__init__.py pupil_src/shared_modules/video_capture/ndsi_backend.py pupil_src/shared_modules/video_capture/uvc_backend.py 11 January 2017, 15:30:12 UTC
f81dc5c mkassner 11 January 2017, 14:09:10 UTC Merge pull request #570 from pupil-labs/python3_opencv3_merged Python3 and OpenCV3 11 January 2017, 14:09:10 UTC
5cebb8e Moritz Kassner 11 January 2017, 14:08:32 UTC Merge branch 'master' into python3_opencv3_merged Conflicts: pupil_src/shared_modules/show_calibration.py 11 January 2017, 14:08:32 UTC
54ef325 mkassner 11 January 2017, 14:05:54 UTC Merge pull request #577 from papr/python3_opencv3_merged Last PEP 8 changes before merge 11 January 2017, 14:05:54 UTC
7563015 Pablo Prietz 11 January 2017, 13:35:23 UTC Merge pull request #576 from papr/non_blocking_capture Burn-in test changes 11 January 2017, 13:35:23 UTC
6d480ee Pablo Prietz 11 January 2017, 13:31:40 UTC Rename burn-in test trigger message. Fixing unreferenced frame variable in eye.py. 11 January 2017, 13:31:40 UTC
8cdfa33 Pablo Prietz 11 January 2017, 13:05:38 UTC Rebase local branch to upstream 11 January 2017, 13:05:38 UTC
078a8b4 Pablo Prietz 09 January 2017, 17:42:42 UTC Burn-in test changes 11 January 2017, 13:04:45 UTC
a349eb4 Pablo Prietz 11 January 2017, 12:59:30 UTC PEP 8 changes 11 January 2017, 12:59:30 UTC
5941948 Pablo Prietz 09 January 2017, 16:02:47 UTC Basic Python 3 changes. Full changes will be done with merge of non_blocking_capture 11 January 2017, 12:48:42 UTC
e740c5c Moritz Kassner 06 January 2017, 16:18:19 UTC improving on the fix. 06 January 2017, 16:18:19 UTC
680de43 Will Patera 06 January 2017, 04:57:29 UTC Fix for ValueError `too many values to unpack` Strange error, because `cv2.mean(marker_gray)` should always return an array with more than one value, but on my macBook Air I get `ValueError: too many values to unpack (expected 2)`. I had not encountered this error previously so maybe we can refer this change later if desired because `avg[0]` is not so pythonic. 06 January 2017, 04:57:29 UTC
5cd87ff Will Patera 06 January 2017, 04:54:51 UTC adding default positions non-fullscreen calibration window This fixes issues on Windows with menu bar being hidden if `y < 31` 06 January 2017, 04:54:51 UTC
cf96d62 Will Patera 06 January 2017, 04:52:37 UTC fixing typo removed extra `}` 06 January 2017, 04:52:37 UTC
7ca817b Polynomdivision 05 January 2017, 15:43:10 UTC Fix batch script for Windows The batch script wasn't working. I have to do something like this. 05 January 2017, 15:43:10 UTC
92a4776 mkassner 05 January 2017, 13:27:59 UTC Merge pull request #573 from papr/python3_opencv3_merged Update string formatting from `%` to `.format`. Some PEP 8 changes. 05 January 2017, 13:27:59 UTC
5f526fa Pablo Prietz 05 January 2017, 10:33:58 UTC Make use of pyzmq `*_string` methods in pupil_remote. PEP 8 changes. 05 January 2017, 10:33:58 UTC
986a658 Pablo Prietz 04 January 2017, 16:53:31 UTC Fix bugs introduced by previous commit, potential part 1 04 January 2017, 16:53:31 UTC
244378f Pablo Prietz 04 January 2017, 16:41:45 UTC Merge branch 'python3_opencv3_merged' of https://github.com/pupil-labs/pupil into python3_opencv3_merged 04 January 2017, 16:41:45 UTC
d3cadf9 Pablo Prietz 04 January 2017, 16:41:38 UTC Update string formatting from `%` to `.format`. Some PEP 8 changes. 04 January 2017, 16:41:38 UTC
89e1d14 Moritz Kassner 04 January 2017, 09:21:42 UTC fixing pupil groups internal threadpipe to work with unicde strings. 04 January 2017, 09:21:42 UTC
7361b4a Will Patera 04 January 2017, 08:18:15 UTC removing `//` floor divide operator 04 January 2017, 08:18:15 UTC
0468e81 Will Patera 04 January 2017, 03:50:42 UTC Floor division `//` only returns `int` if **both** terms are `int` If one term is a float, then the result will also be a float with the `//` floor division operator. For example `7 // 3 = 2` **but** `8.0 // 2 = 4.0` Summary - must explicitly cast as `int()` 04 January 2017, 03:50:42 UTC
5de1609 Moritz Kassner 03 January 2017, 09:45:01 UTC Merge branch 'python3_opencv3_merged' of https://github.com/pupil-labs/pupil into python3_opencv3_merged 03 January 2017, 09:45:01 UTC
e613a46 Moritz Kassner 03 January 2017, 09:44:23 UTC PEP 238 -- "Changing the Division Operator" recommends to use the `//` operator when the output should be an int and the inputs were ints. This looks cleaner than converting to int afterwards. 03 January 2017, 09:44:23 UTC
18a3e3a Will Patera 03 January 2017, 09:34:30 UTC @mkassner's merge with @papr's PR was not so good reapplying commit b3f0f95 Removing `Version_Format` patch 03 January 2017, 09:34:30 UTC
4639f7f Moritz Kassner 03 January 2017, 09:21:54 UTC I think making it conform to 80 char width really destroys readability. I have relaxed this constraint. 03 January 2017, 09:21:54 UTC
7bb3633 Moritz Kassner 03 January 2017, 09:12:48 UTC Merge branch 'python3_opencv3_merged' into python3_opencv3_merged_papr Conflicts: pupil_src/capture/eye.py 03 January 2017, 09:12:48 UTC
b3f0f95 Will Patera 03 January 2017, 04:02:03 UTC remove VersionFormat monkey patch. **Note** this will break with version strings that are not purely numerical; e.g. `v0.8.7-w` will not be valid and will cause Pupil to fail without this patch. While version strings like `v0.8.7-w` are valid according to semantic versioning, it is not properly parsed with `distutils.version` with `LooseVersion`. Pupil Developers must therefore establish a convention to use only numerical version formats if we take this path; e.g. `v0.8.7.1` with no alpha chars. See http://semver.org/ for reference on valid formats. 03 January 2017, 04:02:03 UTC
07151e6 Pablo Prietz 02 January 2017, 17:14:50 UTC PEP 8 all the things. Part 1 02 January 2017, 17:14:50 UTC
42fc158 Pablo Prietz 02 January 2017, 17:10:55 UTC Merge branch 'python3_opencv3_merged' of https://github.com/pupil-labs/pupil into python3_opencv3_merged 02 January 2017, 17:10:55 UTC
da46141 Moritz Kassner 02 January 2017, 16:03:27 UTC removed MonkeyPatched import 02 January 2017, 16:03:27 UTC
7fd6f9a Pablo Prietz 02 January 2017, 16:03:02 UTC Update zmq_tools to py3 and PEP 8 02 January 2017, 16:03:02 UTC
ea4ba25 Moritz Kassner 02 January 2017, 16:02:54 UTC remove import statement 02 January 2017, 16:02:54 UTC
a42f8b6 Moritz Kassner 02 January 2017, 15:59:41 UTC refactor import 02 January 2017, 15:59:41 UTC
34e7510 Moritz Kassner 02 January 2017, 15:51:15 UTC consolidate imports into one line 02 January 2017, 15:51:15 UTC
a68cb60 Moritz Kassner 02 January 2017, 15:47:57 UTC remove __future__import 02 January 2017, 15:47:57 UTC
3768c9e Moritz Kassner 02 January 2017, 15:47:09 UTC remove Version_Format Monkey Patch 02 January 2017, 15:47:09 UTC
879028a Moritz Kassner 02 January 2017, 15:35:39 UTC make the service executable check simpler. Refactor the dict iteration for notifications. 02 January 2017, 15:35:39 UTC
e8d7eae Moritz Kassner 02 January 2017, 15:22:18 UTC cosmetics 02 January 2017, 15:22:18 UTC
5715bc7 Moritz Kassner 02 January 2017, 15:22:14 UTC fixing #556 02 January 2017, 15:22:14 UTC
17db6be Moritz Kassner 02 January 2017, 15:16:17 UTC comment improvements. 02 January 2017, 15:16:17 UTC
4426258 Moritz Kassner 02 January 2017, 14:44:38 UTC finalising zmq data type conventions for python 3. In case of string always use UNICODE. Serialized payloads are type agnostic. Adding typing info to doc strings for send and recv fns. 02 January 2017, 14:44:38 UTC
704fb47 mkassner 02 January 2017, 14:10:37 UTC Merge pull request #569 from pupil-labs/2017_header_changes 2017 header changes 02 January 2017, 14:10:37 UTC
f44d0bf Moritz Kassner 02 January 2017, 14:09:42 UTC removed broken headers. 02 January 2017, 14:09:42 UTC
88714b3 Moritz Kassner 02 January 2017, 14:06:26 UTC updating licence headers. Happy 2017! 02 January 2017, 14:06:26 UTC
522679d Moritz Kassner 02 January 2017, 14:06:02 UTC updating header script to 2017. Refactor logic and made license text PEP8 conform. 02 January 2017, 14:06:02 UTC
9c01b2a Will Patera 02 January 2017, 05:10:44 UTC add None for required args `cameraMatrix` and `distCoeffs` 02 January 2017, 05:10:44 UTC
09a3418 Will Patera 02 January 2017, 04:18:07 UTC move calibration pattern window to y = 31 for Windows at y = 0 a window on Windows os will not have accessible menu bar 02 January 2017, 04:18:07 UTC
3f7bbc4 Will Patera 02 January 2017, 04:17:08 UTC set plugin window default positions for platforms 02 January 2017, 04:17:08 UTC
2146b69 Will Patera 02 January 2017, 02:44:14 UTC fixing import syntax for accuracy test and adjust calibration plugins 02 January 2017, 02:44:14 UTC
8d671b2 Will Patera 02 January 2017, 02:36:51 UTC opencv3 method name changed to `findCirclesGrid` 02 January 2017, 02:36:51 UTC
3fb0867 Will Patera 02 January 2017, 02:28:07 UTC fix for future depreciation warning VisibleDeprecationWarning: using a non-integer number instead of an integer will result in an error in the future 02 January 2017, 02:28:07 UTC
7475ad6 Will Patera 02 January 2017, 02:25:50 UTC python3 division returns float types for division indices must be ints - cast explicitly 02 January 2017, 02:25:50 UTC
c0965a2 Will Patera 02 January 2017, 02:25:19 UTC Python3 division returns floats by default - opencv requires ints 02 January 2017, 02:25:19 UTC
8ef8ea5 cpicanco 24 December 2016, 18:43:20 UTC exchange vis_eye_video_overlay from analysis to visualization container 24 December 2016, 18:43:20 UTC
back to top