冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/05-total/HydroLossCurveTotalViewModel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/total/SimulationPrintLossCurveTotalViewModel.cs ÐÞ¸Ä
@@ -1,26 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace HStation.WinFrmUI
namespace Yw.WinFrmUI
{
    /// <summary>
    /// 
    /// </summary>
    public class SimulationPrintLossCurveTotalViewModel
    public class HydroLossCurveTotalViewModel
    {

        /// <summary>
        /// 
        /// </summary>
        public SimulationPrintLossCurveTotalViewModel() { }
        public HydroLossCurveTotalViewModel() { }

        /// <summary>
        /// 
        /// </summary>
        public SimulationPrintLossCurveTotalViewModel(List<SimulationPrintLossCurveItemViewModel> allItemList)
        public HydroLossCurveTotalViewModel(List<HydroLossCurveItemViewModel> allItemList)
        {
            if (allItemList == null || allItemList.Count < 1)
            {
@@ -36,17 +30,17 @@
        /// <summary>
        /// æ°´å¤´æŸå¤±
        /// </summary>
        public double? HeadLoss { get; set; }
        public double HeadLoss { get; set; }

        /// <summary>
        /// å±€éƒ¨æŸå¤±
        /// </summary>
        public double? MinorLoss { get; set; }
        public double MinorLoss { get; set; }

        /// <summary>
        /// æ²¿ç¨‹æŸå¤±
        /// </summary>
        public double? FrictionLoss { get; set; }
        public double FrictionLoss { get; set; }

    }
}