Skip to content

Adds flip state and rotation for visualization #168

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

Open
micahwoodard wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Adds flip state and rotation for visualization #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cca0ca9
adds flip state and rotation for visualization
micahwoodard Sep 3, 2026
3487ac7
improves doc string
micahwoodard Sep 3, 2026
85a68df
fixes example
micahwoodard Sep 3, 2026
5d06f21
lints
micahwoodard Sep 3, 2026
50c2630
uses composite class instead of inheritance
micahwoodard Sep 4, 2026
93e35d3
fixes acquisition mapping
micahwoodard Sep 4, 2026
2f52305
lints
micahwoodard Sep 4, 2026
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: 7 additions & 5 deletions examples/rig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
AindDynamicForagingRig,
DynamicForagingAindManipulator,
DynamicForagingSoundCard,
DynamicForagingSpinnakerCamera,
RigCalibration,
SpinnakerCamera,
)

manipulator_calibration = AindManipulatorCalibration(
Expand Down Expand Up @@ -48,14 +50,14 @@
rig_name="test_rig",
computer_name="test_computer",
data_directory="D:/Data/",
triggered_camera_controller=cameras.CameraController[cameras.SpinnakerCamera](
triggered_camera_controller=cameras.CameraController[DynamicForagingSpinnakerCamera](
frame_rate=120,
cameras={
"BodyCamera": cameras.SpinnakerCamera(
serial_number="23349426", binning=1, exposure=1000, gain=8, video_writer=None
"BodyCamera": DynamicForagingSpinnakerCamera(
camera=SpinnakerCamera(serial_number="23349426", binning=1, exposure=1000, gain=8, video_writer=None)
),
"SideCamera": cameras.SpinnakerCamera(
serial_number="23349424", binning=1, exposure=1000, gain=8, video_writer=None
"SideCamera": DynamicForagingSpinnakerCamera(
camera=SpinnakerCamera(serial_number="23349424", binning=1, exposure=1000, gain=8, video_writer=None)
),
},
),
Expand Down
61 changes: 57 additions & 4 deletions schema/aind_behavior_dynamic_foraging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"type": "string"
},
"triggered_camera_controller": {
"$ref": "#/$defs/CameraController_SpinnakerCamera_",
"$ref": "#/$defs/CameraController_DynamicForagingSpinnakerCamera_",
"description": "Required camera controller to triggered cameras."
},
"monitoring_camera_controller": {
Expand Down Expand Up @@ -970,7 +970,7 @@
"title": "BlockBasedTrialGeneratorSpec",
"type": "object"
},
"CameraController_SpinnakerCamera_": {
"CameraController_DynamicForagingSpinnakerCamera_": {
"properties": {
"device_type": {
"const": "CameraController",
Expand All @@ -992,7 +992,7 @@
},
"cameras": {
"additionalProperties": {
"$ref": "#/$defs/SpinnakerCamera"
"$ref": "#/$defs/DynamicForagingSpinnakerCamera"
},
"description": "Cameras to be instantiated",
"title": "Cameras",
Expand All @@ -1016,7 +1016,7 @@
"required": [
"cameras"
],
"title": "CameraController[SpinnakerCamera]",
"title": "CameraController[DynamicForagingSpinnakerCamera]",
"type": "object"
},
"CameraController_WebCamera_": {
Expand Down Expand Up @@ -1750,6 +1750,28 @@
"title": "DynamicForagingSoundCard",
"type": "object"
},
"DynamicForagingSpinnakerCamera": {
"description": "A SpinnakerCamera for the dynamic foraging rig that includes camera image rotation for visualizers.",
"properties": {
"camera": {
"$ref": "#/$defs/SpinnakerCamera",
"description": "Spinnaker camera instance"
},
"visualizer_settings": {
"$ref": "#/$defs/VisualizerSettings",
"default": {
"flip_state": null,
"rotation": 0.0
},
"description": "Visualizer settings for the camera"
}
},
"required": [
"camera"
],
"title": "DynamicForagingSpinnakerCamera",
"type": "object"
},
"ExponentialDistribution": {
"description": "An exponential probability distribution.\n\nModels time between events in a Poisson process. Commonly used\nfor wait times and inter-event intervals.",
"properties": {
Expand Down Expand Up @@ -4111,6 +4133,37 @@
"title": "VideoWriterOpenCv",
"type": "object"
},
"VisualizerSettings": {
"description": "Visualizer settings for the dynamic foraging rig's camera. This includes camera image rotation and flip state for visualizers.",
"properties": {
"flip_state": {
"default": null,
"description": "Camera flip state",
"oneOf": [
{
"enum": [
"horizontal",
"vertical",
"both"
],
"type": "string"
},
{
"type": "null"
}
],
"title": "Flip State"
},
"rotation": {
"default": 0,
"description": "Camera rotation angle in radians",
"title": "Rotation",
"type": "number"
}
},
"title": "VisualizerSettings",
"type": "object"
},
"WaterValveCalibration": {
"description": "Represents a water valve calibration.",
"properties": {
Expand Down
Loading