flag,error 항목 정리,
This commit is contained in:
162
Cs_HMI/Project/ViewForm/fAgv.Designer.cs
generated
162
Cs_HMI/Project/ViewForm/fAgv.Designer.cs
generated
@@ -30,17 +30,18 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
|
||||
this.richTextBox2 = new System.Windows.Forms.RichTextBox();
|
||||
this.richTextBox3 = new System.Windows.Forms.RichTextBox();
|
||||
this.richTextBox4 = new System.Windows.Forms.RichTextBox();
|
||||
this.rtSystem0 = new System.Windows.Forms.RichTextBox();
|
||||
this.rtSystem1 = new System.Windows.Forms.RichTextBox();
|
||||
this.rtSignal1 = new System.Windows.Forms.RichTextBox();
|
||||
this.rtError = new System.Windows.Forms.RichTextBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.lbIP = new System.Windows.Forms.Label();
|
||||
this.button7 = new System.Windows.Forms.Button();
|
||||
this.button6 = new System.Windows.Forms.Button();
|
||||
this.button5 = new System.Windows.Forms.Button();
|
||||
this.button17 = new System.Windows.Forms.Button();
|
||||
this.lbIP = new System.Windows.Forms.Label();
|
||||
this.button3 = new System.Windows.Forms.Button();
|
||||
this.button2 = new System.Windows.Forms.Button();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
@@ -56,7 +57,8 @@
|
||||
this.button13 = new System.Windows.Forms.Button();
|
||||
this.button10 = new System.Windows.Forms.Button();
|
||||
this.button16 = new System.Windows.Forms.Button();
|
||||
this.button17 = new System.Windows.Forms.Button();
|
||||
this.rtData = new System.Windows.Forms.RichTextBox();
|
||||
this.rtSignal2 = new System.Windows.Forms.RichTextBox();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
this.panel1.SuspendLayout();
|
||||
this.panel2.SuspendLayout();
|
||||
@@ -69,11 +71,13 @@
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
|
||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
|
||||
this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.richTextBox2, 1, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.richTextBox3, 2, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.richTextBox4, 3, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rtSignal2, 2, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rtSystem0, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rtSystem1, 1, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rtSignal1, 2, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rtError, 3, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.rtData, 3, 1);
|
||||
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
@@ -84,45 +88,47 @@
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(1050, 461);
|
||||
this.tableLayoutPanel1.TabIndex = 6;
|
||||
//
|
||||
// richTextBox1
|
||||
// rtSystem0
|
||||
//
|
||||
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.richTextBox1.Location = new System.Drawing.Point(3, 3);
|
||||
this.richTextBox1.Name = "richTextBox1";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.richTextBox1, 2);
|
||||
this.richTextBox1.Size = new System.Drawing.Size(256, 404);
|
||||
this.richTextBox1.TabIndex = 1;
|
||||
this.richTextBox1.Text = "";
|
||||
this.rtSystem0.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtSystem0.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.rtSystem0.Location = new System.Drawing.Point(3, 3);
|
||||
this.rtSystem0.Name = "rtSystem0";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.rtSystem0, 2);
|
||||
this.rtSystem0.Size = new System.Drawing.Size(256, 404);
|
||||
this.rtSystem0.TabIndex = 1;
|
||||
this.rtSystem0.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n";
|
||||
//
|
||||
// richTextBox2
|
||||
// rtSystem1
|
||||
//
|
||||
this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.richTextBox2.Location = new System.Drawing.Point(265, 3);
|
||||
this.richTextBox2.Name = "richTextBox2";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.richTextBox2, 2);
|
||||
this.richTextBox2.Size = new System.Drawing.Size(256, 404);
|
||||
this.richTextBox2.TabIndex = 1;
|
||||
this.richTextBox2.Text = "";
|
||||
this.rtSystem1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtSystem1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.rtSystem1.Location = new System.Drawing.Point(265, 3);
|
||||
this.rtSystem1.Name = "rtSystem1";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.rtSystem1, 2);
|
||||
this.rtSystem1.Size = new System.Drawing.Size(256, 404);
|
||||
this.rtSystem1.TabIndex = 1;
|
||||
this.rtSystem1.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n";
|
||||
//
|
||||
// richTextBox3
|
||||
// rtSignal1
|
||||
//
|
||||
this.richTextBox3.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.richTextBox3.Location = new System.Drawing.Point(527, 3);
|
||||
this.richTextBox3.Name = "richTextBox3";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.richTextBox3, 2);
|
||||
this.richTextBox3.Size = new System.Drawing.Size(256, 404);
|
||||
this.richTextBox3.TabIndex = 1;
|
||||
this.richTextBox3.Text = "";
|
||||
this.rtSignal1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtSignal1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.rtSignal1.Location = new System.Drawing.Point(527, 3);
|
||||
this.rtSignal1.Name = "rtSignal1";
|
||||
this.rtSignal1.Size = new System.Drawing.Size(256, 199);
|
||||
this.rtSignal1.TabIndex = 1;
|
||||
this.rtSignal1.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n";
|
||||
//
|
||||
// richTextBox4
|
||||
// rtError
|
||||
//
|
||||
this.richTextBox4.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.richTextBox4.Location = new System.Drawing.Point(789, 3);
|
||||
this.richTextBox4.Name = "richTextBox4";
|
||||
this.tableLayoutPanel1.SetRowSpan(this.richTextBox4, 2);
|
||||
this.richTextBox4.Size = new System.Drawing.Size(258, 404);
|
||||
this.richTextBox4.TabIndex = 1;
|
||||
this.richTextBox4.Text = "";
|
||||
this.rtError.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtError.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.rtError.Location = new System.Drawing.Point(789, 3);
|
||||
this.rtError.Name = "rtError";
|
||||
this.rtError.Size = new System.Drawing.Size(258, 199);
|
||||
this.rtError.TabIndex = 1;
|
||||
this.rtError.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
@@ -159,18 +165,6 @@
|
||||
this.panel1.Size = new System.Drawing.Size(1050, 58);
|
||||
this.panel1.TabIndex = 7;
|
||||
//
|
||||
// lbIP
|
||||
//
|
||||
this.lbIP.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lbIP.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.lbIP.ForeColor = System.Drawing.Color.White;
|
||||
this.lbIP.Location = new System.Drawing.Point(252, 0);
|
||||
this.lbIP.Name = "lbIP";
|
||||
this.lbIP.Size = new System.Drawing.Size(638, 58);
|
||||
this.lbIP.TabIndex = 8;
|
||||
this.lbIP.Text = "000.000.000.000";
|
||||
this.lbIP.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||
//
|
||||
// button7
|
||||
//
|
||||
this.button7.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
@@ -204,6 +198,29 @@
|
||||
this.button5.UseVisualStyleBackColor = true;
|
||||
this.button5.Click += new System.EventHandler(this.button5_Click);
|
||||
//
|
||||
// button17
|
||||
//
|
||||
this.button17.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.button17.Location = new System.Drawing.Point(810, 0);
|
||||
this.button17.Name = "button17";
|
||||
this.button17.Size = new System.Drawing.Size(80, 58);
|
||||
this.button17.TabIndex = 9;
|
||||
this.button17.Text = "Run(Bwd)";
|
||||
this.button17.UseVisualStyleBackColor = true;
|
||||
this.button17.Click += new System.EventHandler(this.button17_Click);
|
||||
//
|
||||
// lbIP
|
||||
//
|
||||
this.lbIP.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.lbIP.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.lbIP.ForeColor = System.Drawing.Color.White;
|
||||
this.lbIP.Location = new System.Drawing.Point(252, 0);
|
||||
this.lbIP.Name = "lbIP";
|
||||
this.lbIP.Size = new System.Drawing.Size(638, 58);
|
||||
this.lbIP.TabIndex = 8;
|
||||
this.lbIP.Text = "000.000.000.000";
|
||||
this.lbIP.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||
//
|
||||
// button3
|
||||
//
|
||||
this.button3.Dock = System.Windows.Forms.DockStyle.Left;
|
||||
@@ -376,16 +393,25 @@
|
||||
this.button16.UseVisualStyleBackColor = true;
|
||||
this.button16.Click += new System.EventHandler(this.button16_Click);
|
||||
//
|
||||
// button17
|
||||
// rtData
|
||||
//
|
||||
this.button17.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.button17.Location = new System.Drawing.Point(810, 0);
|
||||
this.button17.Name = "button17";
|
||||
this.button17.Size = new System.Drawing.Size(80, 58);
|
||||
this.button17.TabIndex = 9;
|
||||
this.button17.Text = "Run(Bwd)";
|
||||
this.button17.UseVisualStyleBackColor = true;
|
||||
this.button17.Click += new System.EventHandler(this.button17_Click);
|
||||
this.rtData.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtData.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.rtData.Location = new System.Drawing.Point(789, 208);
|
||||
this.rtData.Name = "rtData";
|
||||
this.rtData.Size = new System.Drawing.Size(258, 199);
|
||||
this.rtData.TabIndex = 3;
|
||||
this.rtData.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n";
|
||||
//
|
||||
// rtSignal2
|
||||
//
|
||||
this.rtSignal2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.rtSignal2.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
|
||||
this.rtSignal2.Location = new System.Drawing.Point(527, 208);
|
||||
this.rtSignal2.Name = "rtSignal2";
|
||||
this.rtSignal2.Size = new System.Drawing.Size(256, 199);
|
||||
this.rtSignal2.TabIndex = 4;
|
||||
this.rtSignal2.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n";
|
||||
//
|
||||
// fAgv
|
||||
//
|
||||
@@ -412,10 +438,10 @@
|
||||
|
||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
|
||||
private System.Windows.Forms.Timer timer1;
|
||||
private System.Windows.Forms.RichTextBox richTextBox1;
|
||||
private System.Windows.Forms.RichTextBox richTextBox2;
|
||||
private System.Windows.Forms.RichTextBox richTextBox3;
|
||||
private System.Windows.Forms.RichTextBox richTextBox4;
|
||||
private System.Windows.Forms.RichTextBox rtSystem0;
|
||||
private System.Windows.Forms.RichTextBox rtSystem1;
|
||||
private System.Windows.Forms.RichTextBox rtSignal1;
|
||||
private System.Windows.Forms.RichTextBox rtError;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.Button button2;
|
||||
@@ -438,5 +464,7 @@
|
||||
private System.Windows.Forms.Button button13;
|
||||
private System.Windows.Forms.Label lbPortName;
|
||||
private System.Windows.Forms.Button button17;
|
||||
private System.Windows.Forms.RichTextBox rtData;
|
||||
private System.Windows.Forms.RichTextBox rtSignal2;
|
||||
}
|
||||
}
|
||||
@@ -38,10 +38,12 @@ namespace Project.ViewForm
|
||||
lbIP.Text = PUB.IP;
|
||||
label1.Text = PUB.AGV.LastSTS;
|
||||
|
||||
richTextBox1.Rtf = PUB.AGV.system0.ToRtfString();
|
||||
richTextBox2.Rtf = PUB.AGV.system1.ToRtfString();
|
||||
richTextBox3.Rtf = CombineRtfStrings(PUB.AGV.signal.ToRtfString(), PUB.AGV.data.ToRtfString());
|
||||
richTextBox4.Rtf = PUB.AGV.error.ToRtfString();
|
||||
rtSystem0.Rtf = PUB.AGV.system0.ToRtfString();
|
||||
rtSystem1.Rtf = PUB.AGV.system1.ToRtfString();
|
||||
rtSignal1.Rtf = PUB.AGV.signal1.ToRtfString();
|
||||
rtSignal2.Rtf = PUB.AGV.signal2.ToRtfString();
|
||||
rtData.Rtf = PUB.AGV.data.ToRtfString();
|
||||
rtError.Rtf = PUB.AGV.error.ToRtfString();
|
||||
lbPortName.Text = $"AGV:{PUB.setting.Port_AGV}\nBMS:{PUB.setting.Port_BAT}";
|
||||
timer1.Start();
|
||||
}
|
||||
|
||||
@@ -234,8 +234,8 @@ namespace Project.ViewForm
|
||||
|
||||
//마크정보
|
||||
guideSensor1.SensorValue = PUB.AGV.data.guidesensor;
|
||||
guideSensor1.LMark = PUB.AGV.signal.mark_sensor_1;
|
||||
guideSensor1.RMark = PUB.AGV.signal.mark_sensor_2;
|
||||
guideSensor1.LMark = PUB.AGV.signal1.mark_sensor_1;
|
||||
guideSensor1.RMark = PUB.AGV.signal1.mark_sensor_2;
|
||||
guideSensor1.Invalidate();
|
||||
|
||||
if (PUB.AGV.system1.agv_run || PUB.AGV.system1.agv_run_manual)
|
||||
|
||||
Reference in New Issue
Block a user