SmartAquafarm
/
SmartAquaViewer
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

design: 폰트 변경 및 일부 디자인 변경

Browse Source
prototype
HyungJune Kim 6 months ago
parent d4588feb41
commit ea0006530d
23 changed files with 274 additions and 334 deletions
Show Stats Download Patch File Download Diff File

1
SmartAquaViewer/App.xaml
Unescape View File

@ -44,7 +44,6 @@
<DataTemplate DataType="{x:Type vm:CCTVViewModel}">
<view:CCTVView/>
</DataTemplate>
</ResourceDictionary>
</Application.Resources>
</Application>

2
SmartAquaViewer/Controls/FFPlayerControl.xaml
Unescape View File

@ -24,7 +24,7 @@
Visibility="{Binding IsPlayingVIsibility}">
<TextBlock Name="lblVideoStatus" Text="연결 없음"
VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="16" Foreground="#999999" FontFamily="{StaticResource SCDream5}"/>
FontSize="16" Foreground="#999999" FontFamily="{StaticResource Pretendard_Medium}"/>
</Border>
<Image x:Name="imgPlayer" Grid.Row="1"

6
SmartAquaViewer/Controls/SegmentedControl.xaml
Unescape View File

@ -11,13 +11,13 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<RadioButton Name="rdbtnA" Content="수조" GroupName="SignalType" Tag="Tank"
Checked="RadioButton_Checked"
Style="{StaticResource RadioButtonSegmentedStyle}" Width="249" Height="56" IsChecked="True"/>
Style="{StaticResource RadioButtonSegmentedStyle}" IsChecked="True"/>
<RadioButton Name="rdbtnB" Content="여과시스템" GroupName="SignalType" Tag="Filter"
Checked="RadioButton_Checked"
Style="{StaticResource RadioButtonSegmentedStyle}" Width="249" Height="56"/>
Style="{StaticResource RadioButtonSegmentedStyle}"/>
<RadioButton Name="rdbtnC" Content="살균시스템" GroupName="SignalType" Tag="Sterilizer"
Checked="RadioButton_Checked"
Style="{StaticResource RadioButtonSegmentedStyle}" Width="249" Height="56"/>
Style="{StaticResource RadioButtonSegmentedStyle}"/>
</StackPanel>
</Border>
</UserControl>

BIN
SmartAquaViewer/Fonts/Pretendard-Black.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-Bold.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-ExtraBold.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-ExtraLight.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-Light.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-Medium.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-Regular.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-SemiBold.otf
View File

Binary file not shown.

BIN
SmartAquaViewer/Fonts/Pretendard-Thin.otf
View File

Binary file not shown.

7
SmartAquaViewer/MainWindow.xaml
Unescape View File

@ -32,9 +32,8 @@
<Border Grid.ColumnSpan="2" Background="#1D3649"
BorderBrush="#325C80" BorderThickness="0 0 0 1">
<Grid>
<TextBlock x:Name="appTitle" Text="{Binding AppTitle}" FontFamily="{StaticResource SCDream6}"
Margin="20 0 0 0" Foreground="White" FontSize="16"
VerticalAlignment="Center"/>
<TextBlock x:Name="appTitle" Text="{Binding AppTitle}" Margin="20 0 0 0"
Style="{StaticResource TitleTextBlockStyle}"/>
<Image Source="/Resources/Images/NIFS_logo_w.png"
HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
@ -59,7 +58,7 @@
<Grid Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2"
Background="#152935"/>
<view:FileListView Grid.Row="1" Grid.RowSpan="2" x:Name="fileListView"/>
<view:FileListView Grid.Row="1" Grid.RowSpan="2" x:Name="fileListView" Loaded="fileListView_Loaded"/>
<Border Grid.Row="1" Grid.Column="1" Margin="24 12 24 0" CornerRadius="4">
<UniformGrid Columns="4">

5
SmartAquaViewer/MainWindow.xaml.cs
Unescape View File

@ -75,5 +75,10 @@ namespace SmartAquaViewer
windowMax.Visibility = Visibility.Visible;
}
}
private void fileListView_Loaded(object sender, RoutedEventArgs e)
{
}
}
}

168
SmartAquaViewer/Resources/Generic.xaml
Unescape View File

