From ad4cbf4fea520f714a03b06f92a935937a8f5343 Mon Sep 17 00:00:00 2001
From: hj615 <hj615@cuuva.com>
Date: Tue, 2 Dec 2025 13:26:47 +0900
Subject: [PATCH] =?UTF-8?q?design:=20=EC=97=90=EB=84=88=EC=A7=80=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SmartAquaViewer/Resources/Generic.xaml   |  66 +-
 SmartAquaViewer/View/EnegyView.xaml      | 759 ++++++++++++-----------
 SmartAquaViewer/View/MonitoringView.xaml |  89 +--
 3 files changed, 468 insertions(+), 446 deletions(-)

diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml
index 6277a54..13c3844 100644
--- a/SmartAquaViewer/Resources/Generic.xaml
+++ b/SmartAquaViewer/Resources/Generic.xaml
@@ -59,34 +59,36 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="RadioButtonStyle" TargetType="RadioButton">
-        <Setter Property="Background" Value="#2F2F44"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="FontSize" Value="32"/>
-        <Setter Property="Width" Value="300"/>
-        <Setter Property="Height" Value="60"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RadioButton">
-                    <Border Background="{TemplateBinding Background}" CornerRadius="10"
-                            BorderThickness="1" BorderBrush="Black">
-                        <TextBlock Text="{TemplateBinding Content}" 
-                                   HorizontalAlignment="Center" VerticalAlignment="Center"
-                                   FontSize="32" Foreground="{TemplateBinding Foreground}"/>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Background" Value="#C2C2E6"/>
-                            <Setter Property="Foreground" Value="Black"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+    <Style x:Key="RadioBtnContentTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
+        <Setter Property="Foreground" Value="#999"/>
+        <Style.Triggers>
+            <!-- 🔹 라디오버튼이 체크되었을 때 텍스트 색 변경 -->
+            <DataTrigger
+                Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=RadioButton}}"
+                Value="True">
+                <Setter Property="Foreground" Value="White" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="CheckBoxContentTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
+        <Setter Property="Foreground" Value="#999"/>
+        <Style.Triggers>
+            <!-- 🔹 라디오버튼이 체크되었을 때 텍스트 색 변경 -->
+            <DataTrigger
+                Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=CheckBox}}"
+                Value="True">
+                <Setter Property="Foreground" Value="White" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style x:Key="ImageRadioButtonStyle" TargetType="RadioButton">
-        <Setter Property="Foreground" Value="Black"/>
+        <Setter Property="Foreground" Value="#999"/>
         <Setter Property="FontSize" Value="20"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -242,8 +244,8 @@
     <SolidColorBrush x:Key="LineComboArrow" Color="#C0C3C6" />
     <!-- 화살표 색 -->
     <SolidColorBrush x:Key="LineComboHover"  Color="#1D3E55" />
-    <SolidColorBrush x:Key="LineComboItemHover" Color="#20435A" />
-    <SolidColorBrush x:Key="LineComboItemSelected" Color="#29506B" />
+    <SolidColorBrush x:Key="LineComboItemHover" Color="#325C80" />
+    <SolidColorBrush x:Key="LineComboItemSelected" Color="#325C80" />
 
     <Style x:Key="ComboDropToggleStyle" TargetType="ToggleButton">
         <Setter Property="Focusable" Value="False" />
@@ -726,4 +728,14 @@
         <Setter Property="SelectionEnd" Value="{Binding Path=Value, RelativeSource={RelativeSource Self}}" />
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
     </Style>
+
+    <Style x:Key="GraphButtonStyle" TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatLightBgButton}">
+        <Setter Property="FontFamily" Value="{StaticResource SCDream3}" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Background" Value="#325C80" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Width" Value="120" />
+        <Setter Property="Height" Value="38" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/SmartAquaViewer/View/EnegyView.xaml b/SmartAquaViewer/View/EnegyView.xaml
index fd5c9cc..fbc5f30 100644
--- a/SmartAquaViewer/View/EnegyView.xaml
+++ b/SmartAquaViewer/View/EnegyView.xaml
@@ -18,30 +18,23 @@
         <classes:CurrentPageEqualsConverter x:Key="CurrentPageEqualsConverter"/>
     </UserControl.Resources>
 
-    <Border BorderBrush="#2d374c" BorderThickness="2">
-        <Grid Background="Transparent">
+    <Border>
+        <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="160"/>
-                <RowDefinition Height="350"/>
+                <RowDefinition Height="128"/>
                 <RowDefinition Height="*"/>
-                <RowDefinition Height="40"/>
             </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="600"/>
-            </Grid.ColumnDefinitions>
 
