| Desktop/HStation.Xhs.Hydro.Test.Core/Form3.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Desktop/HStation.Xhs.Hydro.Test.Core/Form3.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Desktop/HStation.Xhs.Hydro.Test.Core/Form3.Designer.cs
@@ -48,6 +48,9 @@ toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); 关于AToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); propertyGrid1 = new System.Windows.Forms.PropertyGrid(); 导出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); iNPToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); jSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -75,7 +78,7 @@ // // 文件FToolStripMenuItem // 文件FToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 打开OToolStripMenuItem, toolStripSeparator, 退出XToolStripMenuItem }); 文件FToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { 打开OToolStripMenuItem, 导出ToolStripMenuItem, toolStripSeparator, 退出XToolStripMenuItem }); 文件FToolStripMenuItem.Name = "文件FToolStripMenuItem"; 文件FToolStripMenuItem.Size = new System.Drawing.Size(58, 21); 文件FToolStripMenuItem.Text = "文件(&F)"; @@ -86,19 +89,19 @@ 打开OToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; 打开OToolStripMenuItem.Name = "打开OToolStripMenuItem"; 打开OToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O; 打开OToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 打开OToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 打开OToolStripMenuItem.Text = "打开(&O)"; 打开OToolStripMenuItem.Click += 打开OToolStripMenuItem_Click; // // toolStripSeparator // toolStripSeparator.Name = "toolStripSeparator"; toolStripSeparator.Size = new System.Drawing.Size(162, 6); toolStripSeparator.Size = new System.Drawing.Size(177, 6); // // 退出XToolStripMenuItem // 退出XToolStripMenuItem.Name = "退出XToolStripMenuItem"; 退出XToolStripMenuItem.Size = new System.Drawing.Size(165, 22); 退出XToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 退出XToolStripMenuItem.Text = "退出(&X)"; 退出XToolStripMenuItem.Click += 退出XToolStripMenuItem_Click; // @@ -186,6 +189,26 @@ propertyGrid1.Size = new System.Drawing.Size(244, 528); propertyGrid1.TabIndex = 2; // // 导出ToolStripMenuItem // 导出ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { iNPToolStripMenuItem, jSONToolStripMenuItem }); 导出ToolStripMenuItem.Name = "导出ToolStripMenuItem"; 导出ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); 导出ToolStripMenuItem.Text = "导出"; // // iNPToolStripMenuItem // iNPToolStripMenuItem.Name = "iNPToolStripMenuItem"; iNPToolStripMenuItem.Size = new System.Drawing.Size(180, 22); iNPToolStripMenuItem.Text = "INP"; iNPToolStripMenuItem.Click += iNPToolStripMenuItem_Click; // // jSONToolStripMenuItem // jSONToolStripMenuItem.Name = "jSONToolStripMenuItem"; jSONToolStripMenuItem.Size = new System.Drawing.Size(180, 22); jSONToolStripMenuItem.Text = "JSON"; // // Form3 // AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -225,5 +248,8 @@ private System.Windows.Forms.ToolStripMenuItem 简单计算ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 局部损失计算ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem 导出ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem iNPToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem jSONToolStripMenuItem; } } Desktop/HStation.Xhs.Hydro.Test.Core/Form3.cs
@@ -249,7 +249,7 @@ this.Close(); } private void 简单计算ToolStripMenuItem_Click(object sender, EventArgs e) { @@ -322,12 +322,23 @@ var Snode = _network.GetAllNodes().FirstOrDefault(n => n.Id == node.ID); var links = _network.AnalyzeDownstreamPath(Snode, calcResult); if (links == null || links.Count <= 0) return; map.SetSelectObj(links.Select(l => l.Id).ToList()); var result = _network.GetChartNodeByPathLinks(links, calcResult); } } private void iNPToolStripMenuItem_Click(object sender, EventArgs e) { //打开文件对话框,将 _network.ToInpString();导出 var sfd = new SaveFileDialog(); sfd.Filter = "inp文件|*.inp"; if (sfd.ShowDialog() == DialogResult.OK) { File.WriteAllText(sfd.FileName, _network.ToInpString()); } } } } Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj
@@ -32,7 +32,10 @@ <ItemGroup> <Compile Remove="Form1.cs" /> <Compile Remove="Form1.Designer.cs" /> <Compile Remove="Form2.cs" /> <Compile Remove="Form2.Designer.cs" /> <EmbeddedResource Remove="Form1.resx" /> <EmbeddedResource Remove="Form2.resx" /> </ItemGroup> <ItemGroup> <Folder Include="temp\" /> Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj.user
@@ -4,9 +4,6 @@ <ProjectView>ShowAllFiles</ProjectView> </PropertyGroup> <ItemGroup> <Compile Update="Form2.cs"> <SubType>Form</SubType> </Compile> <Compile Update="Form3.cs"> <SubType>Form</SubType> </Compile> Hydro/Yw.EPAnet.Calcu.Core/03-calcu/NetworkPathAnalyseExtensions.cs
@@ -168,6 +168,7 @@ var dictLinks = calcuResult.LinkList.ToDictionary(p => p.Id); var dictNodes = calcuResult.NodeList.ToDictionary(p => p.Id); var visitedNodes = new HashSet<Node>(); visitedNodes.Add(startJunc); var nextLinks = startJunc.GetNextLinks(calcuResult.LinkList); if (nextLinks==null || nextLinks.Count <= 0) return nextLinks; @@ -198,7 +199,7 @@ /// <param name="direction">遍历方向,0表示双向,1表示正向,-1表示反向</param> /// <param name="isOnlyMax">是否只取最大流量的分支</param> /// <returns></returns> public static List<Link> TraversePipeNetworkALL(this Network network, Link startLink, HashSet<Node> visitedNodes = null, int direction = 0, bool isOnlyMax = false,CalcuResult calcuResult=null) public static List<Link> TraversePipeNetworkALL(this Network network, Link startLink, HashSet<Node> visitedNodes, int direction = 0, bool isOnlyMax = false,CalcuResult calcuResult=null) { var dictLinks = calcuResult.LinkList.ToDictionary(p => p.Id); var dictNodes = calcuResult.NodeList.ToDictionary(p => p.Id); @@ -207,8 +208,7 @@ Queue<Link> queue = new Queue<Link>(); queue.Enqueue(startLink); if (visitedNodes == null) visitedNodes = new HashSet<Node>(); while (queue.Count > 0) {
