From ff95feeafcb651dca6bf1fadb3a2cc53addce5f8 Mon Sep 17 00:00:00 2001 From: hj615 Date: Fri, 22 Aug 2025 17:26:30 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=8A=A4=ED=83=9D=20=EC=98=81=EC=97=AD?= =?UTF-8?q?=20=EA=B7=B8=EB=9E=98=ED=94=84=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SmartAquaViewer/Model/Enums.cs | 7 +- SmartAquaViewer/View/EnegyView.xaml | 116 ++++++++- SmartAquaViewer/View/MonitoringView.xaml | 2 +- SmartAquaViewer/ViewModel/EnergyViewModel.cs | 232 ++++++++++++++++-- .../ViewModel/GraphControlViewModel.cs | 178 +++++++++++++- .../ViewModel/MonitoringViewModel.cs | 2 +- 6 files changed, 504 insertions(+), 33 deletions(-) diff --git a/SmartAquaViewer/Model/Enums.cs b/SmartAquaViewer/Model/Enums.cs index 7f4c8f5..d55c773 100644 --- a/SmartAquaViewer/Model/Enums.cs +++ b/SmartAquaViewer/Model/Enums.cs @@ -18,13 +18,16 @@ namespace SmartAquaViewer.Model LINE, BOX, SCATTER, - STEP + STEP, + STACKAREA, + PIE } public enum StepFieldKind { Status, // 전원/상태 - Sensor // 센서 값 + Sensor, // 센서 값 + Energy, // 에너지 소비량 } public enum PowerStatus diff --git a/SmartAquaViewer/View/EnegyView.xaml b/SmartAquaViewer/View/EnegyView.xaml index 1276688..d7596e6 100644 --- a/SmartAquaViewer/View/EnegyView.xaml +++ b/SmartAquaViewer/View/EnegyView.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:SmartAquaViewer.View" xmlns:control="clr-namespace:SmartAquaViewer.Controls" + xmlns:helper="clr-namespace:SmartAquaViewer.Helper" mc:Ignorable="d" d:DesignHeight="940" d:DesignWidth="1650"> @@ -122,7 +123,120 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +