修复底图不显示及初始节点颜色的问题

cloudflight

2024-09-25 65c40acf3e641fff1bbf67e048117d29999c9f85

修复底图不显示及初始节点颜色的问题

 Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj

@@ -173,7 +173,6 @@
    <EmbeddedResource Include="Map\DMap.resx">
      <DependentUpon>DMap.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="PropertyFrom.resx">
      <DependentUpon>PropertyFrom.cs</DependentUpon>
    </EmbeddedResource>

 Hydraulic/Hydro.MapUI/Map/DMap.Model.cs

@@ -31,8 +31,20 @@
        /// </summary>
        public MapDimensions mapOption
        {
            get { return TC.mapOption; }
            set { TC.mapOption = value; }
            get 
            { 
                if (_useTCorMV)
                    return TC.mapOption; 
                else
                    return mv.mapOption;
            }
            set 
            { 
                if (_useTCorMV)
                    TC.mapOption = value; 
                else
                    mv.mapOption = value; 
            }
        }
        /// <summary>
        /// 地图选项_起始操作时
@@ -44,17 +56,40 @@
        [Browsable(false)]
        public Template _newTemplate
        {
            get { return TC.newTemplate; }
            set { TC.newTemplate = value; }
            get 
            { 
                if (_useTCorMV)
                    return TC.newTemplate; 
                else
                    return mv._newTemplate; 
            }
            set 
            { 
                if (_useTCorMV)
                    TC.newTemplate = value; 
                else
                    mv._newTemplate = value;
            }
        }


        [Browsable(false)]
        public Template _Template
        {
            get { return TC.template; }
            get 
            { 
                if (_useTCorMV)
                    return TC.template; 
                else
                    return mv._Template;
				
            }
        }


		

        public MapViewer mv = null;
        #endregion
        //#region 交互属性
        ///// <summary>

 Hydraulic/Hydro.MapUI/Map/DMap.cs

@@ -38,16 +38,21 @@

        private bool Inited = false;

        public DrawingStatus Status = DrawingStatus.Ready; 
        public DrawingStatus Status = DrawingStatus.Ready;

        bool _useTCorMV = true;
        public DMap()
        {
            InitializeComponent();
            DoubleBuffered = true;
        }

        //补充参数
        public void Init(TContainer TC, DrawDelegate[] Draws, MouseDelegate[] MouseEvents)
        public void Init( TContainer TC, DrawDelegate[] Draws, MouseDelegate[] MouseEvents)
        {
            _useTCorMV = true;
            this.TC = TC;
       
            this.DrawNet = Draws[0];
            this.DrawNetNew = Draws[1];
            this.DrawBackGroundPic = Draws[2];
@@ -59,7 +64,22 @@
            this.Inited = true;
            this.Status=DrawingStatus.Ready;
        }
        public void Init(MapViewer mv, DrawDelegate[] Draws, MouseDelegate[] MouseEvents)
        {

            _useTCorMV = false;
            this.mv = mv;
            this.DrawNet = Draws[0];
            this.DrawNetNew = Draws[1];
            this.DrawBackGroundPic = Draws[2];
            this.DrawAuxiliary = Draws[3];
            this.onMouseDown = MouseEvents[0];
            this.onMouseMove = MouseEvents[1];
            this.onMouseUp = MouseEvents[2];
            this.onMouseWheel = MouseEvents[3];
            this.Inited = true;
            this.Status=DrawingStatus.Ready;
        }
        protected override void OnPaint(PaintEventArgs e)
        {
            this.Status= DrawingStatus.drawingBase;

 Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs

@@ -661,7 +661,7 @@
            this.toolStripTextBox_水平旋转角度});
            this.水平旋转ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("水平旋转ToolStripMenuItem.Image")));
            this.水平旋转ToolStripMenuItem.Name = "水平旋转ToolStripMenuItem";
            this.水平旋转ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.水平旋转ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.水平旋转ToolStripMenuItem.Text = "水平旋转";
            this.水平旋转ToolStripMenuItem.Click += new System.EventHandler(this.水平旋转ToolStripMenuItem_Click);
            // 
