Skip to content

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

和美安装包_v6.34.3 -20211112 

1. 修复 追边测厚仪服务器 保存图片 很慢
2. 修复 追边测厚仪服务器 删除图片出错（不存在的文件夹）
3. 优化 产品界面 把解方程类型删除了
4. 优化 AD盒参数保存在电脑。 避免AD盒 i2c 有问题。
parent b082f6cf
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 300 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/App.xaml.cs
View file @ f00163e1
...@@ -32,8 +32,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -32,8 +32,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
}; };
this.Startup += (s, e) => this.Startup += (s, e) =>
{ {
var v = new Misc.Ver() { SrcType = typeof(App) };
this.MainWindow = new MultiLayout.MainWindow(); this.MainWindow = new MultiLayout.MainWindow();
this.MainWindow.Title = "中国塑控 China Plastic Control"; this.MainWindow.Title = $"中国塑控 China Plastic Control {v.V}-{v.BuildTime}";
this.MainWindow.Loaded += (_s, _e) => this.MainWindow.Loaded += (_s, _e) =>
{ {
//启动Poll系统 //启动Poll系统
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ f00163e1
...@@ -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.34.1.0")] [assembly: AssemblyVersion("6.34.3")]
[assembly: AssemblyFileVersion("6.34.1.0")] [assembly: AssemblyFileVersion("6.34.3")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")] [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/FLY.Thick.Blowing.UI.csproj
View file @ f00163e1
...@@ -190,9 +190,6 @@ ...@@ -190,9 +190,6 @@
<Compile Include="WdIOTip.xaml.cs"> <Compile Include="WdIOTip.xaml.cs">
<DependentUpon>WdIOTip.xaml</DependentUpon> <DependentUpon>WdIOTip.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="WdProfileLegend.xaml.cs">
<DependentUpon>WdProfileLegend.xaml</DependentUpon>
</Compile>
<Page Include="App.xaml"> <Page Include="App.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
...@@ -289,10 +286,6 @@ ...@@ -289,10 +286,6 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="WdProfileLegend.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgMenu.xaml
View file @ f00163e1
...@@ -28,10 +28,7 @@ ...@@ -28,10 +28,7 @@
<Button Style="{StaticResource ButtonStyle_back}" Command="BrowseBack"/> <Button Style="{StaticResource ButtonStyle_back}" Command="BrowseBack"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" FlowDirection="RightToLeft"> <StackPanel Orientation="Horizontal" FlowDirection="RightToLeft">
<StackPanel DataContext="{StaticResource version}"> <StackPanel >
<Button Style="{StaticResource ButtonStyle_empty}" Background="{x:Null}" Click="button_version_Click" VerticalAlignment="Center">
<TextBlock Text="{Binding .}" FontSize="24" FontWeight="Bold" Margin="15" />
</Button>
<Button Style="{StaticResource ButtonStyle_empty}" Background="{x:Null}" Click="button_instruction_Click" VerticalAlignment="Center"> <Button Style="{StaticResource ButtonStyle_empty}" Background="{x:Null}" Click="button_instruction_Click" VerticalAlignment="Center">
<TextBlock Text="说明书" FontSize="24" FontWeight="Bold" Margin="15" /> <TextBlock Text="说明书" FontSize="24" FontWeight="Bold" Margin="15" />
</Button> </Button>
...@@ -90,7 +87,7 @@ ...@@ -90,7 +87,7 @@
<Button Click="button_flyad_Click"> <Button Click="button_flyad_Click">
<Grid> <Grid>
<Image Source="/FLY.Thick.Base.UI;component/Images/bg_chip.jpg" Stretch="UniformToFill" /> <Image Source="/FLY.Thick.Base.UI;component/Images/bg_chip.jpg" Stretch="UniformToFill" />
<TextBlock FontWeight="Bold" FontFamily="YouYuan" VerticalAlignment="Center" Foreground="White" FontSize="40" Text="控制器" Background="#C00083D7" Padding="10"/> <TextBlock FontWeight="Bold" FontFamily="YouYuan" VerticalAlignment="Center" Foreground="White" FontSize="40" Text="AD盒" Background="#C00083D7" Padding="10"/>
</Grid> </Grid>
</Button> </Button>
</WrapPanel> </WrapPanel>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgProfileBlowing.xaml
View file @ f00163e1
...@@ -99,69 +99,6 @@ ...@@ -99,69 +99,6 @@
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding K, StringFormat={}{0:F3}}" /> <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding K, StringFormat={}{0:F3}}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" >
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Text="无死区&#x0a;精确计算" />
</Border>
<StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="测量模式" />
<ComboBox MinWidth="120" MinHeight="40" HorizontalAlignment="Left">
<ComboBoxItem IsSelected="{Binding MMode, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:MeasureMode.Edge}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="不解方程"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding MMode, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:MeasureMode.Normal}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="测两层"/>
</ComboBoxItem>
</ComboBox>
</StackPanel>
<Button Margin="{StaticResource ControlMargin}" Command="{Binding LegendCmd}" >
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding MMode}" Value="Bag">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
<DataTrigger Binding="{Binding MMode}" Value="Normal">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Rectangle Fill="White" Height="48"/>
<Path Data="{StaticResource Geometry_legend}" Fill="{StaticResource Color_theme_activity}" Stretch="Uniform" Width="60" Height="60"/>
<TextBlock Text="图例" Padding="3,2" Foreground="White" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="{StaticResource Color_theme_activity}" FontSize="12"/>
</Grid>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding MMode, Converter={StaticResource e2visconv_collapsed}, ConverterParameter={x:Static common:MeasureMode.Normal}}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="膜宽" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmWidth}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="探头离膜边" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmPosH}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<ListBox Name="listview_profile" ItemsSource="{Binding ProfileList}" Margin="{StaticResource ControlMargin}" MinWidth="400" Grid.Column="1" Background="{StaticResource Background_Title}"> <ListBox Name="listview_profile" ItemsSource="{Binding ProfileList}" Margin="{StaticResource ControlMargin}" MinWidth="400" Grid.Column="1" Background="{StaticResource Background_Title}">
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgProfileBlowing.xaml.cs
View file @ f00163e1
...@@ -52,7 +52,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -52,7 +52,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
public RelayCommand AhelperCmd { get; } public RelayCommand AhelperCmd { get; }
public RelayCommand LegendCmd { get; }
#endregion #endregion
IBlowingFixProfileService profileService; IBlowingFixProfileService profileService;
...@@ -64,7 +63,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -64,7 +63,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
ApplyCmd = new RelayCommand(Apply); ApplyCmd = new RelayCommand(Apply);
DelCmd = new RelayCommand(Del); DelCmd = new RelayCommand(Del);
AhelperCmd = new RelayCommand(Ahelper); AhelperCmd = new RelayCommand(Ahelper);
LegendCmd = new RelayCommand(Legend);
} }
public void Init(IBlowingFixProfileService profileService, ListBox listview_profile) public void Init(IBlowingFixProfileService profileService, ListBox listview_profile)
...@@ -116,32 +114,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -116,32 +114,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void Apply() private void Apply()
{ {
//有效性检查 //有效性检查
switch (Param.MMode)
{
case MeasureMode.Edge:
break;
default:
//case MeasureMode.Normal:
{
if (Param.FilmWidth < 500)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "膜宽<500mm 异常");
return;
}
else if (Param.FilmPosH > Param.FilmWidth / 3)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置>(膜宽/3) 异常");
return;
}
else if (Param.FilmPosH < 0)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置<0 异常");
return;
}
}
break;
}
if (Param.Target <= 0) if (Param.Target <= 0)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "目标值<=0 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "目标值<=0 异常");
...@@ -190,14 +162,5 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -190,14 +162,5 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
Param.K = w.A; Param.K = w.A;
} }
} }
private void Legend()
{
WdProfileLegend w = new WdProfileLegend();
w.DataContext = Param;
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(listview_profile);
w.ShowDialog();
}
} }
} }
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Properties/AssemblyInfo.cs
View file @ f00163e1
...@@ -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 © 2020 FLYAutomation")] [assembly: AssemblyCopyright("Copyright © 2021 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("6.33.0")] [assembly: AssemblyVersion("6.34.0")]
[assembly: AssemblyFileVersion("6.33.0")] [assembly: AssemblyFileVersion("6.34.0")]
[assembly: Guid("27509A23-198D-420D-A472-982C07194BBB")] [assembly: Guid("27509A23-198D-420D-A472-982C07194BBB")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/DynAreaProfile.xaml
View file @ f00163e1
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FLY.Thick.Blowing.UI.Fix.Client.UiModule" xmlns:local="clr-namespace:FLY.Thick.Blowing.UI.Fix.Client.UiModule"
xmlns:blowing_common="clr-namespace:FLY.Thick.Blowing.Common;assembly=FLY.Thick.Blowing" xmlns:blowing_common="clr-namespace:FLY.Thick.Blowing.Common;assembly=FLY.Thick.Blowing"
mc:Ignorable="d" > mc:Ignorable="d"
d:DesignWidth="250">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
<Setter Property="Foreground" Value="#FF3B3B3B"/> <Setter Property="Foreground" Value="#FF3B3B3B"/>
<Setter Property="Margin" Value="5,0"/> <Setter Property="Margin" Value="5,0"/>
</Style> </Style>
<blowing_common:BlowingFixProfileParam x:Key="profile_param" MMode="Bag"/> <blowing_common:BlowingFixProfileParam x:Key="profile_param" />
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Button Click="button_profile_click" Style="{StaticResource ButtonStyle_empty}" d:DataContext="{StaticResource profile_param}"> <Button Click="button_profile_click" Style="{StaticResource ButtonStyle_empty}" d:DataContext="{StaticResource profile_param}">
...@@ -40,98 +41,10 @@ ...@@ -40,98 +41,10 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="A" Style="{StaticResource TextBlockStyle_ItemHeader}" /> <TextBlock Text="斜率A" Style="{StaticResource TextBlockStyle_ItemHeader}" />
<TextBlock Text="{Binding K, StringFormat={}{0:F3}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="{Binding K, StringFormat={}{0:F3}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" />
</StackPanel> </StackPanel>
</Grid> </Grid>
<StackPanel Orientation="Vertical">
<Grid Margin="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="182*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="膜宽" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding FilmWidth}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="2" Grid.Column="1">
<TextBlock Text="膜边" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding FilmPosH}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
</StackPanel>
</StackPanel>
</Grid>
<StackPanel.Style>
<Style TargetType="StackPanel">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding MMode}" Value="Normal">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</StackPanel.Style>
</StackPanel>
<StackPanel Orientation="Vertical">
<Grid Margin="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="182*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="膜宽" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding FilmWidth}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="2" Grid.Column="1">
<TextBlock Text="膜边" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding FilmPosH}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
</StackPanel>
</StackPanel>
</Grid>
<Grid Margin="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="182*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="插边" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding BagFold0}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_static}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="2" Grid.Column="1">
<TextBlock Text="插边" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding BagFold1}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_static}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" FontSize="12" />
</StackPanel>
</StackPanel>
</Grid>
<StackPanel.Style>
<Style TargetType="StackPanel">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding MMode}" Value="Bag">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</StackPanel.Style>
</StackPanel>
</StackPanel> </StackPanel>
</Border> </Border>
</Button> </Button>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraph/WdScanGraphConfig.xaml
View file @ f00163e1
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsPercent}"/> <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsPercent}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5" Visibility="{Binding IsPercent,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}"> <StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动目标值" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动目标值" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsAutoTarget}"/> <ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsAutoTarget}"/>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/WdProfileLegend.xaml deleted 100644 → 0
View file @ b082f6cf
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.WdProfileLegend"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:common="clr-namespace:FLY.Thick.Blowing.Common;assembly=FLY.Thick.Blowing"
mc:Ignorable="d"
Title="Window_ProfileLegend" SizeToContent="WidthAndHeight" >
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
<common:BlowingFixProfileParam x:Key="param" MMode="Bag"/>
</ResourceDictionary>
</Window.Resources>
<Grid Width="500" d:DataContext="{StaticResource param}">
<Image Margin="10" Stretch="Uniform" >
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="image/normal.jpg"/>
<Style.Triggers>
<DataTrigger Binding="{Binding MMode}" Value="Bag">
<Setter Property="Source" Value="image/bag.jpg"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Grid>
</flyctrllib:WindowBigClose>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/WdProfileLegend.xaml.cs deleted 100644 → 0
View file @ b082f6cf
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace FLY.Thick.Blowing.UI.Fix.Client
{
/// <summary>
/// Window_ProfileLegend.xaml 的交互逻辑
/// </summary>
public partial class WdProfileLegend : FLY.ControlLibrary.WindowBigClose
{
public WdProfileLegend()
{
InitializeComponent();
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Common/BlowingFixProfileParam.cs
View file @ f00163e1
...@@ -44,23 +44,7 @@ namespace FLY.Thick.Blowing.Common ...@@ -44,23 +44,7 @@ namespace FLY.Thick.Blowing.Common
#endregion #endregion
#region 吹膜定点解方程用
/// <summary>
/// 测量模式
/// </summary>
public MeasureMode MMode { get; set; } = MeasureMode.Edge;
/// <summary>
/// 膜宽 单位 mm， 收卷时，切膜前，测量的宽度
/// </summary>
public int FilmWidth { get; set; } = 1180;
/// <summary>
/// 探头所在膜的横向位置 单位 mm
/// </summary>
public int FilmPosH { get; set; } = 70;
#endregion
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
public object Clone() public object Clone()
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/GM_BlowingFix.cs
View file @ f00163e1
...@@ -749,11 +749,6 @@ namespace FLY.Thick.Blowing.Server ...@@ -749,11 +749,6 @@ namespace FLY.Thick.Blowing.Server
this.bulkDb = bulkDb; this.bulkDb = bulkDb;
this.bulkDb.GetTempFrameAction = GetTempFrame; this.bulkDb.GetTempFrameAction = GetTempFrame;
Misc.BindingOperations.SetBinding(mProfileParam, nameof(mProfileParam.MMode), this, nameof(MMode));
Misc.BindingOperations.SetBinding(mProfileParam, nameof(mProfileParam.FilmWidth), this, nameof(FilmWidth));
Misc.BindingOperations.SetBinding(mProfileParam, nameof(mProfileParam.FilmPosH), this, nameof(FilmPosH));
Misc.BindingOperations.SetBinding(mPDetect, nameof(mPDetect.FilmVelocity), mDynArea, nameof(mDynArea.FilmVelocity)); Misc.BindingOperations.SetBinding(mPDetect, nameof(mPDetect.FilmVelocity), mDynArea, nameof(mDynArea.FilmVelocity));
Misc.BindingOperations.SetBinding(this, nameof(NBolts), () => Misc.BindingOperations.SetBinding(this, nameof(NBolts), () =>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/App.xaml.cs
View file @ f00163e1
...@@ -32,8 +32,10 @@ namespace FLY.Thick.BlowingScan.UI.Client ...@@ -32,8 +32,10 @@ namespace FLY.Thick.BlowingScan.UI.Client
}; };
this.Startup += (s, e) => this.Startup += (s, e) =>
{ {
var v = new Misc.Ver() { SrcType = typeof(App) };
this.MainWindow = new MultiLayout.MainWindow(); this.MainWindow = new MultiLayout.MainWindow();
this.MainWindow.Title = "中国塑控 China Plastic Control"; this.MainWindow.Title = $"中国塑控 China Plastic Control {v.V}-{v.BuildTime}";
this.MainWindow.Loaded += (_s, _e) => this.MainWindow.Loaded += (_s, _e) =>
{ {
//启动Poll系统 //启动Poll系统
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ f00163e1
...@@ -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.34.1")] [assembly: AssemblyVersion("6.34.3")]
[assembly: AssemblyFileVersion("6.34.1")] [assembly: AssemblyFileVersion("6.34.3")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgMenu.xaml
View file @ f00163e1
...@@ -27,10 +27,7 @@ ...@@ -27,10 +27,7 @@
<Button Style="{StaticResource ButtonStyle_back}" Command="BrowseBack"/> <Button Style="{StaticResource ButtonStyle_back}" Command="BrowseBack"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" FlowDirection="RightToLeft"> <StackPanel Orientation="Horizontal" FlowDirection="RightToLeft">
<StackPanel DataContext="{StaticResource version}"> <StackPanel>
<Button Style="{StaticResource ButtonStyle_empty}" Background="{x:Null}" Click="button_version_Click" VerticalAlignment="Center">
<TextBlock Text="{Binding .}" FontSize="24" FontWeight="Bold" Margin="15" />
</Button>
<Button Style="{StaticResource ButtonStyle_empty}" Background="{x:Null}" Click="button_instruction_Click" VerticalAlignment="Center"> <Button Style="{StaticResource ButtonStyle_empty}" Background="{x:Null}" Click="button_instruction_Click" VerticalAlignment="Center">
<TextBlock Text="说明书" FontSize="24" FontWeight="Bold" Margin="15" /> <TextBlock Text="说明书" FontSize="24" FontWeight="Bold" Margin="15" />
</Button> </Button>
...@@ -121,7 +118,7 @@ ...@@ -121,7 +118,7 @@
<Button Click="button_flyad_Click"> <Button Click="button_flyad_Click">
<Grid> <Grid>
<Image Source="/FLY.Thick.Base.UI;component/Images/bg_chip.jpg" Stretch="UniformToFill" /> <Image Source="/FLY.Thick.Base.UI;component/Images/bg_chip.jpg" Stretch="UniformToFill" />
<TextBlock FontWeight="Bold" FontFamily="YouYuan" VerticalAlignment="Center" Foreground="White" FontSize="40" Text="控制器" Background="#C00083D7" Padding="10"/> <TextBlock FontWeight="Bold" FontFamily="YouYuan" VerticalAlignment="Center" Foreground="White" FontSize="40" Text="AD盒" Background="#C00083D7" Padding="10"/>
</Grid> </Grid>
</Button> </Button>
</WrapPanel> </WrapPanel>
......
脚本/版本描述.txt
View file @ f00163e1
和美安装包_v6.34.2 -20211031 和美安装包_v6.34.3 -20211112
1. 修复 收卷主界面 4个控制使能， 修改为 状态改变 。（之前错误为 按1松0） 1. 修复 追边测厚仪服务器 保存图片 很慢
2. 修复 追边测厚仪服务器 删除图片出错（不存在的文件夹）
3. 优化 产品界面 把解方程类型删除了
4. 优化 AD盒参数保存在电脑。 避免AD盒 i2c 有问题。
和美安装包_v6.34.1 -20211031 和美安装包_v6.34.1 -20211031
1. 修复 收卷主界面 4个控制使能， 修改为 状态改变 。（之前错误为 按1松0） 1. 修复 收卷主界面 4个控制使能， 修改为 状态改变 。（之前错误为 按1松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