From dbcef6befb123066754141adef6dc3ef6653b6ce Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 02 十二月 2024 14:34:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.cs
similarity index 93%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelCtrl.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.cs
index 029cfb5..af5b88a 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/01-excel/ImportPumpPerform2dByExcelCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/01-excel/PumpImportByExcelCtrl.cs
@@ -2,20 +2,19 @@
using NPOI.HSSF.UserModel;
using System.IO;
-//缂栬緫鍘熷鐨勬�ц兘鏇茬嚎
namespace Yw.WinFrmUI.Phart
{
- public partial class ImportPumpPerform2dByExcelCtrl : DevExpress.XtraEditors.XtraUserControl
+ public partial class PumpImportByExcelCtrl : DevExpress.XtraEditors.XtraUserControl
{
- public ImportPumpPerform2dByExcelCtrl()
+ public PumpImportByExcelCtrl()
{
InitializeComponent();
this.gridView1.SetDefaultEditView();
this.gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- _allBindList = new List<CurrentViewModel>();
- this.bindingSource1.DataSource = _allBindList;
+ _all_bind_list = new List<CurrentViewModel>();
+ this.bindingSource1.DataSource = _all_bind_list;
}
#region CurrentViewModel
@@ -83,7 +82,7 @@
#endregion CurrentViewModel
- private List<CurrentViewModel> _allBindList;
+ private List<CurrentViewModel> _all_bind_list;
private Yw.Geometry.CubicSpline2d
_qh = null,
@@ -178,7 +177,7 @@
col_index_p = 3;
}
- _allBindList.Clear();
+ _all_bind_list.Clear();
double q, h, eta, power;
NPOI.SS.UserModel.IRow rowtemp = null;
@@ -250,10 +249,10 @@
{
throw new Exception("鏁堢巼澶т簬100%");
}
- _allBindList.Add(new CurrentViewModel(index++, q, h, eta, power));
+ _all_bind_list.Add(new CurrentViewModel(index++, q, h, eta, power));
}
- if (_allBindList.Count < 4)
+ if (_all_bind_list.Count < 4)
{
this.xtrPerform2dChart1.InitialChartData();
XtraMessageBox.Show("瀵煎叆鐐硅繃灏�,璇锋墜鍔ㄦ坊鍔犵偣,鐐规暟鑷冲皯4涓偣");
@@ -272,7 +271,7 @@
//鍔犺浇鏇茬嚎
private bool loadChart()
{
- if (_allBindList == null || _allBindList.Count < 4)
+ if (_all_bind_list == null || _all_bind_list.Count < 4)
{
this.xtrPerform2dChart1.InitialChartData();
return false;
@@ -281,9 +280,9 @@
_qh_pt_list = new List<Yw.Geometry.Point2d>();
_qe_pt_list = new List<Yw.Geometry.Point2d>();
_qp_pt_list = new List<Yw.Geometry.Point2d>();
- for (int i = 0; i < _allBindList.Count; i++)
+ for (int i = 0; i < _all_bind_list.Count; i++)
{
- var model = _allBindList[i];
+ var model = _all_bind_list[i];
if (model.H > 0)
_qh_pt_list.Add(new Yw.Geometry.Point2d() { X = model.Q, Y = model.H });
if (model.E >= 0)
--
Gitblit v1.9.3