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

design: 폰트 통합 및 적용

Browse Source
prototype
HyungJune Kim 10 months ago
parent 45d20bdfe3
commit e4dc4a2784
6 changed files with 69 additions and 36 deletions
Show Stats Download Patch File Download Diff File

5
SmartAquaViewer/Resources/Generic.xaml
Unescape View File

@ -162,6 +162,7 @@
<Setter Property="Background" Value="#242424"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
</Style>
<Style x:Key="DataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Background" Value="#1F1F1F"/>
@ -170,11 +171,13 @@
<Setter Property="BorderBrush" Value="White"/>
<Setter Property="FontSize" Value="14"/>
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="Padding" Value="8"/>
<Setter Property="Padding" Value="3"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream6}"/>
</Style>
<Style x:Key="DataGridElmenetStyle" TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
</Style>
<Style x:Key="GridViewColumnHeaderStyle" TargetType="{x:Type GridViewColumnHeader}">

17
SmartAquaViewer/View/CCTVView.xaml
Unescape View File

@ -41,12 +41,14 @@
</Border>
<Grid HorizontalAlignment="Right">
<Button Tag="left" Margin="0"
Style="{StaticResource ImageButtonStyle}" Width="25" Command="{Binding ChangeDrawerStatusCommand}"
Style="{StaticResource ImageButtonStyle}"
Width="25" Command="{Binding ChangeDrawerStatusCommand}"
VerticalAlignment="Center" HorizontalAlignment="Right" Visibility="{Binding BtnVisibilityLeft}"
helper:ImageButtonHelper.ImageSource="/Resources/Images/arrow_left.png"/>
<Button Tag="right" Margin="0"
Style="{StaticResource ImageButtonStyle}" Width="25" Command="{Binding ChangeDrawerStatusCommand}"
Style="{StaticResource ImageButtonStyle}"
Width="25" Command="{Binding ChangeDrawerStatusCommand}"
VerticalAlignment="Center" HorizontalAlignment="Right" Visibility="{Binding BtnVisibilityRight}"
helper:ImageButtonHelper.ImageSource="/Resources/Images/arrow_right.png"/>
</Grid>
@ -99,7 +101,8 @@
<GridViewColumn.CellTemplate>
<DataTemplate>
<Grid>
<TextBlock Text="{Binding DeviceId}" Style="{StaticResource GridViewTextBlockStyle}"/>
<TextBlock Text="{Binding DeviceId}"
Style="{StaticResource GridViewTextBlockStyle}"/>
</Grid>
</DataTemplate>
</GridViewColumn.CellTemplate>
@ -121,17 +124,21 @@
<!--하단 버튼-->
<Grid Grid.Row="2">
<Button Padding="0" Margin="5" Content="재생" Visibility="{Binding BtnVisibilityPlay}"
<Button Padding="0" Margin="5" Content="재생"
Visibility="{Binding BtnVisibilityPlay}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Style="{StaticResource MaterialDesignFlatMidBgButton}"
FontFamily="{StaticResource SCDream5}"
Command="{Binding PlayAllCCTVCommand}">
<Button.ToolTip>
<ToolTip Content="CCTV 재생"/>
</Button.ToolTip>
</Button>
<Button Padding="0" Margin="5" Content="중지" Visibility="{Binding BtnVisibilityStop}"
<Button Padding="0" Margin="5" Content="중지"
Visibility="{Binding BtnVisibilityStop}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Style="{StaticResource MaterialDesignFlatMidBgButton}"
FontFamily="{StaticResource SCDream5}"
Command="{Binding StopAllCCTVCommand}">
<Button.ToolTip>
<ToolTip Content="CCTV 재생"/>

20
SmartAquaViewer/View/EnegyView.xaml
Unescape View File

