Skip to content

T
thick-casting
Commit df26d345 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

# 流延测厚仪安装包_v7.7.2_20230324 

## 流延测厚仪服务器 v7.7.2
1. 修复 Misc计算sigma限制范围

## 流延测厚仪客户端 v7.7.2
1. 修复 产品界面限制全部参数设置

## 自动模头服务器 v7.6.1
1. 修复 限制数据范围
parent 84da6a46
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 36 deletions
Project.FLY.FilmCasting.AutoDie/FLY.FilmCasting.AutoDie.UI.Server/Properties/AssemblyInfo.cs
View file @ df26d345
...@@ -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 © 2022 FLYAutomation")] [assembly: AssemblyCopyright("Copyright © 2023 FLYAutomation")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.0.3")] [assembly: AssemblyVersion("7.6.1.0")]
[assembly: AssemblyFileVersion("7.6.0.3")] [assembly: AssemblyFileVersion("7.6.1.0")]
[assembly: Guid("CC6F2BB4-E648-47BE-8223-B6157E35403D")] [assembly: Guid("CC6F2BB4-E648-47BE-8223-B6157E35403D")]
Project.FLY.FilmCasting.AutoDie/FLY.FilmCasting.AutoDie/Server/FeedbackHeat.cs
View file @ df26d345
...@@ -705,14 +705,19 @@ namespace FLY.FilmCasting.AutoDie.Server ...@@ -705,14 +705,19 @@ namespace FLY.FilmCasting.AutoDie.Server
return;//非常异常！！！ return;//非常异常！！！
//把数据范围外 的全部删除 //把数据范围外 的全部删除
for (int i = 0; i < lc_ScanData.DataBegin; i++) int dataBegin = lc_ScanData.DataBegin;
lc_ScanData.Thicks[i] = double.NaN; int dataEnd = lc_ScanData.DataEnd;
if (dataBegin < 0) dataBegin = 0;
if (dataEnd < 0) dataEnd = 0;
for (int i = lc_ScanData.DataEnd+1; i < ChannelCnt; i++) for (int i = 0; i < dataBegin; i++)
lc_ScanData.Thicks[i] = double.NaN;
for (int i = dataEnd+1; i < ChannelCnt; i++)
lc_ScanData.Thicks[i] = double.NaN; lc_ScanData.Thicks[i] = double.NaN;
//检测数据有效性,其中一个无效 //检测数据有效性,其中一个无效
for (int i = lc_ScanData.DataBegin; i <= lc_ScanData.DataEnd; i++) for (int i = dataBegin; i <= dataEnd; i++)
{ {
if (double.IsNaN(lc_ScanData.Thicks[i])) if (double.IsNaN(lc_ScanData.Thicks[i]))
return; return;
......
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Client/Properties/AssemblyInfo.cs
View file @ df26d345
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.7.1.0")] [assembly: AssemblyVersion("7.7.2.0")]
[assembly: AssemblyFileVersion("7.7.1.0")] [assembly: AssemblyFileVersion("7.7.2.0")]
[assembly: Guid("BD20A921-953E-44CA-8FAB-4619D3CBCD06")] [assembly: Guid("BD20A921-953E-44CA-8FAB-4619D3CBCD06")]
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Server/Properties/AssemblyInfo.cs
View file @ df26d345
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.7.0.0")] [assembly: AssemblyVersion("7.7.2.0")]
[assembly: AssemblyFileVersion("7.7.0.0")] [assembly: AssemblyFileVersion("7.7.2.0")]
[assembly: Guid("E7D930E0-C871-4001-A31A-DC748ED5817C")] [assembly: Guid("E7D930E0-C871-4001-A31A-DC748ED5817C")]
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI/PgProfile.xaml.cs
View file @ df26d345
...@@ -24,6 +24,7 @@ using System.Windows.Navigation; ...@@ -24,6 +24,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes; using System.Windows.Shapes;
using Unity; using Unity;
using DynArea = FLY.Thick.Base.Common.DynArea; using DynArea = FLY.Thick.Base.Common.DynArea;
using IInitParamService = FLY.Thick.FilmCasting.IService.IInitParamService;
namespace FLY.Thick.FilmCasting.UI namespace FLY.Thick.FilmCasting.UI
{ {
...@@ -38,10 +39,10 @@ namespace FLY.Thick.FilmCasting.UI ...@@ -38,10 +39,10 @@ namespace FLY.Thick.FilmCasting.UI
InitializeComponent(); InitializeComponent();
} }
[InjectionMethod] [InjectionMethod]
public void Init(IFilmCastingProfileService profileService, ITDGageService gageService, IBoltMapFilmCastingService boltMapFilmCastingService) public void Init(IFilmCastingProfileService profileService, ITDGageService gageService, IBoltMapFilmCastingService boltMapFilmCastingService, IInitParamService initParamService)
{ {
viewModel = new PgProfileVm(); viewModel = new PgProfileVm();
viewModel.Init(profileService, gageService, boltMapFilmCastingService); viewModel.Init(profileService, gageService, boltMapFilmCastingService, initParamService);
this.DataContext = viewModel; this.DataContext = viewModel;
} }
...@@ -101,7 +102,7 @@ namespace FLY.Thick.FilmCasting.UI ...@@ -101,7 +102,7 @@ namespace FLY.Thick.FilmCasting.UI
IFilmCastingProfileService profileService; IFilmCastingProfileService profileService;
IBoltMapFilmCastingService boltMapFilmCastingService; IBoltMapFilmCastingService boltMapFilmCastingService;
IInitParamService initParamService;
public string SelectedItem { get; set; } public string SelectedItem { get; set; }
public DynArea DynArea { get; private set; } public DynArea DynArea { get; private set; }
...@@ -119,12 +120,12 @@ namespace FLY.Thick.FilmCasting.UI ...@@ -119,12 +120,12 @@ namespace FLY.Thick.FilmCasting.UI
public void Init(IFilmCastingProfileService profileService, ITDGageService gageService, IBoltMapFilmCastingService boltMapFilmCastingService) public void Init(IFilmCastingProfileService profileService, ITDGageService gageService, IBoltMapFilmCastingService boltMapFilmCastingService, IInitParamService initParamService)
{ {
this.DynArea = gageService.DynArea; this.DynArea = gageService.DynArea;
this.profileService = profileService; this.profileService = profileService;
this.boltMapFilmCastingService = boltMapFilmCastingService; this.boltMapFilmCastingService = boltMapFilmCastingService;
this.initParamService = initParamService;
updateParam(); updateParam();
updateMidBoltNo(); updateMidBoltNo();
...@@ -271,39 +272,132 @@ namespace FLY.Thick.FilmCasting.UI ...@@ -271,39 +272,132 @@ namespace FLY.Thick.FilmCasting.UI
private void ApplyParam() private void ApplyParam()
{ {
if (DataRange.Begin < 1) int totalmm = (int)(initParamService.PosLength * initParamService.Encoder1_mmpp);
if (!Param.IsAutoDataRange)
{
if (DataRange.Begin < 1)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "数据范围.开始 < 1 异常");
return;
}
if (DataRange.End > boltMapFilmCastingService.BoltCnt)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"数据范围.结束 > {boltMapFilmCastingService.BoltCnt}, 异常!");
return;
}
if (DataRange.End <= DataRange.Begin)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "数据范围.结束<=开始, 异常!");
return;
}
}
else
{
if (Param.SideCutWidth < 0) {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "切边宽度小于0mm, 异常!");
return;
}
if (Param.SideCutWidth > totalmm/3)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"切边宽度 大于 总机架长度({totalmm}mm)的 1/3, 异常!");
return;
}
}
if (ScanRange.Begin < 1)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "数据范围.开始 < 1 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "扫描范围.开始 < 1, 异常!");
return; return;
} }
if (DataRange.End > boltMapFilmCastingService.BoltCnt) if (ScanRange.End > boltMapFilmCastingService.BoltCnt)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错",$"数据范围.结束 > {boltMapFilmCastingService.BoltCnt} 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"扫描范围.结束 > {boltMapFilmCastingService.BoltCnt}, 异常!");
return; return;
} }
if (DataRange.End<=DataRange.Begin) if (ScanRange.End <= ScanRange.Begin)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "数据范围.结束<=开始 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "扫描范围.结束<=开始, 异常!");
return; return;
} }
if (ScanRange.Begin < 1) if (Param.LeftEmptyBolts < 0)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "扫描范围.开始 < 1 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "开始无效螺丝数 < 0, 异常!");
return; return;
} }
if (ScanRange.End > boltMapFilmCastingService.BoltCnt)
if (Param.LeftEmptyBolts > boltMapFilmCastingService.BoltCnt/3)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"扫描范围.结束 > {boltMapFilmCastingService.BoltCnt} 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"开始无效螺丝数 > 总螺丝数({boltMapFilmCastingService.BoltCnt})的1/3, 异常!");
return; return;
} }
if (ScanRange.End <= ScanRange.Begin)
if (Param.RightEmptyBolts < 0)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "结束无效螺丝数 < 0, 异常!");
return;
}
if (Param.RightEmptyBolts > boltMapFilmCastingService.BoltCnt / 3)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"结束无效螺丝数 > 总螺丝数({boltMapFilmCastingService.BoltCnt})的1/3, 异常!");
return;
}
if (Param.UniformShrinkPercent > 0.5)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "收缩率 > 50%, 异常!");
return;
}
if (Param.MidOffset > totalmm/3)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"中心位置偏移 > 总机架长度({totalmm}mm)的 1/3, 异常!");
return;
}
if (Param.K < 0.1)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"斜率K 补偿 < 0.1, 异常!");
return;
}
if (Param.Target < 10)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"目标值 < 10, 异常!");
return;
}
if (Param.TolerancePercent < 0.005)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"公差 < 0.5%, 异常!");
return;
}
if ( string.IsNullOrWhiteSpace(Param.PName) )
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "扫描范围.结束<=开始 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"名称 为空, 异常!");
return; return;
} }
if (string.IsNullOrWhiteSpace(Param.Batch))
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"批号 为空, 异常!");
return;
}
if (string.IsNullOrWhiteSpace(Param.Number))
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", $"卷号 为空, 异常!");
return;
}
if (!Param.IsAutoDataRange)
Param.DataRange = new RangeStruct(DataRange.Begin - 1, DataRange.End - 1);
Param.DataRange = new RangeStruct(DataRange.Begin - 1, DataRange.End - 1);
Param.ScanRange = new RangeStruct(ScanRange.Begin - 1, ScanRange.End - 1); Param.ScanRange = new RangeStruct(ScanRange.Begin - 1, ScanRange.End - 1);
......
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI/UiModule/ScanMmGraph/ScanMmGraphVm.cs
View file @ df26d345
...@@ -76,15 +76,15 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -76,15 +76,15 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
XFormatter = (x) => XFormatter = (x) =>
{ {
if(graphParamMm==null) if(graphParamMm==null)
return $"{x}"; return $"{(int)x}";
if (graphParamMm.IsXShowBoltNo) if (graphParamMm.IsXShowBoltNo)
return $"{x}"; return $"{(int)x}";
if (!IsMmValid) if (!IsMmValid)
{ {
//还没有膜 //还没有膜
return $"{x}"; return $"{(int)x}";
} }
int posMm = (int)BoltIndex2Mm(x-1); int posMm = (int)BoltIndex2Mm(x-1);
...@@ -152,7 +152,7 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -152,7 +152,7 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
//要查询的位置mm 对应 分区序号 //要查询的位置mm 对应 分区序号
double boltIndex = indexOffset + boltIndexOfMid; double boltIndex = indexOffset + boltIndexOfMid;
return boltIndex; return boltIndex;
} }
......
thick_public @ 7f77ea04
Subproject commit 7df4824800ebed22e6b62358b155197fb9095e41 Subproject commit 7f77ea048fcc1155d6881155b2412f1035b0cb90
脚本/filmCastingInstallZipVersionInfo.json
View file @ df26d345
{ {
"InstallZipVersion":"7.7.1", "InstallZipVersion":"7.7.2",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.7.1_20230113.7z" "InstallZipUrl":"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.7.2_20230324.7z"
} }
\ No newline at end of file
脚本/版本描述.md
View file @ df26d345
# 流延测厚仪安装包_v7.7.2_20230324
## 流延测厚仪服务器 v7.7.2
1. 修复 Misc计算sigma限制范围
## 流延测厚仪客户端 v7.7.2
1. 修复 产品界面限制全部参数设置
## 自动模头服务器 v7.6.1
1. 修复 限制数据范围
## 称重服务器 v7.2.0
## 数据浏览器 v7.6.1
## LP3 v3.0.0
<br/>
<br/>
<br/>
# 流延测厚仪安装包_v7.7.1_20230113 # 流延测厚仪安装包_v7.7.1_20230113
## 流延测厚仪服务器 v7.7.0 ## 流延测厚仪服务器 v7.7.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