单独匹配修改

duheng

2024-12-24 038b668a0a4dc1568e753008ff549a870166723c

单独匹配修改

 Desktop/HStation.Desktop.Xhs.Core/MainForm.cs

@@ -741,7 +741,7 @@
                                    CreatePage(page,guid);
                                }
                            }
                        },   new TilePeekItem(){
                        },   /*new TilePeekItem(){
                            Caption="测试导出",
                            SvgImage=svgImg32Model[2],
                            SvgImageSize=new Size(24,24),
@@ -758,7 +758,7 @@
                                    CreatePage(page,guid);
                                }
                            }
                        },
                        },*/
                        };
                    _AuthConfigCtrl = peakItemList.CreatePeekCtrl();
                }

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/relation/03-grid/PhartDiagramRelationGridViewCtrl.Designer.cs

@@ -71,6 +71,7 @@
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.RowCellClick += gridView1_RowCellClick;
            gridView1.FocusedRowChanged += gridView1_FocusedRowChanged;
            // 
            // colName
            // 

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/relation/03-grid/PhartDiagramRelationGridViewCtrl.cs

@@ -9,6 +9,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Input;
using Yw;

namespace HStation.WinFrmUI
@@ -24,13 +25,19 @@

        private List<PhartDiagramRelationGridItemViewModel> _allBindingList = null;//所有绑定列表

        private string _objectType;

        public Action<List<PhartDiagramRelationExtensionsVmo>> SelectDataEvent;

        /// <summary>
        /// 绑定数据
        /// </summary>
        public async void SetBindingData(string objectType, long objectId)
        {
            _objectType = objectType;
            var allList = await BLLFactory<HStation.BLL.PhartDiagramRelation>.Instance.GetByObjectTypeAndObjectID(objectType, objectId);
            SetBindingData(allList);
            gridView1_FocusedRowChanged(null, null);
        }

        /// <summary>
@@ -59,5 +66,15 @@
                dlg.ShowDialog();
            }
        }

        //行变化事件
        private async void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
            if (vm == null)
                return;
            var list = await new BLL.PhartDiagramRelation().GetExByObjectTypeAndObjectID(_objectType, vm.Vmo.ObjectID);
            SelectDataEvent.Invoke(list);
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs

@@ -1842,27 +1842,28 @@
                }
            }

            var flowmeter = dict.OrderBy(x => x.Value).LastOrDefault().Key;
            input.MatchingDbId = flowmeter.ID.ToString();
            var elbow = dict.OrderBy(x => x.Value).LastOrDefault().Key;
            input.MatchingDbId = elbow.ID.ToString();
            if (string.IsNullOrEmpty(input.ModelType))
            {
                input.MatchingModelType = flowmeter.Name;
                input.MatchingModelType = elbow.Name;
            }
            if (input.MinorLoss <= 0)
            if (input.MinorLoss <= 0 || input.MinorLoss == null)
            {
                input.MatchingMinorLoss = flowmeter.MinorLoss;
                input.MatchingMinorLoss = elbow.MinorLoss;
            }
            if (input.BendingAngle <= 0)
            if (input.BendingAngle <= 0 || input.BendingAngle == null)
            {
                input.MatchingBendingAngle = flowmeter.Angle;
                input.MatchingBendingAngle = elbow.Angle;
            }
            input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)flowmeter.ElbowType;
            input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)elbow.ElbowType;
            //  input.MatchingElbowType = Yw.WinFrmUI.eElbowType.Short;
            if (input.Material == null || input.Material == string.Empty)
            {
                input.MatchingMaterial = flowmeter.Material;
                input.MatchingMaterial = elbow.Material;
            }
            if (!input.Caliber.HasValue)
                input.MatchingCaliber = flowmeter.Caliber;
                input.MatchingCaliber = elbow.Caliber;
            return true;
        }


 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingCtrl.cs

