From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurveHelper.cs | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/helper/SimulationPrintLossCurveHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurveHelper.cs
similarity index 60%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/helper/SimulationPrintLossCurveHelper.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurveHelper.cs
index 0745633..f8f42d5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/helper/SimulationPrintLossCurveHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurveHelper.cs
@@ -1,54 +1,48 @@
-锘縰sing Mapster;
-using Yw.EPAnet;
+锘縰sing Yw.EPAnet;
using Yw.Hydro;
using Yw.Model;
-using Yw.Vmo;
-namespace HStation.WinFrmUI
+namespace Yw.WinFrmUI
{
/// <summary>
///
/// </summary>
- public class SimulationPrintLossCurveHelper
+ public class HydroLossCurveHelper
{
/// <summary>
- ///
+ /// 鍒涘缓
/// </summary>
- /// <returns></returns>
- public static SimulationPrintLossCurveViewModel Create
+ public static HydroLossCurveViewModel Create
(
Yw.Model.HydroModelInfo hydroInfo,
HydroWorkingVmo working,
- HydroVisualInfo visual,
+ HydroNodeInfo node,
HydroCalcuResult calcuResult = null,
bool isHead = false,
List<HydroEvaluationVmo> allEvaluationList = null
)
{
- var vm = new SimulationPrintLossCurveViewModel();
-
//楠岃瘉
if (hydroInfo == null)
{
- return vm;
+ return default;
}
if (working == null)
{
- return vm;
+ return default;
}
- if (visual == null)
+ if (node == null)
{
- return vm;
+ return default;
}
- //璧嬪�兼ā鍨嬩俊鎭紝閬垮厤骞叉壈
- //var newHydroInfo = hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
- //newHydroInfo.UpdateWorkingInfo(working.WorkingInfo);
+ var vm = new HydroLossCurveViewModel();
//璁＄畻缁撴灉
if (calcuResult == null)
{
+ hydroInfo.UpdateWorkingInfo(working.WorkingInfo);
calcuResult = hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss, isHead, allEvaluationList);
if (!calcuResult.Succeed)
{
@@ -57,25 +51,24 @@
}
var allCalcuVisualDict = calcuResult.GetVisualDict();
-
-
+ //绠＄嚎
var network = hydroInfo.ToNetwork();
if (network == null)
{
return vm;
}
- var node = network.GetAllNodes()?.Find(x => x.Id == visual.Code);
- if (node == null)
+ var epaNode = network.GetAllNodes()?.Find(x => x.Id == node.Code);
+ if (epaNode == null)
{
return vm;
}
- var allStartPathList = network.AnalyzeUpstreamPath(node, calcuResult.EPAnetCalcuResult);
+ var allStartPathList = network.AnalyzeUpstreamPath(epaNode, calcuResult.EPAnetCalcuResult);
if (allStartPathList == null)
{
allStartPathList = new List<Link>();
}
- var allEndPathList = network.AnalyzeDownstreamPath(node, calcuResult.EPAnetCalcuResult);
+ var allEndPathList = network.AnalyzeDownstreamPath(epaNode, calcuResult.EPAnetCalcuResult);
if (allEndPathList == null)
{
allEndPathList = new List<Link>();
@@ -88,23 +81,25 @@
return vm;
}
var allVisualDict = hydroInfo.GetVisualDict();
- vm.Items = new List<SimulationPrintLossCurveItemViewModel>();
+ vm.Items = new List<HydroLossCurveItemViewModel>();
foreach (var epaLoss in allEpaLossList)
{
var visualNode = allVisualDict.GetValue(epaLoss.Id);
if (visualNode != null)
{
- var item = new SimulationPrintLossCurveItemViewModel(epaLoss, visualNode);
+ var item = new HydroLossCurveItemViewModel(epaLoss, visualNode);
vm.Items.Add(item);
}
}
- vm.Elev = new SimulationPrintLossCurveElevViewModel(vm.Items);
- vm.Start = new SimulationPrintLossCurveStartViewModel(vm.Items);
- vm.End = new SimulationPrintLossCurveEndViewModel(vm.Items);
- vm.Total = new SimulationPrintLossCurveTotalViewModel(vm.Items);
+ vm.Elev = new HydroLossCurveElevViewModel(vm.Items);
+ vm.Start = new HydroLossCurveStartViewModel(vm.Items);
+ vm.End = new HydroLossCurveEndViewModel(vm.Items);
+ vm.Total = new HydroLossCurveTotalViewModel(vm.Items);
+ vm.Lower = new HydroLossCurveLowerViewModel(vm.Items);
return vm;
+
}
--
Gitblit v1.9.3