design: DataGrid 스타일 적용

SmartAquaViewer/Resources/Generic.xaml

@@ -386,24 +386,38 @@
         <Setter Property="IsReadOnly" Value="True"/>
         <Setter Property="CanUserAddRows" Value="False"/>
         <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="#767676"/>
+        <Setter Property="VerticalGridLinesBrush" Value="#767676"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="#999"/>
     </Style>
-
     <Style x:Key="DataGridRowStyle" TargetType="{x:Type DataGridRow}">
-        <Setter Property="Background" Value="#242424"/>
+        <Setter Property="Background" Value="#292929"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
     </Style>
     <Style x:Key="DataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
-        <Setter Property="Background" Value="#1F1F1F"/>
+        <Setter Property="Background" Value="#264A60"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="BorderBrush" Value="White"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="Padding" Value="3"/>
+        <Setter Property="FontFamily" Value="{StaticResource SCDream5}"/>
-        <Setter Property="FontFamily" Value="{StaticResource SCDream6}"/>
+        <Setter Property="Height" Value="44"/>
-        <Setter Property="Height" Value="45"/>
+    </Style>
+    <Style x:Key="HighlightLeftBorderHeaderStyle" 
+           TargetType="{x:Type DataGridColumnHeader}"
+           BasedOn="{StaticResource DataGridColumnHeaderStyle}">
+        <Setter Property="BorderBrush" Value="White"/>
+        <Setter Property="BorderThickness" Value="1 0 0 0"/>
+    </Style>
+    <Style x:Key="HighlightLeftBorderCellStyle"
+           TargetType="DataGridCell"
+           BasedOn="{StaticResource MaterialDesignDataGridCell}">
+        <Setter Property="BorderBrush" Value="White"/>
+        <Setter Property="BorderThickness" Value="1 0 0 0"/>
     </Style>
     <Style x:Key="DataGridElmenetStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="HorizontalAlignment" Value="Center"/>

SmartAquaViewer/View/MonitoringView.xaml

@@ -45,20 +45,21 @@
                               helper:DataGridAutoPageSizeBehavior.Pager="{Binding TanksPager}"
                               helper:DataGridAutoPageSizeBehavior.Suspend="{Binding IsOpenMode}"
                               helper:DataGridAutoPageSizeBehavior.ThrottleMs="120"
-                              Grid.Row="1" Margin="15 0"
+                              Grid.Row="1" Margin="0"
                               ColumnWidth="*" RowHeight="30"
-                              Background="Transparent"
                               HorizontalAlignment="Stretch">
                         <DataGrid.Columns>
                             <!-- 측정 시각 -->
                             <DataGridTextColumn 
-                                    Header="시간" Width="90"
+                                    Header="시간" Width="84.8"
                                     Binding="{Binding RecordedTime, StringFormat=\{0:HH:mm:ss\}}"
                                     ElementStyle="{StaticResource DataGridElmenetStyle}"/>
 
                             <!-- Tank 값들 -->
                             <DataGridTextColumn Header="번호" Binding="{Binding Tanks[0].Number}"
-                                                    ElementStyle="{StaticResource DataGridElmenetStyle}"/>
+                                                ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
+                                                HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}"/>
                             <DataGridTextColumn Binding="{Binding Tanks[0].DOValue, StringFormat=\{0:F2\}}"
                                                 ElementStyle="{StaticResource DataGridElmenetStyle}">
                                 <DataGridTextColumn.Header>
@@ -98,10 +99,10 @@
                                 </DataGridTextColumn.Header>
                             </DataGridTextColumn>
 
-                            <DataGridTextColumn Width="5"/>
-
                             <DataGridTextColumn Header="번호" Binding="{Binding Tanks[1].Number}"
-                                                    ElementStyle="{StaticResource DataGridElmenetStyle}"/>
+                                                ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
+                                                HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}"/>
                             <DataGridTextColumn Binding="{Binding Tanks[1].DOValue, StringFormat=\{0:F2\}}"
                                                 ElementStyle="{StaticResource DataGridElmenetStyle}">
                                 <DataGridTextColumn.Header>
@@ -140,10 +141,11 @@
                                     </StackPanel>
                                 </DataGridTextColumn.Header>
                             </DataGridTextColumn>
-                            <DataGridTextColumn Width="5"/>
 
                             <DataGridTextColumn Header="번호" Binding="{Binding Tanks[2].Number}"
-                                                    ElementStyle="{StaticResource DataGridElmenetStyle}"/>
+                                                ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
+                                                HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}"/>
                             <DataGridTextColumn Binding="{Binding Tanks[2].DOValue, StringFormat=\{0:F2\}}"
                                                 ElementStyle="{StaticResource DataGridElmenetStyle}">
                                 <DataGridTextColumn.Header>
@@ -202,7 +204,9 @@
                                 ElementStyle="{StaticResource DataGridElmenetStyle}"/>
 
                             <DataGridTextColumn Binding="{Binding Filtering.SandFilterPower, Converter={StaticResource BoolToPowerConverter}}" 
-                                                ElementStyle="{StaticResource DataGridElmenetStyle}">
+                                                ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
+                                                HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}">
                                 <DataGridTextColumn.Header>
                                     <StackPanel>
                                         <TextBlock Text="모래여과기" HorizontalAlignment="Center"/>
@@ -330,7 +334,9 @@
                                 ElementStyle="{StaticResource DataGridElmenetStyle}"/>
 
                             <DataGridTextColumn Header="오존 발생기 전원" Binding="{Binding Sterilizing.OzoneGeneratorPower, Converter={StaticResource BoolToPowerConverter}}"
-                                                ElementStyle="{StaticResource DataGridElmenetStyle}"/>
+                                                ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
+                                                HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}"/>
                             <DataGridTextColumn Header="자외선 살균기 ID" Binding="{Binding Sterilizing.UVSterilizerId}"
                                                 ElementStyle="{StaticResource DataGridElmenetStyle}"/>
                             <DataGridTextColumn Header="자외선 살균기 전원" Binding="{Binding Sterilizing.UVSterilizerPower, Converter={StaticResource BoolToPowerConverter}}"