@@ -676,14 +676,14 @@
            // 
            this.轴旋转ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("轴旋转ToolStripMenuItem.Image")));
            this.轴旋转ToolStripMenuItem.Name = "轴旋转ToolStripMenuItem";
            this.轴旋转ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.轴旋转ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.轴旋转ToolStripMenuItem.Text = "轴旋转";
            // 
            // 轴镜像ToolStripMenuItem
            // 
            this.轴镜像ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("轴镜像ToolStripMenuItem.Image")));
            this.轴镜像ToolStripMenuItem.Name = "轴镜像ToolStripMenuItem";
            this.轴镜像ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.轴镜像ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.轴镜像ToolStripMenuItem.Text = "轴镜像";
            // 
            // 缩放ToolStripMenuItem
@@ -694,7 +694,7 @@
            this.toolStripMenuItem_缩小2倍});
            this.缩放ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("缩放ToolStripMenuItem.Image")));
            this.缩放ToolStripMenuItem.Name = "缩放ToolStripMenuItem";
            this.缩放ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.缩放ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.缩放ToolStripMenuItem.Text = "缩放";
            this.缩放ToolStripMenuItem.Click += new System.EventHandler(this.缩放ToolStripMenuItem_Click);
            // 
@@ -722,7 +722,7 @@
            // toolStripSeparator7
            // 
            this.toolStripSeparator7.Name = "toolStripSeparator7";
            this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
            // 
            // 关阀分析ToolStripMenuItem
            // 
@@ -730,7 +730,7 @@
            this.关阀分析不考虑水源ToolStripMenuItem});
            this.关阀分析ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("关阀分析ToolStripMenuItem.Image")));
            this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem";
            this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.关阀分析ToolStripMenuItem.Text = "关阀分析";
            this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀搜索考虑水源ToolStripMenuItem_Click);
            // 
@@ -745,7 +745,7 @@
            // 
            this.连通性检查ToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("连通性检查ToolStripMenuItem1.Image")));
            this.连通性检查ToolStripMenuItem1.Name = "连通性检查ToolStripMenuItem1";
            this.连通性检查ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
            this.连通性检查ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
            this.连通性检查ToolStripMenuItem1.Text = "连通性检查";
            this.连通性检查ToolStripMenuItem1.Click += new System.EventHandler(this.连通性检查ToolStripMenuItem1_Click);
            // 
@@ -753,7 +753,7 @@
            // 
            this.下游连通性ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("下游连通性ToolStripMenuItem.Image")));
            this.下游连通性ToolStripMenuItem.Name = "下游连通性ToolStripMenuItem";
            this.下游连通性ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.下游连通性ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.下游连通性ToolStripMenuItem.Text = "下游连通性";
            this.下游连通性ToolStripMenuItem.Click += new System.EventHandler(this.下游连通性ToolStripMenuItem_Click);
            // 
@@ -761,14 +761,14 @@
            // 
            this.上游连通性ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("上游连通性ToolStripMenuItem.Image")));
            this.上游连通性ToolStripMenuItem.Name = "上游连通性ToolStripMenuItem";
            this.上游连通性ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.上游连通性ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.上游连通性ToolStripMenuItem.Text = "上游连通性";
            // 
            // 标高推测ToolStripMenuItem
            // 
            this.标高推测ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("标高推测ToolStripMenuItem.Image")));
            this.标高推测ToolStripMenuItem.Name = "标高推测ToolStripMenuItem";
            this.标高推测ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.标高推测ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.标高推测ToolStripMenuItem.Text = "标高推测";
            this.标高推测ToolStripMenuItem.Click += new System.EventHandler(this.标高推测ToolStripMenuItem_Click);
            // 
@@ -776,7 +776,7 @@
            // 
            this.标高导出ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("标高导出ToolStripMenuItem.Image")));
            this.标高导出ToolStripMenuItem.Name = "标高导出ToolStripMenuItem";
            this.标高导出ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.标高导出ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.标高导出ToolStripMenuItem.Text = "标高导出";
            this.标高导出ToolStripMenuItem.Click += new System.EventHandler(this.标高导出ToolStripMenuItem_Click);
            // 
