master
Tongg 7 months ago
parent 7af5e487c2
commit 2a2cb1cbce
  1. 2
      Views/UserControl/ViewportData/Entity/ColorConfigEntity.cs
  2. 4
      Views/UserControl/ViewportData/Helper/VideoHelper.cs
  3. 14
      Views/UserControl/ViewportData/ViewportData.cs

@ -18,7 +18,7 @@ public class ColorConfigEntity
private string _selLineColor; private string _selLineColor;
private string _selFrontColor = "FFFF0000"; private string _selFrontColor = "FFFF0000";
private string _errFacetColor; private string _errFacetColor = "#FFFF0000";
private string _tableFacetColor; private string _tableFacetColor;
private string _upperMainFacetColor; private string _upperMainFacetColor;
private string _starFacetColor; private string _starFacetColor;

@ -180,12 +180,12 @@ public class VideoHelper
{ {
List<PngBitmapEncoder> result = new List<PngBitmapEncoder>(); List<PngBitmapEncoder> result = new List<PngBitmapEncoder>();
for (int i = 0; i < 10000; i += 50) for (int i = 0; i < 20000; i += 50)
{ {
// 使用 Dispatcher.Invoke 来确保 UI 操作在主线程中执行 // 使用 Dispatcher.Invoke 来确保 UI 操作在主线程中执行
var encoder = Application.Current.Dispatcher.Invoke(() => CutPng(viewport)); var encoder = Application.Current.Dispatcher.Invoke(() => CutPng(viewport));
result.Add(encoder); result.Add(encoder);
Thread.Sleep(25); // 模拟处理过程 Thread.Sleep(20); // 模拟处理过程
} }
return result; return result;

@ -17,6 +17,8 @@ public class ViewportData
/// 钻石数据 /// 钻石数据
/// </summary> /// </summary>
public String DiamondData { get; set; } public String DiamondData { get; set; }
public ColorConfigEntity ColorConfig { get; set; }
/// <summary> /// <summary>
/// 初始化构造 /// 初始化构造
@ -29,6 +31,17 @@ public class ViewportData
DiamondData = diamondData; DiamondData = diamondData;
} }
/// <summary> /// <summary>
/// 初始化构造
/// </summary>
/// <param name="diamondCode">钻石编码</param>
/// <param name="diamondData">钻石数据</param>
public ViewportData(string diamondCode, string diamondData, ColorConfigEntity colorConfig)
{
DiamondCode = diamondCode;
DiamondData = diamondData;
ColorConfig = colorConfig;
}
/// <summary>
/// 空白构造 /// 空白构造
/// </summary> /// </summary>
public ViewportData() public ViewportData()
@ -132,6 +145,7 @@ public class ViewportData
ViewportManager.ViewportTriangle.Clear(); ViewportManager.ViewportTriangle.Clear();
ViewportManager.ViewportTriangle.AddRange(facetsFinal); ViewportManager.ViewportTriangle.AddRange(facetsFinal);
ViewportManager.ColorConfig = ColorConfig;
// ViewportManager.LoadModelByEntities(facetsFinal); // ViewportManager.LoadModelByEntities(facetsFinal);
} }
catch (Exception ex) catch (Exception ex)

Loading…
Cancel
Save