From 7b072c0563be4c57325f44fbf6ac828756ae582e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期六, 08 六月 2024 11:07:26 +0800
Subject: [PATCH] 解决冲突
---
Hydraulic/Hydro.MapView/Model/MeterViewModel.cs | 9 +++++----
Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs b/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
index 2ba8a4b..47d98b3 100644
--- a/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
+++ b/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
@@ -59,7 +59,7 @@
if (parts[-2] == "Meter")
{
var m = new MeterViewModel();
- m.DlTemplateID = ToDisplyName(parts.ToString(-4, ""));
+ m.DlTemplateID = parts.ToString(-4, "");
j = m;
}
else if (parts[-2] == "Nozzle")
@@ -995,7 +995,7 @@
if (o is JunctionViewModel j)
junctionStringBuilder.AppendLine(j.ToString() + $"{j.Level}\tJunction\t{o.Tags}");
else if (o is MeterViewModel m)
- junctionStringBuilder.AppendLine(m.ToString() + $"{o.Level}\tMeter\t{o.Tags}\t{m.GetTemplateID()}");
+ junctionStringBuilder.AppendLine(m.ToString() + $"{o.Level}\tMeter\t{o.Tags}\t{m.DlTemplateID}");
else if (o is NozzleViewModel no)
junctionStringBuilder.AppendLine(no.ToString() + $"{o.Level}\tNozzle\t{o.Tags}\t{no.FlowCoefficient}");
});
diff --git a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
index 586cda1..1e26e91 100644
--- a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
@@ -18,10 +18,11 @@
return $"{ID}\t{Elev}\t{Demand}\t{PatternID}\t;\t";
}
- public string GetTemplateID()
- {
- return Convert.ToString(DlTemplateEditor.ImageComboBoxEdit.EditValue);
- }
+ /*
+ public string GetTemplateID()
+ {
+ return Convert.ToString(DlTemplateEditor.ImageComboBoxEdit.EditValue);
+ }*/
[Category("鍩烘湰淇℃伅")]
[DisplayName("褰撻噺妯℃澘")]
--
Gitblit v1.9.3