From 11382dcea69c351f400336c86769fb7c8140322b Mon Sep 17 00:00:00 2001
From: hj615 <hj615@cuuva.com>
Date: Thu, 21 Aug 2025 13:20:44 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=BC=EB=B6=80=20=EB=94=94=EC=9E=90?=
 =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SmartAquaViewer/DataAnalisys/WaterQualityVO.cs   | 14 --------------
 SmartAquaViewer/Resources/Generic.xaml           |  2 +-
 SmartAquaViewer/View/EnegyView.xaml              |  7 +++++--
 SmartAquaViewer/ViewModel/MonitoringViewModel.cs |  2 ++
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/SmartAquaViewer/DataAnalisys/WaterQualityVO.cs b/SmartAquaViewer/DataAnalisys/WaterQualityVO.cs
index 140997e..97c4444 100644
--- a/SmartAquaViewer/DataAnalisys/WaterQualityVO.cs
+++ b/SmartAquaViewer/DataAnalisys/WaterQualityVO.cs
@@ -47,20 +47,6 @@ namespace SmartAquaViewer.DataAnalysis
             Sterilizing = sterilizing;
         }
 
-        public double CalculateTotalEnergy()
-        {
-            double total = 0;
-            total += Filtering.SandFilterEnergy;
-            total += Filtering.CirculationPumpEnergy;
-            total += Filtering.HeatPumpEnergy;
-            total += Filtering.AirBlowerEnergy;
-            total += Sterilizing.OzoneGeneratorEnergy;
-            total += Sterilizing.UVSterilizerEnergy;
-            total += Sterilizing.OzoneDissolverEnergy;
-            total += Sterilizing.ExcessOzoneDestroyerEnergy;
-            return Math.Round(total, 2);
-        }
-
         /// <summary>
         /// 샘플 데이터 리스트 생성
         /// </summary>
diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml
index 05f7c9e..ef1ba84 100644
--- a/SmartAquaViewer/Resources/Generic.xaml
+++ b/SmartAquaViewer/Resources/Generic.xaml
@@ -130,7 +130,7 @@
         <Setter Property="BorderBrush" Value="White"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="FontWeight" Value="Bold"/>
-        <Setter Property="Padding" Value="8 0"/>
+        <Setter Property="Padding" Value="8"/>
     </Style>
     <Style x:Key="DataGridElmenetStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="HorizontalAlignment" Value="Center"/>
diff --git a/SmartAquaViewer/View/EnegyView.xaml b/SmartAquaViewer/View/EnegyView.xaml
index 2d8d269..bc08401 100644
--- a/SmartAquaViewer/View/EnegyView.xaml
+++ b/SmartAquaViewer/View/EnegyView.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SmartAquaViewer.View"
+             xmlns:control="clr-namespace:SmartAquaViewer.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="940" d:DesignWidth="1650">
     <Grid Background="#243851">
@@ -13,8 +14,8 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="800"/>
         </Grid.ColumnDefinitions>
 
         <Border Grid.ColumnSpan="2" Margin="20" BorderBrush="#3E4C60" BorderThickness="1" CornerRadius="10">
@@ -71,7 +72,9 @@
 
         <Border Grid.Row="2" Grid.Column="1" Margin="0 0 20 20" CornerRadius="10"
                 Background="#384659" BorderBrush="#404F63" BorderThickness="1">
-
+            <control:GraphControl x:Name="graphControl"
+                      Margin="10" DataContext="{Binding GraphControlVM}"
+                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
         </Border>
     </Grid>
 </UserControl>
diff --git a/SmartAquaViewer/ViewModel/MonitoringViewModel.cs b/SmartAquaViewer/ViewModel/MonitoringViewModel.cs
index 4da8a55..10f78dd 100644
--- a/SmartAquaViewer/ViewModel/MonitoringViewModel.cs
+++ b/SmartAquaViewer/ViewModel/MonitoringViewModel.cs
@@ -11,6 +11,7 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
 using SmartAquaViewer.Controls;
+using SmartAquaViewer.DataAnalisys;
 using SmartAquaViewer.DataAnalysis;
 using SmartAquaViewer.Model;
 
@@ -242,6 +243,7 @@ namespace SmartAquaViewer.ViewModel
             BtnVisibilityUp = Visibility.Collapsed;
 
             WaterQualityList = WaterQualityVO.GetSampleData(new DateTime(2025, 8, 1), new DateTime(2025, 8, 1), 10);
+            var list = Test.GetSampleData(new DateTime(2025, 8, 1), new DateTime(2025, 8, 1), 24);
             Datas.SetWaterQualityVO(WaterQualityList);
 
             TankGroups = WaterQualityList