-            <Border Grid.ColumnSpan="2" Margin="15" BorderBrush="#3E4C60" BorderThickness="1" CornerRadius="10">
-                <Border.Background>
-                    <ImageBrush ImageSource="/Resources/Images/top_bg.png" Stretch="Fill"/>
-                </Border.Background>
+            <Border Margin="0 0 0 16" BorderBrush="#3E4C60" BorderThickness="1" CornerRadius="4" Background="#264A60">
                 <UniformGrid Columns="9">
-                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <TextBlock Text="총 소비 전력" HorizontalAlignment="Center" 
-                                   FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/>
-                        <TextBlock Text="{Binding TotalEnergy, StringFormat=\{0:F2\}}" HorizontalAlignment="Center" 
-                                   FontSize="26" Foreground="White" FontFamily="{StaticResource SCDream4}"/>
-                    </StackPanel>
+                    <Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
+                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Text="총 소비 전력" HorizontalAlignment="Center" 
+                                       FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/>
+                            <TextBlock Text="{Binding TotalEnergy, StringFormat=\{0:F2\}}" HorizontalAlignment="Center" 
+                                       FontSize="26" Foreground="White" FontFamily="{StaticResource SCDream4}"/>
+                        </StackPanel>
+                    </Border>
                     <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
                         <TextBlock Text="모래여과기" HorizontalAlignment="Center" 
                                    FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/>
@@ -93,360 +86,424 @@
                 </UniformGrid>
             </Border>
 
-            <DataGrid ItemsSource="{Binding PagedItems}" 
-                      Style="{StaticResource DataGridStyle}" Background="Transparent" 
-                      RowStyle="{StaticResource DataGridRowStyle}" ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}"
-                      helper:DataGridAutoPageSizeBehavior.Enable="True"
-                      Grid.Row="1" Grid.RowSpan="2" Margin="15 0"
-                      HorizontalAlignment="Stretch" 
-                      ColumnWidth="*" RowHeight="30">
-                <DataGrid.Columns>
-                    <DataGridTextColumn 
-                        Header="시간" Width="90"
-                        Binding="{Binding RecordedTime, StringFormat=\{0:HH:mm:ss\}}"
-                        ElementStyle="{StaticResource DataGridElmenetStyle}"/>
+            <md:DrawerHost Grid.Row="1" RightDrawerBackground="Transparent" IsRightDrawerOpen="True" OpenMode="Standard">
+                <Border BorderBrush="#1D3649" BorderThickness="0 0 2 0">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition Height="40"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="30"/>
+                        </Grid.ColumnDefinitions>
+                        <DataGrid ItemsSource="{Binding PagedItems}" 
+                                  Style="{StaticResource DataGridStyle}" Background="Transparent" 
+                                  RowStyle="{StaticResource DataGridRowStyle}" ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}"
+                                  helper:DataGridAutoPageSizeBehavior.Enable="True"
+                                  HorizontalAlignment="Stretch" Margin="0 0 16 0"
+                                  ColumnWidth="*" RowHeight="30">
+                            <DataGrid.Columns>
+                                <DataGridTextColumn 
+                                    Header="시간" Width="90"
+                                    Binding="{Binding RecordedTime, StringFormat=\{0:HH:mm:ss\}}"
+                                    ElementStyle="{StaticResource DataGridElmenetStyle}"/>
 
