From 1ec65a7b983a7d519c3602d20a855ac1bac1825e Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:24:40 +0800
Subject: [PATCH] 修改电价辅助类的命名空间
---
WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs | 69 +++++++++++++---------------------
1 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.cs
index f4325a4..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;
@@ -284,43 +298,14 @@
this._ViewModel = viewMode;
- //if ( _Template?.Floors!=null)
- //{
-
- // _Template.Floors.ForEach(f=>
- // {
- // var btn = new ToolStripButton(" "+f.Name+" ");
- // btn.Click += (s, e) =>
- // {
- // this.mapOption.ShowFloor = f.FloorIndex;
- // if (f.MapView != null )
- // {
- // this.mapOption= f.MapView.Copy();
- // }
- // this.SetInvalidated();
- // };
- // ToolStripMenuItem_Floor.DropDownItems.Add(btn);
-
- // });
- //}
-
- //_Template.network = null;
+
if (!LoadData()) return;
- //LoadData();
- // temp.network.LoadRepeaters();
-
- // map.SetStartEndPoint(temp.Node1, temp.Node2);
-
if (!reLoad)
{
if (_Template.view == null)
InitCenter();
else
{
- //MapCenter = _Template.view.Center;
- //zoom = _Template.view.zoom;
- //Rotation = _Template.view.rotation;
- //RotationF = _Template.view.rotationF;
this.mapOption = _Template.view.Copy();
SetMapInvalidate();
}
@@ -330,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()
@@ -3500,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();
@@ -3898,17 +3883,17 @@
// 璁＄畻鐐规姇褰卞埌鐩寸嚎涓婄殑鍧愭爣
- List<PointF3D> projectedPoints = new List<PointF3D>();
+ List<PointF3D> modelTemplateedPoints = new List<PointF3D>();
foreach (PointF3D point in points)
{
- double projectedY = slope * point.X + interceptY;
- double projectedZ = slope * point.X + interceptZ;
+ double modelTemplateedY = slope * point.X + interceptY;
+ double modelTemplateedZ = slope * point.X + interceptZ;
- projectedPoints.Add(new PointF3D(point.X, (float)projectedY, (float)projectedZ));
+ modelTemplateedPoints.Add(new PointF3D(point.X, (float)modelTemplateedY, (float)modelTemplateedZ));
}
- return projectedPoints;
+ return modelTemplateedPoints;
}
public void 娣诲姞搴曞浘ToolStripMenuItem_Click(object sender, EventArgs e)
--
Gitblit v1.9.3