@ -9,16 +9,29 @@
xmlns:shell="clr-namespace:System.Windows.Shell;assembly=PresentationFramework">
<classes:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
<FontFamily x:Key="SCDream1">pack://application:,,,/Fonts/#S-Core Dream 1 Thin</FontFamily>
<FontFamily x:Key="SCDream2">pack://application:,,,/Fonts/#S-Core Dream 2 ExtraLight</FontFamily>
<FontFamily x:Key="SCDream3">pack://application:,,,/Fonts/#S-Core Dream 3 Light</FontFamily>
<FontFamily x:Key="SCDream4">pack://application:,,,/Fonts/#S-Core Dream 4 Regular</FontFamily>
<FontFamily x:Key="SCDream5">pack://application:,,,/Fonts/#S-Core Dream 5 Medium</FontFamily>
<FontFamily x:Key="SCDream6">pack://application:,,,/Fonts/#S-Core Dream 6 Bold</FontFamily>
<FontFamily x:Key="SCDream7">pack://application:,,,/Fonts/#S-Core Dream 7 ExtraBold</FontFamily>
<FontFamily x:Key="SCDream8">pack://application:,,,/Fonts/#S-Core Dream 8 Heavy</FontFamily>
<FontFamily x:Key="SCDream9">pack://application:,,,/Fonts/#S-Core Dream 9 Black</FontFamily>
<classes:InverseBoolConverter x:Key="InverseBoolConverter"/>
<classes:EnumEqualsConverter x:Key="EnumEqualsConverter"/>
<classes:BoolToPowerConverter x:Key="BoolToPowerConverter"/>
<classes:OneBasedConverter x:Key="OneBasedConverter"/>
<classes:PageIndexToDisplayConverter x:Key="PageIndexToDisplayConverter"/>
<classes:CurrentPageEqualsConverter x:Key="CurrentPageEqualsConverter"/>
<FontFamily x:Key="Pretendard_Thin">pack://application:,,,/Fonts/#Pretendard Thin</FontFamily>
<FontFamily x:Key="Pretendard_ExtraLight">pack://application:,,,/Fonts/#Pretendard ExtraLight</FontFamily>
<FontFamily x:Key="Pretendard_Light">pack://application:,,,/Fonts/#Pretendard Light</FontFamily>
<FontFamily x:Key="Pretendard_Regular">pack://application:,,,/Fonts/#Pretendard Regular</FontFamily>
<FontFamily x:Key="Pretendard_Medium">pack://application:,,,/Fonts/#Pretendard Medium</FontFamily>
<FontFamily x:Key="Pretendard_SemiBold">pack://application:,,,/Fonts/#Pretendard SemiBold</FontFamily>
<FontFamily x:Key="Pretendard_Bold">pack://application:,,,/Fonts/#Pretendard Bold</FontFamily>
<FontFamily x:Key="Pretendard_ExtraBold">pack://application:,,,/Fonts/#Pretendard ExtraBold</FontFamily>
<FontFamily x:Key="Pretendard_Black">pack://application:,,,/Fonts/#Pretendard Black</FontFamily>
<Style TargetType="{x:Type TextBlock}" x:Key="TitleTextBlockStyle">
<Setter Property="FontFamily" Value="{StaticResource Pretendard_SemiBold}"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="16"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style x:Key="WindowChromeStyle" TargetType="{x:Type Window}">
<Setter Property="shell:WindowChrome.WindowChrome">
@ -61,7 +74,7 @@
<Style x:Key="RadioBtnContentTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}"/>
<Setter Property="Foreground" Value="#999"/>
<Style.Triggers>
<!-- 🔹 라디오버튼이 체크되었을 때 텍스트 색 변경 -->
@ -75,7 +88,7 @@
<Style x:Key="CheckBoxContentTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}"/>
<Setter Property="Foreground" Value="#999"/>
<Style.Triggers>
<!-- 🔹 라디오버튼이 체크되었을 때 텍스트 색 변경 -->
@ -87,6 +100,18 @@
</Style.Triggers>
</Style>
<Style x:Key="FieldNameRunStyle" TargetType="{x:Type Run}">
<Setter Property="FontSize" Value="18"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}"/>
<Setter Property="Foreground" Value="#4178BE"/>
</Style>
<Style x:Key="FieldValueRunStyle" TargetType="{x:Type Run}">
<Setter Property="FontSize" Value="24"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_SemiBold}"/>
<Setter Property="Foreground" Value="#FFFFFF"/>
</Style>
<Style x:Key="ImageRadioButtonStyle" TargetType="RadioButton">
<Setter Property="Foreground" Value="#999"/>
<Setter Property="FontSize" Value="20"/>
@ -97,7 +122,7 @@
<Image x:Name="ButtonImage" Stretch="Fill"
Source="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(helper:RadioButtonHelper.UnPressedImage)}"/>
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"
TextElement.FontFamily="{StaticResource SCDream8}"
TextElement.FontFamily="{StaticResource Pretendard_SemiBold}"
TextElement.FontSize="{TemplateBinding FontSize}"
TextElement.Foreground="{TemplateBinding Foreground}"/>
</Grid>
@ -117,13 +142,16 @@
<Setter Property="Foreground" Value="#999"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Width" Value="249"/>
<Setter Property="Height" Value="56"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Grid>
<Border Background="{TemplateBinding Background}" CornerRadius="30">
<Border Background="{TemplateBinding Background}" CornerRadius="30"
Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"
TextElement.FontFamily="{StaticResource SCDream8}"
TextElement.FontFamily="{StaticResource Pretendard_SemiBold}"
TextElement.FontSize="{TemplateBinding FontSize}"
TextElement.Foreground="{TemplateBinding Foreground}"/>
</Border>
@ -149,7 +177,7 @@
<ControlTemplate TargetType="RadioButton">
<Border Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"
TextElement.FontFamily="{StaticResource SCDream8}"
TextElement.FontFamily="{StaticResource Pretendard_SemiBold}"
TextElement.FontSize="{TemplateBinding FontSize}"
TextElement.Foreground="{TemplateBinding Foreground}"/>
</Border>
@ -164,6 +192,49 @@
</Setter>
</Style>
<Style x:Key="PageCommandButtonStyle"
TargetType="Button"
BasedOn="{StaticResource MaterialDesignFlatLightBgButton}">
<!-- 기본 속성 재정의 -->
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Width" Value="20"/>
<Setter Property="Height" Value="20"/>
<Setter Property="Padding" Value="0"/>
<Setter Property="Margin" Value="4 0"/>
<Setter Property="Opacity" Value="1"/>
</Style>
<Style x:Key="PageNumButtonStyle" TargetType="{x:Type Button}">
<Setter Property="Width" Value="24"/>
<Setter Property="Height" Value="24"/>
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="#264A60" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Foreground" Value="#264A60"/>
<Setter Property="Padding" Value="6 0"/>
<Setter Property="Margin" Value="6"/>
<Style.Triggers>
<DataTrigger Value="True">
<DataTrigger.Binding>
<MultiBinding Converter="{StaticResource CurrentPageEqualsConverter}">
<!-- 현재 버튼의 인덱스 (각 아이템, int) -->
<Binding />
<!-- TanksPager.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>
<Style x:Key="ImageButtonStyle" TargetType="Button">
<Setter Property="Width" Value="58"/>
<Setter Property="Height" Value="42"/>
@ -204,22 +275,15 @@
<Setter.Value>
<ControlTemplate TargetType="Button">
<Grid>
<!-- 🔷 사다리꼴(위 좁고 아래 넓음) -->
<!-- (20,0) (120,0)
\ /
(0,50) (140,50) -->
<Polygon x:Name="shape"
Fill="#1D3649"
Points="85.6111,0 92,30 0,30 6.38889,0" />
<!-- 내용 -->
<ContentPresenter HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0"/>
</Grid>
<!-- 🔷 버튼 상태 -->
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="shape" Property="Fill" Value="#264A63"/>
@ -246,22 +310,15 @@
<Setter.Value>
<ControlTemplate TargetType="Button">
<Grid>
<!-- 🔷 사다리꼴(위 좁고 아래 넓음) -->
<!-- (20,0) (120,0)
\ /
(0,50) (140,50) -->
<Polygon x:Name="shape"
Fill="#1D3649"
Points="0,85.6111 30,92 30,0 0,6.38889" />
<!-- 내용 -->
<ContentPresenter HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="0"/>
</Grid>
<!-- 🔷 버튼 상태 -->
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="shape" Property="Fill" Value="#264A63"/>
@ -357,6 +414,7 @@
<Setter Property="Background" Value="{StaticResource LineComboBg}"/>
<Setter Property="Foreground" Value="{StaticResource LineComboText}"/>
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_SemiBold}"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="12 0" />
<Setter Property="ItemContainerStyle" Value="{StaticResource LineComboBoxItemStyle}" />
@ -418,6 +476,20 @@
</Setter>
</Style>
<!-- DataGrid -->
<Style TargetType="{x:Type DataGridCell}">
<Setter Property="Padding" Value="0" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
<Grid>
<ContentPresenter Margin="0" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="DataGridStyle" TargetType="DataGrid">
<Setter Property="EnableRowVirtualization" Value="True"/>
<Setter Property="EnableColumnVirtualization" Value="True"/>
@ -435,21 +507,21 @@
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="#999"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="TextElement.FontSize" Value="14"/>
</Style>
<Style x:Key="DataGridRowStyle" TargetType="{x:Type DataGridRow}">
<Setter Property="Background" Value="#292929"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}"/>
<Setter Property="Foreground" Value="#BDBDBD"/>
<Setter Property="Padding" Value="0"/>
</Style>
<Style x:Key="DataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Background" Value="#264A60"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="FontSize" Value="14"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream5}"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_SemiBold}"/>
<Setter Property="Height" Value="44"/>
</Style>
<Style x:Key="HighlightLeftBorderHeaderStyle"
@ -467,7 +539,7 @@
<Style x:Key="DataGridElmenetStyle" TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}"/>
</Style>
<Style x:Key="GridViewColumnHeaderStyle" TargetType="{x:Type GridViewColumnHeader}">
@ -478,6 +550,8 @@
Background="#1D3649"
Width="{TemplateBinding Width}" >
<TextBlock Text="{TemplateBinding Content}"
FontSize="14"
FontFamily="{StaticResource Pretendard_SemiBold}"
Foreground="White"
Padding="0"
TextAlignment="Center"
@ -495,24 +569,10 @@
<Style x:Key="GridViewTextBlockStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="14"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
<Style x:Key="PageCommandButtonStyle"
TargetType="Button"
BasedOn="{StaticResource MaterialDesignFlatLightBgButton}">
<!-- 기본 속성 재정의 -->
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Width" Value="20"/>
<Setter Property="Height" Value="20"/>
<Setter Property="Padding" Value="0"/>
<Setter Property="Opacity" Value="1"/>
</Style>
<Style TargetType="ListBoxItem" x:Key="TransparentListBoxItemStyle" BasedOn="{StaticResource MaterialDesignListBoxItem}">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Padding" Value="0"/>
@ -679,7 +739,7 @@
VerticalAlignment="Center"
TextElement.Foreground="{TemplateBinding Foreground}"
TextElement.FontSize="12"
TextElement.FontFamily="{StaticResource SCDream2}"/>
TextElement.FontFamily="{StaticResource Pretendard_Medium}"/>
</StackPanel>
<ControlTemplate.Triggers>
@ -775,7 +835,7 @@
</Style>
<Style x:Key="GeneralButtonStyle" TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatLightBgButton}">
<Setter Property="FontFamily" Value="{StaticResource SCDream3}" />
<Setter Property="FontFamily" Value="{StaticResource Pretendard_SemiBold}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
<Setter Property="Background" Value="#325C80" />
@ -785,7 +845,7 @@
</Style>
<Style x:Key="CCTVTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontFamily" Value="{StaticResource SCDream4}" />
<Setter Property="FontFamily" Value="{StaticResource Pretendard_Medium}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
</Style>

