From 3314fa6d962c399d93b87e45a90ed94050a771da Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 12:12:27 +0800
Subject: [PATCH] 增加场所信息Vmo层
---
WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs
index 33074c0..194c625 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs
@@ -1,8 +1,6 @@
锘�
using Newtonsoft.Json;
-using System.ComponentModel;
using System.Data;
-using System.IO;
using System.Numerics;
using System.Text;
using static Hydro.MapViewEnum;
@@ -10,7 +8,7 @@
namespace Hydro
{
- public partial class MapViewer : UserControl
+ public partial class MapViewer : XtraUserControl
{
#region 涓�銆佸叏灞�
@@ -60,6 +58,22 @@
if (this.statusStrip1 != null) this.statusStrip1.Visible = value;
}
}
+
+ private bool _showPropertyForm = true;
+ [DisplayName("鏄剧ず灞炴�ф爮")]
+ public bool ShowPropertyForm
+ {
+ get
+ {
+ return _showPropertyForm;// this.panel1==null?true:Visible;
+ }
+ set
+ {
+ _showPropertyForm = value;
+ if (this.propertyForm != null) this.propertyForm.Visible = value;
+ }
+ }
+
//public MapViewer()
//{
// this.showToolBar = false;
@@ -266,7 +280,7 @@
}
- Dictionary<TemplateType, bool> _ViewModel = null;
+ Dictionary<PBS.eModelTemplateType, bool> _ViewModel = null;
public void Clear()
{
_Template = null;
@@ -276,7 +290,7 @@
RotationF = 90;
SetMapInvalidate();
}
- public void SetData(Template template, dict<string, dynamic> param = null, Dictionary<TemplateType, bool> viewMode = null)
+ public void SetData(Template template, dict<string, dynamic> param = null, Dictionary<PBS.eModelTemplateType, bool> viewMode = null)
{
this.param = param;
bool reLoad = _Template == template;
@@ -301,7 +315,7 @@
label_center.Text = $"center锛�({MapCenter.X.ToString("0.00")} 锛寋MapCenter.Y.ToString("0.00")}锛�";
label_zoom.Text = $"Zoom锛歿zoom.ToString("0.000")}";
toolStripStatusLabel_rotation.Text = $"Rotation锛�({Rotation.ToString("0")}锛寋RotationF.ToString("0")})";
- //SetInvalidated();
+
}
private void InitCenter()
@@ -3471,7 +3485,7 @@
var result = ofd.ShowDialog();
if (result == DialogResult.OK)
{
- _Template = new Template(new Guid().ToString(), "鏂板缓", "澶嶅埗", TemplateType.鍏朵粬);
+ _Template = new Template(new Guid().ToString(), "鏂板缓", "澶嶅埗", PBS.eModelTemplateType.Custom);
string json = File.ReadAllText(ofd.FileName);
_Template.network = JsonConvert.DeserializeObject<MapViewNetWork>(json);
_Template.network.BuildRelation();
--
Gitblit v1.9.3