@@ -1,4 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraBars.Ribbon.Drawing;
using DevExpress.XtraEditors;
using DevExpress.XtraMap;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -21,11 +23,28 @@
            this.gridView1.RegistCustomDrawCell(Color.BurlyWood, Color.White);
            this.generalSearchCtrl1.SearchEvent += Search;
            this.generalSearchCtrl1.ClearEvent += Clear;
            this.phartDiagramRelationGridViewCtrl1.SelectDataEvent += SelectData;
        }

        public List<AssetsValveSingleMatchingViewModel> _allList = null;//所有列表
        private List<AssetsValveSingleMatchingViewModel> _allBindingList = null;//所有绑定列表
        private AssetsValveMainVmo _selected = null;//当前选中

        private AssetsValveSingleMatchingViewModel _row;
        private ValveMatchingViewModel _viewModel;

        public class ValveMatchingViewModel
        {
            public ValveMatchingViewModel()
            {
            }

            public AssetsValveMainVmo Vmo { get; set; }
            public string MatchingCurveDbId { get; set; }

            public List<HydroCurvePointViewModel> MatchingCurveQL { get; set; }
            public List<HydroCurvePointViewModel> MatchingCurveOL { get; set; }
        }

        /// <summary>
        /// 绑定数据
@@ -97,25 +116,57 @@
        /// <summary>
        /// 获取
        /// </summary>
        public AssetsValveMainVmo Get()
        public ValveMatchingViewModel Get()
        {
            var vm = this.gridView1.GetFocusedRow() as AssetsValveSingleMatchingViewModel;
            if (vm == null)
            {
                return default;
            }
            return vm.Vmo;
            /*            var vm = this.gridView1.GetFocusedRow() as AssetsValveSingleMatchingViewModel;
                        if (vm == null)
                        {
                            return default;
                        }
                        _viewModel.Vmo = vm;
            */
            return _viewModel;
        }

        //聚焦改变
        private void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            _viewModel = new ValveMatchingViewModel();
            var row = this.gridView1.GetFocusedRow() as AssetsValveSingleMatchingViewModel;
            if (row == null)
            {
                return;
            }
            _row = row;
            _viewModel.Vmo = row.Vmo;
            this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.ValveMain, row.Vmo.ID);
        }

        //曲线数据关联变化
        private void SelectData(List<PhartDiagramRelationExtensionsVmo> list)
        {
            if (list != null && list.Count > 0)
            {
                var def = list.OrderByDescending(x => x.Importance).First();
                _viewModel.MatchingCurveDbId = def.ID.ToString();
                var curve = def.Diagram.GraphList[0].GetFeatPointList();
                if (_row.ValveType == HStation.Assets.eValveType.GPV)
                {
                    _viewModel.MatchingCurveQL = new List<HydroCurvePointViewModel>();
                    foreach (var item in curve)
                    {
                        _viewModel.MatchingCurveQL.Add(new HydroCurvePointViewModel(item.X, item.Y));
                    }
                }
                else if (_row.ValveType == HStation.Assets.eValveType.TCV)
                {
                    _viewModel.MatchingCurveOL = new List<HydroCurvePointViewModel>();
                    foreach (var item in curve)
                    {
                        _viewModel.MatchingCurveOL.Add(new HydroCurvePointViewModel(item.X, item.Y));
                    }
                }
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/03-valve/AssetsValveSingleMatchingDlg.cs

@@ -49,11 +49,15 @@
            {
                return;
            }

            _input.MatchingModelType = vm.Name;
            _input.MatchingMaterial = vm.Material;
            _input.MatchingDiameter = vm.Caliber;
            _input.MinorLoss = vm.MinorLoss;
            _input.MatchingDbId = vm.Vmo.ID.ToString();
            _input.MatchingModelType = vm.Vmo.Name;
            _input.MatchingMaterial = vm.Vmo.Material;
            _input.MatchingDiameter = vm.Vmo.Caliber;
            _input.MatchingMinorLoss = vm.Vmo.MinorLoss;
            _input.MatchingCurveOL = vm.MatchingCurveOL;
            _input.MatchingCurveQL = vm.MatchingCurveQL;
            _input.MatchingCurveDbId = vm.MatchingCurveDbId;
            _input.MatchingValveType = (Yw.WinFrmUI.eValveType)(int)vm.Vmo.ValveType;
            this.ReloadDataEvent?.Invoke(_input);
            this.DialogResult = DialogResult.OK;
            this.Close();

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingCtrl.cs

@@ -1,4 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraBars.Ribbon.Drawing;
using DevExpress.XtraEditors;
using DevExpress.XtraMap;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -21,11 +23,27 @@
            this.gridView1.RegistCustomDrawCell(Color.BurlyWood, Color.White);
            this.generalSearchCtrl1.SearchEvent += Search;
            this.generalSearchCtrl1.ClearEvent += Clear;
            this.phartDiagramRelationGridViewCtrl1.SelectDataEvent += SelectData;
        }

        public List<AssetsTankSingleMatchingViewModel> _allList = null;//所有列表
        private List<AssetsTankSingleMatchingViewModel> _allBindingList = null;//所有绑定列表
        private AssetsTankMainVmo _selected = null;//当前选中

        private AssetsTankSingleMatchingViewModel _row;
        private TankMatchingViewModel _viewModel;

        public class TankMatchingViewModel
        {
            public TankMatchingViewModel()
            {
            }

            public AssetsTankMainVmo Vmo { get; set; }
            public string MatchingCurveDbId { get; set; }

            public List<HydroCurvePointViewModel> MatchingCurve { get; set; }
        }

        /// <summary>
        /// 绑定数据
@@ -65,6 +83,7 @@
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.Contains(name)).ToList();
            }
            var material = this.txtMaterial.Text.Trim();
            this.assetsTankSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
            this.assetsTankSingleMatchingViewModelBindingSource.ResetBindings(false);
        }