BIN
SmartAquaViewer/Resources/Images/add_folder_gray.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 377 B

20
SmartAquaViewer/SmartAquaViewer.csproj
Unescape View File

@ -11,6 +11,15 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Fonts\Pretendard-Black.otf" />
<None Remove="Fonts\Pretendard-Bold.otf" />
<None Remove="Fonts\Pretendard-ExtraBold.otf" />
<None Remove="Fonts\Pretendard-ExtraLight.otf" />
<None Remove="Fonts\Pretendard-Light.otf" />
<None Remove="Fonts\Pretendard-Medium.otf" />
<None Remove="Fonts\Pretendard-Regular.otf" />
<None Remove="Fonts\Pretendard-SemiBold.otf" />
<None Remove="Fonts\Pretendard-Thin.otf" />
<None Remove="Fonts\SCDream1.otf" />
<None Remove="Fonts\SCDream2.otf" />
<None Remove="Fonts\SCDream3.otf" />
@ -21,6 +30,7 @@
<None Remove="Fonts\SCDream8.otf" />
<None Remove="Fonts\SCDream9.otf" />
<None Remove="Resources\Images\add_folder.png" />
<None Remove="Resources\Images\add_folder_gray.png" />
<None Remove="Resources\Images\arrow_down.png" />
<None Remove="Resources\Images\arrow_left.png" />
<None Remove="Resources\Images\arrow_right.png" />
@ -66,6 +76,15 @@
</ItemGroup>
<ItemGroup>
<Resource Include="Fonts\Pretendard-Black.otf" />
<Resource Include="Fonts\Pretendard-Bold.otf" />
<Resource Include="Fonts\Pretendard-ExtraBold.otf" />
<Resource Include="Fonts\Pretendard-ExtraLight.otf" />
<Resource Include="Fonts\Pretendard-Light.otf" />
<Resource Include="Fonts\Pretendard-Medium.otf" />
<Resource Include="Fonts\Pretendard-Regular.otf" />
<Resource Include="Fonts\Pretendard-SemiBold.otf" />
<Resource Include="Fonts\Pretendard-Thin.otf" />
<Resource Include="Fonts\SCDream1.otf" />
<Resource Include="Fonts\SCDream2.otf" />
<Resource Include="Fonts\SCDream3.otf" />
@ -76,6 +95,7 @@
<Resource Include="Fonts\SCDream8.otf" />
<Resource Include="Fonts\SCDream9.otf" />
<Resource Include="Resources\Images\add_folder.png" />
<Resource Include="Resources\Images\add_folder_gray.png" />
<Resource Include="Resources\Images\arrow_down.png" />
<Resource Include="Resources\Images\arrow_left.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

