From 1fbe7fa98fadeb549b1dc24f491291fa39dd47ba Mon Sep 17 00:00:00 2001
From: NohDoyeon241104 <otteryeonny@ubisam.com>
Date: Thu, 18 Jun 2026 14:20:26 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20DA1/DA2=20Voltage=20=ED=91=9C=EC=8B=9C?=
 =?UTF-8?q?=EB=A5=BC=20No=20Laser=20=ED=86=A0=EA=B8=80=EC=97=90=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99(=EC=A1=B0=EA=B1=B4=EB=B6=80=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DA1/DA2 Voltage UniformGrid에 Visibility 바인딩(IsNoLaser, convTrueVisible) 추가.
Time이 Use Spot Time 체크 시 표시되듯, No Laser 체크 시에만 전압 표시.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../Views/Manual/Scanner/UCScannerLaserControl.xaml        | 2 +-
 docs/작업일지/2026_06_18.md                                | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControl.xaml b/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControl.xaml
index c5c15ce..178eef2 100644
--- a/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControl.xaml
+++ b/WeldingComponents/WeldingCommon/Views/Manual/Scanner/UCScannerLaserControl.xaml
@@ -86,7 +86,7 @@
                                                   OffContent="Laser Fire"
                                                   OnContent="No Laser (전압만)"/>
                                 </Border>
-                                <UniformGrid Grid.Row="3" Rows="2" VerticalAlignment="Top" Margin="0 5 0 0">
+                                <UniformGrid Grid.Row="3" Rows="2" VerticalAlignment="Top" Margin="0 5 0 0" Visibility="{Binding IsNoLaser, Converter={StaticResource convTrueVisible}}">
                                     <usercontrols:UCKeyValue KeyText="DA1 Voltage" Value="{Binding AnalogOut1Voltage}" DecimalPlaces="3" Unit="V" KeyHorizontalAlignment="Right" KeyTextWidth="0.9*" IsReadOnly="True" />
                                     <usercontrols:UCKeyValue KeyText="DA2 Voltage" Value="{Binding AnalogOut2Voltage}" DecimalPlaces="3" Unit="V" KeyHorizontalAlignment="Right" KeyTextWidth="0.9*" IsReadOnly="True" />
                                 </UniformGrid>
diff --git a/docs/작업일지/2026_06_18.md b/docs/작업일지/2026_06_18.md
index 0684b80..8319a08 100644
--- a/docs/작업일지/2026_06_18.md
+++ b/docs/작업일지/2026_06_18.md
@@ -122,3 +122,10 @@
 - **Manual**(`UCScannerLaserControlViewModel`): `IsNoLaser` 추가, Laser On 직접 분기(Percent/Watt 두 곳)의 `LaserSignalOn()`을 `if(!IsNoLaser)`로 가드 → 체크 시 발진 없이 전압만 인가.
 - **Manual XAML**(`UCScannerLaserControl.xaml`): Use Spot Time 토글과 **같은 ToggleSwitch 디자인**의 `No Laser (전압만)` 토글 추가. Timer Set 영역 배치 = Use Spot Time → Time(체크 시만) → No Laser → DA1/DA2 Voltage 순.
 - 이 NoLaser는 RTC5 발진 게이트(`LaserSignalOn`)를 막는 방식이라 **이 화면만으로 자기완결**(DO9/13 별도 화면 불필요). No Use Spot Time + No Laser + Laser On → 전압 readback 표시 + 발진 없음.
+
+## 14:19
+
+### DA1/DA2 Voltage 표시를 No Laser 토글에 연동(조건부 표시)
+
+- DA1/DA2 Voltage UniformGrid에 `Visibility="{Binding IsNoLaser, Converter={StaticResource convTrueVisible}}"` 추가.
+- Time이 Use Spot Time 체크 시 표시되는 것과 동일하게, **No Laser 체크(전압만) 시에만 DA1/DA2 Voltage 표시**, Laser Fire(해제) 시 숨김.