From 9ffb31c233f3b4891550293294c2ee716f77b42a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 22 九月 2024 19:08:49 +0800
Subject: [PATCH] 完善自动匹配

---
 Desktop/HStation.Xhs.Hydro.Test.Core/Form2.cs |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.cs b/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.cs
index 5b4a163..82e42e8 100644
--- a/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.cs
+++ b/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.cs
@@ -1,15 +1,17 @@
-锘縰sing System;
+锘�
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-
-
-
+using Yw.EPAnet;
+using Yw.WinFrmUI.Q3d;
 
 namespace Hydro.ClientTool
 {
@@ -26,11 +28,23 @@
         private void Form2_Load(object sender, EventArgs e)
         {
            
-        }
+            string inptxt=File.ReadAllText(@"D:\Desktop\D_Production\宸ュ叿椤圭洰\ISupply\XHS.V1.0\Hydro\bin\debug\net6.0-windows\test.inp");
+            Network network = InpInteropHelper.FromInpString(inptxt);
+            
 
+            NetworkViewModel net=new NetworkViewModel();
+            
+        }
+        //甯垜缂栧啓涓�涓柟娉曪紝灏唍etwork杞崲涓篘etworkViewModel
+        public NetworkViewModel ConvertNetworkToNetworkViewModel(Network network)
+        {
+            NetworkViewModel net = new NetworkViewModel();
+           
+            return net;
+        }
         private void Form2_KeyDown(object sender, KeyEventArgs e)
         {
-            mapViewer1.MapViewer_KeyDown(sender, e);
+            map.MapViewer_KeyDown(sender, e);
         }
     }
 }

--
Gitblit v1.9.3