From 935a8a4996853c51188402c57f905ee9c9eac898 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 22:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs
index 9d74844..af358f2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/05-elbows/01-elbowsinglematching/ElbowSingleMatchingForm.cs
@@ -8,11 +8,11 @@
this.gridView3.SetNormalView();
}
- private ElbowMatchingViewModel _ElbowMatchingViewModel;
+ private HydroElbowMatchingViewModel _ElbowMatchingViewModel;
private BLL.AssetsElbowMain _ElbowBll;
private List<ElbowSingleMatchingViewModel> _allBindingList;
- public async void SetBindingData(ElbowMatchingViewModel ElbowMatchingViewModel)
+ public async void SetBindingData(HydroElbowMatchingViewModel ElbowMatchingViewModel)
{
_ElbowMatchingViewModel = ElbowMatchingViewModel;
_allBindingList = new List<ElbowSingleMatchingViewModel>();
@@ -38,8 +38,8 @@
_ElbowMatchingViewModel.MatchingCaliber = vm.Caliber;
_ElbowMatchingViewModel.MatchingMaterial = vm.Material;
_ElbowMatchingViewModel.MatchingModelType = vm.ModelType;
- _ElbowMatchingViewModel.MatchingAngle = vm.Angle;
- _ElbowMatchingViewModel.MatchingConnectionLength = vm.ElbowLengthType;
+ _ElbowMatchingViewModel.MatchingBendingAngle = vm.Angle;
+ _ElbowMatchingViewModel.MatchingElbowType = (eElbowType?)(int)vm.ElbowType;
}
}
}
--
Gitblit v1.9.3