-                    <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Filtering.SandFilterEnergy, StringFormat=\{0:F2\}}">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="모래" HorizontalAlignment="Center"/>
-                                <TextBlock Text="여과기" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="순환펌프" ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Filtering.CirculationPumpEnergy, StringFormat=\{0:F2\}}"/>
-                    <DataGridTextColumn Header="히트펌프" ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Filtering.HeatPumpEnergy, StringFormat=\{0:F2\}}"/>
-                    <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Filtering.AirBlowerEnergy, StringFormat=\{0:F2\}}">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="에어" HorizontalAlignment="Center"/>
-                                <TextBlock Text="브로와" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Sterilizing.OzoneGeneratorEnergy, StringFormat=\{0:F2\}}">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="오존" HorizontalAlignment="Center"/>
-                                <TextBlock Text="발생기" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Sterilizing.UVSterilizerEnergy, StringFormat=\{0:F2\}}">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="자외선" HorizontalAlignment="Center"/>
-                                <TextBlock Text="살균기" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Sterilizing.OzoneDissolverEnergy, StringFormat=\{0:F2\}}">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="오존용해" HorizontalAlignment="Center"/>
-                                <TextBlock Text="장치" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding Sterilizing.ExcessOzoneDestroyerEnergy, StringFormat=\{0:F2\}}">
-                        <DataGridTextColumn.Header>
-                            <StackPanel>
-                                <TextBlock Text="배오존" HorizontalAlignment="Center"/>
-                                <TextBlock Text="장치" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="총 전력" ElementStyle="{StaticResource DataGridElmenetStyle}"
-                                        Binding="{Binding TotalEnergy, StringFormat=\{0:F2\}}"/>
-                </DataGrid.Columns>
-            </DataGrid>
+                                <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                    Binding="{Binding Filtering.SandFilterEnergy, StringFormat=\{0:F2\}}"
+                                                    CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
+                                                    HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}">
+                                    <DataGridTextColumn.Header>
+                                        <StackPanel>
+                                            <TextBlock Text="모래" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="여과기" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataGridTextColumn.Header>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn Header="순환펌프" ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Filtering.CirculationPumpEnergy, StringFormat=\{0:F2\}}"/>
+                                <DataGridTextColumn Header="히트펌프" ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Filtering.HeatPumpEnergy, StringFormat=\{0:F2\}}"/>
+                                <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Filtering.AirBlowerEnergy, StringFormat=\{0:F2\}}">
+                                    <DataGridTextColumn.Header>
+                                        <StackPanel>
+                                            <TextBlock Text="에어" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="브로와" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataGridTextColumn.Header>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Sterilizing.OzoneGeneratorEnergy, StringFormat=\{0:F2\}}">
+                                    <DataGridTextColumn.Header>
+                                        <StackPanel>
+                                            <TextBlock Text="오존" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="발생기" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataGridTextColumn.Header>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Sterilizing.UVSterilizerEnergy, StringFormat=\{0:F2\}}">
+                                    <DataGridTextColumn.Header>
+                                        <StackPanel>
+                                            <TextBlock Text="자외선" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="살균기" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataGridTextColumn.Header>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Sterilizing.OzoneDissolverEnergy, StringFormat=\{0:F2\}}">
+                                    <DataGridTextColumn.Header>
+                                        <StackPanel>
+                                            <TextBlock Text="오존용해" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="장치" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataGridTextColumn.Header>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding Sterilizing.ExcessOzoneDestroyerEnergy, StringFormat=\{0:F2\}}">
+                                    <DataGridTextColumn.Header>
+                                        <StackPanel>
+                                            <TextBlock Text="배오존" HorizontalAlignment="Center"/>
+                                            <TextBlock Text="장치" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataGridTextColumn.Header>
+                                </DataGridTextColumn>
+                                <DataGridTextColumn Header="총 전력" ElementStyle="{StaticResource DataGridElmenetStyle}"
+                                                Binding="{Binding TotalEnergy, StringFormat=\{0:F2\}}"/>
+                            </DataGrid.Columns>
+                        </DataGrid>
+
+                        <Grid Grid.Row="1" VerticalAlignment="Center">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                <Button Command="{Binding FirstPageCommand}"  
+                                        Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
+                                    <md:PackIcon Kind="PageFirst"/>
+                                </Button>
+                                <Button Command="{Binding PrevPageCommand}"   
+                                        Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
+                                    <md:PackIcon Kind="ChevronLeft"/>
+                                </Button>
 
-            <Grid Grid.Row="3" VerticalAlignment="Center">
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Button Command="{Binding FirstPageCommand}"  
-                            Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0">
-                        <md:PackIcon Kind="PageFirst"/>
-                    </Button>
-                    <Button Command="{Binding PrevPageCommand}"   
-                            Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0">
-                        <md:PackIcon Kind="ChevronLeft"/>
-                    </Button>
+                                <ItemsControl ItemsSource="{Binding PageNumbers}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel Orientation="Horizontal" Margin="32 0" />
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
 