@@ -784,28 +784,28 @@
            // 
            this.显示水流ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("显示水流ToolStripMenuItem.Image")));
            this.显示水流ToolStripMenuItem.Name = "显示水流ToolStripMenuItem";
            this.显示水流ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.显示水流ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.显示水流ToolStripMenuItem.Text = "显示水流路线";
            this.显示水流ToolStripMenuItem.Click += new System.EventHandler(this.显示水流ToolStripMenuItem_Click);
            // 
            // 方向修复ToolStripMenuItem
            // 
            this.方向修复ToolStripMenuItem.Name = "方向修复ToolStripMenuItem";
            this.方向修复ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.方向修复ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.方向修复ToolStripMenuItem.Text = "方向修复";
            this.方向修复ToolStripMenuItem.Click += new System.EventHandler(this.方向修复ToolStripMenuItem_Click);
            // 
            // toolStripSeparator12
            // 
            this.toolStripSeparator12.Name = "toolStripSeparator12";
            this.toolStripSeparator12.Size = new System.Drawing.Size(145, 6);
            this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
            // 
            // 复制ToolStripMenuItem
            // 
            this.复制ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("复制ToolStripMenuItem.Image")));
            this.复制ToolStripMenuItem.Name = "复制ToolStripMenuItem";
            this.复制ToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C";
            this.复制ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.复制ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.复制ToolStripMenuItem.Text = "复制";
            this.复制ToolStripMenuItem.Click += new System.EventHandler(this.复制ToolStripMenuItem_Click);
            // 
@@ -814,21 +814,21 @@
            this.粘贴ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("粘贴ToolStripMenuItem.Image")));
            this.粘贴ToolStripMenuItem.Name = "粘贴ToolStripMenuItem";
            this.粘贴ToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V";
            this.粘贴ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.粘贴ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.粘贴ToolStripMenuItem.Text = "粘贴";
            this.粘贴ToolStripMenuItem.Click += new System.EventHandler(this.粘贴ToolStripMenuItem1_Click);
            // 
            // 删除ToolStripMenuItem1
            // 
            this.删除ToolStripMenuItem1.Name = "删除ToolStripMenuItem1";
            this.删除ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
            this.删除ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
            this.删除ToolStripMenuItem1.Text = "删除";
            this.删除ToolStripMenuItem1.Click += new System.EventHandler(this.删除ToolStripMenuItem_Click);
            // 
            // toolStripSeparator15
            // 
            this.toolStripSeparator15.Name = "toolStripSeparator15";
            this.toolStripSeparator15.Size = new System.Drawing.Size(145, 6);
            this.toolStripSeparator15.Size = new System.Drawing.Size(177, 6);
            // 
            // 对齐ToolStripMenuItem
            // 
@@ -839,7 +839,7 @@
            this.竖直对齐ToolStripMenuItem,
            this.自动对齐ToolStripMenuItem});
            this.对齐ToolStripMenuItem.Name = "对齐ToolStripMenuItem";
            this.对齐ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.对齐ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.对齐ToolStripMenuItem.Text = "对齐";
            // 
            // toolStripSeparator16
@@ -882,19 +882,19 @@
            // 排列ToolStripMenuItem
            // 
            this.排列ToolStripMenuItem.Name = "排列ToolStripMenuItem";
            this.排列ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.排列ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.排列ToolStripMenuItem.Text = "排列";
            // 
            // toolStripSeparator22
            // 
            this.toolStripSeparator22.Name = "toolStripSeparator22";
            this.toolStripSeparator22.Size = new System.Drawing.Size(145, 6);
            this.toolStripSeparator22.Size = new System.Drawing.Size(177, 6);
            // 
            // 楼层管理ToolStripMenuItem
            // 
            this.楼层管理ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("楼层管理ToolStripMenuItem.Image")));
            this.楼层管理ToolStripMenuItem.Name = "楼层管理ToolStripMenuItem";
            this.楼层管理ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.楼层管理ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.楼层管理ToolStripMenuItem.Text = "楼层管理";
            this.楼层管理ToolStripMenuItem.Click += new System.EventHandler(this.楼层管理ToolStripMenuItem_Click);
            // 
@@ -902,14 +902,14 @@
            // 
            this.水量分配ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("水量分配ToolStripMenuItem.Image")));
            this.水量分配ToolStripMenuItem.Name = "水量分配ToolStripMenuItem";
            this.水量分配ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.水量分配ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.水量分配ToolStripMenuItem.Text = "水量分配";
            // 
            // 计算局部损失ToolStripMenuItem
            // 
            this.计算局部损失ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("计算局部损失ToolStripMenuItem.Image")));
            this.计算局部损失ToolStripMenuItem.Name = "计算局部损失ToolStripMenuItem";
            this.计算局部损失ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
            this.计算局部损失ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.计算局部损失ToolStripMenuItem.Text = "计算局部损失";
            this.计算局部损失ToolStripMenuItem.Click += new System.EventHandler(this.toolStripButton_CalcMiniLoss_Click);
            // 
