fix: 일부 디자인 수정

hhsung_work
HyungJune Kim 10 months ago
parent 9effacb0a5
commit 11382dcea6

@ -47,20 +47,6 @@ namespace SmartAquaViewer.DataAnalysis
Sterilizing = sterilizing; 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>
/// 샘플 데이터 리스트 생성 /// 샘플 데이터 리스트 생성
/// </summary> /// </summary>

@ -130,7 +130,7 @@
<Setter Property="BorderBrush" Value="White"/> <Setter Property="BorderBrush" Value="White"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="FontWeight" Value="Bold"/> <Setter Property="FontWeight" Value="Bold"/>
<Setter Property="Padding" Value="8 0"/> <Setter Property="Padding" Value="8"/>
</Style> </Style>
<Style x:Key="DataGridElmenetStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="DataGridElmenetStyle" TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Center"/> <Setter Property="HorizontalAlignment" Value="Center"/>

@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SmartAquaViewer.View" xmlns:local="clr-namespace:SmartAquaViewer.View"
xmlns:control="clr-namespace:SmartAquaViewer.Controls"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="940" d:DesignWidth="1650"> d:DesignHeight="940" d:DesignWidth="1650">
<Grid Background="#243851"> <Grid Background="#243851">
@ -13,8 +14,8 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="800"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="2" Margin="20" BorderBrush="#3E4C60" BorderThickness="1" CornerRadius="10"> <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" <Border Grid.Row="2" Grid.Column="1" Margin="0 0 20 20" CornerRadius="10"
Background="#384659" BorderBrush="#404F63" BorderThickness="1"> Background="#384659" BorderBrush="#404F63" BorderThickness="1">
<control:GraphControl x:Name="graphControl"
Margin="10" DataContext="{Binding GraphControlVM}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
</Border> </Border>
</Grid> </Grid>
</UserControl> </UserControl>

@ -11,6 +11,7 @@ using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Threading; using System.Windows.Threading;
using SmartAquaViewer.Controls; using SmartAquaViewer.Controls;
using SmartAquaViewer.DataAnalisys;
using SmartAquaViewer.DataAnalysis; using SmartAquaViewer.DataAnalysis;
using SmartAquaViewer.Model; using SmartAquaViewer.Model;
@ -242,6 +243,7 @@ namespace SmartAquaViewer.ViewModel
BtnVisibilityUp = Visibility.Collapsed; BtnVisibilityUp = Visibility.Collapsed;
WaterQualityList = WaterQualityVO.GetSampleData(new DateTime(2025, 8, 1), new DateTime(2025, 8, 1), 10); 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); Datas.SetWaterQualityVO(WaterQualityList);
TankGroups = WaterQualityList TankGroups = WaterQualityList

Loading…
Cancel
Save