-                    <ItemsControl ItemsSource="{Binding PageNumbers}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Button Margin="6"
+                                                    Padding="6,0"
+                                                    Command="{Binding DataContext.GoToPageCommand,
+                                                                      RelativeSource={RelativeSource AncestorType=ItemsControl}}"
+                                                    CommandParameter="{Binding}">
+                                                <Button.Content>
+                                                    <Binding Converter="{StaticResource PageIndexToDisplayConverter}" />
+                                                </Button.Content>
+                                                <Button.Style>
+                                                    <Style TargetType="Button">
+                                                        <Setter Property="Background" Value="Transparent" />
+                                                        <Setter Property="BorderBrush" Value="#264A60" />
+                                                        <Setter Property="BorderThickness" Value="1" />
+                                                        <Setter Property="Foreground" Value="#264A60"/>
 
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Button Margin="2"
-                                        Padding="6,2"
-                                        Command="{Binding DataContext.GoToPageCommand,
-                                                          RelativeSource={RelativeSource AncestorType=ItemsControl}}"
-                                        CommandParameter="{Binding}">
-                                    <Button.Content>
-                                        <Binding Converter="{StaticResource PageIndexToDisplayConverter}" />
-                                    </Button.Content>
-                                    <Button.Style>
-                                        <Style TargetType="Button">
-                                            <Setter Property="Background" Value="Transparent" />
-                                            <Setter Property="BorderBrush" Value="Gray" />
-                                            <Setter Property="BorderThickness" Value="1" />
+                                                        <!-- 🔹 현재 페이지면 강조 -->
+                                                        <Style.Triggers>
+                                                            <DataTrigger Value="True">
+                                                                <DataTrigger.Binding>
+                                                                    <MultiBinding Converter="{StaticResource CurrentPageEqualsConverter}">
+                                                                        <!--현재 버튼의 인덱스-->
+                                                                        <Binding />
+                                                                        <!--ViewModel의 PageIndex-->
+                                                                        <Binding Path="DataContext.PageIndex"
+                                                                         RelativeSource="{RelativeSource AncestorType=ItemsControl}" />
+                                                                    </MultiBinding>
+                                                                </DataTrigger.Binding>
+                                                                <Setter Property="Background" Value="#325C80" />
+                                                                <Setter Property="Foreground" Value="White" />
+                                                                <Setter Property="BorderThickness" Value="0" />
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Button.Style>
+                                            </Button>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
 
-                                            <!-- 🔹 현재 페이지면 강조 -->
-                                            <Style.Triggers>
-                                                <DataTrigger Value="True">
-                                                    <DataTrigger.Binding>
-                                                        <MultiBinding Converter="{StaticResource CurrentPageEqualsConverter}">
-                                                            <!--현재 버튼의 인덱스-->
-                                                            <Binding />
-                                                            <!--ViewModel의 PageIndex-->
-                                                            <Binding Path="DataContext.PageIndex"
-                                                                     RelativeSource="{RelativeSource AncestorType=ItemsControl}" />
-                                                        </MultiBinding>
-                                                    </DataTrigger.Binding>
-                                                    <Setter Property="Background" Value="#FF007ACC" />
-                                                    <Setter Property="Foreground" Value="White" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Button.Style>
+                                <Button Command="{Binding NextPageCommand}"   
+                                        Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
+                                    <md:PackIcon Kind="ChevronRight"/>
                                 </Button>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                                <Button Command="{Binding LastPageCommand}"   
+                                        Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
+                                    <md:PackIcon Kind="PageLast"/>
+                                </Button>
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </Border>
+                <md:DrawerHost.RightDrawerContent>
+                    <Border x:Name="RightDrawerRoot" Width="626" CornerRadius="0 4 4 0" Background="#1D3649">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="358"/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <Border Margin="16 16 16 12" CornerRadius="4"
+                                    Background="#152935" BorderBrush="#325C80" BorderThickness="1">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition Height="62"/>
+                                    </Grid.RowDefinitions>
+                                    <StackPanel Margin="24 24 24 0">
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="146"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock Text="그래프" VerticalAlignment="Center"
+                                                       FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
 
-                    <Button Command="{Binding NextPageCommand}"   
-                            Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0">
-                        <md:PackIcon Kind="ChevronRight"/>
-                    </Button>
-                    <Button Command="{Binding LastPageCommand}"   
-                            Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0">
-                        <md:PackIcon Kind="PageLast"/>
-                    </Button>
-                </StackPanel>
-            </Grid>
+                                            <ComboBox Margin="0" Height="35" Grid.Column="1"
+                                                      Style="{StaticResource ComboBoxStyle}"
+                                                      FontFamily="{StaticResource SCDream3}"
+                                                      ItemsSource="{Binding GraphTypes}"
+                                                      SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
+                                                      helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
+                                                      IsEditable="False" IsTextSearchEnabled="False"/>
+                                        </Grid>
+                                        <Grid Margin="0 10 0 0">
+                                            <Grid.Resources>
+                                                <Style TargetType="FrameworkElement">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                </Style>
+                                                <Style x:Key="VisibleWhenLine" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                                <Style x:Key="VisibleWhenStackArea" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                                <Style x:Key="VisibleWhenLineNStackArea" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                                <Style x:Key="VisibleWhenPie" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="PIE">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Grid.Resources>
 
