Skip to content

Commit 753a09f

Browse files
authored
load calibration plugins appropriately (pupil-labs#679)
* load calibration plugins appropriately. * Allow runtime capture managers.
1 parent 455808c commit 753a09f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

pupil_src/capture/world.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def world(timebase, eyes_are_alive, ipc_pub_url, ipc_sub_url,
9696

9797
# Plug-ins
9898
from plugin import Plugin, Plugin_List, import_runtime_plugins
99-
from calibration_routines import calibration_plugins, gaze_mapping_plugins
99+
from calibration_routines import calibration_plugins, gaze_mapping_plugins, Calibration_Plugin
100100
from fixation_detector import Fixation_Detector_3D
101101
from recorder import Recorder
102102
from display_recent_gaze import Display_Recent_Gaze
@@ -109,7 +109,7 @@ def world(timebase, eyes_are_alive, ipc_pub_url, ipc_sub_url,
109109
from log_history import Log_History
110110
from frame_publisher import Frame_Publisher
111111
from blink_detection import Blink_Detection
112-
from video_capture import source_classes, manager_classes
112+
from video_capture import source_classes, manager_classes,Base_Manager
113113
from pupil_data_relay import Pupil_Data_Relay
114114
from remote_recorder import Remote_Recorder
115115

@@ -145,6 +145,10 @@ def get_timestamp():
145145

146146
# manage plugins
147147
runtime_plugins = import_runtime_plugins(os.path.join(g_pool.user_dir, 'plugins'))
148+
calibration_plugins += [p for p in runtime_plugins if issubclass(p,Calibration_Plugin)]
149+
runtime_plugins = [p for p in runtime_plugins if not issubclass(p,Calibration_Plugin)]
150+
manager_classes += [p for p in runtime_plugins if issubclass(p,Base_Manager)]
151+
runtime_plugins = [p for p in runtime_plugins if not issubclass(p,Base_Manager)]
148152
user_launchable_plugins = [Pupil_Groups, Frame_Publisher, Pupil_Remote, Time_Sync, Surface_Tracker,
149153
Annotation_Capture, Log_History, Fixation_Detector_3D, Blink_Detection,
150154
Remote_Recorder] + runtime_plugins

pupil_src/shared_modules/calibration_routines/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from . accuracy_test import Accuracy_Test
2020
from . hmd_calibration import HMD_Calibration, HMD_Calibration_3D
2121
from . gaze_mappers import Dummy_Gaze_Mapper, Monocular_Gaze_Mapper, Binocular_Gaze_Mapper,Vector_Gaze_Mapper,Binocular_Vector_Gaze_Mapper,Dual_Monocular_Gaze_Mapper
22+
from . calibration_plugin_base import Calibration_Plugin
2223

2324
calibration_plugins = [Screen_Marker_Calibration,
2425
Manual_Marker_Calibration,

0 commit comments

Comments
 (0)