This commit is contained in:
2025-12-30 15:43:10 +08:00
parent 955dab6e65
commit 7083653661
44 changed files with 1165 additions and 513 deletions
@@ -296,16 +296,12 @@ namespace HiNcRcl.Areas.Player
{
using var _ = await DisposeSemaphore.EmbraceAsync();
if (disposedValue) return;
var machiningProject = MachiningProject;
if (machiningProject != null)
{
LocalProjectService.PacePlayer.IsLockedChangedEvent
+= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsRunningChangedEvent
+= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsFinishedChangedEvent
+= EnumerablePlayer_IsLockedEventHandler;
}
LocalProjectService.PacePlayer.IsLockedChangedEvent
+= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsRunningChangedEvent
+= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsFinishedChangedEvent
+= EnumerablePlayer_IsLockedEventHandler;
}
}
@@ -313,16 +309,12 @@ namespace HiNcRcl.Areas.Player
public async ValueTask DisposeAsync()
{
using var _ = await DisposeSemaphore.EmbraceAsync();
var machiningProject = MachiningProject;
if (machiningProject != null)
{
LocalProjectService.PacePlayer.IsLockedChangedEvent
-= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsRunningChangedEvent
-= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsFinishedChangedEvent
-= EnumerablePlayer_IsLockedEventHandler;
}
LocalProjectService.PacePlayer.IsLockedChangedEvent
-= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsRunningChangedEvent
-= EnumerablePlayer_IsLockedEventHandler;
LocalProjectService.PacePlayer.IsFinishedChangedEvent
-= EnumerablePlayer_IsLockedEventHandler;
disposedValue = true;
await ValueTask.CompletedTask;
}
@@ -352,21 +344,21 @@ namespace HiNcRcl.Areas.Player
await Task.Run(() =>
{
LocalProjectService.PacePlayer.Pause();
}).ShowIfCatched(this);
}).ShowIfCatched(this);
}
public async Task RunToLineEnd()
{
await Task.Run(() =>
{
LocalProjectService.NcRunner.RunToLineEnd();
}).ShowIfCatched(this);
}).ShowIfCatched(this);
}
public async Task RunToNextPace()
{
await Task.Run(() =>
{
LocalProjectService.PacePlayer.RunToNextPace();
}).ShowIfCatched(this);
}).ShowIfCatched(this);
}
public async Task Break()
{