From 00cdd8ac9b85b9aadcedb1b7db702b7ba2748d8b Mon Sep 17 00:00:00 2001 From: to3796zw Date: Sat, 20 Jun 2026 09:41:53 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20Axis=20Position=20Interlock=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C,=20Theta=20=EC=98=81=EC=96=B4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SequenceSetting의 Axis Position Interlock 속성 4개를 제거하고 (참조처 없음), LaserInterlock의 Head Theta DisplayName을 영어로 전환해 세팅 UI 표기를 정리. 빌드 검증 통과(오류 0). --- .../Settings/LaserInterlockSetting.cs | 10 +++++----- .../WeldingCommon/Settings/SequenceSetting.cs | 14 -------------- docs/작업일지/2026_06_20.md | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 docs/작업일지/2026_06_20.md diff --git a/Machines/ILSOS_PrismaticRD_PTOP/Settings/LaserInterlockSetting.cs b/Machines/ILSOS_PrismaticRD_PTOP/Settings/LaserInterlockSetting.cs index c5c0285..7fd46c2 100644 --- a/Machines/ILSOS_PrismaticRD_PTOP/Settings/LaserInterlockSetting.cs +++ b/Machines/ILSOS_PrismaticRD_PTOP/Settings/LaserInterlockSetting.cs @@ -10,32 +10,32 @@ namespace ILSOS_PrismaticRD_PTOP.Settings [Browsable(true)] [ReadOnly(false)] [Category("Head Theta Interlock")] - [DisplayName("인터락 사용")] + [DisplayName("Use Interlock")] public bool HeadThetaInterlockEnabled { get; set; } = false; [Browsable(true)] [ReadOnly(false)] [Category("Head Theta Interlock")] - [DisplayName("수평 각도(deg)")] + [DisplayName("Horizontal Angle (deg)")] public double HeadThetaHorizontal { get; set; } = 0; [Browsable(true)] [ReadOnly(false)] [Category("Head Theta Interlock")] - [DisplayName("수직 각도(deg)")] + [DisplayName("Vertical Angle (deg)")] public double HeadThetaVertical { get; set; } = 90; [Browsable(true)] [ReadOnly(false)] [Category("Head Theta Interlock")] - [DisplayName("허용 오차(±deg)")] + [DisplayName("Tolerance (±deg)")] public double HeadThetaTolerance { get; set; } = 2.5; // PLC Head_Theta_Position 스케일. deg×10 가정(미확정) → 실값 확인 후 조정. [Browsable(true)] [ReadOnly(false)] [Category("Head Theta Interlock")] - [DisplayName("PLC 스케일(deg×?)")] + [DisplayName("PLC Scale (deg×?)")] public double HeadThetaPlcScale { get; set; } = 10; } } diff --git a/WeldingComponents/WeldingCommon/Settings/SequenceSetting.cs b/WeldingComponents/WeldingCommon/Settings/SequenceSetting.cs index 7249e81..a9dfb21 100644 --- a/WeldingComponents/WeldingCommon/Settings/SequenceSetting.cs +++ b/WeldingComponents/WeldingCommon/Settings/SequenceSetting.cs @@ -67,19 +67,5 @@ namespace WeldingCommon.Settings [DisplayName("Group Raming Use")] public bool GroupRamingUse { get; set; } = false; - - //260617 - 수직, 수평 + 허용오차 단일 값 입력하는 곳(시퀸스 돌 때 같이 입력해야할 것.) - [Category("Axis Position Interlock")] - [DisplayName("수직 기준값 [deg]")] - public double VerticalSector { get; set; } = 0.0; - - [DisplayName("수직 허용오차 [deg]")] - public double VerticalTolerance { get; set; } = 0.0; - - [DisplayName("수평 기준값 [deg]")] - public double HorizontalSector { get; set; } = 0.0; - - [DisplayName("수평 허용오차 [deg]")] - public double HorizontalTolerance { get; set; } = 0.0; } } diff --git a/docs/작업일지/2026_06_20.md b/docs/작업일지/2026_06_20.md new file mode 100644 index 0000000..6f4bfff --- /dev/null +++ b/docs/작업일지/2026_06_20.md @@ -0,0 +1,18 @@ +# 작업일지 — 2026-06-20 + +## 09:41 — Setting 정리: Axis Position Interlock 삭제 + Head Theta Interlock 영어화 + +### 변경 내용 (2파일) +- `WeldingComponents/WeldingCommon/Settings/SequenceSetting.cs` + - `[Category("Axis Position Interlock")]` 블록 **전체 삭제** (주석 + 속성 4개) + - 삭제 속성: `VerticalSector` / `VerticalTolerance` / `HorizontalSector` / `HorizontalTolerance` + - Serena `find_referencing_symbols` + grep 확인 결과 정의 파일 외 **참조처 없음** → 삭제 안전 +- `Machines/ILSOS_PrismaticRD_PTOP/Settings/LaserInterlockSetting.cs` + - Head Theta Interlock 항목 `DisplayName` 5개 한글→영어화 (주석은 유지) + - `인터락 사용`→`Use Interlock` / `수평 각도(deg)`→`Horizontal Angle (deg)` / `수직 각도(deg)`→`Vertical Angle (deg)` / `허용 오차(±deg)`→`Tolerance (±deg)` / `PLC 스케일(deg×?)`→`PLC Scale (deg×?)` + - `[Category("Head Theta Interlock")]`는 기존부터 영어라 변경 없음 + +### 검증 +- 서브에이전트로 MSBuild 빌드(Debug|x64) — **오류 0개**, 경고 655개(전부 기존·무관) +- 빌드 로그에 삭제 속성/변경 DisplayName 관련 오류·잔존 참조 없음 +- 빌드 산출물: **WeldingCommon.dll**, **ILSOS_PrismaticRD_PTOP**