大改

tx

8 天以前 e0b138b3e057de6f57021e6c8963868f5c5acc5a

 TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcFeatTestData/CalcFeatTestData1Dlg.cs

@@ -534,12 +534,12 @@
                    this._bindingData.Find(x => x.Entity.MonitorType == Model.eMonitorType.水位 &&
                    x.Entity.Property == TProduct.Model.MonitorTypeProperty.进口);

                if (moinitor_press_inlet != null &&
                  moinitor_press_inlet.Entity != null &&
                  moinitor_press_inlet.Entity.Elevation != null)
                {
                    height_inlet = moinitor_press_inlet.Entity.Elevation.Value;
                }
                //if (moinitor_press_inlet != null &&
                //  moinitor_press_inlet.Entity != null &&
                //  moinitor_press_inlet.Entity.Elevation != null)
                //{
                //    height_inlet = moinitor_press_inlet.Entity.Elevation.Value;
                //}

                if (moinitor_press_inlet != null && moinitor_press_inlet.DispValue != null)
                {
@@ -552,21 +552,21 @@
                    this._bindingData.Find(x => x.Entity.MonitorType == Model.eMonitorType.压力 &&
                    x.Entity.Property == TProduct.Model.MonitorTypeProperty.进口);

                if (moinitor_press_inlet != null &&
                    moinitor_press_inlet.Entity != null &&
                    moinitor_press_inlet.Entity.PipeDia != null &&
                    moinitor_press_inlet.Entity.PipeDia > 10)
                {
                    double mm_inlet_dia = moinitor_press_inlet.Entity.PipeDia.Value;
                    rPipeInV = OtherPressCoeff * total_flow_m3h / mm_inlet_dia / mm_inlet_dia;
                }
                //if (moinitor_press_inlet != null &&
                //    moinitor_press_inlet.Entity != null &&
                //    moinitor_press_inlet.Entity.PipeDia != null &&
                //    moinitor_press_inlet.Entity.PipeDia > 10)
                //{
                //    double mm_inlet_dia = moinitor_press_inlet.Entity.PipeDia.Value;
                //    rPipeInV = OtherPressCoeff * total_flow_m3h / mm_inlet_dia / mm_inlet_dia;
                //}

                if (moinitor_press_inlet != null &&
                   moinitor_press_inlet.Entity != null &&
                   moinitor_press_inlet.Entity.Elevation != null)
                {
                    height_inlet = moinitor_press_inlet.Entity.Elevation.Value;
                }
                //if (moinitor_press_inlet != null &&
                //   moinitor_press_inlet.Entity != null &&
                //   moinitor_press_inlet.Entity.Elevation != null)
                //{
                //    height_inlet = moinitor_press_inlet.Entity.Elevation.Value;
                //}

                if (_pumpRatedParas != null && _pumpRatedParas.IsInletPress)
                {
@@ -611,15 +611,15 @@
            double p2m = UnitConvert_MPa2M(p2mpa);
            double rPipeOutV = 0;
            double height_oulet = 0;
            if (moinitor_press_outlet.Entity.PipeDia != null && moinitor_press_outlet.Entity.PipeDia > 5)
            {
                double mm_outlet_dia = moinitor_press_outlet.Entity.PipeDia.Value;
                rPipeOutV = OtherPressCoeff * total_flow_m3h / mm_outlet_dia / mm_outlet_dia;// OtherPressCoeff = 4 * 1000 / Math.PI / 3.6;
            }
            if (moinitor_press_outlet.Entity.Elevation != null)
            {
                height_oulet = moinitor_press_outlet.Entity.Elevation.Value;
            }
            //if (moinitor_press_outlet.Entity.PipeDia != null && moinitor_press_outlet.Entity.PipeDia > 5)
            //{
            //    double mm_outlet_dia = moinitor_press_outlet.Entity.PipeDia.Value;
            //    rPipeOutV = OtherPressCoeff * total_flow_m3h / mm_outlet_dia / mm_outlet_dia;// OtherPressCoeff = 4 * 1000 / Math.PI / 3.6;
            //}
            //if (moinitor_press_outlet.Entity.Elevation != null)
            //{
            //    height_oulet = moinitor_press_outlet.Entity.Elevation.Value;
            //}