4
SmartAquaViewer/View/CCTVView.xaml
Unescape View File

@ -70,11 +70,11 @@
<RowDefinition/>
<RowDefinition Height="81"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Margin="0 0 0 16">
<StackPanel Orientation="Horizontal" Margin="0 0 0 16" Width="250">
<Image Source="/Resources/Images/cctv.png"
VerticalAlignment="Center"
Width="20" Height="20"/>
<TextBlock Text="CCTV 목록" FontFamily="{StaticResource SCDream5}"
<TextBlock Text="CCTV 목록" FontFamily="{StaticResource Pretendard_SemiBold}"
FontSize="18" FontWeight="Bold" Foreground="White"
VerticalAlignment="Center" Margin="8 0"/>
</StackPanel>

120
SmartAquaViewer/View/EnegyView.xaml
Unescape View File

@ -11,13 +11,6 @@
mc:Ignorable="d"
d:DesignHeight="940" d:DesignWidth="1650">
<UserControl.Resources>
<classes:InverseBoolConverter x:Key="InverseBoolConverter"/>
<classes:OneBasedConverter x:Key="OneBasedConverter"/>
<classes:PageIndexToDisplayConverter x:Key="PageIndexToDisplayConverter"/>
<classes:CurrentPageEqualsConverter x:Key="CurrentPageEqualsConverter"/>
</UserControl.Resources>
<Border>
<Grid>
<Grid.RowDefinitions>
@ -29,83 +22,74 @@
<UniformGrid Columns="9">
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="총 소비 전력" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="총 소비 전력" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="모래여과기" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="모래여과기" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalCirculationPumpEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="순환펌프" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="순환펌프" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalCirculationPumpEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="히트펌프" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="히트펌프" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalHeatPumpEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="에어브로와" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="에어브로와" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalAirBlowerEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="오존발생기" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="오존발생기" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalOzoneGeneratorEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="자외선 살균기" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="자외선 살균기" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalUVSterilizerEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="오존용해장치" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="오존용해장치" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalOzoneDissolverEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border>
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="배오존장치" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="배오존장치" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalExcessOzoneDestroyerEnergy, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
</UniformGrid>
@ -202,11 +186,11 @@
<Grid Grid.Row="1" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Command="{Binding FirstPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageFirst"/>
</Button>
<Button Command="{Binding PrevPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronLeft"/>
</Button>
@ -219,51 +203,24 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button Margin="6"
Padding="6,0"
Command="{Binding DataContext.GoToPageCommand,
<Button Command="{Binding DataContext.GoToPageCommand,
RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}">
CommandParameter="{Binding}"
Style="{StaticResource PageNumButtonStyle}">
<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"/>
<!-- 🔹 현재 페이지면 강조 -->
<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>
<Button Command="{Binding NextPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronRight"/>
</Button>
<Button Command="{Binding LastPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageLast"/>
</Button>
</StackPanel>
@ -313,11 +270,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox Margin="0" Height="35" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
ItemsSource="{Binding GraphTypes}"
SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
@ -369,10 +326,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
Grid.Column="1"
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_Medium}" Foreground="White"/>
</Grid>
<Grid Margin="0 0 0 10">
@ -381,9 +338,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Top" Foreground="White">
<Run Text="Y축" FontSize="18" FontFamily="{StaticResource SCDream4}"/>
<Run Text="Y축" FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}"/>
<LineBreak/>
<Run Text="(복수 선택 가능)" FontSize="14" Foreground="#767676"/>
<Run Text="(복수 선택 가능)" FontSize="14"
Foreground="#767676" FontFamily="{StaticResource Pretendard_Medium}"/>
</TextBlock>
<ListBox ItemsSource="{Binding YFieldCandidates}"
@ -392,8 +350,7 @@
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value"
FontSize="14" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignFilterChipListBox}"
ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
@ -417,7 +374,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="필드" VerticalAlignment="Top"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ListBox ItemsSource="{Binding YFieldCandidates}"
Grid.Column="1"
@ -425,8 +382,7 @@
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value"
FontSize="14" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignFilterChipListBox}"
ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
@ -448,13 +404,13 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="집계 방식" VerticalAlignment="Top"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<StackPanel Orientation="Horizontal" Grid.Column="1">
<RadioButton x:Name="rbStatus"
GroupName="pie" Margin="0 0 12 0"
Foreground="#325C80"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}">
<TextBlock Text="합계" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
@ -462,7 +418,7 @@
<RadioButton x:Name="pie"
GroupName="pie"
Foreground="#325C80"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Mode=TwoWay}">
<TextBlock Text="평균" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>

