design: 에너지 화면 디자인 적용

prototype
HyungJune Kim 7 months ago
parent e8fd344c10
commit ad4cbf4fea

@ -59,34 +59,36 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style x:Key="RadioButtonStyle" TargetType="RadioButton"> <Style x:Key="RadioBtnContentTextBlockStyle" TargetType="TextBlock">
<Setter Property="Background" Value="#2F2F44"/> <Setter Property="FontSize" Value="16"/>
<Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
<Setter Property="Foreground" Value="#999"/>
<Style.Triggers>
<!-- 🔹 라디오버튼이 체크되었을 때 텍스트 색 변경 -->
<DataTrigger
Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=RadioButton}}"
Value="True">
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="32"/> </DataTrigger>
<Setter Property="Width" Value="300"/> </Style.Triggers>
<Setter Property="Height" Value="60"/> </Style>
<Setter Property="Template">
<Setter.Value> <Style x:Key="CheckBoxContentTextBlockStyle" TargetType="TextBlock">
<ControlTemplate TargetType="RadioButton"> <Setter Property="FontSize" Value="16"/>
<Border Background="{TemplateBinding Background}" CornerRadius="10" <Setter Property="FontFamily" Value="{StaticResource SCDream3}"/>
BorderThickness="1" BorderBrush="Black"> <Setter Property="Foreground" Value="#999"/>
<TextBlock Text="{TemplateBinding Content}" <Style.Triggers>
HorizontalAlignment="Center" VerticalAlignment="Center" <!-- 🔹 라디오버튼이 체크되었을 때 텍스트 색 변경 -->
FontSize="32" Foreground="{TemplateBinding Foreground}"/> <DataTrigger
</Border> Binding="{Binding IsChecked, RelativeSource={RelativeSource AncestorType=CheckBox}}"
<ControlTemplate.Triggers> Value="True">
<Trigger Property="IsChecked" Value="True"> <Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#C2C2E6"/> </DataTrigger>
<Setter Property="Foreground" Value="Black"/> </Style.Triggers>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style> </Style>
<Style x:Key="ImageRadioButtonStyle" TargetType="RadioButton"> <Style x:Key="ImageRadioButtonStyle" TargetType="RadioButton">
<Setter Property="Foreground" Value="Black"/> <Setter Property="Foreground" Value="#999"/>
<Setter Property="FontSize" Value="20"/> <Setter Property="FontSize" Value="20"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@ -242,8 +244,8 @@
<SolidColorBrush x:Key="LineComboArrow" Color="#C0C3C6" /> <SolidColorBrush x:Key="LineComboArrow" Color="#C0C3C6" />
<!-- 화살표 색 --> <!-- 화살표 색 -->
<SolidColorBrush x:Key="LineComboHover" Color="#1D3E55" /> <SolidColorBrush x:Key="LineComboHover" Color="#1D3E55" />
<SolidColorBrush x:Key="LineComboItemHover" Color="#20435A" /> <SolidColorBrush x:Key="LineComboItemHover" Color="#325C80" />
<SolidColorBrush x:Key="LineComboItemSelected" Color="#29506B" /> <SolidColorBrush x:Key="LineComboItemSelected" Color="#325C80" />
<Style x:Key="ComboDropToggleStyle" TargetType="ToggleButton"> <Style x:Key="ComboDropToggleStyle" TargetType="ToggleButton">
<Setter Property="Focusable" Value="False" /> <Setter Property="Focusable" Value="False" />
@ -726,4 +728,14 @@
<Setter Property="SelectionEnd" Value="{Binding Path=Value, RelativeSource={RelativeSource Self}}" /> <Setter Property="SelectionEnd" Value="{Binding Path=Value, RelativeSource={RelativeSource Self}}" />
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" /> <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
</Style> </Style>
<Style x:Key="GraphButtonStyle" TargetType="Button" BasedOn="{StaticResource MaterialDesignFlatLightBgButton}">
<Setter Property="FontFamily" Value="{StaticResource SCDream3}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
<Setter Property="Background" Value="#325C80" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Width" Value="120" />
<Setter Property="Height" Value="38" />
</Style>
</ResourceDictionary> </ResourceDictionary>

