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 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +