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 |
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 |
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 |
0e9ad81 | Will Patera | 22 December 2016, 04:45:42 UTC | remove forking_enable from batch exporter already specified by video_export_launcher | 22 December 2016, 04:45:42 UTC |
7db5265 | Will | 20 December 2016, 03:17:46 UTC | Merge pull request #554 from papr/p3 Merging this PR for testing on the VM. | 20 December 2016, 03:17:46 UTC |
2b87577 | Pablo Prietz | 19 December 2016, 11:04:32 UTC | Python 3 compatibility -- recv_string | 19 December 2016, 11:04:32 UTC |
e224c3d | Will Patera | 16 December 2016, 05:40:44 UTC | python3 `.keys()` does not return a list, but a `dict_keys` object wrap this in a list if you want call by indices | 16 December 2016, 05:40:44 UTC |
6b0f44d | Will Patera | 16 December 2016, 05:34:46 UTC | remove depreciated import pupil_sync no longer exists | 16 December 2016, 05:34:46 UTC |
ae4a909 | Will Patera | 15 December 2016, 07:07:13 UTC | fix python3 import | 15 December 2016, 07:07:13 UTC |
e167b5a | Will Patera | 15 December 2016, 04:56:29 UTC | more python3 fixes for pupil remote | 15 December 2016, 04:56:29 UTC |
03f39fe | Will Patera | 15 December 2016, 04:37:48 UTC | python3 utf-8 encoding for response | 15 December 2016, 04:37:48 UTC |
5043ede | Will Patera | 15 December 2016, 03:59:23 UTC | python3 utf-8 decoding for msgs received via socket also, prefixing split char with `b` | 15 December 2016, 03:59:23 UTC |
b8c63e9 | Will Patera | 15 December 2016, 03:42:20 UTC | python3 utf-8 decoding for ui strings | 15 December 2016, 03:42:20 UTC |
2e0e486 | mkassner | 14 December 2016, 16:52:57 UTC | Merge pull request #548 from papr/p3 Remove deprecated dict iter* methods | 14 December 2016, 16:52:57 UTC |
67d0290 | Pablo Prietz | 14 December 2016, 16:50:55 UTC | Fixes #547 | 14 December 2016, 16:50:55 UTC |
c6ea900 | Will Patera | 14 December 2016, 10:21:17 UTC | python3 utf-8 encoding and newline='' for csv file writing | 14 December 2016, 10:21:17 UTC |
09afc8a | Will Patera | 14 December 2016, 10:19:21 UTC | python3 utf-8 encoding and newline='' for csv file writing | 14 December 2016, 10:19:21 UTC |
7598bfd | Will Patera | 14 December 2016, 10:03:28 UTC | try casting filter_size as int for opencv fn arg | 14 December 2016, 10:03:28 UTC |
971f463 | Will Patera | 14 December 2016, 09:53:20 UTC | try casting std_dev as float for opencv3 GaussianBlur arg | 14 December 2016, 09:53:20 UTC |
482898e | Will Patera | 14 December 2016, 09:45:58 UTC | overriding VersionFormat `_cmp` method support for sem. ver comparisons like: `VersionFormat(‘0.8.7.120) > VersonFormat(‘0.8.7.w.1’)` | 14 December 2016, 09:45:58 UTC |
c4fdb0b | Will Patera | 14 December 2016, 09:39:09 UTC | python3 replacing `xrange` with `range` and ensuring that arguments for range are ints not floats | 14 December 2016, 09:39:09 UTC |
4fd348f | Will Patera | 14 December 2016, 09:26:54 UTC | indices must be ints not floats | 14 December 2016, 09:26:54 UTC |
95d5649 | Will Patera | 14 December 2016, 08:03:36 UTC | opencv3 var namespace and var name update | 14 December 2016, 08:03:36 UTC |
d747001 | Will Patera | 14 December 2016, 05:33:59 UTC | fix extra newlines in csv files with `newline=''` | 14 December 2016, 05:33:59 UTC |
1a4c173 | Will Patera | 14 December 2016, 05:23:17 UTC | set encoding of csv to utf-8 | 14 December 2016, 05:23:17 UTC |
66a7bc0 | Will Patera | 14 December 2016, 04:54:49 UTC | python3 change cast dict.values() to list | 14 December 2016, 04:54:49 UTC |
012f1ff | Will Patera | 14 December 2016, 04:44:14 UTC | fix forking for Win bundle | 14 December 2016, 04:44:14 UTC |
7747efa | Will Patera | 14 December 2016, 04:31:03 UTC | add `np_dll_list` to coll in bundle.spec | 14 December 2016, 04:31:03 UTC |
d04f6cf | Will Patera | 14 December 2016, 04:23:51 UTC | add numpy to imports in bundle.spec player bundle crashes with plugins that use multiprocessing like offline surface detector or fixation detector 3d | 14 December 2016, 04:23:51 UTC |
42569fa | Will Patera | 14 December 2016, 04:18:26 UTC | try adding numpy binaries to fix missing dll in bundle `mkl_intel_thread.dll` | 14 December 2016, 04:18:26 UTC |
36c979a | Will Patera | 14 December 2016, 03:43:54 UTC | import Calibration_Visualizer explicitly this way it does not require a prefix | 14 December 2016, 03:43:54 UTC |
a8c2add | Will Patera | 14 December 2016, 03:20:29 UTC | try to remove the `b` bytes prefix in front of string Also fixing typo `localy` to `locally` | 14 December 2016, 03:20:29 UTC |
9e22001 | Will Patera | 14 December 2016, 03:10:49 UTC | range expects an int not float | 14 December 2016, 03:10:49 UTC |
18e6a17 | Will Patera | 14 December 2016, 03:04:56 UTC | opencv3 update argument required for `next_pts` Here we set `next_pts` to `None` | 14 December 2016, 03:04:56 UTC |
54d6591 | Will Patera | 14 December 2016, 02:58:27 UTC | fix namespace conflict OpenGL * import will import a method named `platform` Therefore we make explicit import `from platform import system` | 14 December 2016, 02:58:27 UTC |
9a76f64 | Will Patera | 14 December 2016, 02:41:25 UTC | attempt to fix multiprocessing RuntimeError on Win Windows complains that 'context has already been set' Try wrapping this macOS specific forking instruction to bypass error | 14 December 2016, 02:41:25 UTC |
77c13ba | Will Patera | 14 December 2016, 02:15:16 UTC | opencv3 findContours returns 3 values - opencv2 findContours returns contours and hierarchy - opencv3 findContours returns img, contours, and hierarchy - could be made opencv2/3 compatible by slicing the return [-2:] | 14 December 2016, 02:15:16 UTC |
feb1851 | Will Patera | 13 December 2016, 10:48:46 UTC | fixes typo in player_methods closes #545 Rebundle pupil player for v0.8.7 or bump tag | 13 December 2016, 10:48:46 UTC |
0b93753 | Will Patera | 13 December 2016, 10:46:27 UTC | fixing v086 to v087 updater | 13 December 2016, 10:46:27 UTC |
c842975 | Will Patera | 13 December 2016, 09:11:06 UTC | set default window pos for player based on platform specific settings | 13 December 2016, 09:11:06 UTC |
4d3eca5 | Will Patera | 13 December 2016, 09:08:37 UTC | python3 changes for player file handling methods | 13 December 2016, 09:08:37 UTC |
5b9d7f0 | Will Patera | 13 December 2016, 08:26:23 UTC | python3 syntax change exception except requires parens for multiple exceptions | 13 December 2016, 08:26:23 UTC |
19e3edb | Moritz Kassner | 13 December 2016, 08:17:15 UTC | Merge branch 'master' into python3_opencv3 Conflicts: pupil_src/player/eye_video_overlay.py pupil_src/shared_modules/pupil_remote.py pupil_src/shared_modules/video_capture/ndsi_backend.py | 13 December 2016, 08:17:15 UTC |
fa7f0ce | Will Patera | 13 December 2016, 05:08:14 UTC | workaround to make window menu visible in Windows | 13 December 2016, 05:08:14 UTC |
6b4d17e | Will Patera | 13 December 2016, 05:06:53 UTC | add UI platform tweaks to player making a glfw window at (0,0) on windows will hide its menu bar (making it inaccessible) these are tweaks to enable usable menus on Windows | 13 December 2016, 05:06:53 UTC |
5f4cbe3 | Will Patera | 13 December 2016, 04:36:07 UTC | set `newline=''` for csv files Test to see if this will solve issues on Windows | 13 December 2016, 04:36:07 UTC |
c695267 | Will Patera | 12 December 2016, 08:53:42 UTC | change var name `libs_2d` to `libs` add `ceres` to mac/linux | 12 December 2016, 08:53:42 UTC |
3ad034e | Will Patera | 12 December 2016, 08:04:50 UTC | include `ceres` in libs list | 12 December 2016, 08:04:50 UTC |
f85da70 | Will Patera | 12 December 2016, 08:04:33 UTC | remove unused var `eigen_include_win` | 12 December 2016, 08:04:33 UTC |
1641965 | Will Patera | 12 December 2016, 08:04:09 UTC | remove whitespace :nail_care: | 12 December 2016, 08:04:09 UTC |
d2163a0 | Will Patera | 12 December 2016, 08:03:52 UTC | remove undeclared var `eigen_include_win` | 12 December 2016, 08:03:52 UTC |
080b849 | Will | 12 December 2016, 05:09:48 UTC | Merge pull request #542 from pointcontrols/python3_opencv3 🎆 Pupil is back up and running on Windows 10 🎆 TODO General (Pupil Capture, Player, Service) - Fix GLFW window position. Windows that spawn at (0,0) will not have an accessible menu bar on Windows and therefore can not be moved or closed via Windows GUI. Need a workaround. - Bundle - Set bundle flags to launch without `cmd prompt` in Windows - Deployment - make Windows installer/shortcut - Add `.bat` files for `bundle_capture`, `bundle_player`, and `bundle_service` - Link 3rd party `.dll`s? for the `pupil_external` directory? What is the best method for distribution and versioning here? Pupil Capture - `ceres-solver` on Windows seems slower compared to Linux and macOS. Are we compiling in debug mode? Can this be optimized Pupil Player (currently not loading recordings) - Debug loading in `file_methods.py` - recordings are not loading in Pupil Player on Windows with this branch. This is likely related to differences in paths in Windows vs Unix systems. Make sure we are using `os.path.sep` and `os.path.join` appropriately. This could also be related to python3 str->bytes issues that are not yet handled. | 12 December 2016, 05:09:48 UTC |
fabbf57 | Will Patera | 12 December 2016, 04:51:14 UTC | do not load Fixation detector by default This plugin should be loaded only if user wants this plugin | 12 December 2016, 04:51:14 UTC |
0e286e3 | Will Patera | 12 December 2016, 04:50:21 UTC | fix strings->bytes for python3 Pupil Remote is Working :smile: | 12 December 2016, 04:50:21 UTC |