From 6ea5dced7cd5e9b6136b96f38be4ba4116943524 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 15 六月 2024 12:36:04 +0800
Subject: [PATCH] 提交
---
Hydraulic/Hydro.MapUI/Map/MapViewer.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
index 8536fd3..8fb53ed 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
@@ -2475,6 +2475,12 @@
private void btn_鍒濆垎閰峗Click(object sender, EventArgs e)
{
+ string result = null;
+ if ((result=_Template.network.CheckValidate())!=null)
+ {
+ MessageBox.Show(result);
+ return;
+ }
List<WaterEquivalentSettings> settings = new List<WaterEquivalentSettings>();
settings.Add(new WaterEquivalentSettings()
{
@@ -2489,18 +2495,21 @@
ID=1008,
MinRatedFlow=0.48f,
RatedFlow=0.72f,
+ Count=1,
},
new WaterEquivalent()
{
ID=1009,
MinRatedFlow=0.88f,
RatedFlow=0.96f,
+ Count=2,
},
new WaterEquivalent()
{
ID=1010,
MinRatedFlow=1.08f,
RatedFlow=1.08f,
+ Count=3,
}
}
},
@@ -2527,18 +2536,21 @@
ID=2008,
MinRatedFlow=0.48f,
RatedFlow=0.48f,
+ Count=1,
},
new WaterEquivalent()
{
ID=2009,
MinRatedFlow=0.12f,
RatedFlow=0.12f,
+ Count=5,
},
new WaterEquivalent()
{
ID=2010,
MinRatedFlow=0.16f,
RatedFlow=0.18f,
+ Count=6,
}
}
},
@@ -2549,8 +2561,8 @@
"M31","M32","M33","M34","M35","M36","M37","M38","M39","M40","M41","M42","M43","M44","M45","M46","M47","M48","M49","M50","M51","M52","M53","M54","M55","M56","M57","M58","M59","M60","M61","M62","M63","M64","M65","M66","M67","M68","M69","M70","M71","M72","M73","M74","M75","M76","M77","M78","M79","M80"
},
});
-
- _Network.WaterDistribution(_Template.FullPath, GlobalPath.configPath + "config_waterDistri.wdb",settings,40);
+ var head=_Network.reservoirs.FirstOrDefault().Head;
+ _Network.WaterDistribution(_Template.FullPath, GlobalPath.configPath + "config_waterDistri.wdb",settings,40, head);
}
--
Gitblit v1.9.3