冲突解决

qin

2024-05-06 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c

 Hydro.ClientTool/Form1.Designer.cs

@@ -28,25 +28,38 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.button1 = new System.Windows.Forms.Button();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
            //this.mapViewer1 = new Hydro.MapUI.MapViewer();
            this.SuspendLayout();
            // 
            // button1
            // mapViewer1
            // 
            this.button1.Location = new System.Drawing.Point(79, 95);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(75, 23);
            this.button1.TabIndex = 0;
            this.button1.Text = "button1";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            //this.mapViewer1._IsEditMode = true;
            //this.mapViewer1._newTemplate = null;/*((Hydro.MapView.Template)(resources.GetObject("mapViewer1._newTemplate")));*/
            //this.mapViewer1._ShowJunction = true;
            //this.mapViewer1._ShowValve = true;
            //this.mapViewer1._Template = null;
            //this.mapViewer1.BackColor = System.Drawing.Color.Transparent;
            //this.mapViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
            //this.mapViewer1.junction_multiply = 1F;
            //this.mapViewer1.Link_multiply = 1F;
            //this.mapViewer1.Location = new System.Drawing.Point(0, 0);
            //this.mapViewer1.MapCenter = new System.Drawing.PointF(0,0);//((System.Drawing.PointF)(resources.GetObject("mapViewer1.MapCenter")));
            //this.mapViewer1.Name = "mapViewer1";
            //this.mapViewer1.Rotation = 0D;
            //this.mapViewer1.RotationF = 90D;
            //this.mapViewer1.ShowStatusBar = true;
            //this.mapViewer1.showToolBar = false;
            //this.mapViewer1.Size = new System.Drawing.Size(800, 450);
            //this.mapViewer1.TabIndex = 1;
            //this.mapViewer1.zoom = 1F;
            // 
            // Form1
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(800, 450);
            this.Controls.Add(this.button1);
            //this.Controls.Add(this.mapViewer1);
            this.Name = "Form1";
            this.Text = "Form1";
            this.Load += new System.EventHandler(this.Form1_Load);
@@ -56,7 +69,7 @@

        #endregion

        private System.Windows.Forms.Button button1;
        //private MapUI.MapViewer mapViewer1;
    }
}