CVAuto：测完图片后自动显示第一张效果，完善总计指标统计，断言通过的图片在调整画框 ✓ 对 X 错后变成蓝色可纠错，兼容对象格式的 Polygon，Line，Point，只在机器学习开启时用 missTruth 补充漏检 等

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/cv/apijson/JSONResponse.js

@@ -2461,20 +2461,59 @@ var JSONResponse = {
 
     return detection.polygons
   },
+  getPolygon: function (item) {
+    if (JSONResponse.isString(item)) {
+      return StringUtil.split(item);
+    }
+    if (item instanceof Array) {
+      return item;
+    }
+    if (! JSONResponse.isObject(item)) {
+      return null;
+    }
+
+    return item.polygon || item
+  },
   getLines: function (detection) {
     if (! JSONResponse.isObject(detection)) {
       return null;
     }
 
     return detection.lines || detection.keyLines || detection.key_lines
   },
+  getLine: function (item) {
+    if (JSONResponse.isString(item)) {
+      return StringUtil.split(item);
+    }
+    if (item instanceof Array) {
+      return item;
+    }
+    if (! JSONResponse.isObject(item)) {
+      return null;
+    }
+
+    return item.line || item.keyLine || item.key_line || item
+  },
   getPoints: function (detection) {
     if (! JSONResponse.isObject(detection)) {
       return null;
     }
 
     return detection.points || detection.keyPoints || detection.key_points
   },
+  getPoint: function (item) {
+    if (JSONResponse.isString(item)) {
+      return StringUtil.split(item);
+    }
+    if (item instanceof Array) {
+      return item;
+    }
+    if (! JSONResponse.isObject(item)) {
+      return null;
+    }
+
+    return item.point || item.keyPoint || item.key_point || item
+  },
   getBboxes: function (detection) {
     if (! JSONResponse.isObject(detection)) {
       return null;
@@ -2483,7 +2522,10 @@ var JSONResponse = {
     return detection.bboxes || detection.boxes || detection.targets
   },
   getBbox: function (item) {
-    if (item instanceof Array || JSONResponse.isString(item)) {
+    if (JSONResponse.isString(item)) {
+      return StringUtil.split(item);
+    }
+    if (item instanceof Array) {
       return item;
     }
     if (! JSONResponse.isObject(item)) {
@@ -2696,7 +2738,7 @@ var JSONResponse = {
           return;
         }
 
-        var [x, y, x2, y2, d] = JSONResponse.getXYXYD(item, width, height, xRate, yRate);
+        var [x, y, x2, y2, d] = JSONResponse.getXYXYD(JSONResponse.getLine(item) || item, width, height, xRate, yRate);
 
         const color = JSONResponse.getColor(item) || JSONResponse.getColor(detection) || JSONResponse.getColor(detection.bbox);
         const rgba = color == null || color.length <= 0 ? null : `rgba(${color.join(',')})`;
@@ -2728,7 +2770,7 @@ var JSONResponse = {
           return;
         }
 
-        var [x, y, w, h, d] = JSONResponse.getXYWHD(item, width, height, xRate, yRate);
+        var [x, y, w, h, d] = JSONResponse.getXYWHD(JSONResponse.getPoint(item) || item, width, height, xRate, yRate);
 
         const color = JSONResponse.getColor(item) || JSONResponse.getColor(detection) || JSONResponse.getColor(detection.bbox);
         const rgba = color == null || color.length <= 0 ? null : `rgba(${color.join(',')})`;
@@ -2739,7 +2781,8 @@ var JSONResponse = {
 
         ctx.beginPath();
         ctx.arc(x, y, Math.max(2, height*0.005), 0, 2*Math.PI);
-        if (JSONResponse.getFill(item) != false) {
+        let fill = JSONResponse.getFill(item);
+        if (fill || (fill == null && JSONResponse.getFill(detection) != false)) {
           ctx.fill();
         }
 
@@ -2761,7 +2804,8 @@ var JSONResponse = {
           return;
         }
 
-        var points = JSONResponse.getPoints(item) || item;
+        var polygon = JSONResponse.getPolygon(item) || item;
+        var points = JSONResponse.getPoints(polygon) || item;
         if (points instanceof Array) {
           const color = JSONResponse.getColor(item) || JSONResponse.getColor(detection) || JSONResponse.getColor(detection.bbox);
           if (color != null && color.length >= 3) {
@@ -2777,8 +2821,8 @@ var JSONResponse = {
           }
 
           ctx.beginPath();
-          points.forEach((item, i) => {
-            var [x, y, w, h, d] = JSONResponse.getXYWHD(item, width, height, xRate, yRate);
+          points.forEach((item2, i) => {
+            var [x, y, w, h, d] = JSONResponse.getXYWHD(JSONResponse.getPoint(item2) || item2, width, height, xRate, yRate);
 
             if (i <= 0) {
               ctx.moveTo(x, y);
@@ -2788,7 +2832,8 @@ var JSONResponse = {
           });
           ctx.closePath();
           ctx.stroke();
-          if (JSONResponse.getFill(item)) {
+          let fill = JSONResponse.getFill(item);
+          if (fill || (fill == null && JSONResponse.getFill(detection))) {
             ctx.fill();
           }
         }