@ -94,7 +94,7 @@
HorizontalAlignment="Stretch" ColumnWidth="*">
<DataGrid.Columns>
<DataGridTextColumn
Header="시간"
Header="시간" Width="90"
Binding="{Binding RecordedTime, StringFormat=\{0:HH:mm:ss\}}"
ElementStyle="{StaticResource DataGridElmenetStyle}"/>
@ -175,10 +175,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="40" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
ItemsSource="{Binding GraphTypes}"
SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
@ -230,10 +231,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
Margin="15 0 0 0" Grid.Column="1"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
</Grid>
<Grid Margin="0 0 0 15">
@ -242,7 +243,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Top"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Border Grid.Column="1" CornerRadius="10"
Background="White" Margin="15 0 0 15">
@ -254,6 +255,7 @@
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/>
</Border>
</Grid>
@ -266,7 +268,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="필드" VerticalAlignment="Top"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Border Grid.Column="1" CornerRadius="10"
Background="White" Margin="15 0 0 15">
@ -278,6 +280,7 @@
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/>
</Border>
</Grid>
@ -286,11 +289,13 @@
<RadioButton x:Name="rbStatus" Content="합계"
GroupName="pie" Margin="0 0 30 0"
Foreground="White" FontSize="20"
FontFamily="{StaticResource SCDream3}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}"/>
<RadioButton x:Name="pie" Content="평균"
GroupName="pie" Grid.Column="1"
Foreground="White" FontSize="20"
FontFamily="{StaticResource SCDream3}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Mode=TwoWay}"/>
</StackPanel>
@ -353,7 +358,8 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right">
<Button Content="그래프 생성" Style="{StaticResource MaterialDesignFlatLightBgButton}"
<Button Content="그래프 생성" FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFlatLightBgButton}"
FontWeight="Bold" Command="{Binding DrawGraphCommand}"/>
</StackPanel>
</Grid>

3
SmartAquaViewer/View/FileListView.xaml
Unescape View File

@ -74,7 +74,8 @@
<DataTemplate>
<StackPanel Orientation="Horizontal" Margin="0 5">
<TextBlock Text="{Binding Name}" Margin="5"
FontSize="16" FontWeight="Medium" Foreground="White"/>
FontSize="16" FontWeight="Medium" Foreground="White"
FontFamily="{StaticResource SCDream4}"/>
</StackPanel>
</DataTemplate>
</ListView.ItemTemplate>

18
SmartAquaViewer/View/GreenHouseView.xaml
Unescape View File

@ -175,10 +175,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="40" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
ItemsSource="{Binding GraphTypes}"
SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
@ -229,10 +230,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
Margin="15 0 0 0" Grid.Column="1"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
</Grid>
<Grid Margin="0 0 0 15">
@ -241,7 +242,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Top"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Border Grid.Column="1" CornerRadius="10"
Background="White" Margin="15 0 0 15">
@ -253,6 +254,7 @@
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/>
</Border>
</Grid>
@ -265,7 +267,7 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="필드" VerticalAlignment="Top"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Border Grid.Column="1" CornerRadius="10"
Background="White" Margin="15 0 0 15">
@ -277,6 +279,7 @@
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/>
</Border>
</Grid>
@ -285,11 +288,13 @@
<RadioButton x:Name="rbStatus" Content="합계"
GroupName="pie" Margin="0 0 30 0"
Foreground="White" FontSize="20"
FontFamily="{StaticResource SCDream3}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}"/>
<RadioButton x:Name="pie" Content="평균"
GroupName="pie" Grid.Column="1"
Foreground="White" FontSize="20"
FontFamily="{StaticResource SCDream3}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Mode=TwoWay}"/>
</StackPanel>
@ -350,7 +355,8 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right">
<Button Content="그래프 생성" Style="{StaticResource MaterialDesignFlatLightBgButton}"
<Button Content="그래프 생성" FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFlatLightBgButton}"
FontWeight="Bold" Command="{Binding DrawGraphCommand}"/>
</StackPanel>
</Grid>

42
SmartAquaViewer/View/MonitoringView.xaml
Unescape View File

