Skip to content

H
hemei
Commit 5f334fa5 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

和美安装包_v6.21.3 -20210105 

1. 修复 收卷设置速度，弹出异常。原因Mahapp的资源名称还没改完
parent e3cb4649
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 89 deletions
Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/IbcCtrlGraph/IBCCtrlGraph.xaml
View file @ 5f334fa5
...@@ -20,33 +20,33 @@ ...@@ -20,33 +20,33 @@
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<Grid x:Name="gridVm"/> <Grid x:Name="gridVm"/>
<Border Margin="{StaticResource ControlMargin}" CornerRadius="5" Background="{StaticResource WhiteBrush}"> <Border Margin="{StaticResource ControlMargin}" CornerRadius="5" Background="{StaticResource MahApps.Brushes.ThemeBackground}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Margin="25, 10"> <StackPanel Orientation="Horizontal" Margin="25, 10">
<Button Style="{StaticResource ButtonStyle_icon}" Command="{Binding InfoSetCmd}" Foreground="{StaticResource AccentBaseColorBrush}"> <Button Style="{StaticResource ButtonStyle_icon}" Command="{Binding InfoSetCmd}" Foreground="{StaticResource MahApps.Brushes.AccentBase}">
<Grid> <Grid>
<Ellipse Width="30" Height="30" Fill="{StaticResource WhiteBrush}"/> <Ellipse Width="30" Height="30" Fill="{StaticResource MahApps.Brushes.ThemeBackground}"/>
<iconPacks:PackIconMaterial Kind="Information"/> <iconPacks:PackIconMaterial Kind="Information"/>
</Grid> </Grid>
</Button> </Button>
<StackPanel Margin="10, 0"> <StackPanel Margin="10, 0">
<TextBlock FontSize="22" Foreground="{StaticResource LabelTextBrush}" Text="IBC控制过程"/> <TextBlock FontSize="22" Foreground="{StaticResource MahApps.Brushes.Text}" Text="IBC控制过程"/>
<TextBlock FontSize="14" Foreground="{StaticResource GrayBrush1}"> <TextBlock FontSize="14" Foreground="{StaticResource MahApps.Brushes.Gray1}">
<Run Text="{Binding BeginTime,StringFormat={}{0:HH:mm:ss}}"/><Run Text="-"/><Run Text="{Binding EndTime,StringFormat={}{0:HH:mm:ss}}"/> <Run Text="{Binding BeginTime,StringFormat={}{0:HH:mm:ss}}"/><Run Text="-"/><Run Text="{Binding EndTime,StringFormat={}{0:HH:mm:ss}}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}" DataContext="{Binding DbWidthWindow}"> <StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}" DataContext="{Binding DbWidthWindow}">
<Button Command="{Binding DataContext.PreCmd,ElementName=gridVm}" Foreground="{StaticResource AccentBaseColorBrush}"> <Button Command="{Binding DataContext.PreCmd,ElementName=gridVm}" Foreground="{StaticResource MahApps.Brushes.AccentBase}">
<Button.Style> <Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_smallIcon}"> <Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_smallIcon}">
<Style.Triggers> <Style.Triggers>
<!--已经是第1页--> <!--已经是第1页-->
<DataTrigger Binding="{Binding IsFirstPage}" Value="True"> <DataTrigger Binding="{Binding IsFirstPage}" Value="True">
<Setter Property="Foreground" Value="{StaticResource GrayBrush3}"/> <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray3}"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
...@@ -62,13 +62,13 @@ ...@@ -62,13 +62,13 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding TotalPages}" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding TotalPages}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="页" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="页" />
</StackPanel> </StackPanel>
<Button Foreground="{StaticResource AccentBaseColorBrush}" Command="{Binding DataContext.NextCmd,ElementName=gridVm}"> <Button Foreground="{StaticResource MahApps.Brushes.AccentBase}" Command="{Binding DataContext.NextCmd,ElementName=gridVm}">
<Button.Style> <Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_smallIcon}"> <Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_smallIcon}">
<Style.Triggers> <Style.Triggers>
<!--已经是最后页--> <!--已经是最后页-->
<DataTrigger Binding="{Binding IsLastPage}" Value="True"> <DataTrigger Binding="{Binding IsLastPage}" Value="True">
<Setter Property="Foreground" Value="{StaticResource GrayBrush3}"/> <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray3}"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
<iconPacks:PackIconMaterial Kind="ArrowRight" /> <iconPacks:PackIconMaterial Kind="ArrowRight" />
</Button> </Button>
<Button Foreground="{StaticResource AccentBaseColorBrush}" Command="{Binding DataContext.NextestCmd,ElementName=gridVm}" > <Button Foreground="{StaticResource MahApps.Brushes.AccentBase}" Command="{Binding DataContext.NextestCmd,ElementName=gridVm}" >
<Button.Style> <Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_smallIcon}"> <Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_smallIcon}">
<Style.Triggers> <Style.Triggers>
<!--已经是最新--> <!--已经是最新-->
<DataTrigger Binding="{Binding IsKeepNewest}" Value="True"> <DataTrigger Binding="{Binding IsKeepNewest}" Value="True">
<Setter Property="Foreground" Value="{StaticResource GrayBrush3}"/> <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray3}"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Grid.Style> </Grid.Style>
<Ellipse Fill="{StaticResource ValidationSummaryColor1}" /> <Ellipse Fill="{StaticResource MahApps.Brushes.ValidationSummary1}" />
<TextBlock FontSize="10" Text="{Binding AutoKeepNewestTimeRemaining}" DataContext="{Binding ElementName=gridVm,Path=DataContext}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource ValidationTextBrush}"/> <TextBlock FontSize="10" Text="{Binding AutoKeepNewestTimeRemaining}" DataContext="{Binding ElementName=gridVm,Path=DataContext}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource MahApps.Brushes.Text.Validation}"/>
</Grid> </Grid>
</Grid> </Grid>
</Button> </Button>
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
<Style x:Key="CleanSeparator" TargetType="lvc:Separator"> <Style x:Key="CleanSeparator" TargetType="lvc:Separator">
<Setter Property="IsEnabled" Value="False"></Setter> <Setter Property="IsEnabled" Value="False"></Setter>
</Style> </Style>
<SolidColorBrush x:Key="DBrush" Color="{StaticResource Gray1}"/> <SolidColorBrush x:Key="DBrush" Color="{StaticResource MahApps.Colors.Gray1}"/>
<SolidColorBrush x:Key="FilmWidthBrush" Color="{StaticResource AccentBaseColor}"/> <SolidColorBrush x:Key="FilmWidthBrush" Color="{StaticResource MahApps.Colors.AccentBase}"/>
<sys:Double x:Key="AxisFontSize">14</sys:Double> <sys:Double x:Key="AxisFontSize">14</sys:Double>
</lvc:CartesianChart.Resources> </lvc:CartesianChart.Resources>
<lvc:CartesianChart.Series> <lvc:CartesianChart.Series>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</lvc:CartesianChart.Series> </lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis IsEnabled="True" ShowLabels="True" Foreground="{StaticResource BlackBrush}" FontSize="{StaticResource AxisFontSize}" > <lvc:Axis IsEnabled="True" ShowLabels="True" Foreground="{StaticResource MahApps.Brushes.Text}" FontSize="{StaticResource AxisFontSize}" >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Style="{StaticResource CleanSeparator}"></lvc:Separator> <lvc:Separator Style="{StaticResource CleanSeparator}"></lvc:Separator>
</lvc:Axis.Separator> </lvc:Axis.Separator>
...@@ -139,10 +139,10 @@ ...@@ -139,10 +139,10 @@
</lvc:Axis> </lvc:Axis>
<lvc:Axis Foreground="{StaticResource FilmWidthBrush}" Title="折径显示 (mm)" FontSize="{StaticResource AxisFontSize}" > <lvc:Axis Foreground="{StaticResource FilmWidthBrush}" Title="折径显示 (mm)" FontSize="{StaticResource AxisFontSize}" >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator StrokeThickness="1" Stroke="{StaticResource AccentColorBrush2}" StrokeDashArray="8" /> <lvc:Separator StrokeThickness="1" Stroke="{StaticResource MahApps.Brushes.Accent2}" StrokeDashArray="8" />
</lvc:Axis.Separator> </lvc:Axis.Separator>
<lvc:Axis.Sections> <lvc:Axis.Sections>
<lvc:AxisSection Value="{Binding FilmWidthAxisYTarget}" StrokeThickness="3" Stroke="{StaticResource Color_theme_highlight}" Label="折径设置值"/> <lvc:AxisSection Value="{Binding FilmWidthAxisYTarget}" StrokeThickness="3" Stroke="{StaticResource MahApps.Brushes.Highlight}" Label="折径设置值"/>
</lvc:Axis.Sections> </lvc:Axis.Sections>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisY> </lvc:CartesianChart.AxisY>
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UIModule/IbcCtrlGraph/WdGraphSet.xaml
View file @ 5f334fa5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
xmlns:local="clr-namespace:FLY.Integrated.UI.Client.UiModule" xmlns:local="clr-namespace:FLY.Integrated.UI.Client.UiModule"
mc:Ignorable="d" mc:Ignorable="d"
Title="Window_GraphSet" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" Background="{StaticResource WhiteBrush}" Title="Window_GraphSet" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" Background="{StaticResource MahApps.Brushes.ThemeBackground}"
d:DataContext="{d:DesignInstance local:IbcCtrlGraphParams}"> d:DataContext="{d:DesignInstance local:IbcCtrlGraphParams}">
<flyctrllib:WindowBigClose.Resources> <flyctrllib:WindowBigClose.Resources>
<ResourceDictionary> <ResourceDictionary>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</flyctrllib:WindowBigClose.Resources> </flyctrllib:WindowBigClose.Resources>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<StackPanel Orientation="Horizontal" Margin="10"> <StackPanel Orientation="Horizontal" Margin="10">
<TextBlock FontSize="30" Foreground="{StaticResource TextBrush}" Text="IBC控制过程" /> <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Text}" Text="IBC控制过程" />
</StackPanel> </StackPanel>
<StackPanel > <StackPanel >
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UiModule/RotaryPanel/RotaryPanel.xaml
View file @ 5f334fa5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Border Grid.Row="1" Margin="{StaticResource ControlMargin}" CornerRadius="5" Background="{StaticResource WhiteBrush}" > <Border Grid.Row="1" Margin="{StaticResource ControlMargin}" CornerRadius="5" Background="{StaticResource MahApps.Brushes.ThemeBackground}" >
<Grid > <Grid >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel > <StackPanel >
<TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/> <TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource MahApps.Brushes.Text}"/>
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right"> <Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding RotaryFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/> <TextBlock Text="{Binding RotaryFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource MahApps.Brushes.Text}"/>
</Viewbox> </Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" /> <TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel> </StackPanel>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<Button Style="{StaticResource ButtonStyle_empty}" Click="btnFreqClick"> <Button Style="{StaticResource ButtonStyle_empty}" Click="btnFreqClick">
<StackPanel Orientation="Horizontal" Margin="20,0,0,0"> <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}" HorizontalAlignment="Right"> <Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}" HorizontalAlignment="Right">
<TextBlock Text="{Binding RotaryFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="35" Foreground="{StaticResource HighlightBrush}"/> <TextBlock Text="{Binding RotaryFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="35" Foreground="{StaticResource MahApps.Brushes.Highlight}"/>
</Viewbox> </Viewbox>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/> <TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel> </StackPanel>
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
<flyctrl:ResetBehavior Binding="{Binding RotaryForw}"/> <flyctrl:ResetBehavior Binding="{Binding RotaryForw}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid>
<Ellipse Fill="{StaticResource GrayBrush10}" Margin="6,10,6,2"/> <Ellipse Fill="{StaticResource MahApps.Brushes.Gray10}" Margin="6,10,6,2"/>
<iconPacks:PackIconMaterial Kind="RotateRight" /> <iconPacks:PackIconMaterial Kind="RotateRight" />
</Grid> </Grid>
</Button> </Button>
<TextBlock Text="转塔反转" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="{StaticResource FontSize_title}" Foreground="{StaticResource TextBrush}" /> <TextBlock Text="转塔反转" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="{StaticResource FontSize_title}" Foreground="{StaticResource MahApps.Brushes.Text}" />
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}"> <Button Style="{StaticResource ButtonStyle_resizeIcon}">
...@@ -94,11 +94,11 @@ ...@@ -94,11 +94,11 @@
<flyctrl:ResetBehavior Binding="{Binding RotaryBackw}"/> <flyctrl:ResetBehavior Binding="{Binding RotaryBackw}"/>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid> <Grid>
<Ellipse Fill="{StaticResource GrayBrush10}" Margin="6,10,6,2"/> <Ellipse Fill="{StaticResource MahApps.Brushes.Gray10}" Margin="6,10,6,2"/>
<iconPacks:PackIconMaterial Kind="RotateLeft" /> <iconPacks:PackIconMaterial Kind="RotateLeft" />
</Grid> </Grid>
</Button> </Button>
<TextBlock Text="转塔反转" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="{StaticResource FontSize_title}" Foreground="{StaticResource TextBrush}" /> <TextBlock Text="转塔反转" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="{StaticResource FontSize_title}" Foreground="{StaticResource MahApps.Brushes.Text}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UiModule/RotaryPanel/RotaryPanelStyle.xaml
View file @ 5f334fa5
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/> <Setter Property="Padding" Value="1"/>
<Setter Property="OffBrush" Value="{StaticResource ValidationSummaryColor5}" /> <Setter Property="OffBrush" Value="{StaticResource MahApps.Brushes.ValidationSummary5}" />
<Setter Property="OnBrush" Value="{StaticResource AccentColorBrush}" /> <Setter Property="OnBrush" Value="{StaticResource MahApps.Brushes.Accent}" />
<Setter Property="OffLabel" Value="停止中" /> <Setter Property="OffLabel" Value="停止中" />
<Setter Property="OnLabel" Value="运行中" /> <Setter Property="OnLabel" Value="运行中" />
<Setter Property="Template"> <Setter Property="Template">
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/> <Setter Property="Padding" Value="1"/>
<Setter Property="OffBrush" Value="{StaticResource GrayBrush1}" /> <Setter Property="OffBrush" Value="{StaticResource MahApps.Brushes.Gray1}" />
<Setter Property="OnBrush" Value="{StaticResource AccentColorBrush}" /> <Setter Property="OnBrush" Value="{StaticResource MahApps.Brushes.Accent}" />
<Setter Property="OffLabel" Value="复位" /> <Setter Property="OffLabel" Value="复位" />
<Setter Property="OnLabel" Value="复位中" /> <Setter Property="OnLabel" Value="复位中" />
<Setter Property="Template"> <Setter Property="Template">
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
<ControlTemplate TargetType="flyctrl:NoToggleButton"> <ControlTemplate TargetType="flyctrl:NoToggleButton">
<Border Background="Transparent"> <Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}" > <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}" >
<Ellipse Stretch="Uniform" Fill="{StaticResource GrayBrush10}" Margin="2" Width="40" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"/> <Ellipse Stretch="Uniform" Fill="{StaticResource MahApps.Brushes.Gray10}" Margin="2" Width="40" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"/>
<iconPacks:PackIconMaterial x:Name="icon" Kind="Bullseye" Foreground="{TemplateBinding OffBrush}" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"/> <iconPacks:PackIconMaterial x:Name="icon" Kind="Bullseye" Foreground="{TemplateBinding OffBrush}" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"/>
<TextBlock x:Name="tbOnOff" Margin="0,0,0,-10" Padding="2" Foreground="{StaticResource WhiteBrush}" FontSize="15" VerticalAlignment="Bottom" HorizontalAlignment="Center" <TextBlock x:Name="tbOnOff" Margin="0,0,0,-10" Padding="2" Foreground="{StaticResource MahApps.Brushes.ThemeBackground}" FontSize="15" VerticalAlignment="Bottom" HorizontalAlignment="Center"
Background="{TemplateBinding OffBrush}" Background="{TemplateBinding OffBrush}"
Text="{TemplateBinding OffLabel}"/> Text="{TemplateBinding OffLabel}"/>
</Grid> </Grid>
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/> <Setter Property="Padding" Value="1"/>
<Setter Property="OffBrush" Value="{StaticResource GrayBrush1}" /> <Setter Property="OffBrush" Value="{StaticResource MahApps.Brushes.Gray1}" />
<Setter Property="OnBrush" Value="{StaticResource AccentColorBrush2}" /> <Setter Property="OnBrush" Value="{StaticResource MahApps.Brushes.Accent2}" />
<Setter Property="IsEnabled" Value="False" /> <Setter Property="IsEnabled" Value="False" />
<Setter Property="OnLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}"/> <Setter Property="OnLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}"/>
<Setter Property="OffLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}"/> <Setter Property="OffLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}"/>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<ControlTemplate TargetType="flyctrl:NoToggleButton"> <ControlTemplate TargetType="flyctrl:NoToggleButton">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial x:Name="icon" Kind="CircleOutline" Width="30" Height="{Binding Width,RelativeSource={RelativeSource Mode=Self}}" Margin="2" Foreground="{TemplateBinding OffBrush}"/> <iconPacks:PackIconMaterial x:Name="icon" Kind="CircleOutline" Width="30" Height="{Binding Width,RelativeSource={RelativeSource Mode=Self}}" Margin="2" Foreground="{TemplateBinding OffBrush}"/>
<TextBlock x:Name="tbOnOff" Text="{TemplateBinding OffLabel}" Style="{StaticResource TextBlockStyle_FieldHeader}" Foreground="{StaticResource TextBrush}" FontSize="{StaticResource FontSize_title}"/> <TextBlock x:Name="tbOnOff" Text="{TemplateBinding OffLabel}" Style="{StaticResource TextBlockStyle_FieldHeader}" Foreground="{StaticResource MahApps.Brushes.Text}" FontSize="{StaticResource FontSize_title}"/>
</StackPanel> </StackPanel>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
</Style> </Style>
</Style.Resources> </Style.Resources>
<Setter Property="Foreground" Value="{StaticResource GrayBrush1}"/> <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Gray1}"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<Trigger Property="IsPressed" Value="True"> <Trigger Property="IsPressed" Value="True">
<Setter TargetName="path" Property="Width" Value="46"/> <Setter TargetName="path" Property="Width" Value="46"/>
<Setter TargetName="grid" Property="Margin" Value="2"/> <Setter TargetName="grid" Property="Margin" Value="2"/>
<Setter Property="Foreground" Value="{StaticResource AccentColorBrush}"/> <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Accent}"/>
<Setter TargetName="grid" Property="Effect" Value="{x:Null}" /> <Setter TargetName="grid" Property="Effect" Value="{x:Null}" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UiModule/RotaryPanel/WdFreq.xaml
View file @ 5f334fa5
...@@ -39,19 +39,19 @@ ...@@ -39,19 +39,19 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource AccentColorBrush}" <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource MahApps.Brushes.Accent}"
VerticalAlignment="Top" VerticalAlignment="Top"
Click="btnPlusClick" > Click="btnPlusClick" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}"> <Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/> <Ellipse Fill="{StaticResource MahApps.Brushes.ThemeBackground}" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="PlusCircle"/> <iconPacks:PackIconMaterial Kind="PlusCircle"/>
</Grid> </Grid>
</Button> </Button>
<Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource ValidationSummaryColor5}" <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource MahApps.Brushes.ValidationSummary5}"
VerticalAlignment="Top" VerticalAlignment="Top"
Click="btnMinusClick" > Click="btnMinusClick" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}"> <Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/> <Ellipse Fill="{StaticResource MahApps.Brushes.ThemeBackground}" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="MinusCircle"/> <iconPacks:PackIconMaterial Kind="MinusCircle"/>
</Grid> </Grid>
</Button> </Button>
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UiModule/TractionPanel/TractionPanel.xaml
View file @ 5f334fa5
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel > <StackPanel >
<TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource TextBrush}"/> <TextBlock Text="显示" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource MahApps.Brushes.Text}"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right"> <Viewbox Width="{StaticResource ViewboxW_fs25_00p0}" Height="{StaticResource ViewboxH_fs25}" HorizontalAlignment="Right">
<TextBlock Text="{Binding TractionVelocity,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource TextBrush}"/> <TextBlock Text="{Binding TractionVelocity,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25" Foreground="{StaticResource MahApps.Brushes.Text}"/>
</Viewbox> </Viewbox>
<TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" /> <TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}" />
</StackPanel> </StackPanel>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<Button Style="{StaticResource ButtonStyle_empty}" Click="btnVelocityClick"> <Button Style="{StaticResource ButtonStyle_empty}" Click="btnVelocityClick">
<StackPanel Orientation="Horizontal" Margin="20,0,0,0"> <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
<Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}"> <Viewbox MaxWidth="{StaticResource ViewboxW_fs35_000p0}" Height="{StaticResource ViewboxH_fs35}">
<TextBlock Text="{Binding TractionVelocitySet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="35" Foreground="{StaticResource HighlightBrush}"/> <TextBlock Text="{Binding TractionVelocitySet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="35" Foreground="{StaticResource MahApps.Brushes.Highlight}"/>
</Viewbox> </Viewbox>
<TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/> <TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel> </StackPanel>
......
Project.FLY.Integrated/FLY.Integrated.UI.Client/UiModule/TractionPanel/WdVelocity.xaml
View file @ 5f334fa5
...@@ -40,19 +40,19 @@ ...@@ -40,19 +40,19 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource AccentColorBrush}" <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource MahApps.Brushes.Accent}"
VerticalAlignment="Top" VerticalAlignment="Top"
Click="btnPlusClick" > Click="btnPlusClick" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}"> <Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/> <Ellipse Fill="{StaticResource MahApps.Brushes.ThemeBackground}" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="PlusCircle"/> <iconPacks:PackIconMaterial Kind="PlusCircle"/>
</Grid> </Grid>
</Button> </Button>
<Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource ValidationSummaryColor5}" <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource MahApps.Brushes.ValidationSummary5}"
VerticalAlignment="Top" VerticalAlignment="Top"
Click="btnMinusClick" > Click="btnMinusClick" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}"> <Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/> <Ellipse Fill="{StaticResource MahApps.Brushes.ThemeBackground}" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="MinusCircle"/> <iconPacks:PackIconMaterial Kind="MinusCircle"/>
</Grid> </Grid>
</Button> </Button>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/WdSetValue.xaml
View file @ 5f334fa5
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}"> <StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource AccentColorBrush}" <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource Color_theme_activity}"
VerticalAlignment="Top" VerticalAlignment="Top"
Command="{Binding PlusCmd}" > Command="{Binding PlusCmd}" >
<iconPacks:PackIconMaterial Kind="PlusCircle"/> <iconPacks:PackIconMaterial Kind="PlusCircle"/>
</Button> </Button>
<Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource ValidationSummaryColor5}" <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource Color_theme_validation}"
VerticalAlignment="Top" VerticalAlignment="Top"
Command="{Binding MinusCmd}" > Command="{Binding MinusCmd}" >
<iconPacks:PackIconMaterial Kind="MinusCircle"/> <iconPacks:PackIconMaterial Kind="MinusCircle"/>
......
thick_public @ a33ff2f8
Subproject commit 1676b45befd3e926c9e68e54aabd18dbdd51d450 Subproject commit a33ff2f8ab12e7468524953d2225fd7689e299d6
脚本/版本描述.txt
View file @ 5f334fa5
和美安装包_v6.21.3 -20210105
1. 修复 收卷设置速度，弹出异常。原因Mahapp的资源名称还没改完
和美安装包_v6.21.2 -20201231 和美安装包_v6.21.2 -20201231
1. 增加 称重服务器 可以通过对 6666666_v3 删减，生成任意 xxxxx_v3 1. 增加 称重服务器 可以通过对 6666666_v3 删减，生成任意 xxxxx_v3
......
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