22
SmartAquaViewer/View/FileListView.xaml
Unescape View File

@ -32,7 +32,7 @@
VerticalAlignment="Center" HorizontalAlignment="Center"
Width="24" Height="24"/>
</Border>
<TextBlock Text="파일 목록" FontFamily="{StaticResource SCDream5}"
<TextBlock Text="파일 목록" FontFamily="{StaticResource Pretendard_SemiBold}"
FontSize="24" FontWeight="Bold" Foreground="White"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</StackPanel>
@ -51,12 +51,9 @@
</Button>
</Grid>
<TextBlock Grid.Row="1" Text="파일을 업로드하세요"
VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="16" FontWeight="Medium" Foreground="Gray"
FontFamily="{StaticResource SCDream4}">
<TextBlock.Style>
<Style TargetType="TextBlock">
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
<StackPanel.Style>
<Style TargetType="StackPanel">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding FileList.Count}" Value="0">
@ -64,8 +61,13 @@
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel.Style>
<Image Source="/Resources/Images/add_folder_gray.png" VerticalAlignment="Top"
Width="24" Height="24" Margin="0 0 8 0" Stretch="Fill"/>
<TextBlock Text="파일을 업로드하세요."
FontSize="20" Foreground="#999999"
FontFamily="{StaticResource Pretendard_Medium}"/>
</StackPanel>
<ListView
Grid.Row="1" Padding="0"
@ -89,7 +91,7 @@
Width="24" Height="24" Margin="0 0 8 0"/>
<TextBlock Text="{Binding Name}"
FontSize="20" Foreground="White"
FontFamily="{StaticResource SCDream4}"
FontFamily="{StaticResource Pretendard_Medium}"
VerticalAlignment="Center"/>
</StackPanel>
</Border>

