From b272034a1fdbfe32b355fc6c264a4c45df107190 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期二, 23 十二月 2025 14:55:03 +0800
Subject: [PATCH] 优化了新增地块功能
---
src/zhuye/MapRenderer.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 6 deletions(-)
diff --git a/src/zhuye/MapRenderer.java b/src/zhuye/MapRenderer.java
index 9db0014..dfffdf9 100644
--- a/src/zhuye/MapRenderer.java
+++ b/src/zhuye/MapRenderer.java
@@ -112,6 +112,7 @@
private List<Point2D.Double> previewReturnPath; // 棰勮鐨勫線杩旇矾寰�
private List<Point2D.Double> previewOriginalBoundary; // 棰勮鐨勫師濮嬭竟鐣岋紙绱壊锛�
private List<Point2D.Double> previewOptimizedBoundary; // 棰勮鐨勪紭鍖栧悗杈圭晫
+ private boolean showOnlyOriginalBoundary = false; // 鏄惁鍙樉绀哄師濮嬭竟鐣�
private boolean boundaryPreviewActive; // 鏄惁澶勪簬杈圭晫棰勮妯″紡
private static final double TRACK_SAMPLE_MIN_DISTANCE_METERS = 0.2d;
@@ -3155,18 +3156,45 @@
Color purpleFill = new Color(128, 0, 128, 80); // 绱壊鍗婇�忔槑濉厖
Color purpleBorder = new Color(128, 0, 128, 255); // 绱壊杈规
bianjiedrwa.drawBoundary(g2d, previewOriginalBoundary, scale, purpleFill, purpleBorder);
+
+ // 濡傛灉闅愯棌浜嗕紭鍖栬竟鐣岋紝鏄剧ず鍘熷杈圭晫鍧愭爣鐐癸紙娣辩豢鑹插疄蹇冨渾鍦堬級
+ if (showOnlyOriginalBoundary) {
+ drawOriginalBoundaryPointsWithNumbers(g2d, previewOriginalBoundary, scale);
+ }
}
- // 缁樺埗浼樺寲鍚庤竟鐣岋紙缁胯壊锛屼笌姝ｅ父杈圭晫棰滆壊涓�鑷达級
- if (previewOptimizedBoundary != null && previewOptimizedBoundary.size() >= 2) {
- bianjiedrwa.drawBoundary(g2d, previewOptimizedBoundary, scale, GRASS_FILL_COLOR, GRASS_BORDER_COLOR);
-
- // 缁樺埗浼樺寲鍚庤竟鐣屽潗鏍囩偣锛堢传鑹插疄蹇冨渾鍦堬紝鏄剧ず搴忓彿锛�
- drawOptimizedBoundaryPointsWithNumbers(g2d, previewOptimizedBoundary, scale);
+ // 鏍规嵁鏍囧織鍐冲畾鏄惁缁樺埗浼樺寲鍚庤竟鐣�
+ if (!showOnlyOriginalBoundary) {
+ // 缁樺埗浼樺寲鍚庤竟鐣岋紙缁胯壊锛屼笌姝ｅ父杈圭晫棰滆壊涓�鑷达級
+ if (previewOptimizedBoundary != null && previewOptimizedBoundary.size() >= 2) {
+ bianjiedrwa.drawBoundary(g2d, previewOptimizedBoundary, scale, GRASS_FILL_COLOR, GRASS_BORDER_COLOR);
+
+ // 缁樺埗浼樺寲鍚庤竟鐣屽潗鏍囩偣锛堢传鑹插疄蹇冨渾鍦堬紝鏄剧ず搴忓彿锛�
+ drawOptimizedBoundaryPointsWithNumbers(g2d, previewOptimizedBoundary, scale);
+ }
}
}
/**
+ * 璁剧疆鏄惁鍙樉绀哄師濮嬭竟鐣�
+ * @param showOnlyOriginal 濡傛灉涓簍rue锛屽彧鏄剧ず鍘熷杈圭晫锛涘鏋滀负false锛屾樉绀哄師濮嬭竟鐣屽拰浼樺寲杈圭晫
+ */
+ public void setShowOnlyOriginalBoundary(boolean showOnlyOriginal) {
+ this.showOnlyOriginalBoundary = showOnlyOriginal;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+
+ /**
+ * 鑾峰彇鏄惁鍙樉绀哄師濮嬭竟鐣�
+ * @return 濡傛灉鍙樉绀哄師濮嬭竟鐣岃繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
+ */
+ public boolean isShowOnlyOriginalBoundary() {
+ return showOnlyOriginalBoundary;
+ }
+
+ /**
* 缁樺埗浼樺寲鍚庤竟鐣屽潗鏍囩偣锛堢传鑹插疄蹇冨渾鍦堬紝鏄剧ず搴忓彿锛�
* 搴忓彿鏄剧ず鍦ㄧ偣涓績锛屽瓧浣撳ぇ灏�11鍙凤紝涓嶉殢缂╂斁鍙樺寲
*/
@@ -3240,6 +3268,79 @@
}
/**
+ * 缁樺埗鍘熷杈圭晫鍧愭爣鐐癸紙娣辩豢鑹插疄蹇冨渾鍦堬紝鏄剧ず搴忓彿锛�
+ * 鍙湪闅愯棌浼樺寲杈圭晫鏃舵樉绀�
+ */
+ private void drawOriginalBoundaryPointsWithNumbers(Graphics2D g2d, List<Point2D.Double> boundary, double scale) {
+ if (boundary == null || boundary.isEmpty()) {
+ return;
+ }
+
+ // 淇濆瓨鍘熷鍙樻崲
+ AffineTransform originalTransform = g2d.getTransform();
+
+ // 璁剧疆鐐圭殑澶у皬锛堝疄蹇冨渾鍦堬紝鐩村緞绾�0.3绫筹紝涓庝紭鍖栧悗杈圭晫鍧愭爣鐐瑰ぇ灏忎竴鑷达級
+ double scaleFactor = Math.max(0.5, scale);
+ double markerDiameter = 0.3; // 鍦嗗湀鐩村緞锛堢背锛�
+ double markerRadius = markerDiameter / 2.0;
+
+ // 璁剧疆瀛椾綋锛�11鍙凤紝涓嶉殢缂╂斁鍙樺寲锛�
+ Font labelFont = new Font("寰蒋闆呴粦", Font.PLAIN, 11);
+ g2d.setFont(labelFont);
+ FontMetrics fontMetrics = g2d.getFontMetrics(labelFont);
+
+ // 娣辩豢鑹插疄蹇冨渾鍦堥鑹�
+ Color darkGreenColor = new Color(0, 100, 0, 255); // 娣辩豢鑹�
+
+ // 缁樺埗姣忎釜鐐瑰強鍏跺簭鍙�
+ for (int i = 0; i < boundary.size(); i++) {
+ Point2D.Double point = boundary.get(i);
+ double x = point.x;
+ double y = point.y;
+
+ // 缁樺埗娣辩豢鑹插疄蹇冨渾鍦堬紙鍦ㄤ笘鐣屽潗鏍囩郴涓紝闅忕缉鏀惧彉鍖栵級
+ g2d.setColor(darkGreenColor);
+ Ellipse2D.Double marker = new Ellipse2D.Double(
+ x - markerRadius,
+ y - markerRadius,
+ markerDiameter,
+ markerDiameter
+ );
+ g2d.fill(marker);
+
+ // 灏嗕笘鐣屽潗鏍囪浆鎹负灞忓箷鍧愭爣浠ョ粯鍒跺簭鍙凤紙涓嶉殢缂╂斁鍙樺寲锛�
+ Point2D.Double worldPoint = new Point2D.Double(x, y);
+ Point2D.Double screenPoint = new Point2D.Double();
+ originalTransform.transform(worldPoint, screenPoint);
+
+ // 淇濆瓨褰撳墠鍙樻崲
+ AffineTransform savedTransform = g2d.getTransform();
+
+ // 閲嶇疆鍙樻崲涓哄睆骞曞潗鏍囩郴缁�
+ g2d.setTransform(new AffineTransform());
+
+ // 缁樺埗搴忓彿锛堝湪灞忓箷鍧愭爣绯讳腑锛屼笉闅忕缉鏀惧彉鍖栵級
+ String numberText = String.valueOf(i + 1);
+ int textWidth = fontMetrics.stringWidth(numberText);
+ int textHeight = fontMetrics.getHeight();
+
+ // 鍦ㄧ偣涓績缁樺埗搴忓彿
+ int textX = (int)(screenPoint.x - textWidth / 2.0);
+ int textY = (int)(screenPoint.y + textHeight / 4.0);
+
+ // 缁樺埗搴忓彿鏂囧瓧锛堥粦鑹诧級
+ g2d.setColor(Color.BLACK);
+ g2d.drawString(numberText, textX, textY);
+
+ // 鎭㈠鍙樻崲
+ g2d.setTransform(savedTransform);
+ }
+
+ // 鎭㈠鍘熷鍙樻崲
+ g2d.setTransform(originalTransform);
+ }
+
+ /**
* 澶勭悊浼樺寲鍚庤竟鐣屽潗鏍囩偣鐐瑰嚮
* @param screenPoint 灞忓箷鍧愭爣鐐�
* @return 鏄惁澶勭悊浜嗙偣鍑�
--
Gitblit v1.10.0