Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract pupil_detectors into a separate repo #1642

Merged
merged 49 commits into from Dec 12, 2019
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c0867e0
Extract pupil_detectors into a separate repo
romanroibu Sep 17, 2019
191e8d6
Update eye.py to use the new Detector_2D_Plugin class
romanroibu Sep 19, 2019
6388473
Add PupilDetectorManager to eye.py
romanroibu Sep 20, 2019
37d7dab
Use PupilDetectorManager instance in eye.py
romanroibu Sep 20, 2019
5e17b59
Remove debug print statement
romanroibu Sep 23, 2019
9dca2e4
Fix PupilDetectorManager.activate_detector_by_name plugin_name argument
romanroibu Sep 23, 2019
7c050ce
Update eye.py to use the latest Plugin API for PupilDetectorPlugin
romanroibu Sep 23, 2019
2b40880
Merge branch 'master' into extract-pupil-detectors
papr Oct 15, 2019
cc1b23b
Move Pupil Manager into separate file
papr Oct 15, 2019
412d114
Move plugin code from detectors repo back to pupil
papr Oct 15, 2019
23458dc
Load pupil detector plugins and manager as plugins
papr Oct 15, 2019
dfda577
Move detector/manager specific code to according classes
papr Oct 15, 2019
9aa2681
eye.py: Use plugin api properly
papr Oct 15, 2019
c9b9f30
Roi: Remove unnecessary view setter
papr Oct 15, 2019
3ea6bed
Use g_pool.flip if available in base source
papr Oct 15, 2019
1098ca4
Use correct detector base class
papr Oct 15, 2019
81aedf1
Detector plugins + manager: Fix variable names
papr Oct 15, 2019
aab3555
Set DetectorPlugin.detect(frame) as interface
papr Oct 15, 2019
1d3dad6
Sort imports
papr Oct 15, 2019
a1eaa2f
Detector 3d plugin: Use correct api
papr Oct 15, 2019
3f868fb
Apply black
papr Oct 15, 2019
fd25f54
Detector 2d plugin: Set correct label/identifier
papr Oct 15, 2019
00aae53
PupilDetectorPlugin: Document label/identifier
papr Oct 15, 2019
7df0be4
Detector 3d plugin: Fix missing key and use coorect method call
papr Oct 15, 2019
3d85dec
Fix Detector 2d Plugin
papr Oct 15, 2019
5629e6f
Fix Detector Dummy Plugin
papr Oct 15, 2019
8cb49fd
Fix roi+algorithm view
papr Oct 16, 2019
fa4552b
Move pupil+eyeball outline drawing into visualizer2d and call from de…
papr Oct 16, 2019
9738c0f
Fix crash when selecting 2D detector
pfaion Oct 16, 2019
da283c7
Fix incorrect parameters for changing properties via network
pfaion Oct 17, 2019
5dfd6b4
Add early-exit to handle_set_property_notification
pfaion Oct 17, 2019
a5e5d79
Add better error handling for set_property for roi
pfaion Oct 17, 2019
5a0040b
Fix broken roi update logic when setting via network
pfaion Oct 17, 2019
edd7d45
Improve formatting
pfaion Oct 17, 2019
03642eb
Handle 'nan' values in pupil visualizations better
pfaion Oct 17, 2019
f9e0cc9
Remoe singleeyefitter dependency from calibration module
papr Oct 21, 2019
2fd5a35
Merge branch 'extract-pupil-detectors' of github.com:romanroibu/pupil…
papr Oct 21, 2019
31ba31b
Remove dead UI code
pfaion Nov 4, 2019
0f5b454
Remove dead UI code
pfaion Nov 4, 2019
f7fa3eb
Replace detector API
pfaion Nov 4, 2019
8cb24d1
Hookup detector UI via new PropertyProxy
pfaion Nov 4, 2019
3d947d7
Remove unused method
pfaion Nov 4, 2019
5e46637
Fix broken on_resolution_change
pfaion Nov 4, 2019
24b263b
Move imports to top of the file
pfaion Dec 9, 2019
5d3718c
Improve variable names
pfaion Dec 9, 2019
768ab4c
Add review suggestion for improved readability
pfaion Dec 9, 2019
f56efdc
Merge branch 'develop' into extract-pupil-detectors
pfaion Dec 9, 2019
edc943b
Merge branch 'develop' into extract-pupil-detectors
papr Dec 11, 2019
759bc3e
Don't build detectors anymore
papr Dec 11, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Update eye.py to use the latest Plugin API for PupilDetectorPlugin

  • Loading branch information
romanroibu committed Sep 23, 2019
commit 7c050ce5f9358b9d3f4aa5f40907f150b9c69f11
@@ -745,6 +745,7 @@ def window_should_update():
ipc_socket.notify(properties_broadcast)
g_pool.capture.on_notify(notification)
g_pool.capture_manager.on_notify(notification)
pupil_detector_manager.active_detector.on_notify(notification)

# Get an image from the grabber
event = {}
@@ -805,10 +806,8 @@ def window_should_update():
if g_pool.writer:
g_pool.writer.write_video_frame(frame)

# pupil ellipse detection
result = pupil_detector_manager.active_detector.detect(
frame, g_pool.u_r, g_pool.display_mode == "algorithm"
)
pupil_detector_manager.active_detector.recent_events(event)
result = event.get("pupil_detection_result", None)
if result is not None:
result["id"] = eye_id
result["topic"] = "pupil.{}".format(eye_id)
@@ -907,7 +906,7 @@ def window_should_update():

make_coord_system_pixel_based((*window_size[::-1], 3), g_pool.flip)

pupil_detector_manager.active_detector.visualize() # detector decides if we visualize or not
pupil_detector_manager.active_detector.gl_display() # detector decides if we visualize or not

# update screen
glfw.glfwSwapBuffers(main_window)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.