-            <Border Grid.Row="1" Grid.Column="1" Margin="0 0 15 15" CornerRadius="10"
-                    Background="#384659" BorderBrush="#404F63" BorderThickness="1">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition Height="50"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel>
-                        <Grid Margin="15 15 15 15">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="80"/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Text="그래프" VerticalAlignment="Center"
-                                       FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
+                                            <StackPanel>
+                                                <StackPanel Style="{StaticResource VisibleWhenLineNStackArea}">
+                                                    <Grid Margin="0 0 0 10" >
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="146"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <TextBlock Text="X축" VerticalAlignment="Center"
+                                                                   FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
+                                                        <TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
+                                                                   Grid.Column="1"
+                                                                   FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
+                                                    </Grid>
 
-                            <ComboBox Margin="15 0 0 0" Height="40" Grid.Column="1"
-                                      Style="{StaticResource ComboBoxStyle}"
-                                      FontFamily="{StaticResource SCDream3}"
-                                      ItemsSource="{Binding GraphTypes}"
-                                      SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
-                                      helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
-                                      IsEditable="False" IsTextSearchEnabled="False"/>
-                        </Grid>
-                        <Grid Margin="15 0">
-                            <Grid.Resources>
-                                <Style TargetType="FrameworkElement">
-                                    <Setter Property="Visibility" Value="Collapsed"/>
-                                </Style>
-                                <Style x:Key="VisibleWhenLine" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                                <Style x:Key="VisibleWhenStackArea" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                                <Style x:Key="VisibleWhenLineNStackArea" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                                <Style x:Key="VisibleWhenPie" TargetType="FrameworkElement" BasedOn="{StaticResource {x:Type FrameworkElement}}">
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="PIE">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Grid.Resources>
+                                                    <Grid Margin="0 0 0 10">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="146"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <TextBlock VerticalAlignment="Top" Foreground="White">
+                                                            <Run Text="Y축" FontSize="18" FontFamily="{StaticResource SCDream4}"/>
+                                                            <LineBreak/>
+                                                            <Run Text="(복수 선택 가능)" FontSize="14" Foreground="#767676"/>
+                                                        </TextBlock>
 
-                            <StackPanel>
-                                <StackPanel Style="{StaticResource VisibleWhenLineNStackArea}">
-                                    <Grid Margin="0 0 0 20" >
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="80"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="X축" VerticalAlignment="Center"
-                                                   FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
-                                        <TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
-                                                   Margin="15 0 0 0" Grid.Column="1"
-                                                   FontSize="20" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
-                                    </Grid>
+                                                        <ListBox ItemsSource="{Binding YFieldCandidates}"
+                                                                 Grid.Column="1"
+                                                                 SelectionMode="Extended"
+                                                                 helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
+                                                                 helper:MultiSelectBehavior.KeyPath="Key"
+                                                                 helper:MultiSelectBehavior.ValuePath="Value"
+                                                                 FontSize="14" FontWeight="Bold"
+                                                                 FontFamily="{StaticResource SCDream5}"
+                                                                 Style="{StaticResource MaterialDesignFilterChipListBox}"
+                                                                 ItemContainerStyle="{StaticResource ListBoxItemStyle}">
+                                                            <ListBox.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <ToggleButton Content="{Binding Display}"
+                                                                                  Focusable="False"
+                                                                                  IsChecked="{Binding IsSelected,
+                                                                                              RelativeSource={RelativeSource AncestorType=ListBoxItem}}"
+                                                                                  Style="{StaticResource CircleCheckToggleButtonStyle}"
+                                                                                  Margin="12 0"/>
+                                                                </DataTemplate>
+                                                            </ListBox.ItemTemplate>
+                                                        </ListBox>
+                                                    </Grid>
+                                                </StackPanel>
 
-                                    <Grid Margin="0 0 0 15">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="80"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="Y축" VerticalAlignment="Top"
-                                                   FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
+                                                <StackPanel Style="{StaticResource VisibleWhenPie}">
+                                                    <Grid Margin="0 0 0 10">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="146"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <TextBlock Text="필드" VerticalAlignment="Top"
+                                                           FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
 
