From 8f5ced6be3df267d8328c819cc469697f61d8fa5 Mon Sep 17 00:00:00 2001 From: lyf <169361657@qq.com> Date: Fri, 5 Dec 2025 13:48:14 +0800 Subject: [PATCH] 1 --- inc/BallisticPredictor.h:Zone.Identifier | 2 -- inc/Camera.h:Zone.Identifier | 2 -- inc/ImagePreprocessor.h:Zone.Identifier | 2 -- inc/KalmanFilter.h:Zone.Identifier | 2 -- inc/MindVisionCamera.h:Zone.Identifier | 2 -- inc/TTLCommunicator.h:Zone.Identifier | 2 -- inc/Visualizer.h:Zone.Identifier | 2 -- src/MindVisionMain.cpp | 4 ++-- 8 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 inc/BallisticPredictor.h:Zone.Identifier delete mode 100644 inc/Camera.h:Zone.Identifier delete mode 100644 inc/ImagePreprocessor.h:Zone.Identifier delete mode 100644 inc/KalmanFilter.h:Zone.Identifier delete mode 100644 inc/MindVisionCamera.h:Zone.Identifier delete mode 100644 inc/TTLCommunicator.h:Zone.Identifier delete mode 100644 inc/Visualizer.h:Zone.Identifier diff --git a/inc/BallisticPredictor.h:Zone.Identifier b/inc/BallisticPredictor.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/BallisticPredictor.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/inc/Camera.h:Zone.Identifier b/inc/Camera.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/Camera.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/inc/ImagePreprocessor.h:Zone.Identifier b/inc/ImagePreprocessor.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/ImagePreprocessor.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/inc/KalmanFilter.h:Zone.Identifier b/inc/KalmanFilter.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/KalmanFilter.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/inc/MindVisionCamera.h:Zone.Identifier b/inc/MindVisionCamera.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/MindVisionCamera.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/inc/TTLCommunicator.h:Zone.Identifier b/inc/TTLCommunicator.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/TTLCommunicator.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/inc/Visualizer.h:Zone.Identifier b/inc/Visualizer.h:Zone.Identifier deleted file mode 100644 index a45e1ac..0000000 --- a/inc/Visualizer.h:Zone.Identifier +++ /dev/null @@ -1,2 +0,0 @@ -[ZoneTransfer] -ZoneId=3 diff --git a/src/MindVisionMain.cpp b/src/MindVisionMain.cpp index b62128b..de20340 100644 --- a/src/MindVisionMain.cpp +++ b/src/MindVisionMain.cpp @@ -45,7 +45,7 @@ void output_control_data(const cv::Point2f* ballistic_point, else if (target_color == "blue") simplified_color = "b"; // Construct send string (original format) - send_str << "#s " << simplified_color << " " << std::to_string(ballistic_offset_x) << " " << std::to_string(ballistic_offset_y) << "*\n"; + send_str << "#s " << simplified_color << " " << std::to_string(ballistic_offset_yaw) << " " << std::to_string(ballistic_offset_pitch) << "*\n"; // Send data if (ttl_communicator != nullptr) { @@ -298,9 +298,9 @@ int main(int /*argc*/, char* /*argv*/[]) { output_control_data(display_center, target_color, ttl, img_center, use_ttl); // Display windows - cv::imshow("Armor Detection", frame); cv::imshow(target_color + " Mask", mask); cv::imshow(target_color + " Only", color_only_frame); + cv::imshow("Armor Detection", frame); // Exit on 'q' key press if (cv::waitKey(1) == 'q') {