From 0fd4a678c2218c42d383e964a6b4aca975aa7b7a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 14:32:51 +0800
Subject: [PATCH] 图表修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/03-one-point/ImportPumpPerform2dByOnePointCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs
similarity index 97%
rename from WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/03-one-point/ImportPumpPerform2dByOnePointCtrl.cs
rename to WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs
index c28e96f..497a26e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/v1/01-perform/01-pump-chart/05-import/03-one-point/ImportPumpPerform2dByOnePointCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/v2/02-pump/05-import/03-one-point/PumpImportByOnePointCtrl.cs
@@ -1,17 +1,16 @@
锘縰sing DevExpress.XtraEditors;
using NPOI.Util;
-
-
+
namespace Yw.WinFrmUI.Phart
{
/// <summary>
/// (寰呬慨鏀�)
/// </summary>
- public partial class ImportPumpPerform2dByOnePointCtrl : XtraUserControl
+ public partial class PumpImportByOnePointCtrl : XtraUserControl
{
//鏋勯�犲嚱鏁�
- public ImportPumpPerform2dByOnePointCtrl()
+ public PumpImportByOnePointCtrl()
{
InitializeComponent();
this.comboBoxType.SelectedIndex = 0;
@@ -21,7 +20,7 @@
}
double _ratedn = -1;
- PumpGroupPt _work_point = null;
+ PumpQueryPointViewModel _work_point = null;
List<Yw.Geometry.Point2d> _qh_pt_list = null;
List<Yw.Geometry.Point2d> _qe_pt_list = null;
List<Yw.Geometry.Point2d> _qp_pt_list = null;
@@ -86,7 +85,7 @@
return false;
}
- _work_point = new PumpGroupPt();
+ _work_point = new PumpQueryPointViewModel();
_work_point.Q = double.Parse(this.txtQ.Text);
_work_point.H = double.Parse(this.txtH.Text);
if (_work_point.H < 1 || _work_point.Q < 1)
@@ -112,10 +111,10 @@
MessageBox.Show("鏁堢巼鏈夎繖涔堝ぇ鍚�?");
return false;
}
- _work_point.P = PumpCalcHelper.CalculateP(_work_point.Q, _work_point.H, _work_point.E);
+ _work_point.P = PumpCalcHelper.CalculateP(_work_point.Q, _work_point.H, _work_point.E.Value);
if (string.IsNullOrWhiteSpace(this.txtP.Text))
{
- this.txtP.EditValue = Math.Round(_work_point.P, 1);
+ this.txtP.EditValue = Math.Round(_work_point.P.Value, 1);
}
//姹借殌
double NPSHr = 0;
@@ -125,7 +124,7 @@
NPSHr = Math.Round(NPSHr, 1);
this.txtNPSH.EditValue = NPSHr;
}
- _work_point.NPSH = NPSHr;
+ //_work_point.NPSH = NPSHr;
//寰楀埌鐐逛綅缃�
--
Gitblit v1.9.3