From 5d6d890cfd10466d5d14ff5177adcc888baaa0e4 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期三, 17 十二月 2025 17:46:13 +0800
Subject: [PATCH] 新增了边界距离显示优化了设置页面布局
---
src/zhuye/MapRenderer.java | 551 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 533 insertions(+), 18 deletions(-)
diff --git a/src/zhuye/MapRenderer.java b/src/zhuye/MapRenderer.java
index 635a1b1..78bbf86 100644
--- a/src/zhuye/MapRenderer.java
+++ b/src/zhuye/MapRenderer.java
@@ -18,6 +18,8 @@
import java.util.List;
import java.util.Locale;
import java.util.Set;
+import java.io.File;
+import set.Setsys;
import gecaoji.Device;
import gecaoji.Gecaoji;
import gecaoji.GecaojiMeg;
@@ -35,13 +37,15 @@
*/
public class MapRenderer {
// 瑙嗗浘鍙樻崲鍙傛暟
- private double scale = 1.0;
+ private static final double DEFAULT_SCALE = 20.0; // 榛樿缂╂斁姣斾緥
+ private double scale = DEFAULT_SCALE;
private double translateX = 0.0;
private double translateY = 0.0;
private Point lastDragPoint;
private static final double MIN_SCALE = 0.05d;
private static final double MAX_SCALE = 50.0d;
private static final double SCALE_EPSILON = 1e-6d;
+ private static final String MAP_SCALE_PROPERTY = "mapScale"; // 灞炴�ф枃浠朵腑鐨勯敭鍚�
// 涓婚棰滆壊
private final Color THEME_COLOR = new Color(46, 139, 87);
@@ -49,6 +53,7 @@
private static final Color GRASS_FILL_COLOR = new Color(144, 238, 144, 120);
private static final Color GRASS_BORDER_COLOR = new Color(60, 179, 113);
private static final Color BOUNDARY_POINT_COLOR = new Color(128, 0, 128);
+ private static final Color OBSTACLE_POINT_COLOR = new Color(255, 140, 0); // 姗欒壊锛岀敤浜庡尯鍒嗛殰纰嶇墿鐐�
private static final Color CIRCLE_SAMPLE_COLOR = new Color(220, 20, 60, 230);
private static final double CIRCLE_SAMPLE_SIZE = 0.54d;
private static final double BOUNDARY_POINT_MERGE_THRESHOLD = 0.05;
@@ -68,6 +73,8 @@
private String currentObstacleLandNumber;
private String boundaryName;
private boolean boundaryPointsVisible;
+ private boolean obstaclePointsVisible;
+ private boolean boundaryLengthVisible = false; // 鏄惁鏄剧ず杈圭晫璺濈锛岄粯璁ゅ叧闂�
private double boundaryPointSizeScale = 1.0d;
private boolean previewSizingEnabled;
private String currentBoundaryLandNumber;
@@ -111,6 +118,64 @@
this.mowerUpdateTimer = createMowerTimer();
this.mowerInfoManager = new GecaojiMeg(visualizationPanel, mower);
setupMouseListeners();
+ // 浠庨厤缃枃浠惰鍙栦笂娆′繚瀛樼殑缂╂斁姣斾緥鍜岃鍥句腑蹇冨潗鏍�
+ loadViewSettingsFromProperties();
+ }
+
+ /**
+ * 浠庨厤缃枃浠惰鍙栫缉鏀炬瘮渚嬪拰瑙嗗浘涓績鍧愭爣
+ */
+ private void loadViewSettingsFromProperties() {
+ // 鍔犺浇缂╂斁姣斾緥
+ String scaleValue = Setsys.getPropertyValue(MAP_SCALE_PROPERTY);
+ if (scaleValue != null && !scaleValue.trim().isEmpty()) {
+ try {
+ double savedScale = Double.parseDouble(scaleValue.trim());
+ // 楠岃瘉缂╂斁姣斾緥鏄惁鍦ㄦ湁鏁堣寖鍥村唴
+ if (savedScale >= MIN_SCALE && savedScale <= MAX_SCALE) {
+ scale = savedScale;
+ } else {
+ scale = DEFAULT_SCALE;
+ }
+ } catch (NumberFormatException e) {
+ // 濡傛灉瑙ｆ瀽澶辫触锛屼娇鐢ㄩ粯璁ゅ��
+ scale = DEFAULT_SCALE;
+ }
+ } else {
+ // 濡傛灉娌℃湁淇濆瓨鐨勫�硷紝浣跨敤榛樿鍊�
+ scale = DEFAULT_SCALE;
+ }
+
+ // 鍔犺浇瑙嗗浘涓績鍧愭爣
+ String viewCenterXValue = Setsys.getPropertyValue("viewCenterX");
+ String viewCenterYValue = Setsys.getPropertyValue("viewCenterY");
+ if (viewCenterXValue != null && !viewCenterXValue.trim().isEmpty()) {
+ try {
+ translateX = Double.parseDouble(viewCenterXValue.trim());
+ } catch (NumberFormatException e) {
+ translateX = 0.0;
+ }
+ } else {
+ translateX = 0.0;
+ }
+ if (viewCenterYValue != null && !viewCenterYValue.trim().isEmpty()) {
+ try {
+ translateY = Double.parseDouble(viewCenterYValue.trim());
+ } catch (NumberFormatException e) {
+ translateY = 0.0;
+ }
+ } else {
+ translateY = 0.0;
+ }
+ }
+
+ /**
+ * 淇濆瓨缂╂斁姣斾緥鍒伴厤缃枃浠�
+ */
+ private void saveScaleToProperties() {
+ Setsys setsys = new Setsys();
+ // 淇濈暀2浣嶅皬鏁�
+ setsys.updateProperty(MAP_SCALE_PROPERTY, String.format("%.2f", scale));
}
/**
@@ -152,6 +217,11 @@
if (handleMowerClick(e.getPoint())) {
return;
}
+ // 浼樺厛澶勭悊闅滅鐗╄竟鐣岀偣鐐瑰嚮锛堝鏋滃彲瑙侊級
+ if (obstaclePointsVisible && handleObstaclePointClick(e.getPoint())) {
+ return;
+ }
+ // 鐒跺悗澶勭悊鍦板潡杈圭晫鐐圭偣鍑�
if (boundaryPointsVisible) {
handleBoundaryPointClick(e.getPoint());
}
@@ -218,6 +288,8 @@
translateX += (newWorldX - worldX);
translateY += (newWorldY - worldY);
+ // 淇濆瓨缂╂斁姣斾緥鍒伴厤缃枃浠�
+ saveScaleToProperties();
visualizationPanel.repaint();
}
@@ -253,9 +325,11 @@
* 閲嶇疆瑙嗗浘
*/
public void resetView() {
- scale = 1.0;
+ scale = DEFAULT_SCALE;
translateX = 0.0;
translateY = 0.0;
+ // 淇濆瓨缂╂斁姣斾緥鍒伴厤缃枃浠�
+ saveScaleToProperties();
visualizationPanel.repaint();
}
@@ -281,14 +355,11 @@
boolean hasPlannedPath = currentPlannedPath != null && currentPlannedPath.size() >= 2;
boolean hasObstacles = currentObstacles != null && !currentObstacles.isEmpty();
+ // 缁樺埗鍦板潡杈圭晫锛堝簳灞傦級
if (hasBoundary) {
drawCurrentBoundary(g2d);
}
- if (hasObstacles) {
- Obstacledraw.drawObstacles(g2d, currentObstacles, scale, selectedObstacleName);
- }
-
yulanzhangaiwu.renderPreview(g2d, scale);
if (!circleSampleMarkers.isEmpty()) {
@@ -301,20 +372,37 @@
adddikuaiyulan.drawPreview(g2d, handheldBoundaryPreview, scale, handheldBoundaryPreviewActive, boundaryPreviewMarkerScale);
+ // 缁樺埗瀵艰埅璺緞锛堜腑灞傦級
if (hasPlannedPath) {
drawCurrentPlannedPath(g2d);
}
- if (boundaryPointsVisible && hasBoundary) {
- double markerScale = boundaryPointSizeScale * (previewSizingEnabled ? PREVIEW_BOUNDARY_MARKER_SCALE : 1.0d);
- pointandnumber.drawBoundaryPoints(
- g2d,
- currentBoundary,
- scale,
- BOUNDARY_POINT_MERGE_THRESHOLD,
- BOUNDARY_POINT_COLOR,
- markerScale
- );
+ // 缁樺埗闅滅鐗╋紙椤跺眰锛屾樉绀哄湪鍦板潡鍜屽鑸矾寰勪笂鏂癸級
+ if (hasObstacles) {
+ Obstacledraw.drawObstacles(g2d, currentObstacles, scale, selectedObstacleName);
+ }
+
+ // 鏄剧ず杈圭晫鐐癸紙濡傛灉杈圭晫鐐瑰彲瑙侊紝鎴栬�呰竟鐣岃窛绂诲彲瑙侊級
+ if ((boundaryPointsVisible || boundaryLengthVisible) && hasBoundary) {
+ // 棰勮妯″紡涓嬫樉绀哄簭鍙�
+ if (previewSizingEnabled) {
+ drawBoundaryPointsWithNumbers(g2d, currentBoundary, scale);
+ } else {
+ double markerScale = boundaryPointSizeScale;
+ pointandnumber.drawBoundaryPoints(
+ g2d,
+ currentBoundary,
+ scale,
+ BOUNDARY_POINT_MERGE_THRESHOLD,
+ BOUNDARY_POINT_COLOR,
+ markerScale
+ );
+ }
+ }
+
+ // 缁樺埗闅滅鐗╁潗鏍囩偣锛堝甫搴忓彿锛�
+ if (obstaclePointsVisible && hasObstacles) {
+ drawObstaclePointsWithNumbers(g2d, currentObstacles, scale);
}
if (shouldRenderIdleTrail()) {
@@ -327,9 +415,18 @@
drawMower(g2d);
+ // 淇濆瓨褰撳墠鍙樻崲锛堝寘鍚鍥惧彉鎹級鐢ㄤ簬鍧愭爣杞崲
+ AffineTransform currentTransformForLength = g2d.getTransform();
+
// 鎭㈠鍘熷鍙樻崲
g2d.setTransform(originalTransform);
+ // 缁樺埗杈圭晫闀垮害锛堝鏋滃惎鐢級- 鍦ㄦ仮澶嶅師濮嬪彉鎹㈠悗缁樺埗
+ if (boundaryLengthVisible && hasBoundary) {
+ bianjie.BoundaryLengthDrawer.drawBoundaryLengths(g2d, currentBoundary, scale,
+ visualizationPanel.getWidth(), visualizationPanel.getHeight(), translateX, translateY);
+ }
+
// 缁樺埗瑙嗗浘淇℃伅
drawViewInfo(g2d);
}
@@ -482,7 +579,8 @@
if (device == null) {
return;
}
- if (!isHighPrecisionFix(device.getPositioningStatus())) {
+ // 浣跨敤鏇村鏉剧殑瀹氫綅鐘舵�佸垽鏂紝鍏佽鐘舵��1鍜�4鏄剧ず鎷栧熬
+ if (!isValidFixForTrail(device.getPositioningStatus())) {
return;
}
@@ -504,6 +602,56 @@
idleMowerTrail.addLast(new tuowei.TrailSample(now, new Point2D.Double(position.x, position.y)));
pruneIdleMowerTrail(now);
}
+
+ /**
+ * 寮哄埗鏇存柊鎷栧熬锛堢敤浜庢敹鍒�$GNGGA鏁版嵁鏃剁珛鍗虫洿鏂帮級
+ * 杩欎釜鏂规硶浼氬埛鏂癿ower浣嶇疆骞剁珛鍗虫坊鍔犲埌鎷栧熬
+ */
+ public void forceUpdateIdleMowerTrail() {
+ long now = System.currentTimeMillis();
+ pruneIdleMowerTrail(now);
+
+ if (idleTrailSuppressed || realtimeTrackRecording) {
+ if (!idleMowerTrail.isEmpty()) {
+ clearIdleMowerTrail();
+ }
+ return;
+ }
+
+ Device device = Device.getGecaoji();
+ if (device == null) {
+ return;
+ }
+ // 浣跨敤鏇村鏉剧殑瀹氫綅鐘舵�佸垽鏂紝鍏佽鐘舵��1鍜�4鏄剧ず鎷栧熬
+ if (!isValidFixForTrail(device.getPositioningStatus())) {
+ return;
+ }
+
+ // 鍒锋柊mower浣嶇疆锛屼娇鐢ㄦ渶鏂扮殑Device鏁版嵁
+ mower.refreshFromDevice();
+ Point2D.Double position = mower.getPosition();
+ if (position == null || !Double.isFinite(position.x) || !Double.isFinite(position.y)) {
+ return;
+ }
+
+ tuowei.TrailSample lastSample = idleMowerTrail.peekLast();
+ if (lastSample != null) {
+ Point2D.Double lastPoint = lastSample.getPoint();
+ double dx = position.x - lastPoint.x;
+ double dy = position.y - lastPoint.y;
+ if (Math.hypot(dx, dy) < IDLE_TRAIL_SAMPLE_DISTANCE_METERS) {
+ return;
+ }
+ }
+
+ idleMowerTrail.addLast(new tuowei.TrailSample(now, new Point2D.Double(position.x, position.y)));
+ pruneIdleMowerTrail(now);
+
+ // 绔嬪嵆閲嶇粯锛岀‘淇濇嫋灏惧強鏃舵樉绀�
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
private void pruneIdleMowerTrail(long now) {
if (idleMowerTrail.isEmpty()) {
@@ -1047,6 +1195,139 @@
}
}
+ /**
+ * 澶勭悊闅滅鐗╄竟鐣岀偣鐐瑰嚮
+ * @param screenPoint 灞忓箷鍧愭爣鐐�
+ * @return 濡傛灉澶勭悊浜嗙偣鍑昏繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
+ */
+ private boolean handleObstaclePointClick(Point screenPoint) {
+ if (currentObstacles == null || currentObstacles.isEmpty() || currentObstacleLandNumber == null) {
+ return false;
+ }
+
+ double threshold = computeSelectionThresholdPixels();
+
+ // 閬嶅巻鎵�鏈夐殰纰嶇墿锛屾壘鍒拌鐐瑰嚮鐨勭偣
+ for (Obstacledge.Obstacle obstacle : currentObstacles) {
+ if (obstacle == null) {
+ continue;
+ }
+
+ List<Obstacledge.XYCoordinate> xyCoords = obstacle.getXyCoordinates();
+ if (xyCoords == null || xyCoords.isEmpty()) {
+ continue;
+ }
+
+ // 妫�鏌ユ瘡涓偣
+ for (int i = 0; i < xyCoords.size(); i++) {
+ Obstacledge.XYCoordinate coord = xyCoords.get(i);
+ Point2D.Double worldPoint = new Point2D.Double(coord.getX(), coord.getY());
+ Point2D.Double screenPosition = worldToScreen(worldPoint);
+
+ double dx = screenPosition.x - screenPoint.x;
+ double dy = screenPosition.y - screenPoint.y;
+ if (Math.hypot(dx, dy) <= threshold) {
+ // 鎵惧埌琚偣鍑荤殑鐐�
+ String obstacleName = obstacle.getObstacleName();
+ String pointLabel = (i + 1) + "";
+ String message = "纭畾瑕佸垹闄ら殰纰嶇墿 \"" + obstacleName + "\" 鐨勭" + pointLabel + "鍙疯竟鐣岀偣鍚楋紵";
+
+ int choice = JOptionPane.showConfirmDialog(
+ visualizationPanel,
+ message,
+ "鍒犻櫎闅滅鐗╄竟鐣岀偣",
+ JOptionPane.OK_CANCEL_OPTION,
+ JOptionPane.WARNING_MESSAGE
+ );
+
+ if (choice == JOptionPane.OK_OPTION) {
+ removeObstaclePoint(obstacle, i);
+ }
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * 鍒犻櫎闅滅鐗╃殑鎸囧畾杈圭晫鐐�
+ */
+ private void removeObstaclePoint(Obstacledge.Obstacle obstacle, int pointIndex) {
+ if (obstacle == null || currentObstacleLandNumber == null) {
+ return;
+ }
+
+ List<Obstacledge.XYCoordinate> xyCoords = obstacle.getXyCoordinates();
+ if (xyCoords == null || pointIndex < 0 || pointIndex >= xyCoords.size()) {
+ return;
+ }
+
+ // 妫�鏌ュ垹闄ゅ悗鏄惁杩樻湁瓒冲鐨勭偣
+ Obstacledge.ObstacleShape shape = obstacle.getShape();
+ int minPoints = (shape == Obstacledge.ObstacleShape.CIRCLE) ? 2 : 3;
+
+ if (xyCoords.size() <= minPoints) {
+ JOptionPane.showMessageDialog(
+ visualizationPanel,
+ "闅滅鐗╄嚦灏戦渶瑕�" + minPoints + "涓偣锛屾棤娉曞垹闄�",
+ "鎻愮ず",
+ JOptionPane.INFORMATION_MESSAGE
+ );
+ return;
+ }
+
+ // 鍒涘缓鏂扮殑鍧愭爣鍒楄〃锛堢Щ闄ゆ寚瀹氱偣锛�
+ List<Obstacledge.XYCoordinate> updatedCoords = new ArrayList<>(xyCoords);
+ updatedCoords.remove(pointIndex);
+
+ // 鏇存柊闅滅鐗╁潗鏍�
+ obstacle.setXyCoordinates(updatedCoords);
+
+ // 淇濆瓨鍒伴厤缃枃浠�
+ try {
+ File configFile = new File("Obstacledge.properties");
+ Obstacledge.ConfigManager manager = new Obstacledge.ConfigManager();
+ if (configFile.exists()) {
+ manager.loadFromFile(configFile.getAbsolutePath());
+ }
+
+ Obstacledge.Plot plot = manager.getPlotById(currentObstacleLandNumber.trim());
+ if (plot != null) {
+ // 绉婚櫎鏃ч殰纰嶇墿骞舵坊鍔犳洿鏂板悗鐨勯殰纰嶇墿
+ plot.removeObstacleByName(obstacle.getObstacleName());
+ plot.addObstacle(obstacle);
+ manager.saveToFile(configFile.getAbsolutePath());
+
+ // 鏇存柊鍦板潡鏇存柊鏃堕棿
+ Dikuai.updateField(currentObstacleLandNumber.trim(), "updateTime",
+ new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date()));
+ Dikuai.saveToProperties();
+
+ // 閲嶆柊鍔犺浇闅滅鐗╂暟鎹互鍒锋柊鏄剧ず
+ List<Obstacledge.Obstacle> updatedObstacles = new ArrayList<>();
+ for (Obstacledge.Obstacle obs : currentObstacles) {
+ if (obs.getObstacleName().equals(obstacle.getObstacleName())) {
+ updatedObstacles.add(obstacle); // 浣跨敤鏇存柊鍚庣殑闅滅鐗�
+ } else {
+ updatedObstacles.add(obs); // 淇濇寔鍏朵粬闅滅鐗╀笉鍙�
+ }
+ }
+ applyObstaclesToRenderer(updatedObstacles, currentObstacleLandNumber);
+ visualizationPanel.repaint();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ JOptionPane.showMessageDialog(
+ visualizationPanel,
+ "淇濆瓨澶辫触: " + ex.getMessage(),
+ "閿欒",
+ JOptionPane.ERROR_MESSAGE
+ );
+ }
+ }
+
private void handleBoundaryPointClick(Point screenPoint) {
if (currentBoundary == null || currentBoundaryLandNumber == null) {
return;
@@ -1233,6 +1514,32 @@
return false;
}
}
+
+ /**
+ * 鍒ゆ柇瀹氫綅鐘舵�佹槸鍚︽湁鏁堬紝鍙敤浜庢樉绀烘嫋灏�
+ * 鎺ュ彈鐘舵��1锛堝崟鐐瑰畾浣嶏級銆�2锛堢爜宸垎锛夈��3锛堟棤鏁圥PS锛夈��4锛堝浐瀹氳В锛夈��5锛堟诞鐐硅В锛�
+ */
+ private boolean isValidFixForTrail(String fixQuality) {
+ if (fixQuality == null) {
+ return false;
+ }
+ String trimmed = fixQuality.trim();
+ if (trimmed.isEmpty()) {
+ return false;
+ }
+ // 鎺ュ彈鐘舵��1,2,3,4,5锛堝彧瑕佷笉鏄�0鎴栨棤鏁堢姸鎬侊級
+ if ("1".equals(trimmed) || "2".equals(trimmed) || "3".equals(trimmed) ||
+ "4".equals(trimmed) || "5".equals(trimmed)) {
+ return true;
+ }
+ try {
+ double value = Double.parseDouble(trimmed);
+ // 鎺ュ彈1.0, 2.0, 3.0, 4.0, 5.0锛堝彧瑕佷笉鏄�0锛�
+ return value >= 1.0 && value <= 5.0;
+ } catch (NumberFormatException ex) {
+ return false;
+ }
+ }
private boolean isPointInsideActiveBoundary(Point2D.Double point) {
if (point == null || !Double.isFinite(point.x) || !Double.isFinite(point.y)) {
@@ -1288,6 +1595,183 @@
/**
* 缁樺埗瑙嗗浘淇℃伅
*/
+ /**
+ * 缁樺埗闅滅鐗╁潗鏍囩偣锛堝甫搴忓彿锛�
+ * 搴忓彿鏄剧ず鍦ㄧ偣涓績锛屽瓧浣撳ぇ灏忎笌闅滅鐗╁悕绉颁竴鑷达紙11鍙凤級锛屼笉闅忕缉鏀惧彉鍖�
+ */
+ private void drawObstaclePointsWithNumbers(Graphics2D g2d, List<Obstacledge.Obstacle> obstacles, double scale) {
+ if (obstacles == null || obstacles.isEmpty()) {
+ return;
+ }
+
+ // 淇濆瓨鍘熷鍙樻崲
+ AffineTransform originalTransform = g2d.getTransform();
+
+ // 璁剧疆鐐圭殑澶у皬锛堥殢缂╂斁鍙樺寲锛�
+ double scaleFactor = Math.max(0.5, scale);
+ double clampedScale = boundaryPointSizeScale * (previewSizingEnabled ? PREVIEW_BOUNDARY_MARKER_SCALE : 1.0d);
+ if (!Double.isFinite(clampedScale) || clampedScale <= 0.0d) {
+ clampedScale = 1.0d;
+ }
+ 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;
+
+ // 璁剧疆瀛椾綋锛堜笌闅滅鐗╁悕绉颁竴鑷达紝涓嶉殢缂╂斁鍙樺寲锛�
+ Font labelFont = new Font("寰蒋闆呴粦", Font.PLAIN, 11);
+ g2d.setFont(labelFont);
+ FontMetrics fontMetrics = g2d.getFontMetrics(labelFont);
+
+ // 閬嶅巻鎵�鏈夐殰纰嶇墿
+ for (Obstacledge.Obstacle obstacle : obstacles) {
+ if (obstacle == null || !obstacle.isValid()) {
+ continue;
+ }
+
+ List<Obstacledge.XYCoordinate> xyCoords = obstacle.getXyCoordinates();
+ if (xyCoords == null || xyCoords.isEmpty()) {
+ continue;
+ }
+
+ // 缁樺埗姣忎釜鐐瑰強鍏跺簭鍙�
+ for (int i = 0; i < xyCoords.size(); i++) {
+ Obstacledge.XYCoordinate coord = xyCoords.get(i);
+ double x = coord.getX();
+ double y = coord.getY();
+
+ // 缁樺埗鐐癸紙鍦ㄤ笘鐣屽潗鏍囩郴涓紝闅忕缉鏀惧彉鍖栵級
+ g2d.setColor(OBSTACLE_POINT_COLOR);
+ 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);
+ }
+
+ /**
+ * 缁樺埗杈圭晫鐐癸紙甯﹀簭鍙凤級
+ * 搴忓彿鏄剧ず鍦ㄧ偣涓績锛屽瓧浣撳ぇ灏忎笌闅滅鐗╁簭鍙蜂竴鑷达紙11鍙凤級锛屼笉闅忕缉鏀惧彉鍖�
+ */
+ private void drawBoundaryPointsWithNumbers(Graphics2D g2d, List<Point2D.Double> boundary, double scale) {
+ if (boundary == null || boundary.size() < 2) {
+ return;
+ }
+
+ // 淇濆瓨鍘熷鍙樻崲
+ AffineTransform originalTransform = g2d.getTransform();
+
+ int totalPoints = boundary.size();
+ boolean closed = totalPoints > 2 && areBoundaryPointsClose(boundary.get(0), boundary.get(totalPoints - 1));
+ int effectiveCount = closed ? totalPoints - 1 : totalPoints;
+ if (effectiveCount <= 0) {
+ return;
+ }
+
+ // 璁剧疆鐐圭殑澶у皬锛堜笌杈圭晫绾垮搴︿竴鑷达級
+ // 杈圭晫绾垮搴︼細3 / Math.max(0.5, scale)
+ double scaleFactor = Math.max(0.5, scale);
+ double markerDiameter = 3.0 / scaleFactor; // 涓庤竟鐣岀嚎瀹藉害涓�鑷�
+ double markerRadius = markerDiameter / 2.0;
+
+ // 璁剧疆瀛椾綋锛堜笌闅滅鐗╁簭鍙蜂竴鑷达紝涓嶉殢缂╂斁鍙樺寲锛�
+ Font labelFont = new Font("寰蒋闆呴粦", Font.PLAIN, 11);
+ g2d.setFont(labelFont);
+ FontMetrics fontMetrics = g2d.getFontMetrics(labelFont);
+
+ // 缁樺埗姣忎釜鐐瑰強鍏跺簭鍙�
+ for (int i = 0; i < effectiveCount; i++) {
+ Point2D.Double point = boundary.get(i);
+ double x = point.x;
+ double y = point.y;
+
+ // 缁樺埗鐐癸紙鍦ㄤ笘鐣屽潗鏍囩郴涓紝闅忕缉鏀惧彉鍖栵級
+ g2d.setColor(BOUNDARY_POINT_COLOR);
+ 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);
+ }
+
+ /**
+ * 妫�鏌ヤ袱涓竟鐣岀偣鏄惁鎺ヨ繎锛堢敤浜庡垽鏂竟鐣屾槸鍚﹂棴鍚堬級
+ */
+ private boolean areBoundaryPointsClose(Point2D.Double a, Point2D.Double b) {
+ if (a == null || b == null) {
+ return false;
+ }
+ double dx = a.x - b.x;
+ double dy = a.y - b.y;
+ return Math.hypot(dx, dy) <= BOUNDARY_POINT_MERGE_THRESHOLD;
+ }
+
private void drawViewInfo(Graphics2D g2d) {
g2d.setColor(new Color(80, 80, 80));
g2d.setFont(new Font("寰蒋闆呴粦", Font.PLAIN, 11));
@@ -1339,7 +1823,15 @@
* 璁剧疆瑙嗗浘鍙樻崲鍙傛暟锛堢敤浜庣▼搴忓寲鎺у埗锛�
*/
public void setViewTransform(double scale, double translateX, double translateY) {
- this.scale = scale;
+ // 闄愬埗缂╂斁鑼冨洿
+ scale = Math.max(MIN_SCALE, Math.min(scale, MAX_SCALE));
+ // 濡傛灉缂╂斁姣斾緥鏀瑰彉浜嗭紝淇濆瓨鍒伴厤缃枃浠�
+ if (Math.abs(this.scale - scale) > SCALE_EPSILON) {
+ this.scale = scale;
+ saveScaleToProperties();
+ } else {
+ this.scale = scale;
+ }
this.translateX = translateX;
this.translateY = translateY;
visualizationPanel.repaint();
@@ -1593,6 +2085,7 @@
obstacleBounds = null;
selectedObstacleName = null;
currentObstacleLandNumber = null;
+ obstaclePointsVisible = false;
}
private List<Obstacledge.Obstacle> parseObstacles(String obstaclesData, String landNumber) {
@@ -1880,6 +2373,28 @@
visualizationPanel.repaint();
}
+ public void setObstaclePointsVisible(boolean visible) {
+ this.obstaclePointsVisible = visible;
+ visualizationPanel.repaint();
+ }
+
+ /**
+ * 璁剧疆鏄惁鏄剧ず杈圭晫璺濈
+ */
+ public void setBoundaryLengthVisible(boolean visible) {
+ boundaryLengthVisible = visible;
+ if (visualizationPanel != null) {
+ visualizationPanel.repaint();
+ }
+ }
+
+ /**
+ * 鑾峰彇鏄惁鏄剧ず杈圭晫璺濈
+ */
+ public boolean isBoundaryLengthVisible() {
+ return boundaryLengthVisible;
+ }
+
public void setBoundaryPointSizeScale(double sizeScale) {
double normalized = (Double.isFinite(sizeScale) && sizeScale > 0.0d) ? sizeScale : 1.0d;
if (Math.abs(boundaryPointSizeScale - normalized) < 1e-6) {
--
Gitblit v1.10.0