diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs index 7e9f1d2..1bc9a47 100644 --- a/ViewModel/Grading/GradingResultVM.cs +++ b/ViewModel/Grading/GradingResultVM.cs @@ -943,6 +943,10 @@ public class GradingResultVM : BaseViewModel return; } //ExportFile(filePath); + if (filePath.ToLower().EndsWith(".txt")) + { + filePath = filePath.Substring(0,filePath.Length-4); + } TxtFile(filePath); } } @@ -1870,7 +1874,7 @@ public class GradingResultVM : BaseViewModel catch (Exception ex) { Logger.Error($"热敏打印发生错误: {ex.Message}"); - Growl.Error("热敏打印发生错误"); + Growl.Error(MultilingualHelper.getString("DiamodResultPrintError")); } finally { diff --git a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs index 4ad71c2..f512564 100644 --- a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs +++ b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs @@ -1309,63 +1309,65 @@ public class ViewportHelperPro var edgeLines = new List>(); Color4 XlineColor =new Color4(80f, 0f, 0f, 1f); - float r =5; + float LineSize =5; + float r = 0; if(double.TryParse(ViewportManager.DiamondData["M2"].ToString(), out var v)) { - r = (float)(v*0.51); + LineSize = (float)(v*0.51); + r = (float)v / 2; } edgeLines = new List>(); - var XLine = lineCal.calXline(r); + var XLine = lineCal.calXline(LineSize); edgeLines.Add(XLine); lines.Add(DisplayLineModel3D(edgeLines, XlineColor, thickness)); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(XLine, 2)); + edgeLines.Add(lineCal.calLineOfOffset(XLine, r/2)); var lineA = DisplayLineModel3D(edgeLines, XlineColor, thickness); lines.Add(lineA); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(XLine, -2)); + edgeLines.Add(lineCal.calLineOfOffset(XLine, -r / 2)); var lineB = DisplayLineModel3D(edgeLines, XlineColor, thickness); lines.Add(lineB); bindingMoveLine(lineA, lineB); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(XLine, 4)); + edgeLines.Add(lineCal.calLineOfOffset(XLine, r)); var lineE = DisplayLineModel3D(edgeLines, XlineColor, thickness); lines.Add(lineE); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(XLine, -4)); + edgeLines.Add(lineCal.calLineOfOffset(XLine, -r)); var lineF = DisplayLineModel3D(edgeLines, XlineColor, thickness); lines.Add(lineF); bindingMoveLine(lineE, lineF); Color4 YlineColor = new Color4(0F, 80f, 0f, 1f); edgeLines = new List>(); - var YLine = lineCal.calYline(r); + var YLine = lineCal.calYline(LineSize); edgeLines.Add(YLine); lines.Add(DisplayLineModel3D(edgeLines, YlineColor, thickness)); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(YLine, 2)); + edgeLines.Add(lineCal.calLineOfOffset(YLine, (float)r/2)); var lineC = DisplayLineModel3D(edgeLines, YlineColor, thickness); lines.Add(lineC); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(YLine, -2)); + edgeLines.Add(lineCal.calLineOfOffset(YLine, (float)-r/2)); var lineD = DisplayLineModel3D(edgeLines, YlineColor, thickness); lines.Add(lineD); bindingMoveLine(lineC, lineD); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(YLine, 4)); + edgeLines.Add(lineCal.calLineOfOffset(YLine, (float)r)); var lineG = DisplayLineModel3D(edgeLines, YlineColor, thickness); lines.Add(lineG); edgeLines = new List>(); - edgeLines.Add(lineCal.calLineOfOffset(YLine, -4)); + edgeLines.Add(lineCal.calLineOfOffset(YLine, (float)-r)); var lineH = DisplayLineModel3D(edgeLines, YlineColor, thickness); lines.Add(lineH); bindingMoveLine(lineG, lineH);