算法更新

app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/Version.java

@@ -1,7 +1,7 @@
 package com.iflytop.profilometer.core.migration.algo.type;
 
 public class Version {
-	static public final Integer VERSION_MAIN = 26;
+	static public final Integer VERSION_MAIN = 27;
 
 	static public String getVersion() {
 		return String.format("V%d", VERSION_MAIN);

app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java

@@ -16,7 +16,10 @@ import com.iflytop.profilometer.core.system.SystemService;
 import com.iflytop.profilometer.core.websocket.WebSocketManager;
 import com.iflytop.profilometer.model.bo.RailProfileMeasureTaskState;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import cn.hutool.json.JSONUtil;
@@ -186,7 +189,6 @@ public class RailProfileDrawerService implements ProfilometerDrawerListener {
                 profilometerRecorder.getFirstSide(),
                 profilometerRecorder.getDataCache2(),
                 profilometerRecorder.getFirstSide().getOpposite());
-
         if (report.outline1Side == MeasureSide.LEFT) {
             taskState.setLeftPointSetList(report.outline1);
         } else {
@@ -197,9 +199,22 @@ public class RailProfileDrawerService implements ProfilometerDrawerListener {
         } else {
             taskState.setRightPointSetList(report.outline2);
         }
+        List<XYPoint> allList = new ArrayList<>();
+        if (report.outline1Side == MeasureSide.LEFT) {
+            allList.addAll(report.outline1);
+            List<XYPoint> rightList = new ArrayList<>(report.outline2);
+            Collections.reverse(rightList);
+            allList.addAll(rightList);
+        } else {
+            allList.addAll(report.outline2);
+            List<XYPoint> leftList = new ArrayList<>(report.outline1);
+            Collections.reverse(leftList);
+            allList.addAll(leftList);
+        }
+
         Map<String, Object> finishMap = new HashMap<>();
         finishMap.put("type", "measure-finished");
-        finishMap.put("data", report);
+        finishMap.put("data", allList);
         WebSocketManager.send(JSONUtil.toJsonStr(finishMap));
     }