From ef716332fef142a02843b5a99e8e3e92ab165738 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 11:35:24 +0800
Subject: [PATCH] 修改单独匹配界面线程问题
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main-bak/EditElbowMainDlg.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main-bak/EditElbowMainDlg.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main-bak/EditElbowMainDlg.cs
index f047f3f..a515032 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main-bak/EditElbowMainDlg.cs
@@ -15,7 +15,7 @@
private Vmo.AssetsElbowMainVmo _ElbowVmo = null;
- private List<Vmo.AssetsElbowCoefficientVmo> _AssetsElbowCoefficient;
+ private List<Vmo.AssetsElbowFactorVmo> _AssetsElbowCoefficient;
public async void SetBindingData(Vmo.AssetsElbowMainVmo ElbowVmo)
{
@@ -49,7 +49,7 @@
{
TextEditCaliber.EditValue = _ElbowVmo.Caliber.ToString();
}
- if (_ElbowVmo.Material == null|| _ElbowVmo.Material==string.Empty)
+ if (_ElbowVmo.Material == null || _ElbowVmo.Material == string.Empty)
{
TextEditMaterial.EditValue = "榛樿";
}
@@ -63,7 +63,6 @@
this.TextEditName.Text = _ElbowVmo.Name;
this.TextEditCoefficient.Text = _ElbowVmo.MinorLoss.ToString();
this.DescriptionTextEdit.Text = _ElbowVmo.Description;
- this.TextEditKeyWorld.Text = string.Join(",", _ElbowVmo.KeyWord);
this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>(_ElbowVmo.Flags);
}
@@ -119,9 +118,9 @@
}
//鎵惧埌鏈�鐩歌繎鐨勬潗鏂�
- private AssetsElbowCoefficientVmo GetCoefficientByMaterial(string name)
+ private AssetsElbowFactorVmo GetCoefficientByMaterial(string name)
{
- AssetsElbowCoefficientVmo select = null;
+ AssetsElbowFactorVmo select = null;
int maxMatchedChars = 0;
foreach (var item in _AssetsElbowCoefficient)
{
@@ -165,7 +164,7 @@
else
{
_ElbowVmo.Caliber = null;
- }
+ }
if (double.TryParse(TextEditCoefficient.Text, out double Coefficient))
{
_ElbowVmo.MinorLoss = Coefficient;
--
Gitblit v1.9.3