| 37463f9 | Moritz Kassner | 16 February 2015, 08:40:31 UTC | simplified implementation of pupil diameter graph and moved it out of canny detector as it is not specific to it. | 16 February 2015, 08:40:31 UTC |
| 8af47fe | Will Patera | 16 February 2015, 04:16:00 UTC | Added apparent pupil diameter graph in eye.py. Can be turned on/off in the pupil detector gui menu. In this implementation, the diameter graph is only updated if the confidence of the result is > 0. (Potential) Todo: - make the range of the graph dynamic such that if Pupil min/max is changed then the min/max of the graph is also updated. Another option would be to add a single red horizontal line to show the current min/max on top of the graph as defined by the user -- however this may be redundant, as it can be seen in the algorithm view. | 16 February 2015, 04:16:00 UTC |
| 7d3c70f | Moritz Kassner | 15 February 2015, 15:39:13 UTC | small fixes to performance graph update in player. | 15 February 2015, 15:39:13 UTC |
| 0212b35 | Moritz Kassner | 15 February 2015, 15:00:26 UTC | allow plugin to be persistent | 15 February 2015, 15:00:26 UTC |
| b32ecc1 | Moritz Kassner | 15 February 2015, 14:59:51 UTC | typo fix | 15 February 2015, 14:59:51 UTC |
| b403da0 | Moritz Kassner | 15 February 2015, 14:59:39 UTC | changed logging level because we do use the fn regularly now. | 15 February 2015, 14:59:39 UTC |
| 56b6110 | Moritz Kassner | 15 February 2015, 14:03:29 UTC | added call to deal with offscreen menus. | 15 February 2015, 14:03:29 UTC |
| 5d1e27f | Moritz Kassner | 15 February 2015, 14:03:12 UTC | removed debug print | 15 February 2015, 14:03:12 UTC |
| a6ecaab | Michael Barz | 13 February 2015, 17:45:53 UTC | reset world | 13 February 2015, 17:45:53 UTC |
| 0b8a2cd | Michael Barz | 13 February 2015, 17:33:20 UTC | interface for pyvideoinput | 13 February 2015, 17:33:20 UTC |
| 638be27 | Moritz Kassner | 13 February 2015, 16:55:49 UTC | removed atb imports. | 13 February 2015, 16:55:49 UTC |
| b1ee1e8 | Moritz Kassner | 13 February 2015, 16:52:18 UTC | merged file | 13 February 2015, 16:52:18 UTC |
| dda4380 | Moritz Kassner | 13 February 2015, 16:49:16 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 13 February 2015, 16:49:16 UTC |
| 369ac03 | Moritz Kassner | 13 February 2015, 16:49:05 UTC | incremantal commit | 13 February 2015, 16:49:05 UTC |
| 689561d | Michael Barz | 13 February 2015, 16:47:48 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil.git into v0.4_restruct Conflicts: pupil_src/shared_modules/marker_auto_trim_marks.py | 13 February 2015, 16:47:48 UTC |
| 6a38846 | Moritz Kassner | 13 February 2015, 16:35:04 UTC | updated filter fixation ui | 13 February 2015, 16:35:04 UTC |
| eb760e5 | Moritz Kassner | 13 February 2015, 16:34:47 UTC | removed atb | 13 February 2015, 16:34:47 UTC |
| 679607d | Moritz Kassner | 13 February 2015, 16:34:28 UTC | removed confused windows binaries | 13 February 2015, 16:34:28 UTC |
| 1be141f | Moritz Kassner | 13 February 2015, 16:23:26 UTC | added purge option for plugins in player | 13 February 2015, 16:23:26 UTC |
| 07cc64d | Moritz Kassner | 12 February 2015, 09:32:29 UTC | cosmetics | 12 February 2015, 09:32:29 UTC |
| 047153a | Moritz Kassner | 12 February 2015, 09:28:59 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 12 February 2015, 09:28:59 UTC |
| 9f443c2 | Moritz Kassner | 12 February 2015, 09:28:47 UTC | updated exporters | 12 February 2015, 09:28:47 UTC |
| 4c85c4c | Will Patera | 12 February 2015, 06:50:25 UTC | cosmetics - changes to vis cross and setting defaults (see last commit for more detail) | 12 February 2015, 06:50:25 UTC |
| 637d7a9 | Will Patera | 12 February 2015, 04:50:38 UTC | cosmetics - if we're going to be working in the range of 0-255, then the initial settings should be within that range. Min setting should also be 0 (unless this causes bugs elsewhere?). Also, set defaults that are visible/look good (we can revise default colors at a later date for now just R for circle and G for polyline). Question - do we really want the GUI to have 0-255 range or 0.-1. range? | 12 February 2015, 04:50:38 UTC |
| b33aeae | Will Patera | 12 February 2015, 04:20:04 UTC | adding sidebar and quick bar back to world.py --- needed for testing (these lines were removed in https://github.com/pupil-labs/pupil/commit/ea1cd0097e1e21c56f3b99e5dd3a4b41b06f684c -- please explain) | 12 February 2015, 04:20:04 UTC |
| c0965fd | Will Patera | 12 February 2015, 03:59:28 UTC | incremental work - untested (as world gui does not appear...graphs appear but no gui) | 12 February 2015, 03:59:28 UTC |
| fb4acd7 | Moritz Kassner | 11 February 2015, 18:26:38 UTC | making more plugins work again. | 11 February 2015, 18:26:38 UTC |
| 4a4b178 | michael | 11 February 2015, 15:56:34 UTC | pyglui plugin update | 11 February 2015, 15:56:34 UTC |
| 01fed09 | michael | 11 February 2015, 15:08:11 UTC | color menu is collapsed by default | 11 February 2015, 15:08:11 UTC |
| 4df2d56 | Moritz Kassner | 11 February 2015, 15:04:44 UTC | added alpha to default color | 11 February 2015, 15:04:44 UTC |
| 602565e | Moritz Kassner | 11 February 2015, 15:04:16 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct Conflicts: pupil_src/player/vis_polyline.py | 11 February 2015, 15:04:16 UTC |
| 4f0683a | Moritz Kassner | 11 February 2015, 15:03:51 UTC | incremental commit | 11 February 2015, 15:03:51 UTC |
| d970e6f | michael | 11 February 2015, 15:03:12 UTC | bugfix: rgb, bgr issue | 11 February 2015, 15:03:12 UTC |
| 34fe095 | michael | 11 February 2015, 14:59:07 UTC | made vis plugins non-unique | 11 February 2015, 14:59:07 UTC |
| dd27d27 | michael | 11 February 2015, 14:49:56 UTC | Switched player plugins to scrolling menues | 11 February 2015, 14:49:56 UTC |
| bf3cddc | michael | 11 February 2015, 14:24:41 UTC | plugin updates for pyglui complete | 11 February 2015, 14:24:41 UTC |
| c986664 | michael | 11 February 2015, 14:17:15 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil.git into v0.4_restruct Conflicts: pupil_src/player/export_launcher.py | 11 February 2015, 14:17:15 UTC |
| ea1cd00 | Moritz Kassner | 11 February 2015, 14:06:29 UTC | stating to replace ATB with pyglui in player. | 11 February 2015, 14:06:29 UTC |
| 5bc5a3b | michael | 11 February 2015, 14:06:25 UTC | incremental update of player plugins -> work with pyglui | 11 February 2015, 14:06:25 UTC |
| 5ea3611 | Moritz Kassner | 11 February 2015, 08:40:08 UTC | cosmetics | 11 February 2015, 08:40:08 UTC |
| 050bef5 | Moritz Kassner | 11 February 2015, 08:28:41 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 11 February 2015, 08:28:41 UTC |
| 549fd7c | Moritz Kassner | 11 February 2015, 08:28:36 UTC | extended g_pool.plugins from a list to a self sorting list with convenience functions. | 11 February 2015, 08:28:36 UTC |
| 13df442 | Will Patera | 11 February 2015, 03:23:34 UTC | first step towards replacing movement of the marker with alpha (fade in/out). TODO - replace the interpolation function so the marker fades in/out smoothly. Could use function like y=x**2(3−2x) (domain between 0 and 1) | 11 February 2015, 03:23:34 UTC |
| 75eeae0 | Will Patera | 06 February 2015, 09:32:08 UTC | adding an alternative return option for `get_map_from_cloud` such that we can return the params as well as the mapping function. These params will be saved to the `simple_gaze_mapper` plugin. | 06 February 2015, 09:32:08 UTC |
| 326e9c0 | Will Patera | 06 February 2015, 09:14:40 UTC | updating other mapping functions to save their params with simple_gaze_mapper instead of the map_fn | 06 February 2015, 09:14:40 UTC |
| 79f7124 | Will Patera | 06 February 2015, 08:11:08 UTC | saving calibration params instead of saving the `map_fn` -- the mapping function is reconstructed on plugin init. | 06 February 2015, 08:11:08 UTC |
| f81807c | Will Patera | 06 February 2015, 05:26:21 UTC | removing import of dill | 06 February 2015, 05:26:21 UTC |
| dee7ac2 | Will Patera | 06 February 2015, 05:26:07 UTC | reverting - removing dill as pickling function. Will either save the params or modify the mapping function such that it is pickleable | 06 February 2015, 05:26:07 UTC |
| 8c21e5d | Will Patera | 06 February 2015, 05:25:06 UTC | cosmetics - typo fix in comments | 06 February 2015, 05:25:06 UTC |
| 0272900 | Will Patera | 05 February 2015, 14:42:07 UTC | Adding `dill` module to test out if we really want to pickle the map_fn in the simple gaze mapper. Currently this works, but requires `pip install dill` as an additional module. | 05 February 2015, 14:42:07 UTC |
| 572ddd3 | Will Patera | 05 February 2015, 13:01:38 UTC | save pattern scale | 05 February 2015, 13:01:38 UTC |
| c0444b2 | Will Patera | 05 February 2015, 08:04:15 UTC | `contours` or `hierarchy` are None type when the camera moves too fast and causes a crash. Adding a check and returning early with empty list if None type for either. | 05 February 2015, 08:04:15 UTC |
| 42014cf | Will Patera | 05 February 2015, 07:00:09 UTC | Added scale slider for calibration pattern. Todo - determine the max value of the slider. | 05 February 2015, 07:00:09 UTC |
| ed35b6e | Will Patera | 05 February 2015, 06:40:15 UTC | updating debug ellipses to cygl ellipses | 05 February 2015, 06:40:15 UTC |
| 75f256e | Will Patera | 05 February 2015, 06:33:14 UTC | Starting work on the screen marker calibration rendering and animation. Changed to cygl points. | 05 February 2015, 06:33:14 UTC |
| e056fe9 | Will Patera | 05 February 2015, 05:20:00 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 05 February 2015, 05:20:00 UTC |
| 4cd092d | Will Patera | 04 February 2015, 04:41:14 UTC | typo fix - changed from 'canditate' to 'candidate' (**note you will need to delete all your .pyc files in shared modules and calibration_routines otherwise python will complain -- can be done with rm -f *.pyc in the dirs affected) | 04 February 2015, 04:41:14 UTC |
| 2a2f041 | Will Patera | 30 January 2015, 13:45:01 UTC | typo fix - should be 'capture' not 'capure' | 30 January 2015, 13:45:01 UTC |
| e1fecaf | Moritz Kassner | 29 January 2015, 18:47:16 UTC | added comment | 29 January 2015, 18:47:16 UTC |
| fef0e94 | Moritz Kassner | 29 January 2015, 18:45:03 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 29 January 2015, 18:45:03 UTC |
| b341752 | Moritz Kassner | 29 January 2015, 18:44:56 UTC | add timestamps check | 29 January 2015, 18:44:56 UTC |
| d383829 | Moritz Kassner | 29 January 2015, 17:35:40 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 29 January 2015, 17:35:40 UTC |
| a35365c | Moritz Kassner | 29 January 2015, 17:35:35 UTC | removed old entry | 29 January 2015, 17:35:35 UTC |
| a292832 | Moritz Kassner | 28 January 2015, 13:58:06 UTC | removed cpu save mode as we are efficient enough now. | 28 January 2015, 13:58:06 UTC |
| ed33d5a | Moritz Kassner | 28 January 2015, 13:23:09 UTC | fixed missing move of parameter save command | 28 January 2015, 13:23:09 UTC |
| da2a99f | Moritz Kassner | 28 January 2015, 13:17:30 UTC | improved ROI interaction and removed some bugs. | 28 January 2015, 13:17:30 UTC |
| b2b2740 | Moritz Kassner | 28 January 2015, 13:17:05 UTC | reworked pupil detector guy init to make it more streamlined and consistant with capture.init_gui | 28 January 2015, 13:17:05 UTC |
| 7c8c69e | Moritz Kassner | 28 January 2015, 13:03:13 UTC | render gray image only in most modes. This saves a lot of CPU on Linux. | 28 January 2015, 13:03:13 UTC |
| 869a988 | Will Patera | 27 January 2015, 09:20:35 UTC | adding info text to the display modes. | 27 January 2015, 09:20:35 UTC |
| 860e91f | Moritz Kassner | 22 January 2015, 17:58:36 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 22 January 2015, 17:58:36 UTC |
| 48a4810 | Moritz Kassner | 26 January 2015, 13:02:07 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 26 January 2015, 13:02:07 UTC |
| cb5581f | Moritz Kassner | 26 January 2015, 13:02:02 UTC | explaining naming options in UI | 26 January 2015, 13:02:02 UTC |
| a007b7e | Will Patera | 25 January 2015, 14:03:27 UTC | cosmetics - updating readme so that image links are not broken. | 25 January 2015, 14:03:27 UTC |
| 6f983f4 | Moritz Kassner | 25 January 2015, 13:48:23 UTC | how about just getting the constant from OpenGL? We can later expose it from cygl and import from there. | 25 January 2015, 13:48:23 UTC |
| 8b67202 | Will Patera | 24 January 2015, 05:11:57 UTC | bug fix - ROI needs to have a 'line loop' not a 'line strip'. Didn't want to add a OpenGL import to eye - so created a method in gl utils to return the GL line types. This should really be updated in cygl. | 24 January 2015, 05:11:57 UTC |
| 2e2dfe2 | Moritz Kassner | 23 January 2015, 16:22:14 UTC | use cygl | 23 January 2015, 16:22:14 UTC |
| 3fb10ab | Moritz Kassner | 23 January 2015, 16:06:12 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 23 January 2015, 16:06:12 UTC |
| 008ce88 | Moritz Kassner | 23 January 2015, 14:43:45 UTC | use cygl methods | 23 January 2015, 14:43:45 UTC |
| f445acc | Will Patera | 23 January 2015, 12:03:53 UTC | removing unnecessary list comp. -- slice! | 23 January 2015, 12:03:53 UTC |
| c1d0461 | Will Patera | 23 January 2015, 11:38:10 UTC | Active ROI edit point now scales up and changes color (like the Switch) when selected | 23 January 2015, 11:38:10 UTC |
| ae4fad4 | Will Patera | 23 January 2015, 09:39:46 UTC | removed padding -- not necessary now that the ROI is rendered above/after the GUI | 23 January 2015, 09:39:46 UTC |
| 2d5276b | Moritz Kassner | 23 January 2015, 09:25:03 UTC | moved order into base class | 23 January 2015, 09:25:03 UTC |
| 474ce91 | Moritz Kassner | 23 January 2015, 09:24:46 UTC | cosmetics | 23 January 2015, 09:24:46 UTC |
| 92ce66e | Moritz Kassner | 23 January 2015, 09:09:33 UTC | improved roi interaction and rendering | 23 January 2015, 09:09:33 UTC |
| 31080bf | Moritz Kassner | 23 January 2015, 09:09:09 UTC | move U roi class into eye for ease of cycle imports. This can change later. | 23 January 2015, 09:09:09 UTC |
| 29bad3e | Moritz Kassner | 23 January 2015, 08:45:04 UTC | simplified code, removed var | 23 January 2015, 08:45:04 UTC |
| 83e506b | Moritz Kassner | 23 January 2015, 08:44:43 UTC | removed double multiplication of hdpi factor | 23 January 2015, 08:44:43 UTC |
| b952550 | Will Patera | 23 January 2015, 08:13:55 UTC | bug fix - no longer require absolute values (in fact this will cause very bad slicing behavior) | 23 January 2015, 08:13:55 UTC |
| 9381e38 | Will Patera | 23 January 2015, 07:06:00 UTC | bug fixes for ROI - changed to 4 point rectangle instead of 2 point rectangle Todo: - fix ROI handle from interfering with GUI sidebar - create overlay image in ROI display mode to emphasize the ROI area (also add this to algorithm view?) - user feedback - ROI handle should scale up when pressed | 23 January 2015, 07:06:00 UTC |
| 4142d42 | Moritz Kassner | 22 January 2015, 17:58:21 UTC | fixed wrong fn arg type | 22 January 2015, 17:58:21 UTC |
| cc79714 | Moritz Kassner | 22 January 2015, 02:53:37 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 22 January 2015, 02:53:37 UTC |
| 2340635 | Moritz Kassner | 22 January 2015, 02:53:12 UTC | use cygl texture fn | 22 January 2015, 02:53:12 UTC |
| b856646 | Moritz Kassner | 22 January 2015, 00:56:03 UTC | removed old pupil detectors | 22 January 2015, 00:56:03 UTC |
| 7d507fe | Moritz Kassner | 22 January 2015, 16:46:08 UTC | small fix | 22 January 2015, 16:46:08 UTC |
| fcdf0ea | Moritz Kassner | 22 January 2015, 16:39:05 UTC | added order to plugins | 22 January 2015, 16:39:05 UTC |
| af147ce | Will Patera | 22 January 2015, 14:55:48 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct Conflicts: pupil_src/capture/eye.py | 22 January 2015, 14:55:48 UTC |
| b664099 | Will Patera | 22 January 2015, 14:54:06 UTC | incremental work on ROI - setStart and setEnd need to be rewritten because we are no longer dragging a rectangle in one shot with a mouse, but setting the positions of corners independently. | 22 January 2015, 14:54:06 UTC |
| f5a0d8e | Moritz Kassner | 22 January 2015, 12:03:46 UTC | small fixes | 22 January 2015, 12:03:46 UTC |
| ad97a53 | Will Patera | 22 January 2015, 11:08:57 UTC | Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct | 22 January 2015, 11:08:57 UTC |
| 083ce66 | Will Patera | 22 January 2015, 11:08:48 UTC | cleaning up the ROI -- fixing bugs | 22 January 2015, 11:08:48 UTC |