@ -43,7 +43,7 @@
<DataGrid.Columns>
<!-- 측정 시각 -->
<DataGridTextColumn
Header="시간" Width="80"
Header="시간" Width="90"
Binding="{Binding RecordedTime, StringFormat=\{0:HH:mm:ss\}}"
ElementStyle="{StaticResource DataGridElmenetStyle}"/>
@ -372,10 +372,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="40" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
ItemsSource="{Binding GraphTypes}"
SelectedIndex="{Binding SelectedGraphIndex, Mode=TwoWay}"
helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
@ -387,9 +388,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="40" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}"
ItemsSource="{Binding XFieldCandidates}"
SelectedItem="{Binding SelectedXField}"
DisplayMemberPath="Display"/>
@ -397,7 +399,7 @@
<StackPanel Margin="15 0" Style="{StaticResource VisibleWhenTank}">
<TextBlock Text="수조 (복수 선택)" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Border CornerRadius="10" Background="White" Margin="0 5 0 10">
<ListBox ItemsSource="{Binding TankGroups}"
@ -408,6 +410,7 @@
helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/>
</Border>
</StackPanel>
@ -463,10 +466,11 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Center" Style="{StaticResource VisibleWhenLine}"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox ItemsSource="{Binding YFieldCandidates}"
SelectedItem="{Binding SelectedYField, Mode=TwoWay}"
Grid.Column="1"
FontFamily="{StaticResource SCDream3}"
DisplayMemberPath="Display" Margin="15 0 0 0"
Height="40" Style="{StaticResource ComboBoxStyle}"/>
</Grid>
@ -480,9 +484,10 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="필드 종류" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
<RadioButton x:Name="rbStatus" Content="전원/상태"
FontFamily="{StaticResource SCDream3}"
GroupName="strpPlot" Margin="0 0 30 0"
Foreground="White" FontSize="20"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
@ -490,6 +495,7 @@
Converter={StaticResource EnumEqualsConverter},
ConverterParameter={x:Static model:StepFieldKind.Status}}"/>
<RadioButton x:Name="rbValue" Content="센서 값"
FontFamily="{StaticResource SCDream3}"
GroupName="strpPlot" Grid.Column="1"
Foreground="White" FontSize="20"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
@ -501,7 +507,7 @@
<StackPanel Margin="0 5 0 0">
<TextBlock Text="Y축 (복수 선택)" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<!-- SelectedItems 바인딩을 위한 간단 Behavior는 아래 3) 참고 -->
<Border CornerRadius="10" Background="White" Margin="0 5">
<ListBox ItemsSource="{Binding YFieldCandidates}"
@ -510,6 +516,7 @@
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
Height="Auto" Background="White"
FontSize="14" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/>
</Border>
</StackPanel>
@ -523,11 +530,12 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Center" Width="80"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox ItemsSource="{Binding YFieldCandidates}"
SelectedItem="{Binding SelectedYField}"
DisplayMemberPath="Display" Height="40"
Grid.Column="1" Grid.ColumnSpan="3" Margin="15 0 0 0"
FontFamily="{StaticResource SCDream3}"
Style="{StaticResource ComboBoxStyle}"/>
</Grid>
@ -538,12 +546,12 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="마커 크기" Grid.Row="1" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Slider Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="15 0 0 0"
Minimum="1" Maximum="15" Value="{Binding ScatterMarkerSize}" Width="280" IsSnapToTickEnabled="True" TickFrequency="1"/>
<TextBlock Text="{Binding ScatterMarkerSize}" Margin="15 0"
Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
</Grid>
</StackPanel>
@ -556,7 +564,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="시간 범위" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<Slider Margin="15 0 0 0" Grid.Column="1"
VerticalAlignment="Center" HorizontalAlignment="Left"
Minimum="1" Maximum="24" TickFrequency="1" IsSnapToTickEnabled="True"
@ -564,7 +572,7 @@
<TextBlock Text="{Binding BoxTimeSpan}"
Margin="15 0" Grid.Column="2"
VerticalAlignment="Center" HorizontalAlignment="Right"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
</Grid>
<Grid>
@ -573,11 +581,12 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="값 필드" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/>
<ComboBox ItemsSource="{Binding YFieldCandidates}"
SelectedItem="{Binding SelectedYField}"
DisplayMemberPath="Display" Height="40"
Grid.Column="1" Margin="15 0 0 0"
FontFamily="{StaticResource SCDream3}"
Style="{StaticResource ComboBoxStyle}"/>
</Grid>
@ -588,7 +597,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="박스 너비" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="20" FontFamily="{StaticResource SCDream5}" 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"
@ -596,7 +605,7 @@
<TextBlock Text="{Binding BoxWidth, StringFormat=F2}"
Margin="15 0" Grid.Column="2"
VerticalAlignment="Center" HorizontalAlignment="Right"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
</Grid>
</StackPanel>
</Grid>
@ -641,7 +650,8 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right">
<Button Content="그래프 생성" Style="{StaticResource MaterialDesignFlatLightBgButton}"
<Button Content="그래프 생성" FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFlatLightBgButton}"
FontWeight="Bold" Command="{Binding DrawGraphCommand}"/>
</StackPanel>
</Grid>

Write Preview
Loading…
Cancel
Save