118
SmartAquaViewer/View/GreenHouseView.xaml
Unescape View File

@ -29,83 +29,74 @@
<UniformGrid Columns="9">
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="총 배출량" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="총 배출량" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="모래여과기" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="모래여과기" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalSandFilterGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="순환펌프" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="순환펌프" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalCirculationPumpGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="히트펌프" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="히트펌프" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalHeatPumpGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="에어브로와" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="에어브로와" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalAirBlowerGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="오존발생기" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="오존발생기" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalOzoneGeneratorGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="자외선 살균기" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="자외선 살균기" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalUVSterilizerGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="오존용해장치" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="오존용해장치" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalOzoneDissolverGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
<Border>
<TextBlock VerticalAlignment="Center" TextAlignment="Center">
<Run Text="배오존장치" FontSize="18" Foreground="#4178BE" FontFamily="{StaticResource SCDream5}"/>
<Run Text="배오존장치" Style="{StaticResource FieldNameRunStyle}"/>
<LineBreak/>
<Run Text="{Binding TotalExcessOzoneDestroyerGreenhouseGas, StringFormat=\{0:F2\}}"
FontSize="24" FontFamily="{StaticResource SCDream5}"
Foreground="White"/>
Style="{StaticResource FieldValueRunStyle}"/>
</TextBlock>
</Border>
</UniformGrid>
@ -203,11 +194,11 @@
<Grid Grid.Row="1" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Command="{Binding FirstPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageFirst"/>
</Button>
<Button Command="{Binding PrevPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronLeft"/>
</Button>
@ -220,51 +211,24 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button Margin="6"
Padding="6,0"
Command="{Binding DataContext.GoToPageCommand,
<Button Command="{Binding DataContext.GoToPageCommand,
RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}">
CommandParameter="{Binding}"
Style="{StaticResource PageNumButtonStyle}">
<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"/>
<!-- 🔹 현재 페이지면 강조 -->
<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>
<Button Command="{Binding NextPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronRight"/>
</Button>
<Button Command="{Binding LastPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageLast"/>
</Button>
</StackPanel>
@ -314,11 +278,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox Height="35" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
ItemsSource="{Binding GraphTypes}"
SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
@ -370,10 +334,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
Grid.Column="1"
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_Medium}" Foreground="White"/>
</Grid>
<Grid Margin="0 0 0 10">
@ -381,8 +345,12 @@
<ColumnDefinition Width="146"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Top"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
<TextBlock VerticalAlignment="Top" Foreground="White">
<Run Text="Y축" FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}"/>
<LineBreak/>
<Run Text="(복수 선택 가능)" FontSize="14"
Foreground="#767676" FontFamily="{StaticResource Pretendard_Medium}"/>
</TextBlock>
<ListBox ItemsSource="{Binding YFieldCandidates}"
Grid.Column="1"
@ -390,9 +358,7 @@
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="14" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignFilterChipListBox}"
ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
@ -416,7 +382,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="필드" VerticalAlignment="Top"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ListBox ItemsSource="{Binding YFieldCandidates}"
Grid.Column="1"
@ -424,9 +390,7 @@
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="14" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignFilterChipListBox}"
ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
@ -448,13 +412,13 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="집계 방식" VerticalAlignment="Top"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<StackPanel Orientation="Horizontal" Grid.Column="1">
<RadioButton x:Name="rbStatus"
GroupName="pie" Margin="0 0 12 0"
Foreground="#325C80"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}">
<TextBlock Text="합계" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
@ -462,7 +426,7 @@
<RadioButton x:Name="pie"
GroupName="pie"
Foreground="#325C80"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Mode=TwoWay}">
<TextBlock Text="평균" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>

128
SmartAquaViewer/View/MonitoringView.xaml
Unescape View File

