Hydraulic/Hydro.Core/Common/Parts.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapUI/Map/MapViewer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapUI/Map/MapViewer.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapView/EditorConvert/DlTemplateEditor.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapView/EditorConvert/EquivalentTemplateModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapView/Hydro.MapView.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydraulic/Hydro.MapView/Model/MeterViewModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Hydraulic/Hydro.Core/Common/Parts.cs
@@ -44,7 +44,7 @@ List<string> sp = line.Split(new char[] { '\t', ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList(); int pos = sp.IndexOf(";"); int pos = sp.IndexOf(";"); if (pos > 0) { _parts = new List<string>(); Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
@@ -160,6 +160,7 @@ <EmbeddedResource Include="Map\DMap.resx"> <DependentUpon>DMap.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="Properties\licenses.licx" /> <EmbeddedResource Include="PropertyFrom.resx"> <DependentUpon>PropertyFrom.cs</DependentUpon> </EmbeddedResource> @@ -309,7 +310,7 @@ <Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Xml" /> <Reference Include="WindowsBase" /> <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <Reference Include="DevExpress.Diagram.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
@@ -118,11 +118,11 @@ this.toolStripTextBox_æ°´å¹³æè½¬è§åº¦ = new System.Windows.Forms.ToolStripTextBox(); this.è½´æè½¬ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.è½´éåToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.缩æ¾ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripTextBox_ç¼©æ¾æ¯ä¾ = new System.Windows.Forms.ToolStripTextBox(); this.toolStripMenuItem_æ¾å¤§2å = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem_缩å°2å = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.å ³éåæToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.å ³éåæä¸èèæ°´æºToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.è¿éæ§æ£æ¥ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -647,7 +647,7 @@ this.toolStripTextBox_æ°´å¹³æè½¬è§åº¦}); this.æ°´å¹³æè½¬ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("æ°´å¹³æè½¬ToolStripMenuItem.Image"))); this.æ°´å¹³æè½¬ToolStripMenuItem.Name = "æ°´å¹³æè½¬ToolStripMenuItem"; this.æ°´å¹³æè½¬ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.æ°´å¹³æè½¬ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.æ°´å¹³æè½¬ToolStripMenuItem.Text = "æ°´å¹³æè½¬"; this.æ°´å¹³æè½¬ToolStripMenuItem.Click += new System.EventHandler(this.æ°´å¹³æè½¬ToolStripMenuItem_Click); // @@ -662,20 +662,15 @@ // this.è½´æè½¬ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("è½´æè½¬ToolStripMenuItem.Image"))); this.è½´æè½¬ToolStripMenuItem.Name = "è½´æè½¬ToolStripMenuItem"; this.è½´æè½¬ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.è½´æè½¬ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.è½´æè½¬ToolStripMenuItem.Text = "è½´æè½¬"; // // è½´éåToolStripMenuItem // this.è½´éåToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("è½´éåToolStripMenuItem.Image"))); this.è½´éåToolStripMenuItem.Name = "è½´éåToolStripMenuItem"; this.è½´éåToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.è½´éåToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.è½´éåToolStripMenuItem.Text = "è½´éå"; // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); // // 缩æ¾ToolStripMenuItem // @@ -685,7 +680,7 @@ this.toolStripMenuItem_缩å°2å}); this.缩æ¾ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("缩æ¾ToolStripMenuItem.Image"))); this.缩æ¾ToolStripMenuItem.Name = "缩æ¾ToolStripMenuItem"; this.缩æ¾ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.缩æ¾ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.缩æ¾ToolStripMenuItem.Text = "缩æ¾"; this.缩æ¾ToolStripMenuItem.Click += new System.EventHandler(this.缩æ¾ToolStripMenuItem_Click); // @@ -699,16 +694,21 @@ // toolStripMenuItem_æ¾å¤§2å // this.toolStripMenuItem_æ¾å¤§2å.Name = "toolStripMenuItem_æ¾å¤§2å"; this.toolStripMenuItem_æ¾å¤§2å.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem_æ¾å¤§2å.Size = new System.Drawing.Size(160, 22); this.toolStripMenuItem_æ¾å¤§2å.Text = "æ¾å¤§2å"; this.toolStripMenuItem_æ¾å¤§2å.Click += new System.EventHandler(this.缩æ¾ToolStripMenuItem_Click); // // toolStripMenuItem_缩å°2å // this.toolStripMenuItem_缩å°2å.Name = "toolStripMenuItem_缩å°2å"; this.toolStripMenuItem_缩å°2å.Size = new System.Drawing.Size(180, 22); this.toolStripMenuItem_缩å°2å.Size = new System.Drawing.Size(160, 22); this.toolStripMenuItem_缩å°2å.Text = "缩å°2å"; this.toolStripMenuItem_缩å°2å.Click += new System.EventHandler(this.缩æ¾ToolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6); // // å ³éåæToolStripMenuItem // @@ -716,7 +716,7 @@ this.å ³éåæä¸èèæ°´æºToolStripMenuItem}); this.å ³éåæToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("å ³éåæToolStripMenuItem.Image"))); this.å ³éåæToolStripMenuItem.Name = "å ³éåæToolStripMenuItem"; this.å ³éåæToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.å ³éåæToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.å ³éåæToolStripMenuItem.Text = "å ³éåæ"; this.å ³éåæToolStripMenuItem.Click += new System.EventHandler(this.å ³éæç´¢èèæ°´æºToolStripMenuItem_Click); // @@ -731,7 +731,7 @@ // this.è¿éæ§æ£æ¥ToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("è¿éæ§æ£æ¥ToolStripMenuItem1.Image"))); this.è¿éæ§æ£æ¥ToolStripMenuItem1.Name = "è¿éæ§æ£æ¥ToolStripMenuItem1"; this.è¿éæ§æ£æ¥ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.è¿éæ§æ£æ¥ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); this.è¿éæ§æ£æ¥ToolStripMenuItem1.Text = "è¿éæ§æ£æ¥"; this.è¿éæ§æ£æ¥ToolStripMenuItem1.Click += new System.EventHandler(this.è¿éæ§æ£æ¥ToolStripMenuItem1_Click); // @@ -739,7 +739,7 @@ // this.䏿¸¸è¿éæ§ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("䏿¸¸è¿éæ§ToolStripMenuItem.Image"))); this.䏿¸¸è¿éæ§ToolStripMenuItem.Name = "䏿¸¸è¿éæ§ToolStripMenuItem"; this.䏿¸¸è¿éæ§ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.䏿¸¸è¿éæ§ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.䏿¸¸è¿éæ§ToolStripMenuItem.Text = "䏿¸¸è¿éæ§"; this.䏿¸¸è¿éæ§ToolStripMenuItem.Click += new System.EventHandler(this.䏿¸¸è¿éæ§ToolStripMenuItem_Click); // @@ -747,14 +747,14 @@ // this.䏿¸¸è¿éæ§ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("䏿¸¸è¿éæ§ToolStripMenuItem.Image"))); this.䏿¸¸è¿éæ§ToolStripMenuItem.Name = "䏿¸¸è¿éæ§ToolStripMenuItem"; this.䏿¸¸è¿éæ§ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.䏿¸¸è¿éæ§ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.䏿¸¸è¿éæ§ToolStripMenuItem.Text = "䏿¸¸è¿éæ§"; // // æ 髿¨æµToolStripMenuItem // this.æ 髿¨æµToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("æ 髿¨æµToolStripMenuItem.Image"))); this.æ 髿¨æµToolStripMenuItem.Name = "æ 髿¨æµToolStripMenuItem"; this.æ 髿¨æµToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.æ 髿¨æµToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.æ 髿¨æµToolStripMenuItem.Text = "æ 髿¨æµ"; this.æ 髿¨æµToolStripMenuItem.Click += new System.EventHandler(this.æ 髿¨æµToolStripMenuItem_Click); // @@ -762,7 +762,7 @@ // this.æ é«å¯¼åºToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("æ é«å¯¼åºToolStripMenuItem.Image"))); this.æ é«å¯¼åºToolStripMenuItem.Name = "æ é«å¯¼åºToolStripMenuItem"; this.æ é«å¯¼åºToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.æ é«å¯¼åºToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.æ é«å¯¼åºToolStripMenuItem.Text = "æ é«å¯¼åº"; this.æ é«å¯¼åºToolStripMenuItem.Click += new System.EventHandler(this.æ é«å¯¼åºToolStripMenuItem_Click); // @@ -770,28 +770,28 @@ // this.æ¾ç¤ºæ°´æµToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("æ¾ç¤ºæ°´æµToolStripMenuItem.Image"))); this.æ¾ç¤ºæ°´æµToolStripMenuItem.Name = "æ¾ç¤ºæ°´æµToolStripMenuItem"; this.æ¾ç¤ºæ°´æµToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.æ¾ç¤ºæ°´æµToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.æ¾ç¤ºæ°´æµToolStripMenuItem.Text = "æ¾ç¤ºæ°´æµè·¯çº¿"; this.æ¾ç¤ºæ°´æµToolStripMenuItem.Click += new System.EventHandler(this.æ¾ç¤ºæ°´æµToolStripMenuItem_Click); // // æ¹åä¿®å¤ToolStripMenuItem // this.æ¹åä¿®å¤ToolStripMenuItem.Name = "æ¹åä¿®å¤ToolStripMenuItem"; this.æ¹åä¿®å¤ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.æ¹åä¿®å¤ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.æ¹åä¿®å¤ToolStripMenuItem.Text = "æ¹åä¿®å¤"; this.æ¹åä¿®å¤ToolStripMenuItem.Click += new System.EventHandler(this.æ¹åä¿®å¤ToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(145, 6); // // å¤å¶ToolStripMenuItem // this.å¤å¶ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("å¤å¶ToolStripMenuItem.Image"))); this.å¤å¶ToolStripMenuItem.Name = "å¤å¶ToolStripMenuItem"; this.å¤å¶ToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C"; this.å¤å¶ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.å¤å¶ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.å¤å¶ToolStripMenuItem.Text = "å¤å¶"; this.å¤å¶ToolStripMenuItem.Click += new System.EventHandler(this.å¤å¶ToolStripMenuItem_Click); // @@ -800,21 +800,21 @@ this.ç²è´´ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ç²è´´ToolStripMenuItem.Image"))); this.ç²è´´ToolStripMenuItem.Name = "ç²è´´ToolStripMenuItem"; this.ç²è´´ToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V"; this.ç²è´´ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.ç²è´´ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.ç²è´´ToolStripMenuItem.Text = "ç²è´´"; this.ç²è´´ToolStripMenuItem.Click += new System.EventHandler(this.ç²è´´ToolStripMenuItem1_Click); // // å é¤ToolStripMenuItem1 // this.å é¤ToolStripMenuItem1.Name = "å é¤ToolStripMenuItem1"; this.å é¤ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.å é¤ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); this.å é¤ToolStripMenuItem1.Text = "å é¤"; this.å é¤ToolStripMenuItem1.Click += new System.EventHandler(this.å é¤ToolStripMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; this.toolStripSeparator15.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator15.Size = new System.Drawing.Size(145, 6); // // 对é½ToolStripMenuItem // @@ -825,7 +825,7 @@ this.ç«ç´å¯¹é½ToolStripMenuItem, this.èªå¨å¯¹é½ToolStripMenuItem}); this.对é½ToolStripMenuItem.Name = "对é½ToolStripMenuItem"; this.对é½ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.对é½ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.对é½ToolStripMenuItem.Text = "对é½"; // // toolStripSeparator16 @@ -868,19 +868,19 @@ // æåToolStripMenuItem // this.æåToolStripMenuItem.Name = "æåToolStripMenuItem"; this.æåToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.æåToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.æåToolStripMenuItem.Text = "æå"; // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; this.toolStripSeparator22.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator22.Size = new System.Drawing.Size(145, 6); // // 楼å±ç®¡çToolStripMenuItem // this.楼å±ç®¡çToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("楼å±ç®¡çToolStripMenuItem.Image"))); this.楼å±ç®¡çToolStripMenuItem.Name = "楼å±ç®¡çToolStripMenuItem"; this.楼å±ç®¡çToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.楼å±ç®¡çToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.楼å±ç®¡çToolStripMenuItem.Text = "楼å±ç®¡ç"; this.楼å±ç®¡çToolStripMenuItem.Click += new System.EventHandler(this.楼å±ç®¡çToolStripMenuItem_Click); // Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
@@ -112,6 +112,8 @@ }; template.BackGroundPoint1 = p4; template.BackGroundPoint2 = new PointF(p3.X, p1.Y); Hydraulic/Hydro.MapUI/Map/MapViewer.cs
@@ -937,6 +937,7 @@ if /*æå ¥ç»æ*/(e.Button == MouseButtons.Left && _isInsertingObject) { var net = _newTemplate.network; var net0 = _newTemplate.network.DeepCopyByBin<MapViewNetWork>(); List<NodeViewModel> nodes = _Nodes.Select(node => (NodeViewModel)node).ToList(); float minDist = 100f; NodeViewModel minNode = null; @@ -1012,6 +1013,11 @@ //_Network.Nodes.AddRange(net.Nodes); //_Network.Links.AddRange(net.Links); _newTemplate.network = net0; _undoOldValue = new PointF3D(0, 0, 0); _OperaNode = _newTemplate.network.Nodes.Find(node => node.ID == _newTemplate.Node1) as NodeViewModel; _isInsertingObject = true; SetMapInvalidate(); return; } Hydraulic/Hydro.MapUI/Map/MapViewer.resx
@@ -613,42 +613,42 @@ <data name="toolStripButton_æ·»å æ°´è¡¨.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> 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 8+KBfVA1AAAAAElFTkSuQmCC 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 yuqRFMcAAAAASUVORK5CYII= </value> </data> <data name="toolStripButton_éå¤å¨.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -1429,16 +1429,17 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAERIeWRyby5NYXBWaWV3LCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1 cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbAwDAAAAUVN5c3RlbS5EcmF3aW5nLCBWZXJzaW9u PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49YjAzZjVmN2YxMWQ1MGEzYQUB AAAAG0h5ZHJvLk1hcFZpZXcuTWFwRGltZW5zaW9ucwwAAAAXPENlbnRlcj5rX19CYWNraW5nRmllbGQV AAAAG0h5ZHJvLk1hcFZpZXcuTWFwRGltZW5zaW9ucw0AAAAXPENlbnRlcj5rX19CYWNraW5nRmllbGQV PHpvb20+a19fQmFja2luZ0ZpZWxkGTxyb3RhdGlvbj5rX19CYWNraW5nRmllbGQKX3JvdGF0aW9uRho8 U2hvd0Zsb29yPmtfX0JhY2tpbmdGaWVsZBo8aXNTaG93UGljPmtfX0JhY2tpbmdGaWVsZB48aXNTaG93 VW5mYXZvcj5rX19CYWNraW5nRmllbGQbPExvY2syRFZpZXc+a19fQmFja2luZ0ZpZWxkGzxpc0VkaXRN b2RlPmtfX0JhY2tpbmdGaWVsZBg8SXNPcnRobz5rX19CYWNraW5nRmllbGQbPENvbG91ck5vZGU+a19f QmFja2luZ0ZpZWxkGzxDb2xvdXJMaW5rPmtfX0JhY2tpbmdGaWVsZAQAAAAAAAAAAAAEBBVTeXN0ZW0u RHJhd2luZy5Qb2ludEYDAAAACwYGCAEBAQEBGEh5ZHJvLk1hcFZpZXcuQ29sb3VyVHlwZQIAAAAYSHlk cm8uTWFwVmlldy5Db2xvdXJUeXBlAgAAAAIAAAAF/P///xVTeXN0ZW0uRHJhd2luZy5Qb2ludEYCAAAA AXgBeQAACwsDAAAAAAAAAAAAAADNzMw9AAAAAAAAAAAAAAAAAAAAAAAAAIABAQAAAQX7////GEh5ZHJv Lk1hcFZpZXcuQ29sb3VyVHlwZQEAAAAHdmFsdWVfXwAIAgAAAAAAAAAB+v////v///8AAAAACw== U2hvd0Zsb29yPmtfX0JhY2tpbmdGaWVsZBo8aXNTaG93UGljPmtfX0JhY2tpbmdGaWVsZBVpc0F1dG9C YWNrZ3JvdW5kSW1hZ2UePGlzU2hvd1VuZmF2b3I+a19fQmFja2luZ0ZpZWxkGzxMb2NrMkRWaWV3Pmtf X0JhY2tpbmdGaWVsZBs8aXNFZGl0TW9kZT5rX19CYWNraW5nRmllbGQYPElzT3J0aG8+a19fQmFja2lu Z0ZpZWxkGzxDb2xvdXJOb2RlPmtfX0JhY2tpbmdGaWVsZBs8Q29sb3VyTGluaz5rX19CYWNraW5nRmll bGQEAAAAAAAAAAAAAAQEFVN5c3RlbS5EcmF3aW5nLlBvaW50RgMAAAALBgYIAQEBAQEBGEh5ZHJvLk1h cFZpZXcuQ29sb3VyVHlwZQIAAAAYSHlkcm8uTWFwVmlldy5Db2xvdXJUeXBlAgAAAAIAAAAF/P///xVT eXN0ZW0uRHJhd2luZy5Qb2ludEYCAAAAAXgBeQAACwsDAAAAAAAAAAAAAADNzMw9AAAAAAAAAAAAAAAA AAAAAAAAAIABAAEAAAEF+////xhIeWRyby5NYXBWaWV3LkNvbG91clR5cGUBAAAAB3ZhbHVlX18ACAIA AAAAAAAAAfr////7////AAAAAAs= </value> </data> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> Hydraulic/Hydro.MapView/EditorConvert/DlTemplateEditor.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,62 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing.Design; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using System.Windows.Forms.Design; namespace Hydro.MapView { public class DlTemplateEditor : UITypeEditor { public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) { return UITypeEditorEditStyle.DropDown; } public override object EditValue(ITypeDescriptorContext context, IServiceProvider serviceProvider, object value) { if (context != null && serviceProvider != null) { IWindowsFormsEditorService editorService = (IWindowsFormsEditorService)serviceProvider.GetService(typeof(IWindowsFormsEditorService)); if (editorService != null) { var filePath = Path.Combine(Directory.GetCurrentDirectory(), "Data\\WaterEquivalent.Json"); List<string> wds = new List<string>(); if (File.Exists(filePath)) { var json = File.ReadAllText(filePath); if (!string.IsNullOrEmpty(json)) { var w = JsonConvert.DeserializeObject<List<EquivalentTemplateModel>>(json); if (w != null) { foreach (var item in w) { wds.Add(item.Name); } } } } // åå»ºä¸æå表 ComboBox comboBox = new ComboBox(); comboBox.Items.AddRange(wds.ToArray()); // æ¾ç¤ºä¸æå表 editorService.DropDownControl(comboBox); // è¿åéä¸çå¼ value = comboBox.SelectedItem; } } return value; } } } Hydraulic/Hydro.MapView/EditorConvert/EquivalentTemplateModel.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Hydro.MapView { public class EquivalentTemplateModel { public string Name { get; set; } public long ID { get; set; } public List<WaterEquivalentModel> waterEquivalents { get; set; } public EquivalentTemplateModel() { waterEquivalents = new List<WaterEquivalentModel>(); } } public class WaterEquivalentModel { /// <summary> /// å¨å ·åç§° /// </summary> public string WaterUtensilName { get; set; } /// <summary> /// æ°é /// </summary> public int Count { get; set; } /// <summary> /// é¢å®æµé /// </summary> public double RatedFlow { get; set; } /// <summary> /// æå°é¢å®æµé /// </summary> public double MinRatedFlow { get; set; } } } Hydraulic/Hydro.MapView/Hydro.MapView.csproj
@@ -72,6 +72,7 @@ <Compile Include="Common\MapDimensions.cs" /> <Compile Include="Common\ShouldSerializeContractResolver.cs" /> <Compile Include="Common\TempForEnum.cs" /> <Compile Include="EditorConvert\EquivalentTemplateModel.cs" /> <Compile Include="Enum\MapViewEnum.cs" /> <Compile Include="MapViewNetWork.cs" /> <Compile Include="MapViewNetWork2Inp.cs" /> @@ -94,6 +95,7 @@ <Compile Include="Template\Floor.cs" /> <Compile Include="Template\Template.cs" /> <Compile Include="Template\TemplateList.cs" /> <Compile Include="EditorConvert\DlTemplateEditor.cs" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Hydro.CommonBase\Hydro.CommonBase.csproj"> Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
@@ -58,7 +58,12 @@ { NodeViewModel j = null; if (parts[-2] == "Meter") j = new MeterViewModel(); { var m = new MeterViewModel(); m.DlTemplateID = parts.ToString(-4, ""); j = m; } else if (parts[-2] == "Nozzle") { var n = new NozzleViewModel(); @@ -1017,7 +1022,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}"); 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}"); }); Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
@@ -1,8 +1,11 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing.Design; using System.Linq; using System.Text; using System.Threading.Tasks; using static System.ComponentModel.TypeConverter; namespace Hydro.MapView { @@ -15,10 +18,10 @@ return $"{ID}\t{Elev}\t{Demand}\t{PatternID}\t;\t"; } /// <summary> /// å½é模æ¿ID /// </summary> public long DlTemplateID { get; set; } [Category("åºæ¬ä¿¡æ¯")] [DisplayName("å½é模æ¿")] [Editor(typeof(DlTemplateEditor),typeof(UITypeEditor))] [Browsable(true)] public string DlTemplateID { get; set; } } }