fix

ViewModel/Grading/DiamondSelectVM.cs

@@ -121,8 +121,12 @@ public class DiamondSelectVM : BaseViewModel
                     });
                    
                 }
+                SocResultEntity socResolt = new SocResultEntity();
                 AlgorithmResultEntity parameter = new AlgorithmResultEntity();
-                parameter = DoSoc();
+                // 启动soc
+                socResolt = DoSoc();
+                // 启动算法
+                parameter = DoAlgorithm();
                 parameter.Standard = "IGI 2024";
                 string value = param.ToString()??"";
                 if (value!= null && value.Split(" ").Length==3)
@@ -153,13 +157,17 @@ public class DiamondSelectVM : BaseViewModel
         WindowManager.openContent.Add(vm);
     }
 
-    private AlgorithmResultEntity DoSoc()
+    private AlgorithmResultEntity DoAlgorithm()
     {
         AlgorithmResultEntity param = new AlgorithmResultEntity();
         string json = $"{{\"status\": \"ok\",\r\n  \"facets\": [\r\n    {{\r\n      \"coords\": [\r\n        {{\r\n          \"x\": 0.03402838855981827,\r\n          \"y\": -0.11212713271379471,\r\n          \"z\": 5.701290607452393\r\n        }},\r\n        {{\r\n          \"x\": 0.46919262409210205,\r\n          \"y\": 0.058160409331321716,\r\n          \"z\": 5.289202690124512\r\n        }},\r\n        {{\r\n          \"x\": 0.1256149709224701,\r\n          \"y\": 0.3005124032497406,\r\n          \"z\": 5.330680847167969\r\n        }}\r\n      ],\r\n      \"facet_id\": \"21_0\",\r\n      \"facet_type\": 21\r\n    }},\r\n    {{\r\n      \"coords\": [\r\n        {{\r\n          \"x\": 2.9093382358551025,\r\n          \"y\": 3.4028751850128174,\r\n          \"z\": 1.724348783493042\r\n        }},\r\n        {{\r\n          \"x\": 0.46919262409210205,\r\n          \"y\": 0.058160409331321716,\r\n          \"z\": 5.289202690124512\r\n        }},\r\n        {{\r\n          \"x\": 0.1256149709224701,\r\n          \"y\": 0.3005124032497406,\r\n          \"z\": 5.330680847167969\r\n        }}\r\n      ],\r\n      \"facet_id\": \"21_1\",\r\n      \"facet_type\": 21\r\n    }}\r\n  ],\r\n  \"measurements\": {{\r\n    \"DIAMETER\": 6.43,\r\n    \"DIAMETER_DEV\": 1.2,\r\n    \"M1\": 6.409999847412109,\r\n    \"M2\": 6.46999979019165,\r\n    \"M3\": 3.9700000286102295,\r\n    \"TABLE\": 58.0,\r\n    \"TABLE_MIN\": 57.5,\r\n    \"TABLE_MAX\": 58.6,\r\n    \"CROWN_HEIGHT\": 11.5,\r\n    \"CROWN_H_DEV\": 1.4,\r\n    \"CROWN_H_MIN\": 10.7,\r\n    \"CROWN_H_MAX\": 12.1,\r\n    \"CROWN_ANGLE\": 30.5,\r\n    \"CROWN_ANGLE_DEV\": 0.9,\r\n    \"CROWN_ANGLE_MIN\": 30.2,\r\n    \"CROWN_ANGLE_MAX\": 31.1,\r\n    \"PAV_DEPTH\": 35.0,\r\n    \"PAV_DEPTH_DEV\": 0.8,\r\n    \"PAV_DEPTH_MIN\": 34.5,\r\n    \"PAV_DEPTH_MAX\": 35.3,\r\n    \"PAV_ANGLE\": 35.1,\r\n    \"PAV_ANGLE_DEV\": 0.8,\r\n    \"PAV_ANGLE_MIN\": 34.7,\r\n    \"PAV_ANGLE_MAX\": 35.5,\r\n    \"GIRDLE_BEZEL\": 7.1,\r\n    \"GIRDLE_BEZEL_DEV\": 1.8,\r\n    \"GIRDLE_BEZEL_MIN\": 6.8,\r\n    \"GIRDLE_BEZEL_MAX\": 7.5,\r\n    \"GIRDLE_BONE\": 7.8,\r\n    \"GIRDLE_BONE_MIN\": 7.3,\r\n    \"GIRDLE_BONE_MAX\": 8.3,\r\n    \"GIRDLE\": 6.3,\r\n    \"GIRDLE_DEV\": 3.3,\r\n    \"GIRDLE_MIN\": 4.2,\r\n    \"GIRDLE_MAX\": 7.5,\r\n    \"TOTAL_DEPTH\": 53.5,\r\n    \"CULET\": 1.8,\r\n    \"LW_RATIO\": 1.0,\r\n    \"TOC\": 1.4,\r\n    \"COC\": 0.5,\r\n    \"TA\": 3.81,\r\n    \"LGF\": 75,\r\n    \"STAR\": 65,\r\n    \"STAR_MIN\": 61.1,\r\n    \"STAR_MAX\": 65.4,\r\n    \"LOWER_HALVES_RATIO\": 75,\r\n    \"LOWER_HALVES_RATIO_MIN\": 73.3,\r\n    \"LOWER_HALVES_RATIO_MAX\": 78.1,\r\n    \"TWIST\": 1.3,\r\n    \"TWIST_DEV\": 2.4,\r\n    \"TWIST_MIN\": -0.2,\r\n    \"TWIST_MAX\": -2.4,\r\n    \"CULET_TO_TABLE\": 1.4\r\n  }}\r\n}}\r\n";
         param = JsonConvert.DeserializeObject<AlgorithmResultEntity>(json);
         return param;
     }
+    private SocResultEntity DoSoc()
+    {
+        return new SocResultEntity();
+    }
 }
 public class ButtonInfo
 {