@ -12,14 +12,6 @@
mc:Ignorable="d"
d:DesignHeight="940" d:DesignWidth="1650">
<UserControl.Resources>
<classes:EnumEqualsConverter x:Key="EnumEqualsConverter"/>
<classes:BoolToPowerConverter x:Key="BoolToPowerConverter"/>
<classes:OneBasedConverter x:Key="OneBasedConverter"/>
<classes:PageIndexToDisplayConverter x:Key="PageIndexToDisplayConverter"/>
<classes:CurrentPageEqualsConverter x:Key="CurrentPageEqualsConverter"/>
</UserControl.Resources>
<Border>
<md:DrawerHost BottomDrawerBackground="Transparent" IsBottomDrawerOpen="{Binding IsOpenMode}" OpenMode="Standard">
<Border BorderBrush="#1D3649" BorderThickness="0 0 0 2">
@ -323,7 +315,6 @@
helper:DataGridAutoPageSizeBehavior.Pager="{Binding TanksPager}"
helper:DataGridAutoPageSizeBehavior.Suspend="{Binding IsOpenMode}"
Grid.Row="1" Margin="0"
Background="Transparent"
VerticalScrollBarVisibility="Auto"
RowStyle="{StaticResource DataGridRowStyle}"
ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}">
@ -364,11 +355,11 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Command="{Binding TanksPager.FirstPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageFirst"/>
</Button>
<Button Command="{Binding TanksPager.PrevPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronLeft"/>
</Button>
@ -382,8 +373,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button Margin="6" Padding="6 0"
Width="21" Height="20"
<Button Style="{StaticResource PageNumButtonStyle}"
Command="{Binding DataContext.GoToPageCommand,
RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}">
@ -391,44 +381,17 @@
<!-- 각 아이템은 int(0,1,2,...) 이므로 그대로 컨버터 -->
<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"/>
<!-- 현재 페이지면 강조 -->
<Style.Triggers>
<DataTrigger Value="True">
<DataTrigger.Binding>
<MultiBinding Converter="{StaticResource CurrentPageEqualsConverter}">
<!-- 현재 버튼의 인덱스 (각 아이템, int) -->
<Binding />
<!-- TanksPager.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>
<Button Command="{Binding TanksPager.NextPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronRight"/>
</Button>
<Button Command="{Binding TanksPager.LastPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageLast"/>
</Button>
</StackPanel>
@ -454,7 +417,7 @@
<md:PackIcon Kind="PageFirst"/>
</Button>
<Button Command="{Binding PrevPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronLeft"/>
</Button>
@ -467,51 +430,24 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<Button Margin="6" Padding="6 0"
Width="21" Height="20"
<Button Style="{StaticResource PageNumButtonStyle}"
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"/>
<!-- 🔹 현재 페이지면 강조 -->
<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>
<Button Command="{Binding NextPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="ChevronRight"/>
</Button>
<Button Command="{Binding LastPageCommand}"
Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
Style="{StaticResource PageCommandButtonStyle}">
<md:PackIcon Kind="PageLast"/>
</Button>
</StackPanel>
@ -573,11 +509,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="35" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
ItemsSource="{Binding GraphTypes}"
SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
@ -589,10 +525,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="35" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
ItemsSource="{Binding XFieldCandidates}"
SelectedItem="{Binding SelectedXField}"
DisplayMemberPath="Display"/>
@ -605,9 +541,9 @@
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" Padding="0"
Foreground="White">
<Run Text="수조" FontSize="18" FontFamily="{StaticResource SCDream4}"/>
<Run Text="수조" FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}"/>
<LineBreak/>
<Run Text="(복수 선택 가능)" FontSize="14" Foreground="#767676"/>
<Run Text="(복수 선택 가능)" FontFamily="{StaticResource Pretendard_Medium}" FontSize="14" Foreground="#767676"/>
</TextBlock>
<ListBox ItemsSource="{Binding TankGroups}"
@ -617,8 +553,8 @@
helper:MultiSelectBehavior.SelectedDictionary="{Binding SelectedWaterTanks}"
helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
FontSize="18" FontWeight="Bold"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource MaterialDesignChoiceChipListBox}"
ItemContainerStyle="{StaticResource TransparentListBoxItemStyle}"
Background="Transparent">
@ -698,11 +634,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Center" Style="{StaticResource VisibleWhenLine}"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox ItemsSource="{Binding YFieldCandidates}"
SelectedItem="{Binding SelectedYField, Mode=TwoWay}"
Grid.Column="1"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
DisplayMemberPath="Display" Margin="15 0 0 0"
Height="35" Style="{StaticResource ComboBoxStyle}"/>
</Grid>
@ -716,7 +652,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="필드 종류" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Left" Margin="15 0">
<RadioButton x:Name="rbStatus"
GroupName="strpPlot" Margin="0 0 16 0"
@ -745,7 +681,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Top" Foreground="White">
<Run Text="Y축" FontSize="18" FontFamily="{StaticResource SCDream4}"/>
<Run Text="Y축" FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}"/>
<LineBreak/>
<Run Text="(복수 선택 가능)" FontSize="14" Foreground="#767676"/>
</TextBlock>
@ -756,8 +692,6 @@
SelectionMode="Extended"
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
Height="Auto" Background="White"
FontSize="14" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"
ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
@ -783,12 +717,12 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox ItemsSource="{Binding YFieldCandidates}"
SelectedItem="{Binding SelectedYField}"
DisplayMemberPath="Display" Height="35"
Grid.Column="1" Grid.ColumnSpan="3" Margin="15 0 0 0"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource ComboBoxStyle}"/>
</Grid>
@ -799,13 +733,13 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="마커 크기" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<Slider Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="15 0 0 0"
Minimum="1" Maximum="15" Value="{Binding ScatterMarkerSize}" Width="280" IsSnapToTickEnabled="True" TickFrequency="1"
Style="{StaticResource CustomSliderStyle}"/>
<TextBlock Text="{Binding ScatterMarkerSize}" Margin="15 0"
Grid.Column="2" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_Medium}" Foreground="White"/>
</Grid>
</StackPanel>
@ -818,7 +752,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="시간 범위" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<Slider Margin="15 0 0 0" Grid.Column="1"
VerticalAlignment="Center" HorizontalAlignment="Left"
Minimum="1" Maximum="24" TickFrequency="1" IsSnapToTickEnabled="True"
@ -827,7 +761,7 @@
<TextBlock Text="{Binding BoxTimeSpan}"
Margin="15 0" Grid.Column="2"
VerticalAlignment="Center" HorizontalAlignment="Right"
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_Medium}" Foreground="White"/>
</Grid>
<Grid Margin="0 0 0 10">
@ -836,12 +770,12 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="값 필드" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<ComboBox ItemsSource="{Binding YFieldCandidates}"
SelectedItem="{Binding SelectedYField}"
DisplayMemberPath="Display" Height="35"
Grid.Column="1" Margin="15 0 0 0"
FontFamily="{StaticResource SCDream3}"
FontFamily="{StaticResource Pretendard_Medium}"
Style="{StaticResource ComboBoxStyle}"/>
</Grid>
@ -852,7 +786,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="박스 너비" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_SemiBold}" Foreground="White"/>
<Slider Margin="15 0 0 0" Grid.Column="1"
VerticalAlignment="Center" HorizontalAlignment="Left"
Minimum="0.1" Maximum="1.0" TickFrequency="0.05" IsSnapToTickEnabled="True"
@ -861,7 +795,7 @@
<TextBlock Text="{Binding BoxWidth, StringFormat=F2}"
Margin="15 0" Grid.Column="2"
VerticalAlignment="Center" HorizontalAlignment="Right"
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource Pretendard_Medium}" Foreground="White"/>
</Grid>
</StackPanel>
</Grid>

