Merge branch 'master' of http://git.51dayu.com.cn/diamond-cut/SparkClient

SparkClient.sln.DotSettings.user

@@ -32,6 +32,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJToken_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F58b0b7706a8be4f7160749424eb996a3f845a1682c3c7ac5e405a346a8c20f1_003FJToken_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb7208b3f72528d22781d25fde9a55271bdf2b5aade4f03b1324579a25493cd8_003FList_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMaterialVariable_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F68d37d16685244cf9996bf767117a771210200_003Fe1_003Fb1acf2fc_003FMaterialVariable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F211e6f3b24fa438a92f1815153647ce2c8f908_003Fc4_003F6e30ec68_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMeshGeometryModel3D_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F68d37d16685244cf9996bf767117a771210200_003Fb5_003Fc0ee0c0f_003FMeshGeometryModel3D_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMessageBox_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F476b8dbfd2cb40ab8ff230fdcda5e37081d20_003F0e_003F12425a46_003FMessageBox_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMessageBox_002Ecs_002Fl_003AC_0021_003FUsers_003Ftongg_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffdc001c928464b80ad45ffa09b838a3a15e200_003F55_003F1a844f6e_003FMessageBox_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

ViewModel/Grading/GradingResultVM.cs

@@ -1044,7 +1044,7 @@ public class GradingResultVM : BaseViewModel
     {
         RowDetail row = new RowDetail();
         row.itemName = GetName(testItemId);
-
+        ViewportData.mockSel(testItemId);
         var data = DtResults.Where(x => x.TestItemId == testItemId).FirstOrDefault();
         row.Avg = data != null ? data.Avg : "";
         row.Dev = data != null ? data.Dev : "";

Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs

@@ -425,22 +425,22 @@ public class ViewportHelperPro
         return result;
     }
 
-    public static List<GeometryModel3D> GenerateLineTextModelsByType(string type, Color4? textColor = null,
+    public static List<Viewport3DTriangleEntity> GenerateLineTextModelsByType(PlaneType type, Color4? textColor = null,
         bool showAll = false)
     {
-        var planType =  ViewportManager.DicValueParamToFacet[type];
+      
         List<Viewport3DTriangleEntity> entities = new List<Viewport3DTriangleEntity>(); 
         string planCode = "";
         ViewportManager.ViewportTriangle.ForEach(e =>
         {
-            if (e.PlaneType == planType && (e.PlaneCode==planCode || string.IsNullOrEmpty(planCode)))
+            if (e.PlaneType == type && (e.PlaneCode==planCode || string.IsNullOrEmpty(planCode)))
             {
                 planCode = e.PlaneCode;
                 entities.Add(e);
             }
         });
-        
-        return GenerateLineTextModels(entities, textColor, showAll);
+
+        return entities;
     }
 
     /// <summary>

Views/UserControl/ViewportData/Helper/ViewportManager.cs

@@ -134,7 +134,29 @@ public class ViewportManager
         }
         ChooseAddModels.Clear();
     }
-    
+
+    public static void MockSelectFacet(string planTypeStr)
+    {
+        PlaneType planeType = PlaneType.Crown;
+        if (DicValueParamToFacet.ContainsKey(planTypeStr))
+        {
+            planeType = DicValueParamToFacet[planTypeStr];
+        }
+        else
+        {
+            ClearDicModels();
+            return;
+        }
+        
+        List<Viewport3DTriangleEntity> entities = ViewportHelperPro.GenerateLineTextModelsByType(planeType);
+        if (entities.Count <= 0)
+        {
+            ClearDicModels();
+        } 
+        ChooseTriangleCode = entities[0].TriangleCode;
+        ResetChooseAddModels();
+    }
+
     #region 面 - 数据固定绑定
     // 选中面 -> 数据
     public static Dictionary<PlaneType, string> DicFacetToValueParam = new Dictionary<PlaneType, string>()

Views/UserControl/ViewportData/ViewportData.cs

@@ -196,4 +196,10 @@ public class ViewportData
             return false;
         }
     }
+
+    public void mockSel(string planKey)
+    {
+        ViewportManager.MockSelectFacet(planKey);
+    }
+    
 }