From e8fd344c10c8f9874791075cc6ca04771854d54b Mon Sep 17 00:00:00 2001
From: hj615 <hj615@cuuva.com>
Date: Mon, 1 Dec 2025 17:12:15 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B7=B8=EB=9E=98=ED=94=84=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SmartAquaViewer/MainWindow.xaml               |  2 +-
 SmartAquaViewer/Resources/Generic.xaml        |  1 +
 SmartAquaViewer/View/MonitoringView.xaml      | 67 ++++++++++++++-----
 .../ViewModel/GraphControlViewModel.cs        |  5 +-
 4 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/SmartAquaViewer/MainWindow.xaml b/SmartAquaViewer/MainWindow.xaml
index 7b198a2..6ad3e2c 100644
--- a/SmartAquaViewer/MainWindow.xaml
+++ b/SmartAquaViewer/MainWindow.xaml
@@ -61,7 +61,7 @@
 
         <view:FileListView Grid.Row="1" Grid.RowSpan="2" x:Name="fileListView"/>
 
-        <Border Grid.Row="1" Grid.Column="1" Margin="24 12 24 0">
+        <Border Grid.Row="1" Grid.Column="1" Margin="24 12 24 0" CornerRadius="4">
             <UniformGrid Columns="4">
                 <RadioButton x:Name="rdbtnMonitoing" GroupName="contentSwap" Content="모니터링" Tag="monitoring"
                              Style="{StaticResource RadioButtonTabStyle}" IsChecked="True" FontSize="30"
diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml
index 4af457e..6277a54 100644
--- a/SmartAquaViewer/Resources/Generic.xaml
+++ b/SmartAquaViewer/Resources/Generic.xaml
@@ -390,6 +390,7 @@
         <Setter Property="VerticalGridLinesBrush" Value="#767676"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="#999"/>
+        <Setter Property="BorderThickness" Value="1"/>
     </Style>
     <Style x:Key="DataGridRowStyle" TargetType="{x:Type DataGridRow}">
         <Setter Property="Background" Value="#292929"/>
diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml
index 5d71e71..41eeb80 100644
--- a/SmartAquaViewer/View/MonitoringView.xaml
+++ b/SmartAquaViewer/View/MonitoringView.xaml
@@ -678,6 +678,16 @@
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
+                                            <Style x:Key="CollpaseWhenLineAndNotTank" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding SelectedTab}" Value="Filter">
+                                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding SelectedTab}" Value="Sterilizer">
+                                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
                                         </Grid.Resources>
 
                                         <!-- LINE -->
@@ -767,11 +777,11 @@
                                         <StackPanel Style="{StaticResource VisibleWhenScatter}">
                                             <Grid Margin="0 0 0 10">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="80"/>
+                                                    <ColumnDefinition Width="110"/>
                                                     <ColumnDefinition/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBlock Text="Y축" VerticalAlignment="Center" Width="80"
-                                                           FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
+                                                <TextBlock Text="Y축" VerticalAlignment="Center"
+                                                           FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
                                                 <ComboBox ItemsSource="{Binding YFieldCandidates}"
                                                           SelectedItem="{Binding SelectedYField}"
                                                           DisplayMemberPath="Display" Height="35"
@@ -782,18 +792,18 @@
 
                                             <Grid Margin="0 0 0 10">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="80"/>
+                                                    <ColumnDefinition Width="110"/>
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBlock Text="마커 크기" Grid.Row="1" VerticalAlignment="Center"
-                                                           FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
-                                                <Slider Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="15 0 0 0"
+                                                <TextBlock Text="마커 크기" VerticalAlignment="Center"
+                                                           FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
+                                                <Slider Grid.Column="1" VerticalAlignment="Center"  HorizontalAlignment="Left" Margin="15 0 0 0"
                                                         Minimum="1" Maximum="15" Value="{Binding ScatterMarkerSize}" Width="280" IsSnapToTickEnabled="True" TickFrequency="1"
                                                         Style="{StaticResource CustomSliderStyle}"/>
                                                 <TextBlock Text="{Binding ScatterMarkerSize}" Margin="15 0"
-                                                           Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"
-                                                           FontSize="20" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
+                                                           Grid.Column="2" VerticalAlignment="Center"
+                                                           FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
                                             </Grid>
                                         </StackPanel>
 
@@ -855,15 +865,42 @@
                                     </Grid>
                                 </StackPanel>
 
-                                <StackPanel Orientation="Horizontal" Grid.Row="1">
+                                <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="24 0 0 0">
                                     <CheckBox IsChecked="{Binding ShowLegends}"
                                               Foreground="#264A60"
-                                              Margin="24 0 4 0" VerticalContentAlignment="Center"
-                                              Style="{StaticResource MaterialDesignUserForegroundCheckBox}"/>
+                                              Margin="0 0 4 0" VerticalContentAlignment="Center">
+                                        <CheckBox.Style>
+                                            <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
+                                                <Setter Property="Visibility" Value="Visible"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding SelectedTab}" Value="Filter">
+                                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding SelectedTab}" Value="Sterilizer">
+                                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </CheckBox.Style>
+                                    </CheckBox>
                                     <TextBlock Text="범례" VerticalAlignment="Center" Margin="0 0 12 0"
                                                FontSize="16" FontFamily="{StaticResource SCDream3}"
-                                               Foreground="#999999" />
-                                    
+                                               Foreground="#999999">
+                                        <TextBlock.Style>
+                                            <Style TargetType="TextBlock">
+                                                <Setter Property="Visibility" Value="Visible"/>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding SelectedTab}" Value="Filter">
+                                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding SelectedTab}" Value="Sterilizer">
+                                                        <Setter Property="Visibility" Value="Collapsed"/>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </TextBlock.Style>
+                                    </TextBlock>
+
                                     <CheckBox IsChecked="{Binding ShowMarkers}"
                                               Foreground="#264A60"
                                               Margin="0 0 4 0" VerticalContentAlignment="Center">
@@ -899,7 +936,7 @@
                                         </TextBlock.Style>
                                     </TextBlock>
 
-                                    <CheckBox Content="회귀선" IsChecked="{Binding ShowRegression}"
+                                    <CheckBox IsChecked="{Binding ShowRegression}"
                                               Foreground="#264A60"
                                               Margin="0 0 4 0" VerticalContentAlignment="Center">
                                         <CheckBox.Style>
diff --git a/SmartAquaViewer/ViewModel/GraphControlViewModel.cs b/SmartAquaViewer/ViewModel/GraphControlViewModel.cs
index ef0c08e..d540bb1 100644
--- a/SmartAquaViewer/ViewModel/GraphControlViewModel.cs
+++ b/SmartAquaViewer/ViewModel/GraphControlViewModel.cs
@@ -305,7 +305,8 @@ namespace SmartAquaViewer.ViewModel
             FieldItem valueField,                // 값 필드
             double boxWidth,                     // 박스 너비
             TimeSpan? timeBucket = null,         // 시간 사용할 때 버킷(기본 1시간)
-            int maxCategories = 24               // X 카테고리 최대개수(너무 많을 때 최근 N개만)
+            int maxCategories = 24,              // X 카테고리 최대개수(너무 많을 때 최근 N개만)
+            bool showLegends = true
         )
         {
             Model.Series.Clear();
@@ -390,7 +391,7 @@ namespace SmartAquaViewer.ViewModel
             }
 
             Model.Legends.Clear();
-            Model.IsLegendVisible = true;
+            Model.IsLegendVisible = showLegends;
             Model.Legends.Add(new Legend
             {
                 LegendPlacement = LegendPlacement.Outside,