From 9f6abcc5426b47ac31f3e57e29187b34fd56adc0 Mon Sep 17 00:00:00 2001 From: codex Date: Tue, 4 Aug 2026 14:44:07 +0300 Subject: [PATCH] fix: keep script preview on active Ortho drawing --- Launcher.Next.Autodesk/AutodeskAdapters.cs | 4 +--- tests/Launcher.Next.Tests/PathAndLaunchTests.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Launcher.Next.Autodesk/AutodeskAdapters.cs b/Launcher.Next.Autodesk/AutodeskAdapters.cs index 414c757..6a31241 100644 --- a/Launcher.Next.Autodesk/AutodeskAdapters.cs +++ b/Launcher.Next.Autodesk/AutodeskAdapters.cs @@ -19,9 +19,7 @@ public sealed class StartupScriptBuilder : IStartupScriptBuilder public string BuildAutomationScript(ResolvedAutomationScriptPaths paths) { var fixture = Path.GetFullPath(paths.FixtureOrthoDwg); - var model = Path.GetFullPath(paths.FixtureModelDwg); if (!File.Exists(fixture)) throw new InvalidOperationException("AUTOMATION_FIXTURE_NOT_FOUND"); - if (!File.Exists(model)) throw new InvalidOperationException("AUTOMATION_SOURCE_MODEL_NOT_FOUND"); var quote = (string value) => "\"" + value.Replace("\"", "\\\"") + "\""; var dialogFreeOpen = "_.FILEDIA\n0\n_.CMDDIA\n0\n"; var diagnostic = paths.Diagnostic @@ -30,7 +28,7 @@ public sealed class StartupScriptBuilder : IStartupScriptBuilder var commands = paths.Diagnostic ? "PHP_REC_AUTOMATION_BEFORE_PXP_1\nPXP-OA\nPHP_REC_AUTOMATION_AFTER_PXP_1\nPHP_REC_AUTOMATION_BEFORE_PXP_2\nPXP-OA\nPHP_REC_AUTOMATION_AFTER_PXP_2\n" : "PXP-OA\nPXP-OA\n"; - return dialogFreeOpen + "_.OPEN\n" + quote(model) + "\n_.OPEN\n" + quote(fixture) + "\n" + diagnostic + BuildNetloadScript(paths.ValidatedPackageRoot, paths.EntryAssembly) + + return dialogFreeOpen + "_.OPEN\n" + quote(fixture) + "\n" + diagnostic + BuildNetloadScript(paths.ValidatedPackageRoot, paths.EntryAssembly) + "PHP_REC_AUTOMATION_PREPARE\n" + commands + "PHP_REC_AUTOMATION_FINALIZE\n"; } } diff --git a/tests/Launcher.Next.Tests/PathAndLaunchTests.cs b/tests/Launcher.Next.Tests/PathAndLaunchTests.cs index 54e29a3..c83b61c 100644 --- a/tests/Launcher.Next.Tests/PathAndLaunchTests.cs +++ b/tests/Launcher.Next.Tests/PathAndLaunchTests.cs @@ -69,7 +69,7 @@ public sealed class PathAndLaunchTests var first = new StartupScriptBuilder().BuildAutomationScript(paths); var second = new StartupScriptBuilder().BuildAutomationScript(paths); Assert.Equal(first, second); Assert.EndsWith("\n", first); Assert.Equal(2, System.Text.RegularExpressions.Regex.Matches(first, "PXP-OA").Count); Assert.True(first.IndexOf("_.FILEDIA\n0", StringComparison.Ordinal) < first.IndexOf("_.OPEN", StringComparison.Ordinal)); - Assert.True(first.IndexOf(model, StringComparison.Ordinal) < first.IndexOf(fixture, StringComparison.Ordinal)); + Assert.DoesNotContain(model, first, StringComparison.OrdinalIgnoreCase); Assert.True(first.IndexOf("PHP_REC_AUTOMATION_PREPARE", StringComparison.Ordinal) < first.IndexOf("PXP-OA", StringComparison.Ordinal)); Assert.True(first.LastIndexOf("PXP-OA", StringComparison.Ordinal) < first.IndexOf("PHP_REC_AUTOMATION_FINALIZE", StringComparison.Ordinal)); }