From ba19a8e1fdbd9818687a850e596bca824856d6e7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 13 十一月 2024 11:29:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.cs
index 08685b9..37f9c77 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.cs
@@ -65,18 +65,26 @@
return;
_ThreeLinkVmo.Description = DescriptionTextEdit.Text.Trim();
_ThreeLinkVmo.Name = TextEditName.Text.Trim();
- _ThreeLinkVmo.KeyWord = TextEditKeyWorld.Text.Trim();
+ _ThreeLinkVmo.KeyWord = this.TextEditKeyWord.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
if (TextEditMaterial.Text != "榛樿")
{
- _ThreeLinkVmo.MaterialName = TextEditMaterial.Text.Trim();
+ _ThreeLinkVmo.Material = TextEditMaterial.Text.Trim();
}
if (double.TryParse(TextEditCaliber.Text, out double caliber))
{
_ThreeLinkVmo.Caliber = caliber;
}
- if (double.TryParse(TextEditCoefficient.Text, out double Coefficient))
+ if (double.TryParse(TextEditCoefficient.Text, out double MinorLoss))
{
- _ThreeLinkVmo.Coefficient = Coefficient;
+ _ThreeLinkVmo.MinorLoss = MinorLoss;
+ }
+ if (double.TryParse(textEditRunThroughCoefficient.Text, out double runThrough))
+ {
+ _ThreeLinkVmo.RunThroughMinorLoss = runThrough;
+ }
+ if (double.TryParse(textEditBranchThroughCoefficient.Text, out double branchThough))
+ {
+ _ThreeLinkVmo.BranchThroughMinorLoss = branchThough;
}
if (await this.ReloadDataEvent.Invoke(_ThreeLinkVmo))
{
--
Gitblit v1.9.3