From d9aea123397d78a765627e6da78ab00ef786472e Mon Sep 17 00:00:00 2001 From: aestene Date: Wed, 8 Feb 2023 18:08:37 +0100 Subject: [PATCH] Fix black linting to reflect new version --- src/isar_turtlebot/services/video_streamer.py | 3 --- src/isar_turtlebot/turtlebot/step_handlers/driveto.py | 1 - src/isar_turtlebot/turtlebot/step_handlers/takeimage.py | 1 - src/isar_turtlebot/turtlebot/step_handlers/takethermalimage.py | 3 +-- src/isar_turtlebot/turtlebot/turtlebot.py | 1 - src/isar_turtlebot/utilities/inspection_pose.py | 1 - 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/isar_turtlebot/services/video_streamer.py b/src/isar_turtlebot/services/video_streamer.py index c5e498e..5f6ac04 100644 --- a/src/isar_turtlebot/services/video_streamer.py +++ b/src/isar_turtlebot/services/video_streamer.py @@ -1,7 +1,5 @@ import base64 -import cv2 - from isar_turtlebot.ros_bridge.ros_bridge import RosBridge @@ -10,7 +8,6 @@ def __init__(self, bridge: RosBridge) -> None: self.bridge: RosBridge = bridge def main(self): - while True: image_data: str = self.bridge.video_stream.get_image() image_bytes: bytes = base64.b64decode(image_data) diff --git a/src/isar_turtlebot/turtlebot/step_handlers/driveto.py b/src/isar_turtlebot/turtlebot/step_handlers/driveto.py index 0d9b3d6..cc80d60 100644 --- a/src/isar_turtlebot/turtlebot/step_handlers/driveto.py +++ b/src/isar_turtlebot/turtlebot/step_handlers/driveto.py @@ -26,7 +26,6 @@ def start( self, step: DriveToPose, ) -> None: - goal_pose: Pose = self.transform.transform_pose( pose=step.pose, from_=step.pose.frame, to_=Frame("robot") ) diff --git a/src/isar_turtlebot/turtlebot/step_handlers/takeimage.py b/src/isar_turtlebot/turtlebot/step_handlers/takeimage.py index c63b5be..201cbfb 100644 --- a/src/isar_turtlebot/turtlebot/step_handlers/takeimage.py +++ b/src/isar_turtlebot/turtlebot/step_handlers/takeimage.py @@ -47,7 +47,6 @@ def __init__( self.inspection: Optional[Image] = None def start(self, step: TakeImage) -> None: - self.status = Status.Active current_pose: Pose = self._get_robot_pose() diff --git a/src/isar_turtlebot/turtlebot/step_handlers/takethermalimage.py b/src/isar_turtlebot/turtlebot/step_handlers/takethermalimage.py index 0dee9cd..81830b2 100644 --- a/src/isar_turtlebot/turtlebot/step_handlers/takethermalimage.py +++ b/src/isar_turtlebot/turtlebot/step_handlers/takethermalimage.py @@ -6,8 +6,8 @@ from typing import Optional from uuid import uuid4 -import numpy as np import PIL.Image as PILImage +import numpy as np from alitra import Pose, Position, Transform from robot_interface.models.inspection.inspection import ( ThermalImage, @@ -53,7 +53,6 @@ def start( self, step: TakeThermalImage, ) -> None: - self.status = Status.Active current_pose: Pose = self._get_robot_pose() target: Position = self.transform.transform_position( diff --git a/src/isar_turtlebot/turtlebot/turtlebot.py b/src/isar_turtlebot/turtlebot/turtlebot.py index 787198a..4406fdc 100644 --- a/src/isar_turtlebot/turtlebot/turtlebot.py +++ b/src/isar_turtlebot/turtlebot/turtlebot.py @@ -40,7 +40,6 @@ class Turtlebot: """Step manager for Turtlebot.""" def __init__(self, bridge: RosBridge, transform: Transform) -> None: - self.logger: Logger = logging.getLogger("robot") self.bridge: RosBridge = bridge self.transform: Transform = transform diff --git a/src/isar_turtlebot/utilities/inspection_pose.py b/src/isar_turtlebot/utilities/inspection_pose.py index 9f0ac16..5f3cf13 100644 --- a/src/isar_turtlebot/utilities/inspection_pose.py +++ b/src/isar_turtlebot/utilities/inspection_pose.py @@ -4,7 +4,6 @@ def get_inspection_pose(current_pose: Pose, target: Position) -> Pose: - direction = target.to_array() - current_pose.position.to_array() alpha = np.arctan2(direction[1], direction[0]) rotation = Rotation.from_euler("zyx", [alpha, 0, 0], degrees=False)