@@ -1101,14 +1101,14 @@
            // 显示节点ToolStripMenuItem
            // 
            this.显示节点ToolStripMenuItem.Name = "显示节点ToolStripMenuItem";
            this.显示节点ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.显示节点ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.显示节点ToolStripMenuItem.Text = "显示节点";
            this.显示节点ToolStripMenuItem.Click += new System.EventHandler(this.显示节点ToolStripMenuItem_Click);
            // 
            // 隐藏节点ToolStripMenuItem
            // 
            this.隐藏节点ToolStripMenuItem.Name = "隐藏节点ToolStripMenuItem";
            this.隐藏节点ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.隐藏节点ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.隐藏节点ToolStripMenuItem.Text = "隐藏节点";
            this.隐藏节点ToolStripMenuItem.Click += new System.EventHandler(this.隐藏节点ToolStripMenuItem_Click);
            // 
@@ -1119,7 +1119,7 @@
            this.中ToolStripMenuItem,
            this.小ToolStripMenuItem});
            this.节点大小ToolStripMenuItem.Name = "节点大小ToolStripMenuItem";
            this.节点大小ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.节点大小ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.节点大小ToolStripMenuItem.Text = "节点大小";
            // 
            // 大ToolStripMenuItem
@@ -1146,19 +1146,19 @@
            // toolStripSeparator10
            // 
            this.toolStripSeparator10.Name = "toolStripSeparator10";
            this.toolStripSeparator10.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
            // 
            // 显示阀门ToolStripMenuItem
            // 
            this.显示阀门ToolStripMenuItem.Name = "显示阀门ToolStripMenuItem";
            this.显示阀门ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.显示阀门ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.显示阀门ToolStripMenuItem.Text = "显示阀门";
            this.显示阀门ToolStripMenuItem.Click += new System.EventHandler(this.显示阀门ToolStripMenuItem_Click);
            // 
            // 隐藏阀门ToolStripMenuItem
            // 
            this.隐藏阀门ToolStripMenuItem.Name = "隐藏阀门ToolStripMenuItem";
            this.隐藏阀门ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.隐藏阀门ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.隐藏阀门ToolStripMenuItem.Text = "隐藏阀门";
            this.隐藏阀门ToolStripMenuItem.Click += new System.EventHandler(this.隐藏阀门ToolStripMenuItem_Click);
            // 
@@ -1169,7 +1169,7 @@
            this.中ToolStripMenuItem1,
            this.小ToolStripMenuItem1});
            this.管线粗细ToolStripMenuItem.Name = "管线粗细ToolStripMenuItem";
            this.管线粗细ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.管线粗细ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.管线粗细ToolStripMenuItem.Text = "管线粗细";
            // 
            // 大ToolStripMenuItem1
@@ -1196,7 +1196,7 @@
            // toolStripSeparator13
            // 
            this.toolStripSeparator13.Name = "toolStripSeparator13";
            this.toolStripSeparator13.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
            // 
            // 缩放级别ToolStripMenuItem
            // 
@@ -1205,7 +1205,7 @@
            this.正常ToolStripMenuItem,
            this.缩小ToolStripMenuItem});
            this.缩放级别ToolStripMenuItem.Name = "缩放级别ToolStripMenuItem";
            this.缩放级别ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.缩放级别ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.缩放级别ToolStripMenuItem.Text = "缩放级别";
            // 
            // 放大ToolStripMenuItem2
@@ -1229,7 +1229,7 @@
            // toolStripSeparator5
            // 
            this.toolStripSeparator5.Name = "toolStripSeparator5";
            this.toolStripSeparator5.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
            // 
            // 隐藏内容ToolStripMenuItem
            // 
@@ -1237,7 +1237,7 @@
            this.显示所有隐藏内容ToolStripMenuItem,
            this.隐藏ToolStripMenuItem});
            this.隐藏内容ToolStripMenuItem.Name = "隐藏内容ToolStripMenuItem";
            this.隐藏内容ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.隐藏内容ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.隐藏内容ToolStripMenuItem.Text = "隐藏内容";
            // 
            // 显示所有隐藏内容ToolStripMenuItem
