diff --git a/Datasheet.Designer.cs b/Datasheet.Designer.cs index 02ac89b..8dd3f64 100644 --- a/Datasheet.Designer.cs +++ b/Datasheet.Designer.cs @@ -29,13 +29,27 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Datasheet)); + this.listView1 = new System.Windows.Forms.ListView(); this.SuspendLayout(); // + // listView1 + // + this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(12, 137); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(716, 301); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + // // Datasheet // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(740, 450); + this.Controls.Add(this.listView1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "Datasheet"; this.Text = "Datasheet"; @@ -44,5 +58,7 @@ } #endregion + + private System.Windows.Forms.ListView listView1; } } \ No newline at end of file diff --git a/Datasheet.cs b/Datasheet.cs index 73d7f45..138313b 100644 --- a/Datasheet.cs +++ b/Datasheet.cs @@ -13,24 +13,30 @@ namespace Gidrolock_Modbus_Scanner public partial class Datasheet : Form { int pollDelay = 250; // delay between each entry poll, ms - List entries = new List(); - + Device device = App.device; public Datasheet() { - InitializeComponent(); - } - } + InitializeComponent(); + listView1.AllowColumnReorder = true; + listView1.CheckBoxes = true; + listView1.FullRowSelect = true; + listView1.GridLines = true; - public class EntryUI : GroupBox - { - public Label Label_Name; - public Label Label_Value; - public ToolTip ToolTip; - public EntryUI(string name, string description, int address, string registerType, string dataType) - { - Label_Name.Text = name; - ToolTip.SetToolTip(this, description); + listView1.Columns.Add("#", -2, HorizontalAlignment.Left); + listView1.Columns.Add("Name", -2, HorizontalAlignment.Left); + listView1.Columns.Add("Value", -2, HorizontalAlignment.Left); + listView1.Columns.Add("Address", -2, HorizontalAlignment.Left); + + + for (int i = 0; i < device.entries.Count; i++) + { + ListViewItem item = new ListViewItem(i.ToString()); + item.SubItems.Add(device.entries[i].name); + item.SubItems.Add(" "); + item.SubItems.Add(device.entries[i].address.ToString()); + + listView1.Items.Add(item); + } } - } } diff --git a/Gidrolock Modbus Scanner.csproj b/Gidrolock Modbus Scanner.csproj index f34d7f3..7ab61e6 100644 --- a/Gidrolock Modbus Scanner.csproj +++ b/Gidrolock Modbus Scanner.csproj @@ -68,20 +68,27 @@ - - - + Form - - Form1.cs + + Datasheet.cs + + + + + Form + + + Main.cs - - - - Form1.cs + + Datasheet.cs + + + Main.cs ResXFileCodeGenerator diff --git a/Json.cs b/Json.cs index d4edf52..eaf7733 100644 --- a/Json.cs +++ b/Json.cs @@ -40,5 +40,5 @@ namespace Gidrolock_Modbus_Scanner this.readOnce = readOnce; } } - public enum RegisterType { Coil, DiscreteInput, HoldingRegister, InputRegister } + public enum RegisterType { Coil, Discrete, Holding, Input } } diff --git a/Main.cs b/Main.cs index 1d8e05e..effc279 100644 --- a/Main.cs +++ b/Main.cs @@ -214,6 +214,7 @@ namespace Gidrolock_Modbus_Scanner { AddLog("Попытка подключиться к устройству " + device.name); Datasheet datasheet = new Datasheet(); + datasheet.Show(); /* if (Radio_SerialPort.Checked) await SendMessageAsync(FunctionCode.InputRegister, 200, 6);