From da83e59432a8e484d153fb9e9f2e0c7b35116eb2 Mon Sep 17 00:00:00 2001
From: iamboss <iamboss@superhightech.com.tw>
Date: Tue, 14 Apr 2026 17:18:05 +0800
Subject: [PATCH] refactor(Sample.Wpf): adapt demos for
 SessionStepBuilt/WorkpieceService/CatchExceptions changes

Made-with: Cursor
---
 Disp/DemoUtil.cs                                            | 1 +
 Machining/DemoMillingByCutterLocation.cs                    | 1 +
 .../DemoRenderingMachiningProcessAndStripPosSelection.cs    | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Disp/DemoUtil.cs b/Disp/DemoUtil.cs
index 921fc3c..a0f6f2c 100644
--- a/Disp/DemoUtil.cs
+++ b/Disp/DemoUtil.cs
@@ -2,6 +2,7 @@
 using Hi.HiNcKits;
 using Hi.Licenses;
 using Hi.WpfPlus.Disp;
+using Microsoft.Extensions.Logging;
 using System.Windows;
 
 namespace Sample.Disp;
diff --git a/Machining/DemoMillingByCutterLocation.cs b/Machining/DemoMillingByCutterLocation.cs
index ccf5766..803fff2 100644
--- a/Machining/DemoMillingByCutterLocation.cs
+++ b/Machining/DemoMillingByCutterLocation.cs
@@ -7,6 +7,7 @@ using Hi.MachiningProcs;
 using Hi.Numerical.Acts;
 using Hi.WpfPlus.Disp;
 using HiMachining.Milling;
+using Microsoft.Extensions.Logging;
 using System;
 using System.IO;
 using System.Threading.Tasks;
diff --git a/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs b/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs
index e2215f2..2612bf7 100644
--- a/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs
+++ b/Machining/DemoRenderingMachiningProcessAndStripPosSelection.cs
@@ -5,6 +5,7 @@ using Hi.Common.FileLines;
 using System.Windows;
 using Hi.MachiningSteps;
 using Hi.HiNcKits;
+using Microsoft.Extensions.Logging;
 
 namespace Sample.Machining
 {
@@ -32,10 +33,11 @@ namespace Sample.Machining
 			localProjectService.LoadProject(projectPath);
             MachiningProject machiningProject = localProjectService.MachiningProject;
 
-			localProjectService.RuntimeApi.MachiningStepSelected += (MachiningStep step) =>
+			localProjectService.RuntimeApi.SessionStepSelected += (MachiningStep step) =>
             {
                 var sourceCommand = step.SourceCommand;
-                Console.WriteLine($"Step Selected: MRR = {step.Mrr_mm3ds} At \"{sourceCommand?.FilePath}\" (Line {sourceCommand?.GetLineNo()}) \"{sourceCommand?.Line}\"");
+                var indexedFileLine = sourceCommand.GetSentence().FirstIndexedFileLine;
+                Console.WriteLine($"Step Selected: MRR = {step.Mrr_mm3ds} At \"{indexedFileLine?.FilePath}\" (Line {indexedFileLine?.GetLineNo()}) \"{indexedFileLine?.Line}\"");
             };
 			localProjectService.PacePlayer.Start();
             #endregion