From ca1ccd0dd9f2d6936368f07d14a2b29b309fd151 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 15:59:25 +0800
Subject: [PATCH] 增加单独匹配界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
index 4ecdb13..c765f4e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
@@ -34,11 +34,11 @@
private List<PhartViewModel> _allPhartList = null;
private readonly Lazy<BLL.XhsValveMainPhartMappingExtensions> _bll_ex = new();
- private ValveMatchingViewModel _pumpMatchingViewModel;
+ private HydroValveMatchingViewModel _pumpMatchingViewModel;
- private List<CurvePointMatchingViewModel> _currentCurvePoint;
+ private List<HydroCurvePointViewModel> _currentCurvePoint;
- public async void SetBindingData(ValveMatchingViewModel valveMatchingViewModel)
+ public async void SetBindingData(HydroValveMatchingViewModel valveMatchingViewModel)
{
_pumpMatchingViewModel = valveMatchingViewModel;
_allBindingList = new List<ValveSingleMatchingViewModel>();
@@ -60,7 +60,7 @@
}
}
}
- _currentCurvePoint = new List<CurvePointMatchingViewModel>();
+ _currentCurvePoint = new List<HydroCurvePointViewModel>();
}
//闃�闂ㄥ瀷鍙峰垪琛ㄩ�夋嫨椤瑰垏鎹簨浠�
@@ -86,7 +86,7 @@
}
_pumpMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
_pumpMatchingViewModel.MatchingMaterial = vm.Material;
- _pumpMatchingViewModel.MatchingValveType = vm.SeriesType;
+ _pumpMatchingViewModel.MatchingValveType = (eValveType?)vm.SeriesType;
_pumpMatchingViewModel.MatchingValveSetting = vm.ValveSetting;
var list = await _bll_ex.Value.GetByValveMainID(vm.ID);
if (list != null && list.Any())
@@ -146,7 +146,7 @@
var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_ql.GraphType, graph_ql.GeometryInfo, 100, null);
foreach (var item in points_qh)
{
- _currentCurvePoint.Add(new CurvePointMatchingViewModel(item.X, item.Y));
+ _currentCurvePoint.Add(new HydroCurvePointViewModel(item.X, item.Y));
}
_pumpMatchingViewModel.MatchingCurveQL = _currentCurvePoint;
}
@@ -155,7 +155,7 @@
var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_ol.GraphType, graph_ol.GeometryInfo, 100, null);
foreach (var item in points_qh)
{
- _currentCurvePoint.Add(new CurvePointMatchingViewModel(item.X, item.Y));
+ _currentCurvePoint.Add(new HydroCurvePointViewModel(item.X, item.Y));
}
_pumpMatchingViewModel.MatchingCurveOL = _currentCurvePoint;
}
--
Gitblit v1.9.3