826220679@qq.com
2 天以前 48ee74129bb09a817a0bbbabe860c4007b74c66b
src/zhuye/MapRenderer.java
@@ -107,6 +107,9 @@
    private boolean idleTrailSuppressed;
    private Path2D.Double realtimeBoundaryPathCache;
    private String realtimeBoundaryPathLand;
    private WangfanDraw returnPathDrawer;  // 往返路径绘制管理器
    private List<Point2D.Double> currentReturnPath; // 当前地块的往返路径(用于显示)
    private List<Point2D.Double> previewReturnPath; // 预览的往返路径
    private static final double TRACK_SAMPLE_MIN_DISTANCE_METERS = 0.2d;
    private static final double TRACK_DUPLICATE_TOLERANCE_METERS = 1e-3d;
@@ -459,6 +462,17 @@
            drawNavigationPreviewCoverage(g2d);
        }
        // 先画往返路径(线+点),保证割草机图标在其上方
        if (returnPathDrawer != null && returnPathDrawer.isActive()) {
            returnPathDrawer.draw(g2d, scale);
        } else if (previewReturnPath != null && !previewReturnPath.isEmpty()) {
            // 绘制预览的往返路径(铁线路图风格)
            WangfanDraw.drawRailwayPath(g2d, previewReturnPath, scale);
        } else if (currentReturnPath != null && !currentReturnPath.isEmpty()) {
            // 绘制保存的往返路径(铁线路图风格)
            WangfanDraw.drawRailwayPath(g2d, currentReturnPath, scale);
        }
        drawMower(g2d);
        
        // 绘制导航预览速度(如果正在导航预览)
@@ -962,6 +976,14 @@
            mowerEffectiveWidthMeters = defaultMowerWidthMeters;
        }
        // 加载往返路径
        String returnPathStr = dikuai != null ? dikuai.getReturnPathCoordinates() : null;
        if (returnPathStr != null && !returnPathStr.isEmpty() && !"-1".equals(returnPathStr)) {
            currentReturnPath = lujingdraw.parsePlannedPath(returnPathStr);
        } else {
            currentReturnPath = null;
        }
        loadRealtimeTrack(landNumber, dikuai != null ? dikuai.getMowingTrack() : null);
        visualizationPanel.repaint();
    }
@@ -2994,4 +3016,62 @@
        return mower;
    }
    /**
     * 设置往返路径绘制管理器
     */
    public void setReturnPathDrawer(WangfanDraw drawer) {
        this.returnPathDrawer = drawer;
    }
    /**
     * 设置预览的往返路径
     */
    public void setPreviewReturnPath(List<Point2D.Double> path) {
        this.previewReturnPath = path;
        if (visualizationPanel != null) {
            visualizationPanel.repaint();
        }
    }
    /**
     * 开始往返路径绘制
     */
    public void startReturnPathDrawing() {
        if (returnPathDrawer != null) {
            // 禁用拖尾效果(在往返路径绘制模式下不显示实时轨迹拖尾)
            idleTrailSuppressed = true;
            clearIdleMowerTrail();
            // 清空之前的路径点(通过 WangfanDraw 管理)
            repaint();
        }
    }
    /**
     * 停止往返路径绘制
     */
    public void stopReturnPathDrawing() {
        // 恢复拖尾效果
        idleTrailSuppressed = false;
        repaint();
    }
    /**
     * 添加往返路径点(已废弃,路径点由 WangfanDraw 直接管理)
     */
    @Deprecated
    public void addReturnPathPoint(double x, double y) {
        // 路径点由 WangfanDraw 直接管理,这里只需要重绘
        repaint();
    }
    /**
     * 获取往返路径点列表的快照
     */
    public List<Point2D.Double> getReturnPathPointsSnapshot() {
        if (returnPathDrawer != null) {
            return returnPathDrawer.getPointsSnapshot();
        }
        return new ArrayList<>();
    }
}