From 93bc151189c3956c80701bf1adf7600be6f19ee7 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 23 十月 2024 16:19:13 +0800
Subject: [PATCH] 颜色分级

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs |  433 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 350 insertions(+), 83 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index ab10d0e..79007e5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1,9 +1,6 @@
 锘縢lobal using Yw.EPAnet;
 using DevExpress.Mvvm.Native;
-using DevExpress.Pdf.Native;
-using DevExpress.Utils.DirectXPaint;
-using NetTaste;
-using NPOI.SS.Formula.Functions;
+using HStation.WinFrmUI.PhartRelation;
 using Yw.WinFrmUI.Bimface;
 using Yw.WinFrmUI.Hydro;
 
@@ -17,7 +14,8 @@
             this.PageTitle.Caption = "姘村姏妯℃嫙";
             this.PageTitle.HeaderSvgImage = this.svgImg32[0];
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
+            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+            RegistBulkSetEvents();
         }
 
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
@@ -76,9 +74,14 @@
             this.tabPageQ3d.Controls.Clear();
             this.tabPageQ3d.Controls.Add(q3dCtrl);
             q3dCtrl.InitialData(() => _hydroInfo);
+            ShowPropertyCtrl();
+
         }
 
         #region Bimface
+
+        //bimface鎺т欢
+        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
 
         //鑾峰彇 bimface 鎺т欢
         private XhsProjectSimulationBimfaceCtrl GetBimfaceCtrl()
@@ -114,8 +117,7 @@
             return _bimfaceCtrl;
         }
 
-        //bimface鎺т欢
-        private XhsProjectSimulationBimfaceCtrl _bimfaceCtrl = null;
+
 
         //璁剧疆Bimface杩炴帴棰滆壊
         private async void SetBimfaceLinkColor()
@@ -178,7 +180,7 @@
             }
         }
 
-        #endregion Bimface
+        #endregion
 
         #region Q3d
 
@@ -220,7 +222,7 @@
             {
                 _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                 _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.InitialData(() => _hydroInfo);
+                _propertyCtrl.InitialData(() => _hydroInfo, () => GetAllCalcuResultList());
                 _propertyCtrl.BlinkLinkParterEvent += async (code, linkCode) =>
                 { //寮鸿皟杩炴帴缁勪欢
                     if (string.IsNullOrEmpty(code))
@@ -399,7 +401,7 @@
             }
             this.controlContainerBottom.Controls.Clear();
             var matchingListCtrl = GetMatchingListCtrl();
-            var input = AssetsMatchingParasHelper.Create(_hydroInfo);
+            var input = AssetsMatchingParasHelper.Create(_hydroInfo, GetAllCalcuResultList());
             matchingListCtrl.SetBindingData(input);
             this.controlContainerBottom.Controls.Add(matchingListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -572,7 +574,7 @@
 
         #endregion 姘村姏鏍¢獙
 
-        #region 淇濆瓨姘村姏淇℃伅
+        #region 淇濆瓨淇℃伅
 
         //淇濆瓨
         private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -629,7 +631,7 @@
                 return;
             }
             var parterListCtrl = GetParterListCtrl();
-            parterListCtrl.SetBindingData(_hydroInfo, GetAllCalcuResult());
+            parterListCtrl.SetBindingData(_hydroInfo, GetAllCalcuResultList());
             this.controlContainerBottom.Controls.Clear();
             this.controlContainerBottom.Controls.Add(parterListCtrl);
             this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
@@ -667,7 +669,65 @@
 
         #endregion INP瀵煎嚭
 
-        #region 閰嶇疆
+        #region 鎵归噺閰嶇疆
+
+        //娉ㄥ唽鎵归噺閰嶇疆浜嬩欢
+        private void RegistBulkSetEvents()
+        {
+            //姘村簱
+            this.barBtnSetReservoirList.ItemClick += delegate
+            {
+                var dlg = new HydroReservoirBulkSetListDlg();
+                dlg.ShowDialog();
+            };
+            //姘存睜
+            this.barBtnSetTankList.ItemClick += delegate
+            {
+                var dlg = new HydroTankBulkSetListDlg();
+                dlg.ShowDialog();
+            };
+            //姘寸
+            this.barBtnSetWaterboxList.ItemClick += delegate
+            {
+                if (_hydroInfo == null)
+                {
+                    return;
+                }
+                var dlg = new HydroWaterboxBulkSetListDlg();
+                dlg.SetBindingData(_hydroInfo);
+                dlg.ShowDialog();
+            };
+            //杩炴帴鑺傜偣
+            this.barBtnSetJunctionList.ItemClick += delegate
+            {
+                var dlg = new HydroJunctionBulkSetListDlg();
+                dlg.ShowDialog();
+            };
+            //闂峰ご
+            this.barBtnSetBluntheadList.ItemClick += delegate
+            {
+                var dlg = new HydroBluntheadBulkSetListDlg();
+                dlg.ShowDialog();
+            };
+            //寮ご
+            this.barBtnSetElbowsList.ItemClick += delegate
+            {
+                var dlg = new HydroElbowBulkSetListDlg();
+                dlg.ShowDialog();
+            };
+            //涓夐��
+            this.barBtnSetThreelinkList.ItemClick += delegate
+            {
+                var dlg = new HydroThreelinkBulkSetListDlg();
+                dlg.ShowDialog();
+            };
+            //鍥涢��
+            this.barBtnSetFourlinkList.ItemClick += delegate
+            {
+
+            };
+        }
+
 
         //鏄剧ずRadialMenu
         private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -675,74 +735,286 @@
             this.rmSet.ShowPopup(MousePosition, true);
         }
 
