From d327dc26c8be00225481d57daaad2ca48e5deb00 Mon Sep 17 00:00:00 2001 From: takahashi Date: Tue, 5 Nov 2024 14:53:09 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=95=E6=95=B0=E3=81=A7=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E8=89=B2=E3=82=92?= =?UTF-8?q?=E5=B0=8F=E6=96=87=E5=AD=97=E3=81=8B=E3=82=89=E5=A4=A7=E6=96=87?= =?UTF-8?q?=E5=AD=97=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front_camera/front_camera/frame_timing_calculator.py | 2 +- front_camera/front_camera/get_correction_angle.py | 2 +- module/Motion/CorrectingRotation.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front_camera/front_camera/frame_timing_calculator.py b/front_camera/front_camera/frame_timing_calculator.py index 0449c1e..5094cf0 100644 --- a/front_camera/front_camera/frame_timing_calculator.py +++ b/front_camera/front_camera/frame_timing_calculator.py @@ -20,7 +20,7 @@ def __init__(self, video_path, bounding_box_width=300, bounding_box_height=600): self.video_path = video_path self.bounding_box_width = bounding_box_width self.bounding_box_height = bounding_box_height - self.yellow_rectangle_detector = ColorRectangleDetector("yellow") + self.yellow_rectangle_detector = ColorRectangleDetector("YELLOW") def get_target_timing(self): """映像から特定のフレームを画像として切り出すタイミングを取得する""" diff --git a/front_camera/front_camera/get_correction_angle.py b/front_camera/front_camera/get_correction_angle.py index 1240e4f..86ba7e1 100644 --- a/front_camera/front_camera/get_correction_angle.py +++ b/front_camera/front_camera/get_correction_angle.py @@ -62,7 +62,7 @@ def calculate_correction_angle(self, image_path): if __name__ == "__main__": parser = argparse.ArgumentParser(description="フロントカメラに関するプログラム") parser.add_argument("--camera-num", type=int, default=0, help="カメラIDを指定する") - parser.add_argument("--color", type=str, default="yellow", help="検出する矩形の色を指定する") + parser.add_argument("--color", type=str, default="YELLOW", help="検出する矩形の色を指定する") args = parser.parse_args() camera = CameraInterface() diff --git a/module/Motion/CorrectingRotation.h b/module/Motion/CorrectingRotation.h index 00c6111..1949195 100644 --- a/module/Motion/CorrectingRotation.h +++ b/module/Motion/CorrectingRotation.h @@ -18,7 +18,7 @@ class CorrectingRotation : public CompositeMotion { * コンストラクタ * @param _pwm 角度補正回頭時のPWM値 * @param _correctionTolerance 補正許容角度 - * @param _color 検出する矩形の色（"yellow" or "red"） + * @param _color 検出する矩形の色（"YELLOW" or "RED"） */ CorrectingRotation(int _pwm = 50, int _correctionTolerance = 0, COLOR _color = COLOR::YELLOW);