单泵匹配界面修改

duheng

2024-12-23 3c918c55e51c67bbd48e1780967b547ee71845c1

单泵匹配界面修改

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.Designer.cs

@@ -50,6 +50,7 @@
            sidePanel3 = new SidePanel();
            layoutControl3 = new DevExpress.XtraLayout.LayoutControl();
            gridControlCurve = new DevExpress.XtraGrid.GridControl();
            phartViewModelBindingSource = new BindingSource(components);
            gridViewCurve = new DevExpress.XtraGrid.Views.Grid.GridView();
            gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,7 +68,6 @@
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            phartViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)ribbon).BeginInit();
            ((ISupportInitialize)repSearchCtrl).BeginInit();
            ((ISupportInitialize)gridControlPumpMain).BeginInit();
@@ -77,6 +77,7 @@
            ((ISupportInitialize)layoutControl3).BeginInit();
            layoutControl3.SuspendLayout();
            ((ISupportInitialize)gridControlCurve).BeginInit();
            ((ISupportInitialize)phartViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridViewCurve).BeginInit();
            ((ISupportInitialize)layoutControlGroup6).BeginInit();
            ((ISupportInitialize)layoutControlGroup7).BeginInit();
@@ -92,7 +93,6 @@
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlGroup1).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)phartViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // ribbon
@@ -306,13 +306,17 @@
            gridControlCurve.TabIndex = 4;
            gridControlCurve.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridViewCurve });
            // 
            // phartViewModelBindingSource
            // 
            phartViewModelBindingSource.DataSource = typeof(PhartViewModel);
            // 
            // gridViewCurve
            // 
            gridViewCurve.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn3, gridColumn2, gridColumn1 });
            gridViewCurve.GridControl = gridControlCurve;
            gridViewCurve.Name = "gridViewCurve";
            gridViewCurve.OptionsView.ShowGroupPanel = false;
            gridViewCurve.FocusedRowChanged += gridViewCurve_FocusedRowChanged;
             gridViewCurve.FocusedRowChanged += gridViewCurve_FocusedRowChanged;
            // 
            // gridColumn3
            // 
@@ -474,10 +478,6 @@
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // phartViewModelBindingSource
            // 
            phartViewModelBindingSource.DataSource = typeof(PhartViewModel);
            // 
            // SimulationPumpSingleMatchingDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -500,6 +500,7 @@
            ((ISupportInitialize)layoutControl3).EndInit();
            layoutControl3.ResumeLayout(false);
            ((ISupportInitialize)gridControlCurve).EndInit();
            ((ISupportInitialize)phartViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridViewCurve).EndInit();
            ((ISupportInitialize)layoutControlGroup6).EndInit();
            ((ISupportInitialize)layoutControlGroup7).EndInit();
@@ -515,7 +516,6 @@
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlGroup1).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)phartViewModelBindingSource).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs

@@ -20,7 +20,6 @@
            public string OtherName { get; set; }
            public int Importance { get; set; }
            public int SortCode { get; set; }
            //    public PhartDiagramExGraphListVmo Diagram { get; set; }

            public long DiagramID { get; set; }
        }
@@ -60,9 +59,9 @@
            }

            this.gridControlPumpMain.DataSource = _pump_mian_vm_list;
            this.gridControlPumpMain.RefreshDataSource();
            this.gridViewPumpMain.BestFitColumns();
            this.gridViewPumpMain.FocusedRowHandle = sel_index;
            // this.gridControlPumpMain.RefreshDataSource();
        }

        private void barBtnOK_ItemClick(object sender, ItemClickEventArgs e)
@@ -119,7 +118,8 @@
            //this.gridControlCurve.DataSource = _phart_vm_list;
            //this.gridViewCurve.RefreshData();
            this.phartViewModelBindingSource.ResetBindings(false);
            this.gridViewCurve.FocusInvalidRow();
            //this.gridViewCurve.FocusInvalidRow();
            gridViewCurve_FocusedRowChanged(null, null);
        }

        private async void gridViewCurve_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
@@ -159,24 +159,6 @@
            }
            var vmo = await BLLFactory<Yw.BLL.PhartDiagramExtensions>.Instance.GetByID(phart.DiagramID);
            this.pumpChartViewCtrl1.SetBindingData(vmo, _pumpVmo.RatedSpeed);
            /*     var diagram = phart.Diagram;
                 if (!OutPtList
                     (diagram,
                     out List<Yw.Geometry.Point2d> qh_pt_list,
                     out List<Yw.Geometry.Point2d> qe_pt_list,
                     out List<Yw.Geometry.Point2d> qp_pt_list
                     ))
                 {
                     this.xtrPerform2dChart1.InitialChartData();
                     return;
                 }

                 var cubic_spline_qh = new Yw.Geometry.CubicSpline2d(qh_pt_list);
                 var cubic_spline_qe = new Yw.Geometry.CubicSpline2d(qe_pt_list);
                 var cubic_spline_qp = new Yw.Geometry.CubicSpline2d(qp_pt_list);
                 var disp_paras = diagram.DispParas;
                 var is_calc_disp_paras = string.IsNullOrWhiteSpace(disp_paras);
                 this.xtrPerform2dChart1.SetBindingData(cubic_spline_qh, cubic_spline_qe, cubic_spline_qp, disp_paras, is_calc_disp_paras);*/
        }
    }
}