个人中心修改

duheng

2025-02-07 80ef0be2e44f42d6f7dc0f9c928de0dbe7362138

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs

@@ -442,7 +442,7 @@
                        {
                            var opening = Yw.WinFrmUI.PhartGraphHelper.GetGraphParas<Yw.WinFrmUI.Phart.QLGraphParasViewModel>((Yw.Ahart.eCurveType)def.Diagram.GraphList[i].GraphType, def.Diagram.GraphList[i].GraphParas);
                            var model = new HydroFactorCurveViewModel();
                            model.CurveFactor = opening.Opening;
                            model.CurveFactor = opening.Opening ?? 0;
                            model.CurveData = new List<HydroCurvePointViewModel>();
                            foreach (var item in curve)
                            {
@@ -1841,6 +1841,7 @@
        public static bool Matching(HydroPressmeterMatchingViewModel input, List<AssetsPressmeterMainVmo> pressmeterVmos)
        {
            //输入参数验证

            if (input == null)
            {
                return false;
@@ -2037,11 +2038,11 @@
            {
                input.MatchingMaterial = translation.Material;
            }
            if (input.MinorLoss < 0)
            if (input.MinorLoss <= 0)
            {
                input.MatchingMinorLoss = translation.MinorLoss;
            }
            if (input.Roughness < 0)
            if (input.Roughness <= 0)
            {
                input.MatchingRoughness = translation.Roughness;
            }
@@ -2053,6 +2054,7 @@
            {
                input.MatchingStartDiameter = translation.StartDiameter;
            }
            input.MatchingTranslationType = (Yw.WinFrmUI.eTranslationType)(int)translation.TranslationType;

            return true;
        }