@@ -80,25 +99,46 @@
        /// <summary>
        /// 获取
        /// </summary>
        public AssetsTankMainVmo Get()
        public TankMatchingViewModel Get()
        {
            var vm = this.gridView1.GetFocusedRow() as AssetsTankSingleMatchingViewModel;
            if (vm == null)
            {
                return default;
            }
            return vm.Vmo;
            /*            var vm = this.gridView1.GetFocusedRow() as AssetsTankSingleMatchingViewModel;
                        if (vm == null)
                        {
                            return default;
                        }
                        _viewModel.Vmo = vm;
            */
            return _viewModel;
        }

        //聚焦改变
        private void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            _viewModel = new TankMatchingViewModel();
            var row = this.gridView1.GetFocusedRow() as AssetsTankSingleMatchingViewModel;
            if (row == null)
            {
                return;
            }
            _row = row;
            _viewModel.Vmo = row.Vmo;
            this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.TankMain, row.Vmo.ID);
        }

        //曲线数据关联变化
        private void SelectData(List<PhartDiagramRelationExtensionsVmo> list)
        {
            if (list != null && list.Count > 0)
            {
                var def = list.OrderByDescending(x => x.Importance).First();
                _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));
                }
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs

@@ -38,7 +38,15 @@
                return;
            }

            _input.MatchingModelType = vm.Name;
            _input.MatchingModelType = vm.Vmo.Name;
            _input.MatchingCurveDbId = vm.MatchingCurveDbId;
            _input.MatchingMaxLevel = vm.Vmo.MaxLevel;
            _input.MatchingMinLevel = vm.Vmo.MinLevel;
            _input.MatchingMinVol = vm.Vmo.MinVol;
            _input.MatchingOverFlow = vm.Vmo.OverFlow;
            _input.MatchingDN = vm.Vmo.DN;
            _input.MatchingDbId = vm.Vmo.ID.ToString();
            _input.MatchingVolCurve = vm.MatchingCurve;
            this.ReloadDataEvent?.Invoke(_input);
            this.DialogResult = DialogResult.OK;
            this.Close();

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingCtrl.cs

@@ -1,4 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraBars.Ribbon.Drawing;
using DevExpress.XtraEditors;
using DevExpress.XtraMap;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -18,14 +20,29 @@
            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;

        public class CompressorMatchingViewModel
        {
            public CompressorMatchingViewModel()
            {
            }

            public AssetsCompressorMainVmo Vmo { get; set; }
            public string MatchingCurveDbId { get; set; }
            public List<HydroCurvePointViewModel> MatchingCurve { get; set; }
        }

        /// <summary>
        /// 绑定数据
