From a848e24185bb1cade3fbfc034a152ec93ef577e2 Mon Sep 17 00:00:00 2001 From: Tongg Date: Tue, 31 Dec 2024 09:51:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=8E=E7=BB=86=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E3=80=81=E6=A8=A1=E5=9E=8B=E9=BB=98=E8=AE=A4=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SparkClient.sln.DotSettings.user | 1 + SparkDB.db | Bin 196608 -> 196608 bytes ViewModel/Grading/GradingResultVM.cs | 2 +- .../ViewportData/Helper/ViewportHelperPro.cs | 10 ++++---- .../ViewportData/Helper/ViewportManager.cs | 24 +++++++++++++++++- .../UserControl/ViewportData/ViewportData.cs | 6 +++++ 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/SparkClient.sln.DotSettings.user b/SparkClient.sln.DotSettings.user index b08fda8..a0a0497 100644 --- a/SparkClient.sln.DotSettings.user +++ b/SparkClient.sln.DotSettings.user @@ -32,6 +32,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded diff --git a/SparkDB.db b/SparkDB.db index b479cf2c20364347fb79d20b7a06baffed3b917a..15e69da630d2dd67aeb2157380ab0964f4403644 100644 GIT binary patch delta 8276 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 x.TestItemId == testItemId).FirstOrDefault(); row.Avg = data != null ? data.Avg : ""; row.Dev = data != null ? data.Dev : ""; diff --git a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs index 4a3824e..cfdc8be 100644 --- a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs +++ b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs @@ -425,22 +425,22 @@ public class ViewportHelperPro return result; } - public static List GenerateLineTextModelsByType(string type, Color4? textColor = null, + public static List GenerateLineTextModelsByType(PlaneType type, Color4? textColor = null, bool showAll = false) { - var planType = ViewportManager.DicValueParamToFacet[type]; + List entities = new List(); 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; } /// diff --git a/Views/UserControl/ViewportData/Helper/ViewportManager.cs b/Views/UserControl/ViewportData/Helper/ViewportManager.cs index c0789dd..03b6335 100644 --- a/Views/UserControl/ViewportData/Helper/ViewportManager.cs +++ b/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 entities = ViewportHelperPro.GenerateLineTextModelsByType(planeType); + if (entities.Count <= 0) + { + ClearDicModels(); + } + ChooseTriangleCode = entities[0].TriangleCode; + ResetChooseAddModels(); + } + #region 面 - 数据固定绑定 // 选中面 -> 数据 public static Dictionary DicFacetToValueParam = new Dictionary() diff --git a/Views/UserControl/ViewportData/ViewportData.cs b/Views/UserControl/ViewportData/ViewportData.cs index 80122ab..3400c71 100644 --- a/Views/UserControl/ViewportData/ViewportData.cs +++ b/Views/UserControl/ViewportData/ViewportData.cs @@ -196,4 +196,10 @@ public class ViewportData return false; } } + + public void mockSel(string planKey) + { + ViewportManager.MockSelectFacet(planKey); + } + } \ No newline at end of file