Skip to content

Commit

Permalink
Chore: revert stereotactic info
Browse files Browse the repository at this point in the history
  • Loading branch information
kjy5 committed Jul 26, 2024
1 parent 6be96c7 commit c6d627d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 15 deletions.
8 changes: 2 additions & 6 deletions models/csharp/EphysLinkModels.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,11 @@ public GetManipulatorsResponse(string[] manipulators, int numAxes, Vector4 dimen
public struct PositionalResponse
{
public Vector4 Position;
public bool IsStereotactic;
public string Error;

public PositionalResponse(Vector4 position, bool isStereotactic, string error)
public PositionalResponse(Vector4 position, string error)
{
Position = position;
IsStereotactic = isStereotactic;
Error = error;
}
}
Expand Down Expand Up @@ -133,14 +131,12 @@ public struct SetPositionRequest
{
public string ManipulatorId;
public Vector4 Position;
public bool IsStereotactic;
public float Speed;

public SetPositionRequest(string manipulatorId, Vector4 position, bool isStereotactic, float speed)
public SetPositionRequest(string manipulatorId, Vector4 position, float speed)
{
ManipulatorId = manipulatorId;
Position = position;
IsStereotactic = isStereotactic;
Speed = speed;
}
}
Expand Down
2 changes: 1 addition & 1 deletion models/schemas/ephys_link/PositionalResponse.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"$defs": {"Vector4": {"properties": {"x": {"default": 0.0, "title": "X", "type": "number"}, "y": {"default": 0.0, "title": "Y", "type": "number"}, "z": {"default": 0.0, "title": "Z", "type": "number"}, "w": {"default": 0.0, "title": "W", "type": "number"}}, "title": "Vector4", "type": "object"}}, "description": "Response format for the manipulator position.\n\n:param position: Position of the manipulator.\n:type position: Vector4\n:param is_stereotactic: Whether the position is stereotactic (ML, AP, DV, W).\n:type is_stereotactic: bool\n:param error: Error message if any.\n:type error: str", "properties": {"Position": {"allOf": [{"$ref": "#/$defs/Vector4"}], "default": {"x": 0.0, "y": 0.0, "z": 0.0, "w": 0.0}}, "IsStereotactic": {"default": false, "title": "Isstereotactic", "type": "boolean"}, "Error": {"default": "", "title": "Error", "type": "string"}}, "title": "PositionalResponse", "type": "object"}
{"$defs": {"Vector4": {"properties": {"x": {"default": 0.0, "title": "X", "type": "number"}, "y": {"default": 0.0, "title": "Y", "type": "number"}, "z": {"default": 0.0, "title": "Z", "type": "number"}, "w": {"default": 0.0, "title": "W", "type": "number"}}, "title": "Vector4", "type": "object"}}, "description": "Response format for the manipulator position.\n\n:param position: Position of the manipulator.\n:type position: Vector4\n:param error: Error message if any.\n:type error: str", "properties": {"Position": {"allOf": [{"$ref": "#/$defs/Vector4"}], "default": {"x": 0.0, "y": 0.0, "z": 0.0, "w": 0.0}}, "Error": {"default": "", "title": "Error", "type": "string"}}, "title": "PositionalResponse", "type": "object"}
2 changes: 1 addition & 1 deletion models/schemas/ephys_link/SetPositionRequest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"$defs": {"Vector4": {"properties": {"x": {"default": 0.0, "title": "X", "type": "number"}, "y": {"default": 0.0, "title": "Y", "type": "number"}, "z": {"default": 0.0, "title": "Z", "type": "number"}, "w": {"default": 0.0, "title": "W", "type": "number"}}, "title": "Vector4", "type": "object"}}, "description": "Request format for moving a manipulator to a position.\n\n:param manipulator_id: ID of the manipulator to move.\n:type manipulator_id: str\n:param position: Position to move to in mm (X, Y, Z, W).\n:type position: Vector4\n:param is_stereotactic: Whether the provided position is stereotactic (ML, AP, DV, W).\n:type is_stereotactic: bool\n:param speed: Speed to move at in mm/s.\n:type speed: float", "properties": {"ManipulatorId": {"minLength": 1, "title": "Manipulatorid", "type": "string"}, "Position": {"$ref": "#/$defs/Vector4"}, "IsStereotactic": {"default": false, "title": "Isstereotactic", "type": "boolean"}, "Speed": {"exclusiveMinimum": 0.0, "title": "Speed", "type": "number"}}, "required": ["ManipulatorId", "Position", "Speed"], "title": "SetPositionRequest", "type": "object"}
{"$defs": {"Vector4": {"properties": {"x": {"default": 0.0, "title": "X", "type": "number"}, "y": {"default": 0.0, "title": "Y", "type": "number"}, "z": {"default": 0.0, "title": "Z", "type": "number"}, "w": {"default": 0.0, "title": "W", "type": "number"}}, "title": "Vector4", "type": "object"}}, "description": "Request format for moving a manipulator to a position.\n\n:param manipulator_id: ID of the manipulator to move.\n:type manipulator_id: str\n:param position: Position to move to in mm (X, Y, Z, W).\n:type position: Vector4\n:param speed: Speed to move at in mm/s.\n:type speed: float", "properties": {"ManipulatorId": {"minLength": 1, "title": "Manipulatorid", "type": "string"}, "Position": {"$ref": "#/$defs/Vector4"}, "Speed": {"exclusiveMinimum": 0.0, "title": "Speed", "type": "number"}}, "required": ["ManipulatorId", "Position", "Speed"], "title": "SetPositionRequest", "type": "object"}
2 changes: 1 addition & 1 deletion src/vbl_aquarium/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.21"
__version__ = "0.0.22"
6 changes: 0 additions & 6 deletions src/vbl_aquarium/models/ephys_link.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,12 @@ class SetPositionRequest(VBLBaseModel):
:type manipulator_id: str
:param position: Position to move to in mm (X, Y, Z, W).
:type position: Vector4
:param is_stereotactic: Whether the provided position is stereotactic (ML, AP, DV, W).
:type is_stereotactic: bool
:param speed: Speed to move at in mm/s.
:type speed: float
"""

manipulator_id: str = Field(min_length=1)
position: Vector4
is_stereotactic: bool = False
speed: float = Field(gt=0)


Expand Down Expand Up @@ -109,14 +106,11 @@ class PositionalResponse(VBLBaseModel):
:param position: Position of the manipulator.
:type position: Vector4
:param is_stereotactic: Whether the position is stereotactic (ML, AP, DV, W).
:type is_stereotactic: bool
:param error: Error message if any.
:type error: str
"""

position: Vector4 = Vector4()
is_stereotactic: bool = False
error: str = ""


Expand Down

0 comments on commit c6d627d

Please sign in to comment.