From 45a35805eb1e59972ad9a9c80815f2c030dc69bb Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期五, 26 十二月 2025 16:13:14 +0800
Subject: [PATCH] 割草机新增了属性
---
src/lujing/MowingPathGenerationPage.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 deletions(-)
diff --git a/src/lujing/MowingPathGenerationPage.java b/src/lujing/MowingPathGenerationPage.java
index 8bd2ba9..78735ca 100644
--- a/src/lujing/MowingPathGenerationPage.java
+++ b/src/lujing/MowingPathGenerationPage.java
@@ -140,8 +140,21 @@
contentPanel.add(createTextAreaSection(obstacleTitle, obstacleArea));
// 鍓茶崏瀹藉害
- widthField = createInfoTextField(widthValue != null ? widthValue : "", true);
- contentPanel.add(createTextFieldSection("鍓茶崏瀹藉害 (cm)", widthField));
+ String displayWidth = "";
+ if (widthValue != null && !widthValue.trim().isEmpty() && !"-1".equals(widthValue.trim())) {
+ try {
+ double val = Double.parseDouble(widthValue.trim());
+ // 绠�鍗曠殑鍚彂寮忚浆鎹細濡傛灉鍊煎ぇ浜�5锛屽亣璁炬槸鍘樼背锛岃浆鎹负绫�
+ if (val > 5) {
+ val = val / 100.0;
+ }
+ displayWidth = String.format(Locale.US, "%.2f", val);
+ } catch (NumberFormatException e) {
+ displayWidth = widthValue;
+ }
+ }
+ widthField = createInfoTextField(displayWidth, true);
+ contentPanel.add(createTextFieldSection("鍓茶崏瀹藉害 (m)", widthField));
// 鍓茶崏瀹夊叏璺濈锛堝彧璇绘樉绀猴級
// 浼樺厛浠嶥ikuai瀵硅薄鑾峰彇锛屽鏋淒ikuai涓病鏈夛紝鍐嶄粠Device鑾峰彇
@@ -223,9 +236,9 @@
String sanitizedWidth = sanitizeWidthString(widthField.getText());
if (sanitizedWidth != null) {
try {
- double widthCm = Double.parseDouble(sanitizedWidth);
- widthField.setText(formatWidthForStorage(widthCm));
- sanitizedWidth = formatWidthForStorage(widthCm);
+ double widthMeters = Double.parseDouble(sanitizedWidth);
+ widthField.setText(formatWidthForStorage(widthMeters));
+ sanitizedWidth = formatWidthForStorage(widthMeters);
} catch (NumberFormatException ex) {
widthField.setText(sanitizedWidth);
}
@@ -407,25 +420,25 @@
String rawWidthInput = widthField.getText() != null ? widthField.getText().trim() : "";
String widthSanitized = sanitizeWidthString(widthField.getText());
if (widthSanitized == null) {
- String message = rawWidthInput.isEmpty() ? "璇峰厛璁剧疆鍓茶崏瀹藉害(cm)" : "鍓茶崏瀹藉害鏍煎紡涓嶆纭�";
+ String message = rawWidthInput.isEmpty() ? "璇峰厛璁剧疆鍓茶崏瀹藉害(m)" : "鍓茶崏瀹藉害鏍煎紡涓嶆纭�";
JOptionPane.showMessageDialog(this, message, "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
}
- double widthCm;
+ double widthMeters;
try {
- widthCm = Double.parseDouble(widthSanitized);
+ widthMeters = Double.parseDouble(widthSanitized);
} catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(this, "鍓茶崏瀹藉害鏍煎紡涓嶆纭�", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
}
- if (widthCm <= 0) {
+ if (widthMeters <= 0) {
JOptionPane.showMessageDialog(this, "鍓茶崏瀹藉害蹇呴』澶т簬0", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
}
- String widthNormalized = formatWidthForStorage(widthCm);
+ String widthNormalized = formatWidthForStorage(widthMeters);
widthField.setText(widthNormalized);
String pathNormalized = normalizeCoordinateInput(pathArea.getText());
@@ -518,15 +531,15 @@
String widthStr = sanitizeWidthString(widthCmInput);
if (widthStr == null) {
if (showMessages) {
- String message = rawWidth.isEmpty() ? "璇峰厛璁剧疆鍓茶崏瀹藉害(cm)" : "鍓茶崏瀹藉害鏍煎紡涓嶆纭�";
+ String message = rawWidth.isEmpty() ? "璇峰厛璁剧疆鍓茶崏瀹藉害(m)" : "鍓茶崏瀹藉害鏍煎紡涓嶆纭�";
JOptionPane.showMessageDialog(parentComponent, message, "鎻愮ず", JOptionPane.WARNING_MESSAGE);
}
return null;
}
- double widthCm;
+ double widthVal;
try {
- widthCm = Double.parseDouble(widthStr);
+ widthVal = Double.parseDouble(widthStr);
} catch (NumberFormatException ex) {
if (showMessages) {
JOptionPane.showMessageDialog(parentComponent, "鍓茶崏瀹藉害鏍煎紡涓嶆纭�",
@@ -535,7 +548,7 @@
return null;
}
- if (widthCm <= 0) {
+ if (widthVal <= 0) {
if (showMessages) {
JOptionPane.showMessageDialog(parentComponent, "鍓茶崏瀹藉害蹇呴』澶т簬0",
"鎻愮ず", JOptionPane.WARNING_MESSAGE);
@@ -543,7 +556,7 @@
return null;
}
- double widthMeters = widthCm / 100.0d;
+ double widthMeters = widthVal;
String plannerWidth = BigDecimal.valueOf(widthMeters)
.setScale(3, RoundingMode.HALF_UP)
.stripTrailingZeros()
@@ -627,8 +640,9 @@
} else if (grassType == 2) {
// 寮傚舰鍦板潡锛屾湁闅滅鐗� -> 璋冪敤 YixinglujingHaveObstacel
// 浼犲叆鍙傛暟锛歜oundary(A), obstacles(B), plannerWidth(C), safetyMarginStr(D)
- // 娉ㄦ剰锛歒ixinglujingHaveObstacel.planPath 杩斿洖 String
- generated = YixinglujingHaveObstacel.planPath(boundary, obstacles, plannerWidth, safetyMarginStr);
+ List<YixinglujingHaveObstacel.PathSegment> segments =
+ YixinglujingHaveObstacel.planPath(boundary, obstacles, plannerWidth, safetyMarginStr);
+ generated = formatYixingHaveObstaclePathSegments(segments);
} else {
// 鏃犳硶鍒ゆ柇鍦板潡绫诲瀷锛岄粯璁ゆ寜鍑稿舰澶勭悊鎴栨彁绀�
if (showMessages) {
@@ -781,6 +795,40 @@
}
/**
+ * 鏍煎紡鍖� YixinglujingHaveObstacel.PathSegment 鍒楄〃涓哄潗鏍囧瓧绗︿覆
+ */
+ private String formatYixingHaveObstaclePathSegments(List<YixinglujingHaveObstacel.PathSegment> segments) {
+ if (segments == null || segments.isEmpty()) {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder();
+ YixinglujingHaveObstacel.Point last = null;
+ for (YixinglujingHaveObstacel.PathSegment segment : segments) {
+ // 濡傛灉鏄涓�娈碉紝鎴栬�呭綋鍓嶆璧风偣涓庝笂涓�娈电粓鐐逛笉杩炵画锛屽垯娣诲姞璧风偣
+ if (last == null || !equalsYixingHaveObstaclePoint(last, segment.start)) {
+ appendYixingHaveObstaclePoint(sb, segment.start);
+ }
+ // 娣诲姞缁堢偣
+ appendYixingHaveObstaclePoint(sb, segment.end);
+ last = segment.end;
+ }
+ return sb.toString();
+ }
+
+ private boolean equalsYixingHaveObstaclePoint(YixinglujingHaveObstacel.Point p1, YixinglujingHaveObstacel.Point p2) {
+ if (p1 == null || p2 == null) return false;
+ double tolerance = 1e-6;
+ return Math.abs(p1.x - p2.x) < tolerance && Math.abs(p1.y - p2.y) < tolerance;
+ }
+
+ private void appendYixingHaveObstaclePoint(StringBuilder sb, YixinglujingHaveObstacel.Point point) {
+ if (sb.length() > 0) {
+ sb.append(";");
+ }
+ sb.append(String.format(Locale.US, "%.6f,%.6f", point.x, point.y));
+ }
+
+ /**
* 姣旇緝涓や釜鐐规槸鍚︾浉鍚岋紙浣跨敤灏忕殑瀹瑰樊锛�
*/
private boolean equals2D(AoxinglujingNoObstacle.Point p1, AoxinglujingNoObstacle.Point p2) {
@@ -1046,11 +1094,8 @@
return cleaned.isEmpty() ? null : cleaned;
}
- private String formatWidthForStorage(double widthCm) {
- return BigDecimal.valueOf(widthCm)
- .setScale(2, RoundingMode.HALF_UP)
- .stripTrailingZeros()
- .toPlainString();
+ private String formatWidthForStorage(double widthVal) {
+ return String.format(Locale.US, "%.2f", widthVal);
}
private String formatMowingPatternForDialog(String patternValue) {
--
Gitblit v1.10.0