-                                        <Border Grid.Column="1" CornerRadius="10" 
-                                                Background="White" Margin="15 0 0 15">
-                                            <ListBox ItemsSource="{Binding YFieldCandidates}"
-                                                     DisplayMemberPath="Display"
-                                                     SelectionMode="Extended"
-                                                     helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
-                                                     helper:MultiSelectBehavior.KeyPath="Key"
-                                                     helper:MultiSelectBehavior.ValuePath="Value"
-                                                     Height="Auto" Background="White"
-                                                     FontSize="16" FontWeight="Bold"
-                                                     FontFamily="{StaticResource SCDream5}"
-                                                     Style="{StaticResource MaterialDesignFilterChipListBox}"/>
-                                        </Border>
-                                    </Grid>
-                                </StackPanel>
+                                                        <ListBox ItemsSource="{Binding YFieldCandidates}"
+                                                                 Grid.Column="1"
+                                                                 SelectionMode="Extended"
+                                                                 helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
+                                                                 helper:MultiSelectBehavior.KeyPath="Key"
+                                                                 helper:MultiSelectBehavior.ValuePath="Value"
+                                                                 FontSize="16" FontWeight="Bold"
+                                                                 FontFamily="{StaticResource SCDream5}"
+                                                                 Style="{StaticResource MaterialDesignFilterChipListBox}"
+                                                                 ItemContainerStyle="{StaticResource ListBoxItemStyle}">
+                                                            <ListBox.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <ToggleButton Content="{Binding Display}"
+                                                                                  Focusable="False"
+                                                                                  IsChecked="{Binding IsSelected,
+                                                                                              RelativeSource={RelativeSource AncestorType=ListBoxItem}}"
+                                                                                  Style="{StaticResource CircleCheckToggleButtonStyle}"
+                                                                                  Margin="12 0"/>
+                                                                </DataTemplate>
+                                                            </ListBox.ItemTemplate>
+                                                        </ListBox>
+                                                    </Grid>
 
-                                <StackPanel Style="{StaticResource VisibleWhenPie}">
-                                    <Grid Margin="0 0 0 15">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="80"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Text="필드" VerticalAlignment="Top"
-                                                   FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
+                                                    <Grid Margin="0 0 0 10">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="146"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <TextBlock Text="집계 방식" VerticalAlignment="Top"
+                                                                   FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
 
-                                        <Border Grid.Column="1" CornerRadius="10" 
-                                                Background="White" Margin="15 0 0 15">
-                                            <ListBox ItemsSource="{Binding YFieldCandidates}"
-                                                     DisplayMemberPath="Display"
-                                                     SelectionMode="Extended"
-                                                     helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
-                                                     helper:MultiSelectBehavior.KeyPath="Key"
-                                                     helper:MultiSelectBehavior.ValuePath="Value"
-                                                     Height="Auto" Background="White"
-                                                     FontSize="16" FontWeight="Bold"
-                                                     FontFamily="{StaticResource SCDream5}"
-                                                     Style="{StaticResource MaterialDesignFilterChipListBox}"/>
-                                        </Border>
-                                    </Grid>
+                                                        <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                                            <RadioButton x:Name="rbStatus"
+                                                                         GroupName="pie" Margin="0 0 12 0"
+                                                                         Foreground="#325C80"
+                                                                         FontFamily="{StaticResource SCDream3}"
+                                                                         Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
+                                                                         IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}">
+                                                                <TextBlock Text="합계" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
+                                                            </RadioButton>
+                                                            <RadioButton x:Name="pie"
+                                                                         GroupName="pie" 
+                                                                         Foreground="#325C80"
+                                                                         FontFamily="{StaticResource SCDream3}"
+                                                                         Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
+                                                                         IsChecked="{Binding UseAverage, Mode=TwoWay}">
+                                                                <TextBlock Text="평균" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
+                                                            </RadioButton>
+                                                        </StackPanel>
 
-                                    <StackPanel Orientation="Horizontal" Margin="0 0 0 15">
-                                        <RadioButton x:Name="rbStatus" Content="합계" 
-                                                     GroupName="pie" Margin="0 0 30 0"
-                                                     Foreground="White" FontSize="20"
-                                                     FontFamily="{StaticResource SCDream3}"
-                                                     Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
-                                                     IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}"/>
-                                        <RadioButton x:Name="pie" Content="평균" 
-                                                     GroupName="pie" Grid.Column="1" 
-                                                     Foreground="White" FontSize="20"
-                                                     FontFamily="{StaticResource SCDream3}"
-                                                     Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
-                                                     IsChecked="{Binding UseAverage, Mode=TwoWay}"/>
+                                                    </Grid>
+                                                </StackPanel>
+                                            </StackPanel>
+                                        </Grid>
                                     </StackPanel>
-                                </StackPanel>
 
+                                    <StackPanel Orientation="Horizontal" Margin="24 0 0 0" Grid.Row="1">
+                                        <CheckBox IsChecked="{Binding ShowMarkers}" Margin="0 0 12 0"
+                                                  Foreground="#264A60"
+                                                  VerticalContentAlignment="Center">
+                                            <CheckBox.Style>
+                                                <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </CheckBox.Style>
+                                            <TextBlock Text="마커" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
+                                        </CheckBox>
+                                        <CheckBox IsChecked="{Binding ShowLegends}" Margin="0 0 12 0"
+                                                  Foreground="#264A60"
+                                                  VerticalContentAlignment="Center">
+                                            <CheckBox.Style>
+                                                <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </CheckBox.Style>
+                                            <TextBlock Text="범례" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
+                                        </CheckBox>
+                                        <CheckBox IsChecked="{Binding IsDonut}" Margin="0 0 12 0"
+                                                  Foreground="#264A60"
+                                                  VerticalContentAlignment="Center">
+                                            <CheckBox.Style>
+                                                <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
+                                                    <Setter Property="Visibility" Value="Collapsed"/>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="PIE">
+                                                            <Setter Property="Visibility" Value="Visible"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </CheckBox.Style>
+                                            <TextBlock Text="도넛모드" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
+                                        </CheckBox>
+                                    </StackPanel>
 