7
SmartAquaViewer/ViewModel/GraphControlViewModel.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Collections.ObjectModel;
using System.Windows.Documents;
using Microsoft.VisualBasic;
using OxyPlot;
using OxyPlot.Axes;
@ -433,7 +434,6 @@ namespace SmartAquaViewer.ViewModel
if (tankIds.Count == 0) { Model.InvalidatePlot(true); return; }
// 색상/마커
var colors = OxyPalettes.Hot(tankIds.Count).Colors;
var markerCycle = new[]
{
MarkerType.Circle, MarkerType.Square, MarkerType.Triangle, MarkerType.Diamond,
@ -449,7 +449,7 @@ namespace SmartAquaViewer.ViewModel
MarkerType = markerCycle[k % markerCycle.Length],
MarkerSize = markerSize,
// 색상 자동 배정에 맡기려면 MarkerFill 설정 생략해도 OK
MarkerFill = OxyColor.FromAColor(160, colors[k]), // 약간 투명
MarkerFill = OxyColor.FromAColor(160, TankColors[k]), // 약간 투명
};
// 포인트 수집 (시간순 정렬 권장)
@ -493,7 +493,7 @@ namespace SmartAquaViewer.ViewModel
{
Title = $"Tank {tankId} 회귀",
StrokeThickness = 2,
Color = colors[k]
Color = TankColors[k]
};
reg.Points.Add(new DataPoint(minX, a * minX + b));
reg.Points.Add(new DataPoint(maxX, a * maxX + b));
@ -772,6 +772,7 @@ namespace SmartAquaViewer.ViewModel
InsideLabelPosition = 0.7,
OutsideLabelFormat = null, // 라벨은 내부만
FontSize = 14,
FontWeight = FontWeights.Bold,
InsideLabelColor = OxyColors.Black
};
if (donut)

Write Preview
Loading…
Cancel
Save