From 2538101febc78f525945da72c7cdcb2589f9e6ea Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期四, 10 四月 2025 17:37:33 +0800
Subject: [PATCH] 添加无产品测试
---
TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcFeatTestData/CalcFeatTestData1Dlg.cs | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcFeatTestData/CalcFeatTestData1Dlg.cs b/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcFeatTestData/CalcFeatTestData1Dlg.cs
index ba2b3ff..7da587c 100644
--- a/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcFeatTestData/CalcFeatTestData1Dlg.cs
+++ b/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcFeatTestData/CalcFeatTestData1Dlg.cs
@@ -361,10 +361,11 @@
{
if (_pumpRatedParas == null)
{
- if (isShowError)
- XtraMessageBox.Show("鏈缃车棰濆畾鍙傛暟锛�", "闂纭",
- MessageBoxButtons.OK, MessageBoxIcon.Question);
- return false;
+ _speedSimuMethod = Model.eSpeedSimuMethod.涓嶆崲绠�;
+ // if (isShowError)
+ // XtraMessageBox.Show("鏈缃车棰濆畾鍙傛暟锛�", "闂纭",
+ //MessageBoxButtons.OK, MessageBoxIcon.Question);
+ // return false;
}
#region 杞��,娴侀噺
@@ -567,7 +568,7 @@
height_inlet = moinitor_press_inlet.Entity.Elevation.Value;
}
- if (_pumpRatedParas.IsInletPress)
+ if (_pumpRatedParas != null && _pumpRatedParas.IsInletPress)
{
if (moinitor_press_inlet == null || moinitor_press_inlet.DispValue == null)
{
@@ -580,6 +581,15 @@
double p1mpa = Eventech.Common.UnitHHelper.toMPa(press_unit,
moinitor_press_inlet.DispValue.Value);
p1m = UnitConvert_MPa2M(p1mpa);
+ }
+ else
+ {
+ if (moinitor_press_inlet != null && moinitor_press_inlet.DispValue != null)
+ {
+ double p1mpa = Eventech.Common.UnitHHelper.toMPa(press_unit,
+ moinitor_press_inlet.DispValue.Value);
+ p1m = UnitConvert_MPa2M(p1mpa);
+ }
}
}
@@ -1082,14 +1092,23 @@
base.SetPumpInfo(series, pump);
bci杞�熸崲绠�.Enabled = false;
- if (_speedSimuMethod == Model.eSpeedSimuMethod.涓嶆崲绠�)
+ if(pump == null)
{
bci杞�熸崲绠�.Checked = false;
+ _speedSimuMethod = Model.eSpeedSimuMethod.涓嶆崲绠�;
}
else
{
- bci杞�熸崲绠�.Checked = true;
+ if (_speedSimuMethod == Model.eSpeedSimuMethod.涓嶆崲绠�)
+ {
+ bci杞�熸崲绠�.Checked = false;
+ }
+ else
+ {
+ bci杞�熸崲绠�.Checked = true;
+ }
}
+
}
--
Gitblit v1.9.3