From 71267850a6874e6721d7e322932605de23d805f5 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:54:11 +0800
Subject: [PATCH] _NodeColour、_LinkColour改成public
---
Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs | 2
Hydraulic/Hydro.MapView/Model/MeterViewModel.cs | 6 ++
Hydraulic/Hydro.MapUI/Map/MapViewer.resx | 158 ++++++++++++++++++++++++++--------------------------
Hydraulic/Hydro.MapUI/Map/MapViewer.cs | 4
Hydraulic/Hydro.MapView/MapViewNetWork.cs | 5 +
5 files changed, 93 insertions(+), 82 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
index 7cb806d..f225372 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
@@ -341,7 +341,7 @@
this.toolStripSeparator21});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1019, 25);
+ this.toolStrip1.Size = new System.Drawing.Size(1073, 25);
this.toolStrip1.TabIndex = 6;
this.toolStrip1.Text = "toolStrip1";
//
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
index 80a5f96..3be446d 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
@@ -4514,8 +4514,8 @@
Form_Colour form_Colour = new Form_Colour(_Template.Colours);
form_Colour.Show(this);
}
- Colour _NodeColour = null;
- Colour _LinkColour = null;
+ public Colour _NodeColour = null;
+ public Colour _LinkColour = null;
private void cb_Node_Colour_Click(object sender, EventArgs e)
{
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.resx b/Hydraulic/Hydro.MapUI/Map/MapViewer.resx
index d5b5684..e1b1e6d 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.resx
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.resx
@@ -574,22 +574,22 @@
<data name="toolStripButton_娣诲姞姘存车.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- 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
+ 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
</value>
</data>
<data name="toolStripButton_娣诲姞闃�闂�.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -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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
- 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
- CmL2oeoAAAAASUVORK5CYII=
+ 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
+ 9PgNd7gCAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton_閲嶅鍣�.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -764,7 +764,7 @@
<data name="toolStripButton_鍒锋柊.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAeCAYAAABNChwpAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVFhHxZZRR0RBFMfnioiIPklEpFhSq3buRuy+9BQR
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVFhHxZZRR0RBFMfnioiIPklElFhSq3buRuy+9BQR
EX2Ec2efEj311FNPvbRExBIREUtfJZZYIuqc2WPume62yb0z/Ri7e/7nzv+/u3PnjipDkppPO7Q55VJc
XAA7snMux8MP8A8higFsiAuWwzM+AA6dXar29RS3hUOaKm2O5GcMcRU8hDS0Bd05kDUcXdWGaauFQJpx
SalmZy9ZgQ+h3QYLIUzyAETa2f0WoqdaZzOsVocw8AMQGlpJzby7Hm0eKg8xMQChYdsL0TBP+HfMsjpC
@@ -772,7 +772,7 @@
DffxAuBPTt9aXPOK62MhTgBrbvp5Pwxw11y0Wl4sN+xk48DbjlZ+3kvmsMRqOX4NgBtP0oBH14eLkNYB
q+WZGIDMcZG5HrwN0bzGajX8GAAfPljrOZ3Mm2aD1epwBjKANYc7p+FWTLshq9VSCDAyv/HNjbZaCLwA
ePrB166rkbk2O9waBmdGA49g7j2eBehxzG3h8AJIczyQcEtYxgWgIxnL4SmaZ/ssxcEz19khl+MhzI+5
- 9EeU+gIcni3sFKgGawAAAABJRU5ErkJggg==
+ 9EeU+gIBvi3onIGxPAAAAABJRU5ErkJggg==
</value>
</data>
<data name="姘村钩鏃嬭浆ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1086,31 +1086,31 @@
<data name="toolStripDropDownButton_宸ュ叿.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- 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
+ 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
</value>
</data>
<data name="閲嶇疆ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/Hydraulic/Hydro.MapView/MapViewNetWork.cs b/Hydraulic/Hydro.MapView/MapViewNetWork.cs
index 9919ac7..0df3766 100644
--- a/Hydraulic/Hydro.MapView/MapViewNetWork.cs
+++ b/Hydraulic/Hydro.MapView/MapViewNetWork.cs
@@ -37,6 +37,11 @@
public NodeViewModel EndPoint { get; set; }
/// <summary>
+ /// 褰撻噺闆嗗悎锛屽綋閲忔ā鏉縄D锛�<鍣ㄥ叿ID锛屾暟閲�>
+ /// </summary>
+ //public Dictionary<long,Dictionary<long,int>> DlList { get; set; }
+
+ /// <summary>
/// 鏍稿績鎵胯浇瀛楁
/// </summary>
//public new List<NodeViewModel> Nodes = new List<NodeViewModel>();
diff --git a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
index 6c3f8bf..c73a0a7 100644
--- a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
@@ -14,5 +14,11 @@
if (string.IsNullOrEmpty(PatternID)) PatternID = "";
return $"{ID}\t{Elev}\t{Demand}\t{PatternID}\t;\t";
}
+
+ /// <summary>
+ /// 褰撻噺妯℃澘ID
+ /// </summary>
+ public long DlTemplateID { get; set; }
+
}
}
--
Gitblit v1.9.3