@ -18,30 +18,23 @@
<classes:CurrentPageEqualsConverter x:Key="CurrentPageEqualsConverter"/> <classes:CurrentPageEqualsConverter x:Key="CurrentPageEqualsConverter"/>
</UserControl.Resources> </UserControl.Resources>
<Border BorderBrush="#2d374c" BorderThickness="2"> <Border>
<Grid Background="Transparent"> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="160"/> <RowDefinition Height="128"/>
<RowDefinition Height="350"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="600"/>
</Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="2" Margin="15" BorderBrush="#3E4C60" BorderThickness="1" CornerRadius="10"> <Border Margin="0 0 0 16" BorderBrush="#3E4C60" BorderThickness="1" CornerRadius="4" Background="#264A60">
<Border.Background>
<ImageBrush ImageSource="/Resources/Images/top_bg.png" Stretch="Fill"/>
</Border.Background>
<UniformGrid Columns="9"> <UniformGrid Columns="9">
<Border BorderThickness="0 0 1 0" BorderBrush="#99325C80">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="총 소비 전력" HorizontalAlignment="Center" <TextBlock Text="총 소비 전력" HorizontalAlignment="Center"
FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/> FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/>
<TextBlock Text="{Binding TotalEnergy, StringFormat=\{0:F2\}}" HorizontalAlignment="Center" <TextBlock Text="{Binding TotalEnergy, StringFormat=\{0:F2\}}" HorizontalAlignment="Center"
FontSize="26" Foreground="White" FontFamily="{StaticResource SCDream4}"/> FontSize="26" Foreground="White" FontFamily="{StaticResource SCDream4}"/>
</StackPanel> </StackPanel>
</Border>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="모래여과기" HorizontalAlignment="Center" <TextBlock Text="모래여과기" HorizontalAlignment="Center"
FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/> FontSize="22" Foreground="White" FontFamily="{StaticResource SCDream5}"/>
@ -93,12 +86,22 @@
</UniformGrid> </UniformGrid>
</Border> </Border>
<md:DrawerHost Grid.Row="1" RightDrawerBackground="Transparent" IsRightDrawerOpen="True" OpenMode="Standard">
<Border BorderBrush="#1D3649" BorderThickness="0 0 2 0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="30"/>
</Grid.ColumnDefinitions>
<DataGrid ItemsSource="{Binding PagedItems}" <DataGrid ItemsSource="{Binding PagedItems}"
Style="{StaticResource DataGridStyle}" Background="Transparent" Style="{StaticResource DataGridStyle}" Background="Transparent"
RowStyle="{StaticResource DataGridRowStyle}" ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}" RowStyle="{StaticResource DataGridRowStyle}" ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}"
helper:DataGridAutoPageSizeBehavior.Enable="True" helper:DataGridAutoPageSizeBehavior.Enable="True"
Grid.Row="1" Grid.RowSpan="2" Margin="15 0" HorizontalAlignment="Stretch" Margin="0 0 16 0"
HorizontalAlignment="Stretch"
ColumnWidth="*" RowHeight="30"> ColumnWidth="*" RowHeight="30">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn <DataGridTextColumn
@ -107,7 +110,9 @@
ElementStyle="{StaticResource DataGridElmenetStyle}"/> ElementStyle="{StaticResource DataGridElmenetStyle}"/>
<DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}" <DataGridTextColumn ElementStyle="{StaticResource DataGridElmenetStyle}"
Binding="{Binding Filtering.SandFilterEnergy, StringFormat=\{0:F2\}}"> Binding="{Binding Filtering.SandFilterEnergy, StringFormat=\{0:F2\}}"
CellStyle="{StaticResource HighlightLeftBorderCellStyle}"
HeaderStyle="{StaticResource HighlightLeftBorderHeaderStyle}">
<DataGridTextColumn.Header> <DataGridTextColumn.Header>
<StackPanel> <StackPanel>
<TextBlock Text="모래" HorizontalAlignment="Center"/> <TextBlock Text="모래" HorizontalAlignment="Center"/>
@ -169,28 +174,28 @@
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<Grid Grid.Row="3" VerticalAlignment="Center"> <Grid Grid.Row="1" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Command="{Binding FirstPageCommand}" <Button Command="{Binding FirstPageCommand}"
Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0"> Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
<md:PackIcon Kind="PageFirst"/> <md:PackIcon Kind="PageFirst"/>
</Button> </Button>
<Button Command="{Binding PrevPageCommand}" <Button Command="{Binding PrevPageCommand}"
Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0"> Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
<md:PackIcon Kind="ChevronLeft"/> <md:PackIcon Kind="ChevronLeft"/>
</Button> </Button>
<ItemsControl ItemsSource="{Binding PageNumbers}"> <ItemsControl ItemsSource="{Binding PageNumbers}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" /> <StackPanel Orientation="Horizontal" Margin="32 0" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Button Margin="2" <Button Margin="6"
Padding="6,2" Padding="6,0"
Command="{Binding DataContext.GoToPageCommand, Command="{Binding DataContext.GoToPageCommand,
RelativeSource={RelativeSource AncestorType=ItemsControl}}" RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}"> CommandParameter="{Binding}">
@ -200,8 +205,9 @@
<Button.Style> <Button.Style>
<Style TargetType="Button"> <Style TargetType="Button">
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Gray" /> <Setter Property="BorderBrush" Value="#264A60" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Foreground" Value="#264A60"/>
<!-- 🔹 현재 페이지면 강조 --> <!-- 🔹 현재 페이지면 강조 -->
<Style.Triggers> <Style.Triggers>
@ -215,8 +221,9 @@
RelativeSource="{RelativeSource AncestorType=ItemsControl}" /> RelativeSource="{RelativeSource AncestorType=ItemsControl}" />
</MultiBinding> </MultiBinding>
</DataTrigger.Binding> </DataTrigger.Binding>
<Setter Property="Background" Value="#FF007ACC" /> <Setter Property="Background" Value="#325C80" />
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="BorderThickness" Value="0" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@ -227,33 +234,41 @@
</ItemsControl> </ItemsControl>
<Button Command="{Binding NextPageCommand}" <Button Command="{Binding NextPageCommand}"
Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0"> Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
<md:PackIcon Kind="ChevronRight"/> <md:PackIcon Kind="ChevronRight"/>
</Button> </Button>
<Button Command="{Binding LastPageCommand}" <Button Command="{Binding LastPageCommand}"
Style="{StaticResource MaterialDesignFlatLightBgButton}" Margin="4,0"> Style="{StaticResource PageCommandButtonStyle}" Margin="4,0">
<md:PackIcon Kind="PageLast"/> <md:PackIcon Kind="PageLast"/>
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid>
<Border Grid.Row="1" Grid.Column="1" Margin="0 0 15 15" CornerRadius="10" </Border>
Background="#384659" BorderBrush="#404F63" BorderThickness="1"> <md:DrawerHost.RightDrawerContent>
<Border x:Name="RightDrawerRoot" Width="626" CornerRadius="0 4 4 0" Background="#1D3649">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="358"/>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="50"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel> <Border Margin="16 16 16 12" CornerRadius="4"
<Grid Margin="15 15 15 15"> Background="#152935" BorderBrush="#325C80" BorderThickness="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="62"/>
</Grid.RowDefinitions>
<StackPanel Margin="24 24 24 0">
<Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="146"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="그래프" VerticalAlignment="Center" <TextBlock Text="그래프" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/> FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
<ComboBox Margin="15 0 0 0" Height="40" Grid.Column="1" <ComboBox Margin="0" Height="35" Grid.Column="1"
Style="{StaticResource ComboBoxStyle}" Style="{StaticResource ComboBoxStyle}"
FontFamily="{StaticResource SCDream3}" FontFamily="{StaticResource SCDream3}"
ItemsSource="{Binding GraphTypes}" ItemsSource="{Binding GraphTypes}"
@ -261,7 +276,7 @@
helper:ComboBoxHelper.SelectFirstOnItemsChange="True" helper:ComboBoxHelper.SelectFirstOnItemsChange="True"
IsEditable="False" IsTextSearchEnabled="False"/> IsEditable="False" IsTextSearchEnabled="False"/>
</Grid> </Grid>
<Grid Margin="15 0"> <Grid Margin="0 10 0 0">
<Grid.Resources> <Grid.Resources>
<Style TargetType="FrameworkElement"> <Style TargetType="FrameworkElement">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
@ -301,93 +316,124 @@
<StackPanel> <StackPanel>
<StackPanel Style="{StaticResource VisibleWhenLineNStackArea}"> <StackPanel Style="{StaticResource VisibleWhenLineNStackArea}">
<Grid Margin="0 0 0 20" > <Grid Margin="0 0 0 10" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="146"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="X축" VerticalAlignment="Center" <TextBlock Text="X축" VerticalAlignment="Center"
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/> FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
<TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center" <TextBlock Text="{Binding SelectedXField.Display}" VerticalAlignment="Center"
Margin="15 0 0 0" Grid.Column="1" Grid.Column="1"
FontSize="20" FontFamily="{StaticResource SCDream3}" Foreground="White"/> FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/>
</Grid> </Grid>
<Grid Margin="0 0 0 15"> <Grid Margin="0 0 0 10">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="146"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="Y축" VerticalAlignment="Top" <TextBlock VerticalAlignment="Top" Foreground="White">
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/> <Run Text="Y축" FontSize="18" FontFamily="{StaticResource SCDream4}"/>
<LineBreak/>
<Run Text="(복수 선택 가능)" FontSize="14" Foreground="#767676"/>
</TextBlock>
<Border Grid.Column="1" CornerRadius="10"
Background="White" Margin="15 0 0 15">
<ListBox ItemsSource="{Binding YFieldCandidates}" <ListBox ItemsSource="{Binding YFieldCandidates}"
DisplayMemberPath="Display" Grid.Column="1"
SelectionMode="Extended" SelectionMode="Extended"
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}" helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
helper:MultiSelectBehavior.KeyPath="Key" helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value" helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White" FontSize="14" FontWeight="Bold"
FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}" FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/> Style="{StaticResource MaterialDesignFilterChipListBox}"
</Border> ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
<DataTemplate>
<ToggleButton Content="{Binding Display}"
Focusable="False"
IsChecked="{Binding IsSelected,
RelativeSource={RelativeSource AncestorType=ListBoxItem}}"
Style="{StaticResource CircleCheckToggleButtonStyle}"
Margin="12 0"/>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid> </Grid>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource VisibleWhenPie}"> <StackPanel Style="{StaticResource VisibleWhenPie}">
<Grid Margin="0 0 0 15"> <Grid Margin="0 0 0 10">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="146"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="필드" VerticalAlignment="Top" <TextBlock Text="필드" VerticalAlignment="Top"
FontSize="20" FontFamily="{StaticResource SCDream5}" Foreground="White"/> FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
<Border Grid.Column="1" CornerRadius="10"
Background="White" Margin="15 0 0 15">
<ListBox ItemsSource="{Binding YFieldCandidates}" <ListBox ItemsSource="{Binding YFieldCandidates}"
DisplayMemberPath="Display" Grid.Column="1"
SelectionMode="Extended" SelectionMode="Extended"
helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}" helper:MultiSelectBehavior.SelectedItems="{Binding SelectedYFields, Mode=OneWay}"
helper:MultiSelectBehavior.KeyPath="Key" helper:MultiSelectBehavior.KeyPath="Key"
helper:MultiSelectBehavior.ValuePath="Value" helper:MultiSelectBehavior.ValuePath="Value"
Height="Auto" Background="White"
FontSize="16" FontWeight="Bold" FontSize="16" FontWeight="Bold"
FontFamily="{StaticResource SCDream5}" FontFamily="{StaticResource SCDream5}"
Style="{StaticResource MaterialDesignFilterChipListBox}"/> Style="{StaticResource MaterialDesignFilterChipListBox}"
</Border> ItemContainerStyle="{StaticResource ListBoxItemStyle}">
<ListBox.ItemTemplate>
<DataTemplate>
<ToggleButton Content="{Binding Display}"
Focusable="False"
IsChecked="{Binding IsSelected,
RelativeSource={RelativeSource AncestorType=ListBoxItem}}"
Style="{StaticResource CircleCheckToggleButtonStyle}"
Margin="12 0"/>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid> </Grid>
<StackPanel Orientation="Horizontal" Margin="0 0 0 15"> <Grid Margin="0 0 0 10">
<RadioButton x:Name="rbStatus" Content="합계" <Grid.ColumnDefinitions>
GroupName="pie" Margin="0 0 30 0" <ColumnDefinition Width="146"/>
Foreground="White" FontSize="20" <ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="집계 방식" VerticalAlignment="Top"
FontSize="18" FontFamily="{StaticResource SCDream4}" 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 SCDream3}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}" Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}"/> IsChecked="{Binding UseAverage, Converter={StaticResource InverseBoolConverter}, Mode=TwoWay}">
<RadioButton x:Name="pie" Content="평균" <TextBlock Text="합계" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
GroupName="pie" Grid.Column="1" </RadioButton>
Foreground="White" FontSize="20" <RadioButton x:Name="pie"
GroupName="pie"
Foreground="#325C80"
FontFamily="{StaticResource SCDream3}" FontFamily="{StaticResource SCDream3}"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}" Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding UseAverage, Mode=TwoWay}"/> IsChecked="{Binding UseAverage, Mode=TwoWay}">
</StackPanel> <TextBlock Text="평균" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
</RadioButton>
</StackPanel> </StackPanel>
</Grid>
</StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="15 0 0 0" Grid.Row="1"> <StackPanel Orientation="Horizontal" Margin="24 0 0 0" Grid.Row="1">
<CheckBox Content="마커 표시" IsChecked="{Binding ShowMarkers}" Margin="0 0 15 0" <CheckBox IsChecked="{Binding ShowMarkers}" Margin="0 0 12 0"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White" Foreground="#264A60"
VerticalContentAlignment="Center"> VerticalContentAlignment="Center">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"> <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE"> <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
@ -399,12 +445,13 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</CheckBox.Style> </CheckBox.Style>
<TextBlock Text="마커" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
</CheckBox> </CheckBox>
<CheckBox Content="범례 표시" IsChecked="{Binding ShowLegends}" Margin="0 0 15 0" <CheckBox IsChecked="{Binding ShowLegends}" Margin="0 0 12 0"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White" Foreground="#264A60"
VerticalContentAlignment="Center"> VerticalContentAlignment="Center">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"> <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE"> <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
@ -416,12 +463,13 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</CheckBox.Style> </CheckBox.Style>
<TextBlock Text="범례" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
</CheckBox> </CheckBox>
<CheckBox Content="도넛 모드" IsChecked="{Binding IsDonut}" Margin="0 0 15 0" <CheckBox IsChecked="{Binding IsDonut}" Margin="0 0 12 0"
FontSize="20" FontFamily="{StaticResource SCDream4}" Foreground="White" Foreground="#264A60"
VerticalContentAlignment="Center"> VerticalContentAlignment="Center">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"> <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="PIE"> <DataTrigger Binding="{Binding SelectedGraphType}" Value="PIE">
@ -430,23 +478,32 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</CheckBox.Style> </CheckBox.Style>
<TextBlock Text="도넛모드" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
</CheckBox> </CheckBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" Margin="15 0" Grid.Row="1" HorizontalAlignment="Right">
<Button Content="그래프 생성" FontFamily="{StaticResource SCDream5}" <Button Content="그래프 생성"
Style="{StaticResource MaterialDesignFlatLightBgButton}" Style="{StaticResource GraphButtonStyle}"
FontWeight="Bold" Command="{Binding DrawGraphCommand}"/> Command="{Binding DrawGraphCommand}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
<Border Grid.Row="2" Grid.Column="1" Grid.RowSpan="2" Margin="0 0 15 15" CornerRadius="10" <Border Grid.Row="2" Grid.Column="1" Grid.RowSpan="2" Margin="16 0 16 16" CornerRadius="4"
Background="#384659" BorderBrush="#404F63" BorderThickness="1"> Background="#152935" BorderBrush="#325C80" BorderThickness="1">
<control:GraphControl x:Name="graphControl" <control:GraphControl
x:Name="graphControl"
Margin="10" DataContext="{Binding GraphControlVM}" Margin="10" DataContext="{Binding GraphControlVM}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/> HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
</Border> </Border>
</Grid>
</Border>
</md:DrawerHost.RightDrawerContent>
</md:DrawerHost>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>

