feat: version 0327

Model/Helper/Common.cs

@@ -23,6 +23,8 @@ public class Common
     public const string DataBaseName = "SparkDB";
 
     public static int RunMode = 0;
+
+    public static object LastParam = "ROUND P8 P8";
     
     /// <summary>
     /// 将 DataTable 转换为 JSON 字符串

ViewModel/BaseWindow/BaseControlVM.cs

@@ -135,7 +135,7 @@ public class BaseControlVM : BaseViewModel
         DiamondSelectVM selectVm = new DiamondSelectVM();
         ViewControl = selectVm;
         WindowTitle = MultilingualHelper.getString("DiamondSelect");
-        selectVm.StartGrading("ROUND P8 P8");
+        selectVm.StartGrading(Common.LastParam);
         
     }
 

ViewModel/Configuration/AlgorithmConfigVM.cs

@@ -123,13 +123,42 @@ public class AlgorithmConfigVM : BaseViewModel
         DataTable dataTable = DataBaseHelper.ExecuteQuery(sql);
         if (dataTable != null && dataTable.Rows.Count >= 0)
         {
-            var jsonAlgorithm = JToken.Parse(_AlgorithmConfigJson);
+            JToken jsonAlgorithm = JToken.Parse(_AlgorithmConfigJson);
             foreach (DataRow row in dataTable.Rows)
             {
                 //只对当前运行环境有效
                 if (Common.RunMode == int.Parse(row["Mode"].ToSafeString()))
                 {
-                    
+                    string spec = row["Spec"].ToSafeString();
+                    string[] parameters = param.Split(" ");
+                    //匹配形状忽略，只有原型
+                    //匹配规格
+                    if (parameters.Last().Equals(spec.Split("-").Last()))
+                    {
+                        string jsonKey = row["JsonKey"].ToSafeString();
+                        string value = row["Value"].ToSafeString();
+                        if (jsonKey.Contains("."))
+                        {
+                            var keys = jsonKey.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+                            JToken currentNode = jsonAlgorithm;
+                            for (int i = 0; i < keys.Length - 1; i++)
+                            {
+                                var currentKey = keys[i];
+                                // 如果当前节点不存在或不是对象类型，则创建新对象
+                                if (currentNode[currentKey] == null || currentNode[currentKey]?.Type != JTokenType.Object)
+                                {
+                                    currentNode[currentKey] = new JObject();
+                                }
+                                currentNode = currentNode[currentKey];
+                            }
+                            var finalKey = keys[keys.Length - 1];
+                            currentNode[finalKey] = value;
+                        }
+                        else
+                        {
+                            jsonAlgorithm[jsonKey] = value; 
+                        }
+                    }
                 }
             }
             return jsonAlgorithm.ToString();

ViewModel/Grading/DiamondSelectVM.cs

@@ -145,6 +145,8 @@ public class DiamondSelectVM : BaseViewModel
     [Log]
     public async void StartGrading(object param)
     {
+        //m每次都备份一下最新的检测参数
+        Common.LastParam = param;
         MessageBox messageBox = new MessageBox();
         MessageBoxResult result = messageBox.ShowInput($"{MultilingualHelper.getString("UpdateDiamondCode")}", out string inputStr,
             MultilingualHelper.getString("ok"),

Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs

@@ -2394,7 +2394,7 @@ public class ViewportHelperPro
                 // case "CROWN HEIGHT":
                 // case "PAV DEPTH":
                      v *= 100;
-                    return hasUnit ? $"{v.ToString("F1")}%" : v.ToString("F1");
+                    return hasUnit ? $"{Math.Round(v, 2, MidpointRounding.AwayFromZero).ToString("F1")}%" : Math.Round(v, 2, MidpointRounding.AwayFromZero).ToString("F1");
                 default:
                      v = Math.Floor(v * 1000) / 1000;
                     return hasUnit ? $"{(v*100).ToString("F1")}%" : (v*100).ToString("F1");