From 46f4d476de4668ce76cc0124c74a2e67e609a646 Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Sun, 21 Dec 2025 12:01:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=94=BE=E7=BD=AE=E9=94=99=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...on_analysis.py => contribution_analysis.py | 0 main.py | 118 ------------------ src/optimized_details.md | 34 ----- 3 files changed, 152 deletions(-) rename Contribution_analysis.py => contribution_analysis.py (100%) delete mode 100644 main.py delete mode 100644 src/optimized_details.md diff --git a/Contribution_analysis.py b/contribution_analysis.py similarity index 100% rename from Contribution_analysis.py rename to contribution_analysis.py diff --git a/main.py b/main.py deleted file mode 100644 index 8ac2a835e6..0000000000 --- a/main.py +++ /dev/null @@ -1,118 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -Lane Line Detection (精简版) -核心功能:Canny边缘检测 + 霍夫变换实现车道线检测,单视频处理+结果保存 -适用环境:Ubuntu (Python 3.10 + OpenCV + numpy) -""" - -import cv2 -import numpy as np -import argparse -import os -from pathlib import Path - -# ===================== 核心参数(仅保留必要的) ===================== -# 车道线检测核心参数 -CANNY_LOW_THRESH = 50 # Canny边缘检测低阈值 -CANNY_HIGH_THRESH = 150 # Canny边缘检测高阈值 -HOUGH_RHO = 1 # 霍夫变换rho步长 -HOUGH_THETA = np.pi / 180 # 霍夫变换theta步长 -HOUGH_THRESHOLD = 20 # 霍夫变换阈值 -HOUGH_MIN_LINE_LEN = 40 # 最小线段长度 -HOUGH_MAX_LINE_GAP = 20 # 最大线段间隙 - -# ===================== 核心函数:车道线检测 ===================== -def detect_lane_lines(frame): - """核心:检测并绘制车道线(Canny + 霍夫变换)""" - # 1. 灰度化 + 高斯模糊 - gray = cv2.cvtColor(frame, cv2.COLOR_BGR2GRAY) - blur = cv2.GaussianBlur(gray, (5, 5), 0) - - # 2. Canny边缘检测 - edges = cv2.Canny(blur, CANNY_LOW_THRESH, CANNY_HIGH_THRESH) - - # 3. 区域掩码(仅检测图像下半部分,聚焦车道) - h, w = frame.shape[:2] - mask = np.zeros_like(edges) - polygon = np.array([[(0, h), (w//2, h//2), (w, h)]], np.int32) - cv2.fillPoly(mask, polygon, 255) - masked_edges = cv2.bitwise_and(edges, mask) - - # 4. 霍夫变换检测直线 - lines = cv2.HoughLinesP( - masked_edges, HOUGH_RHO, HOUGH_THETA, HOUGH_THRESHOLD, - minLineLength=HOUGH_MIN_LINE_LEN, maxLineGap=HOUGH_MAX_LINE_GAP - ) - - # 5. 绘制车道线 - frame_with_lane = frame.copy() - if lines is not None: - for line in lines: - x1, y1, x2, y2 = line[0] - cv2.line(frame_with_lane, (x1, y1), (x2, y2), (0, 255, 0), 3) - - return frame_with_lane - -# ===================== 核心函数:视频处理 ===================== -def process_video(video_path, max_frames=10): - """处理单视频:读取帧→检测车道线→保存结果""" - # 校验视频文件 - if not os.path.exists(video_path): - print(f"错误:视频文件不存在 → {video_path}") - return - - # 打开视频流 - cap = cv2.VideoCapture(video_path) - if not cap.isOpened(): - print(f"错误:无法打开视频 → {video_path}") - return - - # 获取视频基础信息 - width = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH)) - height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT)) - fps = int(cap.get(cv2.CAP_PROP_FPS)) or 25 - - # 初始化结果视频写入器 - video_name = Path(video_path).stem - result_path = f"{video_name}_lane_detected.mp4" - fourcc = cv2.VideoWriter_fourcc(*'mp4v') - writer = cv2.VideoWriter(result_path, fourcc, fps, (width, height)) - - # 逐帧处理 - count = 0 - print(f"开始处理视频(最大{max_frames}帧)...") - while cap.isOpened() and count < max_frames: - ret, frame = cap.read() - if not ret: - break - - # 核心:检测车道线 - frame_with_lane = detect_lane_lines(frame) - - # 写入结果视频 - writer.write(frame_with_lane) - - # 实时显示(可选,按Q退出) - cv2.imshow("Lane Detection", frame_with_lane) - if cv2.waitKey(10) & 0xFF == ord('q'): - break - - count += 1 - - # 释放资源 - cap.release() - writer.release() - cv2.destroyAllWindows() - print(f"处理完成!结果保存至 → {result_path}") - -# ===================== 主函数(精简参数) ===================== -if __name__ == "__main__": - # 简化命令行参数:仅保留输入视频、最大帧数 - parser = argparse.ArgumentParser(description="车道线检测(精简版)") - parser.add_argument("video_path", type=str, help="输入视频文件路径") - parser.add_argument("--max-frames", type=int, default=10, help="最大处理帧数(默认10)") - args = parser.parse_args() - - # 执行核心逻辑 - process_video(args.video_path, args.max_frames) diff --git a/src/optimized_details.md b/src/optimized_details.md deleted file mode 100644 index e195b9d92a..0000000000 --- a/src/optimized_details.md +++ /dev/null @@ -1,34 +0,0 @@ -# CARLA Manual Control 代码优化说明文档 - -## 一、优化概述 -这次主要是改了 CARLA 官方的 manual_control.py 脚本,没动原来的功能,就是让代码看着更清楚、改起来更方便,也少了点小问题。 - -## 二、核心优化点明细 - -### 1. 代码结构重构:模块化拆分 -原来的代码我发现好多功能混在一起,找个东西得翻半天。现在按功能拆开了: -工具类:专门找 CARLA 的依赖文件、拿角色蓝图这些通用操作 -传感器类:把碰撞检测、GNSS 这些传感器单独写成类,初始化和数据处理不用再跟别的代码混着 -UI 相关:HUD 显示、提示文字这些单独管,想改界面不用动别的逻辑 -控制类:就管键盘输入和车辆控制,跟显示、传感器分开 - - -### 2. 可读性提升:规范与清晰化 -变量名改了:原来的 t、v、c 这种看不懂的,改成 transform、velocity、control,一眼能看明白 -加了注释:每个类和主要函数都写了是干啥的,复杂点的计算步骤也标了说明 - - -### 3. 性能优化:效率与资源管控 -#### (1)数据结构优化 -- 碰撞历史存储:原代码使用列表 `list` 存储碰撞历史,删除头部元素时效率低(时间复杂度 O(n)),优化为 `collections.deque`(双端队列),头部删除效率提升至 O(1)。 -- 雷达数据处理:减少冗余计算,仅在需要可视化时解析雷达点云,避免不必要的内存占用。 - -#### (2)资源管理优化 -- 传感器销毁逻辑:原代码传感器销毁分散在多个地方,优化后统一到 `World.destroy` 方法,确保程序退出时所有传感器(相机/雷达/GNSS)都能被正确销毁,避免CARLA服务器资源泄漏。 -- 同步模式适配:在 `main` 函数 `finally` 块中添加同步模式恢复逻辑,即使程序异常退出,也能将CARLA世界恢复为异步模式,避免影响后续使用。 - -#### (3)重复计算消除 -换了存储方式:原来存碰撞记录用列表,删东西慢,现在用 deque,删起来快多了 - - - From 139506781acf6796064b62097d3aa0b12f8e07ea Mon Sep 17 00:00:00 2001 From: donghaiwang Date: Sun, 21 Dec 2025 12:03:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E7=BB=9F=E8=AE=A1=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{Conpute_involvement.yml => compute_involvement.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{Conpute_involvement.yml => compute_involvement.yml} (94%) diff --git a/.github/workflows/Conpute_involvement.yml b/.github/workflows/compute_involvement.yml similarity index 94% rename from .github/workflows/Conpute_involvement.yml rename to .github/workflows/compute_involvement.yml index bba689237c..eeb8c0c51a 100644 --- a/.github/workflows/Conpute_involvement.yml +++ b/.github/workflows/compute_involvement.yml @@ -34,4 +34,4 @@ jobs: # 4. 执行你的贡献统计脚本 - name: Display involvement degree (${{ matrix.os }}) - run: python Contribution_analysis.py -t ${{ secrets.GITHUB_TOKEN }} + run: python contribution_analysis.py -t ${{ secrets.GITHUB_TOKEN }}