-                            </StackPanel>
+                                    <StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right">
+                                        <Button Content="그래프 생성" 
+                                                Style="{StaticResource GraphButtonStyle}"
+                                                Command="{Binding DrawGraphCommand}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </Border>
+
+                            <Border Grid.Row="2" Grid.Column="1" Grid.RowSpan="2" Margin="16 0 16 16" CornerRadius="4"
+                                    Background="#152935" BorderBrush="#325C80" BorderThickness="1">
+                                <control:GraphControl 
+                                    x:Name="graphControl"
+                                    Margin="10" DataContext="{Binding GraphControlVM}"
+                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                            </Border>
                         </Grid>
-                    </StackPanel>
+                    </Border>
+                </md:DrawerHost.RightDrawerContent>
+            </md:DrawerHost>
 
-                    <StackPanel Orientation="Horizontal" Margin="15 0 0 0" Grid.Row="1">
-                        <CheckBox Content="마커 표시" IsChecked="{Binding ShowMarkers}" Margin="0 0 15 0"
-                                  FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"
-                                  VerticalContentAlignment="Center">
-                            <CheckBox.Style>
-                                <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
-                                    <Setter Property="Visibility" Value="Collapsed"/>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </CheckBox.Style>
-                        </CheckBox>
-                        <CheckBox Content="범례 표시" IsChecked="{Binding ShowLegends}" Margin="0 0 15 0"
-                                  FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"
-                                  VerticalContentAlignment="Center">
-                            <CheckBox.Style>
-                                <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
-                                    <Setter Property="Visibility" Value="Collapsed"/>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="STACKAREA">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </CheckBox.Style>
-                        </CheckBox>
-                        <CheckBox Content="도넛 모드" IsChecked="{Binding IsDonut}" Margin="0 0 15 0"
-                                  FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"
-                                  VerticalContentAlignment="Center">
-                            <CheckBox.Style>
-                                <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
-                                    <Setter Property="Visibility" Value="Collapsed"/>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding SelectedGraphType}" Value="PIE">
-                                            <Setter Property="Visibility" Value="Visible"/>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </CheckBox.Style>
-                        </CheckBox>
-                    </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right">
-                        <Button Content="그래프 생성" FontFamily="{StaticResource SCDream5}"
-                                Style="{StaticResource MaterialDesignFlatLightBgButton}"
-                                FontWeight="Bold" Command="{Binding DrawGraphCommand}"/>
-                    </StackPanel>
-                </Grid>
-            </Border>
 
-            <Border Grid.Row="2" Grid.Column="1" Grid.RowSpan="2" Margin="0 0 15 15" CornerRadius="10"
-                    Background="#384659" BorderBrush="#404F63" BorderThickness="1">
-                <control:GraphControl x:Name="graphControl"
-                          Margin="10" DataContext="{Binding GraphControlVM}"
-                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            </Border>
         </Grid>
     </Border>
 </UserControl>
diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml
index 41eeb80..03c601b 100644
--- a/SmartAquaViewer/View/MonitoringView.xaml
+++ b/SmartAquaViewer/View/MonitoringView.xaml
@@ -541,10 +541,10 @@
                 </Grid>
             </Border>
             <md:DrawerHost.BottomDrawerContent>
-                <Border x:Name="BottomDrawerRoot" Height="400" CornerRadius="0 4 4 4" Background="#1D3649">
+                <Border x:Name="BottomDrawerRoot" Height="400" CornerRadius="0 0 4 4" Background="#1D3649">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="550"/>
+                            <ColumnDefinition Width="520"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Border Margin="16 16 12 16" CornerRadius="5"
@@ -718,22 +718,24 @@
                                                 <TextBlock Text="필드 종류" VerticalAlignment="Center"
                                                            FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
                                                 <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Left" Margin="15 0">