@@ -1256,83 +1256,83 @@
            // toolStripSeparator17
            // 
            this.toolStripSeparator17.Name = "toolStripSeparator17";
            this.toolStripSeparator17.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator17.Size = new System.Drawing.Size(177, 6);
            // 
            // 添加底图ToolStripMenuItem
            // 
            this.添加底图ToolStripMenuItem.Name = "添加底图ToolStripMenuItem";
            this.添加底图ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.添加底图ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.添加底图ToolStripMenuItem.Text = "添加底图";
            this.添加底图ToolStripMenuItem.Click += new System.EventHandler(this.添加底图ToolStripMenuItem_Click);
            // 
            // 设置底图ToolStripMenuItem
            // 
            this.设置底图ToolStripMenuItem.Name = "设置底图ToolStripMenuItem";
            this.设置底图ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.设置底图ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.设置底图ToolStripMenuItem.Text = "设置底图";
            this.设置底图ToolStripMenuItem.Click += new System.EventHandler(this.设置底图ToolStripMenuItem_Click);
            // 
            // 显示隐藏底图ToolStripMenuItem
            // 
            this.显示隐藏底图ToolStripMenuItem.Name = "显示隐藏底图ToolStripMenuItem";
            this.显示隐藏底图ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.显示隐藏底图ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.显示隐藏底图ToolStripMenuItem.Text = "显示/隐藏底图";
            this.显示隐藏底图ToolStripMenuItem.Click += new System.EventHandler(this.显示隐藏底图ToolStripMenuItem_Click);
            // 
            // 清除底图ToolStripMenuItem
            // 
            this.清除底图ToolStripMenuItem.Name = "清除底图ToolStripMenuItem";
            this.清除底图ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.清除底图ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.清除底图ToolStripMenuItem.Text = "清除底图";
            this.清除底图ToolStripMenuItem.Click += new System.EventHandler(this.清除底图ToolStripMenuItem_Click);
            // 
            // toolStripSeparator18
            // 
            this.toolStripSeparator18.Name = "toolStripSeparator18";
            this.toolStripSeparator18.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator18.Size = new System.Drawing.Size(177, 6);
            // 
            // 显示状态ToolStripMenuItem
            // 
            this.显示状态ToolStripMenuItem.Name = "显示状态ToolStripMenuItem";
            this.显示状态ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.显示状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.显示状态ToolStripMenuItem.Text = "显示状态";
            this.显示状态ToolStripMenuItem.Click += new System.EventHandler(this.显示状态ToolStripMenuItem_Click);
            // 
            // 隐藏状态ToolStripMenuItem
            // 
            this.隐藏状态ToolStripMenuItem.Name = "隐藏状态ToolStripMenuItem";
            this.隐藏状态ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.隐藏状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.隐藏状态ToolStripMenuItem.Text = "隐藏状态";
            this.隐藏状态ToolStripMenuItem.Click += new System.EventHandler(this.隐藏状态ToolStripMenuItem_Click);
            // 
            // toolStripSeparator19
            // 
            this.toolStripSeparator19.Name = "toolStripSeparator19";
            this.toolStripSeparator19.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator19.Size = new System.Drawing.Size(177, 6);
            // 
            // 显示流向ToolStripMenuItem
            // 
            this.显示流向ToolStripMenuItem.Name = "显示流向ToolStripMenuItem";
            this.显示流向ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.显示流向ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.显示流向ToolStripMenuItem.Text = "显示流向";
            this.显示流向ToolStripMenuItem.Click += new System.EventHandler(this.显示流向ToolStripMenuItem_Click);
            // 
            // 隐藏流向ToolStripMenuItem
            // 
            this.隐藏流向ToolStripMenuItem.Name = "隐藏流向ToolStripMenuItem";
            this.隐藏流向ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.隐藏流向ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.隐藏流向ToolStripMenuItem.Text = "隐藏流向";
            this.隐藏流向ToolStripMenuItem.Click += new System.EventHandler(this.隐藏流向ToolStripMenuItem_Click);
            // 
            // toolStripSeparator20
            // 
            this.toolStripSeparator20.Name = "toolStripSeparator20";
            this.toolStripSeparator20.Size = new System.Drawing.Size(150, 6);
            this.toolStripSeparator20.Size = new System.Drawing.Size(177, 6);
            // 
            // 颜色分级管理ToolStripMenuItem
            // 
            this.颜色分级管理ToolStripMenuItem.Name = "颜色分级管理ToolStripMenuItem";
            this.颜色分级管理ToolStripMenuItem.Size = new System.Drawing.Size(153, 22);
            this.颜色分级管理ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
            this.颜色分级管理ToolStripMenuItem.Text = "颜色分级管理";
            this.颜色分级管理ToolStripMenuItem.Click += new System.EventHandler(this.颜色分级管理ToolStripMenuItem_Click);
            // 

 Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs

