From 6f0cb1bc1c219a2a22ab31be20e0a957299b85be Mon Sep 17 00:00:00 2001 From: iamboss Date: Sat, 13 Jun 2026 21:38:20 +0800 Subject: [PATCH] refactor(demos): DemoSessionMessage reads IMessage instead of MultiTagMessage Co-Authored-By: Claude Opus 4.8 --- Common/DemoSessionMessage.cs | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Common/DemoSessionMessage.cs b/Common/DemoSessionMessage.cs index 307b145..3aaea0b 100644 --- a/Common/DemoSessionMessage.cs +++ b/Common/DemoSessionMessage.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Reflection; using Hi.Common; using Hi.Common.FileLines; +using Hi.Common.Messages; using Hi.Geom; using Hi.HiNcKits; using Hi.MachiningProcs; @@ -24,12 +25,12 @@ public static class DemoSessionMessage #region Demo_UseSessionMessageHost internal static void DemoUseSessionMessageHost(LocalProjectService localProjectService) { - SessionProgress sessionMessageHost = localProjectService.SessionProgress; + MixedProgress0 sessionMessageHost = localProjectService.MixedProgress; - SessionProgress.FilterFlag filterFlags = - SessionProgress.FilterFlag.NC | - SessionProgress.FilterFlag.Progress | - SessionProgress.FilterFlag.Error; + MixedProgress0.FilterFlag filterFlags = + MixedProgress0.FilterFlag.NC | + MixedProgress0.FilterFlag.Progress | + MixedProgress0.FilterFlag.Error; string filterText = null; var filteredSessionMessageList = sessionMessageHost .GetFliteredList(filterFlags, filterText); @@ -45,9 +46,8 @@ public static class DemoSessionMessage Console.Write($"Message/NC: {nc.Line}; File: {nc.FilePath}; LineNo: {nc.GetLineNo()}; "); // For SessionMessageHost.FilterFlag.Progress or Error. - var multiTagMessage = sessionMessage.MultiTagMessage; - if (multiTagMessage != null) - Console.WriteLine($"Message/NC: {multiTagMessage.Message}"); + if (sessionMessage.Data is IMessage message) + Console.WriteLine($"Message/NC: {message.GetNotification()}"); var exception = sessionMessage.Exception; if (exception != null) Console.WriteLine($"Message/NC: {exception.Message}"); @@ -60,7 +60,7 @@ public static class DemoSessionMessage internal static void DemoUseSessionMessageHost2(LocalProjectService localProjectService) { - SessionProgress sessionMessageHost = localProjectService.SessionProgress; + MixedProgress0 sessionMessageHost = localProjectService.MixedProgress; IMachiningChain machiningChain = localProjectService.MachiningChain; PresentAttribute mrrPresent = typeof(MachiningStep).GetProperty(nameof(MachiningStep.Mrr_mm3ds)).GetCustomAttribute(); @@ -70,11 +70,11 @@ public static class DemoSessionMessage string torqueUnit = torquePresent?.TailUnitString; string torqueFormat = torquePresent?.DataFormatString; - SessionProgress.FilterFlag filterFlags = - SessionProgress.FilterFlag.Step | - SessionProgress.FilterFlag.NC | - SessionProgress.FilterFlag.Progress | - SessionProgress.FilterFlag.Error; + MixedProgress0.FilterFlag filterFlags = + MixedProgress0.FilterFlag.Step | + MixedProgress0.FilterFlag.NC | + MixedProgress0.FilterFlag.Progress | + MixedProgress0.FilterFlag.Error; string filterText = null; var filteredSessionMessageList = sessionMessageHost .GetFliteredList(filterFlags, filterText); @@ -106,9 +106,8 @@ public static class DemoSessionMessage } // For SessionMessageHost.FilterFlag.Progress or Error. - var multiTagMessage = sessionMessage.MultiTagMessage; - if (multiTagMessage != null) - Console.WriteLine($"Message/NC: {multiTagMessage.Message}"); + if (sessionMessage.Data is IMessage message) + Console.WriteLine($"Message/NC: {message.GetNotification()}"); var exception = sessionMessage.Exception; if (exception != null) Console.WriteLine($"Message/NC: {exception.Message}");