-                                                    <RadioButton x:Name="rbStatus" Content="전원/상태" 
-                                                                 FontFamily="{StaticResource SCDream3}"
-                                                                 GroupName="strpPlot" Margin="0 0 30 0"
-                                                                 Foreground="White" FontSize="16"
+                                                    <RadioButton x:Name="rbStatus"                                                                 
+                                                                 GroupName="strpPlot" Margin="0 0 16 0"
+                                                                 Foreground="#325C80"
                                                                  Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
                                                                  IsChecked="{Binding SelectedKind, Mode=TwoWay,
                                                                                      Converter={StaticResource EnumEqualsConverter},
-                                                                                     ConverterParameter={x:Static model:StepFieldKind.Status}}"/>
-                                                    <RadioButton x:Name="rbValue" Content="센서 값" 
-                                                                 FontFamily="{StaticResource SCDream3}"
-                                                                 GroupName="strpPlot" Grid.Column="1" 
-                                                                 Foreground="White" FontSize="16"
+                                                                                     ConverterParameter={x:Static model:StepFieldKind.Status}}">
+                                                        <TextBlock Text="전원/상태" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
+                                                    </RadioButton>
+                                                    <RadioButton x:Name="rbValue"
+                                                                 GroupName="strpPlot"
+                                                                 Foreground="#325C80"
                                                                  Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
                                                                  IsChecked="{Binding SelectedKind, Mode=TwoWay,
                                                                                      Converter={StaticResource EnumEqualsConverter},
-                                                                                     ConverterParameter={x:Static model:StepFieldKind.Sensor}}"/>
+                                                                                     ConverterParameter={x:Static model:StepFieldKind.Sensor}}">
+                                                        <TextBlock Text="센서 값" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
+                                                    </RadioButton>
                                                 </StackPanel>
                                             </Grid>
 
@@ -870,7 +872,7 @@
                                               Foreground="#264A60"
                                               Margin="0 0 4 0" VerticalContentAlignment="Center">
                                         <CheckBox.Style>
-                                            <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
+                                            <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
                                                 <Setter Property="Visibility" Value="Visible"/>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding SelectedTab}" Value="Filter">
@@ -882,30 +884,14 @@
                                                 </Style.Triggers>
                                             </Style>
                                         </CheckBox.Style>
+                                        <TextBlock Text="범례" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
                                     </CheckBox>
-                                    <TextBlock Text="범례" VerticalAlignment="Center" Margin="0 0 12 0"
-                                               FontSize="16" FontFamily="{StaticResource SCDream3}"
-                                               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">
                                         <CheckBox.Style>
-                                            <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
+                                            <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
@@ -917,30 +903,14 @@
                                                 </Style.Triggers>
                                             </Style>
                                         </CheckBox.Style>
+                                        <TextBlock Text="마커" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
                                     </CheckBox>
-                                    <TextBlock Text="마커" VerticalAlignment="Center" Margin="0 0 12 0"
-                                               FontSize="16" FontFamily="{StaticResource SCDream3}"
-                                               Foreground="#999999">
-                                        <TextBlock.Style>
-                                            <Style TargetType="TextBlock">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
-                                                        <Setter Property="Visibility" Value="Visible"/>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding SelectedGraphType}" Value="STEP">
-                                                        <Setter Property="Visibility" Value="Visible"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
 
                                     <CheckBox IsChecked="{Binding ShowRegression}"
                                               Foreground="#264A60"
                                               Margin="0 0 4 0" VerticalContentAlignment="Center">
                                         <CheckBox.Style>
-                                            <Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}">
+                                            <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding SelectedGraphType}" Value="SCATTER">
@@ -949,29 +919,12 @@
                                                 </Style.Triggers>
                                             </Style>
                                         </CheckBox.Style>
+                                        <TextBlock Text="회귀선" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
                                     </CheckBox>
-                                    <TextBlock Text="회귀선" VerticalAlignment="Center" Margin="0 0 12 0"
-                                               FontSize="16" FontFamily="{StaticResource SCDream3}"
-                                               Foreground="#999999">
-                                        <TextBlock.Style>
-                                            <Style TargetType="TextBlock">
-                                                <Setter Property="Visibility" Value="Collapsed"/>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding SelectedGraphType}" Value="SCATTER">
-                                                        <Setter Property="Visibility" Value="Visible"/>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
                                 </StackPanel>
 
                                 <Button Content="그래프 생성" Grid.Row="1" HorizontalAlignment="Right"
-                                        FontFamily="{StaticResource SCDream3}"
-                                        Foreground="White" FontSize="16"
-                                        Background="#325C80" BorderBrush="Transparent"
-                                        Style="{StaticResource MaterialDesignFlatLightBgButton}"
-                                        Width="120" Height="38"
+                                        Style="{StaticResource GraphButtonStyle}"
                                         Margin="0 0 24 24" Padding="20 0"
                                         Command="{Binding DrawGraphCommand}"/>
                             </Grid>