Compare commits
137
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0e0c13ee00 | ||
|
|
07abdc013b | ||
|
|
990d057ae3 | ||
|
|
8ad3d97edb | ||
|
|
6624c4ffd0 | ||
|
|
a80ff5220d | ||
|
|
beadf751b0 | ||
|
|
5047b7d41b | ||
|
|
f706840d5d | ||
|
|
eb70c9d1a1 | ||
|
|
f127fb1ed2 | ||
|
|
0e53ffb810 | ||
|
|
9242d2bb08 | ||
|
|
9aad3662ed | ||
|
|
eaa6044682 | ||
|
|
87887ffc76 | ||
|
|
9443babaf1 | ||
|
|
bb45add91d | ||
|
|
5bd39d56c4 | ||
|
|
4a351d9b44 | ||
|
|
4a84c268f8 | ||
|
|
289b262053 | ||
|
|
64ace55338 | ||
|
|
8510974d75 | ||
|
|
14c244657d | ||
|
|
79f6124885 | ||
|
|
11a8130494 | ||
|
|
1986d15c2b | ||
|
|
3eaa659947 | ||
|
|
652515c2ba | ||
|
|
9a41d831b4 | ||
|
|
700922b832 | ||
|
|
064cfdd803 | ||
|
|
fcdec4d227 | ||
|
|
461cc8f71b | ||
|
|
b381f83bbd | ||
|
|
d4016237d8 | ||
|
|
aaec3f93f2 | ||
|
|
548c73cb27 | ||
|
|
c57c844f78 | ||
|
|
7d8cc570df | ||
|
|
ba39a649be | ||
|
|
b69a858f8e | ||
|
|
532c9dc1f2 | ||
|
|
01a0b711d0 | ||
|
|
acfa6723c9 | ||
|
|
53d6378cfa | ||
|
|
20ac5e4808 | ||
|
|
f9cd0a43bf | ||
|
|
a8749ffa69 | ||
|
|
43c9e42b5b | ||
|
|
95ae9dfd18 | ||
|
|
34cdfa225c | ||
|
|
2626b64e63 | ||
|
|
6e909f89bc | ||
|
|
91f316d79b | ||
|
|
7090321167 | ||
|
|
6f39bb204d | ||
|
|
3128568965 | ||
|
|
58f71267a2 | ||
|
|
066a9f3d94 | ||
|
|
0a7f05989a | ||
|
|
315d36a36a | ||
|
|
431366c27c | ||
|
|
172d0fa0f1 | ||
|
|
d3da634894 | ||
|
|
a17ad87fc2 | ||
|
|
ed7218983b | ||
|
|
10af8c8f12 | ||
|
|
b6a2cd06af | ||
|
|
8e197cdcde | ||
|
|
7070e4dffe | ||
|
|
cce3ff71c5 | ||
|
|
70ae18981a | ||
|
|
20960ae91f | ||
|
|
ca0f49ee5a | ||
|
|
c3ac183fff | ||
|
|
68f500692c | ||
|
|
86cabb584b | ||
|
|
aefd3aa487 | ||
|
|
07ab3c436f | ||
|
|
c97f02c550 | ||
|
|
62f470c7ba | ||
|
|
2fe1ca71df | ||
|
|
e707456ab6 | ||
|
|
3cecee4777 | ||
|
|
8a9f95a605 | ||
|
|
c270a182ce | ||
|
|
25311e89f0 | ||
|
|
f5a70df68a | ||
|
|
5725bc8737 | ||
|
|
bfd31a3747 | ||
|
|
c5cf142159 | ||
|
|
bc481d4378 | ||
|
|
1fa25809de | ||
|
|
6ed1e4086b | ||
|
|
c633107273 | ||
|
|
2d9fbdd474 | ||
|
|
98564b807f | ||
|
|
1b4ff816ba | ||
|
|
13578b7c9b | ||
|
|
523d063ceb | ||
|
|
31171c9ed8 | ||
|
|
edf1640c4f | ||
|
|
81a075e684 | ||
|
|
32607e2f34 | ||
|
|
c9c4113e86 | ||
|
|
33f91c26aa | ||
|
|
ef615a1f8e | ||
|
|
e7765cbdda | ||
|
|
d8e61b7a5e | ||
|
|
79067b72de | ||
|
|
44de0cf787 | ||
|
|
239796aafe | ||
|
|
8a1735408a | ||
|
|
544b329077 | ||
|
|
1563e2fae0 | ||
|
|
bd5f47d811 | ||
|
|
1bfb91bc4b | ||
|
|
209b8b89b8 | ||
|
|
31787fc05a | ||
|
|
11cf97c476 | ||
|
|
76d362d2c3 | ||
|
|
37d3cacc13 | ||
|
|
713e620485 | ||
|
|
6f32371418 | ||
|
|
243080a1aa | ||
|
|
75c27ee8e5 | ||
|
|
c83ff3d9b3 | ||
|
|
09c53be7f4 | ||
|
|
bdd2c9c888 | ||
|
|
95dba856c8 | ||
|
|
6fa3af6eda | ||
|
|
c616188336 | ||
|
|
bb44b1b1aa | ||
|
|
6e4cc74e82 | ||
|
|
1127a8376f |
@@ -1,6 +1,10 @@
|
||||
/link/
|
||||
/link
|
||||
|
||||
# Generated build output is never source or package input.
|
||||
**/bin/
|
||||
**/obj/
|
||||
|
||||
# DocumentAutomation generated files and local source data
|
||||
DocumentAutomation/**/bin/
|
||||
DocumentAutomation/**/obj/
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
# AGENTS.md
|
||||
|
||||
## Назначение проекта
|
||||
|
||||
Этот репозиторий содержит аудит, архитектуру, исходный код, тесты, runtime
|
||||
evidence и документацию миграции корпоративной экосистемы Autodesk AutoCAD
|
||||
Plant 3D 2019 на Autodesk AutoCAD Plant 3D 2026.
|
||||
|
||||
Конечная цель — функционально эквивалентная рабочая схема Plant 3D 2026:
|
||||
корпоративный Launcher, локальная доставка и активация пакетов, managed
|
||||
плагины, команды, Ribbon, Plant project integration, DataLinks, Ortho,
|
||||
аннотации, обновление, диагностика и rollback. Миграция не считается
|
||||
завершённой после успешной компиляции: необходима runtime-проверка реальных
|
||||
сценариев в Plant 3D 2026.
|
||||
|
||||
## Связанные репозитории
|
||||
|
||||
- основной Autodesk-репозиторий: `C:\dev\autodesk`;
|
||||
- Launcher Next: `C:\dev\launcher-next`;
|
||||
- legacy launcher (read-only): `C:\dev\launcher\git`, `C:\dev\p_serv_starter`;
|
||||
- legacy P_Rec_Annot (read-only): `C:\dev\autodesk\link\P_Rec_Annot\v1.0.4\repo`.
|
||||
|
||||
Legacy и deployed-файлы нельзя изменять без отдельного прямого задания.
|
||||
|
||||
## Целевая платформа и принцип миграции
|
||||
|
||||
- Autodesk AutoCAD Plant 3D 2026, series R25.1, Windows x64, .NET 8;
|
||||
- использовать реальные Autodesk 2026 managed assemblies;
|
||||
- managed package загружается локально, не напрямую с UNC;
|
||||
- Autodesk DLL нельзя коммитить, помещать в package/fixture или публиковать.
|
||||
|
||||
Переносится функциональное поведение, а не историческая структура файлов. Не
|
||||
воспроизводить без отдельного доказательства 20 последовательных `NETLOAD`,
|
||||
legacy LISP bootstrap, `OrthoLoader.dll`, загрузку с сети или прежние
|
||||
workaround. Предпочтительная цепочка:
|
||||
|
||||
`Launcher Next → versioned local package → один managed entry assembly → internal dependencies → commands and Ribbon`.
|
||||
|
||||
## Статус legacy-команд
|
||||
|
||||
Ни одна активная команда Plant 3D 2019 не исчезает молча. Для каждой команды
|
||||
фиксируется ровно один статус: `IMPLEMENTED`, `RUNTIME_VERIFIED`,
|
||||
`REPLACED_WITH_NATIVE`, `RETIRED_APPROVED` или `BLOCKED_WITH_REASON`.
|
||||
Aliases сохраняются, пока их удаление не утверждено отдельно.
|
||||
|
||||
## Runtime уровни
|
||||
|
||||
`Smoke` проверяет assembly load, регистрацию команд, Plant context, Ribbon,
|
||||
отсутствие необработанных исключений и отсутствие записи в DWG.
|
||||
|
||||
`DryRun` проверяет реальные Plant data, Ortho/sheet/view definitions, DataLinks,
|
||||
Plant objects, детерминированный план и отсутствие записи в DWG/project DB.
|
||||
|
||||
`Apply` разрешается только отдельным явным заданием: write guard, ограниченная
|
||||
DWG transaction, тестовая копия проекта, baseline, rollback/UNDO, duplicate
|
||||
protection и runtime evidence обязательны. Apply нельзя включать только
|
||||
локальной конфигурацией.
|
||||
|
||||
## Runtime важнее предположений
|
||||
|
||||
Build и unit tests не доказывают Autodesk integration. Для
|
||||
`RUNTIME_VERIFIED` необходимы фактические результаты: команда, module path,
|
||||
DBMOD, Ribbon, DataLinks, Ortho status, telemetry и состояние файлов после
|
||||
закрытия. Не выдумывать UI evidence: использовать `null`, `NOT VERIFIED` или
|
||||
`BLOCKED WITH REASON`.
|
||||
|
||||
На тестовой машине реальный Plant 3D запуск разрешён, если он входит в задачу
|
||||
и есть test branch, локальный fixture, пройденные build/tests, rollback и нет
|
||||
production deploy. Не создавать искусственный review-gate перед Process.Start.
|
||||
Остановка допустима лишь после завершения доступной части работы и при
|
||||
конкретном внешнем blocker: установка, ОС, права, Autodesk runtime, fixture или
|
||||
необходимость production-данных.
|
||||
|
||||
## Test fixtures и отсутствие записи
|
||||
|
||||
Fixtures создаются вне Git, например `<TEST_FIXTURE_ROOT>`. Ortho fixture —
|
||||
настоящий Plant project с Pipe, DataLinks row, line group, Ortho drawing,
|
||||
Ortho viewport и source-model connection; обычный AutoCAD viewport не годится.
|
||||
Production DWG/project использовать нельзя без прямого разрешения.
|
||||
|
||||
Нельзя коммитить DWG, DCF, Project.xml с runtime-data, project DB, Ortho
|
||||
generated files или реальные engineering values.
|
||||
|
||||
Для Smoke/DryRun проверять DBMOD до/после, SHA-256 содержательных project
|
||||
files, отсутствие непредусмотренных transactions/DCF/project-metadata writes.
|
||||
`LastWriteTime` недостаточен. Отделять служебные Plant cache/session files от
|
||||
содержательных данных.
|
||||
|
||||
## Ribbon, механика и evidence
|
||||
|
||||
Ribbon — часть продукта: проверять tab, panel, button, command binding, stable
|
||||
IDs, отсутствие дубликатов при документах/workspace/reinitialization. Команда
|
||||
может быть отдельно рабочей, но plugin slice не завершён без Ribbon evidence
|
||||
или отдельного UI defect.
|
||||
|
||||
Документировать каждую runtime-цепочку: component/project/class/method,
|
||||
input/output, Autodesk transaction mode, writes, telemetry, failure code и
|
||||
rollback action. Документация соответствует фактическому коду.
|
||||
|
||||
Evidence содержит только проверенные значения. Не добавлять username, permit,
|
||||
полный environment, real project paths/line numbers/ObjectId/RowId/properties,
|
||||
полные logs, local manifest или startup scripts. Путь fixture заменять на
|
||||
`<TEST_FIXTURE_ROOT>`.
|
||||
|
||||
## Warnings и Git
|
||||
|
||||
Известный `MSB3277` WindowsBase 4.0.0.0/8.0.0.0 допустим только при полном
|
||||
совпадении с ранее зафиксированным warning. Новые warnings исследовать; не
|
||||
подавлять `NoWarn` без причины.
|
||||
|
||||
Запрещены force push, amend/rebase опубликованной истории, push binaries,
|
||||
изменение неизвестного remote и production deployment из test branch. Перед
|
||||
commit выполнять:
|
||||
|
||||
```powershell
|
||||
git diff --check
|
||||
git status --short
|
||||
git diff --cached --check
|
||||
```
|
||||
|
||||
Не смешивать Launcher defect, plugin defect, runtime evidence и unrelated
|
||||
formatting в одном commit.
|
||||
|
||||
## Definition of Done
|
||||
|
||||
Срез завершён, когда реализованы код, build/tests, валидный package и требуемый
|
||||
runtime-сценарий; записаны фактические результаты; выполнен rollback; fixture и
|
||||
production изолированы; механика документирована; ветка опубликована обычным
|
||||
push.
|
||||
|
||||
## Общая карта проекта
|
||||
|
||||
Каноническая общая карта проекта находится в Google Drive:
|
||||
`https://drive.google.com/drive/folders/1avnR0V8q7y5pfWRYwB6LPBEEyfpN7PpV`.
|
||||
Локальная синхронизированная копия, если она доступна, определяется только
|
||||
переменной среды `PHIM_PLANT3D_PROJECT_MAP_ROOT`; её путь не хардкодить.
|
||||
|
||||
Перед работой над архитектурой, миграцией или runtime-сценарием обязательно
|
||||
прочитать доступные индекс/обзор карты, целевую архитектуру и migration status,
|
||||
индекс runtime evidence, а также записи карты для затрагиваемых Launcher и
|
||||
P_Rec_Annot. Затем сверить их с локальными AGENTS.md, релевантными tracked
|
||||
документами, текущим кодом и тестами.
|
||||
|
||||
Источники истины имеют следующий приоритет: фактическое runtime evidence;
|
||||
текущий код, tests и tracked configuration на проверенном Git HEAD; tracked
|
||||
документация репозитория; общая карта проекта. Внешняя карта описывает и
|
||||
связывает работу, но не является build/runtime dependency и не переопределяет
|
||||
текущий код или runtime evidence.
|
||||
|
||||
Проверять свежесть каждой используемой записи карты по фактическим `git
|
||||
rev-parse HEAD`, ветке и привязанному runtime evidence. Если карта или её
|
||||
локальная копия недоступна, фиксировать `PROJECT_MAP_UNAVAILABLE`; если
|
||||
зафиксированные commit/runtime status не совпадают с фактическими —
|
||||
`PROJECT_MAP_STALE`. Эти статусы не разрешают выдумывать evidence: продолжать
|
||||
по доступным локальным источникам и явно сообщать расхождение.
|
||||
|
||||
Системные инварианты сохраняются: Launcher доставляет versioned local package
|
||||
с одним managed entry assembly и без Autodesk DLL; P_Rec_Annot подтверждает
|
||||
реальное Plant/Ortho/DataLinks поведение runtime evidence, а не только build
|
||||
или tests. После изменения архитектуры либо runtime-статуса в отчёте указывать
|
||||
конкретные документы общей карты, которые требуют обновления (архитектура,
|
||||
статус миграции, evidence index и запись затронутой подсистемы); не заявлять,
|
||||
что они уже обновлены, без фактического изменения.
|
||||
@@ -0,0 +1,119 @@
|
||||
# AGENTS.md — P_Rec_Annot
|
||||
|
||||
## Назначение и package
|
||||
|
||||
`P_Rec_Annot` — приоритетный Plant 3D 2026 plugin для чтения, планирования и
|
||||
последующего создания Ortho-аннотаций; это перенос активного legacy поведения
|
||||
Plant 3D 2019 на .NET 8/Plant 3D 2026.
|
||||
|
||||
Единственная assembly для `NETLOAD` — `PRecAnnot.Plant3D2026.dll`.
|
||||
`PRecAnnot.*.dll` — internal managed dependencies, их нельзя NETLOAD по одной.
|
||||
Использовать Autodesk 2026 references; Autodesk DLL не включать в bundle.
|
||||
|
||||
## Commands и context
|
||||
|
||||
Поддерживаемые команды: `PHP_REC_ANNOT`, `PXP-AAV`, `PXP-OA`. Все
|
||||
регистрируются реальным Autodesk API, работают в Smoke/DryRun, не изменяют DWG
|
||||
в этих режимах и создают одно usage event на явный вызов.
|
||||
|
||||
Project status: `NotFound`, `FoundWithName`, `FoundWithoutDisplayName`,
|
||||
`Ambiguous`, `Failed`. Никогда не выводить `проект '' найден`; для пустого
|
||||
display name: `Plant 3D-проект открыт; отображаемое имя не определено.`
|
||||
Diagnostic code: `PLANT_PROJECT_DISPLAY_NAME_EMPTY`.
|
||||
|
||||
Drawing states: `Ortho`, `NotOrtho`, `Ambiguous`, `Failed`. Обычный DWG не
|
||||
классифицируется как Ortho; для реального Ortho применять Autodesk API и
|
||||
`OrthoDocUtils.IsValidOrthoDrawing`.
|
||||
|
||||
## DryRun и determinism
|
||||
|
||||
Pipeline: `Plant context → Ortho detection → sheet/view definitions → viewport
|
||||
snapshots → DataLinks → Plant properties → independent DTO → deterministic
|
||||
AnnotationPlan → diagnostics → no write`.
|
||||
|
||||
Autodesk objects, transactions и database handles остаются в adapter layer;
|
||||
Core/Application используют только независимые DTO. На неизменном fixture
|
||||
повторный DryRun обязан давать тот же PlanId, counts, порядок операций и warning
|
||||
codes, без side effects. PlanId не включает время, GUID, absolute path,
|
||||
нестабильный ObjectId или пользовательские данные.
|
||||
|
||||
## Write guard, Ribbon, tests
|
||||
|
||||
Все writes проходят централизованный write guard; в Smoke/DryRun он всегда
|
||||
запрещает изменения. Apply не обходится через command handler/adapter.
|
||||
|
||||
Ожидаемый Ribbon путь: `Промхимпроект → Аннотации → Аннотировать`. Требуются
|
||||
stable IDs, отсутствие дублей, binding к `PHP_REC_ANNOT`, устойчивость к
|
||||
документам/workspace и корректный Terminate.
|
||||
|
||||
Unit tests не требуют Autodesk runtime. Runtime evidence отдельно фиксирует
|
||||
initialization, commands, context, Ortho, DataLinks, plan, Ribbon, DBMOD,
|
||||
telemetry и shutdown.
|
||||
|
||||
Bundle содержит только фактический runtime dependency graph и никогда не
|
||||
содержит Autodesk DLL, PDB, test assemblies, legacy 2019 assemblies, bin/obj
|
||||
или production configuration.
|
||||
|
||||
Fixture: local Plant 3D 2026 project вне Git с настоящей Pipe, synthetic line
|
||||
number, Ortho drawing/viewport и SHA baseline до DryRun.
|
||||
|
||||
## Viewport membership and source DataLinks
|
||||
|
||||
Legacy P_Rec_Annot source for read-only analysis is
|
||||
`\\phpsrv03\NBIM\code\CS\P_Rec_Annot\v1.0.4\repo`.
|
||||
|
||||
A source object is not a member of an Ortho viewport without confirmed
|
||||
evidence. A geometry-only filter is at most `PartiallyResolved`. Apply is
|
||||
blocked by any `PLUGIN_ONLY_CHANGE` in a DWG, DCF, or project metadata found by
|
||||
a paired CONTROL/DryRun comparison.
|
||||
|
||||
## Ortho source DataLinks and DCF control
|
||||
|
||||
DataLinks активного Ortho drawing не являются источником Piping rows. Piping
|
||||
rows читаются из source model drawing и Piping project part, разрешённых через
|
||||
Ortho sheet/view definitions.
|
||||
|
||||
Перед предположениями об Autodesk runtime API необходимо исследовать текущий
|
||||
код, доступный legacy usage, assembly metadata и реальные runtime types.
|
||||
Reflection/runtime inspection применяется только для подтверждения данных,
|
||||
которых нельзя установить статически. Production resolver не угадывает
|
||||
Autodesk properties по строковым именам.
|
||||
|
||||
Подтверждённый контракт Plant 3D 2026: `IDwgViewDef.DwgQuery` →
|
||||
`IDwgQuery.ModelFiles` → `ModelFile[].ModelFileName`. При несовпадении типа
|
||||
возвращать `ORTHO_MODEL_FILES_API_UNSUPPORTED`, без fallback-эвристики.
|
||||
|
||||
Проверка DCF выполняется на парных `control` и `DryRun` fixtures, созданных из
|
||||
одного закрытого состояния проекта. Сравнивать нужно `control delta` с
|
||||
`DryRun delta`: одинаковые изменения классифицируются как baseline behavior
|
||||
Plant 3D, а plugin-only изменения блокируют дальнейшую работу.
|
||||
|
||||
## Общая карта проекта
|
||||
|
||||
Каноническая общая карта проекта:
|
||||
`https://drive.google.com/drive/folders/1avnR0V8q7y5pfWRYwB6LPBEEyfpN7PpV`.
|
||||
Необязательная локальная копия доступна только через
|
||||
`PHIM_PLANT3D_PROJECT_MAP_ROOT`; локальный путь синхронизации не хардкодить.
|
||||
|
||||
До изменения P_Rec_Annot читать доступные индекс карты, запись архитектуры и
|
||||
статуса P_Rec_Annot, DryRun/Apply contract, карту Ortho/DataLinks и связанный
|
||||
runtime evidence index. Сверять их с фактическим Git HEAD, текущими plugin
|
||||
code/tests/configuration и runtime evidence конкретной fixture.
|
||||
|
||||
Приоритет источников: runtime evidence, затем code/tests/configuration на
|
||||
проверенном HEAD, затем tracked repository documentation, затем общая карта.
|
||||
Карта не является build/runtime dependency и не заменяет фактический код либо
|
||||
runtime evidence. Недоступную карту отмечать `PROJECT_MAP_UNAVAILABLE`;
|
||||
несовпадение её commit/runtime status с фактическими данными —
|
||||
`PROJECT_MAP_STALE`.
|
||||
|
||||
Инварианты P_Rec_Annot: остаётся единственная NETLOAD entry assembly, aliases
|
||||
и статусы команд не исчезают молча, Smoke/DryRun не пишут DWG, а Apply требует
|
||||
явного разрешения, локальной fixture, ограниченной transaction, evidence и
|
||||
проверяемого rollback/UNDO. Не ослаблять подтверждённый Ortho source/DataLinks
|
||||
контракт и DCF control comparison ради сведений из карты.
|
||||
|
||||
После изменения plugin architecture или runtime-status в отчёте перечислять
|
||||
документы карты, требующие обновления: запись P_Rec_Annot, command/status,
|
||||
Ortho/DataLinks contract, DryRun/Apply/UNDO evidence и migration status. Не
|
||||
утверждать обновление внешней документации без фактического изменения.
|
||||
@@ -1,4 +1,5 @@
|
||||
<Project>
|
||||
<Import Project="Local.Build.props" Condition="Exists('Local.Build.props')" />
|
||||
<PropertyGroup>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
@@ -9,5 +10,8 @@
|
||||
<AutoCAD2026ManagedDir Condition="'$(AutoCAD2026ManagedDir)' == '' and '$(Plant3D2026InstallDir)' != ''">$(Plant3D2026InstallDir)</AutoCAD2026ManagedDir>
|
||||
<Plant3D2026ManagedDir Condition="'$(Plant3D2026ManagedDir)' == '' and '$(Plant3D2026InstallDir)' != ''">$(Plant3D2026InstallDir)\PLNT3D</Plant3D2026ManagedDir>
|
||||
<Plant3D2026InstallDir Condition="'$(Plant3D2026InstallDir)' == '' and '$(AutoCAD2026ManagedDir)' != ''">$(AutoCAD2026ManagedDir)</Plant3D2026InstallDir>
|
||||
<Plant3D2026StandardInstallDir Condition="'$(Plant3D2026StandardInstallDir)' == ''">$(ProgramW6432)\Autodesk\AutoCAD 2026</Plant3D2026StandardInstallDir>
|
||||
<AutoCAD2026ManagedDir Condition="'$(AutoCAD2026ManagedDir)' == '' and Exists('$(Plant3D2026StandardInstallDir)\AcMgd.dll')">$(Plant3D2026StandardInstallDir)</AutoCAD2026ManagedDir>
|
||||
<Plant3D2026ManagedDir Condition="'$(Plant3D2026ManagedDir)' == '' and Exists('$(Plant3D2026StandardInstallDir)\PLNT3D\PnPProjectManagerMgd.dll')">$(Plant3D2026StandardInstallDir)\PLNT3D</Plant3D2026ManagedDir>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ApplicationPackage SchemaVersion="1.0" Name="P_Rec_Annot" Description="P_Rec_Annot Plant 3D 2026" AppVersion="0.1.0" Author="NBIM">
|
||||
<ApplicationPackage SchemaVersion="1.0" Name="P_Rec_Annot" Description="P_Rec_Annot Plant 3D 2026" AppVersion="0.2.19" ProductCode="b455ee6eaed79d76f084846a60ce3284" Author="NBIM">
|
||||
<Components>
|
||||
<!-- SeriesMin/SeriesMax and platform token are pending official/runtime verification. -->
|
||||
<RuntimeRequirements OS="Win64" />
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Main>
|
||||
<CopyMissingObjects>
|
||||
<Object type="Block" name="BLOCK_ANNO_POSITION" />
|
||||
<Object type="Block" name="BLOCK_ELEVATION" />
|
||||
<Object type="Block" name="BLOCK_LINENUMBER_CONNECTION" />
|
||||
<Object type="Layer" name="PXP_ANNOTATION" />
|
||||
<Object type="Layer" name="PXP_AXIS" />
|
||||
<Object type="TextStyle" name="GOSTC" />
|
||||
</CopyMissingObjects>
|
||||
<LayersSetup>
|
||||
<LayerSetup filtertype="Status" filtervalue="New" color="" lineweight="60" linetype="Continuous" />
|
||||
<LayerSetup filtertype="Status" filtervalue="Existing" color="" lineweight="-3" linetype="Continuous" />
|
||||
<LayerSetup filtertype="Status" filtervalue="Reserved" color="" lineweight="-3" linetype="PXP_DASH" />
|
||||
<LayerSetup filtertype="Status" filtervalue="Demolition" color="" lineweight="-3" linetype="PXP_DASH" />
|
||||
<LayerSetup filtertype="Layer" filtervalue="CENTER" color="4" lineweight="-3" linetype="PXP_AXIS" />
|
||||
</LayersSetup>
|
||||
<Annotations layer="PXP_ANNOTATION" multileaderstyle="PXP_MLEADER" textstyle="GOSTC" />
|
||||
<LinenumberConnections polylinelayer="PXP_AXIS" textlayer="PXP_TEXT" textstyle="GOSTC" />
|
||||
<Elevations layer="PXP_THIN" textstyle="GOSTC" />
|
||||
<SetLayer name="PXP_AXIS" />
|
||||
</Main>
|
||||
@@ -0,0 +1,5 @@
|
||||
# Annotation-plan determinism
|
||||
|
||||
`AnnotationPlanBuilder` uses schema version `1`. Its canonical input is the normalized command, source drawing basename, view ID, source snapshots sorted by stable ID, properties sorted by key, membership state, and operations sorted by stable source key and type. Absolute paths, process data, timestamps and runtime ObjectIds are excluded.
|
||||
|
||||
Runtime DryRun confirmed equal PlanIds and summaries for two calls of each supported command. Changing a relevant normalized input changes the PlanId.
|
||||
@@ -1,5 +1,11 @@
|
||||
# Build
|
||||
|
||||
References resolve in this order: explicit `AutoCAD2026ManagedDir` and
|
||||
`Plant3D2026ManagedDir`, an untracked `Local.Build.props`, then the validated
|
||||
standard Plant 3D 2026 install directory. No Autodesk binary is copied into the
|
||||
repository or bundle. If discovery does not find all required assemblies, pass
|
||||
the explicit properties shown below.
|
||||
|
||||
The workstation has .NET SDK 8.0.423 and Autodesk AutoCAD Plant 3D 2026 installed. The paths are deliberately supplied at build time; no machine-specific Autodesk path is stored in project files.
|
||||
|
||||
Detected assembly inventory:
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
# CONTROL versus DryRun DCF comparison
|
||||
|
||||
DBMOD covers only the active drawing. This procedure separately compares
|
||||
content-bearing project files after identical CONTROL and DryRun sessions.
|
||||
|
||||
1. With Plant 3D closed and the Launcher session `RolledBack`, copy the local
|
||||
fixture to `<FROZEN_FIXTURE>`.
|
||||
2. Create `<CONTROL_FIXTURE>` and `<DRYRUN_FIXTURE>` from that same frozen
|
||||
state; calculate complete local SHA-256 inventories before each run.
|
||||
3. Open model and Ortho drawings in CONTROL through the same Launcher DryRun
|
||||
launch contract, but invoke no P_Rec_Annot command. Close without saving,
|
||||
wait for Launcher rollback, then calculate the after inventory.
|
||||
4. Repeat with DRYRUN and invoke each supported command twice. Close without
|
||||
saving, wait for rollback, then calculate the after inventory.
|
||||
5. Compare deltas by logical relative path. Classify each content-bearing file
|
||||
as `UNCHANGED`, `AUTODESK_BASELINE_CHANGE`, `PLUGIN_ONLY_CHANGE`, or
|
||||
`INCONCLUSIVE`.
|
||||
|
||||
Content-bearing groups include model DWG, Ortho DWG, `Piping.dcf`, remaining
|
||||
DCF/database files, `Project.xml` or equivalent project metadata, and Ortho
|
||||
metadata. Lock, cache, session, log, preview, and temporary files are reported
|
||||
separately and cannot establish project invariance.
|
||||
|
||||
Any `PLUGIN_ONLY_CHANGE` blocks Apply. Full paths and hashes remain local;
|
||||
repository evidence contains only logical fixture markers, groups, counts, and
|
||||
classifications.
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"candidate": "P_Rec_Annot 0.2.19",
|
||||
"root": "<TEST_FIXTURE_ROOT>/controlled-fixtures-0.2.19",
|
||||
"sourcePolicy": "copied only from approved controlled PRecAnnotOrthoDryRun/FilesRelease fixtures; no production data",
|
||||
"families": [
|
||||
{"id":"line-number","artifacts":["line-number/TestPipeOrtho.dwg","line-number/TestPipeModel.dwg","line-number/Project.xml","line-number/Piping.dcf"],"status":"MATERIALIZED; OWNED_HANDLE_DISCOVERY_REQUIRED","workflows":["PXP-LN","PXP-ULN","PXP-ESN","PXP-ELN","PXP-RMP"]},
|
||||
{"id":"elevation","artifacts":["elevation/TestPipeOrtho.dwg","elevation/TestPipeModel.dwg","elevation/Project.xml","elevation/Piping.dcf"],"status":"MATERIALIZED; SOURCE_ELEVATION_CASES_REQUIRED","workflows":["PXP-AE","PXP-IE"]},
|
||||
{"id":"ortho","artifacts":["ortho/TestPipeOrtho.dwg","ortho/TestPipeModel.dwg","ortho/Project.xml","ortho/Piping.dcf"],"status":"MATERIALIZED; EXACT_VIEWPORT_MAPPING_REQUIRED","workflows":["PXP-AAV","PXP-COV","PXP-UOB","PXP-DJ"]},
|
||||
{"id":"manual","artifacts":["manual/Template.dwg"],"status":"MATERIALIZED; MANUAL_STATE_AND_OWNED_BLOCK_REQUIRED","workflows":["mto-ma","PXP-MA","CAC","CAC1","BJ","PXP-MAB","PXP-AC"]},
|
||||
{"id":"batch","artifacts":["batch/FolderA/SameName.dwg","batch/FolderB/SameName.dwg"],"status":"MATERIALIZED; CONTROLLED_PROJECT_RELATIVE_IDENTITY_REQUIRED","workflows":["PXP-IOD"]}
|
||||
],
|
||||
"hashes": {
|
||||
"TestPipeOrtho.dwg": "B372BB94B039AB70E0721F2403D36065588C099B101360BE916C74F55B4B7A39",
|
||||
"TestPipeModel.dwg": "D702E6E1BF100F6BB2D5623128ECB8E8685398FEFD162A989A1574404C1EA8BF",
|
||||
"Project.xml": "EC622CF25E31FDCFEA009581880DA74DC5213EC8427767AB1310E715E2C4F231",
|
||||
"Piping.dcf": "F28A09832CDF647722E81F6CC38A632EC576E8B921E68B01D5335421FF20CE36",
|
||||
"Template.dwg": "22CAAD35CE9C55891CF91042ED9B2C23BA4D5A0745AA40D69F41C1F609DAADB3"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"policy": "controlled-local-only; fail-closed on ambiguous identity; no production DWG/project writes",
|
||||
"fixtures": [
|
||||
{
|
||||
"id": "LINE_NUMBER_ORTHO_OWNED",
|
||||
"requiredDocument": "controlled Plant Ortho DWG copy",
|
||||
"requiredObjects": ["Pipe with DataLinks line number", "owned line-number block", "legacy layers/text styles"],
|
||||
"selection": "exact owned block handle discovered from drawing",
|
||||
"preState": "owned annotation baseline and unchanged Plant source",
|
||||
"mutation": "create/update/delete line annotation",
|
||||
"repeat": "update or AlreadyExists according to command",
|
||||
"undo": "native AutoCAD UNDO restores entity and ownership baseline",
|
||||
"workflows": ["PXP-LN", "PXP-ULN", "PXP-ESN", "PXP-ELN", "PXP-RMP"]
|
||||
},
|
||||
{
|
||||
"id": "CONNECTOR_TOPOLOGY",
|
||||
"requiredDocument": "controlled Plant project and Ortho copy",
|
||||
"requiredObjects": ["two connected Plant parts", "connector/port snapshot", "P3dPartConnection", "line-group relationships"],
|
||||
"selection": "exact connector source identity; no arbitrary entity fallback",
|
||||
"preState": "no owned connection annotation",
|
||||
"mutation": "orthogonal connection leader and ownership XData",
|
||||
"repeat": "recreate/update without duplicate ownership",
|
||||
"undo": "native AutoCAD UNDO restores pre-annotation state",
|
||||
"workflows": ["PXP-ALC"]
|
||||
},
|
||||
{
|
||||
"id": "ELEVATION_GOLDEN",
|
||||
"requiredDocument": "controlled Plant model plus paper/model context",
|
||||
"requiredObjects": ["positive, negative and zero elevations", "BLOCK_ELEVATION definition", "attribute definitions"],
|
||||
"selection": "exact Plant source object handle",
|
||||
"preState": "source object and annotation baseline",
|
||||
"mutation": "legacy /5, AwayFromZero, *5 elevation annotation",
|
||||
"repeat": "update existing owned annotation",
|
||||
"undo": "native AutoCAD UNDO restores baseline",
|
||||
"workflows": ["PXP-AE", "PXP-IE"]
|
||||
},
|
||||
{
|
||||
"id": "ORTHO_VIEWPORT_EXACT",
|
||||
"requiredDocument": "controlled Plant Ortho DWG with one-to-one source view mapping",
|
||||
"requiredObjects": ["exact viewport handle/ObjectId", "layout membership", "Ortho view identity", "visible Plant candidates"],
|
||||
"selection": "validated AcDbViewport handle and expected Ortho mapping",
|
||||
"preState": "viewport and annotation baseline",
|
||||
"mutation": "view annotation/viewport maintenance operation",
|
||||
"repeat": "deterministic update/no duplicate",
|
||||
"undo": "native AutoCAD UNDO restores viewport/entity baseline",
|
||||
"workflows": ["PXP-AAV", "PXP-COV", "PXP-UOB", "PXP-DJ"],
|
||||
"status": "EXACT_VIEWPORT_FIXTURE_BLOCKED"
|
||||
},
|
||||
{
|
||||
"id": "MANUAL_TEMPLATE_EDIT",
|
||||
"requiredDocument": "controlled local Template-derived drawing",
|
||||
"requiredObjects": ["manual annotation blocks", "attributes", "dynamic properties", "required layers/styles", "owned P_REC_ANNOT_MANUAL XData"],
|
||||
"selection": "exact owned annotation handle for edit/reopen",
|
||||
"preState": "palette state and owned annotation baseline",
|
||||
"mutation": "manual insert/update/attribute persistence",
|
||||
"repeat": "restore and update existing owned annotation",
|
||||
"undo": "native AutoCAD UNDO restores entity and manual-state baseline",
|
||||
"workflows": ["mto-ma", "PXP-MA", "CAC", "CAC1", "BJ", "PXP-MAB", "PXP-AC"]
|
||||
},
|
||||
{
|
||||
"id": "ORTHO_BATCH_SAME_NAME",
|
||||
"requiredDocument": "controlled project copy with two relative drawing paths",
|
||||
"requiredObjects": ["same filename in different project-relative directories", "one failing controlled drawing"],
|
||||
"selection": "project-relative identity, never filename-only",
|
||||
"preState": "unchanged controlled copies",
|
||||
"mutation": "per-drawing update with continue-on-error",
|
||||
"repeat": "deterministic ordering and idempotent result",
|
||||
"undo": "per-drawing recovery/cleanup",
|
||||
"workflows": ["PXP-IOD"]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"executionMode": "DryRun",
|
||||
"planSchemaVersion": 1,
|
||||
"sourceObjectsRead": 7,
|
||||
"membershipResolved": 0,
|
||||
"membershipPartial": 0,
|
||||
"membershipUnresolved": 7,
|
||||
"phpRecAnnotPlanIds": ["plan-C5D40DC32505D5D9CFE6D38B", "plan-C5D40DC32505D5D9CFE6D38B"],
|
||||
"pxpAavPlanIds": ["plan-E4877CA13418D43A17F47AAA", "plan-E4877CA13418D43A17F47AAA"],
|
||||
"pxpOaPlanIds": ["plan-6C794D25C292E73AA3BDDC31", "plan-6C794D25C292E73AA3BDDC31"],
|
||||
"summariesDeterministic": true,
|
||||
"dbmodBefore": 0,
|
||||
"dbmodAfter": 0,
|
||||
"launcherSession": "RolledBack",
|
||||
"dcfControlComparison": null,
|
||||
"applyModeUsed": false
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"executionMode": "DryRun",
|
||||
"fixture": {
|
||||
"frozen": "<FROZEN_FIXTURE>",
|
||||
"control": "<CONTROL_FIXTURE>",
|
||||
"dryRun": "<DRYRUN_FIXTURE>",
|
||||
"trackedFileCount": 210
|
||||
},
|
||||
"membership": {
|
||||
"mechanism": "IDwgViewDef.DwgQuery.Execute -> MdObjectId.PrjObjectId -> DataLinksManager.FindAcPpRowId",
|
||||
"orthoViews": 1,
|
||||
"sourceObjects": 7,
|
||||
"resolved": 5,
|
||||
"partiallyResolved": 0,
|
||||
"outsideView": 2,
|
||||
"notResolved": 0,
|
||||
"evidenceCode": "VIEW_MEMBERSHIP_FROM_CONFIRMED_PNP_ID"
|
||||
},
|
||||
"commands": {
|
||||
"PHP_REC_ANNOT": {
|
||||
"planSchemaVersion": 1,
|
||||
"run1PlanId": "plan-AD701C7AA38D99E4C28D7D6D",
|
||||
"run2PlanId": "plan-AD701C7AA38D99E4C28D7D6D",
|
||||
"planDeterministic": true,
|
||||
"summaryDeterministic": true
|
||||
},
|
||||
"PXP-AAV": {
|
||||
"planSchemaVersion": 1,
|
||||
"run1PlanId": "plan-C4FCD62F4EEBA1D1948FA22B",
|
||||
"run2PlanId": "plan-C4FCD62F4EEBA1D1948FA22B",
|
||||
"planDeterministic": true,
|
||||
"summaryDeterministic": true
|
||||
},
|
||||
"PXP-OA": {
|
||||
"planSchemaVersion": 1,
|
||||
"run1PlanId": "plan-C30D133E2D5B4BF4C0AF2ED1",
|
||||
"run2PlanId": "plan-C30D133E2D5B4BF4C0AF2ED1",
|
||||
"planDeterministic": true,
|
||||
"summaryDeterministic": true
|
||||
}
|
||||
},
|
||||
"projectFileComparison": {
|
||||
"controlDeltaCount": 0,
|
||||
"dryRunDeltaCount": 0,
|
||||
"modelDwgPluginOnlyDelta": "UNCHANGED",
|
||||
"orthoDwgPluginOnlyDelta": "UNCHANGED",
|
||||
"pipingDcfPluginOnlyDelta": "UNCHANGED",
|
||||
"projectMetadataPluginOnlyDelta": "UNCHANGED"
|
||||
},
|
||||
"dbmod": {
|
||||
"pairedRun": null,
|
||||
"reason": "Command-window output was not retained."
|
||||
},
|
||||
"launcher": {
|
||||
"controlSession": "RolledBack",
|
||||
"dryRunSession": "RolledBack",
|
||||
"netloadCount": 1,
|
||||
"profileArgumentPresent": false
|
||||
},
|
||||
"apply": {
|
||||
"performed": false,
|
||||
"authorised": false,
|
||||
"reason": "All operations remain Skip; annotation rules are not yet implemented."
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"date": "2026-08-03",
|
||||
"executionMode": "DryRun",
|
||||
"plantProjectDetected": true,
|
||||
"projectDisplayNameStatus": "FoundWithName",
|
||||
"orthoDetection": "Confirmed",
|
||||
"viewportCount": 1,
|
||||
"dataLinksAvailable": true,
|
||||
"dataLinksSheetToSourceMapping": "resolved-through-piping-project-drawing-id",
|
||||
"sourceDrawingsResolved": 1,
|
||||
"sourceDataLinksAvailable": true,
|
||||
"objectsRead": 7,
|
||||
"pipeObjectsRead": 7,
|
||||
"phpRecAnnotRuns": 1,
|
||||
"pxpAavRuns": null,
|
||||
"pxpOaRuns": null,
|
||||
"planId": null,
|
||||
"repeatedPlanIdEqual": null,
|
||||
"dbmodBefore": null,
|
||||
"dbmodAfter": null,
|
||||
"dwgModified": null,
|
||||
"dcfModified": null,
|
||||
"changedProjectFiles": null,
|
||||
"unhandledExceptions": 0,
|
||||
"applyModeUsed": false,
|
||||
"launcherRollback": "RolledBack",
|
||||
"exactViewportMembership": "not-verified"
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
# Ortho DryRun runtime result
|
||||
|
||||
Date: 2026-08-03
|
||||
|
||||
The local test fixture's `TestPipeOrtho.dwg` was detected as Ortho with one
|
||||
viewport. In the paired `DryRun`, `PHP_REC_ANNOT`, `PXP-AAV`, and `PXP-OA`
|
||||
each ran twice. Plugin telemetry recorded all six preflight completions without
|
||||
an unhandled exception. The command-window DBMOD output was not retained for
|
||||
this paired run, so its DBMOD value is recorded as `NOT RECORDED` rather than
|
||||
inferred from telemetry.
|
||||
|
||||
`PlantProject.Name` was available for this fixture and rendered as
|
||||
`PRecAnnotTestProject`.
|
||||
|
||||
The active Ortho sheet does not expose direct Piping rows and must not be used
|
||||
as a DataLinks source. Metadata inspection and a sanitized runtime probe
|
||||
confirmed `IDwgViewDef.DwgQuery.ModelFiles[].ModelFileName` as the source-model
|
||||
reference. The adapter resolves that reference through
|
||||
`PipingProject.GetPnPDrawingFiles()` and reads
|
||||
`DataLinksManager.SelectAcPpRowIds(PnPProjectDrawing.Id)`.
|
||||
|
||||
On the paired real DryRun, one source drawing was resolved and seven source
|
||||
Plant objects were read. The confirmed view query resolved five source rows to
|
||||
the active viewport and classified two as outside the view. Each command
|
||||
reported seven skipped operations, zero writes, zero conflicts, and zero
|
||||
errors. The repeated plans were deterministic:
|
||||
|
||||
| Command | Run 1 / run 2 PlanId |
|
||||
| --- | --- |
|
||||
| `PHP_REC_ANNOT` | `plan-AD701C7AA38D99E4C28D7D6D` |
|
||||
| `PXP-AAV` | `plan-C4FCD62F4EEBA1D1948FA22B` |
|
||||
| `PXP-OA` | `plan-C30D133E2D5B4BF4C0AF2ED1` |
|
||||
|
||||
This verifies source-model DataLinks access, exact view membership through the
|
||||
stored view query, and repeated-plan determinism. The remaining functional
|
||||
limitation is annotation-rule coverage: all seven operations remain safe
|
||||
`Skip` operations, so no first Apply is authorised.
|
||||
|
||||
The earlier single-fixture SHA baseline changed before the first command and
|
||||
was therefore inconclusive. A fresh paired comparison used 210-file CONTROL
|
||||
and DRYRUN copies created from the same closed frozen fixture. Both inventories
|
||||
had zero SHA-256 delta after their respective sessions. The CONTROL session
|
||||
invoked no plugin command; the DRYRUN session invoked all six commands. Thus
|
||||
the model DWG, Ortho DWG, `Piping.dcf`, project metadata, and other tracked
|
||||
content-bearing files have no plugin-only delta in this comparison. Both
|
||||
Launcher sessions completed automatic rollback to `RolledBack`.
|
||||
@@ -0,0 +1,39 @@
|
||||
# Ortho source-model mapping
|
||||
|
||||
## Confirmed Plant 3D 2026 read path
|
||||
|
||||
```text
|
||||
Active Ortho document
|
||||
→ OrthoProject.DwgSheetDefinitions
|
||||
→ IDwgSheetDef.DwgViewDefs
|
||||
→ IDwgViewDef.DwgQuery.ModelFiles[].ModelFileName
|
||||
→ PipingProject.GetPnPDrawingFiles()
|
||||
→ exact normalized-path match to PnPProjectDrawing
|
||||
→ PnPProjectDrawing.Id
|
||||
→ DataLinksManager.SelectAcPpRowIds(int dwgid)
|
||||
→ GetObjectClassname / GetAllProperties
|
||||
→ independent PlantObjectSnapshot
|
||||
→ AnnotationPlanBuilder
|
||||
```
|
||||
|
||||
`PlantOrthoViewportReader.ReadViewports` reads the typed DwgQuery contract and
|
||||
creates an Ortho viewport snapshot. `PlantObjectReader.ReadObjects` resolves
|
||||
the resulting model-file reference through the Piping project drawing list and
|
||||
reads DataLinks by project drawing ID. The active Ortho database is not a
|
||||
Piping-row source.
|
||||
|
||||
All calls are read-only. The adapter opens no write transaction and does not
|
||||
save a drawing, DCF, or project metadata.
|
||||
|
||||
## Diagnostics
|
||||
|
||||
The source reader returns stable telemetry diagnostics rather than suppressing
|
||||
the result of a failed query: `ORTHO_SOURCE_DRAWING_NOT_RESOLVED`,
|
||||
`ORTHO_SOURCE_DRAWING_NOT_IN_PROJECT`, `ORTHO_SOURCE_DRAWING_AMBIGUOUS`,
|
||||
`PIPING_PROJECT_PART_NOT_FOUND`, `SOURCE_DATALINKS_UNAVAILABLE`,
|
||||
`SOURCE_DATALINKS_NO_ROWS`, `SOURCE_DATABASE_READ_FAILED`,
|
||||
`SOURCE_PIPE_ROWS_NOT_FOUND`, or `SOURCE_DATALINKS_READ`.
|
||||
|
||||
Exact membership of a source object in a particular Ortho viewport is not yet
|
||||
implemented. A source-level DryRun plan must not be presented as proof of
|
||||
viewport membership.
|
||||
@@ -0,0 +1,36 @@
|
||||
# Ortho viewport membership
|
||||
|
||||
## Runtime path
|
||||
|
||||
`EntryPoint.RunDiagnostic` reads each `OrthoViewportInfo` and calls
|
||||
`PlantObjectReader.ReadObjects`. The reader resolves source Piping rows, then
|
||||
`PlantViewportMembershipReader.Read` evaluates the stored query for that exact
|
||||
view. It maps `MdObjectId.PrjObjectId` to a source DataLinks row and assigns a
|
||||
membership status to every independent `PlantObjectSnapshot`.
|
||||
|
||||
| Status | Meaning | Diagnostic evidence |
|
||||
| --- | --- | --- |
|
||||
| `Resolved` | The source row was returned by the exact view query. | `VIEW_MEMBERSHIP_FROM_CONFIRMED_PNP_ID` |
|
||||
| `ObjectOutsideView` | The source row was not returned by that confirmed query. | `VIEW_MEMBERSHIP_OBJECT_OUTSIDE_CLIP` |
|
||||
| `NotResolved` | The view contract is unavailable, ambiguous, or failed. | `VIEW_MEMBERSHIP_API_UNSUPPORTED` |
|
||||
|
||||
No source object is treated as visible solely because it belongs to the same
|
||||
model drawing. No geometry-only result is upgraded to `Resolved`.
|
||||
|
||||
## Plan effect
|
||||
|
||||
`AnnotationPlanBuilder` includes membership status in its canonical plan input.
|
||||
`ObjectOutsideView`, unsupported, and unresolved objects are `Skip` operations
|
||||
with stable reason codes. `Resolved` membership can progress only through the
|
||||
existing annotation rules; this DryRun slice never writes an annotation.
|
||||
|
||||
## Paired DryRun evidence
|
||||
|
||||
The paired local DryRun resolved five of seven source rows through the exact
|
||||
view query and classified the remaining two as `ObjectOutsideView`. Each of
|
||||
the three supported commands produced an identical PlanId on its repeated
|
||||
invocation. Both Launcher sessions reached `RolledBack`.
|
||||
|
||||
The paired command-window DBMOD output was not retained. It is intentionally
|
||||
reported as `NOT RECORDED`; project-file SHA-256 inventories nevertheless had
|
||||
zero delta for both CONTROL and DRYRUN copies.
|
||||
@@ -0,0 +1,52 @@
|
||||
# Release asset mapping
|
||||
|
||||
This is the release-to-composite contract for the owner-provided `P_Rec_Annot
|
||||
v1.0.4.2` payload. It deliberately does not copy legacy binaries or a DWG into
|
||||
source control. Autodesk assemblies, legacy plugin DLLs, Plant project data,
|
||||
and the controlled `Template.dwg` fixture are excluded by repository policy.
|
||||
|
||||
## Executable payload
|
||||
|
||||
| Legacy release artifact | Modern functional replacement | Package disposition |
|
||||
| --- | --- | --- |
|
||||
| `AnnotateLineNumbers.dll`, `GetLinenumberAnnotationText.dll` | `PRecAnnot.Core`, `PRecAnnot.Application`, `PRecAnnot.Plant3D2026` line-number services | Replaced by composite assemblies |
|
||||
| `AutoLinenumberConnections.dll` | connector snapshots, connection planner and Plant adapter | Replaced by composite assemblies |
|
||||
| `AutoElevation.dll`, `InsertElevation.dll` | elevation formatter, planner and Plant mutation adapters | Replaced by composite assemblies |
|
||||
| `AutoAnnotateView.dll`, `OrthoAutoAnnotate.dll` | modern Ortho annotation commands and adapters | Replaced by composite assemblies |
|
||||
| `CheckOrthoView.dll`, `UpdateOrthoViewBlocks.dll`, `P3DCopyMissingObjectsToOrthoDrawing.dll`, `P3DSetLayerForViewport.dll`, `UpdateOrthoDrawings.dll` | modern Ortho maintenance commands and adapters | Replaced by composite assemblies |
|
||||
| `GetComponentGeometry.dll`, `ExtentsIntersect.dll` | `PRecAnnot.Core` geometry contracts and Plant geometry reader | Replaced by composite assemblies |
|
||||
| `P3DNewMa.dll`, `PHPAnnotations.dll`, `SwapAttributesMenuItem.dll` | `PRecAnnot.UI` palette and manual annotation commands | Replaced by composite assemblies |
|
||||
| `GetPlantScriptFolderPath.dll`, `GetScriptParameters.dll` | typed portable settings/path contract | Replaced by composite assemblies |
|
||||
| `OrthoLoader.dll`, `LoadedAssemblies.dll`, `EnablerLoader.dll` | composite bootstrap dependency order and capability checks | Replaced by the single entry assembly; legacy loaders never ship or execute |
|
||||
|
||||
The package file manifest generated by `tools/Build-Bundle.ps1` records SHA-256
|
||||
for every package file. `tools/Validate-Bundle.ps1` verifies that manifest
|
||||
before materialization.
|
||||
|
||||
## Configuration and named-object contract
|
||||
|
||||
| Artifact | Modern consumer / role | Missing-resource behavior |
|
||||
| --- | --- | --- |
|
||||
| `Settings.xml` | `bundle/P_Rec_Annot.bundle/Settings.xml`, parsed by `ProductionSettingsContract` and feature-specific settings readers | Command preflight reports configuration failure; no mutation occurs |
|
||||
| `Template.dwg` | Controlled local fixture/template source for line-number, connection, elevation, Ortho and manual block/style contracts | Never silently depend on an arbitrary drawing. Commands report the required block/style as unavailable and make no mutation |
|
||||
| block definitions and attribute tags | Resolved by the respective annotation/manual command before transaction | Preflight failure; no partial creation |
|
||||
| layers, text styles, MLeader styles, dimension styles | Resolved by feature settings and the controlled template contract | Preflight failure; no partial mutation |
|
||||
| dynamic block properties | Read and updated only by the manual annotation workflow when the selected block exposes them | Preserve existing values when absent; do not synthesize properties |
|
||||
|
||||
`Template.dwg` has release SHA-256
|
||||
`22CAAD35CE9C55891CF91042ED9B2C23BA4D5A0745AA40D69F41C1F609DAADB3`.
|
||||
It must be supplied through the controlled fixture provisioner, not committed or
|
||||
bundled as a production drawing.
|
||||
|
||||
## User-facing resources
|
||||
|
||||
| Release artifacts | Consumer | Mapping state |
|
||||
| --- | --- | --- |
|
||||
| `ico/button_*.png` (20 files) | Legacy Ribbon/palette imagery | Source inventory retained; modern Ribbon currently uses command bindings without those binary images. Image packaging requires an approved non-binary resource import and explicit UI runtime evidence. |
|
||||
| `Справка по работе с палитрой.docx` and `.pdf` | Manual annotation help surface | Documentation assets are retained in the owner release. The modern palette exposes no fabricated local copy; help links must resolve from a package-approved documentation asset before UI runtime verification. |
|
||||
| `GetComponentGeometry.xml` | Legacy assembly XML documentation | Functionally replaced by modern source/API documentation; it is not a runtime dependency. |
|
||||
|
||||
The two rows marked as requiring approved resource import are intentionally not
|
||||
classified as packaged. They remain explicit release-asset and UI-runtime gaps,
|
||||
rather than being hidden by copying legacy content or claiming unverified
|
||||
resource behavior.
|
||||
@@ -0,0 +1,101 @@
|
||||
# Plant 3D 2026 DwgQuery / ModelFiles API contract
|
||||
|
||||
## Scope and method
|
||||
|
||||
This report is based on metadata-only inspection of the installed Plant 3D 2026
|
||||
assemblies. The assemblies were read from `<PLANT3D_2026_INSTALL>` and were not
|
||||
copied into the repository. Metadata-only inspection was necessary because the
|
||||
normal PowerShell host cannot load the product's .NET 8 dependencies safely.
|
||||
|
||||
Legacy source at the documented local path was not present on this machine, so
|
||||
there is no legacy API claim in this report.
|
||||
|
||||
## Confirmed assemblies
|
||||
|
||||
| Assembly | Version | Relevant type |
|
||||
| --- | --- | --- |
|
||||
| `PnPDwg2dDef` | `0.0.0.0` | `Autodesk.ProcessPower.Drawings2d.DwgQuery`, `IDwgQuery`, `DwgViewDef`, `IDwgViewDef`, `DwgSheetDef`, `IDwgSheetDef` |
|
||||
| `PnPDwg2dUtil` | `0.0.0.0` | `Autodesk.ProcessPower.Drawings2d.ModelFile` |
|
||||
| `PnP3dOrthoProjectPart` | `17.0.60.1` | Ortho project-part integration assembly; the metadata scan found no public DwgQuery declaration there |
|
||||
|
||||
`PnPDwg2dDef` and `PnPDwg2dUtil` use `0.0.0.0` assembly versions in the
|
||||
installed metadata. The supported runtime contract is therefore identified by
|
||||
the exact public type names below, not by an invented product-version number.
|
||||
|
||||
## Confirmed contract
|
||||
|
||||
```text
|
||||
Autodesk.ProcessPower.Drawings2d.IDwgViewDef.DwgQuery
|
||||
: Autodesk.ProcessPower.Drawings2d.IDwgQuery
|
||||
|
||||
Autodesk.ProcessPower.Drawings2d.IDwgQuery.ModelFiles
|
||||
: Autodesk.ProcessPower.Drawings2d.ModelFile[]
|
||||
|
||||
Autodesk.ProcessPower.Drawings2d.ModelFile.ModelFileName
|
||||
: System.String
|
||||
|
||||
Autodesk.ProcessPower.Drawings2d.ModelFile.ModelFileGuid
|
||||
: System.String
|
||||
```
|
||||
|
||||
`DwgViewDef` implements `IDwgViewDef`; `DwgQuery` implements `IDwgQuery` and
|
||||
`IDisposable`; `ModelFile` implements `IComparable<ModelFile>`.
|
||||
|
||||
`ModelFiles` is an array, not an untyped enumerable. `ModelFileName` is the
|
||||
only confirmed string field representing the model-file reference. `ModelFileGuid`
|
||||
is a separate identity field. `IsReferencedDwg` and `Xform` describe reference
|
||||
state and transform, not a substitute path.
|
||||
|
||||
## Public members relevant to source resolution
|
||||
|
||||
`IDwgViewDef` exposes `DwgQuery`, `ViewName`, layout/orientation properties,
|
||||
and `SetClippingPlanes`, `SetLayout`, `SetOrientation`, `Erase`, and `New`.
|
||||
|
||||
`IDwgQuery` exposes `ModelFiles`, `Execute`, and `Erase`.
|
||||
|
||||
`ModelFile` exposes `ModelFileName`, `ModelFileGuid`, `IsReferencedDwg`, and
|
||||
`Xform`; its constructors accept a file-name string and optional transform,
|
||||
reference flag, and GUID.
|
||||
|
||||
`IDwgSheetDef.DwgViewDefs` exposes the view-definition collection. Sheet
|
||||
`DwgName`/`DwgPath` identify the Ortho sheet and must not be used as the source
|
||||
of Piping DataLinks.
|
||||
|
||||
## Current and legacy usage
|
||||
|
||||
The original adapter used reflection and tried several possible names
|
||||
(`ModelFileName`, `Value`, and arbitrary string values). That was not a valid
|
||||
Plant 3D 2026 contract.
|
||||
|
||||
The production read path now uses the confirmed typed chain only:
|
||||
|
||||
```text
|
||||
IDwgViewDef.DwgQuery.ModelFiles[].ModelFileName
|
||||
```
|
||||
|
||||
The legacy source path was unavailable locally, so no legacy source-model or
|
||||
DataLinks workaround has been imported.
|
||||
|
||||
## Runtime evidence
|
||||
|
||||
Static metadata cannot prove whether `ModelFileName` is project-relative or
|
||||
absolute in a concrete Ortho fixture, or whether a particular view has zero,
|
||||
one, or multiple model files. In DryRun only, setting
|
||||
`P_REC_ANNOT_DIAGNOSTICS=OrthoStructure` enables a sanitized structure probe.
|
||||
It records type names, collection counts, null state, string length, and a
|
||||
one-way value hash; it does not emit paths or engineering data.
|
||||
|
||||
On the local DryRun fixture, the runtime probe recorded one view with one
|
||||
`ModelFile`. The concrete types were `DwgViewDef`, `DwgQueryByBox`, and
|
||||
`ModelFile[]`; `ModelFileName` was non-null and an absolute fixture-model
|
||||
reference. The path itself was not retained in repository evidence.
|
||||
|
||||
The resolver resolves that reference to exactly one
|
||||
`PipingProject.GetPnPDrawingFiles()` entry by normalized full-path equality,
|
||||
then uses the confirmed `DataLinksManager.SelectAcPpRowIds(int dwgid)` overload
|
||||
with the resolved `PnPProjectDrawing.Id`. It does not open or query the active
|
||||
Ortho database for Piping rows.
|
||||
|
||||
The production resolver has no fallback property-name search. If the exact
|
||||
contract is unavailable at runtime it reports
|
||||
`ORTHO_MODEL_FILES_API_UNSUPPORTED` rather than guessing.
|
||||
@@ -0,0 +1,56 @@
|
||||
# Ortho viewport membership API
|
||||
|
||||
## Scope
|
||||
|
||||
This report records the Plant 3D 2026 contract used to map source-model
|
||||
DataLinks objects to one Ortho view. Autodesk binaries were inspected in
|
||||
`<PLANT3D_2026_INSTALL>` and are not part of this repository.
|
||||
|
||||
## Confirmed Plant 3D 2026 contract
|
||||
|
||||
| Assembly | Version | Type/member | Purpose |
|
||||
| --- | --- | --- | --- |
|
||||
| `PnPDwg2dDef` | `0.0.0.0` | `IDwgViewDef.DwgQuery` | Returns the query stored by an Ortho view. |
|
||||
| `PnPDwg2dDef` | `0.0.0.0` | `DwgQueryByBox.Execute(StringCollection, StringCollection)` | Executes the stored view selection and returns `IDwgSet`. |
|
||||
| `PnPDwg2dDef` | `0.0.0.0` | `IDwgSet.GetItem(int, ref MdObjectId)` | Enumerates selected source identities. |
|
||||
| `PnPDwg2dUtil` | `0.0.0.0` | `MdObjectId.PrjObjectId` | Exposes the selected project object identity. |
|
||||
| `PnPDataLinks` | `17.0.60.1` | `DataLinksManager.FindAcPpRowId(PpObjectId)` | Maps a selected project object to its DataLinks row. |
|
||||
|
||||
`DwgQueryByBox` also exposes `CoordinateSystem`, `XLength`, `YLength`,
|
||||
`ZLength`, and `SelectionMask`. `DwgViewDef` exposes orientation, clipping,
|
||||
and layout fields. They are not used as a heuristic in this slice because the
|
||||
query result provides a stronger project-object identity.
|
||||
|
||||
## Selected implementation
|
||||
|
||||
`PlantViewportMembershipReader.Read` locates exactly one view by the stable
|
||||
ID already generated from the sheet GUID and view name. It executes that
|
||||
view's stored `DwgQuery`, converts every returned `MdObjectId.PrjObjectId`
|
||||
through `DataLinksManager.FindAcPpRowId`, and intersects the result with the
|
||||
source drawing's Piping rows.
|
||||
|
||||
Matching rows receive `Resolved` with
|
||||
`VIEW_MEMBERSHIP_FROM_CONFIRMED_PNP_ID`. Source rows absent from the confirmed
|
||||
query result receive `ObjectOutsideView` with
|
||||
`VIEW_MEMBERSHIP_OBJECT_OUTSIDE_CLIP`. An unsupported or ambiguous runtime
|
||||
contract stays `NotResolved` with `VIEW_MEMBERSHIP_API_UNSUPPORTED`; the code
|
||||
does not guess alternate Autodesk properties or select an arbitrary view.
|
||||
|
||||
## Legacy analysis
|
||||
|
||||
The read-only legacy source at
|
||||
`\\phpsrv03\NBIM\code\CS\P_Rec_Annot\v1.0.4\repo` was available. Its
|
||||
`UpdateOrthoDrawings/Commands.cs` configured `DwgQuery.ModelFiles` and called
|
||||
`DwgQuery.Execute`; `OrthoAutoAnnotate/Commands.cs` and
|
||||
`AutoAnnotateView/ViewPorts.cs` also used viewport and entity extents. Those
|
||||
extents checks are a geometric filter, not an authoritative object identity,
|
||||
so they were not ported as `Resolved` membership.
|
||||
|
||||
## Side effects and failure handling
|
||||
|
||||
The reader opens no Autodesk write transaction and calls no persistence API.
|
||||
It does not modify DWG, DCF, or project metadata. `DLException` while mapping
|
||||
an individual generated identity is ignored only for that non-Piping identity;
|
||||
other failures yield the stable API diagnostic and preserve no false positive.
|
||||
Runtime DryRun and paired control/DryRun hash comparison remain required to
|
||||
verify actual no-write behavior.
|
||||
@@ -8,6 +8,7 @@ public sealed record RuntimeDiagnostic
|
||||
}
|
||||
|
||||
public enum OrthoDetectionStatus { Confirmed, NotOrtho, Ambiguous, Unsupported, Failed }
|
||||
public enum PlantProjectDetectionStatus { NotFound, FoundWithName, FoundWithoutDisplayName, Ambiguous, Failed }
|
||||
|
||||
public sealed record OrthoDetectionResult
|
||||
{
|
||||
@@ -20,6 +21,119 @@ public readonly record struct Point2Dto(double X, double Y);
|
||||
public readonly record struct Point3Dto(double X, double Y, double Z);
|
||||
public readonly record struct Vector2Dto(double X, double Y);
|
||||
public sealed record Bounds2Dto(Point2Dto Minimum, Point2Dto Maximum);
|
||||
public sealed record Bounds3Dto(Point3Dto Minimum, Point3Dto Maximum);
|
||||
public enum ExtentsIntersectionType { DoNotIntersect, Intersect, ExtentsMatch, FirstExtentsInsideSecondExtents, SecondExtentsInsideFirstExtents }
|
||||
|
||||
public sealed record LineNumberAnnotationSettings
|
||||
{
|
||||
public required string NullOrEmpty { get; init; }
|
||||
public required IReadOnlyList<LineNumberAnnotationDefinition> Annotations { get; init; }
|
||||
}
|
||||
|
||||
public sealed record LineNumberAnnotationDefinition
|
||||
{
|
||||
public required string Nickname { get; init; }
|
||||
public IReadOnlyDictionary<string, string> Variables { get; init; } = new Dictionary<string, string>();
|
||||
public required IReadOnlyList<LineNumberAnnotationTag> Tags { get; init; }
|
||||
}
|
||||
|
||||
public sealed record LineNumberAnnotationTag
|
||||
{
|
||||
public required string Field { get; init; }
|
||||
public string Divider { get; init; } = string.Empty;
|
||||
public bool SaveWhenEmpty { get; init; } = true;
|
||||
public string IgnoreValue { get; init; } = string.Empty;
|
||||
public string ProcessingXml { get; init; } = string.Empty;
|
||||
}
|
||||
|
||||
public sealed record LineNumberFormattingResult(bool Success, string Text, string? ErrorCode = null);
|
||||
public interface ILineNumberAnnotationFormatter
|
||||
{
|
||||
LineNumberFormattingResult Format(LineNumberAnnotationDefinition definition, IReadOnlyDictionary<string, string?> fields);
|
||||
}
|
||||
|
||||
public sealed record DataLinksPropertyReadResult(bool Success, IReadOnlyDictionary<string, string?> Properties, string? FailureCode = null);
|
||||
public interface IDataLinksPropertyReader { DataLinksPropertyReadResult ReadProperties(long rowId); }
|
||||
public sealed record LineNumberFieldResolution(bool Success, IReadOnlyDictionary<string, string?> Values, string? FailureCode = null);
|
||||
public sealed record LineNumberCandidate(string StableId, long RowId, AnnotationPoint Position, double Rotation, string Layer, string TextStyle, IReadOnlyDictionary<string, string?> Properties);
|
||||
public sealed record ExistingLineNumberAnnotation(string StableId, string SourceStableId, string Text);
|
||||
public sealed record LineNumberCommandOperation(string StableId, AnnotationOperationKind Kind, string? Text, AnnotationPoint Position, double Rotation, string Layer, string TextStyle, IReadOnlyList<string> Reasons);
|
||||
public sealed record LineNumberCommandPlan(IReadOnlyList<LineNumberCommandOperation> Operations);
|
||||
public sealed record LineNumberApplyPreflight(string StableId, int MarkerNumber, string Text, AnnotationPoint Position, double Rotation, string Layer, string TextStyle);
|
||||
public sealed record LineNumberApplyResult(int Created, int Updated, int Unchanged);
|
||||
public sealed record LineNumberListApplyPreflight(string StableId, AnnotationPoint Position, double Rotation, IReadOnlyList<LineNumberApplyPreflight> Rows);
|
||||
public sealed record LineNumberPreviewResult(bool Success, LineNumberCommandPlan? Plan, IReadOnlyList<LineNumberApplyPreflight> Apply, string? FailureCode = null);
|
||||
public sealed record LineNumberCandidateReadResult(bool Success, LineNumberCandidate? Candidate, string? FailureCode = null);
|
||||
public sealed record ElevationCandidate(string StableId, double ModelElevation, double DatumOffset, AnnotationPoint Position, double Rotation, string Layer, string TextStyle);
|
||||
public sealed record ExistingElevationAnnotation(string StableId, string SourceStableId, string Text, AnnotationPoint Position);
|
||||
public sealed record ElevationAnnotationOperation(string StableId, AnnotationOperationKind Kind, string? Text, AnnotationPoint Position, double Rotation, string Layer, string TextStyle, IReadOnlyList<string> Reasons);
|
||||
public sealed record ElevationAnnotationPlan(IReadOnlyList<ElevationAnnotationOperation> Operations);
|
||||
public sealed record ElevationAssets(string Layer, string TextStyle, string BlockName = "BLOCK_ELEVATION");
|
||||
public sealed record ElevationApplyResult(int Created, int Updated, int Unchanged);
|
||||
public sealed record LineConnectionCandidate(string StableId, string LineNumber, Point3Dto FirstEndpoint, Point3Dto SecondEndpoint, Bounds3Dto Bounds, AnnotationPoint Position, double Rotation);
|
||||
public sealed record LineConnectionGroup(string LineNumber, IReadOnlyList<LineConnectionCandidate> Members, AnnotationPoint Placement, double Rotation);
|
||||
// A legacy PXP-ALC annotation belongs to a connector between two *different*
|
||||
// line groups; it is not a duplicate marker for one line group.
|
||||
public sealed record LineConnectionBoundaryCandidate(
|
||||
string StableId,
|
||||
string FirstLineNumber,
|
||||
string SecondLineNumber,
|
||||
Point3Dto FirstEndpoint,
|
||||
Point3Dto SecondEndpoint,
|
||||
Bounds3Dto Bounds,
|
||||
AnnotationPoint Position,
|
||||
double Rotation,
|
||||
string? FirstLineGroupStableId = null,
|
||||
string? SecondLineGroupStableId = null);
|
||||
public sealed record LineConnectionBoundaryPlan(string StableId, string Text, AnnotationPoint Position, double Rotation, IReadOnlyList<string> Reasons, string? FirstText = null, string? SecondText = null, Point3Dto? ConnectorPosition = null);
|
||||
public sealed record LineConnectionAssets(string PolylineLayer, string TextLayer, string TextStyle, string BlockName = "BLOCK_LINENUMBER_CONNECTION");
|
||||
public sealed record LineConnectionApplyResult(int Deleted, int Created);
|
||||
// The geometry adapter supplies the paper-space connector point and orientation.
|
||||
// Keeping it separate from the PnP relation snapshot prevents Autodesk objects
|
||||
// from crossing into the deterministic PXP-ALC planning layer.
|
||||
public sealed record LineConnectionPlacement(
|
||||
Point3Dto FirstEndpoint,
|
||||
Point3Dto SecondEndpoint,
|
||||
Bounds3Dto Bounds,
|
||||
AnnotationPoint Position,
|
||||
double Rotation);
|
||||
public sealed record LineConnectionPreviewResult(
|
||||
bool Success,
|
||||
IReadOnlyList<LineConnectionBoundaryPlan> Plans,
|
||||
string? FailureCode = null);
|
||||
public sealed record PlantConnectorRelationshipSnapshot(
|
||||
string StableId,
|
||||
long ConnectorRowId,
|
||||
long FirstPartRowId,
|
||||
long SecondPartRowId,
|
||||
long FirstLineGroupRowId,
|
||||
long SecondLineGroupRowId,
|
||||
IReadOnlyList<string> Diagnostics,
|
||||
string? ConnectorEntityStableId = null);
|
||||
public sealed record PlantConnectorRelationshipReadResult(bool Success, IReadOnlyList<PlantConnectorRelationshipSnapshot> Connectors, string? FailureCode = null);
|
||||
public interface IPlantConnectorRelationshipReader
|
||||
{
|
||||
PlantConnectorRelationshipReadResult Read();
|
||||
}
|
||||
public sealed record PlantConnectorPortSnapshot(
|
||||
string ConnectorStableId,
|
||||
Point3Dto FirstPosition,
|
||||
Point3Dto SecondPosition,
|
||||
Point3Dto FirstDirection,
|
||||
Point3Dto SecondDirection);
|
||||
public sealed record PlantConnectorPortReadResult(bool Success, PlantConnectorPortSnapshot? Ports, string? FailureCode = null);
|
||||
public interface IPlantConnectorPortReader
|
||||
{
|
||||
PlantConnectorPortReadResult Read(PlantConnectorRelationshipSnapshot connector);
|
||||
}
|
||||
public sealed record ConnectorViewportEligibility(bool Eligible, Point3Dto? PlacementPoint, string? FailureCode = null);
|
||||
public sealed record LineNumberOwnedRow(string SourceStableId, int MarkerNumber, string Text, AnnotationPoint MarkerAttributePosition);
|
||||
public sealed record LineNumberRowMutation(string SourceStableId, int PreviousMarkerNumber, int MarkerNumber, string Text, AnnotationPoint? MarkerAttributePosition);
|
||||
public sealed record LineNumberTextAsset(string Layer, string TextStyle, double Size, string TextValue, Point2Dto Position);
|
||||
public sealed record LineNumberLineAsset(string Layer, Point2Dto Start, Point2Dto End);
|
||||
public sealed record LineNumberMarkerAsset(string Layer, double MaskScaleFactor, IReadOnlyList<LineNumberTextAsset> Texts, IReadOnlyList<LineNumberLineAsset> Lines);
|
||||
public sealed record LineNumberListAsset(string Layer, double MaskScaleFactor, double LineHeight, double LineSpacingDistance, LineNumberTextAsset MarkerText, LineNumberTextAsset LineNumberText, LineNumberLineAsset Line);
|
||||
public sealed record AnnotateLineNumbersAssets(LineNumberMarkerAsset Marker, LineNumberListAsset List);
|
||||
|
||||
public sealed record GeometrySnapshot
|
||||
{
|
||||
@@ -28,6 +142,36 @@ public sealed record GeometrySnapshot
|
||||
public Bounds2Dto? ProjectedBounds { get; init; }
|
||||
public double? Rotation { get; init; }
|
||||
public double? Elevation { get; init; }
|
||||
public Vector2Dto? PaperDirection { get; init; }
|
||||
}
|
||||
|
||||
// Platform-neutral result of the legacy GetComponentGeometry contract. The
|
||||
// Plant adapter is responsible for reading Parts/Pipes and normalising units;
|
||||
// consumers do not take a dependency on Autodesk managed assemblies.
|
||||
public sealed record ComponentGeometryDefinition(
|
||||
string Kind,
|
||||
IReadOnlyDictionary<string, string> Parameters,
|
||||
Bounds3Dto Bounds,
|
||||
bool ImperialDimensions);
|
||||
public sealed record ComponentGeometryReadResult(bool Success, ComponentGeometryDefinition? Geometry, string? FailureCode = null);
|
||||
public sealed record ViewportLayerPlan(bool RequiresChange, string TargetLayer, string? FailureCode = null);
|
||||
public enum OrthoAnnotationRepresentation { None, MultiLeader, BubbleBlock }
|
||||
public sealed record OrthoAnnotationOptions(bool Supports, bool Valves, bool Instruments, bool Plugs, bool Boards);
|
||||
public sealed record OrthoAnnotationClassification(string StableId, OrthoAnnotationRepresentation Representation, string Text, IReadOnlyList<string> Reasons);
|
||||
public sealed record OrthoAnnotationAssets(string Layer, string TextStyle, string MultiLeaderStyle, string BubbleBlock = "BLOCK_ANNO_POSITION");
|
||||
public sealed record OrthoBatchDrawing(string DrawingGuid, string DisplayName, string RelativePath, IReadOnlyList<string> Views);
|
||||
public sealed record OrthoBatchSelection(string RelativePath, IReadOnlyList<string> Views);
|
||||
public sealed record OrthoBatchOperation(string DrawingGuid, string DisplayName, string RelativePath, string ViewName);
|
||||
public sealed record OrthoBatchPlan(IReadOnlyList<OrthoBatchOperation> Operations, IReadOnlyList<string> Diagnostics);
|
||||
public enum OrthoLayerFilterKind { Status, Layer, Table }
|
||||
public sealed record OrthoLayerRule(OrthoLayerFilterKind Kind, string Filter, int? LineWeight, string LineType, short? ColorIndex, byte? Red, byte? Green, byte? Blue)
|
||||
{
|
||||
public bool MatchesStatus(string status) => Kind == OrthoLayerFilterKind.Status && string.Equals(Filter, status, StringComparison.OrdinalIgnoreCase);
|
||||
public bool MatchesLayer(string viewName, string layer) => Kind == OrthoLayerFilterKind.Layer && string.Equals(viewName + "-" + Filter, layer, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
public interface IPlantComponentGeometryReader
|
||||
{
|
||||
ComponentGeometryReadResult Read(string stableEntityId, bool convertToMetric);
|
||||
}
|
||||
|
||||
public sealed record OrthoViewportInfo
|
||||
@@ -57,6 +201,19 @@ public sealed record PlantObjectSnapshot
|
||||
public required GeometrySnapshot Geometry { get; init; }
|
||||
public IReadOnlyDictionary<string, string?> Properties { get; init; } = new Dictionary<string, string?>();
|
||||
public IReadOnlyList<string> Diagnostics { get; init; } = Array.Empty<string>();
|
||||
public ViewMembershipStatus MembershipStatus { get; init; } = ViewMembershipStatus.NotResolved;
|
||||
public IReadOnlyList<string> MembershipEvidenceCodes { get; init; } = Array.Empty<string>();
|
||||
}
|
||||
|
||||
public enum ViewMembershipStatus { NotResolved, Resolved, PartiallyResolved, ObjectOutsideView, Unsupported, Failed }
|
||||
|
||||
public sealed record SourceObjectViewportMembership
|
||||
{
|
||||
public required string SourceObjectStableKey { get; init; }
|
||||
public required string ViewStableKey { get; init; }
|
||||
public required ViewMembershipStatus Status { get; init; }
|
||||
public IReadOnlyList<string> EvidenceCodes { get; init; } = Array.Empty<string>();
|
||||
public string? ReasonCode { get; init; }
|
||||
}
|
||||
|
||||
public sealed record PlantRuntimeContext
|
||||
@@ -66,6 +223,7 @@ public sealed record PlantRuntimeContext
|
||||
public bool IsOrthoDrawing { get; init; }
|
||||
public string? DrawingName { get; init; }
|
||||
public string? ProjectDisplayName { get; init; }
|
||||
public PlantProjectDetectionStatus ProjectDetectionStatus { get; init; } = PlantProjectDetectionStatus.NotFound;
|
||||
public IReadOnlyList<OrthoViewportInfo> Viewports { get; init; } = Array.Empty<OrthoViewportInfo>();
|
||||
public IReadOnlyList<RuntimeDiagnostic> Diagnostics { get; init; } = Array.Empty<RuntimeDiagnostic>();
|
||||
public OrthoDetectionResult Detection { get; init; } = new() { Status = OrthoDetectionStatus.Unsupported, Evidence = Array.Empty<string>(), Diagnostics = Array.Empty<RuntimeDiagnostic>() };
|
||||
@@ -74,6 +232,62 @@ public sealed record PlantRuntimeContext
|
||||
public interface IPlantRuntimeContextReader { PlantRuntimeContext ReadCurrentContext(); }
|
||||
public interface IOrthoViewportReader { IReadOnlyList<OrthoViewportInfo> ReadViewports(CancellationToken cancellationToken); }
|
||||
|
||||
public enum SourceDrawingResolutionStatus { Resolved, NotReferenced, Ambiguous, MissingFromProject, Unsupported, Failed }
|
||||
|
||||
public sealed record OrthoSourceDrawingReference
|
||||
{
|
||||
public required string StableId { get; init; }
|
||||
public required string DisplayName { get; init; }
|
||||
public string? ProjectRelativePath { get; init; }
|
||||
public long? ProjectDrawingRowId { get; init; }
|
||||
public required SourceDrawingResolutionStatus Status { get; init; }
|
||||
public IReadOnlyList<string> EvidenceCodes { get; init; } = Array.Empty<string>();
|
||||
}
|
||||
|
||||
public sealed record SourcePlantObjectSnapshot
|
||||
{
|
||||
public required string StableObjectKey { get; init; }
|
||||
public required string ClassName { get; init; }
|
||||
public string? SourceDrawingStableId { get; init; }
|
||||
public string? LineGroupStableKey { get; init; }
|
||||
public IReadOnlyDictionary<string, string?> Properties { get; init; } = new Dictionary<string, string?>();
|
||||
}
|
||||
|
||||
public sealed record SourceDrawingReadResult
|
||||
{
|
||||
public required OrthoSourceDrawingReference Source { get; init; }
|
||||
public IReadOnlyList<SourcePlantObjectSnapshot> Objects { get; init; } = Array.Empty<SourcePlantObjectSnapshot>();
|
||||
public IReadOnlyList<RuntimeDiagnostic> Diagnostics { get; init; } = Array.Empty<RuntimeDiagnostic>();
|
||||
}
|
||||
|
||||
public interface IOrthoSourceDrawingResolver
|
||||
{
|
||||
IReadOnlyList<OrthoSourceDrawingReference> Resolve(OrthoDrawingSnapshot drawing);
|
||||
}
|
||||
|
||||
public sealed record OrthoDrawingSnapshot
|
||||
{
|
||||
public required string StableId { get; init; }
|
||||
public IReadOnlyList<OrthoViewSourceSnapshot> Views { get; init; } = Array.Empty<OrthoViewSourceSnapshot>();
|
||||
}
|
||||
|
||||
public sealed record OrthoViewSourceSnapshot
|
||||
{
|
||||
public required string ViewStableId { get; init; }
|
||||
public IReadOnlyList<string> ReferencedDrawingPaths { get; init; } = Array.Empty<string>();
|
||||
}
|
||||
|
||||
public interface ISourceDrawingDataLinksReader
|
||||
{
|
||||
SourceDrawingReadResult Read(PlantProjectContext project, OrthoSourceDrawingReference source);
|
||||
}
|
||||
|
||||
public sealed record PlantProjectContext
|
||||
{
|
||||
public required string StableProjectId { get; init; }
|
||||
public string? ProjectDisplayName { get; init; }
|
||||
}
|
||||
|
||||
public enum AnnotationOperationKind { Create, Update, Skip, Conflict, Unsupported }
|
||||
|
||||
public sealed record AnnotationOperationPlan
|
||||
@@ -106,12 +320,40 @@ public sealed record AnnotationPlanningRequest
|
||||
public required OrthoViewportInfo Viewport { get; init; }
|
||||
public IReadOnlyList<PlantObjectSnapshot> Objects { get; init; } = Array.Empty<PlantObjectSnapshot>();
|
||||
public IReadOnlyList<ExistingAnnotation> Existing { get; init; } = Array.Empty<ExistingAnnotation>();
|
||||
// Test-only limited Apply intent. It is part of the canonical plan and is
|
||||
// deliberately explicit: the planner must never choose an arbitrary Pipe.
|
||||
public string? LimitedApplyTargetSnapshotId { get; init; }
|
||||
public string? LimitedApplyRuleId { get; init; }
|
||||
}
|
||||
|
||||
public interface IAnnotationPlanBuilder { AnnotationPlan Build(AnnotationPlanningRequest request); }
|
||||
public enum PRecAnnotExecutionMode { Smoke, DryRun, Apply }
|
||||
public interface IRuntimeWriteGuard { void EnsureWriteAllowed(string operation); }
|
||||
|
||||
public sealed record CreatePipeAnnotationOperation
|
||||
{
|
||||
public required string OperationId { get; init; }
|
||||
public required string SourceObjectStableKey { get; init; }
|
||||
public required string ViewStableKey { get; init; }
|
||||
public required string RuleId { get; init; }
|
||||
public required AnnotationPoint Placement { get; init; }
|
||||
public required string DuplicateKey { get; init; }
|
||||
}
|
||||
|
||||
public sealed record FirstLimitedApplyPermit
|
||||
{
|
||||
public required string FixtureMarker { get; init; }
|
||||
public required bool AllowApply { get; init; }
|
||||
public required string TargetSnapshotId { get; init; }
|
||||
public required string ExpectedPlanId { get; init; }
|
||||
}
|
||||
|
||||
public sealed record FirstLimitedApplyPreflight
|
||||
{
|
||||
public required string PlanId { get; init; }
|
||||
public required CreatePipeAnnotationOperation Operation { get; init; }
|
||||
}
|
||||
|
||||
public sealed record OrthoViewportRef(string DrawingId, string ViewportId);
|
||||
|
||||
public sealed record PlantObjectData
|
||||
@@ -148,6 +390,7 @@ public sealed record AnnotationIntent
|
||||
|
||||
public sealed record AnnotationPlan
|
||||
{
|
||||
public int PlanSchemaVersion { get; init; }
|
||||
public string PlanId { get; init; } = string.Empty;
|
||||
public string CommandName { get; init; } = string.Empty;
|
||||
public IReadOnlyList<AnnotationOperationPlan> Operations { get; init; } = Array.Empty<AnnotationOperationPlan>();
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
using System.Globalization;
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class AnnotateLineNumbersSettingsLoader
|
||||
{
|
||||
public AnnotateLineNumbersAssets Load(string xml)
|
||||
{
|
||||
var lineNumbers = XElement.Parse(xml).Element("LineNumbers") ?? throw Invalid("LineNumbers");
|
||||
var marker = lineNumbers.Element("Marker") ?? throw Invalid("Marker");
|
||||
var list = lineNumbers.Element("List") ?? throw Invalid("List");
|
||||
var texts = marker.Elements("Text").Select(x => Text(x)).ToArray();
|
||||
var lines = marker.Elements("Line").Select(Line).ToArray();
|
||||
if (texts.Length == 0 || lines.Length == 0) throw Invalid("MarkerContent");
|
||||
return new(
|
||||
new(Required(marker, "layer"), Number(marker, "maskscalefactor"), texts, lines),
|
||||
new(Required(list, "layer"), Number(list, "maskscalefactor"), Number(list, "lineheight"), Number(list, "linespacingdistance"), Text(RequiredElement(list, "MarkerText"), false), Text(RequiredElement(list, "LineNumberText"), false), Line(RequiredElement(list, "Line"))));
|
||||
}
|
||||
|
||||
private static LineNumberTextAsset Text(XElement value, bool readValue = true) => new(Required(value, "layer"), Required(value, "textstyle"), Number(value, "size"), readValue ? Required(value, "textvalue", true) : string.Empty, new(Number(value, "positionx"), Number(value, "positiony")));
|
||||
private static LineNumberLineAsset Line(XElement value) => new(Required(value, "layer"), new(Number(value, "startx"), Number(value, "starty")), new(OptionalNumber(value, "endx"), OptionalNumber(value, "endy")));
|
||||
private static XElement RequiredElement(XElement parent, string name) => parent.Element(name) ?? throw Invalid(name);
|
||||
private static string Required(XElement value, string name, bool emptyAllowed = false)
|
||||
{
|
||||
var attribute = value.Attribute(name) ?? throw Invalid(name);
|
||||
if (!emptyAllowed && string.IsNullOrWhiteSpace(attribute.Value)) throw Invalid(name);
|
||||
return attribute.Value;
|
||||
}
|
||||
private static double Number(XElement value, string name) => Parse(Required(value, name));
|
||||
private static double OptionalNumber(XElement value, string name) => value.Attribute(name) is { } attribute ? Parse(attribute.Value) : 0;
|
||||
private static double Parse(string value) => double.TryParse(value.Replace(',', '.'), NumberStyles.Float, CultureInfo.InvariantCulture, out var result) ? result : throw Invalid("number");
|
||||
private static InvalidDataException Invalid(string field) => new("LINE_NUMBER_SETTINGS_INVALID:" + field);
|
||||
}
|
||||
@@ -6,6 +6,7 @@ namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class AnnotationPlanBuilder : IAnnotationPlanBuilder
|
||||
{
|
||||
public const int CurrentPlanSchemaVersion = 2;
|
||||
public AnnotationPlan Build(AnnotationPlanningRequest request)
|
||||
{
|
||||
var objects = request.Objects.OrderBy(x => x.SnapshotId, StringComparer.Ordinal).ToArray();
|
||||
@@ -30,6 +31,65 @@ public sealed class AnnotationPlanBuilder : IAnnotationPlanBuilder
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(request.LimitedApplyTargetSnapshotId) &&
|
||||
!string.Equals(item.SnapshotId, request.LimitedApplyTargetSnapshotId, StringComparison.Ordinal))
|
||||
{
|
||||
operations.Add(new AnnotationOperationPlan { SourceSnapshotId = item.SnapshotId, Kind = AnnotationOperationKind.Skip, Reasons = new[] { "APPLY_NOT_SELECTED_TARGET" } });
|
||||
continue;
|
||||
}
|
||||
|
||||
if (item.MembershipStatus is not ViewMembershipStatus.Resolved and not ViewMembershipStatus.PartiallyResolved)
|
||||
{
|
||||
operations.Add(new AnnotationOperationPlan { SourceSnapshotId = item.SnapshotId, Kind = AnnotationOperationKind.Skip, Reasons = new[] { MembershipReason(item.MembershipStatus) } });
|
||||
continue;
|
||||
}
|
||||
|
||||
// The first Apply slice is intentionally narrower than the
|
||||
// historic bulk rules: exactly one explicitly selected, resolved
|
||||
// Pipe can become a PIPE block operation. All other objects keep
|
||||
// their normal diagnostic treatment.
|
||||
if (!string.IsNullOrWhiteSpace(request.LimitedApplyTargetSnapshotId) &&
|
||||
string.Equals(item.SnapshotId, request.LimitedApplyTargetSnapshotId, StringComparison.Ordinal))
|
||||
{
|
||||
if (!string.Equals(item.ObjectClass, "Pipe", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
operations.Add(new AnnotationOperationPlan { SourceSnapshotId = item.SnapshotId, Kind = AnnotationOperationKind.Unsupported, Reasons = new[] { "APPLY_UNSUPPORTED_OBJECT_CLASS" } });
|
||||
continue;
|
||||
}
|
||||
if (item.MembershipStatus != ViewMembershipStatus.Resolved)
|
||||
{
|
||||
operations.Add(new AnnotationOperationPlan { SourceSnapshotId = item.SnapshotId, Kind = AnnotationOperationKind.Skip, Reasons = new[] { "APPLY_REQUIRES_RESOLVED_MEMBERSHIP" } });
|
||||
continue;
|
||||
}
|
||||
if (item.Geometry.PaperPosition is not { } pipePosition)
|
||||
{
|
||||
operations.Add(new AnnotationOperationPlan { SourceSnapshotId = item.SnapshotId, Kind = AnnotationOperationKind.Skip, Reasons = new[] { "ANNOTATION_PLACEMENT_NOT_RESOLVED" } });
|
||||
continue;
|
||||
}
|
||||
|
||||
var pipeIntent = new AnnotationIntent
|
||||
{
|
||||
StableKey = $"{request.Viewport.Id}:{item.SnapshotId}:{FirstLimitedApplyPlanner.RuleId}",
|
||||
Text = FirstLimitedApplyPlanner.RuleId,
|
||||
Position = new AnnotationPoint(pipePosition.X, pipePosition.Y),
|
||||
Rotation = item.Geometry.Rotation ?? 0,
|
||||
ClassName = item.ObjectClass,
|
||||
Layer = "PXP_ANNOTATION"
|
||||
};
|
||||
operations.Add(new AnnotationOperationPlan
|
||||
{
|
||||
SourceSnapshotId = item.SnapshotId,
|
||||
Kind = AnnotationOperationKind.Create,
|
||||
AnnotationType = "PIPE",
|
||||
Text = FirstLimitedApplyPlanner.RuleId,
|
||||
Position = pipePosition,
|
||||
Rotation = item.Geometry.Rotation,
|
||||
Reasons = Array.Empty<string>()
|
||||
});
|
||||
creates.Add(pipeIntent);
|
||||
continue;
|
||||
}
|
||||
|
||||
var text = string.IsNullOrWhiteSpace(item.LineNumber) ? item.Tag?.Trim() : item.LineNumber!.Trim();
|
||||
if (string.IsNullOrWhiteSpace(text))
|
||||
{
|
||||
@@ -84,7 +144,8 @@ public sealed class AnnotationPlanBuilder : IAnnotationPlanBuilder
|
||||
|
||||
return new AnnotationPlan
|
||||
{
|
||||
PlanId = BuildPlanId(request, objects),
|
||||
PlanSchemaVersion = CurrentPlanSchemaVersion,
|
||||
PlanId = BuildPlanId(request, objects, operations),
|
||||
CommandName = request.CommandName,
|
||||
Operations = operations,
|
||||
Diagnostics = diagnostics,
|
||||
@@ -92,18 +153,41 @@ public sealed class AnnotationPlanBuilder : IAnnotationPlanBuilder
|
||||
Create = creates,
|
||||
Update = updates,
|
||||
Delete = Array.Empty<string>(),
|
||||
SkipReasons = operations.Where(x => x.Kind == AnnotationOperationKind.Skip).SelectMany(x => x.Reasons).ToArray(),
|
||||
SkipReasons = operations.Where(x => x.Kind == AnnotationOperationKind.Skip).SelectMany(x => x.Reasons).OrderBy(x => x, StringComparer.Ordinal).ToArray(),
|
||||
ExaminedCount = objects.Length,
|
||||
IsDeterministic = true
|
||||
};
|
||||
}
|
||||
|
||||
private static string BuildPlanId(AnnotationPlanningRequest request, IReadOnlyList<PlantObjectSnapshot> objects)
|
||||
private static string BuildPlanId(AnnotationPlanningRequest request, IReadOnlyList<PlantObjectSnapshot> objects, IReadOnlyList<AnnotationOperationPlan> operations)
|
||||
{
|
||||
var canonical = new StringBuilder(request.CommandName).Append('|').Append(request.Viewport.SourceDrawingName).Append('|').Append(request.Viewport.Id);
|
||||
foreach (var item in objects)
|
||||
canonical.Append('|').Append(item.SnapshotId).Append('|').Append(item.ObjectClass).Append('|').Append(item.Tag).Append('|').Append(item.LineNumber).Append('|').Append(item.Geometry.PaperPosition);
|
||||
var canonical = new StringBuilder("schema=").Append(CurrentPlanSchemaVersion)
|
||||
.Append("|command=").Append(Normalize(request.CommandName))
|
||||
.Append("|source=").Append(Normalize(Path.GetFileName(request.Viewport.SourceDrawingName)))
|
||||
.Append("|view=").Append(Normalize(request.Viewport.Id))
|
||||
.Append("|limited-target=").Append(Normalize(request.LimitedApplyTargetSnapshotId))
|
||||
.Append("|limited-rule=").Append(Normalize(request.LimitedApplyRuleId));
|
||||
foreach (var item in objects.OrderBy(x => x.SnapshotId, StringComparer.Ordinal))
|
||||
{
|
||||
canonical.Append("|object=").Append(Normalize(item.SnapshotId)).Append('|').Append(Normalize(item.ObjectClass))
|
||||
.Append('|').Append(Normalize(item.Tag)).Append('|').Append(Normalize(item.LineNumber))
|
||||
.Append('|').Append(item.MembershipStatus);
|
||||
foreach (var property in item.Properties.OrderBy(x => x.Key, StringComparer.Ordinal))
|
||||
canonical.Append("|property=").Append(Normalize(property.Key)).Append('=').Append(Normalize(property.Value));
|
||||
}
|
||||
foreach (var operation in operations.OrderBy(x => x.SourceSnapshotId, StringComparer.Ordinal).ThenBy(x => x.Kind))
|
||||
canonical.Append("|operation=").Append(Normalize(operation.SourceSnapshotId)).Append(':').Append(operation.Kind).Append(':').Append(string.Join(',', operation.Reasons.OrderBy(x => x, StringComparer.Ordinal)));
|
||||
var hash = SHA256.HashData(Encoding.UTF8.GetBytes(canonical.ToString()));
|
||||
return "plan-" + Convert.ToHexString(hash)[..24];
|
||||
}
|
||||
|
||||
private static string Normalize(string? value) => (value ?? string.Empty).Trim().Normalize(NormalizationForm.FormC);
|
||||
|
||||
private static string MembershipReason(ViewMembershipStatus status) => status switch
|
||||
{
|
||||
ViewMembershipStatus.ObjectOutsideView => "VIEW_MEMBERSHIP_OBJECT_OUTSIDE_CLIP",
|
||||
ViewMembershipStatus.Unsupported => "VIEW_MEMBERSHIP_API_UNSUPPORTED",
|
||||
ViewMembershipStatus.Failed => "VIEW_MEMBERSHIP_TRANSFORM_FAILED",
|
||||
_ => "VIEW_MEMBERSHIP_NOT_RESOLVED"
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@ public sealed class AnnotationRuleEngine : IAnnotationRuleEngine
|
||||
ObjectClass = item.ClassName,
|
||||
Tag = item.Tag,
|
||||
LineNumber = item.LineNumber,
|
||||
Geometry = new GeometrySnapshot { PaperPosition = new Point2Dto(item.Position.X, item.Position.Y), Rotation = item.Rotation }
|
||||
Geometry = new GeometrySnapshot { PaperPosition = new Point2Dto(item.Position.X, item.Position.Y), Rotation = item.Rotation },
|
||||
MembershipStatus = ViewMembershipStatus.Resolved
|
||||
}).ToArray();
|
||||
|
||||
return new AnnotationPlanBuilder().Build(new AnnotationPlanningRequest
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public static class AttributeSwapPlanner
|
||||
{
|
||||
public static double ComputeShelfLength(double firstWidth, double firstOffset, double secondWidth, double secondOffset) =>
|
||||
Math.Abs(Math.Max(firstWidth + firstOffset, secondWidth + secondOffset) + .9);
|
||||
|
||||
public static IReadOnlyDictionary<string, string> Swap(IReadOnlyDictionary<string, string> metadata, string first, string second)
|
||||
{
|
||||
var result = new Dictionary<string, string>(metadata, StringComparer.Ordinal);
|
||||
if (result.TryGetValue(first, out var firstValue) && result.TryGetValue(second, out var secondValue))
|
||||
{ result[first] = secondValue; result[second] = firstValue; }
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
// Port of AutoLinenumberConnections.IsOKPrepareAnnotation's geometry gate.
|
||||
// The caller performs model-to-paper transformation only after the connector
|
||||
// is eligible, preserving legacy model-space containment semantics.
|
||||
public sealed class ConnectorViewportEligibilityEvaluator
|
||||
{
|
||||
public ConnectorViewportEligibility Evaluate(PlantConnectorPortSnapshot ports, Point3Dto viewDirection, Bounds3Dto viewExtents, double parallelTolerance = 0.1)
|
||||
{
|
||||
if (parallelTolerance < 0) throw new ArgumentOutOfRangeException(nameof(parallelTolerance));
|
||||
if (Parallel(ports.FirstDirection, viewDirection, parallelTolerance) || Parallel(ports.SecondDirection, viewDirection, parallelTolerance))
|
||||
return new(false, null, "CONNECTOR_PORT_PARALLEL_TO_VIEW");
|
||||
if (!Inside(ports.FirstPosition, viewExtents) || !Inside(ports.SecondPosition, viewExtents))
|
||||
return new(false, null, "CONNECTOR_OUTSIDE_VIEW_EXTENTS");
|
||||
// Legacy stores ports[1] as the insertion/model anchor.
|
||||
return new(true, ports.SecondPosition);
|
||||
}
|
||||
|
||||
private static bool Inside(Point3Dto point, Bounds3Dto bounds) =>
|
||||
point.X >= bounds.Minimum.X && point.X <= bounds.Maximum.X &&
|
||||
point.Y >= bounds.Minimum.Y && point.Y <= bounds.Maximum.Y &&
|
||||
point.Z >= bounds.Minimum.Z && point.Z <= bounds.Maximum.Z;
|
||||
|
||||
private static bool Parallel(Point3Dto first, Point3Dto second, double tolerance)
|
||||
{
|
||||
var firstLength = Math.Sqrt(first.X * first.X + first.Y * first.Y + first.Z * first.Z);
|
||||
var secondLength = Math.Sqrt(second.X * second.X + second.Y * second.Y + second.Z * second.Z);
|
||||
if (firstLength == 0 || secondLength == 0) return true;
|
||||
var cosine = Math.Abs((first.X * second.X + first.Y * second.Y + first.Z * second.Z) / (firstLength * secondLength));
|
||||
return 1d - cosine <= tolerance;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class ElevationAnnotationPlanner
|
||||
{
|
||||
public ElevationAnnotationPlan Build(IEnumerable<ElevationCandidate> candidates, IEnumerable<ExistingElevationAnnotation> existing)
|
||||
{
|
||||
var known = existing.GroupBy(value => value.SourceStableId, StringComparer.OrdinalIgnoreCase)
|
||||
.ToDictionary(group => group.Key, group => group.ToArray(), StringComparer.OrdinalIgnoreCase);
|
||||
var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
|
||||
var operations = new List<ElevationAnnotationOperation>();
|
||||
foreach (var candidate in candidates.OrderBy(value => value.StableId, StringComparer.Ordinal))
|
||||
{
|
||||
if (!seen.Add(candidate.StableId))
|
||||
{
|
||||
operations.Add(new(candidate.StableId, AnnotationOperationKind.Conflict, null, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, ["DUPLICATE_CANDIDATE"]));
|
||||
continue;
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(candidate.Layer) || string.IsNullOrWhiteSpace(candidate.TextStyle) || double.IsNaN(candidate.ModelElevation) || double.IsInfinity(candidate.ModelElevation))
|
||||
{
|
||||
operations.Add(new(candidate.StableId, AnnotationOperationKind.Skip, null, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, ["ELEVATION_CANDIDATE_INVALID"]));
|
||||
continue;
|
||||
}
|
||||
var text = LegacyElevationFormatter.Calculate(candidate.ModelElevation, candidate.DatumOffset);
|
||||
var matches = known.GetValueOrDefault(candidate.StableId, []);
|
||||
if (matches.Length > 1)
|
||||
{
|
||||
operations.Add(new(candidate.StableId, AnnotationOperationKind.Conflict, text, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, ["DUPLICATE_EXISTING_ANNOTATION"]));
|
||||
continue;
|
||||
}
|
||||
if (matches.Length == 1 && string.Equals(matches[0].Text, text, StringComparison.Ordinal) && matches[0].Position == candidate.Position)
|
||||
operations.Add(new(candidate.StableId, AnnotationOperationKind.Skip, text, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, ["ALREADY_CURRENT"]));
|
||||
else
|
||||
operations.Add(new(candidate.StableId, matches.Length == 1 ? AnnotationOperationKind.Update : AnnotationOperationKind.Create, text, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, Array.Empty<string>()));
|
||||
}
|
||||
return new(operations);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class ElevationSettingsLoader
|
||||
{
|
||||
public ElevationAssets Load(string xml)
|
||||
{
|
||||
var element = XElement.Parse(xml).Element("Elevations")
|
||||
?? throw new InvalidDataException("ELEVATION_SETTINGS_INVALID:Elevations");
|
||||
return new ElevationAssets(Required(element, "layer"), Required(element, "textstyle"));
|
||||
}
|
||||
|
||||
private static string Required(XElement element, string name) =>
|
||||
element.Attribute(name) is { Value: var value } && !string.IsNullOrWhiteSpace(value)
|
||||
? value
|
||||
: throw new InvalidDataException("ELEVATION_SETTINGS_INVALID:" + name);
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public static class ExtentsIntersectionClassifier
|
||||
{
|
||||
// Source-backed port of ExtentsIntersect.Commands without Autodesk types.
|
||||
public static ExtentsIntersectionType Classify(Bounds3Dto first, Bounds3Dto second)
|
||||
{
|
||||
if (Same(first, second)) return ExtentsIntersectionType.ExtentsMatch;
|
||||
if (Contains(first, second)) return ExtentsIntersectionType.SecondExtentsInsideFirstExtents;
|
||||
if (Contains(second, first)) return ExtentsIntersectionType.FirstExtentsInsideSecondExtents;
|
||||
return Overlaps(first, second) ? ExtentsIntersectionType.Intersect : ExtentsIntersectionType.DoNotIntersect;
|
||||
}
|
||||
private static bool Contains(Bounds3Dto outer, Bounds3Dto inner) => outer.Minimum.X <= inner.Minimum.X && outer.Minimum.Y <= inner.Minimum.Y && outer.Minimum.Z <= inner.Minimum.Z && outer.Maximum.X >= inner.Maximum.X && outer.Maximum.Y >= inner.Maximum.Y && outer.Maximum.Z >= inner.Maximum.Z;
|
||||
private static bool Overlaps(Bounds3Dto a, Bounds3Dto b) => a.Minimum.X <= b.Maximum.X && a.Maximum.X >= b.Minimum.X && a.Minimum.Y <= b.Maximum.Y && a.Maximum.Y >= b.Minimum.Y && a.Minimum.Z <= b.Maximum.Z && a.Maximum.Z >= b.Minimum.Z;
|
||||
private static bool Same(Bounds3Dto a, Bounds3Dto b) => a == b;
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class FirstLimitedApplyPlanner
|
||||
{
|
||||
public const string FixtureMarker = "FIRST_LIMITED_APPLY";
|
||||
public const string RuleId = "PXP-OA.PIPE.OPEN-END.V1";
|
||||
|
||||
public FirstLimitedApplyPreflight Prepare(
|
||||
PRecAnnotExecutionMode mode,
|
||||
AnnotationPlan plan,
|
||||
OrthoViewportInfo viewport,
|
||||
IReadOnlyList<PlantObjectSnapshot> objects,
|
||||
FirstLimitedApplyPermit permit)
|
||||
{
|
||||
if (mode != PRecAnnotExecutionMode.Apply) throw new InvalidOperationException("APPLY_MODE_REQUIRED");
|
||||
if (!permit.AllowApply || !string.Equals(permit.FixtureMarker, FixtureMarker, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("APPLY_TEST_FIXTURE_OR_PERMIT_REQUIRED");
|
||||
if (!string.Equals(permit.ExpectedPlanId, plan.PlanId, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("APPLY_PLAN_STALE");
|
||||
|
||||
var targets = objects.Where(x => string.Equals(x.SnapshotId, permit.TargetSnapshotId, StringComparison.Ordinal)).ToArray();
|
||||
if (targets.Length != 1) throw new InvalidOperationException("APPLY_REQUIRES_EXACTLY_ONE_TARGET");
|
||||
var target = targets[0];
|
||||
if (target.MembershipStatus != ViewMembershipStatus.Resolved) throw new InvalidOperationException("APPLY_REQUIRES_RESOLVED_MEMBERSHIP");
|
||||
if (!string.Equals(target.ObjectClass, "Pipe", StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("APPLY_UNSUPPORTED_OBJECT_CLASS");
|
||||
if (target.Geometry.PaperPosition is not { } placement) throw new InvalidOperationException("ANNOTATION_PLACEMENT_NOT_RESOLVED");
|
||||
|
||||
var create = plan.Operations.Where(x => x.Kind == AnnotationOperationKind.Create && string.Equals(x.SourceSnapshotId, target.SnapshotId, StringComparison.Ordinal)).ToArray();
|
||||
if (create.Length != 1) throw new InvalidOperationException("APPLY_TARGET_CREATE_NOT_PLANNED");
|
||||
|
||||
var duplicateKey = Stable("duplicate", RuleId, viewport.Id, target.SnapshotId);
|
||||
return new FirstLimitedApplyPreflight
|
||||
{
|
||||
PlanId = plan.PlanId,
|
||||
Operation = new CreatePipeAnnotationOperation
|
||||
{
|
||||
OperationId = Stable("operation", RuleId, viewport.Id, target.SnapshotId),
|
||||
SourceObjectStableKey = target.SnapshotId,
|
||||
ViewStableKey = viewport.Id,
|
||||
RuleId = RuleId,
|
||||
Placement = new AnnotationPoint(placement.X, placement.Y),
|
||||
DuplicateKey = duplicateKey
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static string Stable(params string[] values) => Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(string.Join("|", values))))[..24];
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using System.Globalization;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public static class LegacyElevationFormatter
|
||||
{
|
||||
public static int RoundModelElevation(double modelZ, double datumOffset)
|
||||
{
|
||||
// InsertElevation.BlockJig divides the model-space ordinate by five,
|
||||
// rounds that quotient away from zero and restores the five-unit grid
|
||||
// before formatting the signed metres/millimetres value.
|
||||
var grid = Math.Round((modelZ + datumOffset) / 5d, MidpointRounding.AwayFromZero) * 5d;
|
||||
return checked((int)Math.Round(grid, MidpointRounding.AwayFromZero));
|
||||
}
|
||||
|
||||
public static string FormatMillimetres(int millimetres)
|
||||
{
|
||||
if (millimetres == 0) return "0,000";
|
||||
var magnitude = Math.Abs((long)millimetres).ToString(CultureInfo.InvariantCulture).PadLeft(4, '0');
|
||||
var metres = magnitude[..^3];
|
||||
var fraction = magnitude[^3..];
|
||||
return $"{(millimetres > 0 ? "+" : "-")}{metres},{fraction}";
|
||||
}
|
||||
|
||||
public static string Calculate(double modelZ, double datumOffset) => FormatMillimetres(RoundModelElevation(modelZ, datumOffset));
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
// Source-backed PXP-ALC decision logic: only a connector whose related parts
|
||||
// resolve to different line groups produces an annotation. The connector is
|
||||
// the stable ownership identity, preserving repeat/update behaviour.
|
||||
public sealed class LineConnectionBoundaryPlanner
|
||||
{
|
||||
public IReadOnlyList<LineConnectionBoundaryPlan> Build(IEnumerable<LineConnectionBoundaryCandidate> candidates)
|
||||
{
|
||||
var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
|
||||
var result = new List<LineConnectionBoundaryPlan>();
|
||||
foreach (var candidate in candidates.OrderBy(value => value.StableId, StringComparer.Ordinal))
|
||||
{
|
||||
if (!seen.Add(candidate.StableId))
|
||||
{
|
||||
result.Add(new(candidate.StableId, string.Empty, candidate.Position, candidate.Rotation, ["DUPLICATE_CONNECTOR_CANDIDATE"], ConnectorPosition: candidate.FirstEndpoint));
|
||||
continue;
|
||||
}
|
||||
var first = candidate.FirstLineNumber?.Trim() ?? string.Empty;
|
||||
var second = candidate.SecondLineNumber?.Trim() ?? string.Empty;
|
||||
// The legacy command gates insertion on the two P3dLineGroup
|
||||
// relationship IDs, not just on their rendered text. Equal text in
|
||||
// distinct groups remains a real connector boundary; equal group IDs
|
||||
// never does.
|
||||
if (!string.IsNullOrWhiteSpace(candidate.FirstLineGroupStableId) &&
|
||||
string.Equals(candidate.FirstLineGroupStableId, candidate.SecondLineGroupStableId, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
result.Add(new(candidate.StableId, string.Empty, candidate.Position, candidate.Rotation, ["SAME_LINE_GROUP"], ConnectorPosition: candidate.FirstEndpoint));
|
||||
continue;
|
||||
}
|
||||
if (first.Length == 0 || second.Length == 0)
|
||||
{
|
||||
result.Add(new(candidate.StableId, string.Empty, candidate.Position, candidate.Rotation, ["LINE_GROUP_NOT_RESOLVED"], ConnectorPosition: candidate.FirstEndpoint));
|
||||
continue;
|
||||
}
|
||||
if (string.Equals(first, second, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
result.Add(new(candidate.StableId, string.Empty, candidate.Position, candidate.Rotation, ["SAME_LINE_GROUP"], ConnectorPosition: candidate.FirstEndpoint));
|
||||
continue;
|
||||
}
|
||||
var ordered = new[] { first, second }.OrderBy(value => value, StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
result.Add(new(candidate.StableId, string.Join(" / ", ordered), candidate.Position, candidate.Rotation, Array.Empty<string>(), first, second, candidate.FirstEndpoint));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
// Source-backed bridge for AutoLinenumberConnections: each endpoint uses the
|
||||
// same GetLinenumberAnnotationText formatting contract as PXP-LN, while the
|
||||
// connector itself remains the stable annotation ownership key.
|
||||
public sealed class LineConnectionPreviewService(
|
||||
LineNumberFieldResolver fieldResolver,
|
||||
ILineNumberAnnotationFormatter formatter,
|
||||
LineConnectionBoundaryPlanner boundaryPlanner)
|
||||
{
|
||||
public LineConnectionPreviewResult Preview(
|
||||
LineNumberAnnotationDefinition definition,
|
||||
IEnumerable<PlantConnectorRelationshipSnapshot> connectors,
|
||||
IReadOnlyDictionary<string, LineConnectionPlacement> placements)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(definition);
|
||||
ArgumentNullException.ThrowIfNull(connectors);
|
||||
ArgumentNullException.ThrowIfNull(placements);
|
||||
|
||||
var candidates = new List<LineConnectionBoundaryCandidate>();
|
||||
foreach (var connector in connectors.OrderBy(value => value.StableId, StringComparer.Ordinal))
|
||||
{
|
||||
if (!placements.TryGetValue(connector.StableId, out var placement))
|
||||
{
|
||||
candidates.Add(new(connector.StableId, string.Empty, string.Empty, new(), new(), new(new(), new()), new(), 0,
|
||||
connector.FirstLineGroupRowId.ToString(System.Globalization.CultureInfo.InvariantCulture),
|
||||
connector.SecondLineGroupRowId.ToString(System.Globalization.CultureInfo.InvariantCulture)));
|
||||
continue;
|
||||
}
|
||||
|
||||
var fields = definition.Tags.Select(tag => tag.Field).Where(field => !string.IsNullOrWhiteSpace(field));
|
||||
var first = ResolveText(definition, connector.FirstPartRowId, fields);
|
||||
var second = ResolveText(definition, connector.SecondPartRowId, fields);
|
||||
candidates.Add(new(
|
||||
connector.StableId,
|
||||
first.Text,
|
||||
second.Text,
|
||||
placement.FirstEndpoint,
|
||||
placement.SecondEndpoint,
|
||||
placement.Bounds,
|
||||
placement.Position,
|
||||
placement.Rotation,
|
||||
connector.FirstLineGroupRowId.ToString(System.Globalization.CultureInfo.InvariantCulture),
|
||||
connector.SecondLineGroupRowId.ToString(System.Globalization.CultureInfo.InvariantCulture)));
|
||||
}
|
||||
|
||||
var plans = boundaryPlanner.Build(candidates);
|
||||
// Per-connector property failures are represented as non-insertable
|
||||
// plans, matching legacy's continue-on-one-bad-connector behaviour.
|
||||
var repaired = plans.Select(plan =>
|
||||
{
|
||||
var connector = connectors.First(value => string.Equals(value.StableId, plan.StableId, StringComparison.Ordinal));
|
||||
if (!placements.ContainsKey(plan.StableId)) return plan with { Reasons = plan.Reasons.Append("CONNECTOR_GEOMETRY_UNAVAILABLE").Distinct(StringComparer.Ordinal).ToArray() };
|
||||
var fields = definition.Tags.Select(tag => tag.Field).Where(field => !string.IsNullOrWhiteSpace(field));
|
||||
var first = ResolveText(definition, connector.FirstPartRowId, fields);
|
||||
var second = ResolveText(definition, connector.SecondPartRowId, fields);
|
||||
var reasons = plan.Reasons.Concat(first.Error is null ? [] : [first.Error]).Concat(second.Error is null ? [] : [second.Error]).Distinct(StringComparer.Ordinal).ToArray();
|
||||
return reasons.Length == plan.Reasons.Count ? plan : plan with { Text = reasons.Length == 0 ? plan.Text : string.Empty, Reasons = reasons };
|
||||
}).ToArray();
|
||||
return new(true, repaired);
|
||||
}
|
||||
|
||||
private (string Text, string? Error) ResolveText(LineNumberAnnotationDefinition definition, long rowId, IEnumerable<string> fields)
|
||||
{
|
||||
var resolved = fieldResolver.Resolve(rowId, fields);
|
||||
if (!resolved.Success) return (string.Empty, resolved.FailureCode ?? "DATALINKS_PROPERTY_READ_FAILED");
|
||||
var formatted = formatter.Format(definition, resolved.Values);
|
||||
return formatted.Success ? (formatted.Text, null) : (string.Empty, formatted.ErrorCode ?? "LINE_NUMBER_FORMAT_FAILED");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class LineConnectionSettingsLoader
|
||||
{
|
||||
public LineConnectionAssets Load(string xml)
|
||||
{
|
||||
try
|
||||
{
|
||||
var element = XDocument.Parse(xml).Root?.Element("LinenumberConnections") ?? throw new InvalidOperationException("LINE_CONNECTION_SETTINGS_MISSING");
|
||||
string Required(string name) => string.IsNullOrWhiteSpace((string?)element.Attribute(name))
|
||||
? throw new InvalidOperationException("LINE_CONNECTION_SETTING_MISSING:" + name)
|
||||
: (string)element.Attribute(name)!;
|
||||
return new(Required("polylinelayer"), Required("textlayer"), Required("textstyle"));
|
||||
}
|
||||
catch (System.Xml.XmlException exception) { throw new InvalidOperationException("LINE_CONNECTION_SETTINGS_XML_INVALID", exception); }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
// Source-backed port of GetLinenumberAnnotationText. Plant/DataLinks access
|
||||
// stays at the adapter boundary; this service is deterministic and testable.
|
||||
public sealed class LineNumberAnnotationFormatter : ILineNumberAnnotationFormatter
|
||||
{
|
||||
public LineNumberFormattingResult Format(LineNumberAnnotationDefinition definition, IReadOnlyDictionary<string, string?> fields)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(definition);
|
||||
ArgumentNullException.ThrowIfNull(fields);
|
||||
var text = new System.Text.StringBuilder();
|
||||
foreach (var tag in definition.Tags)
|
||||
{
|
||||
if (!fields.TryGetValue(tag.Field, out var value)) return new(false, string.Empty, "FIELD_NOT_FOUND:" + tag.Field);
|
||||
value ??= string.Empty;
|
||||
if (!string.IsNullOrWhiteSpace(tag.ProcessingXml))
|
||||
{
|
||||
var processed = Process(value, tag.ProcessingXml, definition.Variables, fields, tag.Field);
|
||||
if (!processed.Success) return processed;
|
||||
value = processed.Text;
|
||||
}
|
||||
if (string.Equals(value, tag.IgnoreValue, StringComparison.Ordinal)) value = string.Empty;
|
||||
if (string.IsNullOrEmpty(value) && !tag.SaveWhenEmpty) continue;
|
||||
if (text.Length > 0) text.Append(tag.Divider == "space" ? " " : tag.Divider);
|
||||
text.Append(string.IsNullOrEmpty(value) ? definition.Nickname : value);
|
||||
}
|
||||
return new(true, text.ToString());
|
||||
}
|
||||
|
||||
private static LineNumberFormattingResult Process(string value, string processingXml, IReadOnlyDictionary<string, string> variables, IReadOnlyDictionary<string, string?> fields, string field)
|
||||
{
|
||||
try
|
||||
{
|
||||
var root = XElement.Parse(processingXml);
|
||||
if (root.Name.LocalName != "processing" || !root.Elements("function").Any()) return new(false, string.Empty, "PROCESSING_INVALID");
|
||||
foreach (var function in root.Elements("function"))
|
||||
{
|
||||
var result = Apply(function, value, variables, fields, field);
|
||||
if (!result.Success) return result;
|
||||
value = result.Text;
|
||||
}
|
||||
return new(true, value);
|
||||
}
|
||||
catch (System.Xml.XmlException) { return new(false, string.Empty, "PROCESSING_INVALID"); }
|
||||
}
|
||||
|
||||
private static LineNumberFormattingResult Apply(XElement function, string value, IReadOnlyDictionary<string, string> variables, IReadOnlyDictionary<string, string?> fields, string field)
|
||||
{
|
||||
var name = function.Element("name")?.Value;
|
||||
var mode = function.Element("mod")?.Value;
|
||||
var aliases = function.Elements("aliases").ToDictionary(x => x.Element("key")?.Value ?? string.Empty, x => x.Element("value")?.Value ?? string.Empty, StringComparer.OrdinalIgnoreCase);
|
||||
var attrs = function.Elements("attr").Select(a => Resolve(a.Element("value")?.Value, variables, fields)).ToArray();
|
||||
if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(mode) || attrs.Any(x => x is null)) return new(false, string.Empty, "PROCESSING_INVALID");
|
||||
var found = false;
|
||||
switch (name)
|
||||
{
|
||||
case "ToUpper": found = aliases.TryGetValue(attrs[0]!.ToUpperInvariant(), out value!); break;
|
||||
case "NotContains":
|
||||
if (attrs.Length < 2) return new(false, string.Empty, "PROCESSING_INVALID");
|
||||
if (attrs[1]!.Contains(attrs[0]!, StringComparison.Ordinal)) { value = string.Empty; found = true; }
|
||||
else found = aliases.TryGetValue(value, out value!);
|
||||
break;
|
||||
case "Empty": if (string.IsNullOrEmpty(attrs[0])) value = string.Empty; found = true; break;
|
||||
default: return new(false, string.Empty, "PROCESSING_UNKNOWN_FUNCTION:" + name);
|
||||
}
|
||||
return mode == "interrupt" && !found ? new(false, string.Empty, "PROCESSING_ALIAS_NOT_FOUND:" + field) : new(true, value);
|
||||
}
|
||||
|
||||
private static string? Resolve(string? value, IReadOnlyDictionary<string, string> variables, IReadOnlyDictionary<string, string?> fields)
|
||||
{
|
||||
if (value is null) return null;
|
||||
if (value.Length >= 2 && value[0] == '%' && value[^1] == '%') return variables.TryGetValue(value[1..^1], out var resolved) ? resolved : null;
|
||||
return fields.TryGetValue(value, out var field) ? field ?? string.Empty : value;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class LineNumberAnnotationSettingsLoader
|
||||
{
|
||||
public LineNumberAnnotationSettings Load(string xml)
|
||||
{
|
||||
ArgumentException.ThrowIfNullOrWhiteSpace(xml);
|
||||
var root = XElement.Parse(xml);
|
||||
if (root.Name.LocalName != "root") throw new InvalidDataException("SETTINGS_ROOT_INVALID");
|
||||
var nullOrEmpty = root.Element("nullOrEmpty")?.Value;
|
||||
if (nullOrEmpty is null) throw new InvalidDataException("SETTINGS_INVALID:10");
|
||||
var annotations = root.Elements("annotation").Select(ParseAnnotation).ToArray();
|
||||
if (annotations.Length == 0) throw new InvalidDataException("SETTINGS_INVALID:11");
|
||||
return new LineNumberAnnotationSettings { NullOrEmpty = nullOrEmpty, Annotations = annotations };
|
||||
}
|
||||
|
||||
private static LineNumberAnnotationDefinition ParseAnnotation(XElement annotation)
|
||||
{
|
||||
var nickname = annotation.Element("nickname")?.Value;
|
||||
if (string.IsNullOrWhiteSpace(nickname)) throw new InvalidDataException("SETTINGS_INVALID:20");
|
||||
var tags = annotation.Elements("tag").Select(ParseTag).ToArray();
|
||||
if (tags.Length == 0) throw new InvalidDataException("SETTINGS_INVALID:21");
|
||||
var variables = annotation.Elements("set").Select(x => new KeyValuePair<string, string>(x.Element("key")?.Value ?? string.Empty, x.Element("value")?.Value ?? string.Empty)).ToArray();
|
||||
if (variables.Length == 0) throw new InvalidDataException("SETTINGS_INVALID:22");
|
||||
if (variables.Any(x => string.IsNullOrWhiteSpace(x.Key))) throw new InvalidDataException("SETTINGS_INVALID:40");
|
||||
return new LineNumberAnnotationDefinition { Nickname = nickname, Variables = variables.ToDictionary(x => x.Key, x => x.Value, StringComparer.Ordinal), Tags = tags };
|
||||
}
|
||||
|
||||
private static LineNumberAnnotationTag ParseTag(XElement tag)
|
||||
{
|
||||
var divider = tag.Element("devider")?.Value;
|
||||
var saver = tag.Element("saver")?.Value;
|
||||
var field = tag.Element("field")?.Value;
|
||||
var ignore = tag.Element("ignore")?.Value;
|
||||
var processing = tag.Element("processing")?.Value;
|
||||
if (divider is null) throw new InvalidDataException("SETTINGS_INVALID:30");
|
||||
if (saver is null) throw new InvalidDataException("SETTINGS_INVALID:31");
|
||||
if (string.IsNullOrWhiteSpace(field)) throw new InvalidDataException("SETTINGS_INVALID:32");
|
||||
if (ignore is null) throw new InvalidDataException("SETTINGS_INVALID:33");
|
||||
if (processing is null) throw new InvalidDataException("SETTINGS_INVALID:34");
|
||||
return new LineNumberAnnotationTag { Field = field, Divider = divider, SaveWhenEmpty = string.IsNullOrEmpty(saver), IgnoreValue = ignore, ProcessingXml = processing };
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class LineNumberCommandPlanner(ILineNumberAnnotationFormatter formatter)
|
||||
{
|
||||
public LineNumberCommandPlan Build(LineNumberAnnotationDefinition definition, IEnumerable<LineNumberCandidate> candidates, IEnumerable<ExistingLineNumberAnnotation> existing)
|
||||
{
|
||||
var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
|
||||
var indexed = existing.GroupBy(x => x.SourceStableId, StringComparer.OrdinalIgnoreCase).ToDictionary(x => x.Key, x => x.First(), StringComparer.OrdinalIgnoreCase);
|
||||
var result = new List<LineNumberCommandOperation>();
|
||||
foreach (var candidate in candidates.OrderBy(x => x.StableId, StringComparer.Ordinal))
|
||||
{
|
||||
if (!seen.Add(candidate.StableId)) { result.Add(new(candidate.StableId, AnnotationOperationKind.Conflict, null, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, ["DUPLICATE_CANDIDATE"])); continue; }
|
||||
var text = formatter.Format(definition, candidate.Properties);
|
||||
if (!text.Success) { result.Add(new(candidate.StableId, AnnotationOperationKind.Skip, null, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, [text.ErrorCode ?? "FORMAT_FAILED"])); continue; }
|
||||
result.Add(new(candidate.StableId, indexed.ContainsKey(candidate.StableId) ? AnnotationOperationKind.Update : AnnotationOperationKind.Create, text.Text, candidate.Position, candidate.Rotation, candidate.Layer, candidate.TextStyle, Array.Empty<string>()));
|
||||
}
|
||||
return new(result);
|
||||
}
|
||||
|
||||
public static IReadOnlyList<LineNumberApplyPreflight> PrepareApply(LineNumberCommandPlan plan) => plan.Operations
|
||||
.Where(x => x.Kind is AnnotationOperationKind.Create or AnnotationOperationKind.Update)
|
||||
.OrderBy(x => x.StableId, StringComparer.Ordinal)
|
||||
.Select((x, index) => new LineNumberApplyPreflight(x.StableId, index + 1, x.Text!, x.Position, x.Rotation, x.Layer, x.TextStyle)).ToArray();
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class LineNumberCommandPreviewService(LineNumberCommandPlanner planner, LineNumberFieldResolver fieldResolver)
|
||||
{
|
||||
public LineNumberPreviewResult Preview(LineNumberAnnotationDefinition definition, IEnumerable<LineNumberCandidate> candidates, IEnumerable<ExistingLineNumberAnnotation> existing)
|
||||
{
|
||||
var resolved = new List<LineNumberCandidate>();
|
||||
foreach (var candidate in candidates.OrderBy(item => item.StableId, StringComparer.Ordinal))
|
||||
{
|
||||
var fields = definition.Tags.Select(tag => tag.Field).Where(field => !string.IsNullOrWhiteSpace(field));
|
||||
var properties = fieldResolver.Resolve(candidate.RowId, fields);
|
||||
if (!properties.Success) return new(false, null, Array.Empty<LineNumberApplyPreflight>(), properties.FailureCode);
|
||||
resolved.Add(candidate with { Properties = properties.Values });
|
||||
}
|
||||
var plan = planner.Build(definition, resolved, existing);
|
||||
return new(true, plan, LineNumberCommandPlanner.PrepareApply(plan));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class LineNumberConnectionPlanner
|
||||
{
|
||||
public IReadOnlyList<LineConnectionGroup> Build(IEnumerable<LineConnectionCandidate> candidates, double tolerance)
|
||||
{
|
||||
if (tolerance < 0 || double.IsNaN(tolerance) || double.IsInfinity(tolerance)) throw new ArgumentOutOfRangeException(nameof(tolerance));
|
||||
return candidates
|
||||
.Where(value => !string.IsNullOrWhiteSpace(value.LineNumber))
|
||||
.OrderBy(value => value.StableId, StringComparer.Ordinal)
|
||||
.GroupBy(value => value.LineNumber, StringComparer.OrdinalIgnoreCase)
|
||||
.Select(group => BuildGroup(group.Key, group.ToArray(), tolerance))
|
||||
.Where(group => group is not null)
|
||||
.Cast<LineConnectionGroup>()
|
||||
.OrderBy(group => group.LineNumber, StringComparer.OrdinalIgnoreCase)
|
||||
.ToArray();
|
||||
}
|
||||
|
||||
private static LineConnectionGroup? BuildGroup(string number, LineConnectionCandidate[] members, double tolerance)
|
||||
{
|
||||
if (members.Length < 2) return null;
|
||||
var connected = members.Where(first => members.Any(second => !ReferenceEquals(first, second) && Connected(first, second, tolerance))).OrderBy(value => value.StableId, StringComparer.Ordinal).ToArray();
|
||||
if (connected.Length < 2) return null;
|
||||
var anchor = connected[0];
|
||||
return new(number, connected, anchor.Position, anchor.Rotation);
|
||||
}
|
||||
|
||||
private static bool Connected(LineConnectionCandidate first, LineConnectionCandidate second, double tolerance)
|
||||
{
|
||||
if (Distance(first.FirstEndpoint, second.FirstEndpoint) <= tolerance || Distance(first.FirstEndpoint, second.SecondEndpoint) <= tolerance || Distance(first.SecondEndpoint, second.FirstEndpoint) <= tolerance || Distance(first.SecondEndpoint, second.SecondEndpoint) <= tolerance)
|
||||
return true;
|
||||
return ExtentsIntersectionClassifier.Classify(first.Bounds, second.Bounds) is not ExtentsIntersectionType.DoNotIntersect;
|
||||
}
|
||||
|
||||
private static double Distance(Point3Dto first, Point3Dto second)
|
||||
{
|
||||
var x = first.X - second.X; var y = first.Y - second.Y; var z = first.Z - second.Z;
|
||||
return Math.Sqrt(x * x + y * y + z * z);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
/// <summary>
|
||||
/// Produces the canonical, fixture-bound payload for the legacy line-number
|
||||
/// editing commands. The command-specific Apply permit signs this value so a
|
||||
/// controlled session cannot turn an arbitrary selected block or prompted
|
||||
/// value into a write merely by switching runtime mode to Apply.
|
||||
/// </summary>
|
||||
public static class LineNumberEditApplyPlan
|
||||
{
|
||||
public static string ComputeMutationHash(string commandName, string selectedObjectHandle, IReadOnlyList<LineNumberRowMutation> mutations)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(commandName)) throw new ArgumentException("LINE_NUMBER_EDIT_COMMAND_REQUIRED", nameof(commandName));
|
||||
if (string.IsNullOrWhiteSpace(selectedObjectHandle)) throw new ArgumentException("LINE_NUMBER_EDIT_SELECTION_REQUIRED", nameof(selectedObjectHandle));
|
||||
ArgumentNullException.ThrowIfNull(mutations);
|
||||
if (mutations.Count == 0) throw new ArgumentException("LINE_NUMBER_EDIT_MUTATIONS_REQUIRED", nameof(mutations));
|
||||
|
||||
var canonical = new StringBuilder()
|
||||
.Append(commandName).Append('|')
|
||||
.Append(selectedObjectHandle).Append('\n');
|
||||
foreach (var mutation in mutations.OrderBy(value => value.SourceStableId, StringComparer.Ordinal)
|
||||
.ThenBy(value => value.PreviousMarkerNumber)
|
||||
.ThenBy(value => value.MarkerNumber))
|
||||
{
|
||||
canonical.Append(mutation.SourceStableId).Append('|')
|
||||
.Append(mutation.PreviousMarkerNumber).Append('|')
|
||||
.Append(mutation.MarkerNumber).Append('|')
|
||||
.Append(mutation.Text.Replace("\r\n", "\n", StringComparison.Ordinal).Replace("\r", "\n", StringComparison.Ordinal)).Append('|');
|
||||
if (mutation.MarkerAttributePosition is { } position)
|
||||
canonical.Append(position.X.ToString("R", System.Globalization.CultureInfo.InvariantCulture)).Append(',')
|
||||
.Append(position.Y.ToString("R", System.Globalization.CultureInfo.InvariantCulture)).Append(',')
|
||||
.Append(position.Z.ToString("R", System.Globalization.CultureInfo.InvariantCulture));
|
||||
canonical.Append('\n');
|
||||
}
|
||||
return Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(canonical.ToString())));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public static class LineNumberEditPlanner
|
||||
{
|
||||
public static IReadOnlyList<LineNumberRowMutation> Renumber(IEnumerable<LineNumberOwnedRow> rows, int newStart)
|
||||
{
|
||||
if (newStart <= 0) throw new ArgumentOutOfRangeException(nameof(newStart), "LINE_NUMBER_START_MUST_BE_POSITIVE");
|
||||
var ordered = rows.OrderBy(value => value.MarkerNumber).ThenBy(value => value.SourceStableId, StringComparer.Ordinal).ToArray();
|
||||
if (ordered.Length == 0) throw new ArgumentException("LINE_NUMBER_LIST_EMPTY", nameof(rows));
|
||||
if (ordered.Select(value => value.MarkerNumber).Distinct().Count() != ordered.Length) throw new InvalidOperationException("LINE_NUMBER_LIST_DUPLICATE_MARKER_NUMBER");
|
||||
return ordered.Select((value, index) => new LineNumberRowMutation(value.SourceStableId, value.MarkerNumber, checked(newStart + index), value.Text, null)).ToArray();
|
||||
}
|
||||
|
||||
public static LineNumberRowMutation EditText(LineNumberOwnedRow row, string text)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(text)) throw new ArgumentException("LINE_NUMBER_TEXT_EMPTY", nameof(text));
|
||||
return new(row.SourceStableId, row.MarkerNumber, row.MarkerNumber, text, null);
|
||||
}
|
||||
|
||||
public static LineNumberRowMutation ResetMarkerAttributePosition(LineNumberOwnedRow row, Point2Dto configuredPosition) =>
|
||||
new(row.SourceStableId, row.MarkerNumber, row.MarkerNumber, row.Text, new(configuredPosition.X, configuredPosition.Y));
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class LineNumberFieldResolver(IDataLinksPropertyReader reader)
|
||||
{
|
||||
// Source-backed Convert_field_to_value port. The adapter supplies a
|
||||
// deterministic, read-only flattened key set: Table.Column and Column.
|
||||
public LineNumberFieldResolution Resolve(long rowId, IEnumerable<string> fields)
|
||||
{
|
||||
var read = reader.ReadProperties(rowId);
|
||||
if (!read.Success) return new(false, new Dictionary<string, string?>(), read.FailureCode ?? "DATALINKS_READ_FAILED");
|
||||
var values = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
|
||||
foreach (var field in fields.Distinct(StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(field)) return new(false, values, "LINE_NUMBER_FIELD_EMPTY");
|
||||
var dot = field.IndexOf('.', StringComparison.Ordinal);
|
||||
if (dot <= 0 || dot == field.Length - 1) return new(false, values, "LINE_NUMBER_FIELD_INVALID:" + field);
|
||||
if (!read.Properties.TryGetValue(field, out var value) && !read.Properties.TryGetValue(field[(dot + 1)..], out value)) return new(false, values, "LINE_NUMBER_COLUMN_MISSING:" + field);
|
||||
values[field] = value ?? string.Empty;
|
||||
}
|
||||
return new(true, values);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public static class LineNumberListPlanner
|
||||
{
|
||||
public static LineNumberListApplyPreflight Build(AnnotationPoint position, double rotation, IEnumerable<LineNumberApplyPreflight> rows)
|
||||
{
|
||||
var ordered = rows.OrderBy(row => row.MarkerNumber).ToArray();
|
||||
if (ordered.Length == 0) throw new ArgumentException("LINE_NUMBER_LIST_EMPTY", nameof(rows));
|
||||
if (ordered.Any(row => string.IsNullOrWhiteSpace(row.StableId) || string.IsNullOrWhiteSpace(row.Text))) throw new ArgumentException("LINE_NUMBER_LIST_ROW_INVALID", nameof(rows));
|
||||
if (ordered.Select(row => row.MarkerNumber).Distinct().Count() != ordered.Length) throw new ArgumentException("LINE_NUMBER_LIST_DUPLICATE_MARKER_NUMBER", nameof(rows));
|
||||
var key = string.Join("|", ordered.Select(row => $"{row.MarkerNumber}:{row.StableId}"));
|
||||
var digest = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(key))).ToLowerInvariant();
|
||||
return new($"ln-list:{digest}", position, rotation, ordered);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public enum ManualAnnotationKind
|
||||
{
|
||||
LineNumber,
|
||||
ValveOrNozzle,
|
||||
FlowDirection,
|
||||
InstrumentPosition,
|
||||
SectionElevation,
|
||||
InstrumentConnection,
|
||||
AutoCadBlock,
|
||||
PlatformElevation,
|
||||
OtherElevation
|
||||
}
|
||||
|
||||
public static class ManualAnnotationCommandRouter
|
||||
{
|
||||
public static string Resolve(ManualAnnotationKind kind) => kind switch
|
||||
{
|
||||
ManualAnnotationKind.LineNumber => "PXP-LN",
|
||||
ManualAnnotationKind.FlowDirection => "PXP-OA",
|
||||
ManualAnnotationKind.SectionElevation or ManualAnnotationKind.PlatformElevation or ManualAnnotationKind.OtherElevation => "PXP-IE",
|
||||
ManualAnnotationKind.AutoCadBlock => "PXP-MAB",
|
||||
ManualAnnotationKind.ValveOrNozzle or ManualAnnotationKind.InstrumentPosition or ManualAnnotationKind.InstrumentConnection => "PXP-AAV",
|
||||
_ => throw new ArgumentOutOfRangeException(nameof(kind), kind, "Unknown manual annotation kind.")
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed record ManualAnnotationState(string Kind, ManualDatumMode DatumMode, double DatumOffset)
|
||||
{
|
||||
public string Serialize() => string.Join("|", Kind, DatumMode, DatumOffset.ToString(System.Globalization.CultureInfo.InvariantCulture));
|
||||
|
||||
public static ManualAnnotationState? Deserialize(string? value)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(value)) return null;
|
||||
var fields = value.Split('|');
|
||||
if (fields.Length != 3 || !Enum.TryParse<ManualDatumMode>(fields[1], true, out var mode) ||
|
||||
!double.TryParse(fields[2], System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out var offset)) return null;
|
||||
return new ManualAnnotationState(fields[0], mode, offset);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public enum ManualDatumMode { Absolute, Relative }
|
||||
|
||||
public static class ManualDatumResolver
|
||||
{
|
||||
public static double Resolve(double sourceElevation, ManualDatumMode mode, double offset) =>
|
||||
mode == ManualDatumMode.Absolute ? sourceElevation : sourceElevation + offset;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
using System.Text.RegularExpressions;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class OrthoAnnotationClassifier
|
||||
{
|
||||
public OrthoAnnotationClassification Classify(PlantObjectSnapshot source, OrthoAnnotationOptions options)
|
||||
{
|
||||
string Property(params string[] names) => source.Properties.FirstOrDefault(x => names.Any(n => string.Equals(n, x.Key, StringComparison.OrdinalIgnoreCase))).Value?.Trim() ?? string.Empty;
|
||||
var className = source.ObjectClass.Trim();
|
||||
if (className.Equals("Support", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var title = Property("Title"); var text = Normalize(Property("Annotation"));
|
||||
return options.Supports && title.StartsWith("НЕСТАНДАРТНЫЕ", StringComparison.OrdinalIgnoreCase) && text.Length > 0
|
||||
? Ready(source, OrthoAnnotationRepresentation.MultiLeader, text)
|
||||
: Skip(source, "SUPPORT_NOT_NKR_OR_DISABLED");
|
||||
}
|
||||
if (className.Equals("Valve", StringComparison.OrdinalIgnoreCase) || className.Equals("InlineInstrument", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var value = Normalize(className.Equals("Valve", StringComparison.OrdinalIgnoreCase) ? Property("Annotation") : Property("Tag"));
|
||||
if (value.Contains('$')) return options.Instruments ? Ready(source, OrthoAnnotationRepresentation.BubbleBlock, value.Replace("$", "\\P", StringComparison.Ordinal)) : Skip(source, "INSTRUMENT_ANNOTATION_DISABLED");
|
||||
return HasAlphaNumeric(value) && options.Valves ? Ready(source, OrthoAnnotationRepresentation.MultiLeader, value) : Skip(source, "VALVE_ANNOTATION_EMPTY_OR_DISABLED");
|
||||
}
|
||||
if (className.Equals("Plug", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var value = Normalize(Property("TieInNumber"));
|
||||
if (!options.Plugs || !HasAlphaNumeric(value)) return Skip(source, "PLUG_ANNOTATION_EMPTY_OR_DISABLED");
|
||||
var representation = value.Contains('$') ? OrthoAnnotationRepresentation.BubbleBlock : OrthoAnnotationRepresentation.MultiLeader;
|
||||
return Ready(source, representation, "Для подключения\\Pпоз. " + value.Replace("$", "\\P", StringComparison.Ordinal));
|
||||
}
|
||||
if (className.Equals("Board", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var value = Normalize(Property("Tag", "Annotation"));
|
||||
return options.Boards && value.Length > 0 ? Ready(source, value.Contains('$') ? OrthoAnnotationRepresentation.BubbleBlock : OrthoAnnotationRepresentation.MultiLeader, "Шкаф КИП для прибора\\Pпоз. " + value.Replace("$", "\\P", StringComparison.Ordinal)) : Skip(source, "BOARD_ANNOTATION_EMPTY_OR_DISABLED");
|
||||
}
|
||||
return Skip(source, "ORTHO_ANNOTATION_CLASS_UNSUPPORTED");
|
||||
}
|
||||
|
||||
private static bool HasAlphaNumeric(string value) => Regex.IsMatch(value, "[a-zA-Z0-9]");
|
||||
private static string Normalize(string value) => value.Replace("{nl}", "\\P", StringComparison.Ordinal);
|
||||
private static OrthoAnnotationClassification Ready(PlantObjectSnapshot source, OrthoAnnotationRepresentation representation, string text) => new(source.SnapshotId, representation, text, Array.Empty<string>());
|
||||
private static OrthoAnnotationClassification Skip(PlantObjectSnapshot source, string reason) => new(source.SnapshotId, OrthoAnnotationRepresentation.None, string.Empty, [reason]);
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class OrthoAnnotationSettingsLoader
|
||||
{
|
||||
public OrthoAnnotationAssets Load(string xml)
|
||||
{
|
||||
var value = XElement.Parse(xml).Element("Annotations") ?? throw Invalid("Annotations");
|
||||
return new(Required(value, "layer"), Required(value, "textstyle"), Required(value, "multileaderstyle"));
|
||||
}
|
||||
private static string Required(XElement value, string name) => value.Attribute(name) is { Value: var result } && !string.IsNullOrWhiteSpace(result) ? result : throw Invalid(name);
|
||||
private static InvalidDataException Invalid(string value) => new("ORTHO_ANNOTATION_SETTINGS_INVALID:" + value);
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
// v1.0.4.2 identity rule: a selected drawing is matched by its normalized
|
||||
// project-relative path, never by the display/file name alone.
|
||||
public sealed class OrthoBatchPlanner
|
||||
{
|
||||
public OrthoBatchPlan Build(IEnumerable<OrthoBatchDrawing> drawings, IEnumerable<OrthoBatchSelection> selections)
|
||||
{
|
||||
var diagnostics = new List<string>(); var operations = new List<OrthoBatchOperation>();
|
||||
var source = drawings.OrderBy(x => Normalize(x.RelativePath), StringComparer.OrdinalIgnoreCase).ThenBy(x => x.DrawingGuid, StringComparer.Ordinal).ToArray();
|
||||
var duplicateIds = source.GroupBy(x => Normalize(x.RelativePath), StringComparer.OrdinalIgnoreCase).Where(x => x.Count() > 1).Select(x => x.Key).ToHashSet(StringComparer.OrdinalIgnoreCase);
|
||||
foreach (var selection in selections.OrderBy(x => Normalize(x.RelativePath), StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
var relative = Normalize(selection.RelativePath);
|
||||
if (duplicateIds.Contains(relative)) { diagnostics.Add("ORTHO_DRAWING_RELATIVE_PATH_AMBIGUOUS:" + relative); continue; }
|
||||
var drawing = source.SingleOrDefault(x => string.Equals(Normalize(x.RelativePath), relative, StringComparison.OrdinalIgnoreCase));
|
||||
if (drawing is null) { diagnostics.Add("ORTHO_DRAWING_NOT_FOUND:" + relative); continue; }
|
||||
foreach (var view in selection.Views.Distinct(StringComparer.OrdinalIgnoreCase).OrderBy(x => x, StringComparer.OrdinalIgnoreCase))
|
||||
if (drawing.Views.Contains(view, StringComparer.OrdinalIgnoreCase)) operations.Add(new(drawing.DrawingGuid, drawing.DisplayName, relative, view));
|
||||
else diagnostics.Add($"ORTHO_VIEW_NOT_FOUND:{relative}:{view}");
|
||||
}
|
||||
return new(operations.OrderBy(x => x.RelativePath, StringComparer.OrdinalIgnoreCase).ThenBy(x => x.ViewName, StringComparer.OrdinalIgnoreCase).ThenBy(x => x.DrawingGuid, StringComparer.Ordinal).ToArray(), diagnostics.OrderBy(x => x, StringComparer.Ordinal).ToArray());
|
||||
}
|
||||
|
||||
public static string Normalize(string relativePath)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(relativePath) || Path.IsPathRooted(relativePath)) throw new ArgumentException("ORTHO_RELATIVE_PATH_REQUIRED", nameof(relativePath));
|
||||
var parts = relativePath.Replace('/', '\\').Split('\\', StringSplitOptions.RemoveEmptyEntries);
|
||||
if (parts.Any(x => x == "..")) throw new ArgumentException("ORTHO_RELATIVE_PATH_ESCAPES_PROJECT", nameof(relativePath));
|
||||
return string.Join('\\', parts.Where(x => x != "."));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class OrthoLayerSettingsLoader
|
||||
{
|
||||
public IReadOnlyList<OrthoLayerRule> Load(string xml)
|
||||
{
|
||||
var root = XElement.Parse(xml).Element("LayersSetup") ?? throw Invalid("LayersSetup");
|
||||
var result = root.Elements("LayerSetup").Select(Parse).ToArray();
|
||||
return result.Length > 0 ? result : throw Invalid("LayerSetup");
|
||||
}
|
||||
private static OrthoLayerRule Parse(XElement value)
|
||||
{
|
||||
var kind = Required(value, "filtertype").ToUpperInvariant() switch { "STATUS" => OrthoLayerFilterKind.Status, "LAYER" => OrthoLayerFilterKind.Layer, _ => OrthoLayerFilterKind.Table };
|
||||
var filter = Required(value, "filtervalue", true); if (filter.Length == 0) filter = "(Undefined)";
|
||||
int? weight = int.TryParse(Required(value, "lineweight", true), out var parsedWeight) ? parsedWeight : null;
|
||||
var color = Required(value, "color", true); short? index = short.TryParse(color, out var parsedIndex) ? parsedIndex : null; byte? red = null, green = null, blue = null;
|
||||
var rgb = color.Split(','); if (rgb.Length == 3 && byte.TryParse(rgb[0], out var r) && byte.TryParse(rgb[1], out var g) && byte.TryParse(rgb[2], out var b)) { red = r; green = g; blue = b; index = null; }
|
||||
return new(kind, filter, weight, Required(value, "linetype", true), index, red, green, blue);
|
||||
}
|
||||
private static string Required(XElement value, string name, bool empty = false) => value.Attribute(name) is { Value: var result } && (empty || !string.IsNullOrWhiteSpace(result)) ? result : throw Invalid(name);
|
||||
private static InvalidDataException Invalid(string field) => new("ORTHO_LAYER_SETTINGS_INVALID:" + field);
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class OrthoSourceDrawingResolver : IOrthoSourceDrawingResolver
|
||||
{
|
||||
public IReadOnlyList<OrthoSourceDrawingReference> Resolve(OrthoDrawingSnapshot drawing)
|
||||
{
|
||||
var candidates = drawing.Views
|
||||
.OrderBy(x => x.ViewStableId, StringComparer.Ordinal)
|
||||
.SelectMany(x => x.ReferencedDrawingPaths)
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x))
|
||||
.Select(x => x.Trim().Replace('\\', '/'))
|
||||
.Distinct(StringComparer.OrdinalIgnoreCase)
|
||||
.OrderBy(x => x, StringComparer.OrdinalIgnoreCase)
|
||||
.Select(path => new OrthoSourceDrawingReference
|
||||
{
|
||||
StableId = StableId(drawing.StableId, path),
|
||||
DisplayName = Path.GetFileName(path),
|
||||
ProjectRelativePath = path,
|
||||
Status = SourceDrawingResolutionStatus.Resolved,
|
||||
EvidenceCodes = new[] { "SOURCE_FROM_VIEW_DEFINITION", "SOURCE_PATH_MATCHED_PROJECT_RELATIVE" }
|
||||
})
|
||||
.ToArray();
|
||||
|
||||
return candidates.Length != 0
|
||||
? candidates
|
||||
: new[]
|
||||
{
|
||||
new OrthoSourceDrawingReference
|
||||
{
|
||||
StableId = StableId(drawing.StableId, "none"),
|
||||
DisplayName = "source drawing unavailable",
|
||||
Status = SourceDrawingResolutionStatus.NotReferenced,
|
||||
EvidenceCodes = new[] { "ORTHO_SOURCE_DRAWING_NOT_RESOLVED" }
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static string StableId(string drawingId, string source)
|
||||
{
|
||||
var hash = SHA256.HashData(Encoding.UTF8.GetBytes($"{drawingId}|{source}"));
|
||||
return "src-" + Convert.ToHexString(hash)[..20];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
using System.Globalization;
|
||||
using System.Xml.Linq;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
/// <summary>Typed projection of the release Settings.xml sections consumed by production workflows.</summary>
|
||||
public sealed record ProductionSettingsContract(
|
||||
IReadOnlyList<NamedDrawingObject> CopyMissingObjects,
|
||||
IReadOnlyList<LayerSetupRule> LayerSetup,
|
||||
string AnnotationLayer,
|
||||
string AnnotationTextStyle,
|
||||
string AnnotationLeaderStyle,
|
||||
string ConnectionPolylineLayer,
|
||||
string ConnectionTextLayer,
|
||||
string ConnectionTextStyle,
|
||||
string ElevationLayer,
|
||||
string ElevationTextStyle,
|
||||
string SetLayer,
|
||||
double? FixedSupportPlusLength,
|
||||
string? ScriptFolder,
|
||||
LineNumberMarkerSettings? LineNumberMarker,
|
||||
SupportTopViewSettings? SupportTopView)
|
||||
{
|
||||
public LineNumberMarkerAsset? ToLineNumberMarkerAsset()
|
||||
{
|
||||
if (LineNumberMarker is null) return null;
|
||||
var texts = LineNumberMarker.Text is { } text
|
||||
? new[] { new LineNumberTextAsset(text.Layer ?? string.Empty, text.TextStyle ?? string.Empty, text.Size ?? 0, text.TextValue ?? string.Empty, new(text.PositionX ?? 0, text.PositionY ?? 0)) }
|
||||
: Array.Empty<LineNumberTextAsset>();
|
||||
var lines = LineNumberMarker.Line is { } line
|
||||
? new[] { new LineNumberLineAsset(line.Layer ?? string.Empty, new(line.StartX ?? 0, line.StartY ?? 0), new(line.EndX ?? 0, line.EndY ?? 0)) }
|
||||
: Array.Empty<LineNumberLineAsset>();
|
||||
return new(LineNumberMarker.Layer, LineNumberMarker.MaskScaleFactor ?? 0, texts, lines);
|
||||
}
|
||||
|
||||
public static ProductionSettingsContract Parse(string xml)
|
||||
{
|
||||
var root = XElement.Parse(xml, LoadOptions.PreserveWhitespace);
|
||||
var copy = root.Element("CopyMissingObjects")?.Elements("Object")
|
||||
.Select(value => new NamedDrawingObject(Required(value, "type"), Required(value, "name")))
|
||||
.ToArray() ?? Array.Empty<NamedDrawingObject>();
|
||||
var layers = root.Element("LayersSetup")?.Elements("LayerSetup")
|
||||
.Select(value => new LayerSetupRule(
|
||||
Required(value, "filtertype"), Required(value, "filtervalue", allowEmpty: true),
|
||||
ParseInt(value, "lineweight"), Required(value, "linetype", allowEmpty: true),
|
||||
Required(value, "color", allowEmpty: true)))
|
||||
.ToArray() ?? Array.Empty<LayerSetupRule>();
|
||||
var annotations = root.Element("Annotations");
|
||||
var connections = root.Element("LinenumberConnections");
|
||||
var elevations = root.Element("Elevations");
|
||||
var setLayer = root.Element("SetLayer")?.Attribute("name")?.Value;
|
||||
if (string.IsNullOrWhiteSpace(setLayer)) throw Invalid("SetLayer.name");
|
||||
var plusLength = root.Element("PlusLengthNO")?.Attribute("value")?.Value;
|
||||
double? parsedPlusLength = TryParseLegacyNumber(plusLength, out var plus) ? plus : null;
|
||||
var marker = root.Element("LineNumbers")?.Element("Marker");
|
||||
LineNumberMarkerSettings? parsedMarker = marker is null ? null : new(
|
||||
Required(marker, "layer"),
|
||||
TryParseLegacyNumber(marker.Attribute("maskscalefactor")?.Value, out var mask) ? mask : null,
|
||||
ParseLine(marker.Element("Line")),
|
||||
ParseText(marker.Element("Text")));
|
||||
var supports = root.Element("SupportsInTopView");
|
||||
SupportTopViewSettings? parsedSupports = supports is null ? null : new(
|
||||
supports.Attribute("undefinedsize")?.Value,
|
||||
supports.Elements("Support").Select(value => new SupportRule(
|
||||
Required(value, "scriptname"),
|
||||
TryParseLegacyNumber(value.Attribute("nominaldiameter")?.Value, out var diameter) ? diameter : null,
|
||||
value.Attribute("nominalumit")?.Value,
|
||||
int.TryParse(value.Attribute("lastdigit")?.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var lastDigit) ? lastDigit : null,
|
||||
TryParseLegacyNumber(value.Attribute("scale")?.Value, out var scale) ? scale : null,
|
||||
value.Attribute("selectionvalue")?.Value)).ToArray());
|
||||
return new(
|
||||
copy,
|
||||
layers,
|
||||
Required(annotations, "layer"),
|
||||
Required(annotations, "textstyle"),
|
||||
Required(annotations, "multileaderstyle"),
|
||||
Required(connections, "polylinelayer"),
|
||||
Required(connections, "textlayer"),
|
||||
Required(connections, "textstyle"),
|
||||
Required(elevations, "layer"),
|
||||
Required(elevations, "textstyle"),
|
||||
setLayer,
|
||||
parsedPlusLength,
|
||||
root.Element("ScriptFolder")?.Attribute("path")?.Value,
|
||||
parsedMarker,
|
||||
parsedSupports);
|
||||
}
|
||||
|
||||
private static LineGeometrySettings? ParseLine(XElement? value) => value is null ? null : new(
|
||||
TryParseLegacyNumber(value.Attribute("startx")?.Value, out var startX) ? startX : null,
|
||||
TryParseLegacyNumber(value.Attribute("starty")?.Value, out var startY) ? startY : null,
|
||||
TryParseLegacyNumber(value.Attribute("endx")?.Value, out var endX) ? endX : null,
|
||||
TryParseLegacyNumber(value.Attribute("endy")?.Value, out var endY) ? endY : null,
|
||||
value.Attribute("layer")?.Value);
|
||||
|
||||
private static TextAnnotationSettings? ParseText(XElement? value) => value is null ? null : new(
|
||||
value.Attribute("layer")?.Value,
|
||||
value.Attribute("textstyle")?.Value,
|
||||
TryParseLegacyNumber(value.Attribute("size")?.Value, out var size) ? size : null,
|
||||
value.Attribute("textvalue")?.Value,
|
||||
TryParseLegacyNumber(value.Attribute("positionx")?.Value, out var positionX) ? positionX : null,
|
||||
TryParseLegacyNumber(value.Attribute("positiony")?.Value, out var positionY) ? positionY : null);
|
||||
|
||||
private static int? ParseInt(XElement value, string name) => int.TryParse(value.Attribute(name)?.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var parsed) ? parsed : null;
|
||||
private static bool TryParseLegacyNumber(string? value, out double parsed)
|
||||
{
|
||||
if (double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out parsed)) return true;
|
||||
return double.TryParse(value?.Replace(',', '.'), NumberStyles.Float, CultureInfo.InvariantCulture, out parsed);
|
||||
}
|
||||
private static string Required(XElement? value, string name, bool allowEmpty = false) => value?.Attribute(name) is { Value: var result } && (allowEmpty || !string.IsNullOrWhiteSpace(result)) ? result : throw Invalid(name);
|
||||
private static InvalidDataException Invalid(string field) => new("PRODUCTION_SETTINGS_INVALID:" + field);
|
||||
}
|
||||
|
||||
public sealed record NamedDrawingObject(string Type, string Name);
|
||||
public sealed record LayerSetupRule(string FilterType, string FilterValue, int? LineWeight, string LineType, string Color);
|
||||
public sealed record LineNumberMarkerSettings(string Layer, double? MaskScaleFactor, LineGeometrySettings? Line, TextAnnotationSettings? Text);
|
||||
public sealed record LineGeometrySettings(double? StartX, double? StartY, double? EndX, double? EndY, string? Layer);
|
||||
public sealed record TextAnnotationSettings(string? Layer, string? TextStyle, double? Size, string? TextValue, double? PositionX, double? PositionY);
|
||||
public sealed record SupportTopViewSettings(string? UndefinedSize, IReadOnlyList<SupportRule> Rules)
|
||||
{
|
||||
public SupportRule? Resolve(double nominalDiameter, string nominalUnit, string? selectionValue = null) => Rules
|
||||
.Where(rule => rule.NominalDiameter is not null && Math.Abs(rule.NominalDiameter.Value - nominalDiameter) < 0.0001)
|
||||
.Where(rule => string.Equals(rule.NominalUnit, nominalUnit, StringComparison.OrdinalIgnoreCase))
|
||||
.Where(rule => selectionValue is null || string.Equals(rule.SelectionValue, selectionValue, StringComparison.Ordinal))
|
||||
.OrderBy(rule => rule.LastDigit ?? int.MaxValue)
|
||||
.FirstOrDefault();
|
||||
}
|
||||
public sealed record SupportRule(string ScriptName, double? NominalDiameter, string? NominalUnit, int? LastDigit, double? Scale, string? SelectionValue);
|
||||
@@ -0,0 +1,13 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core;
|
||||
|
||||
public sealed class ViewportLayerPlanner
|
||||
{
|
||||
public ViewportLayerPlan Build(string? currentLayer, bool targetLayerExists, string targetLayer = "Defpoints")
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(targetLayer)) return new(false, string.Empty, "VIEWPORT_TARGET_LAYER_INVALID");
|
||||
if (!targetLayerExists) return new(false, targetLayer, "VIEWPORT_TARGET_LAYER_MISSING");
|
||||
return new(!string.Equals(currentLayer, targetLayer, StringComparison.OrdinalIgnoreCase), targetLayer);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Core.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class AutoAnnotateViewCommand
|
||||
{
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
var options = new PromptEntityOptions("\nВыберите видовой экран для автоматической аннотации: ");
|
||||
options.SetRejectMessage("\nДолжен быть видовой экран."); options.AddAllowedClass(typeof(Viewport), true);
|
||||
var selected = document.Editor.GetEntity(options); if (selected.Status != PromptStatus.OK) return;
|
||||
var context = new PlantRuntimeContextReader().ReadCurrentContext(document);
|
||||
if (!context.HasPlantProject || !context.IsOrthoDrawing) throw new InvalidOperationException("AUTO_ANNOTATE_VIEW_ORTHO_CONTEXT_REQUIRED");
|
||||
OrthoViewportInfo viewport;
|
||||
using (var transaction = document.Database.TransactionManager.StartOpenCloseTransaction())
|
||||
{
|
||||
var entity = (Viewport)transaction.GetObject(selected.ObjectId, OpenMode.ForRead);
|
||||
var matches = context.Viewports.Where(x => Math.Abs(x.CenterX - entity.CenterPoint.X) < .001 && Math.Abs(x.CenterY - entity.CenterPoint.Y) < .001 && Math.Abs(x.Width - entity.Width) < .001 && Math.Abs(x.Height - entity.Height) < .001).ToArray();
|
||||
viewport = matches.Length == 1 ? matches[0] : throw new InvalidOperationException(matches.Length == 0 ? "AUTO_ANNOTATE_VIEW_NOT_FOUND" : "AUTO_ANNOTATE_VIEW_AMBIGUOUS");
|
||||
}
|
||||
var objects = new PlantObjectReader().ReadObjects(viewport, CancellationToken.None);
|
||||
var classifications = objects.OrderBy(x => x.SnapshotId, StringComparer.Ordinal)
|
||||
.Select(x => new OrthoAnnotationClassifier().Classify(x, new(true, true, true, true, true))).ToArray();
|
||||
var permit = string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase)
|
||||
? FirstLimitedApplyPermitReader.ReadFor(document) : null;
|
||||
var plan = new AnnotationPlanBuilder().Build(new AnnotationPlanningRequest
|
||||
{
|
||||
CommandName = "PXP-AAV", Viewport = viewport, Objects = objects,
|
||||
LimitedApplyTargetSnapshotId = permit?.TargetSnapshotId,
|
||||
LimitedApplyRuleId = permit is null ? null : FirstLimitedApplyPlanner.RuleId
|
||||
});
|
||||
var leaders = classifications.Count(x => x.Representation == OrthoAnnotationRepresentation.MultiLeader);
|
||||
var bubbles = classifications.Count(x => x.Representation == OrthoAnnotationRepresentation.BubbleBlock);
|
||||
document.Editor.WriteMessage($"\nPXP-AAV preview: examined={plan.Summary.ObjectsExamined}; create={plan.Summary.CreateCount}; update={plan.Summary.UpdateCount}; leaders={leaders}; bubbles={bubbles}; skip={plan.Summary.SkipCount}; conflicts={plan.Summary.ConflictCount}; PlanId={plan.PlanId}. DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("AutoAnnotateViewPreviewCompleted", commandName: "PXP-AAV", resultStatus: "PreviewCompleted", document: document, details: new Dictionary<string, object?> { ["PlanId"] = plan.PlanId, ["ObjectsExamined"] = plan.Summary.ObjectsExamined, ["MultiLeaderCandidates"] = leaders, ["BubbleCandidates"] = bubbles });
|
||||
ScriptDrivenFirstApplyAutomation.RecordPxpAav(plan.PlanId, objects.Select(value => value.SnapshotId).OrderBy(value => value, StringComparer.Ordinal).ToArray(), viewport.Id, plan.Summary.CreateCount, plan.Summary.SkipCount, permit is not null, plan.Summary.ObjectsExamined, objects.Count(value => value.MembershipStatus == ViewMembershipStatus.Resolved));
|
||||
if (permit is null) return;
|
||||
if (!string.Equals(permit.ExpectedPlanId, plan.PlanId, StringComparison.Ordinal)) throw new InvalidOperationException("APPLY_PLAN_ID_MISMATCH");
|
||||
var selectedSource = objects.SingleOrDefault(x => string.Equals(x.SnapshotId, permit.TargetSnapshotId, StringComparison.Ordinal)) ?? throw new InvalidOperationException("APPLY_TARGET_NOT_FOUND");
|
||||
var selectedClassification = classifications.Single(x => string.Equals(x.StableId, permit.TargetSnapshotId, StringComparison.Ordinal));
|
||||
if (selectedClassification.Representation != OrthoAnnotationRepresentation.None)
|
||||
{
|
||||
var settingsPath = Environment.GetEnvironmentVariable("P_REC_ANNOT_LINE_NUMBER_DRAWING_SETTINGS_PATH");
|
||||
if (string.IsNullOrWhiteSpace(settingsPath) || !File.Exists(settingsPath)) throw new InvalidOperationException("ORTHO_ANNOTATION_CONFIGURATION_REQUIRED");
|
||||
var assets = new OrthoAnnotationSettingsLoader().Load(File.ReadAllText(settingsPath));
|
||||
var result = new OrthoAnnotationWriter().Replace(document, viewport, selectedSource, selectedClassification, assets);
|
||||
document.Editor.WriteMessage("\nPXP-AAV Apply: " + result + "; AutoCAD UNDO is available.");
|
||||
RuntimeDiagnostics.Write("AutoAnnotateViewApplyCompleted", commandName: "PXP-AAV", resultStatus: result, document: document, details: new Dictionary<string, object?> { ["PlanId"] = plan.PlanId, ["Representation"] = selectedClassification.Representation.ToString() });
|
||||
return;
|
||||
}
|
||||
var corePermit = new FirstLimitedApplyPermit { FixtureMarker = FirstLimitedApplyPlanner.FixtureMarker, AllowApply = permit.AllowApply, TargetSnapshotId = permit.TargetSnapshotId, ExpectedPlanId = permit.ExpectedPlanId };
|
||||
var preflight = new FirstLimitedApplyPlanner().Prepare(PRecAnnotExecutionMode.Apply, plan, viewport, objects, corePermit);
|
||||
var outcome = new FirstLimitedPipeAnnotationWriter().Write(document, preflight.Operation, permit.VisibilityState, permit.AnnotationTemplateDwgPath);
|
||||
document.Editor.WriteMessage("\nPXP-AAV Apply: " + outcome + "; AutoCAD UNDO is available.");
|
||||
RuntimeDiagnostics.Write("AutoAnnotateViewApplyCompleted", commandName: "PXP-AAV", resultStatus: outcome.ToString(), document: document, details: new Dictionary<string, object?> { ["PlanId"] = plan.PlanId });
|
||||
ScriptDrivenFirstApplyAutomation.RecordApplyOutcome(outcome);
|
||||
}
|
||||
catch (Exception exception) { RuntimeDiagnostics.Write("AutoAnnotateViewFailed", "ERROR", commandName: "PXP-AAV", resultStatus: exception.Message, exception: exception, document: document); document.Editor.WriteMessage("\nPXP-AAV: " + exception.Message); }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
using Autodesk.AutoCAD.Runtime;
|
||||
|
||||
[assembly: CommandClass(typeof(PRecAnnot.Plant3D2026.EntryPoint))]
|
||||
@@ -0,0 +1,29 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed record CompositeAssemblyManifest(string Name, string Sha256, bool Required);
|
||||
internal sealed record CompositeManifest(int SchemaVersion, string Package, string Version, IReadOnlyList<string> Modules, IReadOnlyList<CompositeAssemblyManifest> Assemblies);
|
||||
|
||||
internal static class CompositeModuleManifest
|
||||
{
|
||||
public static CompositeManifest Validate()
|
||||
{
|
||||
var assemblyPath = typeof(EntryPoint).Assembly.Location;
|
||||
var path = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(assemblyPath)!, "..", "module-manifest.json"));
|
||||
if (!File.Exists(path)) throw new InvalidOperationException("COMPOSITE_MODULE_MANIFEST_MISSING");
|
||||
var manifest = JsonSerializer.Deserialize<CompositeManifest>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true }) ?? throw new InvalidOperationException("COMPOSITE_MODULE_MANIFEST_INVALID");
|
||||
// Schema 2 adds the package-wide file manifest while preserving the
|
||||
// required composite module/assembly contract consumed here.
|
||||
if (manifest.SchemaVersion is not (1 or 2) || !string.Equals(manifest.Package, "P_Rec_Annot", StringComparison.Ordinal) || manifest.Modules.Count == 0) throw new InvalidOperationException("COMPOSITE_MODULE_MANIFEST_INVALID");
|
||||
foreach (var item in manifest.Assemblies.Where(value => value.Required))
|
||||
{
|
||||
var file = Path.Combine(Path.GetDirectoryName(assemblyPath)!, item.Name);
|
||||
if (!File.Exists(file)) throw new InvalidOperationException($"COMPOSITE_MODULE_ASSEMBLY_MISSING:{item.Name}");
|
||||
var hash = Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(file))).ToLowerInvariant();
|
||||
if (!string.Equals(hash, item.Sha256, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException($"COMPOSITE_MODULE_HASH_MISMATCH:{item.Name}");
|
||||
}
|
||||
return manifest;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class ElevationAnnotationWriter
|
||||
{
|
||||
private const string ApplicationName = "PXP-AE";
|
||||
|
||||
public IReadOnlyList<ExistingElevationAnnotation> ReadExisting(Document document)
|
||||
{
|
||||
var result = new List<ExistingElevationAnnotation>();
|
||||
using var transaction = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForRead);
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not BlockReference reference) continue;
|
||||
var data = reference.GetXDataForApplication(ApplicationName)?.AsArray();
|
||||
if (data is null) continue;
|
||||
var strings = data.Where(x => x.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Select(x => x.Value?.ToString() ?? string.Empty).ToArray();
|
||||
var source = Value(strings, "SOURCE"); var text = Value(strings, "ANNOTATIONTEXT");
|
||||
if (source is null || text is null) continue;
|
||||
result.Add(new ExistingElevationAnnotation(reference.Handle.ToString(), source, text, new AnnotationPoint(reference.Position.X, reference.Position.Y, reference.Position.Z)));
|
||||
}
|
||||
return result.OrderBy(x => x.SourceStableId, StringComparer.Ordinal).ToArray();
|
||||
}
|
||||
|
||||
public ElevationApplyResult Apply(Document document, IReadOnlyList<ElevationAnnotationOperation> operations, ElevationAssets assets, bool manual = false)
|
||||
{
|
||||
using var documentLock = document.LockDocument();
|
||||
using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var layers = (LayerTable)transaction.GetObject(document.Database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(document.Database.TextStyleTableId, OpenMode.ForRead);
|
||||
if (!blocks.Has(assets.BlockName)) throw new InvalidOperationException("ELEVATION_BLOCK_MISSING:" + assets.BlockName);
|
||||
if (!layers.Has(assets.Layer)) throw new InvalidOperationException("ELEVATION_LAYER_MISSING:" + assets.Layer);
|
||||
if (!styles.Has(assets.TextStyle)) throw new InvalidOperationException("ELEVATION_TEXT_STYLE_MISSING:" + assets.TextStyle);
|
||||
EnsureRegApp(transaction, document.Database);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
var definition = (BlockTableRecord)transaction.GetObject(blocks[assets.BlockName], OpenMode.ForRead);
|
||||
var owned = paper.Cast<ObjectId>().Select(id => transaction.GetObject(id, OpenMode.ForRead)).OfType<BlockReference>()
|
||||
.Select(reference => (reference, source: Source(reference))).Where(x => x.source is not null)
|
||||
.GroupBy(x => x.source!, StringComparer.OrdinalIgnoreCase).ToDictionary(x => x.Key, x => x.ToArray(), StringComparer.OrdinalIgnoreCase);
|
||||
var created = 0; var updated = 0; var unchanged = 0;
|
||||
foreach (var operation in operations.Where(x => x.Kind is AnnotationOperationKind.Create or AnnotationOperationKind.Update))
|
||||
{
|
||||
if (operation.Text is null) continue;
|
||||
var matches = owned.GetValueOrDefault(operation.StableId, []);
|
||||
BlockReference reference;
|
||||
if (matches.Length == 0)
|
||||
{
|
||||
reference = new BlockReference(ToPoint(operation.Position), definition.ObjectId) { LayerId = layers[assets.Layer], Rotation = operation.Rotation };
|
||||
paper.AppendEntity(reference); transaction.AddNewlyCreatedDBObject(reference, true); created++;
|
||||
AddAttributes(transaction, definition, reference, operation.Text, styles[assets.TextStyle]);
|
||||
}
|
||||
else
|
||||
{
|
||||
reference = matches[0].reference; reference.UpgradeOpen();
|
||||
reference.Position = ToPoint(operation.Position); reference.Rotation = operation.Rotation; reference.LayerId = layers[assets.Layer]; updated++;
|
||||
foreach (ObjectId attributeId in reference.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(attributeId, OpenMode.ForWrite);
|
||||
attribute.TextString = operation.Text + (attribute.Tag.Contains('*') ? "*" : string.Empty); attribute.TextStyleId = styles[assets.TextStyle]; attribute.UpdateMTextAttribute();
|
||||
}
|
||||
}
|
||||
reference.XData = Ownership(operation.StableId, operation.Text, manual);
|
||||
ApplyLegacyDynamicProperties(reference);
|
||||
}
|
||||
unchanged += operations.Count(x => x.Kind == AnnotationOperationKind.Skip && x.Reasons.Contains("ALREADY_CURRENT"));
|
||||
transaction.Commit();
|
||||
return new(created, updated, unchanged);
|
||||
}
|
||||
|
||||
private static void AddAttributes(Transaction transaction, BlockTableRecord definition, BlockReference reference, string text, ObjectId style)
|
||||
{
|
||||
foreach (ObjectId id in definition)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not AttributeDefinition source || source.Constant) continue;
|
||||
using var attribute = new AttributeReference(); attribute.SetAttributeFromBlock(source, reference.BlockTransform);
|
||||
attribute.TextString = text + (attribute.Tag.Contains('*') ? "*" : string.Empty); attribute.TextStyleId = style;
|
||||
attribute.UpdateMTextAttribute(); reference.AttributeCollection.AppendAttribute(attribute); transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ApplyLegacyDynamicProperties(BlockReference reference)
|
||||
{
|
||||
if (!reference.IsDynamicBlock) return;
|
||||
foreach (DynamicBlockReferenceProperty property in reference.DynamicBlockReferencePropertyCollection)
|
||||
if (string.Equals(property.PropertyName, "V1", StringComparison.OrdinalIgnoreCase) && !property.ReadOnly) property.Value = "От объекта";
|
||||
}
|
||||
|
||||
private static string? Source(BlockReference reference)
|
||||
{
|
||||
var strings = reference.GetXDataForApplication(ApplicationName)?.AsArray().Where(x => x.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Select(x => x.Value?.ToString() ?? string.Empty).ToArray();
|
||||
return strings is null ? null : Value(strings, "SOURCE");
|
||||
}
|
||||
private static string? Value(string[] values, string key) { var index = Array.FindIndex(values, x => string.Equals(x, key, StringComparison.Ordinal)); return index >= 0 && index + 1 < values.Length ? values[index + 1] : null; }
|
||||
private static Point3d ToPoint(AnnotationPoint point) => new(point.X, point.Y, point.Z);
|
||||
private static ResultBuffer Ownership(string source, string text, bool manual) => new(new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName), new TypedValue((int)DxfCode.ExtendedDataAsciiString, "SOURCE"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, source), new TypedValue((int)DxfCode.ExtendedDataAsciiString, "ANNOTATIONTEXT"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, text), new TypedValue((int)DxfCode.ExtendedDataAsciiString, manual ? "MANUAL" : "AUTO"));
|
||||
private static void EnsureRegApp(Transaction transaction, Database database) { var table = (RegAppTable)transaction.GetObject(database.RegAppTableId, OpenMode.ForRead); if (table.Has(ApplicationName)) return; table.UpgradeOpen(); using var record = new RegAppTableRecord { Name = ApplicationName }; table.Add(record); transaction.AddNewlyCreatedDBObject(record, true); }
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
using System.Text.Json;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed record ElevationApplyPermit
|
||||
{
|
||||
public required bool AllowApply { get; init; }
|
||||
public required string FixtureMarkerPath { get; init; }
|
||||
}
|
||||
|
||||
internal static class ElevationApplyPermitReader
|
||||
{
|
||||
private const string Marker = "P_REC_ANNOT_TEST_FIXTURE=ELEVATION_APPLY";
|
||||
|
||||
public static ElevationApplyPermit ReadAndValidate(Document document)
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_ELEVATION_APPLY_PERMIT_PATH");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(path))
|
||||
throw new InvalidOperationException("ELEVATION_APPLY_PERMIT_REQUIRED");
|
||||
var permit = JsonSerializer.Deserialize<ElevationApplyPermit>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true })
|
||||
?? throw new InvalidOperationException("ELEVATION_APPLY_PERMIT_INVALID");
|
||||
if (!permit.AllowApply || !Path.IsPathFullyQualified(permit.FixtureMarkerPath) || !File.Exists(permit.FixtureMarkerPath) || !string.Equals(File.ReadAllText(permit.FixtureMarkerPath).Trim(), Marker, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("ELEVATION_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
var root = Path.GetDirectoryName(Path.GetFullPath(permit.FixtureMarkerPath))! + Path.DirectorySeparatorChar;
|
||||
if (!Path.GetFullPath(document.Name).StartsWith(root, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("ELEVATION_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
return permit;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.P3dProjectParts;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Core.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class ElevationCommands
|
||||
{
|
||||
public static void RunAutomatic() => Run("PXP-AE", manual: false);
|
||||
public static void RunManual() => Run("PXP-IE", manual: true);
|
||||
|
||||
private static void Run(string command, bool manual)
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
var assets = ElevationRuntimeConfiguration.Read();
|
||||
var datum = PromptDatum(document.Editor);
|
||||
if (datum is null) return;
|
||||
if (manual) RunManual(document, assets, datum.Value);
|
||||
else RunAutomatic(document, assets, datum.Value);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("ElevationCommandFailed", "ERROR", commandName: command, resultStatus: exception.Message, exception: exception, document: document);
|
||||
document.Editor.WriteMessage($"\n{command}: {exception.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private static void RunAutomatic(Document document, ElevationAssets assets, double datum)
|
||||
{
|
||||
var selected = SelectViewport(document.Editor);
|
||||
if (selected.Status != PromptStatus.OK) return;
|
||||
OrthoViewportInfo viewport;
|
||||
using (var transaction = document.Database.TransactionManager.StartOpenCloseTransaction())
|
||||
viewport = ResolveViewport(document, (Viewport)transaction.GetObject(selected.ObjectId, OpenMode.ForRead));
|
||||
var candidates = new PlantObjectReader().ReadObjects(viewport, CancellationToken.None)
|
||||
.Where(value => value.MembershipStatus == ViewMembershipStatus.Resolved && value.Geometry.PaperPosition is not null && value.Geometry.Elevation.HasValue)
|
||||
.Select(value => new ElevationCandidate(value.SnapshotId, value.Geometry.Elevation!.Value, datum,
|
||||
new AnnotationPoint(value.Geometry.PaperPosition!.Value.X, value.Geometry.PaperPosition.Value.Y), value.Geometry.Rotation ?? 0, assets.Layer, assets.TextStyle))
|
||||
.ToArray();
|
||||
var writer = new ElevationAnnotationWriter();
|
||||
var plan = new ElevationAnnotationPlanner().Build(candidates, writer.ReadExisting(document));
|
||||
WritePreview(document, "PXP-AE", plan);
|
||||
if (!IsApply()) return;
|
||||
ElevationApplyPermitReader.ReadAndValidate(document);
|
||||
var result = writer.Apply(document, plan.Operations, assets);
|
||||
WriteApply(document, "PXP-AE", result);
|
||||
}
|
||||
|
||||
private static void RunManual(Document document, ElevationAssets assets, double datum)
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
var point = document.Editor.GetPoint("\nУкажите положение высотной отметки: ");
|
||||
if (point.Status != PromptStatus.OK) return;
|
||||
Viewport? viewport = null;
|
||||
Point3d modelPoint = default;
|
||||
using (var transaction = document.Database.TransactionManager.StartOpenCloseTransaction())
|
||||
{
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForRead);
|
||||
viewport = paper.Cast<ObjectId>().Select(id => transaction.GetObject(id, OpenMode.ForRead)).OfType<Viewport>()
|
||||
.Where(value => value.Number > 1 && !value.PerspectiveOn && Contains(value, point.Value))
|
||||
.OrderBy(value => value.Number).FirstOrDefault();
|
||||
if (viewport is not null) modelPoint = point.Value.TransformBy(ModelToPaper(viewport).Inverse());
|
||||
}
|
||||
if (viewport is null) { document.Editor.WriteMessage("\nТочка должна находиться внутри ортографического видового экрана."); continue; }
|
||||
var stableId = $"manual:{viewport.Handle}:{point.Value.X:R}:{point.Value.Y:R}";
|
||||
var candidate = new ElevationCandidate(stableId, modelPoint.Z, datum, new AnnotationPoint(point.Value.X, point.Value.Y), 0, assets.Layer, assets.TextStyle);
|
||||
var plan = new ElevationAnnotationPlanner().Build([candidate], Array.Empty<ExistingElevationAnnotation>());
|
||||
WritePreview(document, "PXP-IE", plan);
|
||||
if (!IsApply()) return;
|
||||
ElevationApplyPermitReader.ReadAndValidate(document);
|
||||
var result = new ElevationAnnotationWriter().Apply(document, plan.Operations, assets, manual: true);
|
||||
WriteApply(document, "PXP-IE", result);
|
||||
// Legacy PXP-IE repeats until Escape; every committed iteration is
|
||||
// a native AutoCAD transaction and therefore participates in UNDO.
|
||||
}
|
||||
}
|
||||
|
||||
private static double? PromptDatum(Editor editor)
|
||||
{
|
||||
var options = new PromptDoubleOptions("\nСмещение нуля МСК (в мм) <0>: ") { AllowNone = true, DefaultValue = 0, UseDefaultValue = true };
|
||||
var result = editor.GetDouble(options);
|
||||
return result.Status == PromptStatus.OK ? result.Value : result.Status == PromptStatus.None ? 0 : null;
|
||||
}
|
||||
|
||||
private static PromptEntityResult SelectViewport(Editor editor)
|
||||
{
|
||||
var options = new PromptEntityOptions("\nВыберите видовой экран: "); options.SetRejectMessage("\nДолжен быть видовой экран."); options.AddAllowedClass(typeof(Viewport), true);
|
||||
return editor.GetEntity(options);
|
||||
}
|
||||
|
||||
private static OrthoViewportInfo ResolveViewport(Document document, Viewport selected)
|
||||
{
|
||||
var project = PlantApplication.ProjectPart("Ortho") as OrthoProject ?? throw new InvalidOperationException("ELEVATION_ORTHO_PROJECT_UNAVAILABLE");
|
||||
var matches = new PlantOrthoViewportReader(project, document.Name).ReadViewports(CancellationToken.None)
|
||||
.Where(value => Math.Abs(value.CenterX - selected.CenterPoint.X) < 0.001 && Math.Abs(value.CenterY - selected.CenterPoint.Y) < 0.001 && Math.Abs(value.Width - selected.Width) < 0.001 && Math.Abs(value.Height - selected.Height) < 0.001).ToArray();
|
||||
return matches.Length == 1 ? matches[0] : throw new InvalidOperationException(matches.Length == 0 ? "ELEVATION_ORTHO_VIEW_NOT_FOUND" : "ELEVATION_ORTHO_VIEW_AMBIGUOUS");
|
||||
}
|
||||
|
||||
private static Matrix3d ModelToPaper(Viewport viewport)
|
||||
{
|
||||
var center = new Point3d(viewport.ViewCenter.X, viewport.ViewCenter.Y, 0);
|
||||
return Matrix3d.Displacement(new Vector3d(viewport.CenterPoint.X - center.X, viewport.CenterPoint.Y - center.Y, 0))
|
||||
* Matrix3d.Scaling(viewport.CustomScale, center)
|
||||
* Matrix3d.Rotation(viewport.TwistAngle, Vector3d.ZAxis, Point3d.Origin)
|
||||
* Matrix3d.WorldToPlane(new Plane(viewport.ViewTarget, viewport.ViewDirection));
|
||||
}
|
||||
private static bool Contains(Viewport viewport, Point3d point) => viewport.GeometricExtents.MinPoint.X <= point.X && viewport.GeometricExtents.MaxPoint.X >= point.X && viewport.GeometricExtents.MinPoint.Y <= point.Y && viewport.GeometricExtents.MaxPoint.Y >= point.Y;
|
||||
private static bool IsApply() => string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase);
|
||||
private static void WritePreview(Document document, string command, ElevationAnnotationPlan plan) { document.Editor.WriteMessage($"\n{command} preview: create={plan.Operations.Count(x => x.Kind == AnnotationOperationKind.Create)}; update={plan.Operations.Count(x => x.Kind == AnnotationOperationKind.Update)}; skip={plan.Operations.Count(x => x.Kind == AnnotationOperationKind.Skip)}; conflict={plan.Operations.Count(x => x.Kind == AnnotationOperationKind.Conflict)}. DWG не изменён."); RuntimeDiagnostics.Write("ElevationPreviewCompleted", commandName: command, resultStatus: "PreviewCompleted", document: document, details: new Dictionary<string, object?> { ["OperationCount"] = plan.Operations.Count }); }
|
||||
private static void WriteApply(Document document, string command, ElevationApplyResult result) { document.Editor.WriteMessage($"\n{command} Apply: created={result.Created}; updated={result.Updated}; already-current={result.Unchanged}."); RuntimeDiagnostics.Write("ElevationApplyCompleted", commandName: command, resultStatus: "Applied", document: document, details: new Dictionary<string, object?> { ["Created"] = result.Created, ["Updated"] = result.Updated, ["AlreadyCurrent"] = result.Unchanged }); }
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class ElevationRuntimeConfiguration
|
||||
{
|
||||
public static ElevationAssets Read()
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_LINE_NUMBER_DRAWING_SETTINGS_PATH");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(path))
|
||||
throw new InvalidOperationException("ELEVATION_CONFIGURATION_REQUIRED:P_REC_ANNOT_LINE_NUMBER_DRAWING_SETTINGS_PATH");
|
||||
return new ElevationSettingsLoader().Load(File.ReadAllText(path));
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
using System.Diagnostics;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Runtime;
|
||||
using Autodesk.Windows;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
@@ -13,7 +15,13 @@ public sealed class EntryPoint : IExtensionApplication
|
||||
public void Initialize()
|
||||
{
|
||||
RuntimeDiagnostics.Write("AssemblyInitializeStarted");
|
||||
var manifest = CompositeModuleManifest.Validate();
|
||||
RuntimeDiagnostics.Write("CompositeModulesValidated", resultStatus: "Validated", details: new Dictionary<string, object?> { ["PackageVersion"] = manifest.Version, ["ModuleCount"] = manifest.Modules.Count });
|
||||
RibbonIntegration.Register();
|
||||
SwapAttributesContextMenu.Attach();
|
||||
ManualAnnotationPalette.Initialize();
|
||||
// Test automation is driven only by the explicitly generated /b script.
|
||||
// Initialize remains production-equivalent and must not orchestrate commands.
|
||||
RuntimeDiagnostics.Write("AssemblyInitializeCompleted");
|
||||
}
|
||||
|
||||
@@ -21,6 +29,8 @@ public sealed class EntryPoint : IExtensionApplication
|
||||
{
|
||||
RuntimeDiagnostics.Write("AssemblyTerminateStarted");
|
||||
RibbonIntegration.Terminate();
|
||||
SwapAttributesContextMenu.Detach();
|
||||
ManualAnnotationPalette.Terminate();
|
||||
RuntimeDiagnostics.Write("AssemblyTerminateCompleted");
|
||||
}
|
||||
|
||||
@@ -28,11 +38,109 @@ public sealed class EntryPoint : IExtensionApplication
|
||||
public void PrimaryCommand() => RunDiagnostic("PHP_REC_ANNOT");
|
||||
|
||||
[CommandMethod("PXP-AAV")]
|
||||
public void AutoAnnotateViewCommand() => RunDiagnostic("PXP-AAV");
|
||||
public void AutoAnnotateViewCommand() => PRecAnnot.Plant3D2026.AutoAnnotateViewCommand.Run();
|
||||
|
||||
[CommandMethod("PXP-OA")]
|
||||
public void OrthoAnnotateCommand() => RunDiagnostic("PXP-OA");
|
||||
|
||||
[CommandMethod("PXP-LN")] public void AnnotateLineNumbersCommand() => RunLineNumberPreview();
|
||||
[CommandMethod("PXP-ULN")] public void UpdateLineNumbersCommand() => LineNumberRefreshCommand.Run();
|
||||
[CommandMethod("PXP-ESN")] public void EditLineNumberStartCommand() => LineNumberEditCommands.Renumber();
|
||||
[CommandMethod("PXP-ELN")] public void EditLineNumbersCommand() => LineNumberEditCommands.EditText();
|
||||
[CommandMethod("PXP-RMP")] public void ResetMarkerPositionCommand() => LineNumberEditCommands.ResetMarkerPosition();
|
||||
[CommandMethod("PXP-ALC")] public void AutoLineNumberConnectionsCommand() => LineConnectionCommand.Run();
|
||||
[CommandMethod("PXP-AE")] public void AutoElevationCommand() => ElevationCommands.RunAutomatic();
|
||||
[CommandMethod("PXP-IE")] public void InsertElevationCommand() => ElevationCommands.RunManual();
|
||||
[CommandMethod("PXP-COV")] public void CheckOrthoViewportCommand() => OrthoMaintenanceCommands.CheckViewport();
|
||||
[CommandMethod("PXP-UOB")] public void UpdateOrthoViewBlocksCommand() => PRecAnnot.Plant3D2026.UpdateOrthoViewBlocksCommand.Run();
|
||||
[CommandMethod("PXP-RA", CommandFlags.Session)] public void RemoveOrthoAnnotationsCommand() => OrthoAnnotationRemovalCommand.Run();
|
||||
[CommandMethod("PXP-OSI", CommandFlags.Session)] public void ShowOrthoSourceInModelCommand() => OrthoSourceNavigationCommand.Run();
|
||||
[CommandMethod("PXP-DJ")] public void DimensionOrthoAnnotationsCommand() => OrthoDimensionCommand.Run();
|
||||
[CommandMethod("PXP-AC", CommandFlags.UsePickSet)] public void SwapAttributesCommand() => PRecAnnot.Plant3D2026.SwapAttributesCommand.Run();
|
||||
[CommandMethod("PXP-IOD", CommandFlags.Session)] public void UpdateOrthoDrawingsCommand() => PRecAnnot.Plant3D2026.UpdateOrthoDrawingsCommand.Run();
|
||||
[CommandMethod("mto-ma")] public void ShowManualAnnotationPaletteCommand() => ManualAnnotationPalette.Show();
|
||||
[CommandMethod("PXP-MA")] public void ShowManualAnnotationPaletteAliasCommand() => ManualAnnotationPalette.Show();
|
||||
[CommandMethod("CAC1")] public void PlaceManualAnnotationCommand() => ManualAnnotationEditCommand.Run();
|
||||
[CommandMethod("PXP-MAB")] public void InsertManualBlockCommand() => ManualBlockInsertionCommand.Run(ManualAnnotationPalette.CurrentState());
|
||||
[CommandMethod("CAC")] public void CreateManualAnnotationCommand() => ManualBlockInsertionCommand.Run(ManualAnnotationPalette.CurrentState());
|
||||
[CommandMethod("BJ")] public void ManualBlockJigCommand() => ManualBlockInsertionCommand.Run(ManualAnnotationPalette.CurrentState());
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_START", CommandFlags.Session)]
|
||||
public void AutomationStartCommand() => FirstLimitedApplyAutomationBootstrap.Arm();
|
||||
|
||||
// Test-only command-queue barrier. It deliberately performs no Plant or
|
||||
// drawing work; its CommandEnded event proves the activated document is
|
||||
// ready before the coordinator calls the Plant APIs.
|
||||
[CommandMethod("PHP_REC_AUTOMATION_READY")]
|
||||
public void AutomationReadyCommand() { }
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_PREPARE", CommandFlags.Session)]
|
||||
public void AutomationPrepareCommand() => ScriptDrivenFirstApplyAutomation.Prepare();
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_BEFORE_PXP_1", CommandFlags.Session)]
|
||||
public void AutomationBeforePxp1Command() => ScriptDrivenFirstApplyAutomation.RecordSentinel("BeforePxp1");
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_AFTER_PXP_1", CommandFlags.Session)]
|
||||
public void AutomationAfterPxp1Command() => ScriptDrivenFirstApplyAutomation.RecordSentinel("AfterPxp1");
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_BEFORE_PXP_2", CommandFlags.Session)]
|
||||
public void AutomationBeforePxp2Command() => ScriptDrivenFirstApplyAutomation.RecordSentinel("BeforePxp2");
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_AFTER_PXP_2", CommandFlags.Session)]
|
||||
public void AutomationAfterPxp2Command() => ScriptDrivenFirstApplyAutomation.RecordSentinel("AfterPxp2");
|
||||
|
||||
[CommandMethod("PHP_REC_AUTOMATION_FINALIZE", CommandFlags.Session)]
|
||||
public void AutomationFinalizeCommand() => ScriptDrivenFirstApplyAutomation.FinalizeAutomation();
|
||||
|
||||
private static void RunLineNumberPreview()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
var editor = document.Editor;
|
||||
try
|
||||
{
|
||||
var configuration = LineNumberRuntimeConfigurationReader.Read();
|
||||
var profileDefault = configuration.Annotations.Annotations.OrderBy(value => value.Nickname, StringComparer.Ordinal).First();
|
||||
var profilePrompt = new PromptStringOptions($"\nПрофиль номера линии <{profileDefault.Nickname}>: ") { AllowSpaces = false, DefaultValue = profileDefault.Nickname, UseDefaultValue = true };
|
||||
var profileInput = editor.GetString(profilePrompt);
|
||||
if (profileInput.Status != PromptStatus.OK) return;
|
||||
var profile = configuration.Annotations.Annotations.SingleOrDefault(value => string.Equals(value.Nickname, profileInput.StringResult, StringComparison.OrdinalIgnoreCase));
|
||||
if (profile is null) throw new InvalidOperationException("LINE_NUMBER_PROFILE_NOT_FOUND");
|
||||
|
||||
var selection = editor.GetEntity("\nВыберите компонент Plant 3D для аннотации номера линии: ");
|
||||
if (selection.Status != PromptStatus.OK) return;
|
||||
var piping = PlantApplication.ProjectPart("Piping")?.DataLinksManager ?? throw new InvalidOperationException("LINE_NUMBER_PIPING_DATALINKS_UNAVAILABLE");
|
||||
var candidate = new PlantLineNumberCandidateReader(piping).Read(selection.ObjectId, configuration.Assets.Marker.Layer, configuration.Assets.Marker.Texts[0].TextStyle);
|
||||
if (!candidate.Success) throw new InvalidOperationException(candidate.FailureCode);
|
||||
var preview = new LineNumberCommandPreviewService(
|
||||
new LineNumberCommandPlanner(new LineNumberAnnotationFormatter()),
|
||||
new LineNumberFieldResolver(new PlantDataLinksPropertyReader(piping)))
|
||||
.Preview(profile, [candidate.Candidate!], Array.Empty<ExistingLineNumberAnnotation>());
|
||||
if (!preview.Success) throw new InvalidOperationException(preview.FailureCode);
|
||||
var operations = string.Join(", ", preview.Plan!.Operations.Select(value => $"{value.Kind}:{value.Text}"));
|
||||
editor.WriteMessage($"\nPXP-LN preview: {operations}. DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("LineNumberPreviewCompleted", commandName: "PXP-LN", resultStatus: "PreviewCompleted", document: document, details: new Dictionary<string, object?> { ["OperationCount"] = preview.Apply.Count });
|
||||
if (ParseMode(RuntimeDiagnostics.RuntimeMode) != PRecAnnotExecutionMode.Apply) return;
|
||||
|
||||
var operation = preview.Apply.SingleOrDefault() ?? throw new InvalidOperationException("LINE_NUMBER_APPLY_REQUIRES_EXACTLY_ONE_OPERATION");
|
||||
var placement = editor.GetPoint("\nУкажите положение маркера номера линии: ");
|
||||
if (placement.Status != PromptStatus.OK) return;
|
||||
operation = operation with { Position = new AnnotationPoint(placement.Value.X, placement.Value.Y, placement.Value.Z) };
|
||||
var permit = LineNumberApplyPermitReader.Read();
|
||||
LineNumberApplyPermitReader.Validate(document, permit, operation);
|
||||
// AutoCAD wraps a command's committed transaction in its native
|
||||
// UNDO record. No compensating-delete path is used here.
|
||||
var result = new LineNumberAnnotationWriter().Apply(document, [operation], configuration.Assets);
|
||||
RuntimeDiagnostics.Write("LineNumberApplyCompleted", commandName: "PXP-LN", resultStatus: result.Created > 0 ? "Created" : result.Updated > 0 ? "Updated" : "AlreadyCurrent", document: document, details: new Dictionary<string, object?> { ["Created"] = result.Created, ["Updated"] = result.Updated, ["AlreadyCurrent"] = result.Unchanged });
|
||||
editor.WriteMessage($"\nPXP-LN Apply: created={result.Created}; updated={result.Updated}; already-current={result.Unchanged}.");
|
||||
}
|
||||
catch (System.Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("LineNumberPreviewFailed", "ERROR", commandName: "PXP-LN", resultStatus: exception.Message, exception: exception, document: document);
|
||||
WriteEditor(document, $"\nPXP-LN: {exception.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private static void RunDiagnostic(string commandName)
|
||||
{
|
||||
var operationId = Guid.NewGuid().ToString("N");
|
||||
@@ -43,9 +151,14 @@ public sealed class EntryPoint : IExtensionApplication
|
||||
{
|
||||
document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
var mode = ParseMode(RuntimeDiagnostics.RuntimeMode);
|
||||
if (mode == PRecAnnotExecutionMode.Apply) throw new InvalidOperationException("APPLY_MODE_NOT_IMPLEMENTED");
|
||||
|
||||
var context = new PlantRuntimeContextReader().ReadCurrentContext();
|
||||
// Script-driven commands can run while Plant's implicit current
|
||||
// document lags behind MDI activation. Bind the planner to the
|
||||
// command document captured above, which is also the observer's
|
||||
// fixture identity.
|
||||
var context = ScriptDrivenFirstApplyAutomation.TryGetPreparedContext(document, out var scriptContext)
|
||||
? scriptContext
|
||||
: new PlantRuntimeContextReader().ReadCurrentContext(document);
|
||||
var details = new Dictionary<string, object?>
|
||||
{
|
||||
["ExecutionMode"] = mode.ToString(),
|
||||
@@ -75,12 +188,45 @@ public sealed class EntryPoint : IExtensionApplication
|
||||
return;
|
||||
}
|
||||
|
||||
if (mode == PRecAnnotExecutionMode.Apply && !string.Equals(commandName, "PXP-OA", StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("APPLY_RULE_NOT_SUPPORTED");
|
||||
var hasLimitedApplyPermit = !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("P_REC_ANNOT_APPLY_PERMIT_PATH"));
|
||||
var applyPermit = (mode == PRecAnnotExecutionMode.Apply || hasLimitedApplyPermit) && document is not null
|
||||
? FirstLimitedApplyPermitReader.ReadFor(document)
|
||||
: null;
|
||||
var automationTarget = ScriptDrivenFirstApplyAutomation.SelectedTargetSnapshotId
|
||||
?? FirstLimitedApplyAutomationCoordinator.SelectedTargetSnapshotId;
|
||||
var limitedTarget = applyPermit?.TargetSnapshotId ?? automationTarget;
|
||||
if (mode == PRecAnnotExecutionMode.Apply && context.Viewports.Count != 1)
|
||||
throw new InvalidOperationException("APPLY_REQUIRES_EXACTLY_ONE_VIEWPORT");
|
||||
|
||||
var builder = new AnnotationPlanBuilder();
|
||||
var plans = new List<AnnotationPlan>();
|
||||
var objectsByViewport = new List<IReadOnlyList<PlantObjectSnapshot>>();
|
||||
foreach (var viewport in context.Viewports)
|
||||
{
|
||||
var objects = new PlantObjectReader().ReadObjects(viewport, CancellationToken.None);
|
||||
plans.Add(builder.Build(new AnnotationPlanningRequest { CommandName = commandName, Viewport = viewport, Objects = objects }));
|
||||
objectsByViewport.Add(objects);
|
||||
plans.Add(builder.Build(new AnnotationPlanningRequest
|
||||
{
|
||||
CommandName = commandName,
|
||||
Viewport = viewport,
|
||||
Objects = objects,
|
||||
LimitedApplyTargetSnapshotId = limitedTarget,
|
||||
LimitedApplyRuleId = limitedTarget is null ? null : FirstLimitedApplyPlanner.RuleId
|
||||
}));
|
||||
}
|
||||
|
||||
if (mode == PRecAnnotExecutionMode.DryRun &&
|
||||
string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_DIAGNOSTICS"), "FirstLimitedApply", StringComparison.Ordinal))
|
||||
{
|
||||
var candidates = objectsByViewport.SelectMany(x => x)
|
||||
.Where(x => string.Equals(x.ObjectClass, "Pipe", StringComparison.OrdinalIgnoreCase) && x.MembershipStatus == ViewMembershipStatus.Resolved && x.Geometry.PaperPosition is not null)
|
||||
.Select(x => x.SnapshotId)
|
||||
.OrderBy(x => x, StringComparer.Ordinal)
|
||||
.ToArray();
|
||||
WriteEditor(document, $"\nP_Rec_Annot Apply preview candidates: {string.Join(",", candidates)}");
|
||||
details["ApplyPreviewCandidateCount"] = candidates.Length;
|
||||
}
|
||||
|
||||
var summary = new
|
||||
@@ -94,20 +240,69 @@ public sealed class EntryPoint : IExtensionApplication
|
||||
WarningCount = plans.Sum(x => x.Summary.WarningCount),
|
||||
ErrorCount = plans.Sum(x => x.Summary.ErrorCount)
|
||||
};
|
||||
var membershipResolved = objectsByViewport.SelectMany(x => x).Count(x => x.MembershipStatus == ViewMembershipStatus.Resolved);
|
||||
var membershipPartial = objectsByViewport.SelectMany(x => x).Count(x => x.MembershipStatus == ViewMembershipStatus.PartiallyResolved);
|
||||
var membershipUnresolved = objectsByViewport.SelectMany(x => x).Count(x => x.MembershipStatus == ViewMembershipStatus.NotResolved);
|
||||
var membershipOutside = objectsByViewport.SelectMany(x => x).Count(x => x.MembershipStatus == ViewMembershipStatus.ObjectOutsideView);
|
||||
var orthoClassifications = objectsByViewport.SelectMany(x => x).OrderBy(x => x.SnapshotId, StringComparer.Ordinal)
|
||||
.Select(x => new OrthoAnnotationClassifier().Classify(x, new(true, true, true, true, true))).ToArray();
|
||||
var planId = plans.Count == 1 ? plans[0].PlanId : null;
|
||||
details["ObjectsExamined"] = summary.ObjectsExamined;
|
||||
details["PlanSchemaVersion"] = AnnotationPlanBuilder.CurrentPlanSchemaVersion;
|
||||
details["PlanId"] = planId;
|
||||
details["MembershipResolved"] = membershipResolved;
|
||||
details["MembershipPartial"] = membershipPartial;
|
||||
details["MembershipUnresolved"] = membershipUnresolved;
|
||||
details["MembershipOutsideView"] = membershipOutside;
|
||||
details["MultiLeaderCandidates"] = orthoClassifications.Count(x => x.Representation == OrthoAnnotationRepresentation.MultiLeader);
|
||||
details["BubbleCandidates"] = orthoClassifications.Count(x => x.Representation == OrthoAnnotationRepresentation.BubbleBlock);
|
||||
details["PlanCreateCount"] = summary.CreateCount;
|
||||
details["PlanUpdateCount"] = summary.UpdateCount;
|
||||
details["PlanSkipCount"] = summary.SkipCount;
|
||||
details["PlanConflictCount"] = summary.ConflictCount;
|
||||
details["PlanUnsupportedCount"] = summary.UnsupportedCount;
|
||||
details["ErrorCount"] = summary.ErrorCount;
|
||||
if (string.Equals(commandName, "PXP-OA", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var candidates = objectsByViewport.SelectMany(x => x)
|
||||
.Where(x => string.Equals(x.ObjectClass, "Pipe", StringComparison.OrdinalIgnoreCase) && x.MembershipStatus == ViewMembershipStatus.Resolved && x.Geometry.PaperPosition is not null)
|
||||
.Select(x => x.SnapshotId).OrderBy(x => x, StringComparer.Ordinal).ToArray();
|
||||
ScriptDrivenFirstApplyAutomation.RecordPxpOa(planId, candidates, context.Viewports.SingleOrDefault()?.Id, summary.CreateCount, summary.SkipCount, mode == PRecAnnotExecutionMode.Apply ? applyPermit is not null : null, summary.ObjectsExamined, membershipResolved);
|
||||
FirstLimitedApplyAutomationCoordinator.RecordPxpOa(planId, candidates, context.Viewports.SingleOrDefault()?.Id, summary.CreateCount, summary.SkipCount, mode == PRecAnnotExecutionMode.Apply ? applyPermit is not null : null);
|
||||
}
|
||||
if (mode == PRecAnnotExecutionMode.Apply)
|
||||
{
|
||||
var corePermit = new FirstLimitedApplyPermit
|
||||
{
|
||||
FixtureMarker = FirstLimitedApplyPlanner.FixtureMarker,
|
||||
AllowApply = applyPermit!.AllowApply,
|
||||
TargetSnapshotId = applyPermit.TargetSnapshotId,
|
||||
ExpectedPlanId = applyPermit.ExpectedPlanId
|
||||
};
|
||||
var preflight = new FirstLimitedApplyPlanner().Prepare(mode, plans.Single(), context.Viewports.Single(), objectsByViewport.Single(), corePermit);
|
||||
new RuntimeWriteGuard(mode).EnsureWriteAllowed(preflight.Operation.OperationId);
|
||||
RuntimeDiagnostics.Write("ApplyPreflightCompleted", operationId: operationId, commandName: commandName, resultStatus: "Accepted", document: document);
|
||||
RuntimeDiagnostics.Write("AnnotationTransactionStarted", operationId: operationId, commandName: commandName, document: document);
|
||||
var outcome = new FirstLimitedPipeAnnotationWriter().Write(document!, preflight.Operation, applyPermit.VisibilityState, applyPermit.AnnotationTemplateDwgPath);
|
||||
ScriptDrivenFirstApplyAutomation.RecordApplyOutcome(outcome);
|
||||
FirstLimitedApplyAutomationCoordinator.RecordApplyOutcome(outcome);
|
||||
details["ApplyOutcome"] = outcome.ToString();
|
||||
details["AnnotationsCreated"] = outcome == PipeAnnotationWriteOutcome.Created ? 1 : 0;
|
||||
details["AnnotationsSkipped"] = outcome == PipeAnnotationWriteOutcome.AlreadyExists ? 1 : 0;
|
||||
RuntimeDiagnostics.Write(outcome == PipeAnnotationWriteOutcome.Created ? "AnnotationCreated" : "AnnotationDuplicateDetected", operationId: operationId, commandName: commandName, resultStatus: outcome.ToString(), document: document);
|
||||
RuntimeDiagnostics.Write("AnnotationTransactionCommitted", operationId: operationId, commandName: commandName, resultStatus: outcome.ToString(), document: document);
|
||||
}
|
||||
RuntimeDiagnostics.Write("CommandPreflightCompleted", operationId: operationId, commandName: commandName, resultStatus: "DryRunCompleted", document: document, details: details);
|
||||
WriteEditor(document, $"\nP_Rec_Annot — диагностический план\nПроект: {context.ProjectDisplayName}\nТип чертежа: Ortho\nViewport: {context.Viewports.Count}\nОбъектов найдено: {summary.ObjectsExamined}\nБудет создано: {summary.CreateCount}\nБудет обновлено: {summary.UpdateCount}\nБудет пропущено: {summary.SkipCount}\nКонфликтов: {summary.ConflictCount}\nОшибок: {summary.ErrorCount}\nDWG не изменён.");
|
||||
WriteUsage(operationId, commandName, "DryRunCompleted", document, details, stopwatch.ElapsedMilliseconds);
|
||||
RuntimeDiagnostics.Write("CommandCompleted", operationId: operationId, commandName: commandName, resultStatus: "DryRunCompleted", document: document, details: details);
|
||||
WriteEditor(document, $"\nPlan schema: {AnnotationPlanBuilder.CurrentPlanSchemaVersion}; PlanId: {planId ?? "multiple"}; membership resolved/partial/outside/unresolved: {membershipResolved}/{membershipPartial}/{membershipOutside}/{membershipUnresolved}.");
|
||||
var completedStatus = mode == PRecAnnotExecutionMode.Apply ? "ApplyCompleted" : "DryRunCompleted";
|
||||
WriteUsage(operationId, commandName, completedStatus, document, details, stopwatch.ElapsedMilliseconds);
|
||||
RuntimeDiagnostics.Write("CommandCompleted", operationId: operationId, commandName: commandName, resultStatus: completedStatus, document: document, details: details);
|
||||
}
|
||||
catch (System.Exception exception)
|
||||
{
|
||||
if (string.Equals(commandName, "PXP-OA", StringComparison.OrdinalIgnoreCase) && string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase))
|
||||
ScriptDrivenFirstApplyAutomation.RecordApplyFailure(exception);
|
||||
RuntimeDiagnostics.Write("CommandFailed", "ERROR", operationId, commandName, exception.Message, exception, document);
|
||||
WriteUsage(operationId, commandName, exception.Message, document, null, stopwatch.ElapsedMilliseconds, exception);
|
||||
WriteEditor(document, $"\nP_Rec_Annot: безопасная диагностика завершилась ошибкой: {exception.Message}");
|
||||
@@ -180,12 +375,35 @@ internal static class RibbonIntegration
|
||||
if (tab is null) { tab = new RibbonTab { Id = TabId, Title = "Промхимпроект" }; ribbon.Tabs.Add(tab); }
|
||||
var panel = tab.Panels.FirstOrDefault(x => string.Equals(x.Source?.Id, PanelId, StringComparison.OrdinalIgnoreCase));
|
||||
if (panel is not null) { RuntimeDiagnostics.Write("RibbonAlreadyExists", resultStatus: "AlreadyExists"); RuntimeDiagnostics.Write("RibbonInitializationCompleted", resultStatus: "AlreadyExists"); return; }
|
||||
// Keep the existing legacy-compatible PHP_REC_ANNOT action and expose the
|
||||
// production command surface from the same composite panel.
|
||||
var source = new RibbonPanelSource { Id = PanelId, Title = "Аннотации" };
|
||||
source.Items.Add(new RibbonButton { Id = ButtonId, Text = "Аннотировать", ShowText = true, CommandParameter = "PHP_REC_ANNOT " });
|
||||
AddButton(source, "LineNumber", "Line number", "PXP-LN");
|
||||
AddButton(source, "LineConnections", "Line connections", "PXP-ALC");
|
||||
AddButton(source, "AutoElevation", "Auto elevation", "PXP-AE");
|
||||
AddButton(source, "InsertElevation", "Insert elevation", "PXP-IE");
|
||||
AddButton(source, "OrthoAnnotate", "Ortho annotate", "PXP-OA");
|
||||
AddButton(source, "AnnotateView", "Annotate view", "PXP-AAV");
|
||||
AddButton(source, "ShowOrthoSource", "Show source in model", "PXP-OSI");
|
||||
AddButton(source, "RemoveOrthoAnnotations", "Remove Ortho annotations", "PXP-RA");
|
||||
AddButton(source, "DimensionOrthoAnnotations", "Dimension Ortho annotations", "PXP-DJ");
|
||||
AddButton(source, "UpdateOrthoViewBlocks", "Update Ortho view blocks", "PXP-UOB");
|
||||
AddButton(source, "UpdateOrthoDrawings", "Update Ortho drawings", "PXP-IOD");
|
||||
AddButton(source, "SwapAttributes", "Swap attributes", "PXP-AC");
|
||||
AddButton(source, "CreateManualAnnotation", "Create manual annotation", "CAC");
|
||||
AddButton(source, "ManualBlockJig", "Manual block jig", "BJ");
|
||||
AddButton(source, "ManualPalette", "Manual annotations", "mto-ma");
|
||||
tab.Panels.Add(new RibbonPanel { Source = source });
|
||||
RuntimeDiagnostics.Write("RibbonInitializationCompleted", resultStatus: "Created");
|
||||
}
|
||||
|
||||
private static void AddButton(RibbonPanelSource? source, string suffix, string text, string command)
|
||||
{
|
||||
if (source is null) return;
|
||||
source.Items.Add(new RibbonButton { Id = $"{PanelId}.{suffix}", Text = text, ShowText = true, CommandParameter = command + " " });
|
||||
}
|
||||
|
||||
public static void Terminate()
|
||||
{
|
||||
if (!deferred) return;
|
||||
|
||||
@@ -0,0 +1,504 @@
|
||||
using System.Text.Json;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Runtime;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.ProjectManager;
|
||||
using PRecAnnot.Abstractions;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Test-only coordinator. It is not registered in Ribbon and is inert unless
|
||||
// the explicit NextPilot automation environment and local marker are present.
|
||||
internal sealed record FirstApplyAutomationConfiguration
|
||||
{
|
||||
public required string Phase { get; init; }
|
||||
public string? TargetCommand { get; init; }
|
||||
public string? OrthoDrawingPath { get; init; }
|
||||
public string? ModelDrawingPath { get; init; }
|
||||
public required string EvidencePath { get; init; }
|
||||
public required string FixtureMarkerPath { get; init; }
|
||||
}
|
||||
|
||||
internal sealed record AutomationEntityCounts(int Total, int PipeBlocks, int PxpOaXdata, int Owned);
|
||||
internal sealed record PxpOaDiscoveryEvidence(bool Found, string? GlobalName, string? GroupName, string? Flags, string? DeclaringType, string? DeclaringAssembly, string? AssemblyLocation, string? AssemblySha256, bool AssemblyLoaded, bool CommandClassIncluded, bool BundleHashMatched, int DeclarationCount);
|
||||
internal sealed record AutomationSentinelEvidence(string Stage, string? DocumentIdentity, string? DatabaseIdentity, DateTimeOffset TimestampUtc);
|
||||
internal sealed record AutomationCommandCorrelationEvidence(string EventKind, string RawCommandName, string NormalizedCommandName, bool CommandNameMatched, bool PreparedStateMatched, bool DocumentMatched, bool DatabaseMatched, bool FixturePathMatched, bool SequenceAccepted, string? RejectionReason, string? SenderType, string? SenderDocumentPath, string? ExpectedDocumentPath, string? ActiveDocumentPath, int RunCount, DateTimeOffset TimestampUtc);
|
||||
|
||||
internal static class FirstLimitedApplyAutomationBootstrap
|
||||
{
|
||||
private enum BootstrapState { Created, Prepared, Armed, Starting, Completed }
|
||||
private static BootstrapState state;
|
||||
private static bool observedIdle;
|
||||
private static int idleCallbackCount;
|
||||
private static int coordinatorStartCount;
|
||||
|
||||
internal static int IdleCallbackCount => idleCallbackCount;
|
||||
internal static int CoordinatorStartCount => coordinatorStartCount;
|
||||
|
||||
// Called from Initialize: BCL gates and one lightweight subscription only.
|
||||
internal static void Prepare()
|
||||
{
|
||||
if (state != BootstrapState.Created) return;
|
||||
state = BootstrapState.Prepared;
|
||||
AcadApplication.Idle += OnIdle;
|
||||
RuntimeDiagnostics.Write("AutomationBootstrapSubscribed", resultStatus: "Prepared");
|
||||
}
|
||||
|
||||
// Public test command is intentionally side-effect free with respect to Plant APIs.
|
||||
internal static void Arm()
|
||||
{
|
||||
if (state is BootstrapState.Prepared)
|
||||
{
|
||||
// The command itself is the post-NETLOAD barrier. The next Idle
|
||||
// callback, not this command callback, is allowed to start work.
|
||||
observedIdle = true;
|
||||
state = BootstrapState.Armed;
|
||||
}
|
||||
}
|
||||
|
||||
private static void OnIdle(object? sender, EventArgs args)
|
||||
{
|
||||
try
|
||||
{
|
||||
idleCallbackCount++;
|
||||
RuntimeDiagnostics.Write("AutomationBootstrapIdle", resultStatus: state.ToString());
|
||||
// The script engine can consume the custom command after NETLOAD. The
|
||||
// first idle is therefore the explicit post-NETLOAD arming point.
|
||||
if (state == BootstrapState.Prepared) { observedIdle = true; state = BootstrapState.Armed; }
|
||||
if (!observedIdle || state != BootstrapState.Armed) return;
|
||||
state = BootstrapState.Starting;
|
||||
AcadApplication.Idle -= OnIdle;
|
||||
coordinatorStartCount++;
|
||||
RuntimeDiagnostics.Write("AutomationCoordinatorStarting", resultStatus: "FirstPostStartupIdle");
|
||||
new FirstLimitedApplyAutomationCoordinator().Start();
|
||||
}
|
||||
catch (System.Exception exception)
|
||||
{
|
||||
state = BootstrapState.Completed;
|
||||
AcadApplication.Idle -= OnIdle;
|
||||
FirstLimitedApplyAutomationCoordinator.WriteBootstrapFailure(exception);
|
||||
}
|
||||
}
|
||||
}
|
||||
internal sealed record FirstApplyAutomationEvidence
|
||||
{
|
||||
public int SchemaVersion { get; init; } = 1;
|
||||
public required string Phase { get; init; }
|
||||
public string? TargetCommand { get; init; }
|
||||
public bool Completed { get; init; }
|
||||
public bool? Prepared { get; init; }
|
||||
public bool? FunctionalEvidenceCompleted { get; init; }
|
||||
public string? ErrorCode { get; init; }
|
||||
public int? DbmodBefore { get; init; }
|
||||
public int? DbmodAfterCommand1 { get; init; }
|
||||
public int? DbmodAfterCommand2 { get; init; }
|
||||
public int? DbmodAfterUndo { get; init; }
|
||||
public AutomationEntityCounts? Baseline { get; init; }
|
||||
public AutomationEntityCounts? AfterCommand1 { get; init; }
|
||||
public AutomationEntityCounts? AfterCommand2 { get; init; }
|
||||
public AutomationEntityCounts? AfterUndo { get; init; }
|
||||
public IReadOnlyList<string> CompletedCommands { get; init; } = Array.Empty<string>();
|
||||
public string? PlanIdRun1 { get; init; }
|
||||
public string? PlanIdRun2 { get; init; }
|
||||
public bool? PlanIdsEqual { get; init; }
|
||||
public int? EligibleCandidateCount { get; init; }
|
||||
public string? SelectedCandidateHash { get; init; }
|
||||
public string? ViewHash { get; init; }
|
||||
public int? CreateRun1 { get; init; }
|
||||
public int? CreateRun2 { get; init; }
|
||||
public int? SkipRun2 { get; init; }
|
||||
public string? ApplyOutcomeRun1 { get; init; }
|
||||
public string? ApplyOutcomeRun2 { get; init; }
|
||||
public bool? PermitAccepted { get; init; }
|
||||
public bool? CommandsCompleted { get; init; }
|
||||
public bool? InspectorsCompleted { get; init; }
|
||||
public bool? EvidenceFlushed { get; init; }
|
||||
public bool? ExitAttemptQueued { get; init; }
|
||||
public bool? QuitCommandWillStart { get; init; }
|
||||
public bool? QuitCommandEnded { get; init; }
|
||||
public string? ExitFailureCode { get; init; }
|
||||
public int? IdleCallbackCount { get; init; }
|
||||
public int? CoordinatorStartCount { get; init; }
|
||||
// Local test evidence only. This is intentionally never copied into Git
|
||||
// evidence because exception stacks may contain machine-specific paths.
|
||||
public string? ExceptionText { get; init; }
|
||||
public string? PreviousState { get; init; }
|
||||
public string? CurrentState { get; init; }
|
||||
public IReadOnlyList<string> StateTransitions { get; init; } = Array.Empty<string>();
|
||||
public PxpOaDiscoveryEvidence? PxpOaDiscovery { get; init; }
|
||||
public IReadOnlyList<AutomationSentinelEvidence> Sentinels { get; init; } = Array.Empty<AutomationSentinelEvidence>();
|
||||
public IReadOnlyList<string> CommandEvents { get; init; } = Array.Empty<string>();
|
||||
public IReadOnlyList<AutomationCommandCorrelationEvidence> CommandCorrelations { get; init; } = Array.Empty<AutomationCommandCorrelationEvidence>();
|
||||
}
|
||||
|
||||
internal sealed class FirstLimitedApplyAutomationCoordinator
|
||||
{
|
||||
private enum CoordinatorState { Created, Starting, Running, Completed, Failed, ExitQueued }
|
||||
private sealed record PxpResult(string? PlanId, IReadOnlyList<string> Candidates, string? View, int Create, int Skip, bool? PermitAccepted, string? ApplyOutcome);
|
||||
private static string? selectedTargetSnapshotId;
|
||||
private static readonly List<PxpResult> pxpResults = [];
|
||||
internal static string? SelectedTargetSnapshotId => selectedTargetSnapshotId;
|
||||
internal static void WriteBootstrapFailure(System.Exception exception) =>
|
||||
RuntimeDiagnostics.Write("AutomationBootstrapFailed", "ERROR", resultStatus: "AUTOMATION_BOOTSTRAP_FAILED", exception: exception);
|
||||
internal static void RecordPxpOa(string? planId, IReadOnlyList<string> candidates, string? view, int create, int skip, bool? permitAccepted)
|
||||
{
|
||||
if (string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_AUTOMATION"), "FirstLimitedApplyRuntimeTest", StringComparison.Ordinal))
|
||||
pxpResults.Add(new(planId, candidates, view, create, skip, permitAccepted, null));
|
||||
}
|
||||
internal static void RecordApplyOutcome(PipeAnnotationWriteOutcome outcome)
|
||||
{
|
||||
if (!string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_AUTOMATION"), "FirstLimitedApplyRuntimeTest", StringComparison.Ordinal) || pxpResults.Count == 0) return;
|
||||
var last = pxpResults[^1];
|
||||
pxpResults[^1] = last with { ApplyOutcome = outcome.ToString() };
|
||||
}
|
||||
private FirstApplyAutomationConfiguration? config;
|
||||
private Document? document;
|
||||
private readonly List<Document> automationOpenedDocuments = [];
|
||||
private readonly List<string> completed = [];
|
||||
private int step;
|
||||
private int? before, after1, after2, afterUndo;
|
||||
private AutomationEntityCounts? baseline, counts1, counts2, countsUndo;
|
||||
private readonly List<string> transitions = ["Created"];
|
||||
private CoordinatorState state = CoordinatorState.Created;
|
||||
private CoordinatorState previousState = CoordinatorState.Created;
|
||||
private bool documentHandlersSubscribed;
|
||||
private bool lifecycleHandlersSubscribed;
|
||||
private bool fixtureDocumentActivated;
|
||||
private bool projectActivationStarted;
|
||||
private bool exitQueued;
|
||||
private bool exitHandlerSubscribed;
|
||||
private string? exceptionText;
|
||||
private bool functionalCompleted;
|
||||
private bool evidenceFlushed;
|
||||
private bool exitAttemptQueued;
|
||||
private string? exitFailureCode;
|
||||
|
||||
public void Start()
|
||||
{
|
||||
try
|
||||
{
|
||||
Transition(CoordinatorState.Starting, "PostStartupReady");
|
||||
config = ReadConfiguration();
|
||||
if (string.Equals(config.Phase, "LifecycleProbe", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
CompleteLifecycleProbe();
|
||||
return;
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(config.OrthoDrawingPath)) throw new InvalidOperationException("AUTOMATION_ORTHO_PATH_REQUIRED");
|
||||
// A first startup Idle is sufficient to arm automation, but not to
|
||||
// call Plant APIs. Establish an AutoCAD document first and wait for
|
||||
// its activation plus a quiescent callback before project activation.
|
||||
AcadApplication.DocumentManager.DocumentActivated += OnDocumentActivated;
|
||||
AcadApplication.Idle += OnIdle;
|
||||
lifecycleHandlersSubscribed = true;
|
||||
if (!string.IsNullOrWhiteSpace(config.ModelDrawingPath)) automationOpenedDocuments.Add(AcadApplication.DocumentManager.Open(config.ModelDrawingPath, false));
|
||||
transitions.Add("DocumentOpenStarted");
|
||||
RuntimeDiagnostics.Write("AutomationBeforeDocumentOpen", resultStatus: "PostStartupReady");
|
||||
document = AcadApplication.DocumentManager.Open(config.OrthoDrawingPath, false);
|
||||
automationOpenedDocuments.Add(document);
|
||||
AcadApplication.DocumentManager.MdiActiveDocument = document;
|
||||
transitions.Add("DocumentOpened");
|
||||
RuntimeDiagnostics.Write("AutomationAfterDocumentOpen", resultStatus: "WaitingForDocumentActivation", document: document);
|
||||
document.CommandEnded += OnCommandEnded;
|
||||
document.CommandFailed += OnCommandFailed;
|
||||
document.CommandCancelled += OnCommandCancelled;
|
||||
documentHandlersSubscribed = true;
|
||||
Transition(CoordinatorState.Running, "AutomationRunning");
|
||||
// DocumentActivated can be raised synchronously by Open before the
|
||||
// coordinator receives the returned Document. Confirm the current
|
||||
// active document after assignment so that one missed event cannot
|
||||
// strand the workflow waiting for another startup Idle.
|
||||
// Open was requested for this exact local fixture and it has just
|
||||
// been made MDI-active. Queue a no-op public command regardless of
|
||||
// wrapper identity/name normalisation; CommandEnded is the actual
|
||||
// readiness proof before any Plant API is used.
|
||||
fixtureDocumentActivated = true;
|
||||
transitions.Add("FixtureDocumentActiveAfterOpen");
|
||||
QueueReadinessBarrier();
|
||||
}
|
||||
catch (System.Exception ex) { FailFromCallback("Start", ex, "AUTOMATION_START_FAILED"); }
|
||||
}
|
||||
|
||||
private void CompleteLifecycleProbe()
|
||||
{
|
||||
transitions.Add("LifecycleProbeCompleted");
|
||||
WriteEvidence(true, null);
|
||||
// LifecycleProbe is already running from the first verified Idle callback.
|
||||
// Do not wait for a second Idle: a startup-script host is permitted not to
|
||||
// raise one, which otherwise leaves acad.exe responsive but stranded.
|
||||
RequestControlledExit(idleSafe: true);
|
||||
}
|
||||
|
||||
private void OnIdle(object? sender, EventArgs e) => RunCallback("Idle", TryActivateProjectAndVerifyContext);
|
||||
private void OnDocumentActivated(object sender, DocumentCollectionEventArgs e)
|
||||
{
|
||||
RunCallback("DocumentActivated", () =>
|
||||
{
|
||||
if (document is null || e.Document is null) return;
|
||||
if (!string.Equals(e.Document.Name, document.Name, StringComparison.OrdinalIgnoreCase)) return;
|
||||
fixtureDocumentActivated = true;
|
||||
transitions.Add("FixtureDocumentActivated");
|
||||
TryActivateProjectAndVerifyContext();
|
||||
});
|
||||
}
|
||||
private void TryActivateProjectAndVerifyContext()
|
||||
{
|
||||
if (IsTerminal || document is null || !fixtureDocumentActivated || projectActivationStarted) return;
|
||||
if (!AcadApplication.IsQuiescent) return;
|
||||
projectActivationStarted = true;
|
||||
AcadApplication.Idle -= OnIdle;
|
||||
AcadApplication.DocumentManager.DocumentActivated -= OnDocumentActivated;
|
||||
lifecycleHandlersSubscribed = false;
|
||||
try
|
||||
{
|
||||
transitions.Add("ProjectActivationStarted");
|
||||
RuntimeDiagnostics.Write("AutomationBeforeProjectActivation", resultStatus: "DocumentActivatedAndQuiescent", document: document);
|
||||
var projectXml = Path.Combine(Path.GetDirectoryName(config!.FixtureMarkerPath)!, "Project.xml");
|
||||
var project = PlantProject.LoadProject(projectXml, false, string.Empty, string.Empty);
|
||||
PlantApplication.SetCurrentProject(project, true);
|
||||
transitions.Add("ProjectActivated");
|
||||
RuntimeDiagnostics.Write("AutomationAfterProjectActivation", resultStatus: "ProjectAvailable", document: document);
|
||||
transitions.Add("ContextVerificationStarted");
|
||||
var context = new PlantRuntimeContextReader().ReadCurrentContext(document);
|
||||
if (!context.HasPlantProject || !context.IsOrthoDrawing || context.Viewports.Count != 1) { Complete(false, $"AUTOMATION_ORTHO_CONTEXT_INVALID:P={context.HasPlantProject};O={context.IsOrthoDrawing};V={context.Viewports.Count}"); return; }
|
||||
var candidates = new PlantObjectReader().ReadObjects(context.Viewports.Single(), CancellationToken.None)
|
||||
.Where(x => string.Equals(x.ObjectClass, "Pipe", StringComparison.OrdinalIgnoreCase) && x.MembershipStatus == ViewMembershipStatus.Resolved && x.Geometry.PaperPosition is not null)
|
||||
.Select(x => x.SnapshotId).OrderBy(x => x, StringComparer.Ordinal).ToArray();
|
||||
if (candidates.Length == 0) { Complete(false, "AUTOMATION_NO_ELIGIBLE_CANDIDATE"); return; }
|
||||
selectedTargetSnapshotId = candidates[0];
|
||||
transitions.Add("ContextVerified");
|
||||
before = Dbmod(); baseline = Counts();
|
||||
Queue("PXP-OA");
|
||||
}
|
||||
catch (System.Exception ex) { FailFromCallback("ContextVerification", ex, "AUTOMATION_CONTEXT_FAILED"); }
|
||||
}
|
||||
|
||||
private void Queue(string command) => _ = DispatchCommandAsync(command, false);
|
||||
private void QueueReadinessBarrier()
|
||||
{
|
||||
_ = DispatchCommandAsync("PHP_REC_AUTOMATION_READY", true);
|
||||
}
|
||||
private async Task DispatchCommandAsync(string command, bool readiness)
|
||||
{
|
||||
if (IsTerminal || document is null) return;
|
||||
var expected = document;
|
||||
transitions.Add(readiness ? "ReadinessCommandDispatchRequested" : "CommandDispatchRequested:" + command);
|
||||
try
|
||||
{
|
||||
await AcadApplication.DocumentManager.ExecuteInCommandContextAsync(async _ =>
|
||||
{
|
||||
transitions.Add("CommandContextEntered:" + command);
|
||||
var active = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (active is null || !string.Equals(active.Name, expected.Name, StringComparison.OrdinalIgnoreCase))
|
||||
throw new InvalidOperationException("AUTOMATION_COMMAND_DOCUMENT_NOT_ACTIVE");
|
||||
transitions.Add(readiness ? "ReadinessBarrierQueued" : "CommandQueued:" + command);
|
||||
await active.Editor.CommandAsync(command);
|
||||
transitions.Add("CommandInvocationReturned:" + command);
|
||||
}, null);
|
||||
}
|
||||
catch (System.Exception exception) { FailFromCallback("CommandDispatcher", exception, "AUTOMATION_COMMAND_CONTEXT_FAILED"); }
|
||||
}
|
||||
private void OnCommandEnded(object sender, CommandEventArgs e)
|
||||
{
|
||||
RunCallback("CommandEnded", () =>
|
||||
{
|
||||
var name = e.GlobalCommandName?.Trim().TrimStart('.', '_').ToUpperInvariant();
|
||||
if (name == "PHP_REC_AUTOMATION_READY")
|
||||
{
|
||||
transitions.Add("ReadinessBarrierCompleted");
|
||||
TryActivateProjectAndVerifyContext();
|
||||
return;
|
||||
}
|
||||
if (name is not ("PXP-OA" or "UNDO" or "U")) return;
|
||||
completed.Add(name);
|
||||
transitions.Add("CommandCompleted:" + name);
|
||||
if (step++ == 0) { after1 = Dbmod(); counts1 = Counts(); Queue("PXP-OA"); return; }
|
||||
if (step == 2 && string.Equals(config?.Phase, "Apply", StringComparison.OrdinalIgnoreCase)) { after2 = Dbmod(); counts2 = Counts(); Queue("_.UNDO _1"); return; }
|
||||
if (string.Equals(config?.Phase, "Apply", StringComparison.OrdinalIgnoreCase)) { afterUndo = Dbmod(); countsUndo = Counts(); Complete(true, null, safeToExitNow: true); }
|
||||
else { after2 = Dbmod(); counts2 = Counts(); Complete(true, null, safeToExitNow: true); }
|
||||
});
|
||||
}
|
||||
private void OnCommandFailed(object sender, CommandEventArgs e) => RunCallback("CommandFailed", () => Complete(false, "AUTOMATION_COMMAND_FAILED:" + e.GlobalCommandName));
|
||||
private void OnCommandCancelled(object sender, CommandEventArgs e) => RunCallback("CommandCancelled", () => Complete(false, "AUTOMATION_COMMAND_CANCELLED:" + e.GlobalCommandName));
|
||||
|
||||
private int Dbmod() => Convert.ToInt32(AcadApplication.GetSystemVariable("DBMOD"));
|
||||
private AutomationEntityCounts Counts()
|
||||
{
|
||||
if (document is null) throw new InvalidOperationException("AUTOMATION_DOCUMENT_UNAVAILABLE");
|
||||
using var tx = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
var table = (BlockTable)tx.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)tx.GetObject(table[BlockTableRecord.PaperSpace], OpenMode.ForRead);
|
||||
var total = 0; var pipes = 0; var xdata = 0; var owned = 0;
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
total++;
|
||||
if (tx.GetObject(id, OpenMode.ForRead) is BlockReference block && string.Equals(block.Name, "PIPE", StringComparison.OrdinalIgnoreCase)) pipes++;
|
||||
if (tx.GetObject(id, OpenMode.ForRead) is Entity entity)
|
||||
{
|
||||
using var data = entity.GetXDataForApplication("PXP-OA");
|
||||
if (data is not null) { xdata++; if (data.AsArray().Any(x => x.TypeCode == 1000)) owned++; }
|
||||
}
|
||||
}
|
||||
return new(total, pipes, xdata, owned);
|
||||
}
|
||||
private FirstApplyAutomationConfiguration ReadConfiguration()
|
||||
{
|
||||
if (!string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_AUTOMATION"), "FirstLimitedApplyRuntimeTest", StringComparison.Ordinal)) throw new InvalidOperationException("AUTOMATION_DISABLED");
|
||||
if (!string.Equals(RuntimeDiagnostics.RuntimeMode, "DryRun", StringComparison.OrdinalIgnoreCase) && !string.Equals(RuntimeDiagnostics.RuntimeMode, "Apply", StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("AUTOMATION_MODE_BLOCKED");
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_AUTOMATION_CONFIG");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal)) throw new InvalidOperationException("AUTOMATION_CONFIGURATION_REQUIRED");
|
||||
var loaded = JsonSerializer.Deserialize<FirstApplyAutomationConfiguration>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true }) ?? throw new InvalidOperationException("AUTOMATION_CONFIGURATION_INVALID");
|
||||
if (!File.Exists(loaded.FixtureMarkerPath) || !string.Equals(File.ReadAllText(loaded.FixtureMarkerPath).Trim(), "P_REC_ANNOT_TEST_FIXTURE=FIRST_LIMITED_APPLY", StringComparison.Ordinal)) throw new InvalidOperationException("AUTOMATION_FIXTURE_MARKER_INVALID");
|
||||
if (!string.Equals(loaded.Phase, "LifecycleProbe", StringComparison.OrdinalIgnoreCase) &&
|
||||
(string.IsNullOrWhiteSpace(loaded.OrthoDrawingPath) || !Path.GetFullPath(loaded.OrthoDrawingPath).StartsWith(Path.GetDirectoryName(Path.GetFullPath(loaded.FixtureMarkerPath))! + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)))
|
||||
throw new InvalidOperationException("AUTOMATION_FIXTURE_OUTSIDE_MARKER_ROOT");
|
||||
return loaded;
|
||||
}
|
||||
private void Complete(bool success, string? error, bool safeToExitNow = false)
|
||||
{
|
||||
if (IsTerminal) return;
|
||||
functionalCompleted = success;
|
||||
Transition(success ? CoordinatorState.Completed : CoordinatorState.Failed, success ? "Completed" : "Failed");
|
||||
UnsubscribeHandlers();
|
||||
TryWriteEvidence(success, error);
|
||||
selectedTargetSnapshotId = null;
|
||||
pxpResults.Clear();
|
||||
RequestControlledExit(safeToExitNow);
|
||||
}
|
||||
|
||||
// The managed Application.Quit call can leave a startup-script host alive
|
||||
// when it is invoked from a CommandEnded callback. Queue AutoCAD's native
|
||||
// QUIT command instead; the command processor runs it after the current
|
||||
// public PXP-OA command has fully returned and discards every open drawing.
|
||||
private void RequestControlledExit(bool idleSafe = false)
|
||||
{
|
||||
if (exitQueued) return;
|
||||
exitQueued = true;
|
||||
Transition(CoordinatorState.ExitQueued, "ExitQueued");
|
||||
if (idleSafe)
|
||||
{
|
||||
DispatchNativeQuit();
|
||||
return;
|
||||
}
|
||||
AcadApplication.Idle += OnExitIdle;
|
||||
exitHandlerSubscribed = true;
|
||||
}
|
||||
|
||||
private void OnExitIdle(object? sender, EventArgs args)
|
||||
{
|
||||
RunCallback("ControlledExitIdle", DispatchNativeQuit);
|
||||
}
|
||||
|
||||
private void DispatchNativeQuit()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (exitHandlerSubscribed) AcadApplication.Idle -= OnExitIdle;
|
||||
exitHandlerSubscribed = false;
|
||||
exitAttemptQueued = true;
|
||||
if (!AcadApplication.IsQuiescent)
|
||||
{
|
||||
transitions.Add("QuitDispatchDeferredNotQuiescent");
|
||||
TryWriteEvidence(functionalCompleted, null);
|
||||
return;
|
||||
}
|
||||
// LifecycleProbe opens no fixture document, but the real startup
|
||||
// document is available at this point (observed as Drawing1.dwg).
|
||||
// Use that live document only to queue native QUIT; never retain it
|
||||
// past this callback or use it for fixture/Plant work.
|
||||
var exitDocument = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (exitDocument is null)
|
||||
{
|
||||
exitFailureCode = "AUTOMATION_EXIT_DOCUMENT_UNAVAILABLE";
|
||||
transitions.Add("QuitDispatchSkippedNoLiveDocument");
|
||||
TryWriteEvidence(functionalCompleted, null);
|
||||
return;
|
||||
}
|
||||
transitions.Add("QuitDispatchAttempted");
|
||||
// Persist the exit boundary before handing control back to AutoCAD;
|
||||
// process termination can otherwise prevent the final evidence flush.
|
||||
TryWriteEvidence(functionalCompleted, null);
|
||||
exitDocument.SendStringToExecute("_.QUIT _N\n", true, true, false);
|
||||
document = null;
|
||||
automationOpenedDocuments.Clear();
|
||||
}
|
||||
catch (System.Exception exception)
|
||||
{
|
||||
// This is terminal cleanup: contain the exception and leave process
|
||||
// cleanup to Launcher rather than re-entering document APIs.
|
||||
// A failed graceful-exit dispatch is not a failure of already
|
||||
// completed PXP-OA/UNDO work. Launcher owns bounded forced cleanup.
|
||||
exitFailureCode = "AUTOMATION_CONTROLLED_EXIT_FAILED:" + exception.GetType().Name;
|
||||
transitions.Add("QuitDispatchFailed");
|
||||
TryWriteEvidence(functionalCompleted, null);
|
||||
}
|
||||
}
|
||||
|
||||
private bool IsTerminal => state is CoordinatorState.Completed or CoordinatorState.Failed or CoordinatorState.ExitQueued;
|
||||
|
||||
private void Transition(CoordinatorState next, string transition)
|
||||
{
|
||||
previousState = state;
|
||||
state = next;
|
||||
transitions.Add(transition);
|
||||
}
|
||||
|
||||
private void RunCallback(string callback, Action action)
|
||||
{
|
||||
if (IsTerminal && callback != "ControlledExitIdle") return;
|
||||
try { action(); }
|
||||
catch (System.Exception exception) { FailFromCallback(callback, exception, "AUTOMATION_CALLBACK_FAILED"); }
|
||||
}
|
||||
|
||||
private void FailFromCallback(string callback, System.Exception exception, string code)
|
||||
{
|
||||
exceptionText = exception.ToString();
|
||||
RuntimeDiagnostics.Write("AutomationCallbackFailed", "ERROR", resultStatus: code + ":" + callback, exception: exception);
|
||||
if (!IsTerminal) Complete(false, code + ":" + callback + ":" + exception.GetType().Name);
|
||||
else
|
||||
{
|
||||
UnsubscribeHandlers();
|
||||
if (functionalCompleted)
|
||||
{
|
||||
exitFailureCode = code + ":" + callback + ":" + exception.GetType().Name;
|
||||
transitions.Add("ExitCallbackFailed");
|
||||
TryWriteEvidence(true, null);
|
||||
}
|
||||
else TryWriteEvidence(false, code + ":" + callback + ":" + exception.GetType().Name);
|
||||
}
|
||||
}
|
||||
|
||||
private void UnsubscribeHandlers()
|
||||
{
|
||||
if (documentHandlersSubscribed && document is not null)
|
||||
{
|
||||
try { document.CommandEnded -= OnCommandEnded; document.CommandFailed -= OnCommandFailed; document.CommandCancelled -= OnCommandCancelled; }
|
||||
catch (System.Exception exception) { RuntimeDiagnostics.Write("AutomationHandlerUnsubscribeFailed", "ERROR", resultStatus: "AUTOMATION_UNSUBSCRIBE_FAILED", exception: exception); }
|
||||
}
|
||||
documentHandlersSubscribed = false;
|
||||
if (lifecycleHandlersSubscribed)
|
||||
{
|
||||
try { AcadApplication.DocumentManager.DocumentActivated -= OnDocumentActivated; AcadApplication.Idle -= OnIdle; }
|
||||
catch (System.Exception exception) { RuntimeDiagnostics.Write("AutomationHandlerUnsubscribeFailed", "ERROR", resultStatus: "AUTOMATION_UNSUBSCRIBE_FAILED", exception: exception); }
|
||||
}
|
||||
lifecycleHandlersSubscribed = false;
|
||||
}
|
||||
|
||||
private bool TryWriteEvidence(bool success, string? error)
|
||||
{
|
||||
try { evidenceFlushed = true; WriteEvidence(success, error); return true; }
|
||||
catch (System.Exception exception) { evidenceFlushed = false; RuntimeDiagnostics.Write("AutomationEvidenceWriteFailed", "ERROR", resultStatus: "AUTOMATION_EVIDENCE_WRITE_FAILED", exception: exception); return false; }
|
||||
}
|
||||
|
||||
private void WriteEvidence(bool success, string? error)
|
||||
{
|
||||
if (config is null) return;
|
||||
var first = pxpResults.ElementAtOrDefault(0); var second = pxpResults.ElementAtOrDefault(1);
|
||||
var expectedCommands = string.Equals(config.Phase, "Apply", StringComparison.OrdinalIgnoreCase) ? 3 : 2;
|
||||
var evidence = new FirstApplyAutomationEvidence { Phase = config.Phase, Completed = success, ErrorCode = error, DbmodBefore = before, DbmodAfterCommand1 = after1, DbmodAfterCommand2 = after2, DbmodAfterUndo = afterUndo, Baseline = baseline, AfterCommand1 = counts1, AfterCommand2 = counts2, AfterUndo = countsUndo, CompletedCommands = completed, PlanIdRun1 = first?.PlanId, PlanIdRun2 = second?.PlanId, PlanIdsEqual = first is not null && second is not null ? string.Equals(first.PlanId, second.PlanId, StringComparison.Ordinal) : null, EligibleCandidateCount = first?.Candidates.Count, SelectedCandidateHash = selectedTargetSnapshotId, ViewHash = first?.View, CreateRun1 = first?.Create, CreateRun2 = second?.Create, SkipRun2 = second?.Skip, ApplyOutcomeRun1 = first?.ApplyOutcome, ApplyOutcomeRun2 = second?.ApplyOutcome, PermitAccepted = first?.PermitAccepted, CommandsCompleted = completed.Count >= expectedCommands, InspectorsCompleted = baseline is not null && counts1 is not null && counts2 is not null && (!string.Equals(config.Phase, "Apply", StringComparison.OrdinalIgnoreCase) || countsUndo is not null), EvidenceFlushed = evidenceFlushed, ExitAttemptQueued = exitAttemptQueued, ExitFailureCode = exitFailureCode, IdleCallbackCount = FirstLimitedApplyAutomationBootstrap.IdleCallbackCount, CoordinatorStartCount = FirstLimitedApplyAutomationBootstrap.CoordinatorStartCount, ExceptionText = exceptionText, PreviousState = previousState.ToString(), CurrentState = state.ToString(), StateTransitions = transitions };
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(config.EvidencePath)!);
|
||||
File.WriteAllText(config.EvidencePath, JsonSerializer.Serialize(evidence));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
using System.Text.Json;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// This file is deliberately runtime-only. Core receives only the anonymised
|
||||
// permit and canonical operation; no AutoCAD handle, database or project path
|
||||
// crosses the adapter boundary.
|
||||
internal sealed record FirstLimitedApplyRuntimePermit
|
||||
{
|
||||
public required bool AllowApply { get; init; }
|
||||
public required string FixtureMarkerPath { get; init; }
|
||||
public required string TargetSnapshotId { get; init; }
|
||||
public required string ExpectedPlanId { get; init; }
|
||||
public required string VisibilityState { get; init; }
|
||||
// Test-only local copy of the legacy v1.0.4 Template.dwg. The package
|
||||
// deliberately carries no DWG assets; the per-run permit binds this source.
|
||||
public required string AnnotationTemplateDwgPath { get; init; }
|
||||
}
|
||||
|
||||
internal static class FirstLimitedApplyPermitReader
|
||||
{
|
||||
private const string MarkerContent = "P_REC_ANNOT_TEST_FIXTURE=FIRST_LIMITED_APPLY";
|
||||
|
||||
public static FirstLimitedApplyRuntimePermit ReadFor(Document document)
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_APPLY_PERMIT_PATH");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("APPLY_PERMIT_PATH_REQUIRED");
|
||||
if (!File.Exists(path)) throw new InvalidOperationException("APPLY_PERMIT_MISSING");
|
||||
|
||||
var permit = JsonSerializer.Deserialize<FirstLimitedApplyRuntimePermit>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
|
||||
if (permit is null || !permit.AllowApply || string.IsNullOrWhiteSpace(permit.TargetSnapshotId) || string.IsNullOrWhiteSpace(permit.ExpectedPlanId) || string.IsNullOrWhiteSpace(permit.VisibilityState))
|
||||
throw new InvalidOperationException("APPLY_TEST_FIXTURE_OR_PERMIT_REQUIRED");
|
||||
if (!Path.IsPathFullyQualified(permit.FixtureMarkerPath) || permit.FixtureMarkerPath.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(permit.FixtureMarkerPath))
|
||||
throw new InvalidOperationException("APPLY_TEST_FIXTURE_OR_PERMIT_REQUIRED");
|
||||
if (!string.Equals(File.ReadAllText(permit.FixtureMarkerPath).Trim(), MarkerContent, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("APPLY_TEST_FIXTURE_OR_PERMIT_REQUIRED");
|
||||
|
||||
var root = Path.GetDirectoryName(Path.GetFullPath(permit.FixtureMarkerPath))!;
|
||||
var drawing = Path.GetFullPath(document.Name);
|
||||
if (!drawing.StartsWith(root + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
|
||||
throw new InvalidOperationException("APPLY_TEST_FIXTURE_OR_PERMIT_REQUIRED");
|
||||
if (string.IsNullOrWhiteSpace(permit.AnnotationTemplateDwgPath) || !Path.IsPathFullyQualified(permit.AnnotationTemplateDwgPath) || permit.AnnotationTemplateDwgPath.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(permit.AnnotationTemplateDwgPath))
|
||||
throw new InvalidOperationException("ANNOTATION_TEMPLATE_ASSET_REQUIRED");
|
||||
return permit;
|
||||
}
|
||||
}
|
||||
|
||||
internal enum PipeAnnotationWriteOutcome { Created, AlreadyExists }
|
||||
|
||||
internal sealed class FirstLimitedPipeAnnotationWriter
|
||||
{
|
||||
private const string BlockName = "PIPE";
|
||||
private const string XdataApplication = "PXP-OA";
|
||||
|
||||
public PipeAnnotationWriteOutcome Write(Document document, CreatePipeAnnotationOperation operation, string visibilityState, string annotationTemplateDwgPath)
|
||||
{
|
||||
var database = document.Database;
|
||||
using var transaction = database.TransactionManager.StartTransaction();
|
||||
var table = (BlockTable)transaction.GetObject(database.BlockTableId, OpenMode.ForRead);
|
||||
var blockId = EnsureLegacyPipeBlock(transaction, database, table, annotationTemplateDwgPath);
|
||||
|
||||
var paper = (BlockTableRecord)transaction.GetObject(table[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
if (HasOwnedAnnotation(transaction, paper, operation.DuplicateKey)) return PipeAnnotationWriteOutcome.AlreadyExists;
|
||||
EnsureRegApp(transaction, database);
|
||||
|
||||
using var annotation = new BlockReference(
|
||||
new Point3d(operation.Placement.X, operation.Placement.Y, operation.Placement.Z),
|
||||
blockId);
|
||||
paper.AppendEntity(annotation);
|
||||
transaction.AddNewlyCreatedDBObject(annotation, true);
|
||||
SetConfirmedVisibility(annotation, visibilityState);
|
||||
annotation.XData = new ResultBuffer(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, XdataApplication),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, operation.DuplicateKey),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, operation.RuleId));
|
||||
transaction.Commit();
|
||||
return PipeAnnotationWriteOutcome.Created;
|
||||
}
|
||||
|
||||
private static ObjectId EnsureLegacyPipeBlock(Transaction destinationTransaction, Database destination, BlockTable destinationTable, string templatePath)
|
||||
{
|
||||
if (destinationTable.Has(BlockName)) return destinationTable[BlockName];
|
||||
if (!File.Exists(templatePath)) throw new InvalidOperationException("ANNOTATION_TEMPLATE_ASSET_MISSING");
|
||||
|
||||
using var source = new Database(false, true);
|
||||
source.ReadDwgFile(templatePath, FileShare.Read, true, string.Empty);
|
||||
source.CloseInput(true);
|
||||
using var sourceTransaction = source.TransactionManager.StartTransaction();
|
||||
var sourceTable = (BlockTable)sourceTransaction.GetObject(source.BlockTableId, OpenMode.ForRead);
|
||||
if (!sourceTable.Has(BlockName)) throw new InvalidOperationException("ANNOTATION_TEMPLATE_PIPE_BLOCK_MISSING");
|
||||
using var sourceIds = new ObjectIdCollection { sourceTable[BlockName] };
|
||||
using var mapping = new IdMapping();
|
||||
destination.WblockCloneObjects(sourceIds, destination.BlockTableId, mapping, DuplicateRecordCloning.Ignore, false);
|
||||
sourceTransaction.Commit();
|
||||
|
||||
var refreshed = (BlockTable)destinationTransaction.GetObject(destination.BlockTableId, OpenMode.ForRead);
|
||||
if (!refreshed.Has(BlockName)) throw new InvalidOperationException("ANNOTATION_TEMPLATE_BLOCK_IMPORT_FAILED");
|
||||
return refreshed[BlockName];
|
||||
}
|
||||
|
||||
private static bool HasOwnedAnnotation(Transaction transaction, BlockTableRecord paper, string duplicateKey)
|
||||
{
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not BlockReference reference) continue;
|
||||
using var xdata = reference.GetXDataForApplication(XdataApplication);
|
||||
if (xdata?.AsArray().Any(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(value.Value as string, duplicateKey, StringComparison.Ordinal)) == true)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static void EnsureRegApp(Transaction transaction, Database database)
|
||||
{
|
||||
var apps = (RegAppTable)transaction.GetObject(database.RegAppTableId, OpenMode.ForRead);
|
||||
if (apps.Has(XdataApplication)) return;
|
||||
apps.UpgradeOpen();
|
||||
using var record = new RegAppTableRecord { Name = XdataApplication };
|
||||
apps.Add(record);
|
||||
transaction.AddNewlyCreatedDBObject(record, true);
|
||||
}
|
||||
|
||||
// The "V" property and allowed values are the confirmed legacy PXP-OA
|
||||
// dynamic-block contract. Failure is pre-commit and leaves no entity.
|
||||
private static void SetConfirmedVisibility(BlockReference annotation, string visibilityState)
|
||||
{
|
||||
var property = annotation.DynamicBlockReferencePropertyCollection
|
||||
.Cast<DynamicBlockReferenceProperty>()
|
||||
.SingleOrDefault(value => string.Equals(value.PropertyName, "V", StringComparison.Ordinal));
|
||||
var allowed = property?.GetAllowedValues().OfType<string>().ToArray() ?? [];
|
||||
if (property is null || !allowed.Contains(visibilityState, StringComparer.Ordinal))
|
||||
throw new InvalidOperationException($"ANNOTATION_VISIBILITY_STATE_UNSUPPORTED:Allowed={string.Join('|', allowed)}");
|
||||
property.Value = visibilityState;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class LineConnectionAnnotationWriter
|
||||
{
|
||||
private const string ApplicationName = "PXP-ALC";
|
||||
|
||||
public LineConnectionApplyResult Replace(Document document, string viewportStableId, IReadOnlyList<LineConnectionBoundaryPlan> plans, LineConnectionAssets assets)
|
||||
{
|
||||
var insertable = plans.Where(plan => plan.Reasons.Count == 0).OrderBy(plan => plan.Position.X).ThenByDescending(plan => plan.Position.Y).ToArray();
|
||||
using var documentLock = document.LockDocument();
|
||||
var database = document.Database;
|
||||
using var transaction = database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(database.BlockTableId, OpenMode.ForRead);
|
||||
var layers = (LayerTable)transaction.GetObject(database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(database.TextStyleTableId, OpenMode.ForRead);
|
||||
if (!blocks.Has(assets.BlockName)) throw new InvalidOperationException("LINE_CONNECTION_BLOCK_MISSING:" + assets.BlockName);
|
||||
if (!layers.Has(assets.PolylineLayer)) throw new InvalidOperationException("LINE_CONNECTION_POLYLINE_LAYER_MISSING:" + assets.PolylineLayer);
|
||||
if (!layers.Has(assets.TextLayer)) throw new InvalidOperationException("LINE_CONNECTION_TEXT_LAYER_MISSING:" + assets.TextLayer);
|
||||
if (!styles.Has(assets.TextStyle)) throw new InvalidOperationException("LINE_CONNECTION_TEXT_STYLE_MISSING:" + assets.TextStyle);
|
||||
EnsureRegApp(transaction, database);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
var deleted = 0;
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
var value = transaction.GetObject(id, OpenMode.ForRead);
|
||||
var data = value.GetXDataForApplication(ApplicationName)?.AsArray();
|
||||
if (data is null || !data.Any(item => item.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(item.Value?.ToString(), viewportStableId, StringComparison.Ordinal))) continue;
|
||||
value.UpgradeOpen(); value.Erase(); deleted++;
|
||||
}
|
||||
var definition = (BlockTableRecord)transaction.GetObject(blocks[assets.BlockName], OpenMode.ForRead);
|
||||
foreach (var plan in insertable)
|
||||
{
|
||||
using var reference = new BlockReference(new Point3d(plan.Position.X, plan.Position.Y, plan.Position.Z), definition.ObjectId) { LayerId = layers[assets.PolylineLayer], Rotation = plan.Rotation };
|
||||
reference.XData = Ownership(viewportStableId, plan);
|
||||
paper.AppendEntity(reference); transaction.AddNewlyCreatedDBObject(reference, true);
|
||||
var values = new[] { plan.FirstText ?? string.Empty, plan.SecondText ?? string.Empty };
|
||||
var index = 0;
|
||||
foreach (ObjectId entityId in definition)
|
||||
{
|
||||
if (transaction.GetObject(entityId, OpenMode.ForRead) is not AttributeDefinition source || source.Constant) continue;
|
||||
using var attribute = new AttributeReference();
|
||||
attribute.SetAttributeFromBlock(source, reference.BlockTransform);
|
||||
attribute.TextString = values[Math.Min(index++, 1)].Replace("\n", "\\P", StringComparison.Ordinal);
|
||||
attribute.LayerId = layers[assets.TextLayer]; attribute.TextStyleId = styles[assets.TextStyle];
|
||||
attribute.UpdateMTextAttribute(); reference.AttributeCollection.AppendAttribute(attribute); transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
if (plan.ConnectorPosition is { } connector)
|
||||
{
|
||||
using var leader = new Polyline(3) { LayerId = layers[assets.PolylineLayer], XData = Ownership(viewportStableId, plan) };
|
||||
leader.AddVertexAt(0, new Point2d(connector.X, connector.Y), 0, 0, 0);
|
||||
// Legacy PXP-ALC uses an orthogonal two-segment leader. Its
|
||||
// elbow shares the annotation Y coordinate for a stable route.
|
||||
leader.AddVertexAt(1, new Point2d(connector.X, plan.Position.Y), 0, 0, 0);
|
||||
leader.AddVertexAt(2, new Point2d(plan.Position.X, plan.Position.Y), 0, 0, 0);
|
||||
paper.AppendEntity(leader); transaction.AddNewlyCreatedDBObject(leader, true);
|
||||
}
|
||||
}
|
||||
transaction.Commit();
|
||||
return new(deleted, insertable.Length);
|
||||
}
|
||||
|
||||
private static ResultBuffer Ownership(string viewport, LineConnectionBoundaryPlan plan) => new(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, viewport),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, plan.StableId),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "LINENUMBER1"),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, plan.FirstText ?? string.Empty),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "LINENUMBER2"),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, plan.SecondText ?? string.Empty));
|
||||
|
||||
private static void EnsureRegApp(Transaction transaction, Database database)
|
||||
{
|
||||
var table = (RegAppTable)transaction.GetObject(database.RegAppTableId, OpenMode.ForRead);
|
||||
if (table.Has(ApplicationName)) return;
|
||||
table.UpgradeOpen(); using var record = new RegAppTableRecord { Name = ApplicationName }; table.Add(record); transaction.AddNewlyCreatedDBObject(record, true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
using System.Text.Json;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed record LineConnectionApplyPermit
|
||||
{
|
||||
public required bool AllowApply { get; init; }
|
||||
public required string FixtureMarkerPath { get; init; }
|
||||
public required string ExpectedViewportStableId { get; init; }
|
||||
public required IReadOnlyList<string> ExpectedConnectorStableIds { get; init; }
|
||||
}
|
||||
|
||||
internal static class LineConnectionApplyPermitReader
|
||||
{
|
||||
private const string MarkerContent = "P_REC_ANNOT_TEST_FIXTURE=LINE_CONNECTION_APPLY";
|
||||
|
||||
public static LineConnectionApplyPermit Read()
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_LINE_CONNECTION_APPLY_PERMIT_PATH");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(path))
|
||||
throw new InvalidOperationException("LINE_CONNECTION_APPLY_PERMIT_REQUIRED");
|
||||
return JsonSerializer.Deserialize<LineConnectionApplyPermit>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true })
|
||||
?? throw new InvalidOperationException("LINE_CONNECTION_APPLY_PERMIT_INVALID");
|
||||
}
|
||||
|
||||
public static void Validate(Document document, LineConnectionApplyPermit permit, string viewportId, IReadOnlyList<LineConnectionBoundaryPlan> plans)
|
||||
{
|
||||
var actual = plans.Where(plan => plan.Reasons.Count == 0).Select(plan => plan.StableId).OrderBy(value => value, StringComparer.Ordinal).ToArray();
|
||||
var expected = permit.ExpectedConnectorStableIds.OrderBy(value => value, StringComparer.Ordinal).ToArray();
|
||||
if (!permit.AllowApply || !string.Equals(permit.ExpectedViewportStableId, viewportId, StringComparison.Ordinal) || !actual.SequenceEqual(expected, StringComparer.Ordinal))
|
||||
throw new InvalidOperationException("LINE_CONNECTION_APPLY_PERMIT_PLAN_MISMATCH");
|
||||
if (!Path.IsPathFullyQualified(permit.FixtureMarkerPath) || permit.FixtureMarkerPath.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(permit.FixtureMarkerPath) || !string.Equals(File.ReadAllText(permit.FixtureMarkerPath).Trim(), MarkerContent, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("LINE_CONNECTION_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
var root = Path.GetDirectoryName(Path.GetFullPath(permit.FixtureMarkerPath))! + Path.DirectorySeparatorChar;
|
||||
if (!Path.GetFullPath(document.Name).StartsWith(root, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("LINE_CONNECTION_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.P3dProjectParts;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Core.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class LineConnectionCommand
|
||||
{
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
var options = new PromptEntityOptions("\nВыберите видовой экран для аннотаций стыков номеров линий: ");
|
||||
options.SetRejectMessage("\nТребуется видовой экран."); options.AddAllowedClass(typeof(Viewport), true);
|
||||
var selected = document.Editor.GetEntity(options);
|
||||
if (selected.Status != PromptStatus.OK) return;
|
||||
OrthoViewportInfo viewport;
|
||||
using (var transaction = document.Database.TransactionManager.StartOpenCloseTransaction())
|
||||
{
|
||||
var entity = (Viewport)transaction.GetObject(selected.ObjectId, OpenMode.ForRead);
|
||||
viewport = ResolveViewport(document, entity);
|
||||
}
|
||||
var manager = PlantApplication.ProjectPart("Piping")?.DataLinksManager ?? throw new InvalidOperationException("LINE_CONNECTION_PIPING_DATALINKS_UNAVAILABLE");
|
||||
var relationships = new PlantConnectorRelationshipReader(manager).Read();
|
||||
if (!relationships.Success) throw new InvalidOperationException(relationships.FailureCode);
|
||||
var objects = new PlantObjectReader().ReadObjects(viewport, CancellationToken.None);
|
||||
var byRow = objects.Where(value => value.MembershipStatus == ViewMembershipStatus.Resolved && value.Geometry.PaperPosition is not null)
|
||||
.Select(value => (Object: value, Row: ReadRowId(value)))
|
||||
.Where(value => value.Row.HasValue).ToDictionary(value => value.Row!.Value, value => value.Object);
|
||||
var placements = new Dictionary<string, LineConnectionPlacement>(StringComparer.Ordinal);
|
||||
foreach (var relationship in relationships.Connectors)
|
||||
{
|
||||
if (!byRow.TryGetValue(relationship.ConnectorRowId, out var connector) || connector.Geometry.PaperPosition is not { } point) continue;
|
||||
var direction = connector.Geometry.PaperDirection ?? new Vector2Dto(1, 0);
|
||||
var horizontalLeader = Math.Abs(direction.Y) >= Math.Abs(direction.X);
|
||||
var block = horizontalLeader ? new AnnotationPoint(viewport.CenterX, point.Y) : new AnnotationPoint(point.X, viewport.CenterY);
|
||||
var endpoint = new Point3Dto(point.X, point.Y, 0);
|
||||
placements[relationship.StableId] = new(endpoint, endpoint, new(endpoint, endpoint), block, 0);
|
||||
}
|
||||
var configuration = LineNumberRuntimeConfigurationReader.Read();
|
||||
var definition = configuration.Annotations.Annotations.OrderBy(value => value.Nickname, StringComparer.Ordinal).First();
|
||||
var preview = new LineConnectionPreviewService(new LineNumberFieldResolver(new PlantDataLinksPropertyReader(manager)), new LineNumberAnnotationFormatter(), new LineConnectionBoundaryPlanner())
|
||||
.Preview(definition, relationships.Connectors, placements);
|
||||
var ready = preview.Plans.Count(plan => plan.Reasons.Count == 0);
|
||||
document.Editor.WriteMessage($"\nPXP-ALC preview: connectors={relationships.Connectors.Count}; eligible={ready}; skipped={preview.Plans.Count - ready}. DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("LineConnectionPreviewCompleted", commandName: "PXP-ALC", resultStatus: "PreviewCompleted", document: document, details: new Dictionary<string, object?> { ["ConnectorCount"] = relationships.Connectors.Count, ["EligibleCount"] = ready });
|
||||
if (!string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase)) return;
|
||||
var permit = LineConnectionApplyPermitReader.Read();
|
||||
LineConnectionApplyPermitReader.Validate(document, permit, viewport.Id, preview.Plans);
|
||||
var result = new LineConnectionAnnotationWriter().Replace(document, viewport.Id, preview.Plans, configuration.Connections);
|
||||
document.Editor.WriteMessage($"\nPXP-ALC Apply: deleted={result.Deleted}; created={result.Created}.");
|
||||
RuntimeDiagnostics.Write("LineConnectionApplyCompleted", commandName: "PXP-ALC", resultStatus: "Applied", document: document, details: new Dictionary<string, object?> { ["Deleted"] = result.Deleted, ["Created"] = result.Created });
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("LineConnectionCommandFailed", "ERROR", commandName: "PXP-ALC", resultStatus: exception.Message, exception: exception, document: document);
|
||||
document.Editor.WriteMessage("\nPXP-ALC: " + exception.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private static OrthoViewportInfo ResolveViewport(Document document, Viewport selected)
|
||||
{
|
||||
var project = PlantApplication.ProjectPart("Ortho") as OrthoProject ?? throw new InvalidOperationException("LINE_CONNECTION_ORTHO_PROJECT_UNAVAILABLE");
|
||||
var matches = new PlantOrthoViewportReader(project, document.Name).ReadViewports(CancellationToken.None)
|
||||
.Where(value => Math.Abs(value.CenterX - selected.CenterPoint.X) < 0.001 && Math.Abs(value.CenterY - selected.CenterPoint.Y) < 0.001 && Math.Abs(value.Width - selected.Width) < 0.001 && Math.Abs(value.Height - selected.Height) < 0.001)
|
||||
.ToArray();
|
||||
return matches.Length == 1 ? matches[0] : throw new InvalidOperationException(matches.Length == 0 ? "LINE_CONNECTION_ORTHO_VIEW_NOT_FOUND" : "LINE_CONNECTION_ORTHO_VIEW_AMBIGUOUS");
|
||||
}
|
||||
|
||||
private static long? ReadRowId(PlantObjectSnapshot value) => value.Properties.TryGetValue("PRecAnnot.RowId", out var text) && long.TryParse(text, out var row) ? row : null;
|
||||
}
|
||||
@@ -0,0 +1,366 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class LineNumberAnnotationWriter
|
||||
{
|
||||
private const string ApplicationName = "PXP-LN";
|
||||
private const string MarkerBlockName = "LN_MARKER";
|
||||
private const string MarkerAttributeTag = "NUMBER";
|
||||
|
||||
public LineNumberApplyResult Apply(Document document, IReadOnlyList<LineNumberApplyPreflight> plan, AnnotateLineNumbersAssets assets)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(document);
|
||||
ArgumentNullException.ThrowIfNull(plan);
|
||||
ArgumentNullException.ThrowIfNull(assets);
|
||||
if (plan.Select(item => item.StableId).Distinct(StringComparer.Ordinal).Count() != plan.Count)
|
||||
throw new InvalidOperationException("LINE_NUMBER_APPLY_DUPLICATE_STABLE_ID");
|
||||
|
||||
var created = 0;
|
||||
var updated = 0;
|
||||
var unchanged = 0;
|
||||
var database = document.Database;
|
||||
using var documentLock = document.LockDocument();
|
||||
using var transaction = database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(database.BlockTableId, OpenMode.ForRead);
|
||||
ValidateAssets(transaction, database, assets.Marker);
|
||||
EnsureRegApp(transaction, database);
|
||||
var markerDefinition = EnsureMarkerDefinition(transaction, database, blocks, assets.Marker);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
|
||||
foreach (var item in plan.OrderBy(value => value.MarkerNumber))
|
||||
{
|
||||
var existing = FindOwnedMarker(transaction, paper, item.StableId);
|
||||
if (existing is null)
|
||||
{
|
||||
CreateMarker(transaction, paper, markerDefinition, item, assets.Marker);
|
||||
created++;
|
||||
}
|
||||
else if (UpdateMarker(transaction, existing, item, assets.Marker.Layer)) updated++;
|
||||
else unchanged++;
|
||||
}
|
||||
|
||||
transaction.Commit();
|
||||
return new(created, updated, unchanged);
|
||||
}
|
||||
|
||||
// Legacy PXP-LN materialises its selected marker/text pairs as a paper-space
|
||||
// LN_LIST block. The list ownership key makes repeat Apply update that
|
||||
// aggregate rather than append another list.
|
||||
public LineNumberApplyResult ApplyList(Document document, LineNumberListApplyPreflight plan, AnnotateLineNumbersAssets assets)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(document);
|
||||
ArgumentNullException.ThrowIfNull(plan);
|
||||
if (plan.Rows.Count == 0) return new(0, 0, 1);
|
||||
if (plan.Rows.Select(row => row.MarkerNumber).Distinct().Count() != plan.Rows.Count)
|
||||
throw new InvalidOperationException("LINE_NUMBER_LIST_DUPLICATE_MARKER_NUMBER");
|
||||
|
||||
using var documentLock = document.LockDocument();
|
||||
var database = document.Database;
|
||||
using var transaction = database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(database.BlockTableId, OpenMode.ForRead);
|
||||
ValidateListAssets(transaction, database, assets.List);
|
||||
EnsureRegApp(transaction, database);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
var existing = FindOwnedMarker(transaction, paper, plan.StableId);
|
||||
if (existing is not null)
|
||||
{
|
||||
var changed = UpdateList(transaction, existing, plan);
|
||||
transaction.Commit();
|
||||
return new(0, changed ? 1 : 0, changed ? 0 : 1);
|
||||
}
|
||||
|
||||
var definition = CreateListDefinition(transaction, database, blocks, plan, assets.List);
|
||||
using var reference = new BlockReference(new Point3d(plan.Position.X, plan.Position.Y, plan.Position.Z), definition)
|
||||
{
|
||||
Rotation = plan.Rotation,
|
||||
Layer = assets.List.Layer,
|
||||
XData = ListOwnership(plan.StableId)
|
||||
};
|
||||
paper.AppendEntity(reference);
|
||||
transaction.AddNewlyCreatedDBObject(reference, true);
|
||||
AppendListAttributes(transaction, definition, reference, plan.Rows);
|
||||
transaction.Commit();
|
||||
return new(1, 0, 0);
|
||||
}
|
||||
|
||||
public LineNumberApplyResult ApplyEdits(Document document, IReadOnlyList<LineNumberRowMutation> mutations)
|
||||
{
|
||||
if (mutations.Count == 0) return new(0, 0, 1);
|
||||
using var documentLock = document.LockDocument();
|
||||
var database = document.Database;
|
||||
using var transaction = database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForRead);
|
||||
var updated = 0;
|
||||
foreach (var mutation in mutations)
|
||||
{
|
||||
var marker = FindOwnedMarker(transaction, paper, mutation.SourceStableId) ?? throw new InvalidOperationException("LINE_NUMBER_OWNED_MARKER_NOT_FOUND");
|
||||
foreach (ObjectId id in marker.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(id, OpenMode.ForWrite);
|
||||
if (!string.Equals(attribute.Tag, MarkerAttributeTag, StringComparison.OrdinalIgnoreCase)) continue;
|
||||
attribute.TextString = mutation.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
if (mutation.MarkerAttributePosition is { } reset) attribute.Position = new Point3d(reset.X, reset.Y, reset.Z).TransformBy(marker.BlockTransform);
|
||||
}
|
||||
foreach (ObjectId entityId in paper)
|
||||
{
|
||||
if (transaction.GetObject(entityId, OpenMode.ForRead) is not BlockReference list || !list.Name.StartsWith("LN_LIST", StringComparison.OrdinalIgnoreCase)) continue;
|
||||
foreach (ObjectId attributeId in list.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(attributeId, OpenMode.ForWrite);
|
||||
if (string.Equals(attribute.Tag, $"NUMBER{mutation.PreviousMarkerNumber}", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
attribute.Tag = $"NUMBER{mutation.MarkerNumber}";
|
||||
attribute.TextString = mutation.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
}
|
||||
else if (string.Equals(attribute.Tag, $"LINENUMBER{mutation.PreviousMarkerNumber}", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
attribute.Tag = $"LINENUMBER{mutation.MarkerNumber}";
|
||||
attribute.TextString = mutation.Text.Replace("\n", "\\P", StringComparison.Ordinal);
|
||||
attribute.UpdateMTextAttribute();
|
||||
}
|
||||
}
|
||||
}
|
||||
updated++;
|
||||
}
|
||||
transaction.Commit();
|
||||
return new(0, updated, 0);
|
||||
}
|
||||
|
||||
private static void ValidateAssets(Transaction transaction, Database database, LineNumberMarkerAsset marker)
|
||||
{
|
||||
var layers = (LayerTable)transaction.GetObject(database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(database.TextStyleTableId, OpenMode.ForRead);
|
||||
foreach (var layer in marker.Texts.Select(value => value.Layer).Append(marker.Layer).Concat(marker.Lines.Select(value => value.Layer)).Where(value => !string.IsNullOrWhiteSpace(value)).Distinct(StringComparer.OrdinalIgnoreCase))
|
||||
if (!layers.Has(layer)) throw new InvalidOperationException($"LINE_NUMBER_LAYER_MISSING:{layer}");
|
||||
foreach (var style in marker.Texts.Select(value => value.TextStyle).Where(value => !string.IsNullOrWhiteSpace(value)).Distinct(StringComparer.OrdinalIgnoreCase))
|
||||
if (!styles.Has(style)) throw new InvalidOperationException($"LINE_NUMBER_TEXT_STYLE_MISSING:{style}");
|
||||
if (marker.Texts.Count == 0) throw new InvalidOperationException("LINE_NUMBER_MARKER_TEXT_ASSET_MISSING");
|
||||
}
|
||||
|
||||
private static void ValidateListAssets(Transaction transaction, Database database, LineNumberListAsset list)
|
||||
{
|
||||
var layers = (LayerTable)transaction.GetObject(database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(database.TextStyleTableId, OpenMode.ForRead);
|
||||
foreach (var layer in new[] { list.Layer, list.MarkerText.Layer, list.LineNumberText.Layer, list.Line.Layer }.Distinct(StringComparer.OrdinalIgnoreCase))
|
||||
if (!layers.Has(layer)) throw new InvalidOperationException($"LINE_NUMBER_LAYER_MISSING:{layer}");
|
||||
foreach (var style in new[] { list.MarkerText.TextStyle, list.LineNumberText.TextStyle }.Distinct(StringComparer.OrdinalIgnoreCase))
|
||||
if (!styles.Has(style)) throw new InvalidOperationException($"LINE_NUMBER_TEXT_STYLE_MISSING:{style}");
|
||||
if (list.LineHeight <= 0) throw new InvalidOperationException("LINE_NUMBER_LIST_HEIGHT_INVALID");
|
||||
}
|
||||
|
||||
private static ObjectId CreateListDefinition(Transaction transaction, Database database, BlockTable blocks, LineNumberListApplyPreflight plan, LineNumberListAsset list)
|
||||
{
|
||||
blocks.UpgradeOpen();
|
||||
var baseName = $"LN_LIST{plan.Rows.Count}";
|
||||
var name = baseName;
|
||||
for (var suffix = 1; blocks.Has(name); suffix++) name = $"{baseName}_{suffix}";
|
||||
using var definition = new BlockTableRecord { Name = name, Origin = Point3d.Origin };
|
||||
var id = blocks.Add(definition);
|
||||
transaction.AddNewlyCreatedDBObject(definition, true);
|
||||
var layers = (LayerTable)transaction.GetObject(database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(database.TextStyleTableId, OpenMode.ForRead);
|
||||
for (var index = 0; index < plan.Rows.Count; index++)
|
||||
{
|
||||
var row = plan.Rows[index];
|
||||
AppendListAttribute(transaction, definition, row.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture), $"NUMBER{row.MarkerNumber}", "Номер маркера:", list.MarkerText, index, list.LineHeight, list.MaskScaleFactor, layers, styles);
|
||||
AppendListAttribute(transaction, definition, row.Text.Replace("\n", "(|)", StringComparison.Ordinal), $"LINENUMBER{row.MarkerNumber}", "Номер линии:", list.LineNumberText, index, list.LineHeight, list.MaskScaleFactor, layers, styles);
|
||||
using var horizontal = new Line(
|
||||
Shift(list.Line.Start, index, list.LineHeight),
|
||||
Shift(list.Line.End, index, list.LineHeight)) { LayerId = layers[list.Line.Layer] };
|
||||
definition.AppendEntity(horizontal);
|
||||
transaction.AddNewlyCreatedDBObject(horizontal, true);
|
||||
}
|
||||
using var vertical = new Line(
|
||||
new Point3d(list.Line.Start.X, list.Line.Start.Y + list.LineHeight, 0),
|
||||
Shift(list.Line.Start, plan.Rows.Count - 1, list.LineHeight)) { LayerId = layers[list.Line.Layer] };
|
||||
definition.AppendEntity(vertical);
|
||||
transaction.AddNewlyCreatedDBObject(vertical, true);
|
||||
return id;
|
||||
}
|
||||
|
||||
private static void AppendListAttribute(Transaction transaction, BlockTableRecord definition, string text, string tag, string prompt, LineNumberTextAsset asset, int row, double lineHeight, double maskScale, LayerTable layers, TextStyleTable styles)
|
||||
{
|
||||
var position = new Point3d(asset.Position.X, asset.Position.Y - lineHeight * row, 0);
|
||||
using var attribute = new AttributeDefinition(position, text, tag, prompt, styles[asset.TextStyle]) { Height = asset.Size, IsMTextAttributeDefinition = true, LayerId = layers[asset.Layer] };
|
||||
var mtext = attribute.MTextAttributeDefinition;
|
||||
mtext.BackgroundFill = true;
|
||||
mtext.BackgroundScaleFactor = maskScale;
|
||||
mtext.UseBackgroundColor = true;
|
||||
attribute.MTextAttributeDefinition = mtext;
|
||||
definition.AppendEntity(attribute);
|
||||
transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
|
||||
private static Point3d Shift(Point2Dto source, int row, double height) => new(source.X, source.Y - height * row, 0);
|
||||
|
||||
private static void AppendListAttributes(Transaction transaction, ObjectId definitionId, BlockReference reference, IReadOnlyList<LineNumberApplyPreflight> rows)
|
||||
{
|
||||
var values = rows.SelectMany(row => new[]
|
||||
{
|
||||
new KeyValuePair<string, string>($"NUMBER{row.MarkerNumber}", row.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture)),
|
||||
new KeyValuePair<string, string>($"LINENUMBER{row.MarkerNumber}", row.Text.Replace("\n", "\\P", StringComparison.Ordinal))
|
||||
}).ToDictionary(value => value.Key, value => value.Value, StringComparer.OrdinalIgnoreCase);
|
||||
var definition = (BlockTableRecord)transaction.GetObject(definitionId, OpenMode.ForRead);
|
||||
foreach (ObjectId id in definition)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not AttributeDefinition source || source.Constant) continue;
|
||||
using var attribute = new AttributeReference();
|
||||
attribute.SetAttributeFromBlock(source, reference.BlockTransform);
|
||||
attribute.TextString = values[source.Tag];
|
||||
attribute.UpdateMTextAttribute();
|
||||
var row = rows.Single(value => source.Tag.EndsWith(value.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture), StringComparison.Ordinal));
|
||||
attribute.XData = new ResultBuffer(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, row.StableId),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, source.Tag.StartsWith("NUMBER", StringComparison.OrdinalIgnoreCase) ? "MARKER" : "LINENUMBER"),
|
||||
new TypedValue((int)DxfCode.ExtendedDataInteger32, row.MarkerNumber));
|
||||
reference.AttributeCollection.AppendAttribute(attribute);
|
||||
transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
}
|
||||
|
||||
private static bool UpdateList(Transaction transaction, BlockReference reference, LineNumberListApplyPreflight plan)
|
||||
{
|
||||
var position = new Point3d(plan.Position.X, plan.Position.Y, plan.Position.Z);
|
||||
var changed = reference.Position != position || reference.Rotation != plan.Rotation;
|
||||
reference.UpgradeOpen();
|
||||
reference.Position = position;
|
||||
reference.Rotation = plan.Rotation;
|
||||
var values = plan.Rows.SelectMany(row => new[]
|
||||
{
|
||||
new KeyValuePair<string, string>($"NUMBER{row.MarkerNumber}", row.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture)),
|
||||
new KeyValuePair<string, string>($"LINENUMBER{row.MarkerNumber}", row.Text.Replace("\n", "\\P", StringComparison.Ordinal))
|
||||
}).ToDictionary(value => value.Key, value => value.Value, StringComparer.OrdinalIgnoreCase);
|
||||
foreach (ObjectId id in reference.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(id, OpenMode.ForWrite);
|
||||
if (!values.TryGetValue(attribute.Tag, out var value)) continue;
|
||||
changed |= !string.Equals(attribute.TextString, value, StringComparison.Ordinal);
|
||||
attribute.TextString = value;
|
||||
attribute.UpdateMTextAttribute();
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
|
||||
private static ObjectId EnsureMarkerDefinition(Transaction transaction, Database database, BlockTable blocks, LineNumberMarkerAsset marker)
|
||||
{
|
||||
if (blocks.Has(MarkerBlockName)) return blocks[MarkerBlockName];
|
||||
blocks.UpgradeOpen();
|
||||
using var definition = new BlockTableRecord { Name = MarkerBlockName, Origin = Point3d.Origin };
|
||||
var definitionId = blocks.Add(definition);
|
||||
transaction.AddNewlyCreatedDBObject(definition, true);
|
||||
var layers = (LayerTable)transaction.GetObject(database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(database.TextStyleTableId, OpenMode.ForRead);
|
||||
|
||||
foreach (var text in marker.Texts)
|
||||
{
|
||||
using var attribute = new AttributeDefinition(
|
||||
new Point3d(text.Position.X, text.Position.Y, 0), text.TextValue, MarkerAttributeTag, "Номер маркера:", styles[text.TextStyle])
|
||||
{
|
||||
Height = text.Size,
|
||||
IsMTextAttributeDefinition = true,
|
||||
LayerId = layers[text.Layer]
|
||||
};
|
||||
definition.AppendEntity(attribute);
|
||||
transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
foreach (var source in marker.Lines)
|
||||
{
|
||||
using var line = new Line(new Point3d(source.Start.X, source.Start.Y, 0), new Point3d(source.End.X, source.End.Y, 0)) { LayerId = layers[source.Layer] };
|
||||
definition.AppendEntity(line);
|
||||
transaction.AddNewlyCreatedDBObject(line, true);
|
||||
}
|
||||
return definitionId;
|
||||
}
|
||||
|
||||
private static void CreateMarker(Transaction transaction, BlockTableRecord paper, ObjectId definitionId, LineNumberApplyPreflight item, LineNumberMarkerAsset marker)
|
||||
{
|
||||
using var reference = new BlockReference(new Point3d(item.Position.X, item.Position.Y, item.Position.Z), definitionId)
|
||||
{
|
||||
Rotation = item.Rotation,
|
||||
Layer = marker.Layer
|
||||
};
|
||||
paper.AppendEntity(reference);
|
||||
transaction.AddNewlyCreatedDBObject(reference, true);
|
||||
reference.XData = Ownership(item);
|
||||
|
||||
var definition = (BlockTableRecord)transaction.GetObject(definitionId, OpenMode.ForRead);
|
||||
foreach (ObjectId id in definition)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not AttributeDefinition source || source.Constant) continue;
|
||||
using var attribute = new AttributeReference();
|
||||
attribute.SetAttributeFromBlock(source, reference.BlockTransform);
|
||||
attribute.TextString = item.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
attribute.XData = new ResultBuffer(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "MARKER"),
|
||||
new TypedValue((int)DxfCode.ExtendedDataInteger32, item.MarkerNumber));
|
||||
reference.AttributeCollection.AppendAttribute(attribute);
|
||||
transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
}
|
||||
|
||||
private static BlockReference? FindOwnedMarker(Transaction transaction, BlockTableRecord paper, string stableId)
|
||||
{
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not BlockReference reference) continue;
|
||||
using var data = reference.GetXDataForApplication(ApplicationName);
|
||||
var values = data?.AsArray();
|
||||
if (values?.Any(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(value.Value as string, stableId, StringComparison.Ordinal)) == true)
|
||||
return reference;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static ResultBuffer ListOwnership(string stableId) => new(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, stableId),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "LIST"));
|
||||
|
||||
private static bool UpdateMarker(Transaction transaction, BlockReference marker, LineNumberApplyPreflight item, string layer)
|
||||
{
|
||||
var position = new Point3d(item.Position.X, item.Position.Y, item.Position.Z);
|
||||
using var existingOwnership = marker.GetXDataForApplication(ApplicationName);
|
||||
var ownership = existingOwnership?.AsArray() ?? [];
|
||||
var changed = marker.Position != position || marker.Rotation != item.Rotation ||
|
||||
!string.Equals(marker.Layer, layer, StringComparison.OrdinalIgnoreCase) ||
|
||||
!ownership.Any(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(value.Value as string, item.Text, StringComparison.Ordinal));
|
||||
marker.UpgradeOpen();
|
||||
marker.Position = position;
|
||||
marker.Rotation = item.Rotation;
|
||||
marker.Layer = layer;
|
||||
marker.XData = Ownership(item);
|
||||
foreach (ObjectId id in marker.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(id, OpenMode.ForWrite);
|
||||
if (!string.Equals(attribute.Tag, MarkerAttributeTag, StringComparison.OrdinalIgnoreCase)) continue;
|
||||
var value = item.MarkerNumber.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
changed |= !string.Equals(attribute.TextString, value, StringComparison.Ordinal);
|
||||
attribute.TextString = value;
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
|
||||
private static ResultBuffer Ownership(LineNumberApplyPreflight item) => new(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, item.StableId),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "MARKER"),
|
||||
new TypedValue((int)DxfCode.ExtendedDataInteger32, item.MarkerNumber),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, item.Text));
|
||||
|
||||
private static void EnsureRegApp(Transaction transaction, Database database)
|
||||
{
|
||||
var table = (RegAppTable)transaction.GetObject(database.RegAppTableId, OpenMode.ForRead);
|
||||
if (table.Has(ApplicationName)) return;
|
||||
table.UpgradeOpen();
|
||||
using var record = new RegAppTableRecord { Name = ApplicationName };
|
||||
table.Add(record);
|
||||
transaction.AddNewlyCreatedDBObject(record, true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
using System.Text.Json;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed record LineNumberApplyPermit
|
||||
{
|
||||
public required bool AllowApply { get; init; }
|
||||
public required string FixtureMarkerPath { get; init; }
|
||||
public required string ExpectedStableId { get; init; }
|
||||
public required string ExpectedText { get; init; }
|
||||
}
|
||||
|
||||
internal sealed record LineNumberEditApplyPermit
|
||||
{
|
||||
public required bool AllowApply { get; init; }
|
||||
public required string FixtureMarkerPath { get; init; }
|
||||
public required string ExpectedCommandName { get; init; }
|
||||
public required string ExpectedSelectedObjectHandle { get; init; }
|
||||
public required string ExpectedMutationHash { get; init; }
|
||||
}
|
||||
|
||||
internal static class LineNumberApplyPermitReader
|
||||
{
|
||||
private const string MarkerContent = "P_REC_ANNOT_TEST_FIXTURE=LINE_NUMBER_APPLY";
|
||||
|
||||
public static void Validate(Document document, LineNumberApplyPermit permit, LineNumberApplyPreflight operation)
|
||||
{
|
||||
if (!permit.AllowApply || !string.Equals(permit.ExpectedStableId, operation.StableId, StringComparison.Ordinal) || !string.Equals(permit.ExpectedText, operation.Text, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("LINE_NUMBER_APPLY_PERMIT_PLAN_MISMATCH");
|
||||
if (!Path.IsPathFullyQualified(permit.FixtureMarkerPath) || permit.FixtureMarkerPath.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(permit.FixtureMarkerPath) || !string.Equals(File.ReadAllText(permit.FixtureMarkerPath).Trim(), MarkerContent, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("LINE_NUMBER_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
var fixtureRoot = Path.GetDirectoryName(Path.GetFullPath(permit.FixtureMarkerPath))! + Path.DirectorySeparatorChar;
|
||||
if (!Path.GetFullPath(document.Name).StartsWith(fixtureRoot, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("LINE_NUMBER_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
}
|
||||
|
||||
public static LineNumberApplyPermit Read()
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_LINE_NUMBER_APPLY_PERMIT_PATH");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(path))
|
||||
throw new InvalidOperationException("LINE_NUMBER_APPLY_PERMIT_REQUIRED");
|
||||
return JsonSerializer.Deserialize<LineNumberApplyPermit>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true })
|
||||
?? throw new InvalidOperationException("LINE_NUMBER_APPLY_PERMIT_INVALID");
|
||||
}
|
||||
}
|
||||
|
||||
internal static class LineNumberEditApplyPermitReader
|
||||
{
|
||||
private const string MarkerContent = "P_REC_ANNOT_TEST_FIXTURE=LINE_NUMBER_EDIT_APPLY";
|
||||
|
||||
public static LineNumberEditApplyPermit Read()
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_LINE_NUMBER_EDIT_APPLY_PERMIT_PATH");
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(path))
|
||||
throw new InvalidOperationException("LINE_NUMBER_EDIT_APPLY_PERMIT_REQUIRED");
|
||||
return JsonSerializer.Deserialize<LineNumberEditApplyPermit>(File.ReadAllText(path), new JsonSerializerOptions { PropertyNameCaseInsensitive = true })
|
||||
?? throw new InvalidOperationException("LINE_NUMBER_EDIT_APPLY_PERMIT_INVALID");
|
||||
}
|
||||
|
||||
public static void Validate(Document document, LineNumberEditApplyPermit permit, string commandName, string selectedObjectHandle, IReadOnlyList<LineNumberRowMutation> mutations)
|
||||
{
|
||||
var mutationHash = LineNumberEditApplyPlan.ComputeMutationHash(commandName, selectedObjectHandle, mutations);
|
||||
if (!permit.AllowApply ||
|
||||
!string.Equals(permit.ExpectedCommandName, commandName, StringComparison.Ordinal) ||
|
||||
!string.Equals(permit.ExpectedSelectedObjectHandle, selectedObjectHandle, StringComparison.OrdinalIgnoreCase) ||
|
||||
!string.Equals(permit.ExpectedMutationHash, mutationHash, StringComparison.OrdinalIgnoreCase))
|
||||
throw new InvalidOperationException("LINE_NUMBER_EDIT_APPLY_PERMIT_PLAN_MISMATCH");
|
||||
if (!Path.IsPathFullyQualified(permit.FixtureMarkerPath) || permit.FixtureMarkerPath.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(permit.FixtureMarkerPath) || !string.Equals(File.ReadAllText(permit.FixtureMarkerPath).Trim(), MarkerContent, StringComparison.Ordinal))
|
||||
throw new InvalidOperationException("LINE_NUMBER_EDIT_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
var fixtureRoot = Path.GetDirectoryName(Path.GetFullPath(permit.FixtureMarkerPath))! + Path.DirectorySeparatorChar;
|
||||
if (!Path.GetFullPath(document.Name).StartsWith(fixtureRoot, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("LINE_NUMBER_EDIT_APPLY_TEST_FIXTURE_REQUIRED");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class LineNumberEditCommands
|
||||
{
|
||||
public static void Renumber()
|
||||
{
|
||||
Run("PXP-ESN", (document, editor, selected) =>
|
||||
{
|
||||
var start = editor.GetInteger(new PromptIntegerOptions("\nВведите новое начальное значение маркера: ") { LowerLimit = 1 });
|
||||
if (start.Status != PromptStatus.OK) return null;
|
||||
var rows = new LineNumberOwnedAnnotationReader().ReadList(document, selected);
|
||||
return LineNumberEditPlanner.Renumber(rows, start.Value);
|
||||
}, "Выберите блок списка номеров линий: ");
|
||||
}
|
||||
|
||||
public static void EditText()
|
||||
{
|
||||
Run("PXP-ELN", (document, editor, selected) =>
|
||||
{
|
||||
var rows = new LineNumberOwnedAnnotationReader().ReadList(document, selected);
|
||||
var marker = editor.GetInteger(new PromptIntegerOptions("\nВведите номер редактируемого маркера: ") { LowerLimit = 1 });
|
||||
if (marker.Status != PromptStatus.OK) return null;
|
||||
var row = rows.SingleOrDefault(value => value.MarkerNumber == marker.Value) ?? throw new InvalidOperationException("LINE_NUMBER_ROW_NOT_FOUND");
|
||||
var text = editor.GetString(new PromptStringOptions("\nВведите новый текст номера линии: ") { AllowSpaces = true });
|
||||
if (text.Status != PromptStatus.OK) return null;
|
||||
return [LineNumberEditPlanner.EditText(row, text.StringResult)];
|
||||
}, "Выберите блок списка номеров линий: ");
|
||||
}
|
||||
|
||||
public static void ResetMarkerPosition()
|
||||
{
|
||||
Run("PXP-RMP", (document, _, selected) =>
|
||||
{
|
||||
var row = new LineNumberOwnedAnnotationReader().ReadMarker(document, selected);
|
||||
var configured = LineNumberRuntimeConfigurationReader.Read().Assets.Marker.Texts[0].Position;
|
||||
return [LineNumberEditPlanner.ResetMarkerAttributePosition(row, configured)];
|
||||
}, "Выберите маркер номера линии: ");
|
||||
}
|
||||
|
||||
private static void Run(string command, Func<Document, Editor, ObjectId, IReadOnlyList<LineNumberRowMutation>?> operation, string prompt)
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
// These legacy editing paths are mutating commands. Until each
|
||||
// command has a permit that binds its selected owned block and
|
||||
// requested edit, DryRun must remain read-only rather than letting
|
||||
// an editor prompt accidentally commit a transaction.
|
||||
if (!IsApply())
|
||||
{
|
||||
document.Editor.WriteMessage($"\n{command} preview boundary: Apply permit is required; DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("LineNumberEditPreviewCompleted", commandName: command, resultStatus: "ApplyPermitRequired", document: document);
|
||||
return;
|
||||
}
|
||||
var options = new PromptEntityOptions($"\n{prompt}");
|
||||
options.SetRejectMessage("\nТребуется вхождение блока PXP-LN.");
|
||||
options.AddAllowedClass(typeof(BlockReference), true);
|
||||
var selected = document.Editor.GetEntity(options);
|
||||
if (selected.Status != PromptStatus.OK) return;
|
||||
var mutations = operation(document, document.Editor, selected.ObjectId);
|
||||
if (mutations is null) return;
|
||||
var selectedHandle = selected.ObjectId.Handle.ToString();
|
||||
LineNumberEditApplyPermitReader.Validate(document, LineNumberEditApplyPermitReader.Read(), command, selectedHandle, mutations);
|
||||
var result = new LineNumberAnnotationWriter().ApplyEdits(document, mutations);
|
||||
document.Editor.WriteMessage($"\n{command}: updated={result.Updated}; unchanged={result.Unchanged}.");
|
||||
RuntimeDiagnostics.Write("LineNumberEditCompleted", commandName: command, resultStatus: result.Updated > 0 ? "Updated" : "AlreadyCurrent", document: document,
|
||||
details: new Dictionary<string, object?> { ["Updated"] = result.Updated, ["AlreadyCurrent"] = result.Unchanged });
|
||||
}
|
||||
catch (System.Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("LineNumberEditFailed", "ERROR", commandName: command, resultStatus: exception.Message, exception: exception, document: document);
|
||||
document.Editor.WriteMessage($"\n{command}: {exception.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private static bool IsApply() => string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class LineNumberOwnedAnnotationReader
|
||||
{
|
||||
private const string ApplicationName = "PXP-LN";
|
||||
|
||||
public IReadOnlyList<LineNumberOwnedRow> ReadList(Document document, ObjectId listId)
|
||||
{
|
||||
using var transaction = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
if (transaction.GetObject(listId, OpenMode.ForRead) is not BlockReference list || !HasRole(list, "LIST"))
|
||||
throw new InvalidOperationException("LINE_NUMBER_LIST_NOT_SELECTED");
|
||||
|
||||
var rows = new Dictionary<int, (string? StableId, string? Text)>();
|
||||
foreach (ObjectId id in list.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(id, OpenMode.ForRead);
|
||||
var ownership = ReadOwnership(attribute);
|
||||
if (ownership is null) continue;
|
||||
rows.TryGetValue(ownership.Value.MarkerNumber, out var row);
|
||||
rows[ownership.Value.MarkerNumber] = ownership.Value.Role == "LINENUMBER"
|
||||
? (ownership.Value.StableId, attribute.TextString.Replace("\\P", "\n", StringComparison.Ordinal))
|
||||
: (ownership.Value.StableId ?? row.StableId, row.Text);
|
||||
}
|
||||
|
||||
var result = rows.OrderBy(value => value.Key)
|
||||
.Select(value => new LineNumberOwnedRow(
|
||||
value.Value.StableId ?? throw new InvalidOperationException("LINE_NUMBER_ROW_STABLE_ID_MISSING"),
|
||||
value.Key,
|
||||
value.Value.Text ?? throw new InvalidOperationException("LINE_NUMBER_ROW_TEXT_MISSING"),
|
||||
default))
|
||||
.ToArray();
|
||||
if (result.Length == 0) throw new InvalidOperationException("LINE_NUMBER_LIST_EMPTY");
|
||||
return result;
|
||||
}
|
||||
|
||||
public LineNumberOwnedRow ReadMarker(Document document, ObjectId markerId)
|
||||
{
|
||||
using var transaction = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
if (transaction.GetObject(markerId, OpenMode.ForRead) is not BlockReference marker)
|
||||
throw new InvalidOperationException("LINE_NUMBER_MARKER_NOT_SELECTED");
|
||||
var values = marker.GetXDataForApplication(ApplicationName)?.AsArray() ?? [];
|
||||
var stableId = values.Where(value => value.TypeCode == 1000).Select(value => value.Value as string)
|
||||
.FirstOrDefault(value => !string.Equals(value, "MARKER", StringComparison.OrdinalIgnoreCase));
|
||||
var markerNumber = values.Where(value => value.TypeCode == 1071).Select(value => Convert.ToInt32(value.Value)).FirstOrDefault();
|
||||
var text = values.Where(value => value.TypeCode == 1000).Select(value => value.Value as string).LastOrDefault() ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(stableId) || markerNumber <= 0) throw new InvalidOperationException("LINE_NUMBER_MARKER_OWNERSHIP_MISSING");
|
||||
var localPosition = Point3d.Origin;
|
||||
foreach (ObjectId id in marker.AttributeCollection)
|
||||
{
|
||||
var attribute = (AttributeReference)transaction.GetObject(id, OpenMode.ForRead);
|
||||
if (!string.Equals(attribute.Tag, "NUMBER", StringComparison.OrdinalIgnoreCase)) continue;
|
||||
localPosition = attribute.Position.TransformBy(marker.BlockTransform.Inverse());
|
||||
break;
|
||||
}
|
||||
return new(stableId, markerNumber, text, new(localPosition.X, localPosition.Y, localPosition.Z));
|
||||
}
|
||||
|
||||
public IReadOnlyList<LineNumberOwnedRow> ReadMarkers(Document document)
|
||||
{
|
||||
using var transaction = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForRead);
|
||||
var rows = new List<LineNumberOwnedRow>();
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not BlockReference marker || !HasRole(marker, "MARKER")) continue;
|
||||
var values = marker.GetXDataForApplication(ApplicationName)?.AsArray() ?? [];
|
||||
var strings = values.Where(value => value.TypeCode == 1000).Select(value => value.Value as string).ToArray();
|
||||
var stableId = strings.FirstOrDefault(value => !string.Equals(value, "MARKER", StringComparison.OrdinalIgnoreCase));
|
||||
var markerNumber = values.Where(value => value.TypeCode == 1071).Select(value => Convert.ToInt32(value.Value)).FirstOrDefault();
|
||||
var text = strings.LastOrDefault() ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(stableId) || markerNumber <= 0) continue;
|
||||
rows.Add(new(stableId, markerNumber, text, default));
|
||||
}
|
||||
return rows.OrderBy(value => value.MarkerNumber).ThenBy(value => value.SourceStableId, StringComparer.Ordinal).ToArray();
|
||||
}
|
||||
|
||||
private static bool HasRole(BlockReference reference, string role) =>
|
||||
reference.GetXDataForApplication(ApplicationName)?.AsArray().Any(value =>
|
||||
value.TypeCode == 1000 && string.Equals(value.Value as string, role, StringComparison.OrdinalIgnoreCase)) == true;
|
||||
|
||||
private static (string? StableId, string Role, int MarkerNumber)? ReadOwnership(AttributeReference attribute)
|
||||
{
|
||||
var values = attribute.GetXDataForApplication(ApplicationName)?.AsArray();
|
||||
if (values is null) return null;
|
||||
var strings = values.Where(value => value.TypeCode == 1000).Select(value => value.Value as string).ToArray();
|
||||
var role = strings.FirstOrDefault(value => value is "MARKER" or "LINENUMBER");
|
||||
var number = values.Where(value => value.TypeCode == 1071).Select(value => Convert.ToInt32(value.Value)).FirstOrDefault();
|
||||
return role is null || number <= 0 ? null : (strings.FirstOrDefault(value => value != role), role, number);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// PXP-ULN refreshes the source-backed text of already-owned annotations. The
|
||||
// legacy command drives the same operation across selected Ortho drawings; the
|
||||
// modern command keeps the mutation pipeline scoped to the active controlled
|
||||
// drawing until the Ortho drawing enumerator is ported.
|
||||
internal static class LineNumberRefreshCommand
|
||||
{
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
var configuration = LineNumberRuntimeConfigurationReader.Read();
|
||||
var definition = configuration.Annotations.Annotations.OrderBy(value => value.Nickname, StringComparer.Ordinal).First();
|
||||
var manager = PlantApplication.ProjectPart("Piping")?.DataLinksManager ?? throw new InvalidOperationException("LINE_NUMBER_PIPING_DATALINKS_UNAVAILABLE");
|
||||
var owned = new LineNumberOwnedAnnotationReader().ReadMarkers(document);
|
||||
if (owned.Count == 0) throw new InvalidOperationException("LINE_NUMBER_OWNED_MARKERS_NOT_FOUND");
|
||||
var candidates = owned.Select(row => ReadCandidate(document.Database, row, manager, configuration.Assets)).ToArray();
|
||||
var preview = new LineNumberCommandPreviewService(
|
||||
new LineNumberCommandPlanner(new LineNumberAnnotationFormatter()),
|
||||
new LineNumberFieldResolver(new PlantDataLinksPropertyReader(manager)))
|
||||
.Preview(definition, candidates, owned.Select(row => new ExistingLineNumberAnnotation(row.SourceStableId, row.SourceStableId, row.Text)));
|
||||
if (!preview.Success) throw new InvalidOperationException(preview.FailureCode);
|
||||
|
||||
var rows = owned.ToDictionary(row => row.SourceStableId, StringComparer.OrdinalIgnoreCase);
|
||||
var apply = preview.Plan!.Operations.Where(operation => operation.Kind is AnnotationOperationKind.Create or AnnotationOperationKind.Update)
|
||||
.Select(operation => new LineNumberApplyPreflight(operation.StableId, rows[operation.StableId].MarkerNumber, operation.Text!, operation.Position, operation.Rotation, operation.Layer, operation.TextStyle))
|
||||
.OrderBy(operation => operation.MarkerNumber).ToArray();
|
||||
if (!IsApply())
|
||||
{
|
||||
document.Editor.WriteMessage($"\nPXP-ULN preview: changes={apply.Length}; DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("LineNumberRefreshPreviewCompleted", commandName: "PXP-ULN", resultStatus: "PreviewCompleted", document: document,
|
||||
details: new Dictionary<string, object?> { ["OperationCount"] = apply.Length, ["Scope"] = "ActiveDrawing" });
|
||||
return;
|
||||
}
|
||||
|
||||
// The controlled Apply contract is deliberately narrow: a permit
|
||||
// binds one resolved source/text pair, preventing a refresh from
|
||||
// widening into an unreviewed drawing-wide write.
|
||||
if (apply.Length != 1) throw new InvalidOperationException("LINE_NUMBER_REFRESH_APPLY_REQUIRES_EXACTLY_ONE_OPERATION");
|
||||
LineNumberApplyPermitReader.Validate(document, LineNumberApplyPermitReader.Read(), apply[0]);
|
||||
var writer = new LineNumberAnnotationWriter();
|
||||
var markerResult = writer.Apply(document, apply, configuration.Assets);
|
||||
var mutations = apply.Select(item => new LineNumberRowMutation(item.StableId, rows[item.StableId].MarkerNumber, item.MarkerNumber, item.Text, null)).ToArray();
|
||||
var listResult = writer.ApplyEdits(document, mutations);
|
||||
document.Editor.WriteMessage($"\nPXP-ULN: updated markers={markerResult.Updated}; lists={listResult.Updated}; already-current={markerResult.Unchanged}.");
|
||||
RuntimeDiagnostics.Write("LineNumberRefreshCompleted", commandName: "PXP-ULN", resultStatus: markerResult.Updated > 0 ? "Updated" : "AlreadyCurrent", document: document,
|
||||
details: new Dictionary<string, object?> { ["UpdatedMarkers"] = markerResult.Updated, ["UpdatedLists"] = listResult.Updated, ["AlreadyCurrent"] = markerResult.Unchanged, ["Scope"] = "ActiveDrawing" });
|
||||
}
|
||||
catch (System.Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("LineNumberRefreshFailed", "ERROR", commandName: "PXP-ULN", resultStatus: exception.Message, exception: exception, document: document);
|
||||
document.Editor.WriteMessage($"\nPXP-ULN: {exception.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private static bool IsApply() => string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
private static LineNumberCandidate ReadCandidate(Database database, LineNumberOwnedRow row, Autodesk.ProcessPower.DataLinks.DataLinksManager manager, AnnotateLineNumbersAssets assets)
|
||||
{
|
||||
const string prefix = "acad:";
|
||||
if (!row.SourceStableId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("LINE_NUMBER_SOURCE_ID_UNSUPPORTED");
|
||||
if (!long.TryParse(row.SourceStableId[prefix.Length..], System.Globalization.NumberStyles.HexNumber, System.Globalization.CultureInfo.InvariantCulture, out var handle))
|
||||
throw new InvalidOperationException("LINE_NUMBER_SOURCE_HANDLE_INVALID");
|
||||
var id = database.GetObjectId(false, new Handle(handle), 0);
|
||||
var read = new PlantLineNumberCandidateReader(manager).Read(id, assets.Marker.Layer, assets.Marker.Texts[0].TextStyle);
|
||||
if (!read.Success) throw new InvalidOperationException(read.FailureCode);
|
||||
return read.Candidate!;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed record LineNumberRuntimeConfiguration(LineNumberAnnotationSettings Annotations, AnnotateLineNumbersAssets Assets, LineConnectionAssets Connections);
|
||||
|
||||
internal static class LineNumberRuntimeConfigurationReader
|
||||
{
|
||||
public static LineNumberRuntimeConfiguration Read()
|
||||
{
|
||||
var annotationPath = RequiredLocalFile("P_REC_ANNOT_LINE_NUMBER_ANNOTATION_SETTINGS_PATH");
|
||||
var drawingPath = RequiredLocalFile("P_REC_ANNOT_LINE_NUMBER_DRAWING_SETTINGS_PATH");
|
||||
var drawingXml = File.ReadAllText(drawingPath);
|
||||
return new(new LineNumberAnnotationSettingsLoader().Load(File.ReadAllText(annotationPath)), new AnnotateLineNumbersSettingsLoader().Load(drawingXml), new LineConnectionSettingsLoader().Load(drawingXml));
|
||||
}
|
||||
|
||||
private static string RequiredLocalFile(string variable)
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable(variable);
|
||||
if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.StartsWith("\\\\", StringComparison.Ordinal) || !File.Exists(path))
|
||||
throw new InvalidOperationException($"LINE_NUMBER_CONFIGURATION_REQUIRED:{variable}");
|
||||
return path;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class ManualAnnotationEditCommand
|
||||
{
|
||||
private const string AppName = "P_REC_ANNOT_MANUAL";
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
var options = new PromptEntityOptions("\nSelect owned manual annotation to edit: ");
|
||||
options.SetRejectMessage("\nSelect a block reference.");
|
||||
options.AddAllowedClass(typeof(BlockReference), true);
|
||||
var selection = document.Editor.GetEntity(options);
|
||||
if (selection.Status != PromptStatus.OK) return;
|
||||
|
||||
using var documentLock = document.LockDocument();
|
||||
using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
var reference = transaction.GetObject(selection.ObjectId, OpenMode.ForWrite) as BlockReference;
|
||||
if (reference is null) return;
|
||||
var state = ReadState(reference);
|
||||
if (state is null)
|
||||
{
|
||||
document.Editor.WriteMessage("\nManual annotation state is missing or invalid; no migration was performed.");
|
||||
return;
|
||||
}
|
||||
|
||||
document.Editor.WriteMessage($"\nRestored {state.Kind}; datum={state.DatumMode}; offset={state.DatumOffset:0.###}.");
|
||||
foreach (ObjectId attributeId in reference.AttributeCollection)
|
||||
{
|
||||
var attribute = transaction.GetObject(attributeId, OpenMode.ForWrite) as AttributeReference;
|
||||
if (attribute is null) continue;
|
||||
var prompt = new PromptStringOptions($"\n{attribute.Tag} <{attribute.TextString}>: ") { AllowSpaces = true, UseDefaultValue = true, DefaultValue = attribute.TextString };
|
||||
var value = document.Editor.GetString(prompt);
|
||||
if (value.Status == PromptStatus.OK) attribute.TextString = value.StringResult;
|
||||
else if (value.Status is PromptStatus.Cancel or PromptStatus.Error) return;
|
||||
}
|
||||
reference.XData = new ResultBuffer(new TypedValue((int)DxfCode.ExtendedDataRegAppName, AppName), new TypedValue((int)DxfCode.ExtendedDataAsciiString, state.Serialize()));
|
||||
transaction.Commit();
|
||||
document.Editor.WriteMessage("\nManual annotation updated; native AutoCAD UNDO is available.");
|
||||
RuntimeDiagnostics.Write("ManualAnnotationEditCompleted", commandName: "CAC1", resultStatus: "Updated", document: document);
|
||||
}
|
||||
|
||||
private static ManualAnnotationState? ReadState(BlockReference reference)
|
||||
{
|
||||
using var data = reference.GetXDataForApplication(AppName);
|
||||
var serialized = data?.AsArray().FirstOrDefault(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Value as string;
|
||||
return ManualAnnotationState.Deserialize(serialized);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using Autodesk.AutoCAD.Windows;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using PRecAnnot.Core;
|
||||
using WinForms = System.Windows.Forms;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class ManualAnnotationPalette
|
||||
{
|
||||
private static readonly Guid PaletteId = new("dc74a715-60cc-6f6b-8dc7-ccf6a3e52d60");
|
||||
private static PaletteSet? palette;
|
||||
private static ManualAnnotationControl? control;
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
AcadApplication.DocumentManager.DocumentActivated -= DocumentActivated;
|
||||
AcadApplication.DocumentManager.DocumentActivated += DocumentActivated;
|
||||
}
|
||||
public static void Terminate()
|
||||
{
|
||||
AcadApplication.DocumentManager.DocumentActivated -= DocumentActivated;
|
||||
if (palette is not null) palette.Visible = false;
|
||||
}
|
||||
public static void Show()
|
||||
{
|
||||
if (palette is null)
|
||||
{
|
||||
control = new ManualAnnotationControl();
|
||||
palette = new PaletteSet("Ortho drawing annotations", "P_REC_ANNOT_MANUAL", PaletteId)
|
||||
{ Style = PaletteSetStyles.NameEditable | PaletteSetStyles.ShowPropertiesMenu | PaletteSetStyles.ShowAutoHideButton | PaletteSetStyles.ShowCloseButton };
|
||||
palette.Add("Annotations", control);
|
||||
}
|
||||
control!.RefreshAvailability(); palette.Visible = true;
|
||||
RuntimeDiagnostics.Write("ManualAnnotationPaletteShown", resultStatus: "Visible");
|
||||
}
|
||||
public static void PlaceSelected() => control?.Place();
|
||||
public static ManualAnnotationState CurrentState() => control?.CurrentState() ?? new ManualAnnotationState("AutoCadBlock", ManualDatumMode.Absolute, 0);
|
||||
private static void DocumentActivated(object sender, Autodesk.AutoCAD.ApplicationServices.DocumentCollectionEventArgs args) => control?.RefreshAvailability();
|
||||
}
|
||||
|
||||
internal sealed class ManualAnnotationControl : WinForms.UserControl
|
||||
{
|
||||
private readonly WinForms.FlowLayoutPanel choices = new() { Dock = WinForms.DockStyle.Top, AutoSize = true, FlowDirection = WinForms.FlowDirection.TopDown, WrapContents = false };
|
||||
private readonly WinForms.Button place = new() { Text = "Place", AutoSize = true };
|
||||
private readonly WinForms.Button reconnect = new() { Text = "Reconnect / refresh", AutoSize = true };
|
||||
private readonly WinForms.Button help = new() { Text = "Help", AutoSize = true };
|
||||
private readonly WinForms.RadioButton absoluteDatum = new() { Text = "Absolute datum", AutoSize = true, Checked = true };
|
||||
private readonly WinForms.RadioButton relativeDatum = new() { Text = "Relative datum", AutoSize = true };
|
||||
private readonly WinForms.NumericUpDown datumOffset = new() { DecimalPlaces = 3, Minimum = -100000, Maximum = 100000, Increment = 0.001M, Enabled = false };
|
||||
private readonly Dictionary<WinForms.RadioButton, ManualAnnotationKind> kinds = new();
|
||||
public ManualAnnotationControl()
|
||||
{
|
||||
Dock = WinForms.DockStyle.Fill; AutoScroll = true;
|
||||
Add("Line number", ManualAnnotationKind.LineNumber, true); Add("Valve or nozzle", ManualAnnotationKind.ValveOrNozzle); Add("Flow direction", ManualAnnotationKind.FlowDirection);
|
||||
Add("Instrument position", ManualAnnotationKind.InstrumentPosition); Add("Section elevation", ManualAnnotationKind.SectionElevation); Add("Instrument connection point", ManualAnnotationKind.InstrumentConnection);
|
||||
Add("AutoCAD block", ManualAnnotationKind.AutoCadBlock); Add("Platform elevation", ManualAnnotationKind.PlatformElevation); Add("Other elevation", ManualAnnotationKind.OtherElevation);
|
||||
place.Click += (_, _) => Place(); reconnect.Click += (_, _) => Reconnect(); help.Click += (_, _) => OpenHelp();
|
||||
var datum = new WinForms.FlowLayoutPanel { Dock = WinForms.DockStyle.Top, AutoSize = true }; datum.Controls.Add(absoluteDatum); datum.Controls.Add(relativeDatum); datum.Controls.Add(datumOffset);
|
||||
absoluteDatum.CheckedChanged += (_, _) => datumOffset.Enabled = relativeDatum.Checked;
|
||||
relativeDatum.CheckedChanged += (_, _) => datumOffset.Enabled = relativeDatum.Checked;
|
||||
var actions = new WinForms.FlowLayoutPanel { Dock = WinForms.DockStyle.Top, AutoSize = true }; actions.Controls.Add(place); actions.Controls.Add(reconnect); actions.Controls.Add(help);
|
||||
Controls.Add(datum); Controls.Add(actions); Controls.Add(choices); RefreshTheme();
|
||||
}
|
||||
private void Add(string text, ManualAnnotationKind kind, bool selected = false) { var button = new WinForms.RadioButton { Text = text, AutoSize = true, Checked = selected }; kinds.Add(button, kind); choices.Controls.Add(button); }
|
||||
public void RefreshAvailability() { var available = AcadApplication.DocumentManager.MdiActiveDocument is not null && PlantApplication.CurrentProject is not null; place.Enabled = available; reconnect.Enabled = available; RefreshTheme(); }
|
||||
public void Place()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument; if (document is null) return;
|
||||
var kind = kinds.First(value => value.Key.Checked).Value;
|
||||
var command = ManualAnnotationCommandRouter.Resolve(kind);
|
||||
document.SendStringToExecute(command + " ", true, false, false);
|
||||
RuntimeDiagnostics.Write("ManualAnnotationActionInvoked", commandName: command, resultStatus: kind.ToString(), document: document);
|
||||
}
|
||||
public ManualAnnotationState CurrentState() => new(kinds.First(value => value.Key.Checked).Value.ToString(), relativeDatum.Checked ? ManualDatumMode.Relative : ManualDatumMode.Absolute, (double)datumOffset.Value);
|
||||
private static void Reconnect() => AcadApplication.DocumentManager.MdiActiveDocument?.SendStringToExecute("PXP-ULN ", true, false, false);
|
||||
private static void OpenHelp()
|
||||
{
|
||||
var path = Path.Combine(Path.GetDirectoryName(typeof(ManualAnnotationControl).Assembly.Location)!, "ManualAnnotationHelp.pdf");
|
||||
if (File.Exists(path)) System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(path) { UseShellExecute = true });
|
||||
}
|
||||
private void RefreshTheme()
|
||||
{
|
||||
var dark = Convert.ToInt16(AcadApplication.GetSystemVariable("COLORTHEME")) == 0;
|
||||
BackColor = dark ? System.Drawing.Color.FromArgb(92, 92, 92) : System.Drawing.Color.FromArgb(245, 245, 245); ForeColor = dark ? System.Drawing.Color.White : System.Drawing.Color.Black;
|
||||
foreach (WinForms.Control child in choices.Controls) { child.BackColor = BackColor; child.ForeColor = ForeColor; }
|
||||
}
|
||||
}
|
||||
|
||||
internal static class ManualBlockInsertionCommand
|
||||
{
|
||||
public static void Run(ManualAnnotationState state)
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument; if (document is null) return;
|
||||
var name = document.Editor.GetString(new PromptStringOptions("\nBlock name: ") { AllowSpaces = true }); if (name.Status != PromptStatus.OK || string.IsNullOrWhiteSpace(name.StringResult)) return;
|
||||
var point = document.Editor.GetPoint("\nInsertion point: "); if (point.Status != PromptStatus.OK) return;
|
||||
var angle = document.Editor.GetAngle(new PromptAngleOptions("\nRotation <0>: ") { AllowNone = true, BasePoint = point.Value, UseBasePoint = true }); if (angle.Status is not (PromptStatus.OK or PromptStatus.None)) return;
|
||||
using var documentLock = document.LockDocument(); using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead); if (!blocks.Has(name.StringResult)) { document.Editor.WriteMessage("\nBlock definition not found."); return; }
|
||||
var space = (BlockTableRecord)transaction.GetObject(document.Database.CurrentSpaceId, OpenMode.ForWrite); var definition = (BlockTableRecord)transaction.GetObject(blocks[name.StringResult], OpenMode.ForRead);
|
||||
using var reference = new BlockReference(point.Value, definition.ObjectId) { Rotation = angle.Status == PromptStatus.OK ? angle.Value : 0 };
|
||||
space.AppendEntity(reference); transaction.AddNewlyCreatedDBObject(reference, true);
|
||||
var regApps = (RegAppTable)transaction.GetObject(document.Database.RegAppTableId, OpenMode.ForRead);
|
||||
const string appName = "P_REC_ANNOT_MANUAL";
|
||||
if (!regApps.Has(appName)) { regApps.UpgradeOpen(); using var app = new RegAppTableRecord { Name = appName }; regApps.Add(app); transaction.AddNewlyCreatedDBObject(app, true); }
|
||||
reference.XData = new ResultBuffer(new TypedValue((int)DxfCode.ExtendedDataRegAppName, appName), new TypedValue((int)DxfCode.ExtendedDataAsciiString, state.Serialize()));
|
||||
foreach (ObjectId id in definition)
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is AttributeDefinition source && !source.Constant)
|
||||
{ var value = document.Editor.GetString(new PromptStringOptions($"\n{source.Tag} <{source.TextString}>: ") { AllowSpaces = true }); using var attribute = new AttributeReference(); attribute.SetAttributeFromBlock(source, reference.BlockTransform); attribute.TextString = value.Status == PromptStatus.OK ? value.StringResult : source.TextString; reference.AttributeCollection.AppendAttribute(attribute); transaction.AddNewlyCreatedDBObject(attribute, true); }
|
||||
transaction.Commit(); document.Editor.WriteMessage("\nManual block placed; AutoCAD UNDO is available.");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.ProcessPower.P3dProjectParts;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using PRecAnnot.Abstractions;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Core.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Source port of OrthoAutoAnnotate.Commands.RemoveAnnotations (PXP-RA).
|
||||
// The modern writer records the viewport identity in PXP-OA XData, allowing
|
||||
// deterministic removal without depending on the historical named-dictionary scan.
|
||||
internal static class OrthoAnnotationRemovalCommand
|
||||
{
|
||||
private const string ApplicationName = "PXP-OA";
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
var options = new PromptEntityOptions("\nSelect Ortho viewport: ");
|
||||
options.SetRejectMessage("\nA viewport is required.");
|
||||
options.AddAllowedClass(typeof(Viewport), true);
|
||||
var selected = document.Editor.GetEntity(options);
|
||||
if (selected.Status != PromptStatus.OK) return;
|
||||
var viewport = Resolve(document, selected.ObjectId);
|
||||
|
||||
using var documentLock = document.LockDocument();
|
||||
using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForRead);
|
||||
var removed = 0;
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
var entity = transaction.GetObject(id, OpenMode.ForRead) as Entity;
|
||||
if (entity is null || !OwnedByViewport(entity, viewport.Id)) continue;
|
||||
entity.UpgradeOpen();
|
||||
entity.Erase();
|
||||
removed++;
|
||||
}
|
||||
transaction.Commit();
|
||||
document.Editor.WriteMessage($"\nPXP-RA: removed={removed}; native AutoCAD UNDO is available.");
|
||||
RuntimeDiagnostics.Write("OrthoAnnotationRemovalCompleted", commandName: "PXP-RA", resultStatus: "Completed", document: document, details: new Dictionary<string, object?> { ["Removed"] = removed, ["Viewport"] = viewport.Id });
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("OrthoAnnotationRemovalFailed", "ERROR", commandName: "PXP-RA", resultStatus: exception.Message, exception: exception, document: document);
|
||||
document.Editor.WriteMessage("\nPXP-RA: " + exception.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private static OrthoViewportInfo Resolve(Document document, ObjectId selectedId)
|
||||
{
|
||||
using var transaction = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
var selected = (Viewport)transaction.GetObject(selectedId, OpenMode.ForRead);
|
||||
var project = PlantApplication.ProjectPart("Ortho") as OrthoProject ?? throw new InvalidOperationException("ORTHO_PROJECT_UNAVAILABLE");
|
||||
var matches = new PlantOrthoViewportReader(project, document.Name).ReadViewports(CancellationToken.None)
|
||||
.Where(x => Math.Abs(x.CenterX - selected.CenterPoint.X) < .001 && Math.Abs(x.CenterY - selected.CenterPoint.Y) < .001 && Math.Abs(x.Width - selected.Width) < .001 && Math.Abs(x.Height - selected.Height) < .001)
|
||||
.ToArray();
|
||||
return matches.Length == 1 ? matches[0] : throw new InvalidOperationException(matches.Length == 0 ? "ORTHO_VIEW_NOT_FOUND" : "ORTHO_VIEW_AMBIGUOUS");
|
||||
}
|
||||
|
||||
private static bool OwnedByViewport(Entity entity, string viewportId)
|
||||
{
|
||||
using var data = entity.GetXDataForApplication(ApplicationName);
|
||||
var values = data?.AsArray().Where(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Select(value => value.Value?.ToString()).ToArray();
|
||||
return values is { Length: >= 2 } && string.Equals(values[0], "VIEWPORT", StringComparison.Ordinal) && string.Equals(values[1], viewportId, StringComparison.Ordinal);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class OrthoAnnotationWriter
|
||||
{
|
||||
private const string ApplicationName = "PXP-OA";
|
||||
public string Replace(Document document, OrthoViewportInfo viewport, PlantObjectSnapshot source, OrthoAnnotationClassification classification, OrthoAnnotationAssets assets)
|
||||
{
|
||||
if (source.Geometry.PaperPosition is not { } point || classification.Representation == OrthoAnnotationRepresentation.None) throw new InvalidOperationException("ORTHO_ANNOTATION_OPERATION_INVALID");
|
||||
using var documentLock = document.LockDocument(); using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
var blocks = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var layers = (LayerTable)transaction.GetObject(document.Database.LayerTableId, OpenMode.ForRead);
|
||||
var styles = (TextStyleTable)transaction.GetObject(document.Database.TextStyleTableId, OpenMode.ForRead);
|
||||
var leaders = (DBDictionary)transaction.GetObject(document.Database.MLeaderStyleDictionaryId, OpenMode.ForRead);
|
||||
if (!layers.Has(assets.Layer)) throw new InvalidOperationException("ORTHO_ANNOTATION_LAYER_MISSING:" + assets.Layer);
|
||||
if (!styles.Has(assets.TextStyle)) throw new InvalidOperationException("ORTHO_ANNOTATION_TEXT_STYLE_MISSING:" + assets.TextStyle);
|
||||
if (!leaders.Contains(assets.MultiLeaderStyle)) throw new InvalidOperationException("ORTHO_ANNOTATION_MLEADER_STYLE_MISSING:" + assets.MultiLeaderStyle);
|
||||
if (classification.Representation == OrthoAnnotationRepresentation.BubbleBlock && !blocks.Has(assets.BubbleBlock)) throw new InvalidOperationException("ORTHO_ANNOTATION_BUBBLE_BLOCK_MISSING:" + assets.BubbleBlock);
|
||||
EnsureRegApp(transaction, document.Database);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(blocks[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
var deleted = 0;
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
var entity = transaction.GetObject(id, OpenMode.ForRead) as Entity; if (entity is null || !OwnedBy(entity, source.SnapshotId)) continue;
|
||||
entity.UpgradeOpen(); entity.Erase(); deleted++;
|
||||
}
|
||||
var start = new Point3d(point.X, point.Y, 0); var right = point.X >= viewport.CenterX;
|
||||
var land = new Point3d(viewport.CenterX + (right ? viewport.Width / 2d + 5d : -viewport.Width / 2d - 5d), point.Y, 0);
|
||||
if (classification.Representation == OrthoAnnotationRepresentation.MultiLeader)
|
||||
{
|
||||
using var leader = new MLeader { LayerId = layers[assets.Layer], MLeaderStyle = leaders.GetAt(assets.MultiLeaderStyle), ContentType = ContentType.MTextContent, LeaderLineType = LeaderType.StraightLeader };
|
||||
var leaderId = leader.AddLeader(); var lineId = leader.AddLeaderLine(leaderId); leader.AddFirstVertex(lineId, start); leader.AddLastVertex(lineId, land);
|
||||
using var text = new MText { Contents = classification.Text, TextStyleId = styles[assets.TextStyle], Location = land, BackgroundFill = true, UseBackgroundColor = true, BackgroundScaleFactor = 1.1 };
|
||||
leader.MText = text; leader.TextLocation = land; leader.XData = Ownership(viewport, source, classification);
|
||||
paper.AppendEntity(leader); transaction.AddNewlyCreatedDBObject(leader, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
var definition = (BlockTableRecord)transaction.GetObject(blocks[assets.BubbleBlock], OpenMode.ForRead);
|
||||
using var reference = new BlockReference(start, definition.ObjectId) { LayerId = layers[assets.Layer], XData = Ownership(viewport, source, classification) };
|
||||
paper.AppendEntity(reference); transaction.AddNewlyCreatedDBObject(reference, true);
|
||||
foreach (ObjectId id in definition)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not AttributeDefinition definitionAttribute || definitionAttribute.Constant) continue;
|
||||
using var attribute = new AttributeReference(); attribute.SetAttributeFromBlock(definitionAttribute, reference.BlockTransform); attribute.TextString = classification.Text; attribute.TextStyleId = styles[assets.TextStyle]; attribute.UpdateMTextAttribute(); reference.AttributeCollection.AppendAttribute(attribute); transaction.AddNewlyCreatedDBObject(attribute, true);
|
||||
}
|
||||
if (reference.IsDynamicBlock) foreach (DynamicBlockReferenceProperty property in reference.DynamicBlockReferencePropertyCollection)
|
||||
{
|
||||
if (property.ReadOnly) continue;
|
||||
if (string.Equals(property.PropertyName, "P1 X", StringComparison.OrdinalIgnoreCase)) property.Value = land.X - start.X;
|
||||
else if (string.Equals(property.PropertyName, "P1 Y", StringComparison.OrdinalIgnoreCase)) property.Value = land.Y - start.Y;
|
||||
}
|
||||
}
|
||||
transaction.Commit(); return deleted == 0 ? "Created" : "Updated";
|
||||
}
|
||||
private static bool OwnedBy(Entity entity, string source) => entity.GetXDataForApplication(ApplicationName)?.AsArray().Any(x => x.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(x.Value?.ToString(), source, StringComparison.Ordinal)) == true;
|
||||
private static ResultBuffer Ownership(OrthoViewportInfo viewport, PlantObjectSnapshot source, OrthoAnnotationClassification value)
|
||||
{
|
||||
source.Properties.TryGetValue("PRecAnnot.RowId", out var rowId);
|
||||
return new ResultBuffer(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, ApplicationName),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "VIEWPORT"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, viewport.Id),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "SOURCE"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, source.SnapshotId),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "SOURCE_DRAWING"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, viewport.SourceDrawingName ?? string.Empty),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "SOURCE_ROW"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, rowId ?? string.Empty),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "ANNOTATIONTEXT"), new TypedValue((int)DxfCode.ExtendedDataAsciiString, value.Text),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, value.Representation.ToString()));
|
||||
}
|
||||
private static void EnsureRegApp(Transaction transaction, Database database) { var table = (RegAppTable)transaction.GetObject(database.RegAppTableId, OpenMode.ForRead); if (table.Has(ApplicationName)) return; table.UpgradeOpen(); using var record = new RegAppTableRecord { Name = ApplicationName }; table.Add(record); transaction.AddNewlyCreatedDBObject(record, true); }
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Source-backed PXP-DJ mutation boundary. The legacy command dimensions the
|
||||
// selected PXP-OA annotation blocks, rejects mixed viewport scales and keeps
|
||||
// all dimension creation in one transaction so native UNDO restores the prior
|
||||
// state. The Plant-specific candidate discovery remains deliberately typed
|
||||
// through the PXP-OA ownership contract.
|
||||
internal static class OrthoDimensionCommand
|
||||
{
|
||||
private const string AnnotationApp = "PXP-OA";
|
||||
private const string DimensionApp = "PXP-DJ";
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
var selection = document.Editor.GetSelection(new SelectionFilter(new[] { new TypedValue((int)DxfCode.ExtendedDataRegAppName, AnnotationApp) }));
|
||||
if (selection.Status != PromptStatus.OK || selection.Value.Count < 2)
|
||||
{
|
||||
document.Editor.WriteMessage("\nSelect at least two PXP-OA annotations.");
|
||||
return;
|
||||
}
|
||||
|
||||
using var read = document.Database.TransactionManager.StartOpenCloseTransaction();
|
||||
var points = new List<(ObjectId Id, Point3d Position, string Viewport)>();
|
||||
foreach (var id in selection.Value.GetObjectIds())
|
||||
{
|
||||
if (read.GetObject(id, OpenMode.ForRead) is not BlockReference reference) continue;
|
||||
if (!TryReadViewport(reference, out var viewport)) continue;
|
||||
points.Add((id, reference.Position, viewport));
|
||||
}
|
||||
read.Commit();
|
||||
if (points.Count < 2 || points.Select(point => point.Viewport).Distinct(StringComparer.Ordinal).Count() != 1)
|
||||
{
|
||||
document.Editor.WriteMessage("\nSelected annotations must belong to one Ortho viewport.");
|
||||
return;
|
||||
}
|
||||
|
||||
points = points.OrderBy(point => point.Position.X).ThenBy(point => point.Position.Y).ThenBy(point => point.Id.Handle.Value).ToList();
|
||||
var defaultAngle = Math.Abs(points[^1].Position.X - points[0].Position.X) >= Math.Abs(points[^1].Position.Y - points[0].Position.Y) ? 0d : Math.PI / 2d;
|
||||
var angle = document.Editor.GetAngle(new PromptAngleOptions("\nDimension rotation <automatic>: ") { AllowNone = true });
|
||||
if (angle.Status is not (PromptStatus.OK or PromptStatus.None)) return;
|
||||
var rotation = angle.Status == PromptStatus.OK ? angle.Value : defaultAngle;
|
||||
var offset = document.Editor.GetPoint("\nDimension line location: ");
|
||||
if (offset.Status != PromptStatus.OK) return;
|
||||
|
||||
using var documentLock = document.LockDocument();
|
||||
using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
var table = (BlockTable)transaction.GetObject(document.Database.BlockTableId, OpenMode.ForRead);
|
||||
var paper = (BlockTableRecord)transaction.GetObject(table[BlockTableRecord.PaperSpace], OpenMode.ForWrite);
|
||||
EnsureRegApp(transaction, document.Database);
|
||||
EraseOwnedDimensions(transaction, paper, points[0].Viewport, points.Select(point => point.Id.Handle.ToString()).ToHashSet(StringComparer.OrdinalIgnoreCase));
|
||||
for (var index = 1; index < points.Count; index++)
|
||||
{
|
||||
var first = points[index - 1].Position;
|
||||
var second = points[index].Position;
|
||||
var dimension = new RotatedDimension(rotation, first, second, offset.Value, string.Empty, document.Database.Dimstyle);
|
||||
dimension.LayerId = document.Database.Clayer;
|
||||
dimension.XData = Ownership(points[0].Viewport, points.Select(point => point.Id.Handle.ToString()));
|
||||
paper.AppendEntity(dimension);
|
||||
transaction.AddNewlyCreatedDBObject(dimension, true);
|
||||
}
|
||||
transaction.Commit();
|
||||
document.Editor.WriteMessage($"\nCreated {points.Count - 1} Ortho dimensions; native UNDO is available.");
|
||||
}
|
||||
|
||||
private static bool TryReadViewport(BlockReference reference, out string viewport)
|
||||
{
|
||||
viewport = string.Empty;
|
||||
using var data = reference.GetXDataForApplication(AnnotationApp);
|
||||
var values = data?.AsArray().Where(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Select(value => value.Value?.ToString() ?? string.Empty).ToArray();
|
||||
if (values is null) return false;
|
||||
for (var index = 0; index + 1 < values.Length; index++) if (string.Equals(values[index], "VIEWPORT", StringComparison.Ordinal)) { viewport = values[index + 1]; break; }
|
||||
return !string.IsNullOrWhiteSpace(viewport);
|
||||
}
|
||||
|
||||
private static void EraseOwnedDimensions(Transaction transaction, BlockTableRecord paper, string viewport, HashSet<string> handles)
|
||||
{
|
||||
foreach (ObjectId id in paper)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not Entity entity) continue;
|
||||
using var data = entity.GetXDataForApplication(DimensionApp);
|
||||
var values = data?.AsArray().Where(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Select(value => value.Value?.ToString() ?? string.Empty).ToArray();
|
||||
if (values is null || !values.Contains(viewport, StringComparer.Ordinal)) continue;
|
||||
if (!handles.Any(handle => values.Contains(handle, StringComparer.OrdinalIgnoreCase))) continue;
|
||||
entity.UpgradeOpen();
|
||||
entity.Erase();
|
||||
}
|
||||
}
|
||||
|
||||
private static ResultBuffer Ownership(string viewport, IEnumerable<string> handles) => new(
|
||||
new TypedValue((int)DxfCode.ExtendedDataRegAppName, DimensionApp),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, viewport),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, "SOURCES"),
|
||||
new TypedValue((int)DxfCode.ExtendedDataAsciiString, string.Join(",", handles)));
|
||||
|
||||
private static void EnsureRegApp(Transaction transaction, Database database)
|
||||
{
|
||||
var table = (RegAppTable)transaction.GetObject(database.RegAppTableId, OpenMode.ForRead);
|
||||
if (table.Has(DimensionApp)) return;
|
||||
table.UpgradeOpen();
|
||||
using var record = new RegAppTableRecord { Name = DimensionApp };
|
||||
table.Add(record);
|
||||
transaction.AddNewlyCreatedDBObject(record, true);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.P3dProjectParts;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Core.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class OrthoMaintenanceCommands
|
||||
{
|
||||
public static void CheckViewport()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return;
|
||||
try
|
||||
{
|
||||
var options = new PromptEntityOptions("\nВыберите видовой экран для проверки: ");
|
||||
options.SetRejectMessage("\nДолжен быть видовой экран."); options.AddAllowedClass(typeof(Viewport), true);
|
||||
var selected = document.Editor.GetEntity(options); if (selected.Status != PromptStatus.OK) return;
|
||||
OrthoViewportInfo view;
|
||||
ViewportLayerPlan layerPlan;
|
||||
using (var transaction = document.Database.TransactionManager.StartOpenCloseTransaction())
|
||||
{
|
||||
var viewport = (Viewport)transaction.GetObject(selected.ObjectId, OpenMode.ForRead);
|
||||
var layers = (LayerTable)transaction.GetObject(document.Database.LayerTableId, OpenMode.ForRead);
|
||||
layerPlan = new ViewportLayerPlanner().Build(viewport.Layer, layers.Has("Defpoints"));
|
||||
view = Resolve(document, viewport);
|
||||
}
|
||||
if (layerPlan.FailureCode is not null) throw new InvalidOperationException(layerPlan.FailureCode);
|
||||
var objects = new PlantObjectReader().ReadObjects(view, CancellationToken.None);
|
||||
var resolved = objects.Count(x => x.MembershipStatus == ViewMembershipStatus.Resolved);
|
||||
var outside = objects.Count(x => x.MembershipStatus == ViewMembershipStatus.ObjectOutsideView);
|
||||
var unresolved = objects.Count - resolved - outside;
|
||||
document.Editor.WriteMessage($"\nPXP-COV preview: resolved={resolved}; outside={outside}; unresolved={unresolved}; viewport-layer-change={layerPlan.RequiresChange}. DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("OrthoViewportCheckCompleted", commandName: "PXP-COV", resultStatus: "PreviewCompleted", document: document, details: new Dictionary<string, object?> { ["Resolved"] = resolved, ["Outside"] = outside, ["Unresolved"] = unresolved, ["LayerChange"] = layerPlan.RequiresChange });
|
||||
if (!layerPlan.RequiresChange || !string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase)) return;
|
||||
ValidateFixture(document);
|
||||
using var documentLock = document.LockDocument();
|
||||
using var write = document.Database.TransactionManager.StartTransaction();
|
||||
var target = (Viewport)write.GetObject(selected.ObjectId, OpenMode.ForWrite);
|
||||
var layerTable = (LayerTable)write.GetObject(document.Database.LayerTableId, OpenMode.ForRead);
|
||||
target.LayerId = layerTable[layerPlan.TargetLayer];
|
||||
write.Commit();
|
||||
document.Editor.WriteMessage("\nPXP-COV Apply: viewport moved to Defpoints; AutoCAD UNDO is available.");
|
||||
}
|
||||
catch (Exception exception) { RuntimeDiagnostics.Write("OrthoViewportCheckFailed", "ERROR", commandName: "PXP-COV", resultStatus: exception.Message, exception: exception, document: document); document.Editor.WriteMessage("\nPXP-COV: " + exception.Message); }
|
||||
}
|
||||
|
||||
private static OrthoViewportInfo Resolve(Document document, Viewport selected)
|
||||
{
|
||||
var project = PlantApplication.ProjectPart("Ortho") as OrthoProject ?? throw new InvalidOperationException("ORTHO_PROJECT_UNAVAILABLE");
|
||||
var matches = new PlantOrthoViewportReader(project, document.Name).ReadViewports(CancellationToken.None)
|
||||
.Where(x => Math.Abs(x.CenterX - selected.CenterPoint.X) < .001 && Math.Abs(x.CenterY - selected.CenterPoint.Y) < .001 && Math.Abs(x.Width - selected.Width) < .001 && Math.Abs(x.Height - selected.Height) < .001).ToArray();
|
||||
return matches.Length == 1 ? matches[0] : throw new InvalidOperationException(matches.Length == 0 ? "ORTHO_VIEW_NOT_FOUND" : "ORTHO_VIEW_AMBIGUOUS");
|
||||
}
|
||||
|
||||
private static void ValidateFixture(Document document)
|
||||
{
|
||||
var marker = Environment.GetEnvironmentVariable("P_REC_ANNOT_ORTHO_MAINTENANCE_FIXTURE_MARKER");
|
||||
if (string.IsNullOrWhiteSpace(marker) || !Path.IsPathFullyQualified(marker) || !File.Exists(marker) || !string.Equals(File.ReadAllText(marker).Trim(), "P_REC_ANNOT_TEST_FIXTURE=ORTHO_MAINTENANCE_APPLY", StringComparison.Ordinal)) throw new InvalidOperationException("ORTHO_MAINTENANCE_TEST_FIXTURE_REQUIRED");
|
||||
var root = Path.GetDirectoryName(Path.GetFullPath(marker))! + Path.DirectorySeparatorChar;
|
||||
if (!Path.GetFullPath(document.Name).StartsWith(root, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("ORTHO_MAINTENANCE_TEST_FIXTURE_REQUIRED");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
using System.Collections;
|
||||
using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using Autodesk.ProcessPower.Drawings2d;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// This is a diagnostic-only probe. It is never part of source resolution and is
|
||||
// called only by the explicit DryRun/OrthoStructure environment flag combination.
|
||||
internal static class OrthoRuntimeStructureInspector
|
||||
{
|
||||
public static void Inspect(IDwgViewDef view)
|
||||
{
|
||||
if (!RuntimeDiagnostics.IsOrthoStructureDiagnosticsEnabled) return;
|
||||
|
||||
try
|
||||
{
|
||||
var query = view.DwgQuery;
|
||||
var modelFiles = query?.ModelFiles;
|
||||
var details = new Dictionary<string, object?>
|
||||
{
|
||||
["ViewRuntimeType"] = TypeName(view.GetType()),
|
||||
["DwgQueryRuntimeType"] = query is null ? null : TypeName(query.GetType()),
|
||||
["ModelFilesDeclaredType"] = typeof(ModelFile[]).FullName,
|
||||
["ModelFilesRuntimeType"] = modelFiles?.GetType().AssemblyQualifiedName,
|
||||
["ModelFilesCount"] = modelFiles?.Length ?? 0,
|
||||
["ModelFileElements"] = modelFiles?.Select(DescribeModelFile).ToArray() ?? Array.Empty<IReadOnlyDictionary<string, object?>>()
|
||||
};
|
||||
RuntimeDiagnostics.Write("OrthoRuntimeStructureInspected", resultStatus: "Captured", details: details);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("OrthoRuntimeStructureInspectionFailed", "WARNING", resultStatus: "Failed", exception: exception);
|
||||
}
|
||||
}
|
||||
|
||||
private static IReadOnlyDictionary<string, object?> DescribeModelFile(ModelFile? modelFile)
|
||||
{
|
||||
if (modelFile is null)
|
||||
{
|
||||
return new Dictionary<string, object?> { ["IsNull"] = true };
|
||||
}
|
||||
|
||||
var properties = modelFile.GetType()
|
||||
.GetProperties(BindingFlags.Instance | BindingFlags.Public)
|
||||
.Where(property => property.CanRead && property.GetIndexParameters().Length == 0)
|
||||
.OrderBy(property => property.Name, StringComparer.Ordinal)
|
||||
.Select(property => DescribeProperty(modelFile, property))
|
||||
.ToArray();
|
||||
return new Dictionary<string, object?>
|
||||
{
|
||||
["RuntimeType"] = TypeName(modelFile.GetType()),
|
||||
["Properties"] = properties
|
||||
};
|
||||
}
|
||||
|
||||
private static IReadOnlyDictionary<string, object?> DescribeProperty(ModelFile modelFile, PropertyInfo property)
|
||||
{
|
||||
object? value;
|
||||
try { value = property.GetValue(modelFile); }
|
||||
catch { value = null; }
|
||||
return new Dictionary<string, object?>
|
||||
{
|
||||
["PropertyName"] = property.Name,
|
||||
["PropertyType"] = property.PropertyType.FullName,
|
||||
["ValueKind"] = value?.GetType().FullName ?? "null",
|
||||
["IsNull"] = value is null,
|
||||
["StringLength"] = value is string text ? text.Length : null,
|
||||
["PathKind"] = property.Name == "ModelFileName" && value is string path
|
||||
? (Path.IsPathRooted(path) ? "Absolute" : "ProjectRelative")
|
||||
: null,
|
||||
["CollectionCount"] = value is ICollection collection ? collection.Count : null,
|
||||
["StableHash"] = value is null ? null : Hash(value.ToString() ?? string.Empty)
|
||||
};
|
||||
}
|
||||
|
||||
private static string TypeName(Type type) => $"{type.FullName}, {type.Assembly.GetName().Name}, {type.Assembly.GetName().Version}";
|
||||
|
||||
private static string Hash(string value) => Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(value)))[..16];
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using Autodesk.ProcessPower.DataLinks;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Source-backed replacement for OrthoAutoAnnotate.HighlightAndZoomPnPId.
|
||||
// New PXP-OA annotations persist their project source drawing and DataLinks row
|
||||
// in XData. Legacy annotations without that information remain untouched and
|
||||
// fail safely rather than being migrated destructively.
|
||||
internal static class OrthoSourceNavigationCommand
|
||||
{
|
||||
private const string ApplicationName = "PXP-OA";
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
var ortho = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (ortho is null || PlantApplication.CurrentProject is null) return;
|
||||
var pick = ortho.Editor.GetEntity(new PromptEntityOptions("\nSelect an Ortho annotation to show its model source: ") { AllowNone = false });
|
||||
if (pick.Status != PromptStatus.OK) return;
|
||||
if (!TryReadSource(ortho.Database, pick.ObjectId, out var sourceDrawing, out var rowId))
|
||||
{
|
||||
ortho.Editor.WriteMessage("\nThe selected annotation has no modern source identity; no drawing was changed.");
|
||||
return;
|
||||
}
|
||||
|
||||
var target = AcadApplication.DocumentManager.Cast<Document>()
|
||||
.FirstOrDefault(document => SamePath(document.Name, sourceDrawing));
|
||||
if (target is null)
|
||||
{
|
||||
var answer = ortho.Editor.GetKeywords(new PromptKeywordOptions($"\nOpen model drawing '{Path.GetFileName(sourceDrawing)}'? [Open/Cancel] <Open>: ") { Keywords = { "Open", "Cancel" }, AllowNone = true });
|
||||
if (answer.Status == PromptStatus.Cancel || string.Equals(answer.StringResult, "Cancel", StringComparison.OrdinalIgnoreCase)) return;
|
||||
if (!File.Exists(sourceDrawing)) { ortho.Editor.WriteMessage("\nThe source drawing is unavailable in the active project."); return; }
|
||||
try { target = AcadApplication.DocumentManager.Open(sourceDrawing, false); }
|
||||
catch (Exception exception) { RuntimeDiagnostics.Write("OrthoSourceNavigation", "ERROR", resultStatus: "SOURCE_DRAWING_OPEN_FAILED", exception: exception); ortho.Editor.WriteMessage("\nUnable to open the source drawing."); return; }
|
||||
}
|
||||
|
||||
AcadApplication.DocumentManager.MdiActiveDocument = target;
|
||||
var links = PlantApplication.ProjectPart("Piping")?.DataLinksManager;
|
||||
if (links is null) { target.Editor.WriteMessage("\nPiping DataLinks are unavailable."); return; }
|
||||
var id = FindEntityForRow(target.Database, links, rowId);
|
||||
if (id.IsNull) { target.Editor.WriteMessage("\nThe source component no longer exists."); return; }
|
||||
HighlightAndZoom(target, id);
|
||||
RuntimeDiagnostics.Write("OrthoSourceNavigation", resultStatus: "SOURCE_OBJECT_HIGHLIGHTED", document: target);
|
||||
}
|
||||
|
||||
private static bool TryReadSource(Database database, ObjectId id, out string drawing, out int rowId)
|
||||
{
|
||||
drawing = string.Empty; rowId = 0;
|
||||
try
|
||||
{
|
||||
using var transaction = database.TransactionManager.StartOpenCloseTransaction();
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not Entity entity) return false;
|
||||
using var data = entity.GetXDataForApplication(ApplicationName);
|
||||
var values = data?.AsArray().Where(value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString).Select(value => value.Value?.ToString() ?? string.Empty).ToArray();
|
||||
if (values is null) return false;
|
||||
for (var index = 0; index + 1 < values.Length; index++)
|
||||
{
|
||||
if (string.Equals(values[index], "SOURCE_DRAWING", StringComparison.Ordinal)) drawing = values[index + 1];
|
||||
if (string.Equals(values[index], "SOURCE_ROW", StringComparison.Ordinal)) int.TryParse(values[index + 1], out rowId);
|
||||
}
|
||||
return Path.IsPathRooted(drawing) && rowId > 0;
|
||||
}
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
private static ObjectId FindEntityForRow(Database database, DataLinksManager links, int rowId)
|
||||
{
|
||||
try
|
||||
{
|
||||
using var transaction = database.TransactionManager.StartOpenCloseTransaction();
|
||||
var table = (BlockTable)transaction.GetObject(database.BlockTableId, OpenMode.ForRead);
|
||||
var model = (BlockTableRecord)transaction.GetObject(table[BlockTableRecord.ModelSpace], OpenMode.ForRead);
|
||||
foreach (ObjectId id in model)
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not Entity) continue;
|
||||
try { if (links.FindAcPpRowId(id) == rowId) return id; }
|
||||
catch (DLException) { }
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
return ObjectId.Null;
|
||||
}
|
||||
|
||||
private static void HighlightAndZoom(Document document, ObjectId id)
|
||||
{
|
||||
using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not Entity entity) return;
|
||||
entity.Highlight();
|
||||
var extents = entity.GeometricExtents;
|
||||
using var view = document.Editor.GetCurrentView();
|
||||
var transform = Matrix3d.PlaneToWorld(view.ViewDirection);
|
||||
transform = Matrix3d.Displacement(view.Target - Point3d.Origin) * transform;
|
||||
transform = Matrix3d.Rotation(-view.ViewTwist, view.ViewDirection, view.Target) * transform;
|
||||
extents.TransformBy(transform.Inverse());
|
||||
view.Width = Math.Max(extents.MaxPoint.X - extents.MinPoint.X, 1d);
|
||||
view.Height = Math.Max(extents.MaxPoint.Y - extents.MinPoint.Y, 1d);
|
||||
view.CenterPoint = new Point2d((extents.MaxPoint.X + extents.MinPoint.X) / 2d, (extents.MaxPoint.Y + extents.MinPoint.Y) / 2d);
|
||||
document.Editor.SetCurrentView(view);
|
||||
transaction.Commit();
|
||||
}
|
||||
|
||||
private static bool SamePath(string left, string right) => string.Equals(Path.GetFullPath(left), Path.GetFullPath(right), StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
@@ -14,7 +14,12 @@
|
||||
<Reference Include="PnPDataObjects"><HintPath>$(AutoCAD2026ManagedDir)\PnPDataObjects.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnPProjectManagerMgd"><HintPath>$(Plant3D2026ManagedDir)\PnPProjectManagerMgd.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnP3dObjectsMgd"><HintPath>$(Plant3D2026ManagedDir)\PnP3dObjectsMgd.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnP3dPartsRepository"><HintPath>$(AutoCAD2026ManagedDir)\PnP3dPartsRepository.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnP3dProjectPartsMgd"><HintPath>$(Plant3D2026ManagedDir)\PnP3dProjectPartsMgd.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnP3dOrthoProjectPart"><HintPath>$(Plant3D2026ManagedDir)\PnP3dOrthoProjectPart.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnP3dOrthoDrawingsUI"><HintPath>$(Plant3D2026ManagedDir)\PnP3dOrthoDrawingsUI.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnPDwg2dDef"><HintPath>$(Plant3D2026ManagedDir)\PnPDwg2dDef.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnPDwg2dUtil"><HintPath>$(Plant3D2026ManagedDir)\PnPDwg2dUtil.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
<Reference Include="PnPDwg2dGen"><HintPath>$(Plant3D2026ManagedDir)\PnPDwg2dGen.dll</HintPath><Private>false</Private><CopyLocal>false</CopyLocal></Reference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.ProcessPower.PnP3dObjects;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Modern Plant 2026 adapter for the production-useful part of legacy
|
||||
// GetComponentGeometry.IsGeometryRead: Pipe dimensions and Part extents are
|
||||
// read from the selected source object with explicit unit normalisation.
|
||||
internal sealed class PlantComponentGeometryReader(Database database) : IPlantComponentGeometryReader
|
||||
{
|
||||
public ComponentGeometryReadResult Read(string stableEntityId, bool convertToMetric)
|
||||
{
|
||||
if (!TryObjectId(stableEntityId, out var id)) return new(false, null, "COMPONENT_GEOMETRY_STABLE_ID_INVALID");
|
||||
try
|
||||
{
|
||||
using var transaction = database.TransactionManager.StartOpenCloseTransaction();
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not Entity entity) return new(false, null, "COMPONENT_GEOMETRY_ENTITY_NOT_FOUND");
|
||||
var extents = entity.GeometricExtents;
|
||||
var bounds = new Bounds3Dto(new(extents.MinPoint.X, extents.MinPoint.Y, extents.MinPoint.Z), new(extents.MaxPoint.X, extents.MaxPoint.Y, extents.MaxPoint.Z));
|
||||
if (entity is Pipe pipe)
|
||||
{
|
||||
var factor = Factor(convertToMetric, pipe.PartSizeProperties.LinearUnit);
|
||||
var parameters = new Dictionary<string, string>(StringComparer.Ordinal)
|
||||
{
|
||||
["D"] = Format(pipe.OuterDiameter * factor),
|
||||
["L"] = Format(pipe.Length * factor),
|
||||
["StartX"] = Format(pipe.StartPoint.X), ["StartY"] = Format(pipe.StartPoint.Y), ["StartZ"] = Format(pipe.StartPoint.Z),
|
||||
["EndX"] = Format(pipe.EndPoint.X), ["EndY"] = Format(pipe.EndPoint.Y), ["EndZ"] = Format(pipe.EndPoint.Z)
|
||||
};
|
||||
AddDerivedGeometry(parameters, pipe.StartPoint, pipe.EndPoint);
|
||||
AddPorts(parameters, pipe.GetPorts(PortType.Both));
|
||||
return new(true, new("CPP", parameters, bounds, factor != 1));
|
||||
}
|
||||
if (entity is Part part)
|
||||
{
|
||||
var factor = Factor(convertToMetric, part.PartSizeProperties.LinearUnit);
|
||||
var center = extents.MinPoint + (extents.MaxPoint - extents.MinPoint) / 2d;
|
||||
var parameters = new Dictionary<string, string>(StringComparer.Ordinal)
|
||||
{
|
||||
["BoundsX"] = Format((extents.MaxPoint.X - extents.MinPoint.X) * factor),
|
||||
["BoundsY"] = Format((extents.MaxPoint.Y - extents.MinPoint.Y) * factor),
|
||||
["BoundsZ"] = Format((extents.MaxPoint.Z - extents.MinPoint.Z) * factor),
|
||||
["CenterX"] = Format(center.X), ["CenterY"] = Format(center.Y), ["CenterZ"] = Format(center.Z)
|
||||
};
|
||||
var ports = part.GetPorts(PortType.Both);
|
||||
AddPorts(parameters, ports);
|
||||
if (ports.Count >= 2) AddDerivedGeometry(parameters, ports[0].Position, ports[1].Position);
|
||||
return new(true, new("PART", parameters, bounds, factor != 1));
|
||||
}
|
||||
return new(false, null, "COMPONENT_GEOMETRY_UNSUPPORTED_ENTITY");
|
||||
}
|
||||
catch (Autodesk.AutoCAD.Runtime.Exception) { return new(false, null, "COMPONENT_GEOMETRY_EXTENTS_UNAVAILABLE"); }
|
||||
catch (Exception) { return new(false, null, "COMPONENT_GEOMETRY_READ_FAILED"); }
|
||||
}
|
||||
|
||||
private bool TryObjectId(string stableEntityId, out ObjectId id)
|
||||
{
|
||||
id = ObjectId.Null;
|
||||
const string prefix = "acad:";
|
||||
if (string.IsNullOrWhiteSpace(stableEntityId) || !stableEntityId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) return false;
|
||||
if (!long.TryParse(stableEntityId[prefix.Length..], System.Globalization.NumberStyles.HexNumber, System.Globalization.CultureInfo.InvariantCulture, out var handle)) return false;
|
||||
try { id = database.GetObjectId(false, new Handle(handle), 0); return !id.IsNull; }
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
private static double Factor(bool convertToMetric, object? unit) => convertToMetric && string.Equals(unit?.ToString(), "Inch", StringComparison.OrdinalIgnoreCase) ? 25.4 : 1d;
|
||||
private static string Format(double value) => value.ToString("0.###############", System.Globalization.CultureInfo.InvariantCulture);
|
||||
|
||||
private static void AddPorts(Dictionary<string, string> parameters, PortCollection ports)
|
||||
{
|
||||
parameters["PortCount"] = ports.Count.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
for (var index = 0; index < ports.Count; index++)
|
||||
{
|
||||
var port = ports[index]; var prefix = "Port" + index;
|
||||
parameters[prefix + "Name"] = port.Name ?? string.Empty;
|
||||
parameters[prefix + "X"] = Format(port.Position.X); parameters[prefix + "Y"] = Format(port.Position.Y); parameters[prefix + "Z"] = Format(port.Position.Z);
|
||||
parameters[prefix + "DirectionX"] = Format(port.Direction.X); parameters[prefix + "DirectionY"] = Format(port.Direction.Y); parameters[prefix + "DirectionZ"] = Format(port.Direction.Z);
|
||||
}
|
||||
}
|
||||
|
||||
private static void AddDerivedGeometry(Dictionary<string, string> parameters, Autodesk.AutoCAD.Geometry.Point3d start, Autodesk.AutoCAD.Geometry.Point3d end)
|
||||
{
|
||||
var axis = start.GetVectorTo(end); var center = start + axis / 2d;
|
||||
parameters["CenterX"] = Format(center.X); parameters["CenterY"] = Format(center.Y); parameters["CenterZ"] = Format(center.Z);
|
||||
if (axis.Length <= Autodesk.AutoCAD.Geometry.Tolerance.Global.EqualPoint) return;
|
||||
var direction = axis.GetNormal();
|
||||
parameters["AxisX"] = Format(direction.X); parameters["AxisY"] = Format(direction.Y); parameters["AxisZ"] = Format(direction.Z);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.ProcessPower.PnP3dObjects;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Reads the actual two Plant Connector ports from the source model database.
|
||||
// Paper-space projection and viewport filtering deliberately stay in the Ortho
|
||||
// adapter; this boundary only exposes stable, Autodesk-free model geometry.
|
||||
internal sealed class PlantConnectorPortReader(Database sourceModelDatabase) : IPlantConnectorPortReader
|
||||
{
|
||||
public PlantConnectorPortReadResult Read(PlantConnectorRelationshipSnapshot connector)
|
||||
{
|
||||
if (!TryObjectId(connector.ConnectorEntityStableId, out var id)) return new(false, null, "CONNECTOR_ENTITY_HANDLE_UNAVAILABLE");
|
||||
try
|
||||
{
|
||||
using var transaction = sourceModelDatabase.TransactionManager.StartOpenCloseTransaction();
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is not Connector entity) return new(false, null, "CONNECTOR_ENTITY_NOT_FOUND");
|
||||
var ports = entity.GetPorts(PortType.Both);
|
||||
if (ports.Count != 2) return new(false, null, "CONNECTOR_PORT_COUNT_INVALID");
|
||||
var first = ports[0];
|
||||
var second = ports[1];
|
||||
return new(true, new(
|
||||
connector.StableId,
|
||||
Point(first.Position),
|
||||
Point(second.Position),
|
||||
Vector(first.Direction),
|
||||
Vector(second.Direction)));
|
||||
}
|
||||
catch (Autodesk.AutoCAD.Runtime.Exception) { return new(false, null, "CONNECTOR_PORT_READ_FAILED"); }
|
||||
catch (Exception) { return new(false, null, "CONNECTOR_PORT_READ_FAILED"); }
|
||||
}
|
||||
|
||||
private bool TryObjectId(string? stableId, out ObjectId id)
|
||||
{
|
||||
id = ObjectId.Null;
|
||||
const string prefix = "acad:";
|
||||
if (string.IsNullOrWhiteSpace(stableId) || !stableId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase) ||
|
||||
!long.TryParse(stableId[prefix.Length..], System.Globalization.NumberStyles.HexNumber, System.Globalization.CultureInfo.InvariantCulture, out var handle)) return false;
|
||||
try { id = sourceModelDatabase.GetObjectId(false, new Handle(handle), 0); return !id.IsNull; }
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
private static Point3Dto Point(Autodesk.AutoCAD.Geometry.Point3d point) => new(point.X, point.Y, point.Z);
|
||||
private static Point3Dto Vector(Autodesk.AutoCAD.Geometry.Vector3d vector) => new(vector.X, vector.Y, vector.Z);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
using Autodesk.ProcessPower.DataLinks;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Reads the two P3dPartConnection edges and their line-group relationships.
|
||||
// This is the Plant 2026 equivalent of the legacy PXP-ALC connector discovery
|
||||
// pass; it deliberately returns row identities only, never PnP/AutoCAD
|
||||
// objects, so Core remains Autodesk-free.
|
||||
internal sealed class PlantConnectorRelationshipReader(DataLinksManager dataLinks) : IPlantConnectorRelationshipReader
|
||||
{
|
||||
public PlantConnectorRelationshipReadResult Read()
|
||||
{
|
||||
try
|
||||
{
|
||||
var database = dataLinks.GetPnPDatabase();
|
||||
var rows = database.Tables["PnPDataLinks"].Select("RowClassName='P3dConnector'")
|
||||
.OrderBy(row => Convert.ToInt64(row["RowId"]))
|
||||
.ToArray();
|
||||
var result = new List<PlantConnectorRelationshipSnapshot>();
|
||||
foreach (var row in rows)
|
||||
{
|
||||
var connector = Convert.ToInt64(row["RowId"]);
|
||||
var first = dataLinks.GetRelatedRowIds("P3dPartConnection", "Part1", (int)connector, "Part2");
|
||||
var second = dataLinks.GetRelatedRowIds("P3dPartConnection", "Part2", (int)connector, "Part1");
|
||||
if (first.Count != 1 || second.Count != 1) continue;
|
||||
var firstPart = first.First();
|
||||
var secondPart = second.First();
|
||||
var firstGroups = dataLinks.GetRelatedRowIds("P3dLineGroupPartRelationship", "Part", firstPart, "LineGroup");
|
||||
var secondGroups = dataLinks.GetRelatedRowIds("P3dLineGroupPartRelationship", "Part", secondPart, "LineGroup");
|
||||
if (firstGroups.Count != 1 || secondGroups.Count != 1) continue;
|
||||
result.Add(new($"pnp-connector:{connector}", connector, firstPart, secondPart, firstGroups.First(), secondGroups.First(), Array.Empty<string>(), TryEntityStableId(row)));
|
||||
}
|
||||
return new(true, result.OrderBy(value => value.StableId, StringComparer.Ordinal).ToArray());
|
||||
}
|
||||
catch (DLException) { return new(false, Array.Empty<PlantConnectorRelationshipSnapshot>(), "CONNECTOR_DATALINKS_READ_FAILED"); }
|
||||
catch (Exception) { return new(false, Array.Empty<PlantConnectorRelationshipSnapshot>(), "CONNECTOR_RELATIONSHIP_READ_FAILED"); }
|
||||
}
|
||||
|
||||
private static string? TryEntityStableId(dynamic row)
|
||||
{
|
||||
try
|
||||
{
|
||||
var handle = Convert.ToInt64(row["DwgHandleLow"], System.Globalization.CultureInfo.InvariantCulture);
|
||||
return handle > 0 ? $"acad:{handle:X}" : null;
|
||||
}
|
||||
catch { return null; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using Autodesk.ProcessPower.DataLinks;
|
||||
using PRecAnnot.Abstractions;
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class PlantDataLinksPropertyReader(DataLinksManager dataLinks) : IDataLinksPropertyReader
|
||||
{
|
||||
public DataLinksPropertyReadResult ReadProperties(long rowId)
|
||||
{
|
||||
if (rowId <= 0) return new(false, new Dictionary<string, string?>(), "DATALINKS_ROW_ID_INVALID");
|
||||
try
|
||||
{
|
||||
var values = dataLinks.GetAllProperties((int)rowId, true)
|
||||
.GroupBy(x => x.Key, StringComparer.OrdinalIgnoreCase)
|
||||
.ToDictionary(x => x.Key, x => (string?)x.Last().Value, StringComparer.OrdinalIgnoreCase);
|
||||
return new(true, values);
|
||||
}
|
||||
catch (DLException) { return new(false, new Dictionary<string, string?>(), "DATALINKS_PROPERTY_READ_FAILED"); }
|
||||
catch (Exception) { return new(false, new Dictionary<string, string?>(), "DATALINKS_PROPERTY_READ_FAILED"); }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using Autodesk.ProcessPower.DataLinks;
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Converts an explicit AutoCAD selection to the small, AutoCAD-free candidate
|
||||
// used by the line-number preview. It deliberately performs no DataLinks or
|
||||
// DWG write and reports unavailable Plant mappings as typed failures.
|
||||
internal sealed class PlantLineNumberCandidateReader(DataLinksManager dataLinks)
|
||||
{
|
||||
public LineNumberCandidateReadResult Read(ObjectId selectedId, string layer, string textStyle)
|
||||
{
|
||||
if (selectedId.IsNull || !selectedId.IsValid) return new(false, null, "LINE_NUMBER_SELECTION_INVALID");
|
||||
if (string.IsNullOrWhiteSpace(layer) || string.IsNullOrWhiteSpace(textStyle)) return new(false, null, "LINE_NUMBER_ASSET_CONTRACT_INVALID");
|
||||
try
|
||||
{
|
||||
var rowId = dataLinks.FindAcPpRowId(selectedId);
|
||||
if (rowId <= 0) return new(false, null, "LINE_NUMBER_DATALINKS_ROW_NOT_FOUND");
|
||||
var database = selectedId.Database;
|
||||
using var transaction = database.TransactionManager.StartOpenCloseTransaction();
|
||||
if (transaction.GetObject(selectedId, OpenMode.ForRead) is not Entity entity) return new(false, null, "LINE_NUMBER_SELECTION_NOT_ENTITY");
|
||||
var extents = entity.GeometricExtents;
|
||||
var center = new Point3d(
|
||||
(extents.MinPoint.X + extents.MaxPoint.X) / 2d,
|
||||
(extents.MinPoint.Y + extents.MaxPoint.Y) / 2d,
|
||||
(extents.MinPoint.Z + extents.MaxPoint.Z) / 2d);
|
||||
transaction.Commit();
|
||||
return new(true, new($"acad:{selectedId.Handle}", rowId, new(center.X, center.Y, center.Z), 0, layer, textStyle, new Dictionary<string, string?>()));
|
||||
}
|
||||
catch (Autodesk.AutoCAD.Runtime.Exception) { return new(false, null, "LINE_NUMBER_SELECTION_GEOMETRY_UNAVAILABLE"); }
|
||||
catch (DLException) { return new(false, null, "LINE_NUMBER_DATALINKS_ROW_NOT_FOUND"); }
|
||||
catch (Exception) { return new(false, null, "LINE_NUMBER_CANDIDATE_READ_FAILED"); }
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,11 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Collections.Specialized;
|
||||
using System.Text;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.ProcessPower.DataLinks;
|
||||
using Autodesk.ProcessPower.Drawings2d;
|
||||
using Autodesk.ProcessPower.PnP3dObjects;
|
||||
using Autodesk.ProcessPower.P3dProjectParts;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.ProjectManager;
|
||||
@@ -12,9 +16,11 @@ namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal sealed class PlantRuntimeContextReader : IPlantRuntimeContextReader
|
||||
{
|
||||
public PlantRuntimeContext ReadCurrentContext()
|
||||
public PlantRuntimeContext ReadCurrentContext() => ReadCurrentContext(null);
|
||||
|
||||
public PlantRuntimeContext ReadCurrentContext(Document? explicitDocument = null)
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
var document = explicitDocument ?? AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null)
|
||||
{
|
||||
return Empty(false, false, "NO_ACTIVE_DOCUMENT", "Активный документ отсутствует.");
|
||||
@@ -32,6 +38,9 @@ internal sealed class PlantRuntimeContextReader : IPlantRuntimeContextReader
|
||||
return Empty(true, false, "NO_PLANT_PROJECT", "Активный Plant 3D-проект не найден.");
|
||||
}
|
||||
|
||||
var displayName = string.IsNullOrWhiteSpace(project.Name) ? null : project.Name.Trim();
|
||||
var projectStatus = displayName is null ? PlantProjectDetectionStatus.FoundWithoutDisplayName : PlantProjectDetectionStatus.FoundWithName;
|
||||
|
||||
OrthoProject? orthoProject;
|
||||
try { orthoProject = PlantApplication.ProjectPart("Ortho") as OrthoProject; }
|
||||
catch (Exception exception)
|
||||
@@ -60,9 +69,10 @@ internal sealed class PlantRuntimeContextReader : IPlantRuntimeContextReader
|
||||
HasPlantProject = true,
|
||||
IsOrthoDrawing = true,
|
||||
DrawingName = Path.GetFileName(document.Name),
|
||||
ProjectDisplayName = project.Name,
|
||||
ProjectDisplayName = displayName ?? "display name unavailable",
|
||||
ProjectDetectionStatus = projectStatus,
|
||||
Viewports = viewports,
|
||||
Diagnostics = Array.Empty<RuntimeDiagnostic>(),
|
||||
Diagnostics = displayName is null ? new[] { new RuntimeDiagnostic { Code = "PLANT_PROJECT_DISPLAY_NAME_EMPTY", Message = "Plant project is open but no display name is available.", Severity = "Warning" } } : Array.Empty<RuntimeDiagnostic>(),
|
||||
Detection = new OrthoDetectionResult
|
||||
{
|
||||
Status = OrthoDetectionStatus.Confirmed,
|
||||
@@ -82,6 +92,8 @@ internal sealed class PlantRuntimeContextReader : IPlantRuntimeContextReader
|
||||
HasActiveDocument = hasDocument,
|
||||
HasPlantProject = hasProject,
|
||||
IsOrthoDrawing = false,
|
||||
ProjectDisplayName = hasProject ? "display name unavailable" : null,
|
||||
ProjectDetectionStatus = hasProject ? PlantProjectDetectionStatus.Ambiguous : PlantProjectDetectionStatus.NotFound,
|
||||
Diagnostics = new[] { new RuntimeDiagnostic { Code = code, Message = message } },
|
||||
Detection = new OrthoDetectionResult { Status = status, Evidence = evidence, Diagnostics = new[] { new RuntimeDiagnostic { Code = code, Message = message } } }
|
||||
};
|
||||
@@ -124,7 +136,7 @@ internal sealed class PlantOrthoViewportReader : IOrthoViewportReader
|
||||
TwistAngle = 0,
|
||||
IsOn = true,
|
||||
IsLocked = false,
|
||||
SourceDrawingName = sheet.DwgName,
|
||||
SourceDrawingName = ReadSourceDrawingPath(view),
|
||||
ViewName = view.ViewName
|
||||
});
|
||||
}
|
||||
@@ -143,52 +155,234 @@ internal sealed class PlantOrthoViewportReader : IOrthoViewportReader
|
||||
var hash = SHA256.HashData(Encoding.UTF8.GetBytes(sheetId + "|" + viewName));
|
||||
return "vp-" + Convert.ToHexString(hash)[..20];
|
||||
}
|
||||
|
||||
private static string? ReadSourceDrawingPath(IDwgViewDef view)
|
||||
{
|
||||
// Confirmed Plant 3D 2026 contract (PnPDwg2dDef/PnPDwg2dUtil):
|
||||
// IDwgViewDef.DwgQuery -> IDwgQuery.ModelFiles -> ModelFile.ModelFileName.
|
||||
// The Ortho sheet is never used as a Piping DataLinks source.
|
||||
try
|
||||
{
|
||||
if (!OrthoModelFilesContract.IsSupported(view, out var diagnostic))
|
||||
{
|
||||
RuntimeDiagnostics.Write("OrthoModelFilesContractRejected", "WARNING", resultStatus: diagnostic.Code, details: diagnostic.Details);
|
||||
return null;
|
||||
}
|
||||
|
||||
if (RuntimeDiagnostics.IsOrthoStructureDiagnosticsEnabled)
|
||||
{
|
||||
OrthoRuntimeStructureInspector.Inspect(view);
|
||||
}
|
||||
|
||||
return view.DwgQuery?.ModelFiles
|
||||
.Select(file => file.ModelFileName)
|
||||
.FirstOrDefault(value => !string.IsNullOrWhiteSpace(value));
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("OrthoModelFilesReadFailed", "WARNING", resultStatus: "ORTHO_MODEL_FILES_API_UNSUPPORTED", exception: exception);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
internal static class OrthoModelFilesContract
|
||||
{
|
||||
private const string ExpectedViewType = "Autodesk.ProcessPower.Drawings2d.DwgViewDef";
|
||||
private const string ExpectedQueryType = "Autodesk.ProcessPower.Drawings2d.DwgQueryByBox";
|
||||
private const string ExpectedModelFileType = "Autodesk.ProcessPower.Drawings2d.ModelFile";
|
||||
private const string ExpectedDefAssembly = "PnPDwg2dDef";
|
||||
private const string ExpectedUtilAssembly = "PnPDwg2dUtil";
|
||||
private const string ExpectedVersion = "0.0.0.0";
|
||||
|
||||
public static bool IsSupported(IDwgViewDef view, out OrthoModelFilesContractDiagnostic diagnostic)
|
||||
{
|
||||
var query = view.DwgQuery;
|
||||
var files = query?.ModelFiles;
|
||||
var valid = HasExpectedType(view, ExpectedViewType, ExpectedDefAssembly) &&
|
||||
query is not null && HasExpectedType(query, ExpectedQueryType, ExpectedDefAssembly) &&
|
||||
files is not null && files.GetType() == typeof(ModelFile[]) &&
|
||||
files.All(file => file is not null && HasExpectedType(file, ExpectedModelFileType, ExpectedUtilAssembly));
|
||||
diagnostic = new OrthoModelFilesContractDiagnostic(
|
||||
valid ? "ORTHO_MODEL_FILES_API_SUPPORTED" : "ORTHO_MODEL_FILES_API_UNSUPPORTED",
|
||||
new Dictionary<string, object?>
|
||||
{
|
||||
["ExpectedViewType"] = ExpectedViewType,
|
||||
["ActualViewType"] = TypeName(view),
|
||||
["ExpectedQueryType"] = ExpectedQueryType,
|
||||
["ActualQueryType"] = query is null ? null : TypeName(query),
|
||||
["ExpectedModelFileType"] = ExpectedModelFileType,
|
||||
["ActualModelFilesType"] = files?.GetType().AssemblyQualifiedName,
|
||||
["ExpectedAssemblyVersion"] = ExpectedVersion,
|
||||
["ActualViewAssemblyVersion"] = view.GetType().Assembly.GetName().Version?.ToString(),
|
||||
["ActualQueryAssemblyVersion"] = query?.GetType().Assembly.GetName().Version?.ToString(),
|
||||
["ActualModelFilesAssemblyVersion"] = files?.GetType().Assembly.GetName().Version?.ToString()
|
||||
});
|
||||
return valid;
|
||||
}
|
||||
|
||||
private static bool HasExpectedType(object value, string expectedType, string expectedAssembly) =>
|
||||
string.Equals(value.GetType().FullName, expectedType, StringComparison.Ordinal) &&
|
||||
string.Equals(value.GetType().Assembly.GetName().Name, expectedAssembly, StringComparison.Ordinal) &&
|
||||
string.Equals(value.GetType().Assembly.GetName().Version?.ToString(), ExpectedVersion, StringComparison.Ordinal);
|
||||
|
||||
private static string TypeName(object value) => $"{value.GetType().FullName}, {value.GetType().Assembly.GetName().Name}, {value.GetType().Assembly.GetName().Version}";
|
||||
}
|
||||
|
||||
internal sealed record OrthoModelFilesContractDiagnostic(string Code, IReadOnlyDictionary<string, object?> Details);
|
||||
|
||||
internal sealed class PlantObjectReader : IPlantObjectReader
|
||||
{
|
||||
public IReadOnlyList<PlantObjectSnapshot> ReadObjects(OrthoViewportInfo viewport, CancellationToken cancellationToken)
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null) return Array.Empty<PlantObjectSnapshot>();
|
||||
if (string.IsNullOrWhiteSpace(viewport.SourceDrawingName))
|
||||
{
|
||||
WriteOutcome("ORTHO_SOURCE_DRAWING_NOT_RESOLVED", viewport);
|
||||
return Array.Empty<PlantObjectSnapshot>();
|
||||
}
|
||||
|
||||
PipingProject? pipingProject;
|
||||
try { pipingProject = PlantApplication.ProjectPart("Piping") as PipingProject; }
|
||||
catch (Exception exception)
|
||||
{
|
||||
WriteOutcome("PIPING_PROJECT_PART_NOT_FOUND", viewport, exception);
|
||||
return Array.Empty<PlantObjectSnapshot>();
|
||||
}
|
||||
if (pipingProject is null)
|
||||
{
|
||||
WriteOutcome("PIPING_PROJECT_PART_NOT_FOUND", viewport);
|
||||
return Array.Empty<PlantObjectSnapshot>();
|
||||
}
|
||||
|
||||
var sourceDrawing = ResolveProjectDrawing(pipingProject, viewport.SourceDrawingName);
|
||||
if (sourceDrawing is null) return Array.Empty<PlantObjectSnapshot>();
|
||||
|
||||
DataLinksManager? dataLinks;
|
||||
try { dataLinks = PlantApplication.ProjectPart("Piping")?.DataLinksManager; }
|
||||
catch { return Array.Empty<PlantObjectSnapshot>(); }
|
||||
if (dataLinks is null) return Array.Empty<PlantObjectSnapshot>();
|
||||
try { dataLinks = pipingProject.DataLinksManager; }
|
||||
catch (Exception exception)
|
||||
{
|
||||
WriteOutcome("SOURCE_DATALINKS_UNAVAILABLE", viewport, exception);
|
||||
return Array.Empty<PlantObjectSnapshot>();
|
||||
}
|
||||
if (dataLinks is null)
|
||||
{
|
||||
WriteOutcome("SOURCE_DATALINKS_UNAVAILABLE", viewport);
|
||||
return Array.Empty<PlantObjectSnapshot>();
|
||||
}
|
||||
|
||||
var snapshots = new List<PlantObjectSnapshot>();
|
||||
foreach (var rowId in dataLinks.SelectAcPpRowIds(document.Database))
|
||||
try
|
||||
{
|
||||
try
|
||||
// Confirmed Plant 3D 2026 contract: resolve the source model to the
|
||||
// Piping project drawing record, then read its DataLinks by drawing Id.
|
||||
// The active Ortho database is deliberately never passed to DataLinks.
|
||||
var rowIds = dataLinks.SelectAcPpRowIds(sourceDrawing.Id);
|
||||
if (rowIds.Count == 0)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var className = dataLinks.GetObjectClassname(rowId);
|
||||
var properties = dataLinks.GetAllProperties(rowId, true)
|
||||
.GroupBy(x => x.Key, StringComparer.OrdinalIgnoreCase)
|
||||
.ToDictionary(x => x.Key, x => x.Last().Value, StringComparer.OrdinalIgnoreCase);
|
||||
string? Value(params string[] names) => properties.FirstOrDefault(x => names.Any(name => string.Equals(name, x.Key, StringComparison.OrdinalIgnoreCase))).Value;
|
||||
snapshots.Add(new PlantObjectSnapshot
|
||||
{
|
||||
SnapshotId = StableId(Path.GetFileName(document.Name), rowId, className),
|
||||
ObjectClass = className ?? string.Empty,
|
||||
Tag = Value("Tag", "TAG"),
|
||||
LineNumber = Value("Line Number", "LineNumber", "LINENUMBER"),
|
||||
SupportNumber = Value("Support Number", "SupportNumber"),
|
||||
EquipmentNumber = Value("Equipment Number", "EquipmentNumber"),
|
||||
Geometry = new GeometrySnapshot(),
|
||||
Properties = properties.ToDictionary(x => x.Key, x => (string?)x.Value, StringComparer.OrdinalIgnoreCase),
|
||||
Diagnostics = new[] { "GEOMETRY_NOT_MAPPED" }
|
||||
});
|
||||
WriteOutcome("SOURCE_DATALINKS_NO_ROWS", viewport, details: new Dictionary<string, object?> { ["ProjectDrawingResolved"] = true });
|
||||
return Array.Empty<PlantObjectSnapshot>();
|
||||
}
|
||||
catch
|
||||
|
||||
var membership = PlantViewportMembershipReader.Read(viewport, dataLinks, rowIds);
|
||||
|
||||
foreach (var rowId in rowIds)
|
||||
{
|
||||
// Keep the read path best-effort; no write operation is attempted.
|
||||
try
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
var className = dataLinks.GetObjectClassname(rowId);
|
||||
var properties = dataLinks.GetAllProperties(rowId, true)
|
||||
.GroupBy(x => x.Key, StringComparer.OrdinalIgnoreCase)
|
||||
.ToDictionary(x => x.Key, x => x.Last().Value, StringComparer.OrdinalIgnoreCase);
|
||||
properties["PRecAnnot.RowId"] = rowId.ToString(System.Globalization.CultureInfo.InvariantCulture);
|
||||
string? Value(params string[] names) => properties.FirstOrDefault(x => names.Any(name => string.Equals(name, x.Key, StringComparison.OrdinalIgnoreCase))).Value;
|
||||
snapshots.Add(new PlantObjectSnapshot
|
||||
{
|
||||
SnapshotId = StableId(viewport.SourceDrawingName, rowId, className),
|
||||
ObjectClass = className ?? string.Empty,
|
||||
Tag = Value("Tag", "TAG"),
|
||||
LineNumber = Value("Line Number", "LineNumber", "LINENUMBER"),
|
||||
SupportNumber = Value("Support Number", "SupportNumber"),
|
||||
EquipmentNumber = Value("Equipment Number", "EquipmentNumber"),
|
||||
Geometry = membership.GeometryFor(rowId),
|
||||
Properties = properties.ToDictionary(x => x.Key, x => (string?)x.Value, StringComparer.OrdinalIgnoreCase),
|
||||
Diagnostics = new[] { "GEOMETRY_NOT_MAPPED" },
|
||||
MembershipStatus = membership.StatusFor(rowId),
|
||||
MembershipEvidenceCodes = membership.EvidenceFor(rowId)
|
||||
});
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("SourceDataLinksRowReadFailed", "WARNING", resultStatus: "SOURCE_DATABASE_READ_FAILED", exception: exception);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (DLException exception)
|
||||
{
|
||||
WriteOutcome("SOURCE_DATALINKS_UNAVAILABLE", viewport, exception);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
WriteOutcome("SOURCE_DATABASE_READ_FAILED", viewport, exception);
|
||||
}
|
||||
|
||||
WriteOutcome(snapshots.Count == 0 ? "SOURCE_PIPE_ROWS_NOT_FOUND" : "SOURCE_DATALINKS_READ", viewport,
|
||||
details: new Dictionary<string, object?> { ["SourcePlantObjectsRead"] = snapshots.Count, ["PipeObjectsRead"] = snapshots.Count });
|
||||
return snapshots.OrderBy(x => x.SnapshotId, StringComparer.Ordinal).ToArray();
|
||||
}
|
||||
|
||||
private static PnPProjectDrawing? ResolveProjectDrawing(PipingProject pipingProject, string sourceDrawingPath)
|
||||
{
|
||||
if (!Path.IsPathRooted(sourceDrawingPath))
|
||||
{
|
||||
WriteOutcome("ORTHO_SOURCE_DRAWING_NOT_IN_PROJECT", null);
|
||||
return null;
|
||||
}
|
||||
|
||||
string normalizedSource;
|
||||
try { normalizedSource = Path.GetFullPath(sourceDrawingPath); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
WriteOutcome("ORTHO_SOURCE_DRAWING_NOT_RESOLVED", null, exception);
|
||||
return null;
|
||||
}
|
||||
|
||||
var matches = pipingProject.GetPnPDrawingFiles()
|
||||
.Where(drawing => MatchesSourcePath(drawing, normalizedSource))
|
||||
.OrderBy(drawing => drawing.Id)
|
||||
.ToArray();
|
||||
if (matches.Length == 1)
|
||||
{
|
||||
RuntimeDiagnostics.Write("SourceProjectDrawingResolved", resultStatus: "SOURCE_FROM_PROJECT_DRAWING_ROW", details: new Dictionary<string, object?> { ["ProjectDrawingResolved"] = true });
|
||||
return matches[0];
|
||||
}
|
||||
|
||||
WriteOutcome(matches.Length == 0 ? "ORTHO_SOURCE_DRAWING_NOT_IN_PROJECT" : "ORTHO_SOURCE_DRAWING_AMBIGUOUS", null,
|
||||
details: new Dictionary<string, object?> { ["CandidateCount"] = matches.Length });
|
||||
return null;
|
||||
}
|
||||
|
||||
private static bool MatchesSourcePath(PnPProjectDrawing drawing, string normalizedSource) =>
|
||||
EquivalentPath(drawing.AbsoluteFileName, normalizedSource) ||
|
||||
EquivalentPath(drawing.ResolvedFilePath, normalizedSource);
|
||||
|
||||
private static bool EquivalentPath(string? candidate, string normalizedSource)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(candidate)) return false;
|
||||
try { return string.Equals(Path.GetFullPath(candidate), normalizedSource, StringComparison.OrdinalIgnoreCase); }
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
private static void WriteOutcome(string code, OrthoViewportInfo? viewport, Exception? exception = null, IReadOnlyDictionary<string, object?>? details = null)
|
||||
{
|
||||
var sanitizedDetails = new Dictionary<string, object?>
|
||||
{
|
||||
["SourceResolved"] = viewport?.SourceDrawingName is not null
|
||||
};
|
||||
if (details is not null) foreach (var detail in details) sanitizedDetails[detail.Key] = detail.Value;
|
||||
RuntimeDiagnostics.Write("SourceDataLinksReadCompleted", code == "SOURCE_DATALINKS_READ" ? "INFO" : "WARNING", resultStatus: code, exception: exception, details: sanitizedDetails);
|
||||
}
|
||||
|
||||
private static string StableId(string drawingName, int rowId, string? className)
|
||||
{
|
||||
var hash = SHA256.HashData(Encoding.UTF8.GetBytes($"{drawingName}|{rowId}|{className}"));
|
||||
@@ -196,11 +390,162 @@ internal sealed class PlantObjectReader : IPlantObjectReader
|
||||
}
|
||||
}
|
||||
|
||||
internal sealed class PlantViewportMembershipReader
|
||||
{
|
||||
internal readonly record struct MembershipReadResult(
|
||||
IReadOnlySet<int> SelectedRows,
|
||||
ViewMembershipStatus DefaultStatus,
|
||||
string DefaultCode,
|
||||
IReadOnlyDictionary<int, GeometrySnapshot>? Geometry = null)
|
||||
{
|
||||
public ViewMembershipStatus StatusFor(int rowId) =>
|
||||
DefaultStatus == ViewMembershipStatus.Resolved && !SelectedRows.Contains(rowId)
|
||||
? ViewMembershipStatus.ObjectOutsideView
|
||||
: DefaultStatus;
|
||||
|
||||
public IReadOnlyList<string> EvidenceFor(int rowId) =>
|
||||
DefaultStatus == ViewMembershipStatus.Resolved && !SelectedRows.Contains(rowId)
|
||||
? new[] { "VIEW_MEMBERSHIP_OBJECT_OUTSIDE_CLIP" }
|
||||
: new[] { DefaultCode };
|
||||
|
||||
public GeometrySnapshot GeometryFor(int rowId) =>
|
||||
Geometry is not null && Geometry.TryGetValue(rowId, out var geometry)
|
||||
? geometry
|
||||
: new GeometrySnapshot();
|
||||
}
|
||||
|
||||
internal static MembershipReadResult Read(OrthoViewportInfo viewport, DataLinksManager dataLinks, Autodesk.ProcessPower.DataObjects.PnPRowIdArray sourceRows)
|
||||
{
|
||||
try
|
||||
{
|
||||
var project = PlantApplication.ProjectPart("Ortho") as OrthoProject;
|
||||
if (project is null) return Unsupported("VIEW_MEMBERSHIP_API_UNSUPPORTED");
|
||||
|
||||
var candidates = project.DwgSheetDefinitions.AsArray()
|
||||
.SelectMany(sheet => sheet.DwgViewDefs.AsArray()
|
||||
.Where(view => string.Equals(StableId(sheet.DwgGuid.ToString(), view.ViewName), viewport.Id, StringComparison.Ordinal))
|
||||
.Select(view => (sheet, view)))
|
||||
.ToArray();
|
||||
if (candidates.Length != 1) return Unsupported("VIEW_MEMBERSHIP_API_UNSUPPORTED");
|
||||
|
||||
var view = candidates[0].view;
|
||||
if (!OrthoModelFilesContract.IsSupported(view, out var diagnostic))
|
||||
{
|
||||
RuntimeDiagnostics.Write("ViewportMembershipContractRejected", "WARNING", resultStatus: diagnostic.Code, details: diagnostic.Details);
|
||||
return Unsupported("VIEW_MEMBERSHIP_API_UNSUPPORTED");
|
||||
}
|
||||
|
||||
var selectedRows = new HashSet<int>();
|
||||
var geometry = new Dictionary<int, GeometrySnapshot>();
|
||||
var selected = view.DwgQuery.Execute(new StringCollection(), new StringCollection());
|
||||
for (var index = 0; index < selected.Count; index++)
|
||||
{
|
||||
Autodesk.ProcessPower.Drawings2d.MdObjectId sourceId = default;
|
||||
if (!selected.GetItem(index, ref sourceId) || sourceId.IsNull || sourceId.PrjObjectId.IsNull) continue;
|
||||
try
|
||||
{
|
||||
var rowId = dataLinks.FindAcPpRowId(sourceId.PrjObjectId);
|
||||
if (sourceRows.Contains(rowId))
|
||||
{
|
||||
selectedRows.Add(rowId);
|
||||
if (TryReadPlacement(sourceId, dataLinks, out var placement)) geometry[rowId] = placement;
|
||||
}
|
||||
}
|
||||
catch (DLException)
|
||||
{
|
||||
// A generated entity without a Piping DataLinks row is outside this reader's source set.
|
||||
}
|
||||
}
|
||||
|
||||
RuntimeDiagnostics.Write("ViewportMembershipReadCompleted", "INFO", resultStatus: "VIEW_MEMBERSHIP_FROM_CONFIRMED_PNP_ID", details: new Dictionary<string, object?>
|
||||
{
|
||||
["SelectedSourceRows"] = selectedRows.Count,
|
||||
["SourceRows"] = sourceRows.Count
|
||||
});
|
||||
return new MembershipReadResult(selectedRows, ViewMembershipStatus.Resolved, "VIEW_MEMBERSHIP_FROM_CONFIRMED_PNP_ID", geometry);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("ViewportMembershipReadCompleted", "WARNING", resultStatus: "VIEW_MEMBERSHIP_API_UNSUPPORTED", exception: exception);
|
||||
return Unsupported("VIEW_MEMBERSHIP_API_UNSUPPORTED");
|
||||
}
|
||||
}
|
||||
|
||||
private static MembershipReadResult Unsupported(string code) => new(new HashSet<int>(), ViewMembershipStatus.NotResolved, code);
|
||||
|
||||
// Confirmed Plant 3D 2026 linkage: DwgQuery.Execute returns MdObjectId,
|
||||
// whose PrjObjectId identifies the source entity and whose Xform projects
|
||||
// that source entity into the particular Ortho view. This is not a sheet
|
||||
// coordinate heuristic.
|
||||
private static bool TryReadPlacement(MdObjectId sourceId, DataLinksManager dataLinks, out GeometrySnapshot geometry)
|
||||
{
|
||||
geometry = new GeometrySnapshot();
|
||||
var stage = "GetDatabase";
|
||||
try
|
||||
{
|
||||
var openedByQuery = false;
|
||||
// The source model is normally not an active document in an Ortho /b session.
|
||||
// Ask MdObjectId to open its source database read-only and dispose it below when it did.
|
||||
var sourceDatabase = sourceId.GetDatabase(true, ref openedByQuery);
|
||||
try
|
||||
{
|
||||
stage = "StartTransaction";
|
||||
using var transaction = sourceDatabase.TransactionManager.StartOpenCloseTransaction();
|
||||
stage = "MakeAcDbObjectId";
|
||||
var objectId = dataLinks.MakeAcDbObjectId(sourceId.PrjObjectId, sourceDatabase);
|
||||
stage = "OpenPlantEntity";
|
||||
var entity = transaction.GetObject(objectId, OpenMode.ForRead);
|
||||
Autodesk.AutoCAD.Geometry.Point3d modelPoint;
|
||||
Autodesk.AutoCAD.Geometry.Vector3d? modelDirection = null;
|
||||
if (entity is Pipe pipe) modelPoint = pipe.StartPoint;
|
||||
else if (entity is Connector connector)
|
||||
{
|
||||
var ports = connector.GetPorts(PortType.Both);
|
||||
if (ports.Count != 2) return false;
|
||||
modelPoint = ports[1].Position;
|
||||
modelDirection = ports[0].Direction;
|
||||
}
|
||||
else return false;
|
||||
stage = "TransformPlacement";
|
||||
var point = modelPoint.TransformBy(sourceId.Xform);
|
||||
var direction = modelDirection?.TransformBy(sourceId.Xform);
|
||||
geometry = new GeometrySnapshot
|
||||
{
|
||||
WorldPosition = new Point3Dto(modelPoint.X, modelPoint.Y, modelPoint.Z),
|
||||
PaperPosition = new Point2Dto(point.X, point.Y),
|
||||
Elevation = modelPoint.Z,
|
||||
Rotation = 0,
|
||||
PaperDirection = direction is null ? null : new Vector2Dto(direction.Value.X, direction.Value.Y)
|
||||
};
|
||||
return true;
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (openedByQuery) sourceDatabase.Dispose();
|
||||
}
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("OrthoPipePlacementReadFailed", "ERROR", resultStatus: "ORTHO_PIPE_PLACEMENT_UNAVAILABLE", exception: exception, details: new Dictionary<string, object?> { ["PlacementStage"] = stage });
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Ortho viewport IDs are generated by PlantOrthoViewportReader from exactly this pair.
|
||||
// Only an exact regenerated ID is accepted; the reader never chooses an arbitrary view.
|
||||
private static string StableId(string sheetId, string? viewName)
|
||||
{
|
||||
var hash = SHA256.HashData(Encoding.UTF8.GetBytes(sheetId + "|" + (viewName ?? string.Empty)));
|
||||
return "vp-" + Convert.ToHexString(hash)[..20];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
internal sealed class RuntimeWriteGuard(PRecAnnotExecutionMode mode) : IRuntimeWriteGuard
|
||||
{
|
||||
public void EnsureWriteAllowed(string operation)
|
||||
{
|
||||
if (mode == PRecAnnotExecutionMode.Apply) throw new InvalidOperationException("APPLY_MODE_NOT_IMPLEMENTED");
|
||||
if (mode == PRecAnnotExecutionMode.Apply) return;
|
||||
throw new InvalidOperationException("SMOKE_WRITE_BLOCKED");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,10 @@ internal static class RuntimeDiagnostics
|
||||
|
||||
public static string RuntimeMode => Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE") ?? "Normal";
|
||||
|
||||
public static bool IsOrthoStructureDiagnosticsEnabled =>
|
||||
string.Equals(RuntimeMode, "DryRun", StringComparison.OrdinalIgnoreCase) &&
|
||||
string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_DIAGNOSTICS"), "OrthoStructure", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
public static void Write(
|
||||
string eventType,
|
||||
string level = "INFO",
|
||||
|
||||
+276
@@ -0,0 +1,276 @@
|
||||
using System.Text.Json;
|
||||
using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.Runtime;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.ProjectManager;
|
||||
using PRecAnnot.Abstractions;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
// Test-only observer. The AutoCAD /b processor, never this type, drives PXP-OA.
|
||||
internal static class ScriptDrivenFirstApplyAutomation
|
||||
{
|
||||
private sealed record Config(string Phase, string OrthoDrawingPath, string EvidencePath, string FixtureMarkerPath, string ExpectedEntryAssemblySha256, string TargetCommand, bool Diagnostic);
|
||||
private sealed record Run(int Sequence, string? PlanId, IReadOnlyList<string> Candidates, string? View, int Create, int Skip, bool? PermitAccepted, string? ApplyOutcome, int? DbmodBefore, int? DbmodAfter, AutomationEntityCounts? Before, AutomationEntityCounts? After, bool WillStart, bool Ended, bool Failed, bool Cancelled, int? SourceRows, int? MembershipResolved);
|
||||
private static Config? config;
|
||||
private static Document? fixture;
|
||||
private static Database? database;
|
||||
private static AutomationEntityCounts? baseline;
|
||||
private static int? dbmodBaseline;
|
||||
private static readonly List<Run> runs = [];
|
||||
private static readonly List<string> transitions = [];
|
||||
private static readonly List<string> commandEvents = [];
|
||||
private static readonly List<AutomationSentinelEvidence> sentinels = [];
|
||||
private static readonly List<AutomationCommandCorrelationEvidence> correlations = [];
|
||||
private static PxpOaDiscoveryEvidence? discovery;
|
||||
// Plant's implicit current-document lookup can lag between script commands.
|
||||
// PREPARE has already proved this immutable context belongs to the live fixture;
|
||||
// retain it for the two immediately following public PXP-OA commands only.
|
||||
private static PlantRuntimeContext? preparedContext;
|
||||
private static string? selectedTargetSnapshotId;
|
||||
private static bool prepared;
|
||||
private static bool terminal;
|
||||
private static string? applyExceptionText;
|
||||
|
||||
internal static void Prepare()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (terminal) return;
|
||||
config = ReadConfig();
|
||||
RequireGate(config);
|
||||
discovery = DiscoverTargetCommand(config);
|
||||
RequireDiscovery(discovery, config.TargetCommand);
|
||||
var active = AcadApplication.DocumentManager.MdiActiveDocument ?? throw new InvalidOperationException("AUTOMATION_ACTIVE_DOCUMENT_MISSING");
|
||||
if (!SamePath(active.Name, config.OrthoDrawingPath)) throw new InvalidOperationException("AUTOMATION_UNEXPECTED_ACTIVE_FIXTURE");
|
||||
fixture = active;
|
||||
database = active.Database ?? throw new InvalidOperationException("AUTOMATION_FIXTURE_DATABASE_MISSING");
|
||||
fixture.CommandWillStart += OnWillStart;
|
||||
fixture.CommandEnded += OnEnded;
|
||||
fixture.CommandFailed += OnFailed;
|
||||
fixture.CommandCancelled += OnCancelled;
|
||||
var projectXml = Path.Combine(Path.GetDirectoryName(config.FixtureMarkerPath)!, "Project.xml");
|
||||
if (!File.Exists(projectXml)) throw new InvalidOperationException("AUTOMATION_PROJECT_XML_MISSING");
|
||||
var project = PlantProject.LoadProject(projectXml, false, string.Empty, string.Empty);
|
||||
PlantApplication.SetCurrentProject(project, true);
|
||||
var context = new PlantRuntimeContextReader().ReadCurrentContext(fixture);
|
||||
if (!context.HasPlantProject || !context.IsOrthoDrawing || context.Viewports.Count != 1)
|
||||
throw new InvalidOperationException("AUTOMATION_ORTHO_CONTEXT_INVALID");
|
||||
var candidates = new PlantObjectReader().ReadObjects(context.Viewports.Single(), CancellationToken.None)
|
||||
.Where(x => string.Equals(x.ObjectClass, "Pipe", StringComparison.OrdinalIgnoreCase) && x.MembershipStatus == ViewMembershipStatus.Resolved && x.Geometry.PaperPosition is not null)
|
||||
.Select(x => x.SnapshotId).OrderBy(x => x, StringComparer.Ordinal).ToArray();
|
||||
if (candidates.Length == 0) throw new InvalidOperationException("AUTOMATION_NO_ELIGIBLE_CANDIDATE");
|
||||
preparedContext = context;
|
||||
selectedTargetSnapshotId = candidates[0];
|
||||
dbmodBaseline = Dbmod();
|
||||
baseline = Counts(database);
|
||||
prepared = true;
|
||||
transitions.Add("Prepared");
|
||||
Write(false, null);
|
||||
}
|
||||
catch (System.Exception exception) { Fail("AUTOMATION_PREPARE_FAILED", exception); }
|
||||
}
|
||||
|
||||
internal static void RecordSentinel(string stage)
|
||||
{
|
||||
Guard(() =>
|
||||
{
|
||||
if (!prepared || terminal || fixture is null || database is null) return;
|
||||
sentinels.Add(new(stage, fixture.Name, database.Filename, DateTimeOffset.UtcNow));
|
||||
transitions.Add("Sentinel:" + stage);
|
||||
Write(false, null);
|
||||
});
|
||||
}
|
||||
|
||||
internal static void RecordPxpOa(string? planId, IReadOnlyList<string> candidates, string? view, int create, int skip, bool? permitAccepted, int sourceRows, int membershipResolved)
|
||||
{
|
||||
if (!prepared || terminal || runs.Count == 0) return;
|
||||
var last = runs[^1];
|
||||
if (!last.WillStart || last.PlanId is not null) return;
|
||||
runs[^1] = last with { PlanId = planId, Candidates = candidates, View = view, Create = create, Skip = skip, PermitAccepted = permitAccepted, SourceRows = sourceRows, MembershipResolved = membershipResolved };
|
||||
}
|
||||
internal static void RecordPxpAav(string? planId, IReadOnlyList<string> candidates, string? view, int create, int skip, bool? permitAccepted, int sourceRows, int membershipResolved) =>
|
||||
RecordPxpOa(planId, candidates, view, create, skip, permitAccepted, sourceRows, membershipResolved);
|
||||
|
||||
internal static void RecordApplyOutcome(PipeAnnotationWriteOutcome outcome)
|
||||
{
|
||||
if (!prepared || terminal || runs.Count == 0) return;
|
||||
var last = runs[^1];
|
||||
runs[^1] = outcome == PipeAnnotationWriteOutcome.AlreadyExists
|
||||
? last with { ApplyOutcome = outcome.ToString(), Create = 0, Skip = 1 }
|
||||
: last with { ApplyOutcome = outcome.ToString() };
|
||||
}
|
||||
internal static void RecordApplyFailure(System.Exception exception)
|
||||
{
|
||||
if (!prepared || terminal) return;
|
||||
applyExceptionText = exception.ToString();
|
||||
Write(false, "AUTOMATION_APPLY_COMMAND_FAILED");
|
||||
}
|
||||
|
||||
internal static bool TryGetPreparedContext(Document? commandDocument, out PlantRuntimeContext context)
|
||||
{
|
||||
context = null!;
|
||||
if (!prepared || terminal || fixture is null || preparedContext is null || commandDocument is null || config is null) return false;
|
||||
if (!SamePath(commandDocument.Name, config.OrthoDrawingPath) || !SamePath(fixture.Name, config.OrthoDrawingPath)) return false;
|
||||
if (commandDocument.Database is null || database is null || !SamePath(commandDocument.Database.Filename, database.Filename)) return false;
|
||||
context = preparedContext;
|
||||
return true;
|
||||
}
|
||||
|
||||
internal static string? SelectedTargetSnapshotId => prepared && !terminal ? selectedTargetSnapshotId : null;
|
||||
|
||||
internal static void FinalizeAutomation()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!prepared) throw new InvalidOperationException("AUTOMATION_NOT_PREPARED");
|
||||
if (runs.Count != 2) throw new InvalidOperationException("AUTOMATION_EXPECTS_EXACTLY_TWO_TARGET_COMMAND_RUNS");
|
||||
if (runs.Any(x => !x.WillStart || !x.Ended || x.Failed || x.Cancelled)) throw new InvalidOperationException("AUTOMATION_TARGET_COMMAND_NOT_ENDED");
|
||||
if (runs.Any(x => string.IsNullOrWhiteSpace(x.PlanId))) throw new InvalidOperationException("AUTOMATION_TARGET_PLAN_RESULT_NOT_CAPTURED");
|
||||
if (!string.Equals(runs[0].PlanId, runs[1].PlanId, StringComparison.Ordinal)) throw new InvalidOperationException("AUTOMATION_PLAN_IDS_DIFFER");
|
||||
var apply = string.Equals(config!.Phase, "Apply", StringComparison.OrdinalIgnoreCase);
|
||||
if ((!apply && runs.Any(x => x.Create != 1)) || (apply && (runs[0].Create != 1 || runs[1].Create != 0))) throw new InvalidOperationException("AUTOMATION_CREATE_COUNTS_INVALID");
|
||||
if (runs[0].Candidates.Count == 0) throw new InvalidOperationException("AUTOMATION_NO_ELIGIBLE_CANDIDATE");
|
||||
if (apply)
|
||||
{
|
||||
if (runs[0].PermitAccepted != true) throw new InvalidOperationException("AUTOMATION_APPLY_PERMIT_NOT_ACCEPTED");
|
||||
if (!string.Equals(runs[0].ApplyOutcome, PipeAnnotationWriteOutcome.Created.ToString(), StringComparison.Ordinal)) throw new InvalidOperationException("AUTOMATION_APPLY_CREATE_NOT_CONFIRMED");
|
||||
if (!string.Equals(runs[1].ApplyOutcome, PipeAnnotationWriteOutcome.AlreadyExists.ToString(), StringComparison.Ordinal)) throw new InvalidOperationException("AUTOMATION_APPLY_DUPLICATE_NOT_CONFIRMED");
|
||||
var undoCounts = Counts(database!);
|
||||
if (!Equals(undoCounts, baseline)) throw new InvalidOperationException("AUTOMATION_UNDO_DID_NOT_RESTORE_BASELINE");
|
||||
}
|
||||
else if (Dbmod() != dbmodBaseline || !Equals(Counts(database!), baseline)) throw new InvalidOperationException("AUTOMATION_INSPECTOR_INVARIANCE_FAILED");
|
||||
terminal = true;
|
||||
transitions.Add(apply ? "ApplyCompleted" : "PreviewCompleted");
|
||||
Write(true, null);
|
||||
Unsubscribe();
|
||||
}
|
||||
catch (System.Exception exception) { Fail("PREVIEW_ACCEPTANCE_FAILED", exception); }
|
||||
}
|
||||
|
||||
private static void OnWillStart(object sender, CommandEventArgs args)
|
||||
{
|
||||
Guard(() =>
|
||||
{
|
||||
commandEvents.Add("WillStart:" + args.GlobalCommandName);
|
||||
var correlation = Correlate("WillStart", sender, args.GlobalCommandName, runs.Count < 2);
|
||||
correlations.Add(correlation);
|
||||
if (correlation.RejectionReason is not null) return;
|
||||
runs.Add(new Run(runs.Count + 1, null, [], null, 0, 0, null, null, Dbmod(), null, Counts(database!), null, true, false, false, false, null, null));
|
||||
transitions.Add("TargetCommandWillStart:" + runs.Count);
|
||||
});
|
||||
}
|
||||
private static void OnEnded(object sender, CommandEventArgs args) => Finish(sender, args, false, false);
|
||||
private static void OnFailed(object sender, CommandEventArgs args) => Finish(sender, args, true, false);
|
||||
private static void OnCancelled(object sender, CommandEventArgs args) => Finish(sender, args, false, true);
|
||||
private static void Finish(object sender, CommandEventArgs args, bool failed, bool cancelled)
|
||||
{
|
||||
Guard(() =>
|
||||
{
|
||||
var kind = failed ? "Failed" : cancelled ? "Cancelled" : "Ended";
|
||||
commandEvents.Add(kind + ":" + args.GlobalCommandName);
|
||||
var correlation = Correlate(kind, sender, args.GlobalCommandName, runs.Count > 0);
|
||||
correlations.Add(correlation);
|
||||
if (correlation.RejectionReason is not null) return;
|
||||
var last = runs[^1];
|
||||
if (last.Ended || last.Failed || last.Cancelled) return;
|
||||
runs[^1] = last with { Ended = !failed && !cancelled, Failed = failed, Cancelled = cancelled, DbmodAfter = Dbmod(), After = Counts(database!) };
|
||||
transitions.Add(failed ? "TargetCommandFailed" : cancelled ? "TargetCommandCancelled" : "TargetCommandEnded:" + last.Sequence);
|
||||
Write(false, null);
|
||||
});
|
||||
}
|
||||
private static AutomationCommandCorrelationEvidence Correlate(string kind, object sender, string rawName, bool sequenceAccepted)
|
||||
{
|
||||
var normalized = rawName.Trim();
|
||||
var command = config is not null && string.Equals(normalized, config.TargetCommand, StringComparison.OrdinalIgnoreCase);
|
||||
var state = prepared && !terminal && config is not null && fixture is not null && database is not null;
|
||||
var senderDocument = sender as Document;
|
||||
var senderPath = senderDocument?.Name;
|
||||
var expectedPath = config?.OrthoDrawingPath;
|
||||
var activePath = AcadApplication.DocumentManager.MdiActiveDocument?.Name;
|
||||
var fixturePath = senderPath is not null && expectedPath is not null && SamePath(senderPath, expectedPath);
|
||||
var activeFixture = activePath is not null && expectedPath is not null && SamePath(activePath, expectedPath);
|
||||
var document = fixturePath && activeFixture;
|
||||
var databaseMatch = senderDocument?.Database is not null && database is not null && SamePath(senderDocument.Database.Filename, database.Filename);
|
||||
var rejection = !command ? "COMMAND_NAME_MISMATCH" : !state ? "NOT_PREPARED" : !document ? "DOCUMENT_IDENTITY_MISMATCH" : !databaseMatch ? "DATABASE_IDENTITY_MISMATCH" : !sequenceAccepted ? "UNEXPECTED_SEQUENCE" : null;
|
||||
return new(kind, rawName, normalized, command, state, document, databaseMatch, fixturePath, sequenceAccepted, rejection, sender.GetType().FullName, senderPath, expectedPath, activePath, runs.Count, DateTimeOffset.UtcNow);
|
||||
}
|
||||
private static void Guard(Action action) { try { if (!terminal) action(); } catch (System.Exception ex) { Fail("AUTOMATION_EVENT_HANDLER_FAILED", ex); } }
|
||||
private static void Fail(string code, System.Exception exception) { if (terminal) return; terminal = true; transitions.Add("Failed:" + code); try { Write(false, code + ":" + exception); } finally { Unsubscribe(); } }
|
||||
private static void Unsubscribe()
|
||||
{
|
||||
if (fixture is not null) try { fixture.CommandWillStart -= OnWillStart; fixture.CommandEnded -= OnEnded; fixture.CommandFailed -= OnFailed; fixture.CommandCancelled -= OnCancelled; } catch { }
|
||||
preparedContext = null;
|
||||
selectedTargetSnapshotId = null;
|
||||
}
|
||||
private static int? Dbmod() { try { return Convert.ToInt32(AcadApplication.GetSystemVariable("DBMOD")); } catch { return null; } }
|
||||
private static AutomationEntityCounts Counts(Database db)
|
||||
{
|
||||
using var tx = db.TransactionManager.StartTransaction();
|
||||
var space = (BlockTableRecord)tx.GetObject(db.CurrentSpaceId, OpenMode.ForRead);
|
||||
var total = 0; var pipes = 0; var xdata = 0; var owned = 0;
|
||||
foreach (ObjectId id in space) { if (tx.GetObject(id, OpenMode.ForRead) is not Entity entity) continue; total++; if (entity is BlockReference br && string.Equals(br.Name, "PIPE", StringComparison.OrdinalIgnoreCase)) pipes++; if (entity.XData is not null) { foreach (TypedValue value in entity.XData) if (value.Value is string text && string.Equals(text, "PXP-OA", StringComparison.OrdinalIgnoreCase)) { xdata++; owned++; break; } } }
|
||||
return new(total, pipes, xdata, owned);
|
||||
}
|
||||
private static Config ReadConfig()
|
||||
{
|
||||
var path = Environment.GetEnvironmentVariable("P_REC_ANNOT_AUTOMATION_CONFIG") ?? throw new InvalidOperationException("AUTOMATION_CONFIG_MISSING");
|
||||
using var json = JsonDocument.Parse(File.ReadAllText(path)); var root = json.RootElement;
|
||||
var target = root.TryGetProperty("targetCommand", out var command) ? command.GetString() : "PXP-OA";
|
||||
if (string.IsNullOrWhiteSpace(target) || !target.All(value => char.IsAsciiLetterOrDigit(value) || value is '-' or '_')) throw new InvalidOperationException("AUTOMATION_TARGET_COMMAND_INVALID");
|
||||
return new(root.GetProperty("phase").GetString() ?? "Preview", root.GetProperty("orthoDrawingPath").GetString() ?? throw new InvalidOperationException("AUTOMATION_ORTHO_PATH_REQUIRED"), root.GetProperty("evidencePath").GetString() ?? throw new InvalidOperationException("AUTOMATION_EVIDENCE_PATH_REQUIRED"), root.GetProperty("fixtureMarkerPath").GetString() ?? throw new InvalidOperationException("AUTOMATION_MARKER_PATH_REQUIRED"), root.GetProperty("entryAssemblySha256").GetString() ?? throw new InvalidOperationException("AUTOMATION_ENTRY_ASSEMBLY_HASH_REQUIRED"), target, root.TryGetProperty("diagnostic", out var diagnostic) && diagnostic.ValueKind == JsonValueKind.True);
|
||||
}
|
||||
private static void RequireGate(Config value)
|
||||
{
|
||||
if (!string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_AUTOMATION"), "FirstLimitedApplyRuntimeTest", StringComparison.Ordinal) || !string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_LAUNCHER_MODE"), "NextPilot", StringComparison.Ordinal) || !File.Exists(value.FixtureMarkerPath)) throw new InvalidOperationException("AUTOMATION_GATE_REJECTED");
|
||||
}
|
||||
private static bool SamePath(string left, string right) => string.Equals(Path.GetFullPath(left), Path.GetFullPath(right), StringComparison.OrdinalIgnoreCase);
|
||||
private static void Write(bool completed, string? error)
|
||||
{
|
||||
if (config is null) return;
|
||||
var first = runs.ElementAtOrDefault(0); var second = runs.ElementAtOrDefault(1);
|
||||
var apply = string.Equals(config.Phase, "Apply", StringComparison.OrdinalIgnoreCase);
|
||||
var afterUndo = apply && terminal ? Counts(database!) : null;
|
||||
var evidence = new FirstApplyAutomationEvidence { Phase = config.Phase, TargetCommand = config.TargetCommand, Completed = completed, Prepared = prepared, FunctionalEvidenceCompleted = completed, ErrorCode = error, DbmodBefore = dbmodBaseline, DbmodAfterCommand1 = first?.DbmodAfter, DbmodAfterCommand2 = second?.DbmodAfter, DbmodAfterUndo = apply && terminal ? Dbmod() : null, Baseline = baseline, AfterCommand1 = first?.After, AfterCommand2 = second?.After, AfterUndo = afterUndo, CompletedCommands = runs.Where(x => x.Ended).Select(x => config.TargetCommand).Concat(apply && commandEvents.Any(x => string.Equals(x, "Ended:UNDO", StringComparison.OrdinalIgnoreCase)) ? ["UNDO"] : []).ToArray(), PlanIdRun1 = first?.PlanId, PlanIdRun2 = second?.PlanId, PlanIdsEqual = first is not null && second is not null ? string.Equals(first.PlanId, second.PlanId, StringComparison.Ordinal) : null, EligibleCandidateCount = first?.Candidates.Count, SelectedCandidateHash = first?.Candidates.OrderBy(x => x, StringComparer.Ordinal).FirstOrDefault(), ViewHash = first?.View, CreateRun1 = first?.Create, CreateRun2 = second?.Create, SkipRun2 = second?.Skip, ApplyOutcomeRun1 = first?.ApplyOutcome, ApplyOutcomeRun2 = second?.ApplyOutcome, PermitAccepted = first?.PermitAccepted, CommandsCompleted = runs.Count == 2 && runs.All(x => x.Ended) && (!apply || commandEvents.Any(x => string.Equals(x, "Ended:UNDO", StringComparison.OrdinalIgnoreCase))), InspectorsCompleted = baseline is not null && first?.After is not null && second?.After is not null && (!apply || afterUndo is not null), EvidenceFlushed = true, ExceptionText = applyExceptionText, CurrentState = terminal ? (completed ? "Completed" : "Failed") : "Prepared", StateTransitions = transitions, PxpOaDiscovery = discovery, Sentinels = sentinels, CommandEvents = commandEvents, CommandCorrelations = correlations };
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(config.EvidencePath)!);
|
||||
var temp = config.EvidencePath + ".tmp"; File.WriteAllText(temp, JsonSerializer.Serialize(evidence)); File.Move(temp, config.EvidencePath, true);
|
||||
}
|
||||
|
||||
private static PxpOaDiscoveryEvidence DiscoverTargetCommand(Config value)
|
||||
{
|
||||
var entry = typeof(EntryPoint).Assembly;
|
||||
var loaded = AppDomain.CurrentDomain.GetAssemblies().Any(x => ReferenceEquals(x, entry));
|
||||
var location = entry.Location;
|
||||
var hash = File.Exists(location) ? Convert.ToHexString(SHA256.HashData(File.ReadAllBytes(location))) : null;
|
||||
var declarations = AppDomain.CurrentDomain.GetAssemblies().SelectMany(Declarations).Where(x => string.Equals(x.Name, value.TargetCommand, StringComparison.OrdinalIgnoreCase)).ToArray();
|
||||
var owner = declarations.SingleOrDefault(x => x.Assembly == entry);
|
||||
var commandClass = entry.GetCustomAttributesData().Any(x => string.Equals(x.AttributeType.FullName, "Autodesk.AutoCAD.Runtime.CommandClassAttribute", StringComparison.Ordinal) && x.ConstructorArguments.Any(a => string.Equals(a.Value as Type, typeof(EntryPoint))));
|
||||
return new(owner is not null, owner?.Name, owner?.Group, owner?.Flags, owner?.Type.FullName, owner?.Assembly.GetName().Name, location, hash, loaded, commandClass, hash is not null && string.Equals(hash, value.ExpectedEntryAssemblySha256, StringComparison.OrdinalIgnoreCase), declarations.Length);
|
||||
}
|
||||
private sealed record Declaration(string Name, string? Group, string? Flags, Type Type, Assembly Assembly);
|
||||
private static IEnumerable<Declaration> Declarations(Assembly assembly)
|
||||
{
|
||||
Type[] types; try { types = assembly.GetTypes(); } catch (ReflectionTypeLoadException exception) { types = exception.Types.Where(x => x is not null).Cast<Type>().ToArray(); }
|
||||
foreach (var type in types) foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static)) foreach (var attribute in method.GetCustomAttributesData().Where(x => string.Equals(x.AttributeType.FullName, "Autodesk.AutoCAD.Runtime.CommandMethodAttribute", StringComparison.Ordinal)))
|
||||
{
|
||||
var name = attribute.ConstructorArguments.FirstOrDefault().Value as string;
|
||||
if (string.IsNullOrWhiteSpace(name)) continue;
|
||||
var group = attribute.NamedArguments.FirstOrDefault(x => x.MemberName == "GroupName").TypedValue.Value as string;
|
||||
var flags = attribute.NamedArguments.FirstOrDefault(x => x.MemberName == "Flags").TypedValue.Value?.ToString();
|
||||
yield return new(name, group, flags, type, assembly);
|
||||
}
|
||||
}
|
||||
private static void RequireDiscovery(PxpOaDiscoveryEvidence value, string targetCommand)
|
||||
{
|
||||
if (!value.AssemblyLoaded) throw new InvalidOperationException("AUTOMATION_TARGET_ASSEMBLY_NOT_LOADED");
|
||||
if (!value.BundleHashMatched) throw new InvalidOperationException("AUTOMATION_TARGET_BUNDLE_HASH_MISMATCH");
|
||||
if (!value.CommandClassIncluded) throw new InvalidOperationException("AUTOMATION_TARGET_COMMANDCLASS_NOT_REGISTERED");
|
||||
if (value.DeclarationCount > 1) throw new InvalidOperationException("AUTOMATION_TARGET_COMMAND_COLLISION");
|
||||
if (value.DeclarationCount == 0 || !value.Found) throw new InvalidOperationException("AUTOMATION_TARGET_COMMAND_NOT_FOUND");
|
||||
if (!string.Equals(value.GlobalName, targetCommand, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("AUTOMATION_TARGET_GLOBAL_NAME_MISMATCH");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using Autodesk.AutoCAD.Runtime;
|
||||
using Autodesk.AutoCAD.Windows;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class SwapAttributesCommand
|
||||
{
|
||||
private const string ApplicationName = "PXP-ALC";
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (document is null || PlantApplication.CurrentProject is null) return;
|
||||
var selected = document.Editor.SelectImplied();
|
||||
if (selected.Status != PromptStatus.OK || selected.Value.Count == 0) selected = document.Editor.GetSelection();
|
||||
if (selected.Status != PromptStatus.OK || selected.Value.Count == 0) return;
|
||||
using var documentLock = document.LockDocument();
|
||||
using var transaction = document.Database.TransactionManager.StartTransaction();
|
||||
if (transaction.GetObject(selected.Value.GetObjectIds()[0], OpenMode.ForWrite, false) is not BlockReference block || block.AttributeCollection.Count != 2)
|
||||
{ document.Editor.WriteMessage("\nPXP-AC requires a block with exactly two attributes."); return; }
|
||||
var first = transaction.GetObject(block.AttributeCollection[0], OpenMode.ForWrite, false) as AttributeReference;
|
||||
var second = transaction.GetObject(block.AttributeCollection[1], OpenMode.ForWrite, false) as AttributeReference;
|
||||
if (first is null || second is null || first.IsConstant || second.IsConstant || !first.IsMTextAttribute || !second.IsMTextAttribute)
|
||||
{ document.Editor.WriteMessage("\nPXP-AC requires two editable multiline attributes."); return; }
|
||||
var data = block.GetXDataForApplication(ApplicationName)?.AsArray();
|
||||
if (data is null) { document.Editor.WriteMessage("\nRun PXP-ALC before swapping connection attributes."); return; }
|
||||
var firstText = first.MTextAttribute.Contents;
|
||||
var secondText = second.MTextAttribute.Contents;
|
||||
first.TextString = secondText; second.TextString = firstText;
|
||||
first.UpdateMTextAttribute(); second.UpdateMTextAttribute();
|
||||
ResizeShelf(block, first, second);
|
||||
SwapXData(data, "LINENUMBER1", "LINENUMBER2");
|
||||
SwapXData(data, "ANNOTATIONTEXT1", "ANNOTATIONTEXT2");
|
||||
block.XData = new ResultBuffer(data);
|
||||
transaction.Commit();
|
||||
document.Editor.WriteMessage("\nPXP-AC: attributes swapped and shelf resized; AutoCAD UNDO is available.");
|
||||
RuntimeDiagnostics.Write("SwapAttributesCompleted", commandName: "PXP-AC", resultStatus: "Applied", document: document);
|
||||
}
|
||||
|
||||
private static void ResizeShelf(BlockReference block, AttributeReference first, AttributeReference second)
|
||||
{
|
||||
var rotation = block.Rotation;
|
||||
var firstOffset = new Point3d(block.Position.GetVectorTo(first.AlignmentPoint).ToArray()).RotateBy(-rotation, Vector3d.ZAxis, Point3d.Origin);
|
||||
var secondOffset = new Point3d(block.Position.GetVectorTo(second.AlignmentPoint).ToArray()).RotateBy(-rotation, Vector3d.ZAxis, Point3d.Origin);
|
||||
first.Rotation = 0; second.Rotation = 0; first.UpdateMTextAttribute(); second.UpdateMTextAttribute();
|
||||
var length = AttributeSwapPlanner.ComputeShelfLength(
|
||||
first.MTextAttribute.GeometricExtents.MaxPoint.X - first.MTextAttribute.GeometricExtents.MinPoint.X, firstOffset.X,
|
||||
second.MTextAttribute.GeometricExtents.MaxPoint.X - second.MTextAttribute.GeometricExtents.MinPoint.X, secondOffset.X);
|
||||
foreach (DynamicBlockReferenceProperty property in block.DynamicBlockReferencePropertyCollection)
|
||||
if (string.Equals(property.PropertyName, "L", StringComparison.OrdinalIgnoreCase) && !property.ReadOnly) { property.Value = Math.Abs(length); break; }
|
||||
first.Rotation = rotation; second.Rotation = rotation; first.UpdateMTextAttribute(); second.UpdateMTextAttribute();
|
||||
}
|
||||
|
||||
private static void SwapXData(TypedValue[] values, string firstMarker, string secondMarker)
|
||||
{
|
||||
var first = Array.FindIndex(values, value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(value.Value?.ToString(), firstMarker, StringComparison.Ordinal));
|
||||
var second = Array.FindIndex(values, value => value.TypeCode == (int)DxfCode.ExtendedDataAsciiString && string.Equals(value.Value?.ToString(), secondMarker, StringComparison.Ordinal));
|
||||
if (first < 0 || second < 0 || first + 1 >= values.Length || second + 1 >= values.Length) return;
|
||||
(values[first + 1], values[second + 1]) = (values[second + 1], values[first + 1]);
|
||||
}
|
||||
}
|
||||
|
||||
internal static class SwapAttributesContextMenu
|
||||
{
|
||||
private static ContextMenuExtension? menu;
|
||||
public static void Attach()
|
||||
{
|
||||
if (menu is not null) return;
|
||||
menu = new ContextMenuExtension();
|
||||
var item = new MenuItem("Swap attributes and resize shelf");
|
||||
item.Click += OnClick; menu.MenuItems.Add(item);
|
||||
AcadApplication.AddObjectContextMenuExtension(RXObject.GetClass(typeof(BlockReference)), menu);
|
||||
}
|
||||
public static void Detach()
|
||||
{
|
||||
if (menu is null) return;
|
||||
AcadApplication.RemoveObjectContextMenuExtension(RXObject.GetClass(typeof(BlockReference)), menu); menu = null;
|
||||
}
|
||||
private static void OnClick(object? sender, EventArgs args) => AcadApplication.DocumentManager.MdiActiveDocument?.SendStringToExecute("_.PXP-AC ", true, false, false);
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Specialized;
|
||||
using Autodesk.AutoCAD.ApplicationServices;
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.AutoCAD.Geometry;
|
||||
using Autodesk.ProcessPower.Drawings2d;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.P3dProjectParts;
|
||||
using Autodesk.ProcessPower.PnP3dOrthoDrawingsUI;
|
||||
using Autodesk.ProcessPower.ProjectManager;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Application;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class UpdateOrthoDrawingsCommand
|
||||
{
|
||||
public static void Run()
|
||||
{
|
||||
var owner = AcadApplication.DocumentManager.MdiActiveDocument;
|
||||
if (owner is null) return;
|
||||
try
|
||||
{
|
||||
var project = PlantApplication.CurrentProject ?? throw new InvalidOperationException("ORTHO_BATCH_PROJECT_REQUIRED");
|
||||
var ortho = PlantApplication.ProjectPart("Ortho") as OrthoProject ?? throw new InvalidOperationException("ORTHO_BATCH_PROJECT_PART_REQUIRED");
|
||||
var drawings = ReadDrawings(project, ortho);
|
||||
var selections = PromptSelections(owner.Editor, drawings);
|
||||
if (selections.Count == 0) return;
|
||||
var plan = new OrthoBatchPlanner().Build(drawings, selections);
|
||||
foreach (var diagnostic in plan.Diagnostics) owner.Editor.WriteMessage("\nPXP-IOD: " + diagnostic);
|
||||
owner.Editor.WriteMessage($"\nPXP-IOD preview: drawings={plan.Operations.Select(value => value.RelativePath).Distinct(StringComparer.OrdinalIgnoreCase).Count()}; views={plan.Operations.Count}; no drawings modified.");
|
||||
RuntimeDiagnostics.Write("UpdateOrthoDrawingsPreviewCompleted", commandName: "PXP-IOD", resultStatus: "PreviewCompleted", document: owner, details: new Dictionary<string, object?> { ["DrawingCount"] = plan.Operations.Select(value => value.RelativePath).Distinct(StringComparer.OrdinalIgnoreCase).Count(), ["ViewCount"] = plan.Operations.Count });
|
||||
if (!string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase)) return;
|
||||
var fixtureRoot = ValidateFixture();
|
||||
var failures = Apply(project, ortho, plan, fixtureRoot);
|
||||
owner.Editor.WriteMessage($"\nPXP-IOD Apply completed: views={plan.Operations.Count}; failures={failures.Count}.");
|
||||
RuntimeDiagnostics.Write("UpdateOrthoDrawingsApplyCompleted", commandName: "PXP-IOD", resultStatus: failures.Count == 0 ? "Applied" : "PartiallyApplied", document: owner, details: new Dictionary<string, object?> { ["FailureCount"] = failures.Count, ["Failures"] = failures.ToArray() });
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
RuntimeDiagnostics.Write("UpdateOrthoDrawingsFailed", "ERROR", commandName: "PXP-IOD", resultStatus: exception.Message, exception: exception, document: owner);
|
||||
owner.Editor.WriteMessage("\nPXP-IOD: " + exception.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private static IReadOnlyList<OrthoBatchDrawing> ReadDrawings(PlantProject project, OrthoProject ortho)
|
||||
{
|
||||
var root = Path.GetDirectoryName(project.FileName) ?? throw new InvalidOperationException("ORTHO_BATCH_PROJECT_ROOT_UNAVAILABLE");
|
||||
return ortho.DwgSheetDefinitions.AsArray().Select(sheet =>
|
||||
{
|
||||
var path = UIUtils.GetDwgSheetDefResolvedPath(sheet);
|
||||
var relative = Path.GetRelativePath(root, path);
|
||||
return new OrthoBatchDrawing(sheet.DwgGuid.ToString(), Path.GetFileName(path), relative, sheet.DwgViewDefs.AsArray().Select(view => view.ViewName).ToArray());
|
||||
}).OrderBy(value => value.RelativePath, StringComparer.OrdinalIgnoreCase).ToArray();
|
||||
}
|
||||
|
||||
private static IReadOnlyList<OrthoBatchSelection> PromptSelections(Editor editor, IReadOnlyList<OrthoBatchDrawing> drawings)
|
||||
{
|
||||
var result = new List<OrthoBatchSelection>();
|
||||
foreach (var drawing in drawings)
|
||||
{
|
||||
var prompt = new PromptKeywordOptions($"\nUpdate Ortho drawing {drawing.RelativePath}?") { AllowNone = true };
|
||||
prompt.Keywords.Add("Yes"); prompt.Keywords.Add("No"); prompt.Keywords.Default = "No";
|
||||
var answer = editor.GetKeywords(prompt);
|
||||
if (answer.Status == PromptStatus.Cancel) return Array.Empty<OrthoBatchSelection>();
|
||||
if (string.Equals(answer.StringResult, "Yes", StringComparison.OrdinalIgnoreCase)) result.Add(new(drawing.RelativePath, drawing.Views));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static IReadOnlyList<string> Apply(PlantProject project, OrthoProject ortho, OrthoBatchPlan plan, string fixtureRoot)
|
||||
{
|
||||
var projectRoot = Path.GetDirectoryName(project.FileName)!;
|
||||
var failures = new List<string>();
|
||||
foreach (var group in plan.Operations.GroupBy(value => value.RelativePath, StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
var path = Path.GetFullPath(Path.Combine(projectRoot, group.Key));
|
||||
if (!path.StartsWith(fixtureRoot, StringComparison.OrdinalIgnoreCase)) { failures.Add(group.Key + ":OUTSIDE_FIXTURE"); continue; }
|
||||
Document? document = AcadApplication.DocumentManager.Cast<Document>().FirstOrDefault(value => string.Equals(Path.GetFullPath(value.Name), path, StringComparison.OrdinalIgnoreCase));
|
||||
var wasOpen = document is not null;
|
||||
try
|
||||
{
|
||||
if (document is null) { UIUtils.OpenDocument(path, out document, false); document.Database.CloseInput(true); }
|
||||
AcadApplication.DocumentManager.MdiActiveDocument = document;
|
||||
using (document.LockDocument()) foreach (var operation in group) UpdateView(document, ortho, operation.ViewName);
|
||||
if (wasOpen) document.Database.SaveAs(document.Name, true, DwgVersion.Current, document.Database.SecurityParameters); else document.CloseAndSave(path);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
failures.Add(group.Key + ":" + exception.GetType().Name);
|
||||
if (!wasOpen && document is not null) try { document.CloseAndDiscard(); } catch { }
|
||||
}
|
||||
}
|
||||
return failures;
|
||||
}
|
||||
|
||||
private static void UpdateView(Document document, OrthoProject ortho, string viewName)
|
||||
{
|
||||
if (!UIUtils.GetDwgSheetFromOrthoDrawingName(document.Database.Filename, out IDwgSheetDef sheet) || !UIUtils.GetViewDefByViewName(viewName, sheet, out IDwgViewDef definition))
|
||||
throw new InvalidOperationException("ORTHO_BATCH_VIEW_NOT_FOUND:" + viewName);
|
||||
var viewportId = FindViewport(document.Database, definition);
|
||||
var frozen = ReadFrozenLayers(document.Database, viewportId); var off = new StringCollection();
|
||||
if (!UIUtils.IsValidViewpport(viewportId, out double width, out double height, out double scale, out Point3d center) || !definition.SetLayout(width, height, ref center))
|
||||
throw new InvalidOperationException("ORTHO_BATCH_VIEW_LAYOUT_INVALID:" + viewName);
|
||||
definition.ViewScale = scale;
|
||||
var resolved = new StringCollection(); resolved.AddRange(UIUtils.GetResolvedRefModels(definition, false).Select(value => value.ModelFileName).ToArray());
|
||||
var models = new ArrayList(); UIUtils.UpdateFileCollectionWithXrefs(resolved, ref models, out Extents3d extents);
|
||||
definition.DwgQuery.ModelFiles = models.ToArray(typeof(ModelFile)) as ModelFile[];
|
||||
definition.DwgQuery.Execute(frozen, off);
|
||||
UIUtils.CreateOrUpdateOrthoView(null!, sheet, viewName, ortho, false, true, Dwg2dGen.NewDwgSetClipper(definition, 0), 0, frozen, off, new Vector3d(), 0, new Vector3d(), null!);
|
||||
definition.ViewCreationTime = DateTime.UtcNow.ToString("O");
|
||||
}
|
||||
|
||||
private static ObjectId FindViewport(Database database, IDwgViewDef definition)
|
||||
{
|
||||
using var transaction = database.TransactionManager.StartOpenCloseTransaction();
|
||||
var layouts = (DBDictionary)transaction.GetObject(database.LayoutDictionaryId, OpenMode.ForRead);
|
||||
foreach (DBDictionaryEntry entry in layouts)
|
||||
{
|
||||
var layout = (Layout)transaction.GetObject(entry.Value, OpenMode.ForRead);
|
||||
if (layout.ModelType) continue;
|
||||
var paper = (BlockTableRecord)transaction.GetObject(layout.BlockTableRecordId, OpenMode.ForRead);
|
||||
foreach (ObjectId id in paper)
|
||||
if (transaction.GetObject(id, OpenMode.ForRead) is Viewport viewport && viewport.Number > 1 &&
|
||||
Math.Abs(viewport.CenterPoint.X - definition.CenterPoint.X) < .001 && Math.Abs(viewport.CenterPoint.Y - definition.CenterPoint.Y) < .001 &&
|
||||
Math.Abs(viewport.Width - definition.ViewWidth) < .001 && Math.Abs(viewport.Height - definition.ViewHeight) < .001) return id;
|
||||
}
|
||||
throw new InvalidOperationException("ORTHO_BATCH_VIEWPORT_NOT_FOUND:" + definition.ViewName);
|
||||
}
|
||||
|
||||
private static StringCollection ReadFrozenLayers(Database database, ObjectId viewportId)
|
||||
{
|
||||
var result = new StringCollection();
|
||||
using var transaction = database.TransactionManager.StartOpenCloseTransaction();
|
||||
var viewport = (Viewport)transaction.GetObject(viewportId, OpenMode.ForRead);
|
||||
foreach (ObjectId id in viewport.GetFrozenLayers()) if (transaction.GetObject(id, OpenMode.ForRead) is LayerTableRecord layer) result.Add(layer.Name);
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string ValidateFixture()
|
||||
{
|
||||
var marker = Environment.GetEnvironmentVariable("P_REC_ANNOT_ORTHO_BATCH_FIXTURE_MARKER");
|
||||
if (string.IsNullOrWhiteSpace(marker) || !File.Exists(marker) || !string.Equals(File.ReadAllText(marker).Trim(), "P_REC_ANNOT_TEST_FIXTURE=ORTHO_BATCH_APPLY", StringComparison.Ordinal)) throw new InvalidOperationException("ORTHO_BATCH_TEST_FIXTURE_REQUIRED");
|
||||
return Path.GetDirectoryName(Path.GetFullPath(marker))! + Path.DirectorySeparatorChar;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
using Autodesk.AutoCAD.DatabaseServices;
|
||||
using Autodesk.AutoCAD.EditorInput;
|
||||
using Autodesk.ProcessPower.DataObjects;
|
||||
using Autodesk.ProcessPower.Drawings2d;
|
||||
using Autodesk.ProcessPower.PlantInstance;
|
||||
using Autodesk.ProcessPower.PnP3dOrthoDrawingsUI;
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
using AcadApplication = Autodesk.AutoCAD.ApplicationServices.Core.Application;
|
||||
using AcadColor = Autodesk.AutoCAD.Colors.Color;
|
||||
|
||||
namespace PRecAnnot.Plant3D2026;
|
||||
|
||||
internal static class UpdateOrthoViewBlocksCommand
|
||||
{
|
||||
public static void Run()
|
||||
{
|
||||
var document = AcadApplication.DocumentManager.MdiActiveDocument; if (document is null) return;
|
||||
try
|
||||
{
|
||||
var settings = Environment.GetEnvironmentVariable("P_REC_ANNOT_LINE_NUMBER_DRAWING_SETTINGS_PATH");
|
||||
if (string.IsNullOrWhiteSpace(settings) || !File.Exists(settings)) throw new InvalidOperationException("ORTHO_LAYER_CONFIGURATION_REQUIRED");
|
||||
var rules = new OrthoLayerSettingsLoader().Load(File.ReadAllText(settings));
|
||||
var options = new PromptEntityOptions("\nВыберите видовой экран для обновления слоев блоков: "); options.SetRejectMessage("\nДолжен быть видовой экран."); options.AddAllowedClass(typeof(Viewport), true);
|
||||
var selected = document.Editor.GetEntity(options); if (selected.Status != PromptStatus.OK) return;
|
||||
string viewName; var changes = new List<(string Layer, OrthoLayerRule Rule)>();
|
||||
using (var transaction = document.Database.TransactionManager.StartOpenCloseTransaction())
|
||||
{
|
||||
var viewport = (Viewport)transaction.GetObject(selected.ObjectId, OpenMode.ForRead);
|
||||
var context = new PlantRuntimeContextReader().ReadCurrentContext(document);
|
||||
var matched = context.Viewports.Where(x => Math.Abs(x.CenterX - viewport.CenterPoint.X) < .001 && Math.Abs(x.CenterY - viewport.CenterPoint.Y) < .001 && Math.Abs(x.Width - viewport.Width) < .001 && Math.Abs(x.Height - viewport.Height) < .001).ToArray();
|
||||
viewName = matched.Length == 1 ? matched[0].ViewName ?? matched[0].DisplayName : throw new InvalidOperationException(matched.Length == 0 ? "ORTHO_VIEW_NOT_FOUND" : "ORTHO_VIEW_AMBIGUOUS");
|
||||
var layers = (LayerTable)transaction.GetObject(document.Database.LayerTableId, OpenMode.ForRead);
|
||||
foreach (ObjectId id in layers)
|
||||
{
|
||||
var layer = (LayerTableRecord)transaction.GetObject(id, OpenMode.ForRead); var rule = rules.FirstOrDefault(x => x.MatchesLayer(viewName, layer.Name));
|
||||
if (rule is not null) changes.Add((layer.Name, rule));
|
||||
}
|
||||
}
|
||||
document.Editor.WriteMessage($"\nPXP-UOB preview: view={viewName}; matching-layers={changes.Count}. DWG не изменён.");
|
||||
RuntimeDiagnostics.Write("UpdateOrthoViewBlocksPreviewCompleted", commandName: "PXP-UOB", resultStatus: "PreviewCompleted", document: document, details: new Dictionary<string, object?> { ["ViewName"] = viewName, ["LayerCount"] = changes.Count });
|
||||
if (!string.Equals(Environment.GetEnvironmentVariable("P_REC_ANNOT_RUNTIME_MODE"), "Apply", StringComparison.OrdinalIgnoreCase)) return;
|
||||
ValidateFixture(document);
|
||||
using var documentLock = document.LockDocument(); using var write = document.Database.TransactionManager.StartTransaction();
|
||||
var layerTable = (LayerTable)write.GetObject(document.Database.LayerTableId, OpenMode.ForRead); var linetypes = (LinetypeTable)write.GetObject(document.Database.LinetypeTableId, OpenMode.ForRead);
|
||||
var representationCount = ApplyRepresentationRules(document, selected.ObjectId, viewName, rules, write, linetypes);
|
||||
foreach (var change in changes)
|
||||
{
|
||||
var layer = (LayerTableRecord)write.GetObject(layerTable[change.Layer], OpenMode.ForWrite); Apply(layer, change.Rule, linetypes);
|
||||
}
|
||||
var viewportToUpdate = (Viewport)write.GetObject(selected.ObjectId, OpenMode.ForWrite); if (layerTable.Has("Defpoints")) viewportToUpdate.LayerId = layerTable["Defpoints"];
|
||||
write.Commit(); document.Editor.WriteMessage($"\nPXP-UOB Apply: updated-layers={changes.Count}; updated-representations={representationCount}; AutoCAD UNDO is available.");
|
||||
RuntimeDiagnostics.Write("UpdateOrthoViewBlocksApplyCompleted", commandName: "PXP-UOB", resultStatus: "Applied", document: document, details: new Dictionary<string, object?> { ["LayerCount"] = changes.Count, ["RepresentationCount"] = representationCount });
|
||||
}
|
||||
catch (Exception exception) { RuntimeDiagnostics.Write("UpdateOrthoViewBlocksFailed", "ERROR", commandName: "PXP-UOB", resultStatus: exception.Message, exception: exception, document: document); document.Editor.WriteMessage("\nPXP-UOB: " + exception.Message); }
|
||||
}
|
||||
private static void Apply(LayerTableRecord layer, OrthoLayerRule rule, LinetypeTable linetypes)
|
||||
{
|
||||
if (rule.LineWeight.HasValue) layer.LineWeight = (LineWeight)rule.LineWeight.Value;
|
||||
if (!string.IsNullOrWhiteSpace(rule.LineType) && linetypes.Has(rule.LineType)) layer.LinetypeObjectId = linetypes[rule.LineType];
|
||||
if (rule.Red.HasValue) layer.Color = AcadColor.FromRgb(rule.Red.Value, rule.Green!.Value, rule.Blue!.Value);
|
||||
else if (rule.ColorIndex.HasValue) layer.Color = AcadColor.FromColorIndex(Autodesk.AutoCAD.Colors.ColorMethod.ByColor, rule.ColorIndex.Value);
|
||||
}
|
||||
private static int ApplyRepresentationRules(Autodesk.AutoCAD.ApplicationServices.Document document, ObjectId viewportId, string viewName, IReadOnlyList<OrthoLayerRule> rules, Transaction transaction, LinetypeTable linetypes)
|
||||
{
|
||||
var manager = PlantApplication.ProjectPart("Piping")?.DataLinksManager ?? throw new InvalidOperationException("ORTHO_PIPING_DATALINKS_UNAVAILABLE");
|
||||
var database = manager.GetPnPDatabase();
|
||||
IDwgSheetDef sheet;
|
||||
IDwgViewDef view;
|
||||
List<ObjectId> representations;
|
||||
if (!UIUtils.GetDwgSheetFromOrthoDrawingName(document.Database.Filename, out sheet) ||
|
||||
!UIUtils.GetViewDefByViewName(viewName, sheet, out view) ||
|
||||
!UIUtils.GetOrthoEntityListInView(UIUtils.GetDwgSheetDefResolvedPath(sheet), viewName, out representations))
|
||||
throw new InvalidOperationException("ORTHO_VIEW_REPRESENTATIONS_UNAVAILABLE");
|
||||
var changed = 0;
|
||||
foreach (var id in representations.Where(value => !value.IsNull).OrderBy(value => value.Handle.Value))
|
||||
{
|
||||
if (transaction.GetObject(id, OpenMode.ForWrite, false) is not BlockReference block) continue;
|
||||
var modelId = PnPDwg2dUtil.GetModelObjectId(id, document.Database);
|
||||
var rowId = PnPDwg2dUtil.PipingRowId(modelId);
|
||||
var engineering = database.Tables["EngineeringItems"].Select("PnPID=" + rowId);
|
||||
var equipment = database.Tables["Equipment"].Select("PnPID=" + rowId);
|
||||
if (engineering.Length == 1 && equipment.Length == 0)
|
||||
{
|
||||
var status = Convert.ToString(engineering[0]["Status"]) ?? string.Empty;
|
||||
var statusRule = rules.FirstOrDefault(rule => rule.MatchesStatus(status));
|
||||
if (statusRule is not null) Apply(block, statusRule, linetypes);
|
||||
}
|
||||
else if (engineering.Length == 1 && equipment.Length == 1) block.LineWeight = LineWeight.ByLineWeightDefault;
|
||||
if (transaction.GetObject(block.BlockTableRecord, OpenMode.ForRead) is BlockTableRecord definition)
|
||||
foreach (ObjectId nestedId in definition)
|
||||
if (transaction.GetObject(nestedId, OpenMode.ForWrite, false) is Entity nested && rules.FirstOrDefault(rule => rule.MatchesLayer(viewName, nested.Layer)) is { } nestedRule)
|
||||
Apply(nested, nestedRule, linetypes);
|
||||
changed++;
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
private static void Apply(Entity entity, OrthoLayerRule rule, LinetypeTable linetypes)
|
||||
{
|
||||
if (rule.LineWeight.HasValue) entity.LineWeight = (LineWeight)rule.LineWeight.Value;
|
||||
if (!string.IsNullOrWhiteSpace(rule.LineType) && linetypes.Has(rule.LineType)) entity.LinetypeId = linetypes[rule.LineType];
|
||||
if (rule.Red.HasValue) entity.Color = AcadColor.FromRgb(rule.Red.Value, rule.Green!.Value, rule.Blue!.Value);
|
||||
else if (rule.ColorIndex.HasValue) entity.Color = AcadColor.FromColorIndex(Autodesk.AutoCAD.Colors.ColorMethod.ByColor, rule.ColorIndex.Value);
|
||||
}
|
||||
private static void ValidateFixture(Autodesk.AutoCAD.ApplicationServices.Document document)
|
||||
{
|
||||
var marker = Environment.GetEnvironmentVariable("P_REC_ANNOT_ORTHO_MAINTENANCE_FIXTURE_MARKER");
|
||||
if (string.IsNullOrWhiteSpace(marker) || !File.Exists(marker) || !string.Equals(File.ReadAllText(marker).Trim(), "P_REC_ANNOT_TEST_FIXTURE=ORTHO_MAINTENANCE_APPLY", StringComparison.Ordinal)) throw new InvalidOperationException("ORTHO_MAINTENANCE_TEST_FIXTURE_REQUIRED");
|
||||
var root = Path.GetDirectoryName(Path.GetFullPath(marker))! + Path.DirectorySeparatorChar; if (!Path.GetFullPath(document.Name).StartsWith(root, StringComparison.OrdinalIgnoreCase)) throw new InvalidOperationException("ORTHO_MAINTENANCE_TEST_FIXTURE_REQUIRED");
|
||||
}
|
||||
}
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
using PRecAnnot.Core;
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
public sealed class AnnotateLineNumbersSettingsLoaderTests
|
||||
{
|
||||
private const string Xml = "<Main><LineNumbers><Marker layer='M' maskscalefactor='1,5'><Text layer='T' textstyle='S' size='2,5' textvalue='' positionx='1' positiony='2'/><Line layer='L' startx='0' starty='0' endx='3' endy='4'/></Marker><List layer='LIST' maskscalefactor='1.2' lineheight='5' linespacingdistance='6'><MarkerText layer='T' textstyle='S' size='2' textvalue='' positionx='0' positiony='0'/><LineNumberText layer='T' textstyle='S' size='2' textvalue='' positionx='4' positiony='0'/><Line layer='L' startx='0' starty='0'/></List></LineNumbers></Main>";
|
||||
[Fact] public void LoadsLegacyMarkerAndListContract() { var x = new AnnotateLineNumbersSettingsLoader().Load(Xml); Assert.Equal(1.5, x.Marker.MaskScaleFactor); Assert.Equal("M", x.Marker.Layer); Assert.Equal(6, x.List.LineSpacingDistance); Assert.Equal(0, x.List.Line.End.X); }
|
||||
[Fact] public void RejectsMissingRequiredLayer() => Assert.Equal("LINE_NUMBER_SETTINGS_INVALID:layer", Assert.Throws<InvalidDataException>(() => new AnnotateLineNumbersSettingsLoader().Load(Xml.Replace(" layer='M'", ""))).Message);
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
using PRecAnnot.Core;
|
||||
using Xunit;
|
||||
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
|
||||
public sealed class AttributeSwapPlannerTests
|
||||
{
|
||||
[Fact] public void Shelf_length_preserves_legacy_longer_attribute_rule() => Assert.Equal(6.9, AttributeSwapPlanner.ComputeShelfLength(4, 1, 5, 1));
|
||||
[Fact] public void Metadata_values_are_swapped_without_losing_other_ownership_fields()
|
||||
{
|
||||
var result = AttributeSwapPlanner.Swap(new Dictionary<string, string> { ["LINENUMBER1"] = "10", ["LINENUMBER2"] = "20", ["VIEW"] = "A" }, "LINENUMBER1", "LINENUMBER2");
|
||||
Assert.Equal("20", result["LINENUMBER1"]); Assert.Equal("10", result["LINENUMBER2"]); Assert.Equal("A", result["VIEW"]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
|
||||
public sealed class ComponentGeometryContractTests
|
||||
{
|
||||
[Fact]
|
||||
public void GeometryDefinition_PreservesStableParametersAndBounds()
|
||||
{
|
||||
var geometry = new ComponentGeometryDefinition("CPP", new Dictionary<string, string> { ["D"] = "25.4", ["L"] = "508" }, new(new(0, 0, 0), new(1, 2, 3)), true);
|
||||
Assert.Equal("25.4", geometry.Parameters["D"]);
|
||||
Assert.Equal(new Point3Dto(1, 2, 3), geometry.Bounds.Maximum);
|
||||
Assert.True(geometry.ImperialDimensions);
|
||||
}
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
|
||||
public sealed class ConnectorViewportEligibilityEvaluatorTests
|
||||
{
|
||||
[Fact]
|
||||
public void UsesSecondPortAsLegacyPlacementAnchorWhenBothPortsAreVisible()
|
||||
{
|
||||
var result = new ConnectorViewportEligibilityEvaluator().Evaluate(Ports(new(1, 2, 3), new(4, 5, 6), new(1, 0, 0), new(0, 1, 0)), new(0, 0, 1), Bounds());
|
||||
Assert.True(result.Eligible);
|
||||
Assert.Equal(new Point3Dto(4, 5, 6), result.PlacementPoint);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RejectsPortParallelToViewDirection()
|
||||
{
|
||||
var result = new ConnectorViewportEligibilityEvaluator().Evaluate(Ports(new(), new(), new(0, 0, 1), new(1, 0, 0)), new(0, 0, 1), Bounds());
|
||||
Assert.Equal("CONNECTOR_PORT_PARALLEL_TO_VIEW", result.FailureCode);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RejectsConnectorWhenAnyPortLiesOutsideModelViewExtents()
|
||||
{
|
||||
var result = new ConnectorViewportEligibilityEvaluator().Evaluate(Ports(new(0, 0, 0), new(11, 0, 0), new(1, 0, 0), new(0, 1, 0)), new(0, 0, 1), Bounds());
|
||||
Assert.Equal("CONNECTOR_OUTSIDE_VIEW_EXTENTS", result.FailureCode);
|
||||
}
|
||||
|
||||
private static Bounds3Dto Bounds() => new(new(-10, -10, -10), new(10, 10, 10));
|
||||
private static PlantConnectorPortSnapshot Ports(Point3Dto firstPosition, Point3Dto secondPosition, Point3Dto firstDirection, Point3Dto secondDirection) => new("c", firstPosition, secondPosition, firstDirection, secondDirection);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
|
||||
public sealed class ElevationAnnotationPlannerTests
|
||||
{
|
||||
[Fact]
|
||||
public void PlansCreateUpdateAlreadyCurrentAndConflictsDeterministically()
|
||||
{
|
||||
var a = new ElevationCandidate("a", 5, 0, new(0, 0), 0, "PXP", "GOSTC");
|
||||
var b = new ElevationCandidate("b", 10, 0, new(1, 0), 0, "PXP", "GOSTC");
|
||||
var plan = new ElevationAnnotationPlanner().Build([b, a, a], [new("old-a", "a", "+0,005", new(0, 0)), new("old-b1", "b", "+0,010", new()), new("old-b2", "b", "+0,010", new())]);
|
||||
Assert.Collection(plan.Operations,
|
||||
value => Assert.Equal(AnnotationOperationKind.Skip, value.Kind),
|
||||
value => Assert.Equal(AnnotationOperationKind.Conflict, value.Kind),
|
||||
value => Assert.Equal(AnnotationOperationKind.Conflict, value.Kind));
|
||||
Assert.Equal("ALREADY_CURRENT", plan.Operations[0].Reasons.Single());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void PlansUpdateWhenTheFormattedElevationChanged()
|
||||
{
|
||||
var plan = new ElevationAnnotationPlanner().Build([new ElevationCandidate("a", 13, 0, new(), 0, "PXP", "GOSTC")], [new("old", "a", "+0,010", new())]);
|
||||
Assert.Equal(AnnotationOperationKind.Update, plan.Operations.Single().Kind);
|
||||
Assert.Equal("+0,015", plan.Operations.Single().Text);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
using PRecAnnot.Core;
|
||||
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
|
||||
public sealed class ElevationSettingsLoaderTests
|
||||
{
|
||||
[Fact]
|
||||
public void ReadsLegacyElevationAssets()
|
||||
{
|
||||
var result = new ElevationSettingsLoader().Load("<Main><Elevations layer='ELEV' textstyle='GOST'/></Main>");
|
||||
Assert.Equal("ELEV", result.Layer);
|
||||
Assert.Equal("GOST", result.TextStyle);
|
||||
Assert.Equal("BLOCK_ELEVATION", result.BlockName);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData("<Main/>")]
|
||||
[InlineData("<Main><Elevations layer='' textstyle='GOST'/></Main>")]
|
||||
[InlineData("<Main><Elevations layer='ELEV'/></Main>")]
|
||||
public void RejectsIncompleteLegacyAssets(string xml) =>
|
||||
Assert.Throws<InvalidDataException>(() => new ElevationSettingsLoader().Load(xml));
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
using PRecAnnot.Abstractions;
|
||||
using PRecAnnot.Core;
|
||||
namespace PRecAnnot.Core.Tests;
|
||||
public sealed class ExtentsIntersectionClassifierTests
|
||||
{
|
||||
[Theory]
|
||||
[InlineData(0, 0, 2, 2, ExtentsIntersectionType.ExtentsMatch)]
|
||||
[InlineData(0, 0, 4, 4, ExtentsIntersectionType.FirstExtentsInsideSecondExtents)]
|
||||
[InlineData(3, 3, 5, 5, ExtentsIntersectionType.DoNotIntersect)]
|
||||
public void ClassifiesPlanarExtents(double min, double minY, double max, double maxY, ExtentsIntersectionType expected) => Assert.Equal(expected, ExtentsIntersectionClassifier.Classify(Box(0, 0, 2, 2), Box(min, minY, max, maxY)));
|
||||
[Fact] public void TouchingExtents_Intersect() => Assert.Equal(ExtentsIntersectionType.Intersect, ExtentsIntersectionClassifier.Classify(Box(0, 0, 2, 2), Box(2, 1, 3, 2)));
|
||||
private static Bounds3Dto Box(double x1, double y1, double x2, double y2) => new(new(x1, y1, 0), new(x2, y2, 1));
|
||||
}
|
||||
@@ -61,6 +61,170 @@ public sealed class FoundationTests
|
||||
Assert.Contains("[CommandMethod(\"PHP_REC_ANNOT\")]", source);
|
||||
Assert.Contains("[CommandMethod(\"PXP-AAV\")]", source);
|
||||
Assert.Contains("[CommandMethod(\"PXP-OA\")]", source);
|
||||
Assert.Contains("PHP_REC_AUTOMATION_READY", source);
|
||||
}
|
||||
|
||||
[Fact] public void AutomationBootstrap_DefersPlantAndDocumentAccessUntilCoordinator()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var bootstrap = source[..source.IndexOf("internal sealed record FirstApplyAutomationEvidence", StringComparison.Ordinal)];
|
||||
Assert.DoesNotContain("PlantProject.LoadProject", bootstrap);
|
||||
Assert.DoesNotContain("MdiActiveDocument", bootstrap);
|
||||
Assert.Contains("AcadApplication.Idle += OnIdle", bootstrap);
|
||||
Assert.Contains("observedIdle = true", bootstrap);
|
||||
Assert.Contains("coordinatorStartCount++", bootstrap);
|
||||
}
|
||||
|
||||
[Fact] public void AutomationLifecycleProbe_CompletesBeforePlantActivation()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("LifecycleProbe", source);
|
||||
Assert.True(source.IndexOf("CompleteLifecycleProbe", StringComparison.Ordinal) < source.IndexOf("PlantProject.LoadProject", StringComparison.Ordinal));
|
||||
Assert.Contains("PostStartupReady", source);
|
||||
}
|
||||
|
||||
[Fact] public void AutomationProjectActivation_WaitsForFixtureDocumentAndQuiescence()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var activation = source[source.IndexOf("private void TryActivateProjectAndVerifyContext", StringComparison.Ordinal)..];
|
||||
Assert.Contains("!fixtureDocumentActivated", activation);
|
||||
Assert.Contains("!AcadApplication.IsQuiescent", activation);
|
||||
Assert.True(activation.IndexOf("PlantProject.LoadProject", StringComparison.Ordinal) > activation.IndexOf("AutomationBeforeProjectActivation", StringComparison.Ordinal));
|
||||
}
|
||||
|
||||
[Fact] public void AutomationDocumentActivation_IsSubscribedBeforeFixtureOpen()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.True(source.IndexOf("DocumentActivated += OnDocumentActivated", StringComparison.Ordinal) < source.IndexOf("DocumentManager.Open(config.OrthoDrawingPath", StringComparison.Ordinal));
|
||||
Assert.Contains("FixtureDocumentActivated", source);
|
||||
}
|
||||
|
||||
[Fact] public void AutomationDocumentActivation_RecoversSynchronousOpenEvent()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var start = source[source.IndexOf("public void Start()", StringComparison.Ordinal)..source.IndexOf("private void CompleteLifecycleProbe", StringComparison.Ordinal)];
|
||||
Assert.Contains("FixtureDocumentActiveAfterOpen", start);
|
||||
Assert.Contains("fixtureDocumentActivated = true", start);
|
||||
Assert.Contains("QueueReadinessBarrier();", start);
|
||||
Assert.Contains("ReadinessBarrierCompleted", source);
|
||||
Assert.Contains("TryActivateProjectAndVerifyContext();", source);
|
||||
}
|
||||
|
||||
[Fact] public void QueueReadinessBarrier_RequiresActiveFixtureAndUsesSafeDispatch()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var dispatcher = source[source.IndexOf("private async Task DispatchCommandAsync", StringComparison.Ordinal)..source.IndexOf("private void OnCommandEnded", StringComparison.Ordinal)];
|
||||
Assert.Contains("ExecuteInCommandContextAsync", dispatcher);
|
||||
Assert.Contains("MdiActiveDocument", dispatcher);
|
||||
Assert.Contains("AUTOMATION_COMMAND_DOCUMENT_NOT_ACTIVE", dispatcher);
|
||||
Assert.Contains("Editor.CommandAsync", dispatcher);
|
||||
Assert.DoesNotContain("SendStringToExecute", dispatcher);
|
||||
}
|
||||
|
||||
[Fact] public void AutomationControlledExit_QueuesNativeQuitAfterPublicCommand()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("RequestControlledExit", source);
|
||||
Assert.Contains("AcadApplication.Idle += OnExitIdle", source);
|
||||
Assert.Contains("QuitDispatchAttempted", source);
|
||||
Assert.Contains("exitDocument.SendStringToExecute(\"_.QUIT _N\\n\", true, true, false);", source);
|
||||
Assert.Contains("var exitDocument = AcadApplication.DocumentManager.MdiActiveDocument;", source);
|
||||
}
|
||||
|
||||
[Fact] public void Callback_AfterDocumentDestroyed_DoesNotAccessDocument()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("if (document is null || e.Document is null) return;", source);
|
||||
Assert.Contains("if (IsTerminal || document is null) return;", source);
|
||||
}
|
||||
|
||||
[Fact] public void Idle_WhenActiveDocumentNull_DoesNotThrow()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("AUTOMATION_EXIT_DOCUMENT_UNAVAILABLE", source);
|
||||
Assert.Contains("QuitDispatchSkippedNoLiveDocument", source);
|
||||
}
|
||||
|
||||
[Fact] public void TerminalState_IgnoresFurtherCallbacks()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("private bool IsTerminal", source);
|
||||
Assert.Contains("if (IsTerminal && callback != \"ControlledExitIdle\") return;", source);
|
||||
}
|
||||
|
||||
[Fact] public void HandlerException_ProducesFailedEvidence()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("exceptionText = exception.ToString();", source);
|
||||
Assert.Contains("ExceptionText = exceptionText", source);
|
||||
Assert.Contains("FailFromCallback", source);
|
||||
}
|
||||
|
||||
[Fact] public void HandlerException_DoesNotEscapeToAutoCad()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("private void RunCallback", source);
|
||||
Assert.Contains("catch (System.Exception exception) { FailFromCallback", source);
|
||||
Assert.Contains("=> RunCallback(\"Idle\"", source);
|
||||
Assert.Contains("=> RunCallback(\"CommandFailed\"", source);
|
||||
}
|
||||
|
||||
[Fact] public void Unsubscribe_IsIdempotent()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("private bool documentHandlersSubscribed", source);
|
||||
Assert.Contains("private bool lifecycleHandlersSubscribed", source);
|
||||
Assert.Contains("private void UnsubscribeHandlers()", source);
|
||||
}
|
||||
|
||||
[Fact] public void ControlledExit_DoesNotReuseDestroyedDocument()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var controlledExit = source[source.IndexOf("private void RequestControlledExit", StringComparison.Ordinal)..];
|
||||
Assert.DoesNotContain("document.CloseAndDiscard", controlledExit);
|
||||
Assert.Contains("var exitDocument = AcadApplication.DocumentManager.MdiActiveDocument;", controlledExit);
|
||||
Assert.Contains("document = null;", controlledExit);
|
||||
}
|
||||
|
||||
[Fact] public void FinalCommandCompletion_UsesItsQuiescentExitBoundary()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("Complete(true, null, safeToExitNow: true)", source);
|
||||
Assert.Contains("RequestControlledExit(safeToExitNow);", source);
|
||||
}
|
||||
|
||||
[Fact] public void TerminalEvidence_IsFlushedBeforeExitAttempt()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var exit = source[source.IndexOf("private void DispatchNativeQuit", StringComparison.Ordinal)..];
|
||||
Assert.True(exit.IndexOf("TryWriteEvidence(functionalCompleted, null);", StringComparison.Ordinal) < exit.IndexOf("SendStringToExecute(\"_.QUIT _N\\n", StringComparison.Ordinal));
|
||||
Assert.Contains("EvidenceFlushed = evidenceFlushed", source);
|
||||
Assert.Contains("CommandsCompleted", source);
|
||||
Assert.Contains("InspectorsCompleted", source);
|
||||
}
|
||||
|
||||
[Fact] public void ExitFailure_DoesNotInvalidateCompletedFunctionalEvidence()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.Contains("if (functionalCompleted)", source);
|
||||
Assert.Contains("ExitFailureCode = exitFailureCode", source);
|
||||
Assert.Contains("TryWriteEvidence(functionalCompleted, null);", source);
|
||||
}
|
||||
|
||||
[Fact] public void ExitDispatch_DoesNotUseUnavailableDocument()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
var exit = source[source.IndexOf("private void DispatchNativeQuit", StringComparison.Ordinal)..];
|
||||
Assert.Contains("AcadApplication.IsQuiescent", exit);
|
||||
Assert.Contains("QuitDispatchSkippedNoLiveDocument", exit);
|
||||
Assert.DoesNotContain("document ?? AcadApplication.DocumentManager", exit);
|
||||
}
|
||||
|
||||
[Fact] public void ProductionRuntime_DoesNotEnableForceAfterEvidence()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "FirstLimitedApplyAutomation.cs"));
|
||||
Assert.DoesNotContain("ForceAfterEvidence", source);
|
||||
Assert.Contains("P_REC_ANNOT_AUTOMATION", source);
|
||||
}
|
||||
|
||||
[Fact] public void PrimaryCommand_IsRegistered() => Assert.Contains("[CommandMethod(\"PHP_REC_ANNOT\")]", File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "EntryPoint.cs")));
|
||||
@@ -104,6 +268,62 @@ public sealed class FoundationTests
|
||||
Assert.Equal(first.Operations.Select(x => x.SourceSnapshotId), second.Operations.Select(x => x.SourceSnapshotId));
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_ReversedObjectOrder_HasSamePlanId()
|
||||
{
|
||||
var first = Build(Snapshot("a", "Pipe", "L-1"), Snapshot("b", "Pipe", "L-2"));
|
||||
var second = Build(Snapshot("b", "Pipe", "L-2"), Snapshot("a", "Pipe", "L-1"));
|
||||
Assert.Equal(first.PlanId, second.PlanId);
|
||||
Assert.Equal(first.Summary, second.Summary);
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_AbsolutePath_DoesNotAffectPlanId()
|
||||
{
|
||||
var builder = new AnnotationPlanBuilder();
|
||||
var item = Snapshot("a", "Pipe", "L-1");
|
||||
var first = builder.Build(new AnnotationPlanningRequest { CommandName = "PHP_REC_ANNOT", Viewport = new OrthoViewportInfo { Id = "v", DisplayName = "v", SourceDrawingName = "C:\\one\\model.dwg" }, Objects = new[] { item } });
|
||||
var second = builder.Build(new AnnotationPlanningRequest { CommandName = "PHP_REC_ANNOT", Viewport = new OrthoViewportInfo { Id = "v", DisplayName = "v", SourceDrawingName = "D:\\two\\model.dwg" }, Objects = new[] { item } });
|
||||
Assert.Equal(first.PlanId, second.PlanId);
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_ChangedRelevantProperty_ChangesPlanId()
|
||||
{
|
||||
var first = Build(Snapshot("a", "Pipe", "L-1"));
|
||||
var second = Build(Snapshot("a", "Pipe", "L-2"));
|
||||
Assert.NotEqual(first.PlanId, second.PlanId);
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_UnresolvedMembership_IsStableSkip()
|
||||
{
|
||||
var plan = Build(new PlantObjectSnapshot { SnapshotId = "a", ObjectClass = "Pipe", LineNumber = "L-1", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.NotResolved });
|
||||
Assert.Equal(AnnotationOperationKind.Skip, Assert.Single(plan.Operations).Kind);
|
||||
Assert.Contains("VIEW_MEMBERSHIP_NOT_RESOLVED", plan.SkipReasons);
|
||||
}
|
||||
|
||||
[Fact] public void ViewportMembership_OutsideClip_IsSkippedWithStableReason()
|
||||
{
|
||||
var plan = Build(new PlantObjectSnapshot { SnapshotId = "a", ObjectClass = "Pipe", LineNumber = "L-1", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.ObjectOutsideView });
|
||||
Assert.Equal(AnnotationOperationKind.Skip, Assert.Single(plan.Operations).Kind);
|
||||
Assert.Contains("VIEW_MEMBERSHIP_OBJECT_OUTSIDE_CLIP", plan.SkipReasons);
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_ResolvedMembership_AffectsPlanId()
|
||||
{
|
||||
var resolved = Build(new PlantObjectSnapshot { SnapshotId = "a", ObjectClass = "Pipe", LineNumber = "L-1", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.Resolved });
|
||||
var outside = Build(new PlantObjectSnapshot { SnapshotId = "a", ObjectClass = "Pipe", LineNumber = "L-1", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.ObjectOutsideView });
|
||||
Assert.NotEqual(resolved.PlanId, outside.PlanId);
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_ReorderedMembership_HasSamePlanId()
|
||||
{
|
||||
var first = Build(
|
||||
new PlantObjectSnapshot { SnapshotId = "a", ObjectClass = "Pipe", LineNumber = "L-1", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.Resolved },
|
||||
new PlantObjectSnapshot { SnapshotId = "b", ObjectClass = "Pipe", LineNumber = "L-2", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.ObjectOutsideView });
|
||||
var second = Build(
|
||||
new PlantObjectSnapshot { SnapshotId = "b", ObjectClass = "Pipe", LineNumber = "L-2", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.ObjectOutsideView },
|
||||
new PlantObjectSnapshot { SnapshotId = "a", ObjectClass = "Pipe", LineNumber = "L-1", Geometry = new GeometrySnapshot(), MembershipStatus = ViewMembershipStatus.Resolved });
|
||||
Assert.Equal(first.PlanId, second.PlanId);
|
||||
}
|
||||
|
||||
[Fact] public void AnnotationPlan_MissingLineNumber_IsSkipped()
|
||||
{
|
||||
var plan = Build(Snapshot("a", "Pipe", null, null));
|
||||
@@ -130,8 +350,165 @@ public sealed class FoundationTests
|
||||
Assert.Equal(AnnotationOperationKind.Conflict, plan.Operations.Last().Kind);
|
||||
}
|
||||
|
||||
[Fact] public void OrthoSourceResolver_OneView_ResolvesOneModelDrawing()
|
||||
{
|
||||
var result = new OrthoSourceDrawingResolver().Resolve(new OrthoDrawingSnapshot
|
||||
{
|
||||
StableId = "sheet",
|
||||
Views = new[] { new OrthoViewSourceSnapshot { ViewStableId = "view", ReferencedDrawingPaths = new[] { "Plant 3D Models/TestPipeModel.dwg" } } }
|
||||
});
|
||||
var source = Assert.Single(result);
|
||||
Assert.Equal(SourceDrawingResolutionStatus.Resolved, source.Status);
|
||||
Assert.Equal("TestPipeModel.dwg", source.DisplayName);
|
||||
}
|
||||
|
||||
[Fact] public void OrthoSourceResolver_DuplicateViews_DeduplicatesSource()
|
||||
{
|
||||
var result = new OrthoSourceDrawingResolver().Resolve(new OrthoDrawingSnapshot
|
||||
{
|
||||
StableId = "sheet",
|
||||
Views = new[]
|
||||
{
|
||||
new OrthoViewSourceSnapshot { ViewStableId = "a", ReferencedDrawingPaths = new[] { "models/A.dwg" } },
|
||||
new OrthoViewSourceSnapshot { ViewStableId = "b", ReferencedDrawingPaths = new[] { "models/A.dwg" } }
|
||||
}
|
||||
});
|
||||
Assert.Single(result);
|
||||
}
|
||||
|
||||
[Fact] public void OrthoSourceResolver_MissingSource_ReturnsDiagnostic()
|
||||
{
|
||||
var result = new OrthoSourceDrawingResolver().Resolve(new OrthoDrawingSnapshot { StableId = "sheet" });
|
||||
var source = Assert.Single(result);
|
||||
Assert.Equal(SourceDrawingResolutionStatus.NotReferenced, source.Status);
|
||||
Assert.Contains("ORTHO_SOURCE_DRAWING_NOT_RESOLVED", source.EvidenceCodes);
|
||||
}
|
||||
|
||||
[Fact] public void DwgQueryContract_UsesConfirmedModelFileContract()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.Contains("view.DwgQuery?.ModelFiles", source);
|
||||
Assert.Contains("file.ModelFileName", source);
|
||||
Assert.Contains("ORTHO_MODEL_FILES_API_UNSUPPORTED", source);
|
||||
}
|
||||
|
||||
[Fact] public void DwgQueryContract_DoesNotGuessAlternativePropertyNames()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.DoesNotContain("GetProperty(\"ModelFileName\")", source);
|
||||
Assert.DoesNotContain("GetProperty(\"Value\")", source);
|
||||
Assert.DoesNotContain("GetProperty(\"FileName\")", source);
|
||||
}
|
||||
|
||||
[Fact] public void OrthoSourceReader_UsesResolvedPipingProjectDrawingId()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.Contains("pipingProject.GetPnPDrawingFiles()", source);
|
||||
Assert.Contains("dataLinks.SelectAcPpRowIds(sourceDrawing.Id)", source);
|
||||
}
|
||||
|
||||
[Fact] public void OrthoSourceReader_DoesNotQueryTheActiveOrthoDatabase()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.DoesNotContain("SelectAcPpRowIds(sourceDatabase)", source);
|
||||
Assert.DoesNotContain("ReadDwgFile(viewport.SourceDrawingName", source);
|
||||
}
|
||||
|
||||
[Fact] public void OrthoSourceReader_ReportsDistinctSourceDiagnostics()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.Contains("ORTHO_SOURCE_DRAWING_NOT_IN_PROJECT", source);
|
||||
Assert.Contains("SOURCE_DATALINKS_UNAVAILABLE", source);
|
||||
Assert.Contains("SOURCE_DATALINKS_NO_ROWS", source);
|
||||
}
|
||||
|
||||
[Fact] public void ViewportMembership_UsesConfirmedPnpIdentityContract()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.Contains("view.DwgQuery.Execute", source);
|
||||
Assert.Contains("sourceId.PrjObjectId", source);
|
||||
Assert.Contains("dataLinks.FindAcPpRowId", source);
|
||||
Assert.Contains("VIEW_MEMBERSHIP_FROM_CONFIRMED_PNP_ID", source);
|
||||
}
|
||||
|
||||
[Fact] public void ViewportMembership_DoesNotSelectFirstViewport()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
Assert.DoesNotContain("DwgViewDefs.AsArray().First", source);
|
||||
Assert.Contains("candidates.Length != 1", source);
|
||||
}
|
||||
|
||||
[Fact] public void RuntimeInspector_IsDisabledByDefault()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "RuntimeDiagnostics.cs"));
|
||||
Assert.Contains("P_REC_ANNOT_DIAGNOSTICS", source);
|
||||
Assert.Contains("OrthoStructure", source);
|
||||
}
|
||||
|
||||
[Fact] public void ApplyMode_IsBlocked() => Assert.Throws<InvalidOperationException>(() => new ExecutionModeWriteGuard(PRecAnnotExecutionMode.Apply).EnsureWriteAllowed("test"));
|
||||
|
||||
[Fact] public void FirstLimitedApply_RequiresApplyMode()
|
||||
{
|
||||
var context = FirstApplyContext();
|
||||
Assert.Throws<InvalidOperationException>(() => new FirstLimitedApplyPlanner().Prepare(PRecAnnotExecutionMode.DryRun, context.Plan, context.Viewport, context.Objects, context.Permit));
|
||||
}
|
||||
|
||||
[Fact] public void FirstLimitedApply_RequiresFreshPlan()
|
||||
{
|
||||
var context = FirstApplyContext();
|
||||
var permit = context.Permit with { ExpectedPlanId = "stale" };
|
||||
Assert.Throws<InvalidOperationException>(() => new FirstLimitedApplyPlanner().Prepare(PRecAnnotExecutionMode.Apply, context.Plan, context.Viewport, context.Objects, permit));
|
||||
}
|
||||
|
||||
[Fact] public void FirstLimitedApply_RequiresResolvedMembership()
|
||||
{
|
||||
var context = FirstApplyContext();
|
||||
var objects = new[] { context.Objects[0] with { MembershipStatus = ViewMembershipStatus.NotResolved } };
|
||||
Assert.Throws<InvalidOperationException>(() => new FirstLimitedApplyPlanner().Prepare(PRecAnnotExecutionMode.Apply, context.Plan, context.Viewport, objects, context.Permit));
|
||||
}
|
||||
|
||||
[Fact] public void FirstLimitedApply_RequiresExactlyOneTarget()
|
||||
{
|
||||
var context = FirstApplyContext();
|
||||
var permit = context.Permit with { TargetSnapshotId = "missing" };
|
||||
Assert.Throws<InvalidOperationException>(() => new FirstLimitedApplyPlanner().Prepare(PRecAnnotExecutionMode.Apply, context.Plan, context.Viewport, context.Objects, permit));
|
||||
}
|
||||
|
||||
[Fact] public void FirstLimitedApply_CreatesDeterministicOperation()
|
||||
{
|
||||
var context = FirstApplyContext();
|
||||
var planner = new FirstLimitedApplyPlanner();
|
||||
var first = planner.Prepare(PRecAnnotExecutionMode.Apply, context.Plan, context.Viewport, context.Objects, context.Permit);
|
||||
var second = planner.Prepare(PRecAnnotExecutionMode.Apply, context.Plan, context.Viewport, context.Objects, context.Permit);
|
||||
Assert.Equal(first.Operation.OperationId, second.Operation.OperationId);
|
||||
Assert.Equal(first.Operation.DuplicateKey, second.Operation.DuplicateKey);
|
||||
Assert.DoesNotContain("C:\\", first.Operation.DuplicateKey, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
[Fact] public void FirstLimitedApplyPlan_OneResolvedPipeCreatesOnePipeOperation()
|
||||
{
|
||||
var viewport = new OrthoViewportInfo { Id = "vp", DisplayName = "view", SourceDrawingName = "model.dwg" };
|
||||
var plan = new AnnotationPlanBuilder().Build(new AnnotationPlanningRequest
|
||||
{
|
||||
CommandName = "PXP-OA", Viewport = viewport,
|
||||
Objects = new[] { Snapshot("pipe", "Pipe", null), Snapshot("other", "Valve", "TEST") },
|
||||
LimitedApplyTargetSnapshotId = "pipe", LimitedApplyRuleId = FirstLimitedApplyPlanner.RuleId
|
||||
});
|
||||
Assert.Equal(1, plan.Summary.CreateCount);
|
||||
Assert.Equal("PIPE", Assert.Single(plan.Operations.Where(x => x.Kind == AnnotationOperationKind.Create)).AnnotationType);
|
||||
Assert.Contains("APPLY_NOT_SELECTED_TARGET", plan.Operations.Single(x => x.SourceSnapshotId == "other").Reasons);
|
||||
}
|
||||
|
||||
[Fact] public void FirstLimitedApplyPlan_SelectionChangesCanonicalPlanId()
|
||||
{
|
||||
var viewport = new OrthoViewportInfo { Id = "vp", DisplayName = "view", SourceDrawingName = "model.dwg" };
|
||||
var objects = new[] { Snapshot("one", "Pipe", null), Snapshot("two", "Pipe", null) };
|
||||
var builder = new AnnotationPlanBuilder();
|
||||
var one = builder.Build(new AnnotationPlanningRequest { CommandName = "PXP-OA", Viewport = viewport, Objects = objects, LimitedApplyTargetSnapshotId = "one", LimitedApplyRuleId = FirstLimitedApplyPlanner.RuleId });
|
||||
var two = builder.Build(new AnnotationPlanningRequest { CommandName = "PXP-OA", Viewport = viewport, Objects = objects, LimitedApplyTargetSnapshotId = "two", LimitedApplyRuleId = FirstLimitedApplyPlanner.RuleId });
|
||||
Assert.NotEqual(one.PlanId, two.PlanId);
|
||||
}
|
||||
|
||||
[Fact] public void DryRunPath_HasNoForWriteOperations()
|
||||
{
|
||||
var source = File.ReadAllText(Path.Combine(ProjectRoot, "src", "PRecAnnot.Plant3D2026", "PlantReadPath.cs"));
|
||||
@@ -141,6 +518,21 @@ public sealed class FoundationTests
|
||||
Assert.DoesNotContain("SetProperties", source);
|
||||
}
|
||||
|
||||
private static (AnnotationPlan Plan, OrthoViewportInfo Viewport, PlantObjectSnapshot[] Objects, FirstLimitedApplyPermit Permit) FirstApplyContext()
|
||||
{
|
||||
var viewport = new OrthoViewportInfo { Id = "vp", DisplayName = "view", SourceDrawingName = "model.dwg" };
|
||||
var objects = new[] { Snapshot("pipe", "Pipe", "TEST") };
|
||||
var plan = new AnnotationPlanBuilder().Build(new AnnotationPlanningRequest
|
||||
{
|
||||
CommandName = "PXP-OA",
|
||||
Viewport = viewport,
|
||||
Objects = objects,
|
||||
LimitedApplyTargetSnapshotId = "pipe",
|
||||
LimitedApplyRuleId = FirstLimitedApplyPlanner.RuleId
|
||||
});
|
||||
return (plan, viewport, objects, new FirstLimitedApplyPermit { FixtureMarker = FirstLimitedApplyPlanner.FixtureMarker, AllowApply = true, TargetSnapshotId = "pipe", ExpectedPlanId = plan.PlanId });
|
||||
}
|
||||
|
||||
private static AnnotationPlan Build(params PlantObjectSnapshot[] objects) => new AnnotationPlanBuilder().Build(new AnnotationPlanningRequest { CommandName = "PHP_REC_ANNOT", Viewport = new OrthoViewportInfo { Id = "vp", DisplayName = "A", SourceDrawingName = "test.dwg" }, Objects = objects });
|
||||
private static PlantObjectSnapshot Snapshot(string id, string type, string? line, string? tag = "TAG") => new() { SnapshotId = id, ObjectClass = type, LineNumber = line, Tag = tag, Geometry = new GeometrySnapshot { PaperPosition = new Point2Dto(1, 2) } };
|
||||
private static PlantObjectSnapshot Snapshot(string id, string type, string? line, string? tag = "TAG") => new() { SnapshotId = id, ObjectClass = type, LineNumber = line, Tag = tag, Geometry = new GeometrySnapshot { PaperPosition = new Point2Dto(1, 2) }, MembershipStatus = ViewMembershipStatus.Resolved };
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user