大改

tx

9 天以前 e0b138b3e057de6f57021e6c8963868f5c5acc5a

 TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/MainPage性能测试/FeatTestHelper.cs

@@ -262,19 +262,19 @@
                    && x.Property == TProduct.Model.MonitorTypeProperty.杩涘彛);


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

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

                if (_pumpRatedParas.IsInletPress)
                {
@@ -299,18 +299,18 @@
                    && x.Property == TProduct.Model.MonitorTypeProperty.杩涘彛);


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

                if (_pumpRatedParas.IsInletPress)
                {
@@ -348,15 +348,15 @@
            double p2m = UnitConvert_MPa2M(p2mpa);
            double rPipeOutV = 0;
            double height_oulet = 0;
            if (moinitor_press_outlet.PipeDia != null && moinitor_press_outlet.PipeDia > 10)
            {
                double mm_outlet_dia = moinitor_press_outlet.PipeDia.Value;
                rPipeOutV = OtherPressCoeff * total_flow_m3h / mm_outlet_dia / mm_outlet_dia;
            }
            if (moinitor_press_outlet.Elevation != null)
            {
                height_oulet = moinitor_press_outlet.Elevation.Value;
            }
            //if (moinitor_press_outlet.PipeDia != null && moinitor_press_outlet.PipeDia > 10)
            //{
            //    double mm_outlet_dia = moinitor_press_outlet.PipeDia.Value;
            //    rPipeOutV = OtherPressCoeff * total_flow_m3h / mm_outlet_dia / mm_outlet_dia;
            //}
            //if (moinitor_press_outlet.Elevation != null)
            //{
            //    height_oulet = moinitor_press_outlet.Elevation.Value;
            //}


            double gc = height_oulet - height_inlet;//楂樺樊