@@ -51,7 +51,7 @@
                // 应用矩阵变换以抵消之前的翻转效果
                //bufferG.ScaleTransform(1 / Zoom.X, 1 / Zoom.Y);
                List<PointF> p = new List<PointF>();

               
                if (!this.mapOption.isAutoBackgroundImage)
                {
                    var Cps = new List<PointF>

 Hydraulic/Hydro.MapUI/Map/MapViewer.cs

@@ -170,7 +170,7 @@

            cb_Link_Colour.SelectedIndex = 0;

            map.Init(TC,new DrawDelegate[] { Draw, Draw, DrawBackGroud, DrawH },new MouseDelegate[] { mapMouseDown, mapMouseMove, mapMouseUp, mapMouseWheel });
            map.Init(this,new DrawDelegate[] { Draw, Draw, DrawBackGroud, DrawH },new MouseDelegate[] { mapMouseDown, mapMouseMove, mapMouseUp, mapMouseWheel });


            TContainer TCCube = new TContainer();
@@ -313,6 +313,7 @@
        {
            this.param = param;
            bool reLoad = _Template == template;
            map.TC = TC;
            this._Template = template;
            this._ViewModel = viewMode;
            

 Hydraulic/Hydro.MapUI/Map/MapViewer.resx

@@ -613,42 +613,42 @@
  <data name="toolStripButton_添加水表.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAgVSURBVFhHrVcLUJTXGbWtUSfNVINWYFJsQ9BkqnZGidaJ
        jcZHVawxoVWjBpyY+EyiUWI0aqKIBh8hIPgoFIrRBjGtjyrI++WiPEQIwoKrwC7v3QUWhGV5w+k9l13H
        7WLUTu/MYX/u/33nnHvvd+/dHfQU7ScCPxX4mcAzAkMEhprBZ/bxHWMY+39pJCIGC1Do5wIjBEYJjBZw
        MIPP7OM7xjCWOZb8/6kxkSMatmXLLsfwyEuvqyr0Efq2doPRaGxNTU3tJVpaWky61vbGnCL1hS98Di+e
        Pmv+eJFDQ79grpnjqUwwmNP4jKur6/CEG3kr9C0dFXjCVtPQVHsiPMJr5MiRLwsOGnmOXGbOxxqxiA/d
        fyTwpcoGo6Kvr5+43tiJ7NIGRGaUIyheha+jiyX4/H1WOXLKGlDX0iFj+0RSfklF/twFi+YIrjECw8lp
        5v5RE1I89Ozl3xmaOmtJdr+tG0lKHfxjinEo6g784tUISKlGkEKHY+l6iaBrOtkXqqhEarEeTaZOaaRG
        rze4Lfrz24LTWYD1YTExYKOzIV679zvVmzrqSaCuMyEkqQT7LypxKEYN/xQdgtINOJ7RjBOZRpzMapXg
        c3BmMwIVDfBP1uJUejXK9EZpokqna3QeN85NcNMEZ4LLYTML7Bg8b8kSu/I6YxYTy/StOHylEHsvFME3
        tgJ+qXUIUDTh6PVmG5TUd0mxzp4+HEvT44gwcSyVJlplf07hPdVIe/vZQoPLwZqwKUz+Myz2Rr4n17yx
        tQv+UUXYea4A+6IrcDCxDoeSDTic0miFgGtNaGrrEWsudWQLiCuFz9Uq+CboEaLQwiBqp1cEbP/ygL/Q
        cBVgYXJ3WBkYvHz5B/baprYqkly6WYmtp3Ox80IJvGO08Imvt0HErftyxCSnPtHe2YNPwrOx+5Ia++Lq
        ZG70bbmaKCnRGRwdHd2F1lgBblGeE7LRydDQ76/+kSQ1je3Y9u1NbPlHIT6/WIndV7TYHaWzQpbGhJ7e
        fnHLZ6/4zFLp8FFoNrb/S92fJ+ATXY3apnZp0H2p536hNVXAnppmbVmVz+WrdVfpNCavGmv/molN36ng
        db4Sn16otoK2ueuBYFtnN9S6Fmmiq7sX7wWmYENYHracUz+IJ0eC0kBqRMVfvy20WJAvUtOsLQtihL65
        XUYd+Gc+Vp/MwcbTJfj4bIUVvK/UoIvTLgS1jW1Y+XWSFKYBZbkBngHXsC5MiY8iNFZ538RWSwOlpYZW
        obVCYAI1zdpyW4yqqamRpfx+YDo8T+Tig/B7WPNtmTVOlSLiRi3SxLmw9FAisu/VS/Hunl54+CVhRUAG
        VocW2+RtjiiTBpRKZY/QWiswhZpmbbkW9jzXGeR+IBHvBObCI1gFj5C7Nlh5Qoll/jexxC8THV39o9eI
        ZXhrfwKWBeTg3eA7NjmrQlTSQEhoWJ/Q2iwwnZpmbfnH0WLAzTseb/nl4C/HigdGUBHcjxbg0i29efR9
        WBeYhoU+KXjbP2/AnKXHi6WB4L9JA14CM6hp1u43YFmCN33iMf+rTPzJr+BHYWzvkQZqDSa8sSMK83zS
        sfDIDwPGLj9eJA2Yl2BAA/bVWmMTgzYcS8fMPemYcyAXc77KGxCBsZVSnNganI7pn8XgDe+MR+Z8cvpu
        v4GqujahZbMEsgiv5ZalMig84S5+vz0Zr+3JxvS9OQOivqVTihta2jH54/OY+lkiXvsya8BY4oyiRho4
        dyn5ntCyKUK5Dbf7HF0ptjfuVt/H6zvi4LpdgVd3ZtpgY1jRg9H7Rt7CxA8vYvK2FPEuwyaWmLUvB/dq
        W+VxPcfNPUxo2WxDeRBNnjZjYkmNvv8siPwBv92UgAleCkz49LoVyuvapHizuHLHro7AKxujMH5rmk2c
        Bb4XS+Xo76i0Jju70V8IrYUCvBkfHETyKBZwOBJ8bi/JK8RV6rY3BS4fJmHspjSBaxKzvbNl1TPm73HF
        +M2qSLy0PtYq5mEsOpiDqgZhWOSs37w7WmisE5hGLbOmPIr5hxfDcHsnp/GZ+ZoSOlYUavGqVwLGrE3E
        mPUpEpO2KdAtxNs6uuG47BRe8DwPp7Uixvz+YUzdcQPpxf1HcJwiTzt48JCdQmOxwDhqmTWlATZOBa9I
        +0lT/jCnrMLQwsSU/FrM2pUKh/fi4PB+An61JhHO62Lx8poL+OU7Z2HveQUOqxPEu0QrzN6TgdTC/luw
        SFVrGjXa4aDgXiXA4mP1U0tOv6VZZoHr8uu5by5dcbu8qpkEGp0Re74rwOQtybDziBW4iudXXJaw84iB
        nWfcAzhvSMbnZ4qh0ZukuFKlMr0ycVKg4GTlzyS3WcNq9JbGDv7AYHW6TJsxf1nyDaWa6812Wy2+gFxW
        wW3fdTiticUIj2iBGLkEC3wy4ffvEtzW3JexzIlJy9U6u4z/RnBRnN+GXMzc1LARtzROC4vjeQGX4XZ2
        czfv8g0uUNbc5zZ6XGNMtkpjXLXB68qwZ5/dJTg47Rw5xclJbqup/+9GZ9ybDKRbTtmUF10mrlzg/q5v
        yLnYPJWqzqTRaLp5rhN8Vir1bSfPXFTOnLc4zP4FJ2+Rw1Gz4Ljm5CAXOcn9yNFbGgPoklPF9WLRsHK5
        ffhlggcJBXik8lwn+Mw+vmMMY5nDXHKQi5yPFX+4MZjFworltuHe5TcZnmIcGc9zXioEn9nHd4xhLHOY
        O2DBPWmzzAZJOIUcDaeT5zhHxxuN4LPlxyljGMucpx71oxpJLGa4jrxEKPIw2Md3FtEnEB406D9ckvNq
        hGxYfgAAAABJRU5ErkJggg==
        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
        XpQqt0QAAAAASUVORK5CYII=
</value>
  </data>
  <data name="toolStripButton_重复器.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">