Skip to content

H
hemei
Commit f900d651 authored by 冯伟球's avatar 冯伟球
Browse files
Options

更改界面控件颜色配色和布局

parent 6effbe49
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 72 deletions
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/App.xaml
View file @ f900d651
......@@ -6,7 +6,9 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_AirRingShift.xaml
View file @ f900d651
......@@ -78,26 +78,26 @@
<Button Content="搜索最大相关度" Click="AutoSearch_Shift" x:Name="searchBtn"
HorizontalAlignment="Center"
IsEnabled="{Binding SearchEnabled}"
Opacity="0.8"/>
Opacity="0.8" Style="{DynamicResource AccentedSquareButtonStyle}"/>
</Grid>
<WrapPanel Orientation="Horizontal" DockPanel.Dock="Top">
<Button Content="自动计算" Click="AutoCal_Shift"/>
<Button Content="自动计算" Click="AutoCal_Shift" Style="{DynamicResource AccentedSquareButtonStyle}"/>
<TextBlock Text="偏转数：" Margin="5,0,0,0" Style="{StaticResource tb_style}"/>
<TextBlock Text="{Binding AirRingShift}" Style="{StaticResource tb_style}"/>
<TextBlock Text="相关度：" Margin="5,0,0,0" Style="{StaticResource tb_style}"/>
<TextBlock Text="{Binding TandH_Corel, StringFormat={}{0:f3}}" Style="{StaticResource tb_style}"/>
<Button Content="手动前" Margin="3,0,0,0" Click="AirRingShift_Add"/>
<Button Content="手动后" Margin="3,0,0,0" Click="AirRingShift_Sub"/>
<Button Content="复位偏转数" Margin="3,0,0,0" Click="AirRingShift_Reset"/>
<Button Content="手动前" Margin="3,0,0,0" Click="AirRingShift_Add" Style="{DynamicResource AccentedSquareButtonStyle}"/>
<Button Content="手动后" Margin="3,0,0,0" Click="AirRingShift_Sub" Style="{DynamicResource AccentedSquareButtonStyle}"/>
<Button Content="复位偏转数" Margin="3,0,0,0" Click="AirRingShift_Reset" Style="{DynamicResource AccentedSquareButtonStyle}"/>
</WrapPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0" DockPanel.Dock="Top">
<TextBlock Text="旋转角度：" Style="{StaticResource tb_style}"/>
<TextBlock Text="{Binding RotAngle,StringFormat={}{0:f1}}" Style="{StaticResource tb_style}"/>
<Button Content="增加" Margin="3,0,0,0" Click="Angle_Add"/>
<Button Content="减少" Margin="3,0,0,0" Click="Angle_Sub"/>
<Button Content="搜索旋转角度" Margin="3,0,0,0" Click="Search_Angle"/>
<Button Content="增加" Margin="3,0,0,0" Click="Angle_Add" Style="{DynamicResource AccentedSquareButtonStyle}"/>
<Button Content="减少" Margin="3,0,0,0" Click="Angle_Sub" Style="{DynamicResource AccentedSquareButtonStyle}"/>
<Button Content="搜索旋转角度" Margin="3,0,0,0" Click="Search_Angle" Style="{DynamicResource AccentedSquareButtonStyle}"/>
</StackPanel>
<Button Content="应用" DockPanel.Dock="Bottom"/>
<Button Content="应用" DockPanel.Dock="Bottom" Style="{DynamicResource AccentedSquareButtonStyle}"/>
</DockPanel>
</Grid>
</Grid>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FrameDiff.xaml
View file @ f900d651
......@@ -7,6 +7,14 @@
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
......@@ -30,8 +38,8 @@
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
<StackPanel Orientation="Horizontal" Grid.Row="1">
<TextBlock Text="{Binding FrameIdx1, StringFormat=第一幅号：{0}}"/>
<TextBlock Text="{Binding FrameIdx2, StringFormat=第二幅号：{0}}" Margin="3,0,0,0"/>
<TextBlock Text="{Binding FrameIdx1, StringFormat=第一幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBlock Text="{Binding FrameIdx2, StringFormat=第二幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</Grid>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FramePicker.xaml
View file @ f900d651
<UserControl x:Class="FLY.HeatingHelper.UI.UIModule.UC_FramePicker"
<UserControl
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......@@ -6,30 +6,37 @@
xmlns:local="clr-namespace:FLY.HeatingHelper.UI.UIModule"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4.5.2"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" x:Class="FLY.HeatingHelper.UI.UIModule.UC_FramePicker"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="600">
<UserControl.Resources>
<Style TargetType="{x:Type Button}">
<Setter Property="FontSize" Value="12"/>
</Style>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14"/>
<Setter Property="Margin" Value="0,0,5,0"/>
<Setter Property="Background">
<Setter.Value>
<SolidColorBrush Color="#4C000F14" Opacity="0.7"/>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="{x:Type c1c:C1Chart}">
<Setter Property="Foreground" Value="#FFF0F8FE" />
<Setter Property="Background" Value="#4C000F14" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="0 10" />
<Setter Property="FontSize" Value="12"/>
</Style>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--<Style TargetType="{x:Type Button}">
<Setter Property="FontSize" Value="12"/>
</Style>
<Style TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14"/>
<Setter Property="Margin" Value="0,0,5,0"/>
<Setter Property="Background">
<Setter.Value>
<SolidColorBrush Color="#4C000F14" Opacity="0.7"/>
</Setter.Value>
</Setter>
</Style>-->
<Style TargetType="{x:Type c1c:C1Chart}">
<Setter Property="Foreground" Value="#FFF0F8FE" />
<Setter Property="Background" Value="#4C000F14" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="0 10" />
<Setter Property="FontSize" Value="12"/>
</Style>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
......@@ -37,7 +44,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Border Grid.Row="0">
<c1c:C1Chart x:Name="myChart" ChartType="Line" Margin="5,0,0,0">
<c1c:C1Chart x:Name="myChart" ChartType="Line">
<c1c:C1Chart.Data>
<c1c:ChartData>
<c1c:DataSeries Values="{Binding DS_thick}" AxisY="ay0" Label="厚度"/>
......@@ -49,20 +56,41 @@
<c1c:ChartView.AxisY>
<c1c:Axis Visible="False"/>
</c1c:ChartView.AxisY>
<c1c:Axis Name="ay0" AxisType="Y" Title="厚度" Position="Near"/>
<c1c:Axis Name="ay1" AxisType="Y" Title="加热率" Position="Far"/>
<c1c:Axis x:Name="ay0" AxisType="Y" Title="厚度" Position="Near"/>
<c1c:Axis x:Name="ay1" AxisType="Y" Title="加热率" Position="Far"/>
</c1c:ChartView>
</c1c:C1Chart.View>
<c1c:Legend Position="Right" />
</c1c:C1Chart>
</Border>
<StackPanel Orientation="Horizontal" Grid.Row="1">
<TextBlock Text="{Binding FrameID,StringFormat=ID:{0}, Mode=OneWay}" Margin="0,0,5,0"/>
<TextBlock Text="{Binding FrameTime,StringFormat={}{0:MM/dd HH:mm:ss}, Mode=OneWay}" Margin="0,0,5,0"/>
<TextBlock Text="{Binding ResetBolt, StringFormat=复位分区：{0}}" Margin="0,0,5,0"/>
<TextBlock Text="{Binding RotAngle, StringFormat=旋转角度：{0:f1}}" Margin="0,0,5,0"/>
<TextBlock>
<TextBlock.Text>
<DockPanel Grid.Row="1">
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
<Button Content="前一幅" Command="{Binding PreCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="18" Margin="3,0,3,0" />
<Button Content="后一幅" Command="{Binding NxtCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="18" Margin="3,0,3,0" />
</StackPanel>
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
<TextBlock Text="{Binding FrameID, Mode=OneWay, StringFormat=ID:\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="5"/>
<TextBlock Text="{Binding FrameTime, Mode=OneWay, StringFormat=\{0:MM/dd HH:mm:ss\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5"/>
<TextBlock Text="{Binding ResetBolt, StringFormat=复位分区：\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5"/>
<TextBlock Text="{Binding RotAngle, StringFormat=旋转角度：\{0:f1\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5">
<TextBlock.Text >
<MultiBinding StringFormat="{}{0}/({1})-({2})">
<Binding Path="SelectedFrame" />
<Binding Path="MinFrame"/>
<Binding Path="MaxFrame"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</StackPanel>
</DockPanel>
<!--<StackPanel Orientation="Horizontal" >
<TextBlock Text="{Binding FrameID, Mode=OneWay, StringFormat=ID:\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18"/>
<TextBlock Text="{Binding FrameTime, Mode=OneWay, StringFormat=\{0:MM/dd HH:mm:ss\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18"/>
<TextBlock Text="{Binding ResetBolt, StringFormat=复位分区：\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18"/>
<TextBlock Text="{Binding RotAngle, StringFormat=旋转角度：\{0:f1\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18">
<TextBlock.Text >
<MultiBinding StringFormat="{}{0}/({1})-({2})">
<Binding Path="SelectedFrame" />
<Binding Path="MinFrame"/>
......@@ -70,11 +98,8 @@
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<!--<TextBlock Text="{Binding SelectedFrame}"/>
<TextBlock Text="{Binding MinFrame,StringFormat=/(\{0\})-}"/>
<TextBlock Text="{Binding MaxFrame,StringFormat=(\{0\})}"/>-->
<Button Content="前一幅" Margin="3" Command="{Binding PreCmd}"/>
<Button Content="后一幅" Margin="3" Command="{Binding NxtCmd}"/>
</StackPanel>
<Button Content="前一幅" Command="{Binding PreCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="18" Margin="3,0,3,0" />
<Button Content="后一幅" Command="{Binding NxtCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="18" Margin="3,0,3,0" />
</StackPanel>-->
</Grid>
</UserControl>
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_HeatBoltAnalyst.xaml
View file @ f900d651
......@@ -4,8 +4,18 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FLY.HeatingHelper.UI.UIModule"
xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="2*"/>
......@@ -13,26 +23,27 @@
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0" Name="SP_0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="最大幅间隔" Background="LightBlue"/>
<TextBox Text="{Binding MaxFrameInterval}"/>
<TextBlock Text="最大幅间隔" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
<TextBox Text="{Binding MaxFrameInterval}" Style="{StaticResource TextBoxStyle1}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="总加热变化量" Background="LightBlue"/>
<TextBox Text="{Binding HeatRateVar}"/>
<TextBlock Text="总加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBox Text="{Binding HeatRateVar}" Style="{StaticResource TextBoxStyle1}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="忽略加热变化量" Background="LightBlue"/>
<TextBox Text="{Binding NeglectHeatRate}"/>
<TextBlock Text="忽略加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBox Text="{Binding NeglectHeatRate}" Style="{StaticResource TextBoxStyle1}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="分离螺丝数" Background="LightBlue"/>
<TextBox Text="{Binding Separation}"/>
<TextBlock Text="分离螺丝数" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBox Text="{Binding Separation}" Style="{StaticResource TextBoxStyle1}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Path=HeatBoltItems.Count, StringFormat=搜索结果：{0}}" Background="LightCyan" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25"/>
<CheckBox Content="过滤" IsChecked="{Binding IsFilter}"/>
<Button Content="搜索" Click="Button_Click"
Style="{DynamicResource AccentedSquareButtonStyle}" />
</StackPanel>
<Button Content="搜索" Click="Button_Click"/>
<DockPanel Width="{Binding Path=ActualWidth,ElementName=SP_0}">
<TextBlock DockPanel.Dock="Left" Text="{Binding Path=HeatBoltItems.Count, StringFormat=搜索结果：{0}}" Background="LightCyan"/>
<CheckBox Content="过滤" DockPanel.Dock="Right" IsChecked="{Binding IsFilter}"/>
</DockPanel>
<ListView x:Name="lv_result" ItemsSource="{Binding HeatBoltItems}"
MaxHeight="250" SelectionChanged="Lv_result_SelectionChanged"
SelectedIndex="{Binding SelectItem}">
......@@ -62,9 +73,9 @@
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<local:UC_FramePicker Grid.Row="0" DataContext="{Binding vm1}"/>
<local:UC_FramePicker Grid.Row="1" DataContext="{Binding vm2}"/>
<local:UC_FrameDiff Grid.Row="2" DataContext="{Binding vmDiff}"/>
<local:UC_FramePicker Grid.Row="0" DataContext="{Binding vm1}" Margin="5"/>
<local:UC_FramePicker Grid.Row="1" DataContext="{Binding vm2}" Margin="5"/>
<local:UC_FrameDiff Grid.Row="2" DataContext="{Binding vmDiff}" Margin="5"/>
</Grid>
</Grid>
</UserControl>
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/UC_SelectData.xaml
View file @ f900d651
......@@ -76,10 +76,10 @@
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="0,0,5,0">
<CheckBox Content="过滤加热重复项" Margin="0,5,0,5" IsChecked="{Binding Path=Dat.IsDataFilter}"/>
<Button Content="缺省数据范围"
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
Style="{DynamicResource AccentedSquareButtonStyle}"
Command="{Binding DefaultLoadDataRange}"/>
<Button Content="加载数据"
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
Style="{DynamicResource AccentedSquareButtonStyle}"
Command="{Binding ReloadData}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="3" Margin="0,0,5,0">
......@@ -107,17 +107,18 @@
</Controls:RangeSlider>
</StackPanel>
<Button Content="前一项" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
<Button Content="前一项" Style="{DynamicResource AccentedSquareButtonStyle}"
Grid.Column="1" MinWidth="80" Margin="0,0,5,0"
Command="{Binding PreData}"/>
<Button Content="后一项" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
<Button Content="后一项" Style="{DynamicResource AccentedSquareButtonStyle}"
Grid.Column="2" MinWidth="80" Margin="0,0,5,0"
Command="{Binding NextData}"/>
<Button Content="缺省项" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
<Button Content="缺省项" Style="{DynamicResource AccentedSquareButtonStyle}"
Grid.Column="3" MinWidth="80"
Command="{Binding DefaultAnalystData}"/>
<Button Content="test" Click="Button_Click" Grid.Column="4"
Command="{Binding Test}"/>
Command="{Binding Test}"
Style="{DynamicResource AccentedSquareButtonStyle}"/>
</Grid>
<Border Grid.Row="2" Margin="2,5,2,2">
<c1c:C1Chart ChartType="Line" Margin="5,0,0,0">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment