From c498385fb7e372d13e2ee76d7b54ae2381728082 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期三, 17 十二月 2025 19:35:57 +0800
Subject: [PATCH] 新增了测量模式
---
src/zhuye/MapRenderer.java | 185 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 177 insertions(+), 8 deletions(-)
diff --git a/src/zhuye/MapRenderer.java b/src/zhuye/MapRenderer.java
index 78bbf86..368e316 100644
--- a/src/zhuye/MapRenderer.java
+++ b/src/zhuye/MapRenderer.java
@@ -98,6 +98,7 @@
private double mowingCompletionRatio;
private long lastTrackPersistTimeMillis;
private boolean trackDirty;
+ private boolean measurementModeActive = false; // 娴嬮噺妯″紡鏄惁婵�娲�
private boolean handheldBoundaryPreviewActive;
private boolean pendingTrackBreak = true;
private boolean idleTrailSuppressed;
@@ -214,6 +215,10 @@
if (!SwingUtilities.isLeftMouseButton(e) || e.getClickCount() != 1) {
return;
}
+ // 浼樺厛澶勭悊娴嬮噺妯″紡鐐瑰嚮
+ if (measurementModeActive && handleMeasurementClick(e.getPoint())) {
+ return;
+ }
if (handleMowerClick(e.getPoint())) {
return;
}
@@ -415,6 +420,11 @@
drawMower(g2d);
+ // 缁樺埗娴嬮噺妯″紡锛堝鏋滄縺娲伙級
+ if (measurementModeActive) {
+ drawMeasurementMode(g2d, scale);
+ }
+
// 淇濆瓨褰撳墠鍙樻崲锛堝寘鍚鍥惧彉鎹級鐢ㄤ簬鍧愭爣杞崲
AffineTransform currentTransformForLength = g2d.getTransform();
@@ -1048,6 +1058,145 @@
double worldY = (screenPoint.y - visualizationPanel.getHeight() / 2.0) / scale - translateY;
return new Point2D.Double(worldX, worldY);
}
+
+ /**
+ * 澶勭悊娴嬮噺妯″紡鐐瑰嚮
+ */
+ private boolean handleMeasurementClick(Point screenPoint) {
+ if (!measurementModeActive) {
+ return false;
+ }
+ Point2D.Double worldPoint = screenToWorld(screenPoint);
+ celiangmoshi.addPoint(worldPoint);
+ visualizationPanel.repaint();
+ return true;
+ }
+
+ /**
+ * 璁剧疆娴嬮噺妯″紡
+ */
+ public void setMeasurementMode(boolean active) {
+ measurementModeActive = active;
+ if (!active) {
+ celiangmoshi.clear();
+ }
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+
+ /**
+ * 瑙﹀彂鍦板浘閲嶇粯
+ */
+ public void repaint() {
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+
+ /**
+ * 缁樺埗娴嬮噺妯″紡
+ */
+ private void drawMeasurementMode(Graphics2D g2d, double scale) {
+ List<Point2D.Double> points = celiangmoshi.getPoints();
+ if (points.isEmpty()) {
+ return;
+ }
+
+ // 淇濆瓨鍘熷鍙樻崲
+ AffineTransform originalTransform = g2d.getTransform();
+
+ // 璁剧疆娴嬮噺妯″紡棰滆壊
+ Color lineColor = new Color(255, 0, 0, 200); // 绾㈣壊鍗婇�忔槑
+ Color pointColor = new Color(255, 0, 0, 255); // 绾㈣壊
+ Color textColor = new Color(33, 37, 41, 220); // 娣辩伆鑹叉枃瀛�
+
+ // 璁剧疆绾垮鍜岀偣鐨勫ぇ灏忥紙纭繚鐐瑰拰绾胯繛鎺ワ級
+ float lineWidth = (float)(2.0 / scale);
+ // 鐐圭殑澶у皬锛堝湪涓栫晫鍧愭爣绯讳腑锛岀背锛夛紝纭繚鐐硅冻澶熷ぇ浠ヨ鐩栫嚎鐨勭鐐�
+ double pointSizeInWorld = 0.15d; // 鐐圭殑澶у皬锛堢背锛�
+ double halfSize = pointSizeInWorld / 2.0;
+
+ // 鍏堢粯鍒舵墍鏈夋祴閲忕偣锛堜綔涓哄熀纭�灞傦級
+ g2d.setColor(pointColor);
+ for (Point2D.Double point : points) {
+ // 鐐圭殑涓績鍦� point.x, point.y
+ Ellipse2D.Double pointShape = new Ellipse2D.Double(
+ point.x - halfSize,
+ point.y - halfSize,
+ pointSizeInWorld,
+ pointSizeInWorld
+ );
+ g2d.fill(pointShape);
+ }
+
+ // 鐒跺悗缁樺埗杩炵嚎锛岀‘淇濈嚎浠庣偣鐨勪腑蹇冨紑濮嬪拰缁撴潫锛岀偣鍜岀嚎杩炴帴鍦ㄤ竴璧�
+ g2d.setColor(lineColor);
+ g2d.setStroke(new BasicStroke(lineWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+
+ // 缁樺埗杩炵嚎鍜岃窛绂绘枃瀛楋紙鏄剧ず涓や釜鐩搁偦鐐硅繛绾跨殑闀垮害锛�
+ for (int i = 0; i < points.size() - 1; i++) {
+ Point2D.Double p1 = points.get(i);
+ Point2D.Double p2 = points.get(i + 1);
+
+ // 缁樺埗杩炵嚎锛堜粠绗竴涓偣鐨勪腑蹇冨埌绗簩涓偣鐨勪腑蹇冿級
+ // 浣跨敤 Path2D 纭繚绮剧‘缁樺埗锛屼繚鎸佹诞鐐圭簿搴�
+ Path2D.Double linePath = new Path2D.Double();
+ linePath.moveTo(p1.x, p1.y);
+ linePath.lineTo(p2.x, p2.y);
+ g2d.draw(linePath);
+
+ // 璁＄畻璺濈锛堜袱涓浉閭荤偣杩炵嚎鐨勯暱搴︼級
+ double distance = celiangmoshi.calculateDistance(p1, p2);
+ String distanceText = celiangmoshi.formatDistance(distance);
+
+ // 璁＄畻涓偣浣嶇疆锛堢敤浜庢樉绀烘枃瀛楋級
+ double midX = (p1.x + p2.x) / 2.0;
+ double midY = (p1.y + p2.y) / 2.0;
+
+ // 灏嗕笘鐣屽潗鏍囪浆鎹负灞忓箷鍧愭爣锛堢敤浜庢枃瀛楁樉绀猴級
+ Point2D.Double worldMid = new Point2D.Double(midX, midY);
+ Point2D.Double screenMid = worldToScreen(worldMid);
+
+ // 鎭㈠鍘熷鍙樻崲浠ョ粯鍒舵枃瀛楋紙鍥哄畾澶у皬锛屼笉闅忕缉鏀惧彉鍖栵級
+ g2d.setTransform(new AffineTransform());
+
+ // 璁剧疆瀛椾綋锛堜笌缂╂斁鏂囧瓧澶у皬涓�鑷达紝11鍙峰瓧浣擄級
+ Font labelFont = new Font("寰蒋闆呴粦", Font.PLAIN, 11);
+ g2d.setFont(labelFont);
+ FontMetrics metrics = g2d.getFontMetrics(labelFont);
+
+ // 璁＄畻鏂囧瓧浣嶇疆锛堝眳涓樉绀猴級
+ int textWidth = metrics.stringWidth(distanceText);
+ int textHeight = metrics.getHeight();
+ int textX = (int)Math.round(screenMid.x - textWidth / 2.0);
+ int textY = (int)Math.round(screenMid.y - textHeight / 2.0) + metrics.getAscent();
+
+ // 缁樺埗鏂囧瓧鑳屾櫙锛堝彲閫夛紝鐢ㄤ簬鎻愰珮鍙鎬э級
+ g2d.setColor(new Color(255, 255, 255, 200));
+ g2d.fillRoundRect(textX - 2, textY - metrics.getAscent() - 2, textWidth + 4, textHeight + 4, 4, 4);
+
+ // 缁樺埗鏂囧瓧
+ g2d.setColor(textColor);
+ g2d.drawString(distanceText, textX, textY);
+
+ // 鎭㈠鍙樻崲
+ g2d.setTransform(originalTransform);
+ }
+
+ // 鏈�鍚庡啀娆＄粯鍒舵祴閲忕偣锛堝湪杩炵嚎涔嬩笂锛岀‘淇濈偣瑕嗙洊鍦ㄧ嚎鐨勭鐐逛笂锛岀偣鍜岀嚎杩炴帴鍦ㄤ竴璧凤級
+ g2d.setColor(pointColor);
+ for (Point2D.Double point : points) {
+ // 鐐圭殑涓績鍦� point.x, point.y锛屾濂芥槸绾跨殑绔偣浣嶇疆
+ Ellipse2D.Double pointShape = new Ellipse2D.Double(
+ point.x - halfSize,
+ point.y - halfSize,
+ pointSizeInWorld,
+ pointSizeInWorld
+ );
+ g2d.fill(pointShape);
+ }
+ }
private void drawCurrentBoundary(Graphics2D g2d) {
bianjiedrwa.drawBoundary(g2d, currentBoundary, scale, GRASS_FILL_COLOR, GRASS_BORDER_COLOR);
@@ -1062,33 +1211,53 @@
if (markers == null || markers.isEmpty()) {
return;
}
+
+ // 淇濆瓨鍘熷鍙樻崲
+ AffineTransform originalTransform = g2d.getTransform();
+
Shape markerShape;
double half = CIRCLE_SAMPLE_SIZE / 2.0;
g2d.setColor(CIRCLE_SAMPLE_COLOR);
g2d.setStroke(new BasicStroke((float) (1.2f / scale), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
- Font originalFont = g2d.getFont();
- float baseSize = (float) Math.max(12f / scale, 9f);
- float reducedSize = Math.max(baseSize / 3f, 3f);
- Font labelFont = originalFont.deriveFont(reducedSize);
+
+ // 璁剧疆瀛椾綋锛堜笌缂╂斁鏂囧瓧澶у皬涓�鑷达紝11鍙峰瓧浣擄紝涓嶉殢缂╂斁鍙樺寲锛�
+ Font labelFont = new Font("寰蒋闆呴粦", Font.PLAIN, 11);
g2d.setFont(labelFont);
- FontMetrics metrics = g2d.getFontMetrics();
+ FontMetrics metrics = g2d.getFontMetrics(labelFont);
+
for (double[] pt : markers) {
if (pt == null || pt.length < 2 || !Double.isFinite(pt[0]) || !Double.isFinite(pt[1])) {
continue;
}
double x = pt[0];
double y = pt[1];
+
+ // 缁樺埗鐐癸紙鍦ㄤ笘鐣屽潗鏍囩郴涓紝闅忕缉鏀惧彉鍖栵級
markerShape = new Ellipse2D.Double(x - half, y - half, CIRCLE_SAMPLE_SIZE, CIRCLE_SAMPLE_SIZE);
g2d.fill(markerShape);
+
+ // 灏嗕笘鐣屽潗鏍囪浆鎹负灞忓箷鍧愭爣浠ョ粯鍒舵枃瀛楋紙涓嶉殢缂╂斁鍙樺寲锛�
+ Point2D.Double worldPoint = new Point2D.Double(x, y);
+ Point2D.Double screenPoint = new Point2D.Double();
+ originalTransform.transform(worldPoint, screenPoint);
+
+ // 鎭㈠鍘熷鍙樻崲浠ヤ娇鐢ㄥ睆骞曞潗鏍囩粯鍒舵枃瀛�
+ g2d.setTransform(new AffineTransform());
+
String label = String.format(Locale.US, "%.2f,%.2f", x, y);
int textWidth = metrics.stringWidth(label);
- float textX = (float) (x - textWidth / 2.0);
- float textY = (float) (y - half - 0.2d) - metrics.getDescent();
+ int textHeight = metrics.getHeight();
+
+ // 鍦ㄥ睆骞曞潗鏍囩郴涓粯鍒舵枃瀛楋紙涓嶉殢缂╂斁鍙樺寲锛�
+ int textX = (int)(screenPoint.x - textWidth / 2.0);
+ int textY = (int)(screenPoint.y - half - 0.2d) - metrics.getDescent();
g2d.setColor(new Color(33, 37, 41, 220));
g2d.drawString(label, textX, textY);
+
+ // 鎭㈠鍘熷鍙樻崲
+ g2d.setTransform(originalTransform);
g2d.setColor(CIRCLE_SAMPLE_COLOR);
}
- g2d.setFont(originalFont);
}
private void drawCircleCaptureOverlay(Graphics2D g2d, CircleCaptureOverlay overlay, double scale) {
--
Gitblit v1.10.0