From b315a6943e6c0d6bdf0d5f7565c570d719154d6c Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期三, 17 十二月 2025 14:56:58 +0800
Subject: [PATCH] 新增了障碍物管理页面
---
src/zhuye/pointandnumber.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/zhuye/pointandnumber.java b/src/zhuye/pointandnumber.java
index fb95ad8..ac1df42 100644
--- a/src/zhuye/pointandnumber.java
+++ b/src/zhuye/pointandnumber.java
@@ -20,7 +20,8 @@
List<Point2D.Double> boundary, // 杈圭晫鐐归泦鍚�
double scale, // 缂╂斁姣斾緥
double mergeThreshold, // 鍚堝苟闃堝��
- Color pointColor) { // 鐐归鑹�
+ Color pointColor, // 鐐归鑹�
+ double diameterScale) { // 鐩村緞缂╂斁鍥犲瓙
if (boundary == null || boundary.size() < 2) { // 鍒ゆ柇鏁版嵁鏄惁鏈夋晥
return; // 鏃犳晥鐩存帴杩斿洖
}
@@ -32,8 +33,10 @@
return; // 鏃犳晥杩斿洖
}
- double scaleFactor = Math.max(0.5, scale); // 闃叉杩囧皬缂╂斁
- double markerDiameter = Math.max(1.0, (10.0 / scaleFactor) * 0.2); // 鎻忕偣鐩村緞
+ double scaleFactor = Math.max(0.5, scale); // 闃叉杩囧皬缂╂斁
+ double clampedScale = diameterScale > 0 ? diameterScale : 1.0; // 闃叉闈炴硶缂╂斁
+ double minimumDiameter = clampedScale < 1.0 ? 0.5 : 1.0; // 缂╁皬鏃跺厑璁告洿灏忕殑鏈�灏忓��
+ double markerDiameter = Math.max(minimumDiameter, (10.0 / scaleFactor) * 0.2 * clampedScale); // 鎻忕偣鐩村緞
double markerRadius = markerDiameter / 2.0; // 鍗婂緞
for (int i = 0; i < effectiveCount; i++) { // 閬嶅巻鏈夋晥鐐�
--
Gitblit v1.10.0