@@ -97,25 +114,47 @@
        /// <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;
            }
            _row = row;
            _viewModel.Vmo = row.Vmo;
            this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.CompressorMain, row.Vmo.ID);
        }

        //曲线数据关联变化
        private void SelectData(List<PhartDiagramRelationExtensionsVmo> list)
        {
            if (list != null && list.Count > 0)
            {
                var def = list.OrderByDescending(x => x.Importance).First();
                _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));
                }
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/17-compressor/AssetsCompressorSingleMatchingDlg.cs

@@ -26,7 +26,7 @@
        private HydroCompressorMatchingViewModel _input = null;

        /// <summary>
        /// 
        ///
        /// </summary>
        public void SetBindingData(HydroCompressorMatchingViewModel input)
        {
@@ -50,14 +50,16 @@
                return;
            }

            _input.MatchingModelType = vm.Name;
            _input.MatchingMaterial = vm.Material;
            _input.MatchingDiameter = vm.Diameter;
            _input.MinorLoss = vm.MinorLoss;
            _input.MatchingModelType = vm.Vmo.Name;
            _input.MatchingMaterial = vm.Vmo.Material;
            _input.MatchingDiameter = vm.Vmo.Diameter;
            _input.MatchingMinorLoss = vm.Vmo.MinorLoss;
            _input.MatchingCurveQL = vm.MatchingCurve;
            _input.MatchingDbId = vm.Vmo.ID.ToString();
            _input.MatchingCurveDbId = vm.MatchingCurveDbId;
            this.ReloadDataEvent?.Invoke(_input);
            this.DialogResult = DialogResult.OK;
            this.Close();
        }

    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingCtrl.cs

@@ -1,4 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraBars.Ribbon.Drawing;
using DevExpress.XtraEditors;
using DevExpress.XtraMap;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -21,11 +23,26 @@
            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;

        public class ExchangerMatchingViewModel
        {
            public ExchangerMatchingViewModel()
            {
            }

            public AssetsExchangerMainVmo Vmo { get; set; }
            public string MatchingCurveDbId { get; set; }
            public List<HydroCurvePointViewModel> MatchingCurve { get; set; }
        }

        /// <summary>
        /// 绑定数据
@@ -97,25 +114,47 @@
        /// <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;
            }
            _row = row;
            _viewModel.Vmo = row.Vmo;
            this.phartDiagramRelationGridViewCtrl1.SetBindingData(HStation.Assets.DataType.ExchangerMain, row.Vmo.ID);
        }

        //曲线数据关联变化
        private void SelectData(List<PhartDiagramRelationExtensionsVmo> list)
        {
            if (list != null && list.Count > 0)
            {
                var def = list.OrderByDescending(x => x.Importance).First();
                _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));
                }
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-exchanger/AssetsExchangerSingleMatchingDlg.cs

@@ -26,7 +26,7 @@
        private HydroExchangerMatchingViewModel _input = null;

        /// <summary>
        /// 
        ///
        /// </summary>
        public void SetBindingData(HydroExchangerMatchingViewModel input)
        {
@@ -50,14 +50,16 @@
                return;
            }

            _input.MatchingModelType = vm.Name;
            _input.MatchingMaterial = vm.Material;
            _input.MatchingDiameter = vm.Diameter;
            _input.MinorLoss = vm.MinorLoss;
            _input.MatchingModelType = vm.Vmo.Name;
            _input.MatchingMaterial = vm.Vmo.Material;
            _input.MatchingDiameter = vm.Vmo.Diameter;
            _input.MatchingMinorLoss = vm.Vmo.MinorLoss;
            _input.MatchingCurveQL = vm.MatchingCurve;
            _input.MatchingDbId = vm.Vmo.ID.ToString();
            _input.MatchingCurveDbId = vm.MatchingCurveDbId;
            this.ReloadDataEvent?.Invoke(_input);
            this.DialogResult = DialogResult.OK;
            this.Close();
        }

    }
}