From 96f9630247478ee09dace5786ebfe46a54a6f2c0 Mon Sep 17 00:00:00 2001
From: 826220679@qq.com <826220679@qq.com>
Date: 星期六, 20 十二月 2025 13:00:35 +0800
Subject: [PATCH] 优化了地块管理文字变成图标
---
src/dikuai/Dikuai.java | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/dikuai/Dikuai.java b/src/dikuai/Dikuai.java
index fcbc771..d206242 100644
--- a/src/dikuai/Dikuai.java
+++ b/src/dikuai/Dikuai.java
@@ -21,10 +21,6 @@
private String boundaryCoordinates;
// 瑙勫垝璺緞锛堝瓨鍌ㄨ矾寰勫潗鏍囩偣闆嗗悎锛�
private String plannedPath;
- // 闅滅鐗╃粡绾害鍧愭爣
- private String obstacleOriginalCoordinates;
- // 闅滅鐗╁潗鏍�
- private String obstacleCoordinates;
// 杩斿洖鐐瑰潗鏍�
private String returnPointCoordinates;
// 杈圭晫鐐归棿闅�
@@ -47,6 +43,12 @@
private String mowingPattern;
// 鍓茶崏瀹藉害
private String mowingWidth;
+ // 鍓茶崏鏈哄壊鍒�瀹藉害锛堢背锛夛紝榛樿0.40绫�
+ private String mowingBladeWidth;
+ // 鍓茶崏閲嶅彔璺濈锛堢背锛夛紝榛樿0.06绫�
+ private String mowingOverlapDistance;
+ // 鍓茶崏瀹夊叏璺濈锛堢背锛�
+ private String mowingSafetyDistance;
// 瀛樺偍澶氫釜鍦板潡鐨勬槧灏勮〃锛岄敭涓哄湴鍧楃紪鍙�
private static Map<String, Dikuai> dikuaiMap = new HashMap<>();
@@ -97,8 +99,6 @@
dikuai.boundaryOriginalCoordinates = landProps.getProperty("boundaryOriginalCoordinates", "-1");
dikuai.boundaryCoordinates = landProps.getProperty("boundaryCoordinates", "-1");
dikuai.plannedPath = landProps.getProperty("plannedPath", "-1");
- dikuai.obstacleOriginalCoordinates = landProps.getProperty("obstacleOriginalCoordinates", "-1");
- dikuai.obstacleCoordinates = landProps.getProperty("obstacleCoordinates", "-1");
dikuai.returnPointCoordinates = landProps.getProperty("returnPointCoordinates", "-1");
dikuai.boundaryPointInterval = landProps.getProperty("boundaryPointInterval", "-1");
dikuai.angleThreshold = landProps.getProperty("angleThreshold", "-1");
@@ -110,6 +110,9 @@
dikuai.mowingPattern = landProps.getProperty("mowingPattern", "-1");
dikuai.mowingWidth = landProps.getProperty("mowingWidth", "-1");
dikuai.mowingTrack = landProps.getProperty("mowingTrack", "-1");
+ dikuai.mowingBladeWidth = landProps.getProperty("mowingBladeWidth", "0.40");
+ dikuai.mowingOverlapDistance = landProps.getProperty("mowingOverlapDistance", "0.06");
+ dikuai.mowingSafetyDistance = landProps.getProperty("mowingSafetyDistance", "-1");
dikuaiMap.put(landNum, dikuai);
}
@@ -198,12 +201,6 @@
case "plannedPath":
this.plannedPath = value;
return true;
- case "obstacleOriginalCoordinates":
- this.obstacleOriginalCoordinates = value;
- return true;
- case "obstacleCoordinates":
- this.obstacleCoordinates = value;
- return true;
case "returnPointCoordinates":
this.returnPointCoordinates = value;
return true;
@@ -237,6 +234,15 @@
case "mowingTrack":
this.mowingTrack = value;
return true;
+ case "mowingBladeWidth":
+ this.mowingBladeWidth = value;
+ return true;
+ case "mowingOverlapDistance":
+ this.mowingOverlapDistance = value;
+ return true;
+ case "mowingSafetyDistance":
+ this.mowingSafetyDistance = value;
+ return true;
default:
System.err.println("鏈煡瀛楁: " + fieldName);
return false;
@@ -260,8 +266,6 @@
if (dikuai.boundaryOriginalCoordinates != null) properties.setProperty(landNumber + ".boundaryOriginalCoordinates", dikuai.boundaryOriginalCoordinates);
if (dikuai.boundaryCoordinates != null) properties.setProperty(landNumber + ".boundaryCoordinates", dikuai.boundaryCoordinates);
if (dikuai.plannedPath != null) properties.setProperty(landNumber + ".plannedPath", dikuai.plannedPath);
- if (dikuai.obstacleOriginalCoordinates != null) properties.setProperty(landNumber + ".obstacleOriginalCoordinates", dikuai.obstacleOriginalCoordinates);
- if (dikuai.obstacleCoordinates != null) properties.setProperty(landNumber + ".obstacleCoordinates", dikuai.obstacleCoordinates);
if (dikuai.returnPointCoordinates != null) properties.setProperty(landNumber + ".returnPointCoordinates", dikuai.returnPointCoordinates);
if (dikuai.boundaryPointInterval != null) properties.setProperty(landNumber + ".boundaryPointInterval", dikuai.boundaryPointInterval);
if (dikuai.angleThreshold != null) properties.setProperty(landNumber + ".angleThreshold", dikuai.angleThreshold);
@@ -273,6 +277,9 @@
if (dikuai.mowingPattern != null) properties.setProperty(landNumber + ".mowingPattern", dikuai.mowingPattern);
if (dikuai.mowingWidth != null) properties.setProperty(landNumber + ".mowingWidth", dikuai.mowingWidth);
if (dikuai.mowingTrack != null) properties.setProperty(landNumber + ".mowingTrack", dikuai.mowingTrack);
+ if (dikuai.mowingBladeWidth != null) properties.setProperty(landNumber + ".mowingBladeWidth", dikuai.mowingBladeWidth);
+ if (dikuai.mowingOverlapDistance != null) properties.setProperty(landNumber + ".mowingOverlapDistance", dikuai.mowingOverlapDistance);
+ if (dikuai.mowingSafetyDistance != null) properties.setProperty(landNumber + ".mowingSafetyDistance", dikuai.mowingSafetyDistance);
}
try {
@@ -336,22 +343,6 @@
this.plannedPath = plannedPath;
}
- public String getObstacleOriginalCoordinates() {
- return obstacleOriginalCoordinates;
- }
-
- public void setObstacleOriginalCoordinates(String obstacleOriginalCoordinates) {
- this.obstacleOriginalCoordinates = obstacleOriginalCoordinates;
- }
-
- public String getObstacleCoordinates() {
- return obstacleCoordinates;
- }
-
- public void setObstacleCoordinates(String obstacleCoordinates) {
- this.obstacleCoordinates = obstacleCoordinates;
- }
-
public String getReturnPointCoordinates() {
return returnPointCoordinates;
}
@@ -440,6 +431,30 @@
this.mowingTrack = mowingTrack;
}
+ public String getMowingBladeWidth() {
+ return mowingBladeWidth;
+ }
+
+ public void setMowingBladeWidth(String mowingBladeWidth) {
+ this.mowingBladeWidth = mowingBladeWidth;
+ }
+
+ public String getMowingOverlapDistance() {
+ return mowingOverlapDistance;
+ }
+
+ public void setMowingOverlapDistance(String mowingOverlapDistance) {
+ this.mowingOverlapDistance = mowingOverlapDistance;
+ }
+
+ public String getMowingSafetyDistance() {
+ return mowingSafetyDistance;
+ }
+
+ public void setMowingSafetyDistance(String mowingSafetyDistance) {
+ this.mowingSafetyDistance = mowingSafetyDistance;
+ }
+
@Override
public String toString() {
return "Dikuai{" +
@@ -449,8 +464,6 @@
", boundaryOriginalCoordinates='" + boundaryOriginalCoordinates + '\'' +
", boundaryCoordinates='" + boundaryCoordinates + '\'' +
", plannedPath='" + plannedPath + '\'' +
- ", obstacleOriginalCoordinates='" + obstacleOriginalCoordinates + '\'' +
- ", obstacleCoordinates='" + obstacleCoordinates + '\'' +
", returnPointCoordinates='" + returnPointCoordinates + '\'' +
", boundaryPointInterval='" + boundaryPointInterval + '\'' +
", angleThreshold='" + angleThreshold + '\'' +
--
Gitblit v1.10.0