tx
2025-04-10 2538101febc78f525945da72c7cdcb2589f9e6ea
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;
                }
            }
        }