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.

Sign up for GitHub

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

Jump to bottom

BF: fix relative imports #6

Merged
merged 6 commits into from
Jun 12, 2024
Merged

BF: fix relative imports #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3526e8e
Merge pull request #1 from psychopy/main
mh105 Jun 6, 2024
2c4c5b5
STY: fix a spacing in eyetracker.py following PEP8
mh105 Jun 6, 2024
736bfec
BF: resurrect import eye_events for __init__ import
mh105 Jun 6, 2024
571cea2
STY: fix calibration.py following PEP8 style
mh105 Jun 6, 2024
cbf2731
BF: fix a relative import for KeyboardInputEvent
mh105 Jun 6, 2024
6335866
STY: move import to top of .py file
mh105 Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions psychopy_eyetracker_sr_research/sr_research/eyelink/calibration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,20 @@
from psychopy.iohub.constants import EventConstants
from psychopy.iohub.errors import print2err, printExceptionDetailsToStdErr
from psychopy.iohub.util import convertCamelToSnake, win32MessagePump, updateSettings, createCustomCalibrationStim
from psychopy.iohub.devices.keyboard import KeyboardInputEvent
import pylink


class FixationTarget():
def __init__(self, psychopy_eyelink_graphics):
win = psychopy_eyelink_graphics.window
color_type = psychopy_eyelink_graphics.getCalibSetting(['color_type'])
unit_type = psychopy_eyelink_graphics.getCalibSetting(['unit_type'])

outer_fill_color = outer_line_color = psychopy_eyelink_graphics.getCalibSetting(['target_attributes', 'outer_color'])
inner_fill_color = inner_line_color = psychopy_eyelink_graphics.getCalibSetting(['target_attributes', 'inner_color'])
outer_fill_color = outer_line_color = psychopy_eyelink_graphics.getCalibSetting(
['target_attributes', 'outer_color'])
inner_fill_color = inner_line_color = psychopy_eyelink_graphics.getCalibSetting(
['target_attributes', 'inner_color'])

if outer_fill_color is None:
outer_fill_color = psychopy_eyelink_graphics.getCalibSetting(['target_attributes', 'outer_fill_color'])
Expand Down Expand Up @@ -58,6 +62,7 @@ def draw(self, pos=None):
self.calibrationPointInner.pos = pos
self.calibrationPoint.draw()


# Intro Screen
class BlankScreen():

Expand Down Expand Up @@ -467,7 +472,6 @@ def _unregisterEventMonitors(self):
def _handleEvent(self, event):
event_type_index = DeviceEvent.EVENT_TYPE_ID_INDEX
if event[event_type_index] == EventConstants.KEYBOARD_RELEASE:
from .....keyboard import KeyboardInputEvent
key_index = KeyboardInputEvent.CLASS_ATTRIBUTE_NAMES.index('key')
char = event[key_index]
if isinstance(char, bytes):
Expand Down Expand Up @@ -632,7 +636,7 @@ def draw_image_line(self, width, line, totlines, buff):
for i in range(width):
try:
self.rgb_index_array[line - 1, i] = buff[i]
except Exception as e:
except Exception:
printExceptionDetailsToStdErr()
print2err(
'FAILED TO DRAW PIXEL TO IMAGE LINE: %d %d' %
Expand Down
16 changes: 14 additions & 2 deletions psychopy_eyetracker_sr_research/sr_research/eyelink/eyetracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,20 @@
from psychopy.iohub import EXP_SCRIPT_DIRECTORY
from psychopy.iohub.errors import print2err, printExceptionDetailsToStdErr
from psychopy.iohub.devices import Computer, Device
from psychopy.iohub.devices.eyetracker.eye_events import (
from psychopy.iohub.devices.eyetracker.eye_events import ( # noqa: F401
EventConstants,
EyeTrackerDevice
EyeTrackerDevice,
EyeTrackerEvent,
EyeSampleEvent,
MonocularEyeSampleEvent,
BinocularEyeSampleEvent,
GazepointSampleEvent,
FixationStartEvent,
FixationEndEvent,
SaccadeStartEvent,
SaccadeEndEvent,
BlinkStartEvent,
BlinkEndEvent
)

try:
Expand Down Expand Up @@ -1574,6 +1585,7 @@ def _close(self):
self.setConnectionState(False)
EyeTrackerDevice._close(self)


# ================= Command Functions ==========================================

_EYELINK_HOST_MODES = {
Expand Down
Loading