张世豪
3 天以前 55d23efc30f7db5ec2d9b8a0f04a268a10f3e855
src/dikuai/Dikuaiguanli.java
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Objects;
import java.util.Properties;
import java.util.Locale;
import lujing.Lunjingguihua;
import lujing.MowingPathGenerationPage;
@@ -271,14 +272,17 @@
      contentPanel.add(mowingPatternPanel);
      contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
      // 割草机割刀宽度
      // 割草机割刀宽度(单位:米,保留2位小数)
      String mowingBladeWidthValue = dikuai.getMowingBladeWidth();
      String displayBladeWidth = "未设置";
      if (mowingBladeWidthValue != null && !"-1".equals(mowingBladeWidthValue) && !mowingBladeWidthValue.trim().isEmpty()) {
         try {
            double bladeWidthMeters = Double.parseDouble(mowingBladeWidthValue.trim());
            double bladeWidthCm = bladeWidthMeters * 100.0;
            displayBladeWidth = String.format("%.2f厘米", bladeWidthCm);
            // 如果值大于100,认为是厘米,需要转换为米
            if (bladeWidthMeters > 100) {
               bladeWidthMeters = bladeWidthMeters / 100.0;
            }
            displayBladeWidth = String.format(Locale.US, "%.2fm", bladeWidthMeters);
         } catch (NumberFormatException e) {
            displayBladeWidth = "未设置";
         }
@@ -287,10 +291,18 @@
      contentPanel.add(mowingBladeWidthPanel);
      contentPanel.add(Box.createRigidArea(new Dimension(0, 10)));
      // 割草宽度(单位:米,保留2位小数)
      String mowingWidthValue = dikuai.getMowingWidth();
      String displayWidth = "未设置";
      if (mowingWidthValue != null && !"-1".equals(mowingWidthValue) && !mowingWidthValue.trim().isEmpty()) {
         displayWidth = mowingWidthValue + "厘米";
         try {
            double widthCm = Double.parseDouble(mowingWidthValue.trim());
            // 将厘米转换为米,保留2位小数
            double widthMeters = widthCm / 100.0;
            displayWidth = String.format(Locale.US, "%.2fm", widthMeters);
         } catch (NumberFormatException e) {
            displayWidth = "未设置";
         }
      }
      JPanel mowingWidthPanel = createCardInfoItem("割草宽度:", displayWidth);
      contentPanel.add(mowingWidthPanel);
@@ -306,7 +318,7 @@
            if (distanceMeters > 100) {
               distanceMeters = distanceMeters / 100.0;
            }
            displaySafetyDistance = String.format("%.2f米", distanceMeters);
            displaySafetyDistance = String.format(Locale.US, "%.2fm", distanceMeters);
         } catch (NumberFormatException e) {
            displaySafetyDistance = "未设置";
         }