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/17-compressor/AssetsCompressorSingleMatchingCtrl.cs | 90 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs
index 6d0c68a..d24859a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.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
{
@@ -18,19 +9,36 @@
InitializeComponent();
this.layoutControl1.SetupLayoutControl();
this.gridView1.SetLimitView();
- this.gridView1.RegistCustomDrawCell();
+ this.gridView1.RegistCustomDrawCell(Color.BurlyWood, Color.White);
this.generalSearchCtrl1.SearchEvent += Search;
this.generalSearchCtrl1.ClearEvent += Clear;
+ this.phartDiagramRelationGridViewCtrl1.SelectDataEvent += SelectData;
}
public List<AssetsCompressorSingleMatchingViewModel> _allList = null;//鎵�鏈夊垪琛�
private List<AssetsCompressorSingleMatchingViewModel> _allBindingList = null;//鎵�鏈夌粦瀹氬垪琛�
private AssetsCompressorMainVmo _selected = null;//褰撳墠閫変腑
+ private AssetsCompressorSingleMatchingViewModel _row;
+ private CompressorMatchingViewModel _viewModel;
+
+ private long? _curveDbId;
+
+ public class CompressorMatchingViewModel
+ {
+ public CompressorMatchingViewModel()
+ {
+ }
+
+ public AssetsCompressorMainVmo 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.AssetsCompressorMain>.Instance.GetAll();
_allList = new List<AssetsCompressorSingleMatchingViewModel>();
@@ -40,20 +48,22 @@
var item = allList?.Find(x => x.ID == id);
_selected = item;
}
+ if (long.TryParse(curveDbId, out long curveid))
+ {
+ _curveDbId = curveid;
+ }
Search();
+ await Task.Delay(300);
if (_selected != null)
{
if (_allBindingList != null && _allBindingList.Count > 0)
{
- await Task.Run(() =>
- {
- var dataSourceIndex = _allBindingList.FindIndex(x => x.Vmo == _selected);
- if (dataSourceIndex >= 0)
- {
- var rowIndex = this.gridView1.GetRowHandle(dataSourceIndex);
- this.gridView1.FocusedRowHandle = rowIndex;
- }
- });
+ var dataSourceIndex = _allBindingList.FindIndex(x => x.Vmo == _selected);
+ if (dataSourceIndex >= 0)
+ {
+ var rowIndex = this.gridView1.GetRowHandle(dataSourceIndex);
+ this.gridView1.FocusedRowHandle = rowIndex;
+ }
}
}
}
@@ -99,28 +109,46 @@
/// <summary>
/// 鑾峰彇
/// </summary>
- public AssetsCompressorMainVmo Get()
+ public CompressorMatchingViewModel Get()
{
- var vm = this.gridView1.GetFocusedRow() as AssetsCompressorSingleMatchingViewModel;
- if (vm == null)
- {
- return default;
- }
- return vm.Vmo;
+ /* var vm = this.gridView1.GetFocusedRow() as AssetsCompressorSingleMatchingViewModel;
+ if (vm == null)
+ {
+ return default;
+ }
+ _viewModel.Vmo = vm;
+ */
+ return _viewModel;
}
//鑱氱劍鏀瑰彉
private void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
+ _viewModel = new CompressorMatchingViewModel();
var row = this.gridView1.GetFocusedRow() as AssetsCompressorSingleMatchingViewModel;
if (row == null)
{
return;
}
- this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.CompressorMain, row.Vmo.ID);
+ _row = row;
+ _viewModel.Vmo = row.Vmo;
+ this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.CompressorMain, 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