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/09-Tank/TankSingleMatchingCtrl.cs | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs
index c23198f..dd857ef 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs
@@ -24,7 +24,7 @@
{
public long? Dbid { get; set; }
public long? Curveid { get; set; }
- // public Vmo.XhsTankMainPhartMappingExtensions Curveinfo { get; set; }
+ // public Vmo.XhsTankMainPhartMappingExtensions Curveinfo { get; set; }
}
private List<TankSingleMatchingViewModel> _allBindingList = null;
@@ -32,7 +32,7 @@
private BLL.AssetsTankMain _TankBll = null;
private List<PhartViewModel> _allPhartList = null;
- // private readonly Lazy<BLL.XhsTankMainPhartMappingExtensions> _bll_ex = new();
+ private readonly Lazy<BLL.AssetsTankCoefficient> _bll_ex = new();
private HydroTankMatchingViewModel _pumpMatchingViewModel;
@@ -66,27 +66,22 @@
//闃�闂ㄥ瀷鍙峰垪琛ㄩ�夋嫨椤瑰垏鎹簨浠�
private async void gridView2_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- /*_allPhartList = new List<PhartViewModel>();
+ _allPhartList = new List<PhartViewModel>();
var vm = this.gridView3.GetCurrentViewModel(_allBindingList);
if (vm != null)
{
- if (vm.SeriesType == HStation.Assets.eTankType.GPV || vm.SeriesType == HStation.Assets.eTankType.TCV)
- {
- layoutControlGroup2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
- }
- else
- {
- layoutControlGroup2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- }
_pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
_pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
-
- var list = await _bll_ex.Value.GetByTankMainID(vm.ID);
+ /* _pumpMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
+ _pumpMatchingViewModel.MatchingMaterial = vm.Material;
+ _pumpMatchingViewModel.MatchingTankType = (eTankType?)vm.SeriesType;
+ _pumpMatchingViewModel.MatchingTankSetting = vm.TankSetting;*/
+ var list = await _bll_ex.Value.GetByMainID(vm.ID);
if (list != null && list.Any())
{
foreach (var item in list)
{
- _allPhartList.Add(new PhartViewModel { ID = item.ID, OtherName = item.OtherName, Importance = item.Importance, SortCode = item.SortCode });
+ _allPhartList.Add(new PhartViewModel { ID = item.ID });
}
}
}
@@ -101,58 +96,38 @@
}
}
this.gridControl1.DataSource = _allPhartList;
- this.gridView1.FocusInvalidRow();*/
+ this.gridView1.FocusInvalidRow();
}
//鏌ョ湅鏇茬嚎
private async void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
{
- /* if (e.Column == this.ColShowChart)
- {
- var vm = this.gridView1.GetCurrentViewModel(_allPhartList);
+ if (e.Column == this.ColShowChart)
+ {
+ var vm = this.gridView1.GetCurrentViewModel(_allPhartList);
- var vmo = await _bll_ex.Value.GetByID(vm.ID);
- if (vmo != null)
- {
- var dlg = new TankChartShowDlg();
- dlg.InitChart(vmo);
- dlg.ShowDialog();
- }
- return;
- }*/
+ var vmo = await _bll_ex.Value.GetByID(vm.ID);
+ if (vmo != null)
+ {
+ var dlg = new TankChartShowDlg();
+ dlg.InitChart(vmo.VolCurve);
+ dlg.ShowDialog();
+ }
+ return;
+ }
}
private async void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- /* var vm = this.gridView1.GetCurrentViewModel(_allPhartList);
- _currentCurvePoint.Clear();
- if (vm == null)
- return;
- var vmo = await _bll_ex.Value.GetByID(vm.ID);
- if (vmo != null)
- {
- _pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
- var graph_ql = vmo.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.TankQL);
- var graph_ol = vmo.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.TankOL);
- if (graph_ql != null)
- {
- var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_ql.GraphType, graph_ql.GeometryInfo, 100, null);
- foreach (var item in points_qh)
- {
- _currentCurvePoint.Add(new HydroCurvePointViewModel(item.X, item.Y));
- }
- _pumpMatchingViewModel.MatchingCurveQL = _currentCurvePoint;
- }
- if (graph_ol != null)
- {
- var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_ol.GraphType, graph_ol.GeometryInfo, 100, null);
- foreach (var item in points_qh)
- {
- _currentCurvePoint.Add(new HydroCurvePointViewModel(item.X, item.Y));
- }
- _pumpMatchingViewModel.MatchingCurveOL = _currentCurvePoint;
- }
- }*/
+ var vm = this.gridView1.GetCurrentViewModel(_allPhartList);
+ _currentCurvePoint.Clear();
+ if (vm == null)
+ return;
+ var vmo = await _bll_ex.Value.GetByID(vm.ID);
+ if (vmo != null)
+ {
+ _pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3