From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
index 182cecb..cf90bcc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs
@@ -1,13 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+锘縰sing System.Data;
namespace HStation.WinFrmUI
{
@@ -21,16 +12,33 @@
this.gridView1.RegistCustomDrawCell(Color.BurlyWood, Color.White);
this.generalSearchCtrl1.SearchEvent += Search;
this.generalSearchCtrl1.ClearEvent += Clear;
+ this.phartDiagramRelationGridViewCtrl1.SelectDataEvent += SelectData;
}
public List<AssetsExchangerSingleMatchingViewModel> _allList = null;//鎵�鏈夊垪琛�
private List<AssetsExchangerSingleMatchingViewModel> _allBindingList = null;//鎵�鏈夌粦瀹氬垪琛�
private AssetsExchangerMainVmo _selected = null;//褰撳墠閫変腑
+ private AssetsExchangerSingleMatchingViewModel _row;
+ private ExchangerMatchingViewModel _viewModel;
+
+ private long? _curveDbId;
+
+ public class ExchangerMatchingViewModel
+ {
+ public ExchangerMatchingViewModel()
+ {
+ }
+
+ public AssetsExchangerMainVmo Vmo { get; set; }
+ public string MatchingCurveDbId { get; set; }
+ public List<HydroCurvePointViewModel> MatchingCurve { get; set; }
+ }
+
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public async void SetBindingData(string dbId)
+ public async void SetBindingData(string dbId, string curveDbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsExchangerMain>.Instance.GetAll();
_allList = new List<AssetsExchangerSingleMatchingViewModel>();
@@ -39,6 +47,10 @@
{
var item = allList?.Find(x => x.ID == id);
_selected = item;
+ }
+ if (long.TryParse(curveDbId, out long curveId))
+ {
+ _curveDbId = curveId;
}
Search();
await Task.Delay(300);
@@ -97,25 +109,46 @@
/// <summary>
/// 鑾峰彇
/// </summary>
- public AssetsExchangerMainVmo Get()
+ public ExchangerMatchingViewModel Get()
{
- var vm = this.gridView1.GetFocusedRow() as AssetsExchangerSingleMatchingViewModel;
- if (vm == null)
- {
- return default;
- }
- return vm.Vmo;
+ /* var vm = this.gridView1.GetFocusedRow() as AssetsExchangerSingleMatchingViewModel;
+ if (vm == null)
+ {
+ return default;
+ }
+ _viewModel.Vmo = vm;
+ */
+ return _viewModel;
}
//鑱氱劍鏀瑰彉
private void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
+ _viewModel = new ExchangerMatchingViewModel();
var row = this.gridView1.GetFocusedRow() as AssetsExchangerSingleMatchingViewModel;
if (row == null)
{
return;
}
- this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.ExchangerMain, row.Vmo.ID);
+ _row = row;
+ _viewModel.Vmo = row.Vmo;
+ this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.ExchangerMain, row.Vmo.ID, _curveDbId);
+ }
+
+ //鏇茬嚎鏁版嵁鍏宠仈鍙樺寲
+ private void SelectData(PhartDiagramRelationExtensionsVmo def)
+ {
+ if (def != null)
+ {
+ _viewModel.MatchingCurveDbId = def.ID.ToString();
+ var curve = def.Diagram.GraphList[0].GetFeatPointList();
+
+ _viewModel.MatchingCurve = new List<HydroCurvePointViewModel>();
+ foreach (var item in curve)
+ {
+ _viewModel.MatchingCurve.Add(new HydroCurvePointViewModel(item.X, item.Y));
+ }
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3