From 342b10ed5f4ebbccf2d2868d211fbe91cf3e8d5d Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期三, 19 三月 2025 09:10:27 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

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

diff --git a/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs b/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs
index 6b914bf..01c14d3 100644
--- a/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs
+++ b/Desktop/HStation.Xhs.Hydro.Test.Core/Form2.Designer.cs
@@ -30,33 +30,31 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form2));
-            mapViewer1 = new MapUI.MapViewer();
+            map = new Yw.WinFrmUI.Q3d.Drawer();
             SuspendLayout();
             // 
             // mapViewer1
             // 
-            mapViewer1._IsEditMode = true;
-            mapViewer1._newTemplate = null;
-            mapViewer1._ShowJunction = true;
-            mapViewer1._ShowValve = true;
-            mapViewer1._Template = null;
-            mapViewer1.BackColor = System.Drawing.Color.Transparent;
-            mapViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            mapViewer1.junction_multiply = 1F;
-            mapViewer1.Link_multiply = 1F;
-            mapViewer1.Location = new System.Drawing.Point(0, 0);
-            mapViewer1.Lock2DView = false;
-            mapViewer1.MapCenter = (System.Drawing.PointF)resources.GetObject("mapViewer1.MapCenter");
-            mapViewer1.mapOption = (MapView.MapDimensions)resources.GetObject("mapViewer1.mapOption");
-            mapViewer1.Margin = new System.Windows.Forms.Padding(4);
-            mapViewer1.Name = "mapViewer1";
-            mapViewer1.Rotation = 0D;
-            mapViewer1.RotationF = 90D;
-            mapViewer1.ShowStatusBar = true;
-            mapViewer1.showToolBar = true;
-            mapViewer1.Size = new System.Drawing.Size(1484, 944);
-            mapViewer1.TabIndex = 0;
-            mapViewer1.zoom = 1F;
+            map.IsEditMode = true;
+         
+
+ 
+
+
+            map.BackColor = System.Drawing.Color.Transparent;
+            //map.Dock = System.Windows.Forms.DockStyle.Fill;
+
+            map.Location = new System.Drawing.Point(0, 0);
+        
+
+            map.Margin = new System.Windows.Forms.Padding(4);
+            map.Name = "mapViewer1";
+
+    
+   
+            map.Size = new System.Drawing.Size(1484, 944);
+            map.TabIndex = 0;
+            map.zoom = 1F;
             // 
             // Form2
             // 
@@ -64,7 +62,7 @@
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             AutoValidate = System.Windows.Forms.AutoValidate.EnableAllowFocusChange;
             ClientSize = new System.Drawing.Size(1484, 944);
-            Controls.Add(mapViewer1);
+            Controls.Add(map);
             DoubleBuffered = true;
             Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon");
             KeyPreview = true;
@@ -80,7 +78,7 @@
 
         #endregion
 
-        private MapUI.MapViewer mapViewer1;
-        //private MapUI.PropertyForm propertyForm1;
+        private Yw.WinFrmUI.Q3d.Drawer map;
+   
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3