Skip to content

H
hemei
Commit 0547219d authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

版本升级为v6.20.0

parent 0b584cd1
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 260 deletions
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml
View file @ 0547219d
<Page x:Class="FLY.FeedbackRenZiJia.UI.Client.UiModule.AirRingGraph" <UserControl x:Class="FLY.FeedbackRenZiJia.UI.Client.UiModule.AirRingGraph"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:lvc1="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Feng.Wpf" xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:lvc1="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Feng.Wpf"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="400" d:DesignWidth="980" d:DesignHeight="400" d:DesignWidth="980"
Title="Page_Graph" > >
<Page.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
...@@ -48,314 +48,307 @@ ...@@ -48,314 +48,307 @@
</Geometry> </Geometry>
</ResourceDictionary> </ResourceDictionary>
</Page.Resources> </UserControl.Resources>
<Border Style="{StaticResource BorderStyle_module}" >
<Grid Name="grid" Background="White" d:DataContext="{StaticResource viewModel}"> <Grid Name="grid" d:DataContext="{StaticResource viewModel}">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="258*" />
</Grid.RowDefinitions>
<Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="18" /> <RowDefinition Height="auto" />
<RowDefinition Height="32" /> <RowDefinition Height="258*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Rectangle Fill="#FF579aab"/> <Border Background="#F0579aab" Height="20" VerticalAlignment="Top" CornerRadius="3,3,0,0"/>
</Grid> <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="204*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Grid.Resources>
<ResourceDictionary>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Width" Value="50"/>
<Setter Property="Margin" Value="2"/>
</Style>
<Style TargetType="Image" x:Key="ImageStyle">
<Setter Property="Height" Value="50"/>
</Style>
<Style TargetType="Image" BasedOn="{StaticResource ImageStyle}"/>
<Grid> <Style TargetType="TextBlock" x:Key="TitleStyle">
<Grid.ColumnDefinitions> <Setter Property="FontWeight" Value="Bold"/>
<ColumnDefinition Width="auto" /> <Setter Property="FontFamily" Value="YouYuan"/>
<ColumnDefinition Width="auto" /> <Setter Property="HorizontalAlignment" Value="Center"/>
<ColumnDefinition Width="204*" /> </Style>
<ColumnDefinition Width="auto" /> <Style TargetType="TextBlock" BasedOn="{StaticResource TitleStyle}"/>
</Grid.ColumnDefinitions>
<Grid.Resources>
<ResourceDictionary>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Width" Value="50"/>
<Setter Property="Margin" Value="2"/>
</Style>
<Style TargetType="Image" x:Key="ImageStyle">
<Setter Property="Height" Value="50"/>
</Style>
<Style TargetType="Image" BasedOn="{StaticResource ImageStyle}"/>
<Style TargetType="TextBlock" x:Key="TitleStyle">
<Setter Property="FontWeight" Value="Bold"/>
<Setter Property="FontFamily" Value="YouYuan"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource TitleStyle}"/>
</ResourceDictionary> </ResourceDictionary>
</Grid.Resources> </Grid.Resources>
<Button Click="btnInfoClick"> <Button Click="btnInfoClick">
<StackPanel>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/info.png" />
<TextBlock Text="设置" />
</StackPanel>
</Button>
<StackPanel Orientation="Horizontal" Grid.Column="1" Visibility="{Binding CheckEnable, Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}" >
<Button Command="{Binding BaseUpCmd}" >
<StackPanel> <StackPanel>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/up.png"/> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/info.png" />
<TextBlock Text="上升" /> <TextBlock Text="设置" />
</StackPanel> </StackPanel>
</Button> </Button>
<Button Command="{Binding BaseDownCmd}" >
<StackPanel> <StackPanel Orientation="Horizontal" Grid.Column="1" Visibility="{Binding CheckEnable, Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}" >
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/down.png" /> <Button Command="{Binding BaseUpCmd}" >
<TextBlock Text="下降" /> <StackPanel>
</StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/up.png"/>
</Button> <TextBlock Text="上升" />
<Button Command="{Binding AddCmd}"> </StackPanel>
<StackPanel> </Button>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/add.png" /> <Button Command="{Binding BaseDownCmd}" >
<TextBlock Text="加热" /> <StackPanel>
</StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/down.png" />
</Button> <TextBlock Text="下降" />
<Button Command="{Binding SubCmd}" > </StackPanel>
<StackPanel> </Button>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/cancel.png" /> <Button Command="{Binding AddCmd}">
<TextBlock Text="降温" /> <StackPanel>
</StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/add.png" />
</Button> <TextBlock Text="加热" />
<Button Command="{Binding SmoothCmd}" > </StackPanel>
<StackPanel> </Button>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/apache_server.png" /> <Button Command="{Binding SubCmd}" >
<TextBlock Text="平滑" /> <StackPanel>
</StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/cancel.png" />
</Button> <TextBlock Text="降温" />
<Button Command="{Binding CalCmd}" > </StackPanel>
<StackPanel> </Button>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/aim.png" /> <Button Command="{Binding SmoothCmd}" >
<TextBlock Text="计算" /> <StackPanel>
</StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/apache_server.png" />
</Button> <TextBlock Text="平滑" />
<Button Command="{Binding ApplyCmd}" > </StackPanel>
<StackPanel> </Button>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/checkmark.png" /> <Button Command="{Binding CalCmd}" >
<TextBlock Text="应用" /> <StackPanel>
</StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/aim.png" />
</Button> <TextBlock Text="计算" />
<Button Command="{Binding UndoCmd}" > </StackPanel>
<StackPanel DataContext="{Binding FeedbackHeat}"> </Button>
<Grid> <Button Command="{Binding ApplyCmd}" >
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/previous.png" /> <StackPanel>
<Grid HorizontalAlignment="Left" VerticalAlignment="Bottom" > <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/checkmark.png" />
<Ellipse Fill="#FF2F5070" Width="25" Height="25" Opacity="0.8"/> <TextBlock Text="应用" />
<TextBlock Text="{Binding UndoIdx}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" FontFamily="Arial" FontSize="10"/> </StackPanel>
</Button>
<Button Command="{Binding UndoCmd}" >
<StackPanel DataContext="{Binding FeedbackHeat}">
<Grid>
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/previous.png" />
<Grid HorizontalAlignment="Left" VerticalAlignment="Bottom" >
<Ellipse Fill="#FF2F5070" Width="25" Height="25" Opacity="0.8"/>
<TextBlock Text="{Binding UndoIdx}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White" FontFamily="Arial" FontSize="10"/>
</Grid>
</Grid> </Grid>
</Grid> <TextBlock >
<TextBlock > <TextBlock.Style>
<TextBlock.Style> <Style TargetType="TextBlock" BasedOn="{StaticResource TitleStyle}">
<Style TargetType="TextBlock" BasedOn="{StaticResource TitleStyle}"> <Setter Property="Text" Value="撤销"/>
<Setter Property="Text" Value="撤销"/> <Style.Triggers>
<Style.Triggers> <DataTrigger Binding="{Binding IsInUndo}" Value="True">
<DataTrigger Binding="{Binding IsInUndo}" Value="True"> <Setter Property="Text" Value="{Binding UndoTime,StringFormat={}{0:HH:mm}}"/>
<Setter Property="Text" Value="{Binding UndoTime,StringFormat={}{0:HH:mm}}"/> </DataTrigger>
</DataTrigger> </Style.Triggers>
</Style.Triggers> </Style>
</Style> </TextBlock.Style>
</TextBlock.Style> </TextBlock>
</TextBlock> </StackPanel>
</StackPanel> </Button>
</Button> <Button x:Name="btnClearH" Command="{Binding ClearCmd}" Template="{StaticResource picture_button}" >
<Button x:Name="btnClearH" Command="{Binding ClearCmd}" Template="{StaticResource picture_button}" > <StackPanel>
<StackPanel> <Grid>
<Grid> <Image HorizontalAlignment="Center" VerticalAlignment="Center" Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/close.png" />
<Image HorizontalAlignment="Center" VerticalAlignment="Center" Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/close.png" /> <Grid DataContext="{Binding LPress}"
<Grid DataContext="{Binding LPress}"
HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding IsRunning,Converter={StaticResource visbilityconv}}"> HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding IsRunning,Converter={StaticResource visbilityconv}}">
<ed:Arc Width="45" Height="45" Opacity="0.9" <ed:Arc Width="45" Height="45" Opacity="0.9"
ArcThickness="4" ArcThickness="4"
ArcThicknessUnit="Pixel" ArcThicknessUnit="Pixel"
StartAngle="0" EndAngle="360" StartAngle="0" EndAngle="360"
Fill="#FFF1F1F1" Stretch="None" Stroke="#FF988585" /> Fill="#FFF1F1F1" Stretch="None" Stroke="#FF988585" />
<ed:Arc Width="45" Height="45" <ed:Arc Width="45" Height="45"
ArcThickness="4" ArcThickness="4"
ArcThicknessUnit="Pixel" ArcThicknessUnit="Pixel"
StartAngle="0" StartAngle="0"
EndAngle="{Binding Progress}" EndAngle="{Binding Progress}"
Fill="#FF5C7AA0" Stretch="None" Stroke="#FF988585" Opacity="0.9" > Fill="#FF5C7AA0" Stretch="None" Stroke="#FF988585" Opacity="0.9" >
</ed:Arc> </ed:Arc>
</Grid>
</Grid> </Grid>
</Grid> <TextBlock Text="清除" />
<TextBlock Text="清除" /> </StackPanel>
</StackPanel> </Button>
</Button> <Button Command="{Binding SaveCmd}" >
<Button Command="{Binding SaveCmd}" > <StackPanel>
<StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/diskette.png" />
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/diskette.png" /> <TextBlock Text="保存" />
<TextBlock Text="保存" /> </StackPanel>
</StackPanel> </Button>
</Button> <Button Command="{Binding LoadCmd}" >
<Button Command="{Binding LoadCmd}" > <StackPanel>
<StackPanel> <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/open_folder.png" />
<Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/open_folder.png" /> <TextBlock Text="读取" />
<TextBlock Text="读取" /> </StackPanel>
</StackPanel> </Button>
</Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="3"> <StackPanel Orientation="Horizontal" Grid.Column="3">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button Command="{Binding CheckCmd}" Visibility="{Binding FeedbackHeat.HasCheck, Converter={StaticResource visbilityconv}}" > <Button Command="{Binding CheckCmd}" Visibility="{Binding FeedbackHeat.HasCheck, Converter={StaticResource visbilityconv}}" >
<StackPanel DataContext="{Binding FeedbackHeat}"> <StackPanel DataContext="{Binding FeedbackHeat}">
<Grid > <Grid >
<Rectangle Fill="Yellow" RadiusX="5" RadiusY="5" Visibility="{Binding HasElectricity, Converter={StaticResource visbilityconv}}"/> <Rectangle Fill="Yellow" RadiusX="5" RadiusY="5" Visibility="{Binding HasElectricity, Converter={StaticResource visbilityconv}}"/>
<Image>
<Image.Style>
<Style TargetType="Image" BasedOn="{StaticResource ImageStyle}">
<Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/nurse.png"/>
<Style.Triggers>
<DataTrigger Binding="{Binding CheckEnable}" Value="False">
<Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/nurse_gray.png"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Grid>
<TextBlock Style="{StaticResource TitleStyle}" Text="检查" />
</StackPanel>
</Button>
<Button Command="{Binding EnableCmd}" >
<StackPanel DataContext="{Binding FeedbackHeat}">
<Image> <Image>
<Image.Style> <Image.Style>
<Style TargetType="Image" BasedOn="{StaticResource ImageStyle}"> <Style TargetType="Image">
<Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/nurse.png"/> <Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/ligthbulb_on.png"/>
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding CheckEnable}" Value="False"> <DataTrigger Binding="{Binding IsAuto}" Value="False">
<Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/nurse_gray.png"/> <Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/ligthbulb_off.png"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Image.Style> </Image.Style>
</Image> </Image>
</Grid> <TextBlock >
<TextBlock Style="{StaticResource TitleStyle}" Text="检查" /> <TextBlock.Style>
</StackPanel> <Style TargetType="TextBlock" BasedOn="{StaticResource TitleStyle}">
</Button> <Setter Property="Text" Value="自动"/>
<Button Command="{Binding EnableCmd}" > <Style.Triggers>
<StackPanel DataContext="{Binding FeedbackHeat}"> <DataTrigger Binding="{Binding IsAuto}" Value="False">
<Image> <Setter Property="Text" Value="手动"/>
<Image.Style> </DataTrigger>
<Style TargetType="Image"> </Style.Triggers>
<Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/ligthbulb_on.png"/> </Style>
<Style.Triggers> </TextBlock.Style>
<DataTrigger Binding="{Binding IsAuto}" Value="False"> </TextBlock>
<Setter Property="Source" Value="/FLY.FeedbackRenZiJia.UI.Client;component/Images/ligthbulb_off.png"/> </StackPanel>
</DataTrigger> </Button>
</Style.Triggers> </StackPanel>
</Style>
</Image.Style>
</Image>
<TextBlock >
<TextBlock.Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource TitleStyle}">
<Setter Property="Text" Value="自动"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsAuto}" Value="False">
<Setter Property="Text" Value="手动"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </Grid>
</Grid> <Grid Grid.Row="1">
<Grid Grid.Row="1"> <Grid.RowDefinitions>
<Grid.RowDefinitions> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> </Grid.RowDefinitions>
</Grid.RowDefinitions> <lvc:CartesianChart Hoverable="False" DisableAnimations="True" DataTooltip="{x:Null}" Margin="5,2,2,2"
<lvc:CartesianChart Hoverable="False" DisableAnimations="True" DataTooltip="{x:Null}" Margin="5,2,2,2"
MouseMove="UIElement_OnMouseMove" MouseDown="UIElement_MouseDown" MouseUp="UIElement_MouseUp"> MouseMove="UIElement_OnMouseMove" MouseDown="UIElement_MouseDown" MouseUp="UIElement_MouseUp">
<lvc:CartesianChart.Series> <lvc:CartesianChart.Series>
<lvc1:Column2Series <lvc1:Column2Series
PointGeometry="{x:Null}" PointGeometry="{x:Null}"
StrokeThickness ="1" StrokeThickness ="1"
Stroke="Black" Stroke="Black"
Fill="{StaticResource Brushes.PreHeat}" Fill="{StaticResource Brushes.PreHeat}"
Values="{Binding HeatOffsets}" Values="{Binding HeatOffsets}"
Configuration="{Binding Mapper}"/> Configuration="{Binding Mapper}"/>
<lvc:LineSeries <lvc:LineSeries
PointGeometry="{x:Null}" PointGeometry="{x:Null}"
StrokeThickness ="3" StrokeThickness ="3"
Stroke="{StaticResource Brushes.Thick}" Stroke="{StaticResource Brushes.Thick}"
Fill="Transparent" Fill="Transparent"
Values="{Binding ThickPercents}" Values="{Binding ThickPercents}"
Configuration="{Binding MapperThickPercents}"/> Configuration="{Binding MapperThickPercents}"/>
<lvc:ScatterSeries <lvc:ScatterSeries
PointGeometry="{StaticResource Geometry.Close}" PointGeometry="{StaticResource Geometry.Close}"
StrokeThickness ="1" StrokeThickness ="1"
Stroke="{StaticResource Brushes.Thick}" Stroke="{StaticResource Brushes.Thick}"
Fill="{StaticResource WhiteBrush}" Fill="{StaticResource WhiteBrush}"
Values="{Binding ThickPercents}" Values="{Binding ThickPercents}"
Configuration="{Binding MapperThickPercentsWithIsStable}"/> Configuration="{Binding MapperThickPercentsWithIsStable}"/>
</lvc:CartesianChart.Series> </lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}" <lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}"
MinValue="0" MaxValue="{Binding XMax}" MinValue="0" MaxValue="{Binding XMax}"
> >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step ="5"/> <lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step ="5"/>
</lvc:Axis.Separator> </lvc:Axis.Separator>
<lvc:Axis.Sections> <lvc:Axis.Sections>
<lvc:AxisSection Style="{StaticResource AxisSectionStyle}" <lvc:AxisSection Style="{StaticResource AxisSectionStyle}"
Value="{Binding SelectBoltNo}" SectionWidth="{Binding SelectBoltNoWidth}" Value="{Binding SelectBoltNo}" SectionWidth="{Binding SelectBoltNoWidth}"
/> />
</lvc:Axis.Sections> </lvc:Axis.Sections>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}" <lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}"
LabelFormatter="{Binding YFormatter}" LabelFormatter="{Binding YFormatter}"
MinValue="-50" MaxValue="50" FontFamily="Courier New" > MinValue="-50" MaxValue="50" FontFamily="Courier New" >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step="10"/> <lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step="10"/>
</lvc:Axis.Separator> </lvc:Axis.Separator>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisY> </lvc:CartesianChart.AxisY>
</lvc:CartesianChart> </lvc:CartesianChart>
<lvc:CartesianChart Grid.Row="1" Hoverable="False" DisableAnimations="True" DataTooltip="{x:Null}" Margin="5,2,2,2" <lvc:CartesianChart Grid.Row="1" Hoverable="False" DisableAnimations="True" DataTooltip="{x:Null}" Margin="5,2,2,2"
MouseMove="UIElement_OnMouseMove" MouseDown="UIElement_MouseDown" MouseUp="UIElement_MouseUp"> MouseMove="UIElement_OnMouseMove" MouseDown="UIElement_MouseDown" MouseUp="UIElement_MouseUp">
<lvc:CartesianChart.Series> <lvc:CartesianChart.Series>
<lvc1:Column2Series <lvc1:Column2Series
PointGeometry="{x:Null}" PointGeometry="{x:Null}"
StrokeThickness ="1" StrokeThickness ="1"
Stroke="Black" Stroke="Black"
Fill="{StaticResource Brushes.PreHeat}" Fill="{StaticResource Brushes.PreHeat}"
Values="{Binding PreHeats}" Values="{Binding PreHeats}"
Configuration="{Binding MapperPreHeats}"/> Configuration="{Binding MapperPreHeats}"/>
<lvc:LineSeries <lvc:LineSeries
PointGeometry="{x:Null}" PointGeometry="{x:Null}"
StrokeThickness ="3" StrokeThickness ="3"
Stroke="{StaticResource Brushes.Heat}" Stroke="{StaticResource Brushes.Heat}"
Fill="Transparent" Fill="Transparent"
Values="{Binding Heats}" Values="{Binding Heats}"
Configuration="{Binding Mapper}"/> Configuration="{Binding Mapper}"/>
</lvc:CartesianChart.Series> </lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
<lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}" <lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}"
MinValue="0" MaxValue="{Binding XMax}" MinValue="0" MaxValue="{Binding XMax}"
> >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step ="5"/> <lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step ="5"/>
</lvc:Axis.Separator> </lvc:Axis.Separator>
<lvc:Axis.Sections> <lvc:Axis.Sections>
<lvc:AxisSection Style="{StaticResource AxisSectionStyle}" <lvc:AxisSection Style="{StaticResource AxisSectionStyle}"
Value="{Binding SelectBoltNo}" Value="{Binding SelectBoltNo}"
SectionWidth="{Binding SelectBoltNoWidth}" SectionWidth="{Binding SelectBoltNoWidth}"
/> />
</lvc:Axis.Sections> </lvc:Axis.Sections>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
<lvc:CartesianChart.AxisY> <lvc:CartesianChart.AxisY>
<lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}" <lvc:Axis Foreground="{StaticResource Brushes.AxisLabel}"
LabelFormatter="{Binding YFormatter}" LabelFormatter="{Binding YFormatter}"
MinValue="0" MaxValue="100" FontFamily="Courier New" > MinValue="0" MaxValue="100" FontFamily="Courier New" >
<lvc:Axis.Separator> <lvc:Axis.Separator>
<lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step="10"/> <lvc:Separator Stroke="{StaticResource Brushes.AxisSeparator}" Step="10"/>
</lvc:Axis.Separator> </lvc:Axis.Separator>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisY> </lvc:CartesianChart.AxisY>
</lvc:CartesianChart> </lvc:CartesianChart>
</Grid>
</Grid> </Grid>
</Grid> </Border>
</Page> </UserControl>
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml.cs
View file @ 0547219d
...@@ -32,7 +32,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client.UiModule ...@@ -32,7 +32,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client.UiModule
/// <summary> /// <summary>
/// Page_Graph.xaml 的交互逻辑 /// Page_Graph.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class AirRingGraph : Page public partial class AirRingGraph : UserControl
{ {
IUnityContainer container; IUnityContainer container;
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyFileVersion("6.20.0.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")] [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.1")] [assembly: AssemblyVersion("6.20.0")]
[assembly: AssemblyFileVersion("6.0.1")] [assembly: AssemblyFileVersion("6.20.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")] [assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -12,7 +12,7 @@ using System.Windows; ...@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("枫莱尔自动化技术有限公司")] [assembly: AssemblyCompany("枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--追边测厚仪客户端")] [assembly: AssemblyProduct("枫莱尔--追边测厚仪客户端")]
[assembly: AssemblyCopyright("Copyright © 2018 FLYAutomation")] [assembly: AssemblyCopyright("Copyright © 2020 FLYAutomation")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0")] [assembly: AssemblyVersion("6.20.0")]
[assembly: AssemblyFileVersion("5.1.0")] [assembly: AssemblyFileVersion("6.20.0")]
[assembly: Guid("27509A23-198D-420D-A472-982C07194BBB")] [assembly: Guid("27509A23-198D-420D-A472-982C07194BBB")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/ScanGraphCircular.xaml
View file @ 0547219d
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<Grid Style="{StaticResource GridStyle_ButtonShadow}" > <Grid Style="{StaticResource GridStyle_ButtonShadow}" >
<TextBlock Padding="10,5" VerticalAlignment="Top" <TextBlock Padding="10,5" VerticalAlignment="Top"
FontSize="24" Foreground="White" Background="{StaticResource Color_theme_activity}" FontSize="24" Foreground="White" Background="{StaticResource Color_theme_activity}"
Text="对比图" /> Text="环型图" />
</Grid> </Grid>
</Button> </Button>
<Grid Grid.Column="1" Grid.RowSpan="2" Panel.ZIndex="2" <Grid Grid.Column="1" Grid.RowSpan="2" Panel.ZIndex="2"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/WdScanGraphCircularConfig.xaml
View file @ 0547219d
...@@ -57,11 +57,6 @@ ...@@ -57,11 +57,6 @@
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRangePercent}" /> <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRangePercent}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="探头位于右边" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding MPIsRight}" />
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Button Style="{StaticResource ButtonStyle_apply}" Click="btnOkClick"/> <Button Style="{StaticResource ButtonStyle_apply}" Click="btnOkClick"/>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0")] [assembly: AssemblyVersion("6.20.0")]
[assembly: AssemblyFileVersion("5.1.0")] [assembly: AssemblyFileVersion("6.20.0")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyFileVersion("6.20.0.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyFileVersion("6.20.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")] [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -51,5 +51,5 @@ using System.Windows; ...@@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("6.20.0.0")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Properties/AssemblyInfo.cs
View file @ 0547219d
...@@ -10,7 +10,7 @@ using System.Runtime.InteropServices; ...@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FLY.Thick.BlowingScan")] [assembly: AssemblyProduct("FLY.Thick.BlowingScan")]
[assembly: AssemblyCopyright("Copyright © 2018 FlyAutomation")] [assembly: AssemblyCopyright("Copyright © 2020 FlyAutomation")]
[assembly: AssemblyTrademark("FlyAutomation")] [assembly: AssemblyTrademark("FlyAutomation")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0.0")] [assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("5.1.0.0")] [assembly: AssemblyFileVersion("6.20.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