Skip to content

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

1.修复 环型图无法把探头画在左边 

2.修复 称重变量表， 多组份，且每组不一样时，变量表出错
parent eb3c312d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 32 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ 4d96a730
...@@ -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")] [assembly: AssemblyVersion("7.7.2")]
[assembly: AssemblyFileVersion("7.7.0")] [assembly: AssemblyFileVersion("7.7.2")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")] [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/PolarChart.xaml.cs
View file @ 4d96a730
...@@ -27,7 +27,7 @@ namespace FLY.Thick.Blowing.UI.UiModule ...@@ -27,7 +27,7 @@ namespace FLY.Thick.Blowing.UI.UiModule
#region BoltCnt #region BoltCnt
public static readonly DependencyProperty BoltCntProperty = public static readonly DependencyProperty BoltCntProperty =
DependencyProperty.Register(nameof(BoltCnt), typeof(int), typeof(PolarChart), new PropertyMetadata( DependencyProperty.Register(nameof(BoltCnt), typeof(int), typeof(PolarChart), new PropertyMetadata(
88, 72,
new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e) new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
{ {
(d as PolarChart).NotifyPropertyChanged(nameof(BoltCnt)); (d as PolarChart).NotifyPropertyChanged(nameof(BoltCnt));
...@@ -115,7 +115,7 @@ namespace FLY.Thick.Blowing.UI.UiModule ...@@ -115,7 +115,7 @@ namespace FLY.Thick.Blowing.UI.UiModule
public static readonly DependencyProperty IsForwCWProperty = public static readonly DependencyProperty IsForwCWProperty =
DependencyProperty.Register(nameof(IsForwCW), typeof(bool), typeof(PolarChart), new PropertyMetadata( DependencyProperty.Register(nameof(IsForwCW), typeof(bool), typeof(PolarChart), new PropertyMetadata(
true, false,
new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e) new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
{ {
(d as PolarChart).NotifyPropertyChanged(nameof(IsForwCW)); (d as PolarChart).NotifyPropertyChanged(nameof(IsForwCW));
...@@ -147,12 +147,12 @@ namespace FLY.Thick.Blowing.UI.UiModule ...@@ -147,12 +147,12 @@ namespace FLY.Thick.Blowing.UI.UiModule
#region MPIsRight #region MPIsRight
public static readonly DependencyProperty MPIsRightProperty = public static readonly DependencyProperty MPIsRightProperty =
DependencyProperty.Register(nameof(MPIsRight), typeof(bool), typeof(PolarChart), new PropertyMetadata( DependencyProperty.Register(nameof(MPIsRight), typeof(bool), typeof(PolarChart), new PropertyMetadata(
true, true,
new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e) new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
{ {
(d as PolarChart).NotifyPropertyChanged(nameof(MPIsRight)); (d as PolarChart).NotifyPropertyChanged(nameof(MPIsRight));
}))); })));
public bool MPIsRight public bool MPIsRight
{ {
get get
...@@ -179,12 +179,12 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan ...@@ -179,12 +179,12 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
#region OrgBoltNo #region OrgBoltNo
public static readonly DependencyProperty OrgBoltNoProperty = public static readonly DependencyProperty OrgBoltNoProperty =
DependencyProperty.Register(nameof(OrgBoltNo), typeof(int), typeof(PolarChart), new PropertyMetadata( DependencyProperty.Register(nameof(OrgBoltNo), typeof(int), typeof(PolarChart), new PropertyMetadata(
1, 22,
new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e) new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
{ {
(d as PolarChart).NotifyPropertyChanged(nameof(OrgBoltNo)); (d as PolarChart).NotifyPropertyChanged(nameof(OrgBoltNo));
}))); })));
public int OrgBoltNo public int OrgBoltNo
{ {
get get
...@@ -709,7 +709,10 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan ...@@ -709,7 +709,10 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
} }
/// <summary> /// <summary>
/// 与 TransformDegreesOrg 一样，但考虑 探头是否在右边 /// <para>探头在右边:</para>
/// <para>3点为0° 的逆时钟角度坐标 转为 WPF 的 12点为0°顺时钟角度坐标</para>
/// <para>探头在左边:</para>
/// <para>9点为0° 的逆时钟角度坐标 转为 WPF 的 12点为0°顺时钟角度坐标</para>
/// </summary> /// </summary>
/// <param name="degrees"></param> /// <param name="degrees"></param>
/// <returns></returns> /// <returns></returns>
...@@ -786,11 +789,15 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan ...@@ -786,11 +789,15 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
double GetBoltNoOf3oClock() double GetBoltNoOf3oClock()
{ {
double midBoltNo = OrgBoltNo + BoltCnt / 2; return OrgBoltNo;
if (midBoltNo > BoltCnt) //if (MPIsRight)
midBoltNo -= BoltCnt; // return OrgBoltNo;
double boltNoOf3oClock = MPIsRight ? OrgBoltNo : midBoltNo; //else {
return boltNoOf3oClock; // double midBoltNo = OrgBoltNo + BoltCnt / 2;
// if (midBoltNo > BoltCnt)
// midBoltNo -= BoltCnt;
// return midBoltNo;
//}
} }
void GetArcText(int start_index, int end_index, string no, out Arc arc, out TextBlock t) void GetArcText(int start_index, int end_index, string no, out Arc arc, out TextBlock t)
{ {
...@@ -1175,8 +1182,11 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan ...@@ -1175,8 +1182,11 @@ new PropertyChangedCallback(delegate (DependencyObject d, DependencyPropertyChan
/// </summary> /// </summary>
void Draw_AxisYLabel() void Draw_AxisYLabel()
{ {
double boltNoOf3oClock = GetBoltNoOf3oClock();
//永远画在探头方向 的Y轴上 //永远画在探头方向 的Y轴上
double startAngle = TransformDegrees(0); double startAngle = BoltIndex2WpfAngle(!IsForwCW, boltNoOf3oClock, BoltCnt, false, OrgBoltNo - 0.5);
double percent = TolerancePercent; double percent = TolerancePercent;
if (percent < 0.01) if (percent < 0.01)
percent = 0.01; percent = 0.01;
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ 4d96a730
...@@ -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.1")] [assembly: AssemblyVersion("7.7.2")]
[assembly: AssemblyFileVersion("7.7.0.1")] [assembly: AssemblyFileVersion("7.7.2")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Resource/辅助代码生成/Project.FLY.Autogen_WS/Autogen_WS/Autogen_WS/DataInfos.cs
View file @ 4d96a730
...@@ -125,7 +125,7 @@ namespace Autogen_WS ...@@ -125,7 +125,7 @@ namespace Autogen_WS
int i_propName = 3;//属性名 int i_propName = 3;//属性名
int i_typeName = 4;//类型 int i_typeName = 4;//类型
int i_scale = 5;//放大 int i_scale = 5;//放大
int i_canWrite = 6;//可写 //int i_canWrite = 6;//可写
int i_isError = 7;//报警 int i_isError = 7;//报警
//int i_trigger = 8;//触发 //int i_trigger = 8;//触发
int i_regAddr = 8;//PLC寄存器 int i_regAddr = 8;//PLC寄存器
...@@ -253,7 +253,7 @@ namespace Autogen_WS ...@@ -253,7 +253,7 @@ namespace Autogen_WS
ErrorMsgbox?.Invoke($"相同的属性名:{ii.propName} 对象:{ii.objectName} 描述:{ii.propDescription}"); ErrorMsgbox?.Invoke($"相同的属性名:{ii.propName} 对象:{ii.objectName} 描述:{ii.propDescription}");
return false; return false;
} }
string reg_addr = sheet.Cells[iRow, i_regAddr + i].GetValue<string>(); string reg_addr = sheet.Cells[iRow, i_regAddr + i].GetValue<string>();
if (!string.IsNullOrEmpty(reg_addr)) if (!string.IsNullOrEmpty(reg_addr))
{ {
...@@ -267,10 +267,9 @@ namespace Autogen_WS ...@@ -267,10 +267,9 @@ namespace Autogen_WS
return false; return false;
} }
} }
infos.Add(ii);
ii = ii.Clone();
} }
infos.Add(ii);
ii = ii.Clone();
} }
} }
......
脚本/hemeiInstallZipVersionInfo.json
View file @ 4d96a730
{ {
"InstallZipVersion":"7.7.0.1", "InstallZipVersion":"7.7.2.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.0.1_20221109.7z" "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.2.0_20221124.7z"
} }
\ No newline at end of file
脚本/版本描述.md
View file @ 4d96a730
# 和美安装包_v7.7.2-20221124
## 测厚仪服务器 v7.6.2
## 测厚仪客户端 v7.7.2
1. 修复 环型图无法把探头画在左边
## 扫描测厚仪服务器 v7.6.1
## 扫描测厚仪客户端 v7.7.2
1. 修复 环型图无法把探头画在左边
## 自动风环 v7.6.1
## 称重 v7.7.0
## 称重单组 v7.6.0
## 收卷 v7.6.0
## IBC v7.6.0
## 下吹 v7.6.0
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.7.0-20221108 # 和美安装包_v7.7.0-20221108
## 测厚仪服务器 v7.6.2 ## 测厚仪服务器 v7.6.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