Skip to content

Commit 961f8dc

Browse files
committed
Pass on task zoom value from API
1 parent cc5f0cc commit 961f8dc

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/isar/apis/models/start_mission_definition.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
TakeThermalImage,
2020
TakeThermalVideo,
2121
TakeVideo,
22+
ZoomDescription,
2223
)
2324

2425

@@ -52,6 +53,7 @@ class StartMissionTaskDefinition(BaseModel):
5253
inspection: Optional[StartMissionInspectionDefinition] = None
5354
tag: Optional[str] = None
5455
id: Optional[str] = None
56+
zoom: Optional[ZoomDescription] = None
5557

5658

5759
class StartMissionDefinition(BaseModel):
@@ -148,6 +150,7 @@ def create_inspection_task(
148150
tag_id=start_mission_task_definition.tag,
149151
robot_pose=start_mission_task_definition.pose.to_alitra_pose(),
150152
metadata=start_mission_task_definition.inspection.metadata,
153+
zoom=start_mission_task_definition.zoom,
151154
)
152155
elif start_mission_task_definition.inspection.type == InspectionTypes.video:
153156
return TakeVideo(
@@ -156,6 +159,7 @@ def create_inspection_task(
156159
tag_id=start_mission_task_definition.tag,
157160
robot_pose=start_mission_task_definition.pose.to_alitra_pose(),
158161
metadata=start_mission_task_definition.inspection.metadata,
162+
zoom=start_mission_task_definition.zoom,
159163
)
160164

161165
elif start_mission_task_definition.inspection.type == InspectionTypes.thermal_image:
@@ -164,6 +168,7 @@ def create_inspection_task(
164168
tag_id=start_mission_task_definition.tag,
165169
robot_pose=start_mission_task_definition.pose.to_alitra_pose(),
166170
metadata=start_mission_task_definition.inspection.metadata,
171+
zoom=start_mission_task_definition.zoom,
167172
)
168173

169174
elif start_mission_task_definition.inspection.type == InspectionTypes.thermal_video:
@@ -173,6 +178,7 @@ def create_inspection_task(
173178
tag_id=start_mission_task_definition.tag,
174179
robot_pose=start_mission_task_definition.pose.to_alitra_pose(),
175180
metadata=start_mission_task_definition.inspection.metadata,
181+
zoom=start_mission_task_definition.zoom,
176182
)
177183

178184
elif start_mission_task_definition.inspection.type == InspectionTypes.audio:
@@ -182,6 +188,7 @@ def create_inspection_task(
182188
tag_id=start_mission_task_definition.tag,
183189
robot_pose=start_mission_task_definition.pose.to_alitra_pose(),
184190
metadata=start_mission_task_definition.inspection.metadata,
191+
zoom=start_mission_task_definition.zoom,
185192
)
186193
else:
187194
raise ValueError(

src/robot_interface/models/mission/task.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ class TaskTypes(str, Enum):
2929
DockingProcedure = "docking_procedure"
3030

3131

32+
@dataclass
33+
class ZoomDescription:
34+
objectWidth: float
35+
objectHeight: float
36+
37+
3238
@dataclass
3339
class Task:
3440
status: TaskStatus = field(default=TaskStatus.NotStarted, init=False)
@@ -59,6 +65,7 @@ class InspectionTask(Task):
5965
inspection: Inspection = field(default=None, init=True)
6066
robot_pose: Pose = field(default=None, init=True)
6167
metadata: Optional[dict] = field(default_factory=dict, init=True)
68+
zoom: Optional[ZoomDescription] = field(default=None)
6269

6370
@staticmethod
6471
def get_inspection_type() -> Type[Inspection]:

0 commit comments

Comments
 (0)