diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index 321fc77..67f0a2a 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -419,5 +419,16 @@ namespace Rs.Framework return SysConfigParam.GetValue(nameof(OrderByLeftToRight)); } } + + /// + /// 设备类型(SM,LG) + /// + public static string DeviceType + { + get + { + return SysConfigParam.GetValue(nameof(DeviceType)); + } + } } } diff --git a/Rs.SkyLine/Rs.SkyLine.csproj b/Rs.SkyLine/Rs.SkyLine.csproj index 15f160c..d170f65 100644 --- a/Rs.SkyLine/Rs.SkyLine.csproj +++ b/Rs.SkyLine/Rs.SkyLine.csproj @@ -570,5 +570,8 @@ + + + \ No newline at end of file diff --git a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs index e909206..5bb8922 100644 --- a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs +++ b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs @@ -29,6 +29,10 @@ private void InitializeComponent() { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.label22 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.txtDownCameraFlyRegrabNum = new System.Windows.Forms.TextBox(); this.label14 = new System.Windows.Forms.Label(); @@ -59,7 +63,6 @@ this.label18 = new System.Windows.Forms.Label(); this.textBox10 = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.cboxOrderByLeftToRight = new System.Windows.Forms.CheckBox(); this.cboxVirtualAxis = new System.Windows.Forms.CheckBox(); this.cboxCheckSafeEnable = new System.Windows.Forms.CheckBox(); this.cboxRunSpace = new System.Windows.Forms.CheckBox(); @@ -89,7 +92,12 @@ this.label27 = new System.Windows.Forms.Label(); this.txtControlCenterIP = new System.Windows.Forms.TextBox(); this.label26 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); this.tableLayoutPanel1.SuspendLayout(); + this.groupBox8.SuspendLayout(); this.groupBox3.SuspendLayout(); this.groupBox2.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); @@ -103,6 +111,7 @@ ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTraySpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarFlyCameraSpeed)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarWholeSpeed)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -110,6 +119,7 @@ this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.groupBox8, 1, 0); this.tableLayoutPanel1.Controls.Add(this.groupBox3, 0, 1); this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1); this.tableLayoutPanel1.Controls.Add(this.groupBox1, 0, 0); @@ -123,6 +133,55 @@ this.tableLayoutPanel1.Size = new System.Drawing.Size(1568, 877); this.tableLayoutPanel1.TabIndex = 1; // + // groupBox8 + // + this.groupBox8.Controls.Add(this.panel1); + this.groupBox8.Controls.Add(this.radioButton2); + this.groupBox8.Controls.Add(this.radioButton1); + this.groupBox8.Controls.Add(this.label22); + this.groupBox8.Controls.Add(this.label6); + this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox8.ForeColor = System.Drawing.Color.White; + this.groupBox8.Location = new System.Drawing.Point(787, 3); + this.groupBox8.Name = "groupBox8"; + this.groupBox8.Size = new System.Drawing.Size(778, 432); + this.groupBox8.TabIndex = 3; + this.groupBox8.TabStop = false; + this.groupBox8.Text = "设备参数"; + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; + this.radioButton2.Location = new System.Drawing.Point(180, 34); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(35, 16); + this.radioButton2.TabIndex = 1; + this.radioButton2.Text = "LG"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Checked = true; + this.radioButton1.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.radioButton1.Location = new System.Drawing.Point(126, 34); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(35, 16); + this.radioButton1.TabIndex = 1; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "SM"; + this.radioButton1.UseVisualStyleBackColor = true; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(23, 36); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(59, 12); + this.label22.TabIndex = 0; + this.label22.Text = "设备类型:"; + // // groupBox3 // this.groupBox3.Controls.Add(this.txtDownCameraFlyRegrabNum); @@ -486,7 +545,6 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.cboxOrderByLeftToRight); this.groupBox1.Controls.Add(this.cboxVirtualAxis); this.groupBox1.Controls.Add(this.cboxCheckSafeEnable); this.groupBox1.Controls.Add(this.cboxRunSpace); @@ -524,16 +582,6 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "参数设定"; // - // cboxOrderByLeftToRight - // - this.cboxOrderByLeftToRight.AutoSize = true; - this.cboxOrderByLeftToRight.Location = new System.Drawing.Point(323, 341); - this.cboxOrderByLeftToRight.Name = "cboxOrderByLeftToRight"; - this.cboxOrderByLeftToRight.Size = new System.Drawing.Size(96, 16); - this.cboxOrderByLeftToRight.TabIndex = 8; - this.cboxOrderByLeftToRight.Text = "从左到右排料"; - this.cboxOrderByLeftToRight.UseVisualStyleBackColor = true; - // // cboxVirtualAxis // this.cboxVirtualAxis.AutoSize = true; @@ -830,6 +878,48 @@ this.label26.TabIndex = 0; this.label26.Text = "中控IP:"; // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(11, 69); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(71, 12); + this.label6.TabIndex = 0; + this.label6.Text = "取放料方式:"; + // + // panel1 + // + this.panel1.Controls.Add(this.radioButton4); + this.panel1.Controls.Add(this.radioButton3); + this.panel1.Location = new System.Drawing.Point(114, 56); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(190, 33); + this.panel1.TabIndex = 2; + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Checked = true; + this.radioButton3.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.radioButton3.Location = new System.Drawing.Point(12, 6); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(71, 16); + this.radioButton3.TabIndex = 1; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "从左到右"; + this.radioButton3.UseVisualStyleBackColor = true; + // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.FlatAppearance.CheckedBackColor = System.Drawing.Color.Lime; + this.radioButton4.Location = new System.Drawing.Point(90, 6); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(71, 16); + this.radioButton4.TabIndex = 1; + this.radioButton4.Text = "从右到左"; + this.radioButton4.UseVisualStyleBackColor = true; + // // CommonConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -840,6 +930,8 @@ this.Text = "CommonConfig"; this.Load += new System.EventHandler(this.CommonConfig_Load); this.tableLayoutPanel1.ResumeLayout(false); + this.groupBox8.ResumeLayout(false); + this.groupBox8.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); this.groupBox2.ResumeLayout(false); @@ -859,6 +951,8 @@ ((System.ComponentModel.ISupportInitialize)(this.tbarTakeTraySpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarFlyCameraSpeed)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tbarWholeSpeed)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -925,6 +1019,13 @@ private System.Windows.Forms.Label lblPressLowSpeed; private System.Windows.Forms.Label label20; private System.Windows.Forms.CheckBox cboxVirtualAxis; - private System.Windows.Forms.CheckBox cboxOrderByLeftToRight; + private System.Windows.Forms.GroupBox groupBox8; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.RadioButton radioButton4; + private System.Windows.Forms.RadioButton radioButton3; + private System.Windows.Forms.Label label6; } } \ No newline at end of file