Skip to content

刘韬 / 1053_DualSISO

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0e51c838 由 刘韬
选项

优化界面显示

1 个父辈 9fe2d15c
内嵌 并排
正在显示 6 个修改的文件 包含 111 行增加 和 109 行删除
DeviceLibrary/theMachine/BoxTransport.cs
......@@ -193,8 +193,7 @@ namespace DeviceLibrary
IgnoreX09 = false;
break;
case MoveStep.StoreTS09:
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));
DoorControl.Invoke(false);
RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));
if (!IgnoreX09 && IOManager.IOValue(SIO_Type.TrayCheck_Fixture,Config).Equals(IO_VALUE.LOW))
{
Msg.add(string.Format(crc.GetString("Res0003","取料后料叉{0}没有检测到物料无法继续,请检查."), Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
......@@ -202,6 +201,7 @@ namespace DeviceLibrary
}
else
{
DoorControl.Invoke(false);
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
IgnoreX09 = false;
if (To.posid == BoxStorePosition.ngdoor && ConfigHelper.Config.Get($"Device_{mainMachine.MachineSide}_Use_Fixpos", false)
......
DeviceLibrary/theMachine/Store/StoreMachine.cs
......@@ -237,6 +237,9 @@ namespace DeviceLibrary
}
private (bool, string) InOut_Axis_interference(int from, int to)
{
if (RobotManage.DisableUpdownProtect)
return (false, "");
if (Middle_Axis.IsBusy || UpDown_Axis.IsBusy)
return (true, crc.GetString("Res0046.95729a30","旋转或升降轴在运动,进出轴不可运动"));
......
TheMachine/Form1.Designer.cs
......@@ -48,28 +48,28 @@ namespace TheMachine
this.tabc = new System.Windows.Forms.TabControl();
this.tabP1 = new System.Windows.Forms.TabPage();
this.pnl = new System.Windows.Forms.Panel();
this.gb_right = new System.Windows.Forms.GroupBox();
this.listViewR = new System.Windows.Forms.ListView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.stateViewL = new System.Windows.Forms.ListView();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.stateViewR = new System.Windows.Forms.ListView();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.gb_right = new System.Windows.Forms.GroupBox();
this.listViewR = new System.Windows.Forms.ListView();
this.gb_left = new System.Windows.Forms.GroupBox();
this.listViewL = new System.Windows.Forms.ListView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.stateViewL = new System.Windows.Forms.ListView();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.btn_IgnoreX09 = new System.Windows.Forms.Button();
this.btn_PauseBuzzer = new System.Windows.Forms.Button();
this.menuStrip1.SuspendLayout();
this.tabc.SuspendLayout();
this.tabP1.SuspendLayout();
this.pnl.SuspendLayout();
this.gb_right.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.gb_left.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.groupBox2.SuspendLayout();
this.gb_right.SuspendLayout();
this.gb_left.SuspendLayout();
this.SuspendLayout();
//
// menuStrip1
......@@ -199,10 +199,10 @@ namespace TheMachine
| System.Windows.Forms.AnchorStyles.Right)));
this.tabc.Controls.Add(this.tabP1);
this.tabc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabc.Location = new System.Drawing.Point(0, 32);
this.tabc.Location = new System.Drawing.Point(0, 239);
this.tabc.Name = "tabc";
this.tabc.SelectedIndex = 0;
this.tabc.Size = new System.Drawing.Size(1008, 697);
this.tabc.Size = new System.Drawing.Size(1008, 490);
this.tabc.TabIndex = 1;
//
// tabP1
......@@ -210,54 +210,78 @@ namespace TheMachine
this.tabP1.Controls.Add(this.pnl);
this.tabP1.Location = new System.Drawing.Point(4, 30);
this.tabP1.Name = "tabP1";
this.tabP1.Size = new System.Drawing.Size(1000, 663);
this.tabP1.Size = new System.Drawing.Size(1000, 456);
this.tabP1.TabIndex = 0;
this.tabP1.Text = "信息";
this.tabP1.UseVisualStyleBackColor = true;
//
// pnl
//
this.pnl.Controls.Add(this.gb_right);
this.pnl.Controls.Add(this.gb_left);
this.pnl.Controls.Add(this.groupBox1);
this.pnl.Controls.Add(this.pictureBox2);
this.pnl.Controls.Add(this.pictureBox1);
this.pnl.Controls.Add(this.groupBox2);
this.pnl.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnl.Location = new System.Drawing.Point(0, 0);
this.pnl.Name = "pnl";
this.pnl.Size = new System.Drawing.Size(1000, 663);
this.pnl.Size = new System.Drawing.Size(1000, 456);
this.pnl.TabIndex = 273;
//
// gb_right
// groupBox1
//
this.gb_right.Controls.Add(this.listViewR);
this.gb_right.Controls.Add(this.groupBox2);
this.gb_right.Controls.Add(this.pictureBox2);
this.gb_right.Location = new System.Drawing.Point(489, 3);
this.gb_right.Name = "gb_right";
this.gb_right.Size = new System.Drawing.Size(480, 580);
this.gb_right.TabIndex = 272;
this.gb_right.TabStop = false;
this.gb_right.Text = "右侧料仓";
this.groupBox1.Controls.Add(this.stateViewL);
this.groupBox1.Location = new System.Drawing.Point(8, 15);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(477, 227);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "运行步骤";
//
// listViewR
// stateViewL
//
this.listViewR.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.listViewR.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listViewR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listViewR.HideSelection = false;
this.listViewR.Location = new System.Drawing.Point(6, 21);
this.listViewR.MultiSelect = false;
this.listViewR.Name = "listViewR";
this.listViewR.ShowGroups = false;
this.listViewR.Size = new System.Drawing.Size(468, 193);
this.listViewR.TabIndex = 2;
this.listViewR.UseCompatibleStateImageBehavior = false;
this.stateViewL.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.stateViewL.Dock = System.Windows.Forms.DockStyle.Fill;
this.stateViewL.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.stateViewL.HideSelection = false;
this.stateViewL.Location = new System.Drawing.Point(3, 25);
this.stateViewL.MultiSelect = false;
this.stateViewL.Name = "stateViewL";
this.stateViewL.Size = new System.Drawing.Size(471, 199);
this.stateViewL.TabIndex = 0;
this.stateViewL.UseCompatibleStateImageBehavior = false;
//
// pictureBox2
//
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox2.Location = new System.Drawing.Point(500, 248);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(480, 200);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 270;
this.pictureBox2.TabStop = false;
this.pictureBox2.Visible = false;
this.pictureBox2.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox1.Location = new System.Drawing.Point(8, 248);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(477, 200);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 271;
this.pictureBox1.TabStop = false;
this.pictureBox1.Visible = false;
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// groupBox2
//
this.groupBox2.Controls.Add(this.stateViewR);
this.groupBox2.Location = new System.Drawing.Point(6, 220);
this.groupBox2.Location = new System.Drawing.Point(500, 15);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(469, 224);
this.groupBox2.Size = new System.Drawing.Size(480, 224);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "运行步骤";
......@@ -271,86 +295,58 @@ namespace TheMachine
this.stateViewR.Location = new System.Drawing.Point(3, 25);
this.stateViewR.MultiSelect = false;
this.stateViewR.Name = "stateViewR";
this.stateViewR.Size = new System.Drawing.Size(463, 196);
this.stateViewR.Size = new System.Drawing.Size(474, 196);
this.stateViewR.TabIndex = 0;
this.stateViewR.UseCompatibleStateImageBehavior = false;
//
// pictureBox2
// gb_right
//
this.pictureBox2.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox2.Location = new System.Drawing.Point(9, 453);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(463, 127);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 270;
this.pictureBox2.TabStop = false;
this.pictureBox2.Visible = false;
this.pictureBox2.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox2.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
this.gb_right.Controls.Add(this.listViewR);
this.gb_right.Location = new System.Drawing.Point(504, 46);
this.gb_right.Name = "gb_right";
this.gb_right.Size = new System.Drawing.Size(480, 187);
this.gb_right.TabIndex = 272;
this.gb_right.TabStop = false;
this.gb_right.Text = "右侧料仓";
//
// listViewR
//
this.listViewR.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listViewR.Dock = System.Windows.Forms.DockStyle.Fill;
this.listViewR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listViewR.HideSelection = false;
this.listViewR.Location = new System.Drawing.Point(3, 19);
this.listViewR.MultiSelect = false;
this.listViewR.Name = "listViewR";
this.listViewR.ShowGroups = false;
this.listViewR.Size = new System.Drawing.Size(474, 165);
this.listViewR.TabIndex = 2;
this.listViewR.UseCompatibleStateImageBehavior = false;
//
// gb_left
//
this.gb_left.Controls.Add(this.listViewL);
this.gb_left.Controls.Add(this.groupBox1);
this.gb_left.Controls.Add(this.pictureBox1);
this.gb_left.Location = new System.Drawing.Point(3, 3);
this.gb_left.Location = new System.Drawing.Point(15, 46);
this.gb_left.Name = "gb_left";
this.gb_left.Size = new System.Drawing.Size(480, 580);
this.gb_left.Size = new System.Drawing.Size(480, 187);
this.gb_left.TabIndex = 272;
this.gb_left.TabStop = false;
this.gb_left.Text = "左侧料仓";
//
// listViewL
//
this.listViewL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.listViewL.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listViewL.Dock = System.Windows.Forms.DockStyle.Fill;
this.listViewL.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listViewL.HideSelection = false;
this.listViewL.Location = new System.Drawing.Point(6, 21);
this.listViewL.Location = new System.Drawing.Point(3, 19);
this.listViewL.MultiSelect = false;
this.listViewL.Name = "listViewL";
this.listViewL.ShowGroups = false;
this.listViewL.Size = new System.Drawing.Size(468, 193);
this.listViewL.Size = new System.Drawing.Size(474, 165);
this.listViewL.TabIndex = 2;
this.listViewL.UseCompatibleStateImageBehavior = false;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.stateViewL);
this.groupBox1.Location = new System.Drawing.Point(5, 220);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(469, 227);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "运行步骤";
//
// stateViewL
//
this.stateViewL.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.stateViewL.Dock = System.Windows.Forms.DockStyle.Fill;
this.stateViewL.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.stateViewL.HideSelection = false;
this.stateViewL.Location = new System.Drawing.Point(3, 25);
this.stateViewL.MultiSelect = false;
this.stateViewL.Name = "stateViewL";
this.stateViewL.Size = new System.Drawing.Size(463, 199);
this.stateViewL.TabIndex = 0;
this.stateViewL.UseCompatibleStateImageBehavior = false;
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Gainsboro;
this.pictureBox1.Location = new System.Drawing.Point(6, 453);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(466, 127);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 271;
this.pictureBox1.TabStop = false;
this.pictureBox1.Visible = false;
this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick);
this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
//
// btn_IgnoreX09
//
this.btn_IgnoreX09.BackColor = System.Drawing.Color.OrangeRed;
......@@ -380,7 +376,9 @@ namespace TheMachine
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1008, 729);
this.Controls.Add(this.gb_right);
this.Controls.Add(this.btn_IgnoreX09);
this.Controls.Add(this.gb_left);
this.Controls.Add(this.btn_PauseBuzzer);
this.Controls.Add(this.tabc);
this.Controls.Add(this.menuStrip1);
......@@ -397,12 +395,12 @@ namespace TheMachine
this.tabc.ResumeLayout(false);
this.tabP1.ResumeLayout(false);
this.pnl.ResumeLayout(false);
this.gb_right.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.gb_left.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.groupBox2.ResumeLayout(false);
this.gb_right.ResumeLayout(false);
this.gb_left.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
......
TheMachine/SettingControl.Designer.cs
......@@ -120,6 +120,7 @@ namespace TheMachine
//
// tabPage_set
//
this.tabPage_set.AutoScroll = true;
this.tabPage_set.Controls.Add(this.fixtureSizeConfigControl1);
this.tabPage_set.Controls.Add(this.tp);
this.tabPage_set.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......
TheMachine/UC/ConfigControl.cs
......@@ -71,7 +71,7 @@ namespace TheMachine
}
tableLayoutPanel1.SuspendLayout();
int maxrow = tableLayoutPanel1.Height / 34;
int maxrow = tableLayoutPanel1.Height / 52;
tableLayoutPanel1.Controls.Clear();
this.tableLayoutPanel1.RowStyles.Clear();
//this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType., 26));
......@@ -107,7 +107,7 @@ namespace TheMachine
button.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
button.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
button.Name = configBase.ProName;
button.Size = new System.Drawing.Size(225, 27);
button.Size = new System.Drawing.Size(225, 45);
button.Text = crc.GetString(configBase.ProName,configBase.Explain);
button.Click += Button_Click;
button.ForeColor = color;
......
TheMachine/UC/uc_boxdebug.Designer.cs
......@@ -141,7 +141,6 @@ namespace TheMachine
this.dataGridView1.AllowUserToResizeRows = false;
this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Top;
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.EnableHeadersVisualStyles = false;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
......@@ -156,7 +155,7 @@ namespace TheMachine
this.dataGridView1.ShowCellToolTips = false;
this.dataGridView1.ShowEditingIcon = false;
this.dataGridView1.ShowRowErrors = false;
this.dataGridView1.Size = new System.Drawing.Size(981, 308);
this.dataGridView1.Size = new System.Drawing.Size(781, 308);
this.dataGridView1.TabIndex = 103;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
......@@ -189,7 +188,7 @@ namespace TheMachine
this.storePosControl1.Machine = null;
this.storePosControl1.Margin = new System.Windows.Forms.Padding(4);
this.storePosControl1.Name = "storePosControl1";
this.storePosControl1.Size = new System.Drawing.Size(715, 210);
this.storePosControl1.Size = new System.Drawing.Size(515, 210);
this.storePosControl1.TabIndex = 227;
this.storePosControl1.Tag = "not";
//
......@@ -197,6 +196,7 @@ namespace TheMachine
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
this.Controls.Add(this.cb_fixpos);
this.Controls.Add(this.storePosControl1);
this.Controls.Add(this.label_verify);
......@@ -206,7 +206,7 @@ namespace TheMachine
this.Controls.Add(this.groupInout);
this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "uc_boxdebug";
this.Size = new System.Drawing.Size(981, 785);
this.Size = new System.Drawing.Size(981, 546);
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!