Skip to content

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

添加 又把称重的宽度自动设置恢复

parent 5b2439e8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 54 deletions
Project.FLY.Weight/FLY.Weight.UI.Server/PgMain.xaml
View file @ c9512ad6
......@@ -27,10 +27,10 @@
<Run Text="{Binding Accessory.CurrentVelocitySet,StringFormat={}{0:F1}, Mode=OneWay}" />
</TextBlock>
</StackPanel>
<!--<StackPanel x:Name="sp_sysParam" Orientation="Horizontal" Grid.Column="1" Margin="5">
<StackPanel x:Name="sp_sysParam" Orientation="Horizontal" Grid.Column="1" Margin="5">
<CheckBox Content="吹膜宽度mm 绑定 测厚仪"
IsChecked="{Binding BindingTotalFilmWidth}"/>
</StackPanel>-->
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
......
Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs
View file @ c9512ad6
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.7.1.0")]
[assembly: AssemblyFileVersion("7.7.1.0")]
[assembly: AssemblyVersion("7.7.2.0")]
[assembly: AssemblyFileVersion("7.7.2.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
Project.FLY.Weight/FLY.Weight/Server/SysParam.cs
View file @ c9512ad6
......@@ -23,7 +23,7 @@ namespace FLY.Weight.Server
/// <summary>
/// 测厚仪宽度与 吹膜宽度mm 绑定在一起
/// </summary>
//public bool BindingTotalFilmWidth { get; set; } = false;
public bool BindingTotalFilmWidth { get; set; } = false;
/// <summary>
/// 有吸料系统
......
Project.FLY.Weight/FLY.Weight/Server/TDGage.cs
View file @ c9512ad6
......@@ -112,65 +112,64 @@ namespace FLY.Weight.Server
tDGageServiceClient.DynArea.PropertyChanged += DynArea_PropertyChanged;
//this.mSysParam.PropertyChanged += MSysParam_PropertyChanged;
this.mSysParam.PropertyChanged += MSysParam_PropertyChanged;
//timer_saveSysParam = new DispatcherTimer();
//timer_saveSysParam.Interval = TimeSpan.FromSeconds(5);
//timer_saveSysParam.Tick += Timer_saveSysParam_Tick;
timer_saveSysParam = new DispatcherTimer();
timer_saveSysParam.Interval = TimeSpan.FromSeconds(5);
timer_saveSysParam.Tick += Timer_saveSysParam_Tick;
//这个是从测厚仪获取的，每几秒就写一次，不调试！！！！！
mData.plcos.IgnoreLogProperties.Add(new SenderProperty() { sender = mData.Accessory, propertyName = nameof(mData.Accessory.CurrentVelocitySet) });
//mData.plcos.IgnoreLogProperties.Add(new SenderProperty() { sender = mData.Accessory, propertyName = nameof(mData.Accessory.TotalFilmWidth) });
mData.plcos.IgnoreLogProperties.Add(new SenderProperty() { sender = mData.Accessory, propertyName = nameof(mData.Accessory.TotalFilmWidth) });
}
//private void Timer_saveSysParam_Tick(object sender, EventArgs e)
//{
// timer_saveSysParam.Stop();
// mSysParam.Save();
//}
//DispatcherTimer timer_saveSysParam;
private void Timer_saveSysParam_Tick(object sender, EventArgs e)
{
timer_saveSysParam.Stop();
mSysParam.Save();
}
//private void MSysParam_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
//{
// if (e.PropertyName == nameof(SysParam.BindingTotalFilmWidth)) {
// //5秒后保存
// timer_saveSysParam.Start();
DispatcherTimer timer_saveSysParam;
// }
//}
//int lastWidth = 0;
private void MSysParam_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(SysParam.BindingTotalFilmWidth))
{
//5秒后保存
timer_saveSysParam.Start();
}
}
int lastWidth = 0;
private void DynArea_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
//if (e.PropertyName == nameof(Thick.Base.Common.DynArea.Width))
//{
// if (!mSysParam.BindingTotalFilmWidth)
// return;
// if (tDGageServiceClient.DynArea.Width <= 100)
// return;//小于100，肯定异常
// int width = (int)tDGageServiceClient.DynArea.Width;
// if (lastWidth < 100)
// {
// lastWidth = width;
// }
// else
// {
// if (Math.Abs(lastWidth - width) > 10) //偏差大于10mm
// {
// //更新数据
// lastWidth = width;
// }
// }
// int v = (int)Math.Round(lastWidth / 10.0);
// v *= 10;// 以10mm 4舍5入 取整
// mData.Accessory.TotalFilmWidth = v;
//}
//else
if (e.PropertyName == nameof(Thick.Base.Common.DynArea.Width))
{
if (!mSysParam.BindingTotalFilmWidth)
return;
if (tDGageServiceClient.DynArea.Width <= 100)
return;//小于100，肯定异常
int width = (int)tDGageServiceClient.DynArea.Width;
if (lastWidth < 100)
{
lastWidth = width;
}
else
{
if (Math.Abs(lastWidth - width) > 10) //偏差大于10mm
{
//更新数据
lastWidth = width;
}
}
int v = (int)Math.Round(lastWidth / 10.0);
v *= 10;// 以10mm 4舍5入 取整
mData.Accessory.TotalFilmWidth = v;
}
else
if (e.PropertyName == nameof(Thick.Base.Common.DynArea.FilmVelocity))
{
......
hemei.sln
View file @ c9512ad6
......@@ -131,6 +131,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Unions.UI", "Project.FL
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Winder.BanNaiTe.UI.Server", "FLY.Winder.BanNaiTe.UI.Server\FLY.Winder.BanNaiTe.UI.Server.csproj", "{209249CF-310A-4107-85DC-A2C7585E73C7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IbcDebugApp", "IbcDebugApp\IbcDebugApp.csproj", "{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -748,6 +750,18 @@ Global
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|x86.ActiveCfg = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|x86.Build.0 = Release|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Debug|x86.ActiveCfg = Debug|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Debug|x86.Build.0 = Debug|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Release|Any CPU.Build.0 = Release|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Release|x86.ActiveCfg = Release|Any CPU
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -803,6 +817,7 @@ Global
{A7ACD496-9D04-4F8E-B97E-C6C29CE2DE06} = {DF0E88AF-981B-490A-B739-A7D79B8C5BB2}
{703C6559-E0D6-48A2-A54D-5D22447BA33E} = {CFCD212D-5CFB-48D4-BFC6-36768FC07E65}
{209249CF-310A-4107-85DC-A2C7585E73C7} = {086F6EF1-272B-4AFE-89DD-D6EDDF8333E6}
{C254A1B9-4CB4-4482-ADF2-D4C08BEEBC18} = {4439B7B4-75FB-48D3-8705-BB6C46802F23}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BD78A3E8-6F11-4F24-AB5F-A9F25461F64F}
......
thick_public @ 343e10fe
Subproject commit 6b9fde5fa5b404ffab2c5cd2f27fbcd841b0a647
Subproject commit 343e10fe1dcbae798535a595d29bd73e65f9ad66
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