Commit 31b1d087 LN

1.工作页面可查看Io状态。2.过板模式隐藏插件按钮。

1 个父辈 ccf6a23f
...@@ -25,6 +25,17 @@ namespace TSA_V ...@@ -25,6 +25,17 @@ namespace TSA_V
CheckForIllegalCrossThreadCalls = false; CheckForIllegalCrossThreadCalls = false;
InitializeComponent(); InitializeComponent();
} }
public FrmIoManager(bool isWorkOpen)
{
CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
//如果是工作页面打开,隐藏操作按钮
if (isWorkOpen)
{
groupBox4.Visible = false;
}
}
private void FrmMain_Load(object sender, EventArgs e) private void FrmMain_Load(object sender, EventArgs e)
{ {
LanguageProcess(); LanguageProcess();
...@@ -280,12 +291,12 @@ namespace TSA_V ...@@ -280,12 +291,12 @@ namespace TSA_V
txtDoName.Text = io.DeviceName; txtDoName.Text = io.DeviceName;
if (selectControl != null) if (selectControl != null)
{ {
selectControl.BackColor=Color.White; selectControl.BackColor=Color.Black;
selectControl.BorderStyle = System.Windows.Forms.BorderStyle.None; selectControl.BorderStyle = System.Windows.Forms.BorderStyle.None;
} }
IOTextControl newControl = DOControlList[io.ProName]; IOTextControl newControl = DOControlList[io.ProName];
newControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; newControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
newControl.BackColor = Color.LightBlue; newControl.BackColor = Color.Blue;
selectControl = newControl; selectControl = newControl;
} }
} }
......
...@@ -32,6 +32,17 @@ ...@@ -32,6 +32,17 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWork)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmWork));
this.timer = new System.Windows.Forms.Timer(this.components); this.timer = new System.Windows.Forms.Timer(this.components);
this.timerShowForm = new System.Windows.Forms.Timer(this.components); this.timerShowForm = new System.Windows.Forms.Timer(this.components);
this.btnIo = new System.Windows.Forms.Button();
this.btnCodeTest = new System.Windows.Forms.Button();
this.btnWorkInfo = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.btnUpdateAutoTime = new System.Windows.Forms.Button();
this.txtAuToTime = new System.Windows.Forms.TextBox();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.btnTest = new System.Windows.Forms.Button();
this.btnStart = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblStart = new System.Windows.Forms.Label(); this.lblStart = new System.Windows.Forms.Label();
...@@ -82,16 +93,7 @@ ...@@ -82,16 +93,7 @@
this.lblBoardPoint = new System.Windows.Forms.Label(); this.lblBoardPoint = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.lblMsg = new System.Windows.Forms.Label(); this.lblMsg = new System.Windows.Forms.Label();
this.btnTest = new System.Windows.Forms.Button(); this.groupBox3.SuspendLayout();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.btnUpdateAutoTime = new System.Windows.Forms.Button();
this.txtAuToTime = new System.Windows.Forms.TextBox();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.btnWorkInfo = new System.Windows.Forms.Button();
this.btnCodeTest = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.panPoint.SuspendLayout(); this.panPoint.SuspendLayout();
...@@ -101,7 +103,6 @@ ...@@ -101,7 +103,6 @@
((System.ComponentModel.ISupportInitialize)(this.picBoard)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picBoard)).BeginInit();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer // timer
...@@ -114,6 +115,148 @@ ...@@ -114,6 +115,148 @@
this.timerShowForm.Interval = 2000; this.timerShowForm.Interval = 2000;
this.timerShowForm.Tick += new System.EventHandler(this.timerShowForm_Tick); this.timerShowForm.Tick += new System.EventHandler(this.timerShowForm_Tick);
// //
// btnIo
//
this.btnIo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnIo.BackColor = System.Drawing.SystemColors.WindowFrame;
this.btnIo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnIo.FlatAppearance.BorderSize = 0;
this.btnIo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIo.Location = new System.Drawing.Point(1170, 548);
this.btnIo.Name = "btnIo";
this.btnIo.Size = new System.Drawing.Size(51, 30);
this.btnIo.TabIndex = 280;
this.btnIo.UseVisualStyleBackColor = false;
this.btnIo.Click += new System.EventHandler(this.btnIo_Click);
//
// btnCodeTest
//
this.btnCodeTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control;
this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCodeTest.Location = new System.Drawing.Point(233, 487);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279;
this.btnCodeTest.Text = "条码测试";
this.btnCodeTest.UseVisualStyleBackColor = false;
this.btnCodeTest.Visible = false;
this.btnCodeTest.Click += new System.EventHandler(this.btnCodeTest_Click);
//
// btnWorkInfo
//
this.btnWorkInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnWorkInfo.BackColor = System.Drawing.SystemColors.Control;
this.btnWorkInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWorkInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWorkInfo.Location = new System.Drawing.Point(477, 487);
this.btnWorkInfo.Name = "btnWorkInfo";
this.btnWorkInfo.Size = new System.Drawing.Size(120, 60);
this.btnWorkInfo.TabIndex = 278;
this.btnWorkInfo.Text = "工作统计";
this.btnWorkInfo.UseVisualStyleBackColor = false;
this.btnWorkInfo.Click += new System.EventHandler(this.btnWorkInfo_Click);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.label8);
this.groupBox3.Controls.Add(this.label7);
this.groupBox3.Controls.Add(this.btnUpdateAutoTime);
this.groupBox3.Controls.Add(this.txtAuToTime);
this.groupBox3.Controls.Add(this.radioButton2);
this.groupBox3.Controls.Add(this.radioButton1);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(12, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(641, 96);
this.groupBox3.TabIndex = 277;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "工作方式";
//
// label8
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(508, 24);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(23, 20);
this.label8.TabIndex = 283;
this.label8.Text = "秒";
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(226, 24);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(222, 21);
this.label7.TabIndex = 282;
this.label7.Text = "间隔时间:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnUpdateAutoTime
//
this.btnUpdateAutoTime.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateAutoTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateAutoTime.Location = new System.Drawing.Point(421, 55);
this.btnUpdateAutoTime.Name = "btnUpdateAutoTime";
this.btnUpdateAutoTime.Size = new System.Drawing.Size(71, 32);
this.btnUpdateAutoTime.TabIndex = 281;
this.btnUpdateAutoTime.Text = "更新";
this.btnUpdateAutoTime.UseVisualStyleBackColor = false;
this.btnUpdateAutoTime.Visible = false;
this.btnUpdateAutoTime.Click += new System.EventHandler(this.btnUpdateAutoTime_Click);
//
// txtAuToTime
//
this.txtAuToTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAuToTime.Location = new System.Drawing.Point(453, 20);
this.txtAuToTime.MaxLength = 5;
this.txtAuToTime.Name = "txtAuToTime";
this.txtAuToTime.Size = new System.Drawing.Size(47, 29);
this.txtAuToTime.TabIndex = 2;
//
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton2.Location = new System.Drawing.Point(44, 59);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(92, 25);
this.radioButton2.TabIndex = 1;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "自动工作";
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// radioButton1
//
this.radioButton1.AutoSize = true;
this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton1.Location = new System.Drawing.Point(44, 21);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(92, 25);
this.radioButton1.TabIndex = 0;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "脚踏工作";
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// btnTest
//
this.btnTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTest.BackColor = System.Drawing.SystemColors.Control;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(477, 487);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272;
this.btnTest.Text = "测试";
this.btnTest.UseVisualStyleBackColor = false;
this.btnTest.Visible = false;
this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
//
// btnStart // btnStart
// //
this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
...@@ -674,139 +817,12 @@ ...@@ -674,139 +817,12 @@
this.lblMsg.TabIndex = 3; this.lblMsg.TabIndex = 3;
this.lblMsg.Text = "未开始工作"; this.lblMsg.Text = "未开始工作";
// //
// btnTest
//
this.btnTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTest.BackColor = System.Drawing.SystemColors.Control;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(477, 487);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272;
this.btnTest.Text = "测试";
this.btnTest.UseVisualStyleBackColor = false;
this.btnTest.Visible = false;
this.btnTest.Click += new System.EventHandler(this.btnTest_Click);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.label8);
this.groupBox3.Controls.Add(this.label7);
this.groupBox3.Controls.Add(this.btnUpdateAutoTime);
this.groupBox3.Controls.Add(this.txtAuToTime);
this.groupBox3.Controls.Add(this.radioButton2);
this.groupBox3.Controls.Add(this.radioButton1);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(12, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(641, 96);
this.groupBox3.TabIndex = 277;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "工作方式";
//
// label8
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(508, 24);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(23, 20);
this.label8.TabIndex = 283;
this.label8.Text = "秒";
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(226, 24);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(222, 21);
this.label7.TabIndex = 282;
this.label7.Text = "间隔时间:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnUpdateAutoTime
//
this.btnUpdateAutoTime.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateAutoTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateAutoTime.Location = new System.Drawing.Point(421, 55);
this.btnUpdateAutoTime.Name = "btnUpdateAutoTime";
this.btnUpdateAutoTime.Size = new System.Drawing.Size(71, 32);
this.btnUpdateAutoTime.TabIndex = 281;
this.btnUpdateAutoTime.Text = "更新";
this.btnUpdateAutoTime.UseVisualStyleBackColor = false;
this.btnUpdateAutoTime.Visible = false;
this.btnUpdateAutoTime.Click += new System.EventHandler(this.btnUpdateAutoTime_Click);
//
// txtAuToTime
//
this.txtAuToTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAuToTime.Location = new System.Drawing.Point(453, 20);
this.txtAuToTime.MaxLength = 5;
this.txtAuToTime.Name = "txtAuToTime";
this.txtAuToTime.Size = new System.Drawing.Size(47, 29);
this.txtAuToTime.TabIndex = 2;
//
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton2.Location = new System.Drawing.Point(44, 59);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(92, 25);
this.radioButton2.TabIndex = 1;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "自动工作";
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// radioButton1
//
this.radioButton1.AutoSize = true;
this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton1.Location = new System.Drawing.Point(44, 21);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(92, 25);
this.radioButton1.TabIndex = 0;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "脚踏工作";
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// btnWorkInfo
//
this.btnWorkInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnWorkInfo.BackColor = System.Drawing.SystemColors.Control;
this.btnWorkInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWorkInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWorkInfo.Location = new System.Drawing.Point(477, 487);
this.btnWorkInfo.Name = "btnWorkInfo";
this.btnWorkInfo.Size = new System.Drawing.Size(120, 60);
this.btnWorkInfo.TabIndex = 278;
this.btnWorkInfo.Text = "工作统计";
this.btnWorkInfo.UseVisualStyleBackColor = false;
this.btnWorkInfo.Click += new System.EventHandler(this.btnWorkInfo_Click);
//
// btnCodeTest
//
this.btnCodeTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control;
this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCodeTest.Location = new System.Drawing.Point(233, 487);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279;
this.btnCodeTest.Text = "条码测试";
this.btnCodeTest.UseVisualStyleBackColor = false;
this.btnCodeTest.Visible = false;
this.btnCodeTest.Click += new System.EventHandler(this.btnCodeTest_Click);
//
// FrmWork // FrmWork
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1223, 579); this.ClientSize = new System.Drawing.Size(1223, 579);
this.Controls.Add(this.btnIo);
this.Controls.Add(this.btnCodeTest); this.Controls.Add(this.btnCodeTest);
this.Controls.Add(this.btnWorkInfo); this.Controls.Add(this.btnWorkInfo);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
...@@ -834,6 +850,8 @@ ...@@ -834,6 +850,8 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmWelding_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmWelding_FormClosing);
this.Load += new System.EventHandler(this.FrmWelding_Load); this.Load += new System.EventHandler(this.FrmWelding_Load);
this.Shown += new System.EventHandler(this.FrmWork_Shown); this.Shown += new System.EventHandler(this.FrmWork_Shown);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
...@@ -846,8 +864,6 @@ ...@@ -846,8 +864,6 @@
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -917,5 +933,6 @@ ...@@ -917,5 +933,6 @@
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.Button btnWorkInfo; private System.Windows.Forms.Button btnWorkInfo;
private System.Windows.Forms.Button btnCodeTest; private System.Windows.Forms.Button btnCodeTest;
private System.Windows.Forms.Button btnIo;
} }
} }
\ No newline at end of file \ No newline at end of file
...@@ -86,6 +86,18 @@ namespace TSA_V ...@@ -86,6 +86,18 @@ namespace TSA_V
IsSet = true; IsSet = true;
} }
timerShowForm.Start(); timerShowForm.Start();
if (TSAVBean.OnlyGuoBan)
{
bool Visible = false;
btnCamera.Visible = Visible;
btnWorkInfo.Visible = Visible;
btnStart.Visible = Visible;
btnStartWorking.Visible = Visible;
btnPrePoint.Visible = Visible;
btnNextPoint.Visible = Visible;
btnGoHome.Visible = Visible;
}
isInitOk = true; isInitOk = true;
// string ip = ConfigAppSettings.GetValue(Setting_Init.StatusServerIp); // string ip = ConfigAppSettings.GetValue(Setting_Init.StatusServerIp);
// bool result = StatusClient.instance.Connect(); // bool result = StatusClient.instance.Connect();
...@@ -341,21 +353,24 @@ namespace TSA_V ...@@ -341,21 +353,24 @@ namespace TSA_V
btnStart.Visible = false; btnStart.Visible = false;
btnGoHome.Visible = true; btnGoHome.Visible = true;
} }
if (TSAVBean.OnlyGuoBan) { }
if (TSAVBean.Status.Equals(TSAVStatus.Runing) && (!TSAVBean.IsInSuddenDown))
{
btnStartWorking.Enabled = !(TSAVBean.Work.IsWorking);
btnNextPoint.Enabled = true;
btnPrePoint.Enabled = true;
}
else else
{ {
btnStartWorking.Enabled = false; if (TSAVBean.Status.Equals(TSAVStatus.Runing) && (!TSAVBean.IsInSuddenDown))
if (TSAVBean.IsDebug.Equals(false))
{ {
btnNextPoint.Enabled = false;
btnPrePoint.Enabled = false; btnStartWorking.Enabled = !(TSAVBean.Work.IsWorking);
btnNextPoint.Enabled = true;
btnPrePoint.Enabled = true;
}
else
{
btnStartWorking.Enabled = false;
if (TSAVBean.IsDebug.Equals(false))
{
btnNextPoint.Enabled = false;
btnPrePoint.Enabled = false;
}
} }
} }
...@@ -962,5 +977,11 @@ namespace TSA_V ...@@ -962,5 +977,11 @@ namespace TSA_V
g.Flush(); g.Flush();
g.Dispose(); g.Dispose();
} }
private void btnIo_Click(object sender, EventArgs e)
{
FrmIoManager frmWorkIo = new FrmIoManager(true);
frmWorkIo.ShowDialog();
}
} }
} }

411 字节 | 宽: | 高:

363 字节 | 宽: | 高:

UserFromControl/image/gray.png
UserFromControl/image/gray.png
UserFromControl/image/gray.png
UserFromControl/image/gray.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

396 字节 | 宽: | 高:

383 字节 | 宽: | 高:

UserFromControl/image/gray2.png
UserFromControl/image/gray2.png
UserFromControl/image/gray2.png
UserFromControl/image/gray2.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

348 字节 | 宽: | 高:

337 字节 | 宽: | 高:

UserFromControl/image/green.png
UserFromControl/image/green.png
UserFromControl/image/green.png
UserFromControl/image/green.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖

372 字节 | 宽: | 高:

348 字节 | 宽: | 高:

UserFromControl/image/green1.png
UserFromControl/image/green1.png
UserFromControl/image/green1.png
UserFromControl/image/green1.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!