diff --git a/Cs_HMI/Project/StateMachine/_TMDisplay.cs b/Cs_HMI/Project/StateMachine/_TMDisplay.cs index f6459c6..69c5e3a 100644 --- a/Cs_HMI/Project/StateMachine/_TMDisplay.cs +++ b/Cs_HMI/Project/StateMachine/_TMDisplay.cs @@ -566,10 +566,14 @@ namespace Project if (PUB.sm.Step > eSMStep.INIT) { //오류가 있다면 오류를 표시해준다. - if (PUB.AGV.IsOpen == false) + if (PUB.AGV.IsOpen == false ) { UpdateStatusMessage("AGV 연결실패", Color.Tomato, Color.Black); } + else if(PUB.AGV.IsValid==false) + { + UpdateStatusMessage("AGV 통신상태 불량", Color.Tomato, Color.Black); + } else if (PUB.AGV.error.Emergency) { if (PUB.AGV.error.runerror_by_no_magent_line) @@ -581,6 +585,14 @@ namespace Project UpdateStatusMessage("비상 정지", Color.Tomato, Color.Black); } } + else if (PUB.BMS != null || PUB.BMS.IsOpen==false) + { + UpdateStatusMessage("BMS가 연결되지 않았습니다", Color.Tomato, Color.Black); + } + else if (PUB.BMS != null || PUB.BMS.IsValid == false) + { + UpdateStatusMessage("BMS 통신상태 불량", Color.Tomato, Color.Black); + } //else if (PUB.PLC.IsOpen == false) //{ // UpdateStatusMessage(Lang.PLC연결실패, Color.Tomato, Color.Black); diff --git a/Cs_HMI/Project/ViewForm/fFlag.Designer.cs b/Cs_HMI/Project/ViewForm/fFlag.Designer.cs index 1f9be26..0b5ac2f 100644 --- a/Cs_HMI/Project/ViewForm/fFlag.Designer.cs +++ b/Cs_HMI/Project/ViewForm/fFlag.Designer.cs @@ -29,34 +29,42 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.listView1 = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.listView2 = new System.Windows.Forms.ListView(); - this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.listView3 = new System.Windows.Forms.ListView(); - this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.listView4 = new System.Windows.Forms.ListView(); - this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.timer1 = new System.Windows.Forms.Timer(this.components); + this.dv1 = new System.Windows.Forms.DataGridView(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dv2 = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dv3 = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dv4 = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv4)).BeginInit(); this.SuspendLayout(); // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 4; - 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.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.Controls.Add(this.listView1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.listView2, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.listView3, 2, 0); - this.tableLayoutPanel1.Controls.Add(this.listView4, 3, 0); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.Controls.Add(this.dv4, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.dv3, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.dv2, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.dv1, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; @@ -66,92 +74,167 @@ this.tableLayoutPanel1.Size = new System.Drawing.Size(1050, 577); this.tableLayoutPanel1.TabIndex = 6; // - // listView1 - // - this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1, - this.columnHeader2}); - this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.listView1.HideSelection = false; - this.listView1.Location = new System.Drawing.Point(3, 3); - this.listView1.Name = "listView1"; - this.tableLayoutPanel1.SetRowSpan(this.listView1, 2); - this.listView1.Size = new System.Drawing.Size(256, 571); - this.listView1.TabIndex = 0; - this.listView1.UseCompatibleStateImageBehavior = false; - this.listView1.View = System.Windows.Forms.View.Details; - this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); - // - // columnHeader1 - // - this.columnHeader1.Width = 120; - // - // columnHeader2 - // - this.columnHeader2.Width = 120; - // - // listView2 - // - this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader3, - this.columnHeader4}); - this.listView2.Dock = System.Windows.Forms.DockStyle.Fill; - this.listView2.HideSelection = false; - this.listView2.Location = new System.Drawing.Point(265, 3); - this.listView2.Name = "listView2"; - this.tableLayoutPanel1.SetRowSpan(this.listView2, 2); - this.listView2.Size = new System.Drawing.Size(256, 571); - this.listView2.TabIndex = 0; - this.listView2.UseCompatibleStateImageBehavior = false; - this.listView2.View = System.Windows.Forms.View.Details; - // - // columnHeader3 - // - this.columnHeader3.Width = 120; - // - // listView3 - // - this.listView3.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader5, - this.columnHeader6}); - this.listView3.Dock = System.Windows.Forms.DockStyle.Fill; - this.listView3.HideSelection = false; - this.listView3.Location = new System.Drawing.Point(527, 3); - this.listView3.Name = "listView3"; - this.tableLayoutPanel1.SetRowSpan(this.listView3, 2); - this.listView3.Size = new System.Drawing.Size(256, 571); - this.listView3.TabIndex = 0; - this.listView3.UseCompatibleStateImageBehavior = false; - this.listView3.View = System.Windows.Forms.View.Details; - // - // columnHeader5 - // - this.columnHeader5.Width = 120; - // - // listView4 - // - this.listView4.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader7, - this.columnHeader8}); - this.listView4.Dock = System.Windows.Forms.DockStyle.Fill; - this.listView4.HideSelection = false; - this.listView4.Location = new System.Drawing.Point(789, 3); - this.listView4.Name = "listView4"; - this.tableLayoutPanel1.SetRowSpan(this.listView4, 2); - this.listView4.Size = new System.Drawing.Size(258, 571); - this.listView4.TabIndex = 0; - this.listView4.UseCompatibleStateImageBehavior = false; - this.listView4.View = System.Windows.Forms.View.Details; - // - // columnHeader7 - // - this.columnHeader7.Width = 120; - // // timer1 // this.timer1.Interval = 500; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // + // dv1 + // + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AllowUserToResizeRows = false; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2}); + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle4; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(3, 3); + this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; + this.dv1.RowHeadersVisible = false; + this.tableLayoutPanel1.SetRowSpan(this.dv1, 2); + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(309, 571); + this.dv1.TabIndex = 1; + // + // Column1 + // + this.Column1.HeaderText = "Column1"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + // + // Column2 + // + this.Column2.HeaderText = "Column2"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + // + // dv2 + // + this.dv2.AllowUserToAddRows = false; + this.dv2.AllowUserToDeleteRows = false; + this.dv2.AllowUserToResizeRows = false; + this.dv2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn1, + this.dataGridViewTextBoxColumn2}); + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv2.DefaultCellStyle = dataGridViewCellStyle3; + this.dv2.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv2.Location = new System.Drawing.Point(318, 3); + this.dv2.Name = "dv2"; + this.dv2.ReadOnly = true; + this.dv2.RowHeadersVisible = false; + this.tableLayoutPanel1.SetRowSpan(this.dv2, 2); + this.dv2.RowTemplate.Height = 23; + this.dv2.Size = new System.Drawing.Size(309, 571); + this.dv2.TabIndex = 2; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.HeaderText = "Column1"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.HeaderText = "Column2"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.ReadOnly = true; + // + // dv3 + // + this.dv3.AllowUserToAddRows = false; + this.dv3.AllowUserToDeleteRows = false; + this.dv3.AllowUserToResizeRows = false; + this.dv3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn3, + this.dataGridViewTextBoxColumn4}); + this.tableLayoutPanel1.SetColumnSpan(this.dv3, 2); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv3.DefaultCellStyle = dataGridViewCellStyle2; + this.dv3.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv3.Location = new System.Drawing.Point(633, 3); + this.dv3.Name = "dv3"; + this.dv3.ReadOnly = true; + this.dv3.RowHeadersVisible = false; + this.dv3.RowTemplate.Height = 23; + this.dv3.Size = new System.Drawing.Size(414, 282); + this.dv3.TabIndex = 3; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.HeaderText = "Column1"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.HeaderText = "Column2"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.ReadOnly = true; + // + // dv4 + // + this.dv4.AllowUserToAddRows = false; + this.dv4.AllowUserToDeleteRows = false; + this.dv4.AllowUserToResizeRows = false; + this.dv4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dv4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewTextBoxColumn5, + this.dataGridViewTextBoxColumn6}); + this.tableLayoutPanel1.SetColumnSpan(this.dv4, 2); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv4.DefaultCellStyle = dataGridViewCellStyle1; + this.dv4.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv4.Location = new System.Drawing.Point(633, 291); + this.dv4.Name = "dv4"; + this.dv4.ReadOnly = true; + this.dv4.RowHeadersVisible = false; + this.dv4.RowTemplate.Height = 23; + this.dv4.Size = new System.Drawing.Size(414, 283); + this.dv4.TabIndex = 4; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.HeaderText = "Column1"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.HeaderText = "Column2"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + // // fFlag // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -165,6 +248,10 @@ this.Load += new System.EventHandler(this.fFlag_Load); this.VisibleChanged += new System.EventHandler(this.fFlag_VisibleChanged); this.tableLayoutPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv4)).EndInit(); this.ResumeLayout(false); } @@ -173,17 +260,17 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Timer timer1; - private System.Windows.Forms.ListView listView1; - private System.Windows.Forms.ListView listView2; - private System.Windows.Forms.ListView listView3; - private System.Windows.Forms.ListView listView4; - private System.Windows.Forms.ColumnHeader columnHeader1; - private System.Windows.Forms.ColumnHeader columnHeader2; - private System.Windows.Forms.ColumnHeader columnHeader3; - private System.Windows.Forms.ColumnHeader columnHeader4; - private System.Windows.Forms.ColumnHeader columnHeader5; - private System.Windows.Forms.ColumnHeader columnHeader6; - private System.Windows.Forms.ColumnHeader columnHeader7; - private System.Windows.Forms.ColumnHeader columnHeader8; + private System.Windows.Forms.DataGridView dv4; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridView dv3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; + private System.Windows.Forms.DataGridView dv2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridView dv1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; } } \ No newline at end of file diff --git a/Cs_HMI/Project/ViewForm/fFlag.cs b/Cs_HMI/Project/ViewForm/fFlag.cs index 6b720ff..5a32e87 100644 --- a/Cs_HMI/Project/ViewForm/fFlag.cs +++ b/Cs_HMI/Project/ViewForm/fFlag.cs @@ -18,7 +18,7 @@ namespace Project.ViewForm { InitializeComponent(); - + this.FormClosed += FIO_FormClosed; } @@ -30,16 +30,18 @@ namespace Project.ViewForm void MakeControl() { - ListView[] lvs = new ListView[] { listView1, listView2, listView3, listView4 }; - foreach (var lv in lvs) + DataGridView[] dvs = new DataGridView[] { dv1, dv2, dv3, dv4 }; + + foreach(var lv in dvs) { lv.Columns.Clear(); - lv.Columns.Add("Idx"); - lv.Columns.Add("Title"); - lv.Columns.Add("Value"); + lv.Columns.Add("idx", "*"); + lv.Columns.Add("Title", "Title"); + lv.Columns.Add("Value", "Value"); lv.Columns[0].Width = 25; lv.Columns[1].Width = 150; - lv.Columns[2].Width = 100; + lv.Columns[2].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } Array valuelist; @@ -47,38 +49,33 @@ namespace Project.ViewForm foreach (var item in valuelist) { var v = (COMM.eVarBool)item; - var lv = listView1.Items.Add($"{(int)v}"); - lv.SubItems.Add($"{item}"); - lv.SubItems.Add("--"); + dv1.Rows.Add($"{(int)v}", item, "--"); } valuelist = Enum.GetValues(typeof(COMM.eVarInt32)); foreach (var item in valuelist) { var v = (COMM.eVarInt32)item; - var lv = listView2.Items.Add($"{(int)v}"); - lv.SubItems.Add($"{item}"); - lv.SubItems.Add("--"); + dv2.Rows.Add($"{(int)v}", item, "--"); } valuelist = Enum.GetValues(typeof(COMM.eVarString)); foreach (var item in valuelist) { var v = (COMM.eVarString)item; - var lv = listView3.Items.Add($"{(int)v}"); - lv.SubItems.Add($"{item}"); - lv.SubItems.Add("--"); + dv3.Rows.Add($"{(int)v}", item, "--"); } valuelist = Enum.GetValues(typeof(COMM.eVarTime)); foreach (var item in valuelist) { var v = (COMM.eVarString)item; - var lv = listView4.Items.Add($"{(int)v}"); - lv.SubItems.Add($"{item}"); - lv.SubItems.Add("--"); + dv4.Rows.Add($"{(int)v}", item, "--"); } + foreach (var dv in dvs) + dv.AutoResizeColumns(); + } @@ -91,42 +88,32 @@ namespace Project.ViewForm private void timer1_Tick(object sender, EventArgs e) { timer1.Stop(); - listView1.SuspendLayout(); - foreach (ListViewItem item in listView1.Items) + foreach(DataGridViewRow item in this.dv1.Rows) { - var idx = int.Parse(item.SubItems[0].Text); + var idx = int.Parse(item.Cells["idx"].Value.ToString()); var v = VAR.BOOL.Get(idx); - var desc = VAR.BOOL.GetCodeDesc(idx); - item.SubItems[2].Text = v ? "O" : "X"; + item.Cells["value"].Value = v ? "O" : "X"; } - listView1.ResumeLayout(); - listView2.SuspendLayout(); - foreach (ListViewItem item in listView2.Items) + + foreach (DataGridViewRow item in this.dv2.Rows) { - var idx = int.Parse(item.SubItems[0].Text); + var idx = int.Parse(item.Cells["idx"].Value.ToString()); var v = VAR.I32.Get(idx); - var desc = VAR.I32.GetCodeDesc(idx); - item.SubItems[2].Text = v.ToString(); + item.Cells["value"].Value = v.ToString(); } - listView2.ResumeLayout(); - listView3.SuspendLayout(); - foreach (ListViewItem item in listView3.Items) + + foreach (DataGridViewRow item in this.dv3.Rows) { - var idx = int.Parse(item.SubItems[0].Text); + var idx = int.Parse(item.Cells["idx"].Value.ToString()); var v = VAR.STR.Get(idx); - var desc = VAR.STR.GetCodeDesc(idx); - item.SubItems[2].Text = v; + item.Cells["value"].Value = v; } - listView3.ResumeLayout(); - listView4.SuspendLayout(); - foreach (ListViewItem item in listView4.Items) + foreach (DataGridViewRow item in this.dv4.Rows) { - var idx = int.Parse(item.SubItems[0].Text); + var idx = int.Parse(item.Cells["idx"].Value.ToString()); var v = VAR.TIME.Get(idx); - var desc = VAR.TIME.GetCodeDesc(idx); - item.SubItems[2].Text = v.ToString("HH:mm:ss.fff"); + item.Cells["value"].Value = v.ToString("HH:mm:ss.fff"); } - listView4.ResumeLayout(); timer1.Start(); } diff --git a/Cs_HMI/Project/ViewForm/fFlag.resx b/Cs_HMI/Project/ViewForm/fFlag.resx index aac33d5..67c91da 100644 --- a/Cs_HMI/Project/ViewForm/fFlag.resx +++ b/Cs_HMI/Project/ViewForm/fFlag.resx @@ -117,6 +117,30 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 17, 17 diff --git a/Cs_HMI/Project/ViewForm/fManual.cs b/Cs_HMI/Project/ViewForm/fManual.cs index 3276bf0..46c08f7 100644 --- a/Cs_HMI/Project/ViewForm/fManual.cs +++ b/Cs_HMI/Project/ViewForm/fManual.cs @@ -79,8 +79,9 @@ namespace Project.ViewForm } if (PUB.CheckManualChargeMode() == false) return; arDev.Narumi.Speed spd = arDev.Narumi.Speed.Low; + if (radspdh.Checked) spd = arDev.Narumi.Speed.High; - else if (radspdl.Checked) spd = arDev.Narumi.Speed.Mid; + else if (radspdm.Checked) spd = arDev.Narumi.Speed.Mid; arDev.Narumi.Sensor ss = arDev.Narumi.Sensor.PBSOff; if (radpbs0.Checked) ss = arDev.Narumi.Sensor.PBSOn; PUB.AGV.AGVMoveManual(arDev.Narumi.ManulOpt.BS, spd, ss); @@ -109,7 +110,7 @@ namespace Project.ViewForm if (PUB.CheckManualChargeMode() == false) return; arDev.Narumi.Speed spd = arDev.Narumi.Speed.Low; if (radspdh.Checked) spd = arDev.Narumi.Speed.High; - else if (radspdl.Checked) spd = arDev.Narumi.Speed.Mid; + else if (radspdm.Checked) spd = arDev.Narumi.Speed.Mid; arDev.Narumi.Sensor ss = arDev.Narumi.Sensor.PBSOff; if (radpbs0.Checked) ss = arDev.Narumi.Sensor.PBSOn; PUB.AGV.AGVMoveManual(arDev.Narumi.ManulOpt.FS, spd, ss);