@ -541,10 +541,10 @@
</Grid> </Grid>
</Border> </Border>
<md:DrawerHost.BottomDrawerContent> <md:DrawerHost.BottomDrawerContent>
<Border x:Name="BottomDrawerRoot" Height="400" CornerRadius="0 4 4 4" Background="#1D3649"> <Border x:Name="BottomDrawerRoot" Height="400" CornerRadius="0 0 4 4" Background="#1D3649">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="550"/> <ColumnDefinition Width="520"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Margin="16 16 12 16" CornerRadius="5" <Border Margin="16 16 12 16" CornerRadius="5"
@ -718,22 +718,24 @@
<TextBlock Text="필드 종류" VerticalAlignment="Center" <TextBlock Text="필드 종류" VerticalAlignment="Center"
FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/> FontSize="18" FontFamily="{StaticResource SCDream4}" Foreground="White"/>
<StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Left" Margin="15 0"> <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Left" Margin="15 0">
<RadioButton x:Name="rbStatus" Content="전원/상태" <RadioButton x:Name="rbStatus"
FontFamily="{StaticResource SCDream3}" GroupName="strpPlot" Margin="0 0 16 0"
GroupName="strpPlot" Margin="0 0 30 0" Foreground="#325C80"
Foreground="White" FontSize="16"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}" Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding SelectedKind, Mode=TwoWay, IsChecked="{Binding SelectedKind, Mode=TwoWay,
Converter={StaticResource EnumEqualsConverter}, Converter={StaticResource EnumEqualsConverter},
ConverterParameter={x:Static model:StepFieldKind.Status}}"/> ConverterParameter={x:Static model:StepFieldKind.Status}}">
<RadioButton x:Name="rbValue" Content="센서 값" <TextBlock Text="전원/상태" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
FontFamily="{StaticResource SCDream3}" </RadioButton>
GroupName="strpPlot" Grid.Column="1" <RadioButton x:Name="rbValue"
Foreground="White" FontSize="16" GroupName="strpPlot"
Foreground="#325C80"
Style="{StaticResource MaterialDesignUserForegroundRadioButton}" Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
IsChecked="{Binding SelectedKind, Mode=TwoWay, IsChecked="{Binding SelectedKind, Mode=TwoWay,
Converter={StaticResource EnumEqualsConverter}, Converter={StaticResource EnumEqualsConverter},
ConverterParameter={x:Static model:StepFieldKind.Sensor}}"/> ConverterParameter={x:Static model:StepFieldKind.Sensor}}">
<TextBlock Text="센서 값" Style="{StaticResource RadioBtnContentTextBlockStyle}"/>
</RadioButton>
</StackPanel> </StackPanel>
</Grid> </Grid>
@ -870,7 +872,7 @@
Foreground="#264A60" Foreground="#264A60"
Margin="0 0 4 0" VerticalContentAlignment="Center"> Margin="0 0 4 0" VerticalContentAlignment="Center">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"> <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
<Setter Property="Visibility" Value="Visible"/> <Setter Property="Visibility" Value="Visible"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding SelectedTab}" Value="Filter"> <DataTrigger Binding="{Binding SelectedTab}" Value="Filter">
@ -882,30 +884,14 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</CheckBox.Style> </CheckBox.Style>
<TextBlock Text="범례" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
</CheckBox> </CheckBox>
<TextBlock Text="범례" VerticalAlignment="Center" Margin="0 0 12 0"
FontSize="16" FontFamily="{StaticResource SCDream3}"
Foreground="#999999">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Visibility" Value="Visible"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelectedTab}" Value="Filter">
<Setter Property="Visibility" Value="Collapsed"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelectedTab}" Value="Sterilizer">
<Setter Property="Visibility" Value="Collapsed"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<CheckBox IsChecked="{Binding ShowMarkers}" <CheckBox IsChecked="{Binding ShowMarkers}"
Foreground="#264A60" Foreground="#264A60"
Margin="0 0 4 0" VerticalContentAlignment="Center"> Margin="0 0 4 0" VerticalContentAlignment="Center">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"> <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE"> <DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
@ -917,30 +903,14 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</CheckBox.Style> </CheckBox.Style>
<TextBlock Text="마커" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
</CheckBox> </CheckBox>
<TextBlock Text="마커" VerticalAlignment="Center" Margin="0 0 12 0"
FontSize="16" FontFamily="{StaticResource SCDream3}"
Foreground="#999999">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="LINE">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="STEP">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<CheckBox IsChecked="{Binding ShowRegression}" <CheckBox IsChecked="{Binding ShowRegression}"
Foreground="#264A60" Foreground="#264A60"
Margin="0 0 4 0" VerticalContentAlignment="Center"> Margin="0 0 4 0" VerticalContentAlignment="Center">
<CheckBox.Style> <CheckBox.Style>
<Style TargetType="CheckBox" BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"> <Style TargetType="CheckBox" BasedOn="{StaticResource SquareCheckToggleButtonStyle}">
<Setter Property="Visibility" Value="Collapsed"/> <Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="SCATTER"> <DataTrigger Binding="{Binding SelectedGraphType}" Value="SCATTER">
@ -949,29 +919,12 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</CheckBox.Style> </CheckBox.Style>
<TextBlock Text="회귀선" Style="{StaticResource CheckBoxContentTextBlockStyle}"/>
</CheckBox> </CheckBox>
<TextBlock Text="회귀선" VerticalAlignment="Center" Margin="0 0 12 0"
FontSize="16" FontFamily="{StaticResource SCDream3}"
Foreground="#999999">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding SelectedGraphType}" Value="SCATTER">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel> </StackPanel>
<Button Content="그래프 생성" Grid.Row="1" HorizontalAlignment="Right" <Button Content="그래프 생성" Grid.Row="1" HorizontalAlignment="Right"
FontFamily="{StaticResource SCDream3}" Style="{StaticResource GraphButtonStyle}"
Foreground="White" FontSize="16"
Background="#325C80" BorderBrush="Transparent"
Style="{StaticResource MaterialDesignFlatLightBgButton}"
Width="120" Height="38"
Margin="0 0 24 24" Padding="20 0" Margin="0 0 24 24" Padding="20 0"
Command="{Binding DrawGraphCommand}"/> Command="{Binding DrawGraphCommand}"/>
</Grid> </Grid>

Loading…
Cancel
Save