Commit 3b793d4a authored by 潘栩锋's avatar 潘栩锋 🚴

## 流延测厚仪客户端 v7.7.4

1. 修复 修复大混合图 10条曲线,有算出一样的ID,IDs无法Add 这个bug
2. 优化 即时扫描图 的 柱状图带红黄绿颜色
parent b7a93404
...@@ -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 © 2023 FLYAutomation")] [assembly: AssemblyCopyright("Copyright © 2024 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("7.7.3.0")] [assembly: AssemblyVersion("7.7.4.0")]
[assembly: AssemblyFileVersion("7.7.3.0")] [assembly: AssemblyFileVersion("7.7.4.0")]
[assembly: Guid("BD20A921-953E-44CA-8FAB-4619D3CBCD06")] [assembly: Guid("BD20A921-953E-44CA-8FAB-4619D3CBCD06")]
...@@ -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 © 2023 FLYAutomation")] [assembly: AssemblyCopyright("Copyright © 2024 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("7.7.2.0")] [assembly: AssemblyVersion("7.7.4.0")]
[assembly: AssemblyFileVersion("7.7.2.0")] [assembly: AssemblyFileVersion("7.7.4.0")]
[assembly: Guid("E7D930E0-C871-4001-A31A-DC748ED5817C")] [assembly: Guid("E7D930E0-C871-4001-A31A-DC748ED5817C")]
...@@ -792,7 +792,9 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -792,7 +792,9 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
int index = (int)Math.Round(index_d); int index = (int)Math.Round(index_d);
while (index < scanDatas.Count) while (index < scanDatas.Count)
{ {
Ids.Add(scanDatas[index].ID, index); long id = scanDatas[index].ID;
if (!Ids.ContainsKey(id))
Ids.Add(id, index);
index_d += interval; index_d += interval;
index = (int)Math.Round(index_d); index = (int)Math.Round(index_d);
} }
......
...@@ -97,6 +97,7 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -97,6 +97,7 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
protected ChartValues<double> Values = new ChartValues<double>(); protected ChartValues<double> Values = new ChartValues<double>();
protected List<double> datas = new List<double>(); protected List<double> datas = new List<double>();
protected object Mapper; protected object Mapper;
protected object Mapper2;
protected FilmCastingProfileParam profileParam; protected FilmCastingProfileParam profileParam;
protected TempScanGraphItemParam graphparam; protected TempScanGraphItemParam graphparam;
IBulkDbService bulkDb; IBulkDbService bulkDb;
...@@ -150,8 +151,28 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -150,8 +151,28 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
Mapper = Mappers.Xy<double>() Mapper = Mappers.Xy<double>()
.X((value, index) => .X((value, index) =>
{ {
//变为分区号 return index + 1;
return index+1; })
.Y(value => value)
.Fill((value) =>
{
if ((value > Tolerance2YMax) || (value < Tolerance2YMin))
{
return AreaColors[2];
}
else if ((value > ToleranceYMax) || (value < ToleranceYMin))
{
return AreaColors[1];
}
else
{
return AreaColors[0];
}
});
Mapper2 = Mappers.Xy<double>()
.X((value, index) =>
{
return index + 1;
}) })
.Y(value => value); .Y(value => value);
#endregion #endregion
...@@ -214,9 +235,10 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -214,9 +235,10 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
Stroke = new SolidColorBrush(Colors.DarkBlue), Stroke = new SolidColorBrush(Colors.DarkBlue),
Fill = AreaColors[4], Fill = AreaColors[4],
PointGeometry = null, PointGeometry = null,
Configuration = Mapper Configuration = Mapper2
}; };
lineSeries_avg.SetValue(System.Windows.Controls.Panel.ZIndexProperty, 10); lineSeries_avg.SetValue(System.Windows.Controls.Panel.ZIndexProperty, 10);
lineSeries_avg.SetBinding(LineSeries.AreaLimitProperty, new Binding(nameof(Target)) { Source = this });
Series = new SeriesCollection Series = new SeriesCollection
{ {
...@@ -230,8 +252,8 @@ namespace FLY.Thick.FilmCasting.UI.UiModule ...@@ -230,8 +252,8 @@ namespace FLY.Thick.FilmCasting.UI.UiModule
new Column2Series new Column2Series
{ {
Values = Values, Values = Values,
Stroke = new SolidColorBrush(Colors.Transparent), Stroke = new SolidColorBrush(Colors.Black),
StrokeThickness = 0, StrokeThickness = 1,
PointGeometry = null, PointGeometry = null,
Configuration = Mapper Configuration = Mapper
} }
......
{ {
"InstallZipVersion":"7.7.3", "InstallZipVersion":"7.7.4",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.7.3_20230913.7z" "InstallZipUrl":"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.7.4_20240603.7z"
} }
\ No newline at end of file
# 流延测厚仪安装包_v7.7.4_20240603
## 流延测厚仪服务器 v7.7.2
## 流延测厚仪客户端 v7.7.4
1. 修复 修复大混合图 10条曲线,有算出一样的ID,IDs无法Add 这个bug
2. 优化 即时扫描图 的 柱状图带红黄绿颜色
## 自动模头服务器 v7.6.1
## 称重服务器 v7.2.0
## 数据浏览器 v7.6.1
## LP3 v3.0.0
<br/>
<br/>
<br/>
# 流延测厚仪安装包_v7.7.3_20230913 # 流延测厚仪安装包_v7.7.3_20230913
## 流延测厚仪服务器 v7.7.2 ## 流延测厚仪服务器 v7.7.2
......
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