-        #endregion 閰嶇疆
+        //寮瑰嚭鍓�
+        private void rmSet_BeforePopup(object sender, CancelEventArgs e)
+        {
+            if (_hydroInfo == null)
+            {
+                e.Cancel = true;
+                return;
+            }
+            //姘村簱
+            if (_hydroInfo.Reservoirs == null || _hydroInfo.Reservoirs.Count < 1)
+            {
+                this.barBtnSetReservoirList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetReservoirList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
 
-        #region 鎬ц兘鏇茬嚎
+            //姘存睜
+            if (_hydroInfo.Tanks == null || _hydroInfo.Tanks.Count < 1)
+            {
+                this.barBtnSetTankList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetTankList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
 
-        //鎬ц兘鏇茬嚎
-        private void barBtnFeatCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+            //姘寸
+            if (_hydroInfo.Waterboxs == null || _hydroInfo.Waterboxs.Count < 1)
+            {
+                this.barBtnSetWaterboxList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetWaterboxList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //杩炴帴鑺傜偣
+            if (_hydroInfo.Junctions == null || _hydroInfo.Junctions.Count < 1)
+            {
+                this.barBtnSetJunctionList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetJunctionList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍠峰槾
+            if (_hydroInfo.Nozzles == null || _hydroInfo.Nozzles.Count < 1)
+            {
+                this.barBtnSetNozzleList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetNozzleList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //娑堢伀鏍�
+            if (_hydroInfo.Hydrants == null || _hydroInfo.Hydrants.Count < 1)
+            {
+                this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //闂峰ご
+            if (_hydroInfo.Bluntheads == null || _hydroInfo.Bluntheads.Count < 1)
+            {
+                this.barBtnSetBluntheadList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetBluntheadList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //寮ご
+            if (_hydroInfo.Elbows == null || _hydroInfo.Elbows.Count < 1)
+            {
+                this.barBtnSetElbowsList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetElbowsList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //涓夐��
+            if (_hydroInfo.Threelinks == null || _hydroInfo.Threelinks.Count < 1)
+            {
+                this.barBtnSetThreelinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetThreelinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍥涢��
+            if (_hydroInfo.Fourlinks == null || _hydroInfo.Fourlinks.Count < 1)
+            {
+                this.barBtnSetFourlinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetFourlinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //姘磋〃
+            if (_hydroInfo.Meters == null || _hydroInfo.Meters.Count < 1)
+            {
+                this.barBtnSetMeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetMeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //娴侀噺璁�
+            if (_hydroInfo.Flowmeters == null || _hydroInfo.Flowmeters.Count < 1)
+            {
+                this.barBtnSetFlowmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetFlowmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鍘嬪姏琛�
+            if (_hydroInfo.Pressmeters == null || _hydroInfo.Pressmeters.Count < 1)
+            {
+                this.barBtnSetPressmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetPressmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //绠¢亾
+            if (_hydroInfo.Pipes == null || _hydroInfo.Pipes.Count < 1)
+            {
+                this.barBtnSetPipeList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetPipeList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //杩囨浮浠�
+            if (_hydroInfo.Translations == null || _hydroInfo.Translations.Count < 1)
+            {
+                this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //鎹㈢儹鍣�
+            if (_hydroInfo.Exchangers == null || _hydroInfo.Exchangers.Count < 1)
+            {
+                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //绌哄帇鏈�
+            if (_hydroInfo.Compressors == null || _hydroInfo.Compressors.Count < 1)
+            {
+                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //姘存车
+            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
+            {
+                this.barBtnSetPumpList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetPumpList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+            //闃�闂�
+            if (_hydroInfo.Valves == null || _hydroInfo.Valves.Count < 1)
+            {
+                this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            }
+            else
+            {
+                this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
+            }
+
+        }
+
+        #endregion
+
+        #region 骞惰仈鍒嗘瀽
+
+        //骞惰仈鍒嗘瀽
+        private void barBtnAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             if (_hydroInfo == null)
             {
                 return;
             }
-            if (_calcuResult == null)
+            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
             {
                 return;
             }
-            if (!_calcuResult.Succeed)
+            var allCalcuResultList = GetAllCalcuResultList();
+            var vmList = new List<XhsSinglePumpViewModel>();
+            foreach (var pump in _hydroInfo.Pumps)
             {
-                return;
-            }
-            var pumps = _hydroInfo.Pumps;
-            var curve_list = _hydroInfo.Curves;
-            if (curve_list == null || !curve_list.Any())
-            {
-                return;
-            }
-            var vmList = new List<Yw.WinFrmUI.Phart.PumpSerialParallelViewModel>();
-            foreach (var x in pumps)
-            {
-                if (!x.RatedN.HasValue)
+                if (!pump.RatedN.HasValue)
                 {
                     continue;
                 }
-                var qh = curve_list.Find(t => t.Code == x.CurveQH)?.CurveData;
-                var qe = curve_list.Find(t => t.Code == x.CurveQE)?.CurveData;
-                var qp = curve_list.Find(t => t.Code == x.CurveQP)?.CurveData;
-
+                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
+                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
+                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
                 if (qh == null)
                 {
                     continue;
                 }
 
-                var rated_speed = x.RatedN.Value;
-                var speed_ratio = x.SpeedRatio;
+                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
+                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
 
-                var qh_pt_list = qh.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                var qe_pt_list = qe?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-                var qp_pt_list = qp?.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
-
-                var vm = new Yw.WinFrmUI.Phart.PumpSerialParallelViewModel();
-                vm.Id = x.Code;
-                vm.Name = x.Code;
-                //vm.IsBp = ;
-                vm.RatedSpeed = rated_speed;
-                vm.CurrentSpeed = Math.Round(rated_speed * speed_ratio);
-                vm.CurrentHz = Math.Round(vm.CurrentSpeed / vm.RatedSpeed * 50, 1);
-
-                vm.Qh = new Yw.Geometry.CubicSpline2d(qh_pt_list);
-                vm.Qe = new Yw.Geometry.CubicSpline2d(qe_pt_list);
-                vm.Qp = new Yw.Geometry.CubicSpline2d(qp_pt_list);
+                var vm = new XhsSinglePumpViewModel();
                 vmList.Add(vm);
+                vm.ID = pump.ID;
+                vm.Name = pump.Name;
+                vm.Code = pump.Code;
+                vm.IsBp = true;
+                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
+                vm.RatedHz = pump.RatedHz;
+                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
+                vm.RatedSpeed = pump.RatedN.Value;
+                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
+                vm.CurveQH = qhPtList;
+                vm.CurveQE = qePtList;
+                vm.CurveQP = qpPtList;
+
+                if (allCalcuResultList != null && allCalcuResultList.Count > 0)
+                {
+                    var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
+                    if (calcuResult != null)
+                    {
+                        if (calcuResult.CalcuFlow.HasValue)
+                        {
+                            vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
+                        }
+
+                        var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
+                        var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
+                        if (calcuResultStart != null && calcuResultEnd != null)
+                        {
+                            if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
+                            {
+                                vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
+                            }
+                        }
+                    }
+                }
+
             }
 
-            var dlg = new HStation.WinFrmUI.PhartRelation.PumpSerialParallelChartDlg();
-            dlg.SetBindingData(vmList, null, true);
+            var dlg = new PumpParallelChartDlg();
+            dlg.SetBindingData(vmList);
             dlg.ShowDialog();
         }
 
-        #endregion 鎬ц兘鏇茬嚎
+        #endregion
 
         #region 姘村姏璁$畻
 
@@ -802,7 +1074,7 @@
         }
 
         //鑾峰彇璁$畻缁撴灉
-        private List<IHydroCalcuResult> GetAllCalcuResult()
+        private List<IHydroCalcuResult> GetAllCalcuResultList()
         {
             if (_hydroInfo == null)
             {
@@ -1034,11 +1306,13 @@
 
         #region 棰滆壊鍒嗙骇
 
+        //棰滆壊鍒嗙骇搴旂敤鍒楄〃
         private List<HydroGradingApplyViewModel> _allGradingApplyList = null;
+        //棰滆壊鍒嗙骇缂栫爜鍒楄〃
         private List<string> _allGradingCodeList = null;
 
-        //璁剧疆
-        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //璁剧疆棰滆壊鍒嗙骇
+        private void SetGrading()
         {
             if (_hydroInfo == null)
             {
@@ -1049,8 +1323,8 @@
             dlg.ShowDialog();
         }
 
-        //搴旂敤
-        private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //搴旂敤棰滆壊鍒嗙骇
+        private async void ApplyGrading()
         {
             if (_hydroInfo == null)
             {
@@ -1059,15 +1333,7 @@
             if (_allGradingApplyList == null)
             {
                 _allGradingApplyList = new List<HydroGradingApplyViewModel>();
-                if (_hydroInfo.Waterboxs != null && _hydroInfo.Waterboxs.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Waterbox,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Waterbox),
-                        PropName = string.Empty
-                    });
-                }
+
                 if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
                 {
                     _allGradingApplyList.Add(new HydroGradingApplyViewModel()
@@ -1095,18 +1361,9 @@
                         PropName = string.Empty
                     });
                 }
-                if (_hydroInfo.Nozzles != null && _hydroInfo.Nozzles.Count > 0)
-                {
-                    _allGradingApplyList.Add(new HydroGradingApplyViewModel()
-                    {
-                        Code = Yw.Hydro.ParterCatalog.Nozzle,
-                        Name = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Nozzle),
-                        PropName = string.Empty
-                    });
-                }
             }
             var dlg = new ApplyHydroGradingDlg();
-            dlg.SetBindingData(() => _hydroInfo, _allGradingApplyList, GetAllCalcuResult());
+            dlg.SetBindingData(() => _hydroInfo, _allGradingApplyList, GetAllCalcuResultList());
             dlg.ReloadDataEvent += (obj) =>
             {
                 _allGradingCodeList = obj?.Select(x => x.Code).Distinct().ToList();
@@ -1116,13 +1373,22 @@
                     await _bimfaceCtrl?.OverrideComponentsColor(x.Select(t => t.Code).Distinct().ToList(), x.Key, 1);
                 });
             };
-            dlg.ShowDialog();
+            if (dlg.ShowDialog() != DialogResult.OK)
+            {
+                await _bimfaceCtrl?.RestoreComponentsColor(_allGradingCodeList);
+            }
         }
 
-        //鍙栨秷
-        private async void barBtnGradingCancel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        //璁剧疆
+        private void barBtnGradingSet_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
-            await _bimfaceCtrl?.RestoreComponentsColor(_allGradingCodeList);
+            SetGrading();
+        }
+
+        //搴旂敤
+        private void barBtnGradingApply_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            ApplyGrading();
         }
 
         #endregion
@@ -1130,5 +1396,6 @@
 
 
 
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3