diff --git a/Views/UserControl/ViewportData/Entity/ColorConfigEntity.cs b/Views/UserControl/ViewportData/Entity/ColorConfigEntity.cs index aad3323..2d8a98c 100644 --- a/Views/UserControl/ViewportData/Entity/ColorConfigEntity.cs +++ b/Views/UserControl/ViewportData/Entity/ColorConfigEntity.cs @@ -18,7 +18,7 @@ public class ColorConfigEntity private string _selLineColor; private string _selFrontColor = "FFFF0000"; - private string _errFacetColor; + private string _errFacetColor = "#FFFF0000"; private string _tableFacetColor; private string _upperMainFacetColor; private string _starFacetColor; diff --git a/Views/UserControl/ViewportData/Helper/VideoHelper.cs b/Views/UserControl/ViewportData/Helper/VideoHelper.cs index 9ee200e..c620235 100644 --- a/Views/UserControl/ViewportData/Helper/VideoHelper.cs +++ b/Views/UserControl/ViewportData/Helper/VideoHelper.cs @@ -180,12 +180,12 @@ public class VideoHelper { List result = new List(); - for (int i = 0; i < 10000; i += 50) + for (int i = 0; i < 20000; i += 50) { // 使用 Dispatcher.Invoke 来确保 UI 操作在主线程中执行 var encoder = Application.Current.Dispatcher.Invoke(() => CutPng(viewport)); result.Add(encoder); - Thread.Sleep(25); // 模拟处理过程 + Thread.Sleep(20); // 模拟处理过程 } return result; diff --git a/Views/UserControl/ViewportData/ViewportData.cs b/Views/UserControl/ViewportData/ViewportData.cs index c24966b..daf2154 100644 --- a/Views/UserControl/ViewportData/ViewportData.cs +++ b/Views/UserControl/ViewportData/ViewportData.cs @@ -17,6 +17,8 @@ public class ViewportData /// 钻石数据 /// public String DiamondData { get; set; } + + public ColorConfigEntity ColorConfig { get; set; } /// /// 初始化构造 @@ -29,6 +31,17 @@ public class ViewportData DiamondData = diamondData; } /// + /// 初始化构造 + /// + /// 钻石编码 + /// 钻石数据 + public ViewportData(string diamondCode, string diamondData, ColorConfigEntity colorConfig) + { + DiamondCode = diamondCode; + DiamondData = diamondData; + ColorConfig = colorConfig; + } + /// /// 空白构造 /// public ViewportData() @@ -132,6 +145,7 @@ public class ViewportData ViewportManager.ViewportTriangle.Clear(); ViewportManager.ViewportTriangle.AddRange(facetsFinal); + ViewportManager.ColorConfig = ColorConfig; // ViewportManager.LoadModelByEntities(facetsFinal); } catch (Exception ex)