diff --git a/Common/DemoSessionMessage.cs b/Common/DemoSessionMessage.cs index 3aaea0b..bd3a207 100644 --- a/Common/DemoSessionMessage.cs +++ b/Common/DemoSessionMessage.cs @@ -91,7 +91,7 @@ public static class DemoSessionMessage string[] machineCoordinateValueTexts = GetMachineCoordinateValueTexts(step, machiningChain); var machineCoordinatesText = string.Join("; ", Enumerable.Range(0, machiningChain.McCodes.Length) .Select(i => $"MC.{machiningChain.McCodes[i]}: {machineCoordinateValueTexts[i]}")); - Console.Write($"Time: {step.AccumulatedTime:G}; MRR = {step.Mrr_mm3ds.ToString(mrrFormat)} {mrrUnit}; Torque = {step.AvgAbsTorque_Nm?.ToString(torqueFormat)} {torqueUnit}; {machineCoordinatesText}; "); + Console.Write($"Time: {step.EndTimecode:G}; MRR = {step.Mrr_mm3ds.ToString(mrrFormat)} {mrrUnit}; Torque = {step.AvgAbsTorque_Nm?.ToString(torqueFormat)} {torqueUnit}; {machineCoordinatesText}; "); var nc_ = sessionMessageHost.GetSourceCommand(sessionMessage); Console.WriteLine($"Message/NC: {nc_.Line}; File: {nc_.FilePath}; LineNo: {nc_.GetLineNo()}"); } diff --git a/Common/UserConfig.cs b/Common/UserConfig.cs index 9539216..a5d67e0 100644 --- a/Common/UserConfig.cs +++ b/Common/UserConfig.cs @@ -142,7 +142,7 @@ public class UserConfig : IMakeXmlSource public List DisplayedStepPresentKeyList { get; set; } = new List([ nameof(MachiningStep.StepIndex), nameof(MachiningStep.FileNo), nameof(MachiningStep.LineNo), - nameof(MachiningStep.FilePath),nameof(MachiningStep.AccumulatedTime), + nameof(MachiningStep.FilePath),nameof(MachiningStep.EndTimecode), nameof(MachiningStep.LineText),nameof(MachiningStep.FlagsText), nameof(MachiningStep.ToolId), nameof(MachiningStep.SpindleSpeed_rpm),nameof(MachiningStep.Feedrate_mmdmin),