From 02030551b29de256b1e18071fc218be74efc8663 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 09:50:47 +0300 Subject: [PATCH 01/23] ExtCommConfig: fix layout of list views --- .../Controls/CtrlLineCustom.Designer.cs | 219 +++-- .../ExtCommConfig/Controls/CtrlLineCustom.cs | 2 +- .../Controls/CtrlLinePolling.Designer.cs | 847 +++++++++--------- .../ExtCommConfig/Controls/CtrlLinePolling.cs | 6 +- .../ExtCommConfig/ExtCommConfig.csproj | 2 +- 5 files changed, 517 insertions(+), 559 deletions(-) diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.Designer.cs b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.Designer.cs index 1a89a0924..2e958e7e0 100644 --- a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.Designer.cs +++ b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.Designer.cs @@ -28,154 +28,151 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.gbSelectedOption = new System.Windows.Forms.GroupBox(); - this.lblOptionValue = new System.Windows.Forms.Label(); - this.txtOptionValue = new System.Windows.Forms.TextBox(); - this.txtOptionName = new System.Windows.Forms.TextBox(); - this.lblOptionName = new System.Windows.Forms.Label(); - this.lvCustomOptions = new System.Windows.Forms.ListView(); - this.colOptionName = new System.Windows.Forms.ColumnHeader(); - this.colOptionValue = new System.Windows.Forms.ColumnHeader(); - this.btnAddOption = new System.Windows.Forms.Button(); - this.btnDeleteOption = new System.Windows.Forms.Button(); - this.pnlTop = new System.Windows.Forms.Panel(); - this.pnlBottom = new System.Windows.Forms.Panel(); - this.gbSelectedOption.SuspendLayout(); - this.pnlTop.SuspendLayout(); - this.pnlBottom.SuspendLayout(); - this.SuspendLayout(); + gbSelectedOption = new System.Windows.Forms.GroupBox(); + txtOptionValue = new System.Windows.Forms.TextBox(); + lblOptionValue = new System.Windows.Forms.Label(); + txtOptionName = new System.Windows.Forms.TextBox(); + lblOptionName = new System.Windows.Forms.Label(); + lvCustomOptions = new System.Windows.Forms.ListView(); + colOptionName = new System.Windows.Forms.ColumnHeader(); + colOptionValue = new System.Windows.Forms.ColumnHeader(); + btnAddOption = new System.Windows.Forms.Button(); + btnDeleteOption = new System.Windows.Forms.Button(); + pnlTop = new System.Windows.Forms.Panel(); + pnlBottom = new System.Windows.Forms.Panel(); + gbSelectedOption.SuspendLayout(); + pnlTop.SuspendLayout(); + pnlBottom.SuspendLayout(); + SuspendLayout(); // // gbSelectedOption // - this.gbSelectedOption.Controls.Add(this.txtOptionValue); - this.gbSelectedOption.Controls.Add(this.lblOptionValue); - this.gbSelectedOption.Controls.Add(this.txtOptionName); - this.gbSelectedOption.Controls.Add(this.lblOptionName); - this.gbSelectedOption.Location = new System.Drawing.Point(0, 3); - this.gbSelectedOption.Name = "gbSelectedOption"; - this.gbSelectedOption.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10); - this.gbSelectedOption.Size = new System.Drawing.Size(500, 73); - this.gbSelectedOption.TabIndex = 0; - this.gbSelectedOption.TabStop = false; - this.gbSelectedOption.Text = "Selected Option"; + gbSelectedOption.Controls.Add(txtOptionValue); + gbSelectedOption.Controls.Add(lblOptionValue); + gbSelectedOption.Controls.Add(txtOptionName); + gbSelectedOption.Controls.Add(lblOptionName); + gbSelectedOption.Location = new System.Drawing.Point(0, 3); + gbSelectedOption.Name = "gbSelectedOption"; + gbSelectedOption.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10); + gbSelectedOption.Size = new System.Drawing.Size(500, 73); + gbSelectedOption.TabIndex = 0; + gbSelectedOption.TabStop = false; + gbSelectedOption.Text = "Selected Option"; // - // lblOptionValue + // txtOptionValue // - this.lblOptionValue.AutoSize = true; - this.lblOptionValue.Location = new System.Drawing.Point(186, 19); - this.lblOptionValue.Name = "lblOptionValue"; - this.lblOptionValue.Size = new System.Drawing.Size(35, 15); - this.lblOptionValue.TabIndex = 2; - this.lblOptionValue.Text = "Value"; + txtOptionValue.Location = new System.Drawing.Point(189, 37); + txtOptionValue.Name = "txtOptionValue"; + txtOptionValue.Size = new System.Drawing.Size(298, 23); + txtOptionValue.TabIndex = 3; + txtOptionValue.TextChanged += txtOptionValue_TextChanged; // - // txtOptionValue + // lblOptionValue // - this.txtOptionValue.Location = new System.Drawing.Point(189, 37); - this.txtOptionValue.Name = "txtOptionValue"; - this.txtOptionValue.Size = new System.Drawing.Size(298, 23); - this.txtOptionValue.TabIndex = 3; - this.txtOptionValue.TextChanged += new System.EventHandler(this.txtOptionValue_TextChanged); + lblOptionValue.AutoSize = true; + lblOptionValue.Location = new System.Drawing.Point(186, 19); + lblOptionValue.Name = "lblOptionValue"; + lblOptionValue.Size = new System.Drawing.Size(35, 15); + lblOptionValue.TabIndex = 2; + lblOptionValue.Text = "Value"; // // txtOptionName // - this.txtOptionName.Location = new System.Drawing.Point(13, 37); - this.txtOptionName.Name = "txtOptionName"; - this.txtOptionName.Size = new System.Drawing.Size(170, 23); - this.txtOptionName.TabIndex = 1; - this.txtOptionName.TextChanged += new System.EventHandler(this.txtOptionName_TextChanged); + txtOptionName.Location = new System.Drawing.Point(13, 37); + txtOptionName.Name = "txtOptionName"; + txtOptionName.Size = new System.Drawing.Size(170, 23); + txtOptionName.TabIndex = 1; + txtOptionName.TextChanged += txtOptionName_TextChanged; // // lblOptionName // - this.lblOptionName.AutoSize = true; - this.lblOptionName.Location = new System.Drawing.Point(10, 19); - this.lblOptionName.Name = "lblOptionName"; - this.lblOptionName.Size = new System.Drawing.Size(39, 15); - this.lblOptionName.TabIndex = 0; - this.lblOptionName.Text = "Name"; + lblOptionName.AutoSize = true; + lblOptionName.Location = new System.Drawing.Point(10, 19); + lblOptionName.Name = "lblOptionName"; + lblOptionName.Size = new System.Drawing.Size(39, 15); + lblOptionName.TabIndex = 0; + lblOptionName.Text = "Name"; // // lvCustomOptions // - this.lvCustomOptions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colOptionName, - this.colOptionValue}); - this.lvCustomOptions.Dock = System.Windows.Forms.DockStyle.Fill; - this.lvCustomOptions.FullRowSelect = true; - this.lvCustomOptions.GridLines = true; - this.lvCustomOptions.Location = new System.Drawing.Point(0, 29); - this.lvCustomOptions.MultiSelect = false; - this.lvCustomOptions.Name = "lvCustomOptions"; - this.lvCustomOptions.ShowItemToolTips = true; - this.lvCustomOptions.Size = new System.Drawing.Size(550, 421); - this.lvCustomOptions.TabIndex = 1; - this.lvCustomOptions.UseCompatibleStateImageBehavior = false; - this.lvCustomOptions.View = System.Windows.Forms.View.Details; - this.lvCustomOptions.SelectedIndexChanged += new System.EventHandler(this.lvCustomOptions_SelectedIndexChanged); + lvCustomOptions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { colOptionName, colOptionValue }); + lvCustomOptions.Dock = System.Windows.Forms.DockStyle.Fill; + lvCustomOptions.FullRowSelect = true; + lvCustomOptions.GridLines = true; + lvCustomOptions.Location = new System.Drawing.Point(0, 29); + lvCustomOptions.MultiSelect = false; + lvCustomOptions.Name = "lvCustomOptions"; + lvCustomOptions.ShowItemToolTips = true; + lvCustomOptions.Size = new System.Drawing.Size(550, 345); + lvCustomOptions.TabIndex = 1; + lvCustomOptions.UseCompatibleStateImageBehavior = false; + lvCustomOptions.View = System.Windows.Forms.View.Details; + lvCustomOptions.SelectedIndexChanged += lvCustomOptions_SelectedIndexChanged; // // colOptionName // - this.colOptionName.Text = "Name"; - this.colOptionName.Width = 200; + colOptionName.Text = "Name"; + colOptionName.Width = 200; // // colOptionValue // - this.colOptionValue.Text = "Value"; - this.colOptionValue.Width = 300; + colOptionValue.Text = "Value"; + colOptionValue.Width = 300; // // btnAddOption // - this.btnAddOption.Location = new System.Drawing.Point(0, 0); - this.btnAddOption.Name = "btnAddOption"; - this.btnAddOption.Size = new System.Drawing.Size(80, 23); - this.btnAddOption.TabIndex = 0; - this.btnAddOption.Text = "Add"; - this.btnAddOption.UseVisualStyleBackColor = true; - this.btnAddOption.Click += new System.EventHandler(this.btnAddOption_Click); + btnAddOption.Location = new System.Drawing.Point(0, 0); + btnAddOption.Name = "btnAddOption"; + btnAddOption.Size = new System.Drawing.Size(80, 23); + btnAddOption.TabIndex = 0; + btnAddOption.Text = "Add"; + btnAddOption.UseVisualStyleBackColor = true; + btnAddOption.Click += btnAddOption_Click; // // btnDeleteOption // - this.btnDeleteOption.Location = new System.Drawing.Point(86, 0); - this.btnDeleteOption.Name = "btnDeleteOption"; - this.btnDeleteOption.Size = new System.Drawing.Size(80, 23); - this.btnDeleteOption.TabIndex = 1; - this.btnDeleteOption.Text = "Delete"; - this.btnDeleteOption.UseVisualStyleBackColor = true; - this.btnDeleteOption.Click += new System.EventHandler(this.btnDeleteOption_Click); + btnDeleteOption.Location = new System.Drawing.Point(86, 0); + btnDeleteOption.Name = "btnDeleteOption"; + btnDeleteOption.Size = new System.Drawing.Size(80, 23); + btnDeleteOption.TabIndex = 1; + btnDeleteOption.Text = "Delete"; + btnDeleteOption.UseVisualStyleBackColor = true; + btnDeleteOption.Click += btnDeleteOption_Click; // // pnlTop // - this.pnlTop.Controls.Add(this.btnDeleteOption); - this.pnlTop.Controls.Add(this.btnAddOption); - this.pnlTop.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlTop.Location = new System.Drawing.Point(0, 0); - this.pnlTop.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(550, 29); - this.pnlTop.TabIndex = 0; + pnlTop.Controls.Add(btnDeleteOption); + pnlTop.Controls.Add(btnAddOption); + pnlTop.Dock = System.Windows.Forms.DockStyle.Top; + pnlTop.Location = new System.Drawing.Point(0, 0); + pnlTop.Name = "pnlTop"; + pnlTop.Size = new System.Drawing.Size(550, 29); + pnlTop.TabIndex = 0; // // pnlBottom // - this.pnlBottom.Controls.Add(this.gbSelectedOption); - this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 374); - this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(550, 76); - this.pnlBottom.TabIndex = 2; + pnlBottom.Controls.Add(gbSelectedOption); + pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; + pnlBottom.Location = new System.Drawing.Point(0, 374); + pnlBottom.Name = "pnlBottom"; + pnlBottom.Size = new System.Drawing.Size(550, 76); + pnlBottom.TabIndex = 2; // // CtrlLineCustom // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.pnlBottom); - this.Controls.Add(this.lvCustomOptions); - this.Controls.Add(this.pnlTop); - this.Name = "CtrlLineCustom"; - this.Size = new System.Drawing.Size(550, 450); - this.Load += new System.EventHandler(this.CtrlLineCustomParams_Load); - this.gbSelectedOption.ResumeLayout(false); - this.gbSelectedOption.PerformLayout(); - this.pnlTop.ResumeLayout(false); - this.pnlBottom.ResumeLayout(false); - this.ResumeLayout(false); - + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + Controls.Add(lvCustomOptions); + Controls.Add(pnlBottom); + Controls.Add(pnlTop); + Name = "CtrlLineCustom"; + Size = new System.Drawing.Size(550, 450); + Load += CtrlLineCustomParams_Load; + gbSelectedOption.ResumeLayout(false); + gbSelectedOption.PerformLayout(); + pnlTop.ResumeLayout(false); + pnlBottom.ResumeLayout(false); + ResumeLayout(false); } #endregion diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.cs b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.cs index 8e6ec86f9..a0e10af95 100644 --- a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.cs +++ b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLineCustom.cs @@ -38,7 +38,7 @@ private void SetColumnNames() colOptionName.Name = nameof(colOptionName); colOptionValue.Name = nameof(colOptionValue); } - + /// /// Enables or disables the controls. /// diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.Designer.cs b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.Designer.cs index 61a40e542..714df0953 100644 --- a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.Designer.cs +++ b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.Designer.cs @@ -28,608 +28,569 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.gbSelectedDevice = new System.Windows.Forms.GroupBox(); - this.btnResetPollingOptions = new System.Windows.Forms.Button(); - this.btnDeviceProperties = new System.Windows.Forms.Button(); - this.txtCustomOptions = new System.Windows.Forms.TextBox(); - this.lblCustomOptions = new System.Windows.Forms.Label(); - this.txtCmdLine = new System.Windows.Forms.TextBox(); - this.lblCmdLine = new System.Windows.Forms.Label(); - this.dtpPeriod = new System.Windows.Forms.DateTimePicker(); - this.lblPeriod = new System.Windows.Forms.Label(); - this.dtpTime = new System.Windows.Forms.DateTimePicker(); - this.lblTime = new System.Windows.Forms.Label(); - this.numDelay = new System.Windows.Forms.NumericUpDown(); - this.lblDelay = new System.Windows.Forms.Label(); - this.numTimeout = new System.Windows.Forms.NumericUpDown(); - this.lblTimeout = new System.Windows.Forms.Label(); - this.txtStrAddress = new System.Windows.Forms.TextBox(); - this.lblStrAddress = new System.Windows.Forms.Label(); - this.numNumAddress = new System.Windows.Forms.NumericUpDown(); - this.lblNumAddress = new System.Windows.Forms.Label(); - this.cbDriver = new System.Windows.Forms.ComboBox(); - this.lblDriver = new System.Windows.Forms.Label(); - this.txtName = new System.Windows.Forms.TextBox(); - this.lblName = new System.Windows.Forms.Label(); - this.numDeviceNum = new System.Windows.Forms.NumericUpDown(); - this.lblDeviceNum = new System.Windows.Forms.Label(); - this.chkIsBound = new System.Windows.Forms.CheckBox(); - this.chkPollOnCmd = new System.Windows.Forms.CheckBox(); - this.chkActive = new System.Windows.Forms.CheckBox(); - this.lvDevicePolling = new System.Windows.Forms.ListView(); - this.colOrder = new System.Windows.Forms.ColumnHeader(); - this.colActive = new System.Windows.Forms.ColumnHeader(); - this.colPollOnCmd = new System.Windows.Forms.ColumnHeader(); - this.colIsBound = new System.Windows.Forms.ColumnHeader(); - this.colNumber = new System.Windows.Forms.ColumnHeader(); - this.colName = new System.Windows.Forms.ColumnHeader(); - this.colDriver = new System.Windows.Forms.ColumnHeader(); - this.colNumAddress = new System.Windows.Forms.ColumnHeader(); - this.colStrAddress = new System.Windows.Forms.ColumnHeader(); - this.colTimeout = new System.Windows.Forms.ColumnHeader(); - this.colDelay = new System.Windows.Forms.ColumnHeader(); - this.colTime = new System.Windows.Forms.ColumnHeader(); - this.colPeriod = new System.Windows.Forms.ColumnHeader(); - this.colCmdLine = new System.Windows.Forms.ColumnHeader(); - this.btnAddDevice = new System.Windows.Forms.Button(); - this.btnMoveUpDevice = new System.Windows.Forms.Button(); - this.btnMoveDownDevice = new System.Windows.Forms.Button(); - this.btnDeleteDevice = new System.Windows.Forms.Button(); - this.btnPasteDevice = new System.Windows.Forms.Button(); - this.btnCopyDevice = new System.Windows.Forms.Button(); - this.btnCutDevice = new System.Windows.Forms.Button(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.pnlTop = new System.Windows.Forms.Panel(); - this.pnlBottom = new System.Windows.Forms.Panel(); - this.gbSelectedDevice.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numDelay)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numTimeout)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numNumAddress)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numDeviceNum)).BeginInit(); - this.pnlTop.SuspendLayout(); - this.pnlBottom.SuspendLayout(); - this.SuspendLayout(); + components = new System.ComponentModel.Container(); + gbSelectedDevice = new System.Windows.Forms.GroupBox(); + btnResetPollingOptions = new System.Windows.Forms.Button(); + btnDeviceProperties = new System.Windows.Forms.Button(); + txtCustomOptions = new System.Windows.Forms.TextBox(); + lblCustomOptions = new System.Windows.Forms.Label(); + txtCmdLine = new System.Windows.Forms.TextBox(); + lblCmdLine = new System.Windows.Forms.Label(); + dtpPeriod = new System.Windows.Forms.DateTimePicker(); + lblPeriod = new System.Windows.Forms.Label(); + dtpTime = new System.Windows.Forms.DateTimePicker(); + lblTime = new System.Windows.Forms.Label(); + numDelay = new System.Windows.Forms.NumericUpDown(); + lblDelay = new System.Windows.Forms.Label(); + numTimeout = new System.Windows.Forms.NumericUpDown(); + lblTimeout = new System.Windows.Forms.Label(); + txtStrAddress = new System.Windows.Forms.TextBox(); + lblStrAddress = new System.Windows.Forms.Label(); + numNumAddress = new System.Windows.Forms.NumericUpDown(); + lblNumAddress = new System.Windows.Forms.Label(); + cbDriver = new System.Windows.Forms.ComboBox(); + lblDriver = new System.Windows.Forms.Label(); + txtName = new System.Windows.Forms.TextBox(); + lblName = new System.Windows.Forms.Label(); + numDeviceNum = new System.Windows.Forms.NumericUpDown(); + lblDeviceNum = new System.Windows.Forms.Label(); + chkIsBound = new System.Windows.Forms.CheckBox(); + chkPollOnCmd = new System.Windows.Forms.CheckBox(); + chkActive = new System.Windows.Forms.CheckBox(); + lvDevicePolling = new System.Windows.Forms.ListView(); + colOrder = new System.Windows.Forms.ColumnHeader(); + colActive = new System.Windows.Forms.ColumnHeader(); + colPollOnCmd = new System.Windows.Forms.ColumnHeader(); + colIsBound = new System.Windows.Forms.ColumnHeader(); + colNumber = new System.Windows.Forms.ColumnHeader(); + colName = new System.Windows.Forms.ColumnHeader(); + colDriver = new System.Windows.Forms.ColumnHeader(); + colNumAddress = new System.Windows.Forms.ColumnHeader(); + colStrAddress = new System.Windows.Forms.ColumnHeader(); + colTimeout = new System.Windows.Forms.ColumnHeader(); + colDelay = new System.Windows.Forms.ColumnHeader(); + colTime = new System.Windows.Forms.ColumnHeader(); + colPeriod = new System.Windows.Forms.ColumnHeader(); + colCmdLine = new System.Windows.Forms.ColumnHeader(); + btnAddDevice = new System.Windows.Forms.Button(); + btnMoveUpDevice = new System.Windows.Forms.Button(); + btnMoveDownDevice = new System.Windows.Forms.Button(); + btnDeleteDevice = new System.Windows.Forms.Button(); + btnPasteDevice = new System.Windows.Forms.Button(); + btnCopyDevice = new System.Windows.Forms.Button(); + btnCutDevice = new System.Windows.Forms.Button(); + toolTip = new System.Windows.Forms.ToolTip(components); + pnlTop = new System.Windows.Forms.Panel(); + pnlBottom = new System.Windows.Forms.Panel(); + gbSelectedDevice.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numDelay).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numTimeout).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numNumAddress).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numDeviceNum).BeginInit(); + pnlTop.SuspendLayout(); + pnlBottom.SuspendLayout(); + SuspendLayout(); // // gbSelectedDevice // - this.gbSelectedDevice.Controls.Add(this.btnResetPollingOptions); - this.gbSelectedDevice.Controls.Add(this.btnDeviceProperties); - this.gbSelectedDevice.Controls.Add(this.txtCustomOptions); - this.gbSelectedDevice.Controls.Add(this.lblCustomOptions); - this.gbSelectedDevice.Controls.Add(this.txtCmdLine); - this.gbSelectedDevice.Controls.Add(this.lblCmdLine); - this.gbSelectedDevice.Controls.Add(this.dtpPeriod); - this.gbSelectedDevice.Controls.Add(this.lblPeriod); - this.gbSelectedDevice.Controls.Add(this.dtpTime); - this.gbSelectedDevice.Controls.Add(this.lblTime); - this.gbSelectedDevice.Controls.Add(this.numDelay); - this.gbSelectedDevice.Controls.Add(this.lblDelay); - this.gbSelectedDevice.Controls.Add(this.numTimeout); - this.gbSelectedDevice.Controls.Add(this.lblTimeout); - this.gbSelectedDevice.Controls.Add(this.txtStrAddress); - this.gbSelectedDevice.Controls.Add(this.lblStrAddress); - this.gbSelectedDevice.Controls.Add(this.numNumAddress); - this.gbSelectedDevice.Controls.Add(this.lblNumAddress); - this.gbSelectedDevice.Controls.Add(this.cbDriver); - this.gbSelectedDevice.Controls.Add(this.lblDriver); - this.gbSelectedDevice.Controls.Add(this.txtName); - this.gbSelectedDevice.Controls.Add(this.lblName); - this.gbSelectedDevice.Controls.Add(this.numDeviceNum); - this.gbSelectedDevice.Controls.Add(this.lblDeviceNum); - this.gbSelectedDevice.Controls.Add(this.chkIsBound); - this.gbSelectedDevice.Controls.Add(this.chkPollOnCmd); - this.gbSelectedDevice.Controls.Add(this.chkActive); - this.gbSelectedDevice.Location = new System.Drawing.Point(0, 3); - this.gbSelectedDevice.Name = "gbSelectedDevice"; - this.gbSelectedDevice.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10); - this.gbSelectedDevice.Size = new System.Drawing.Size(650, 259); - this.gbSelectedDevice.TabIndex = 0; - this.gbSelectedDevice.TabStop = false; - this.gbSelectedDevice.Text = "Selected Device"; + gbSelectedDevice.Controls.Add(btnResetPollingOptions); + gbSelectedDevice.Controls.Add(btnDeviceProperties); + gbSelectedDevice.Controls.Add(txtCustomOptions); + gbSelectedDevice.Controls.Add(lblCustomOptions); + gbSelectedDevice.Controls.Add(txtCmdLine); + gbSelectedDevice.Controls.Add(lblCmdLine); + gbSelectedDevice.Controls.Add(dtpPeriod); + gbSelectedDevice.Controls.Add(lblPeriod); + gbSelectedDevice.Controls.Add(dtpTime); + gbSelectedDevice.Controls.Add(lblTime); + gbSelectedDevice.Controls.Add(numDelay); + gbSelectedDevice.Controls.Add(lblDelay); + gbSelectedDevice.Controls.Add(numTimeout); + gbSelectedDevice.Controls.Add(lblTimeout); + gbSelectedDevice.Controls.Add(txtStrAddress); + gbSelectedDevice.Controls.Add(lblStrAddress); + gbSelectedDevice.Controls.Add(numNumAddress); + gbSelectedDevice.Controls.Add(lblNumAddress); + gbSelectedDevice.Controls.Add(cbDriver); + gbSelectedDevice.Controls.Add(lblDriver); + gbSelectedDevice.Controls.Add(txtName); + gbSelectedDevice.Controls.Add(lblName); + gbSelectedDevice.Controls.Add(numDeviceNum); + gbSelectedDevice.Controls.Add(lblDeviceNum); + gbSelectedDevice.Controls.Add(chkIsBound); + gbSelectedDevice.Controls.Add(chkPollOnCmd); + gbSelectedDevice.Controls.Add(chkActive); + gbSelectedDevice.Location = new System.Drawing.Point(0, 3); + gbSelectedDevice.Name = "gbSelectedDevice"; + gbSelectedDevice.Padding = new System.Windows.Forms.Padding(10, 3, 10, 10); + gbSelectedDevice.Size = new System.Drawing.Size(650, 259); + gbSelectedDevice.TabIndex = 0; + gbSelectedDevice.TabStop = false; + gbSelectedDevice.Text = "Selected Device"; // // btnResetPollingOptions // - this.btnResetPollingOptions.Location = new System.Drawing.Point(119, 223); - this.btnResetPollingOptions.Name = "btnResetPollingOptions"; - this.btnResetPollingOptions.Size = new System.Drawing.Size(100, 23); - this.btnResetPollingOptions.TabIndex = 26; - this.btnResetPollingOptions.Text = "Reset"; - this.toolTip.SetToolTip(this.btnResetPollingOptions, "Set the device polling options to default"); - this.btnResetPollingOptions.UseVisualStyleBackColor = true; - this.btnResetPollingOptions.Click += new System.EventHandler(this.btnResetPollingOptions_Click); + btnResetPollingOptions.Location = new System.Drawing.Point(119, 223); + btnResetPollingOptions.Name = "btnResetPollingOptions"; + btnResetPollingOptions.Size = new System.Drawing.Size(100, 23); + btnResetPollingOptions.TabIndex = 26; + btnResetPollingOptions.Text = "Reset"; + toolTip.SetToolTip(btnResetPollingOptions, "Set the device polling options to default"); + btnResetPollingOptions.UseVisualStyleBackColor = true; + btnResetPollingOptions.Click += btnResetPollingOptions_Click; // // btnDeviceProperties // - this.btnDeviceProperties.Location = new System.Drawing.Point(13, 223); - this.btnDeviceProperties.Name = "btnDeviceProperties"; - this.btnDeviceProperties.Size = new System.Drawing.Size(100, 23); - this.btnDeviceProperties.TabIndex = 25; - this.btnDeviceProperties.Text = "Properies"; - this.btnDeviceProperties.UseVisualStyleBackColor = true; - this.btnDeviceProperties.Click += new System.EventHandler(this.btnDeviceProperties_Click); + btnDeviceProperties.Location = new System.Drawing.Point(13, 223); + btnDeviceProperties.Name = "btnDeviceProperties"; + btnDeviceProperties.Size = new System.Drawing.Size(100, 23); + btnDeviceProperties.TabIndex = 25; + btnDeviceProperties.Text = "Properies"; + btnDeviceProperties.UseVisualStyleBackColor = true; + btnDeviceProperties.Click += btnDeviceProperties_Click; // // txtCustomOptions // - this.txtCustomOptions.Location = new System.Drawing.Point(437, 62); - this.txtCustomOptions.Multiline = true; - this.txtCustomOptions.Name = "txtCustomOptions"; - this.txtCustomOptions.ReadOnly = true; - this.txtCustomOptions.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtCustomOptions.Size = new System.Drawing.Size(200, 155); - this.txtCustomOptions.TabIndex = 24; - this.txtCustomOptions.WordWrap = false; + txtCustomOptions.Location = new System.Drawing.Point(437, 62); + txtCustomOptions.Multiline = true; + txtCustomOptions.Name = "txtCustomOptions"; + txtCustomOptions.ReadOnly = true; + txtCustomOptions.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + txtCustomOptions.Size = new System.Drawing.Size(200, 155); + txtCustomOptions.TabIndex = 24; + txtCustomOptions.WordWrap = false; // // lblCustomOptions // - this.lblCustomOptions.AutoSize = true; - this.lblCustomOptions.Location = new System.Drawing.Point(434, 44); - this.lblCustomOptions.Name = "lblCustomOptions"; - this.lblCustomOptions.Size = new System.Drawing.Size(49, 15); - this.lblCustomOptions.TabIndex = 23; - this.lblCustomOptions.Text = "Options"; + lblCustomOptions.AutoSize = true; + lblCustomOptions.Location = new System.Drawing.Point(434, 44); + lblCustomOptions.Name = "lblCustomOptions"; + lblCustomOptions.Size = new System.Drawing.Size(49, 15); + lblCustomOptions.TabIndex = 23; + lblCustomOptions.Text = "Options"; // // txtCmdLine // - this.txtCmdLine.Location = new System.Drawing.Point(13, 194); - this.txtCmdLine.Name = "txtCmdLine"; - this.txtCmdLine.Size = new System.Drawing.Size(418, 23); - this.txtCmdLine.TabIndex = 22; - this.txtCmdLine.TextChanged += new System.EventHandler(this.txtCmdLine_TextChanged); + txtCmdLine.Location = new System.Drawing.Point(13, 194); + txtCmdLine.Name = "txtCmdLine"; + txtCmdLine.Size = new System.Drawing.Size(418, 23); + txtCmdLine.TabIndex = 22; + txtCmdLine.TextChanged += txtCmdLine_TextChanged; // // lblCmdLine // - this.lblCmdLine.AutoSize = true; - this.lblCmdLine.Location = new System.Drawing.Point(10, 176); - this.lblCmdLine.Name = "lblCmdLine"; - this.lblCmdLine.Size = new System.Drawing.Size(86, 15); - this.lblCmdLine.TabIndex = 21; - this.lblCmdLine.Text = "Command line"; + lblCmdLine.AutoSize = true; + lblCmdLine.Location = new System.Drawing.Point(10, 176); + lblCmdLine.Name = "lblCmdLine"; + lblCmdLine.Size = new System.Drawing.Size(86, 15); + lblCmdLine.TabIndex = 21; + lblCmdLine.Text = "Command line"; // // dtpPeriod // - this.dtpPeriod.CustomFormat = "HH:mm:ss"; - this.dtpPeriod.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpPeriod.Location = new System.Drawing.Point(331, 150); - this.dtpPeriod.Name = "dtpPeriod"; - this.dtpPeriod.ShowUpDown = true; - this.dtpPeriod.Size = new System.Drawing.Size(100, 23); - this.dtpPeriod.TabIndex = 20; - this.dtpPeriod.Value = new System.DateTime(2021, 1, 1, 0, 0, 0, 0); - this.dtpPeriod.ValueChanged += new System.EventHandler(this.dtpPeriod_ValueChanged); + dtpPeriod.CustomFormat = "HH:mm:ss"; + dtpPeriod.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + dtpPeriod.Location = new System.Drawing.Point(331, 150); + dtpPeriod.Name = "dtpPeriod"; + dtpPeriod.ShowUpDown = true; + dtpPeriod.Size = new System.Drawing.Size(100, 23); + dtpPeriod.TabIndex = 20; + dtpPeriod.Value = new System.DateTime(2021, 1, 1, 0, 0, 0, 0); + dtpPeriod.ValueChanged += dtpPeriod_ValueChanged; // // lblPeriod // - this.lblPeriod.AutoSize = true; - this.lblPeriod.Location = new System.Drawing.Point(328, 132); - this.lblPeriod.Name = "lblPeriod"; - this.lblPeriod.Size = new System.Drawing.Size(41, 15); - this.lblPeriod.TabIndex = 19; - this.lblPeriod.Text = "Period"; + lblPeriod.AutoSize = true; + lblPeriod.Location = new System.Drawing.Point(328, 132); + lblPeriod.Name = "lblPeriod"; + lblPeriod.Size = new System.Drawing.Size(41, 15); + lblPeriod.TabIndex = 19; + lblPeriod.Text = "Period"; // // dtpTime // - this.dtpTime.CustomFormat = "HH:mm:ss"; - this.dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpTime.Location = new System.Drawing.Point(225, 150); - this.dtpTime.Name = "dtpTime"; - this.dtpTime.ShowUpDown = true; - this.dtpTime.Size = new System.Drawing.Size(100, 23); - this.dtpTime.TabIndex = 18; - this.dtpTime.Value = new System.DateTime(2021, 1, 1, 0, 0, 0, 0); - this.dtpTime.ValueChanged += new System.EventHandler(this.dtpTime_ValueChanged); + dtpTime.CustomFormat = "HH:mm:ss"; + dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + dtpTime.Location = new System.Drawing.Point(225, 150); + dtpTime.Name = "dtpTime"; + dtpTime.ShowUpDown = true; + dtpTime.Size = new System.Drawing.Size(100, 23); + dtpTime.TabIndex = 18; + dtpTime.Value = new System.DateTime(2021, 1, 1, 0, 0, 0, 0); + dtpTime.ValueChanged += dtpTime_ValueChanged; // // lblTime // - this.lblTime.AutoSize = true; - this.lblTime.Location = new System.Drawing.Point(222, 132); - this.lblTime.Name = "lblTime"; - this.lblTime.Size = new System.Drawing.Size(33, 15); - this.lblTime.TabIndex = 17; - this.lblTime.Text = "Time"; + lblTime.AutoSize = true; + lblTime.Location = new System.Drawing.Point(222, 132); + lblTime.Name = "lblTime"; + lblTime.Size = new System.Drawing.Size(33, 15); + lblTime.TabIndex = 17; + lblTime.Text = "Time"; // // numDelay // - this.numDelay.Increment = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numDelay.Location = new System.Drawing.Point(119, 150); - this.numDelay.Maximum = new decimal(new int[] { - 600000, - 0, - 0, - 0}); - this.numDelay.Name = "numDelay"; - this.numDelay.Size = new System.Drawing.Size(100, 23); - this.numDelay.TabIndex = 16; - this.numDelay.ValueChanged += new System.EventHandler(this.numDelay_ValueChanged); + numDelay.Increment = new decimal(new int[] { 100, 0, 0, 0 }); + numDelay.Location = new System.Drawing.Point(119, 150); + numDelay.Maximum = new decimal(new int[] { 600000, 0, 0, 0 }); + numDelay.Name = "numDelay"; + numDelay.Size = new System.Drawing.Size(100, 23); + numDelay.TabIndex = 16; + numDelay.ValueChanged += numDelay_ValueChanged; // // lblDelay // - this.lblDelay.AutoSize = true; - this.lblDelay.Location = new System.Drawing.Point(116, 132); - this.lblDelay.Name = "lblDelay"; - this.lblDelay.Size = new System.Drawing.Size(36, 15); - this.lblDelay.TabIndex = 15; - this.lblDelay.Text = "Delay"; + lblDelay.AutoSize = true; + lblDelay.Location = new System.Drawing.Point(116, 132); + lblDelay.Name = "lblDelay"; + lblDelay.Size = new System.Drawing.Size(36, 15); + lblDelay.TabIndex = 15; + lblDelay.Text = "Delay"; // // numTimeout // - this.numTimeout.Increment = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.numTimeout.Location = new System.Drawing.Point(13, 150); - this.numTimeout.Maximum = new decimal(new int[] { - 600000, - 0, - 0, - 0}); - this.numTimeout.Name = "numTimeout"; - this.numTimeout.Size = new System.Drawing.Size(100, 23); - this.numTimeout.TabIndex = 14; - this.numTimeout.ValueChanged += new System.EventHandler(this.numTimeout_ValueChanged); + numTimeout.Increment = new decimal(new int[] { 100, 0, 0, 0 }); + numTimeout.Location = new System.Drawing.Point(13, 150); + numTimeout.Maximum = new decimal(new int[] { 600000, 0, 0, 0 }); + numTimeout.Name = "numTimeout"; + numTimeout.Size = new System.Drawing.Size(100, 23); + numTimeout.TabIndex = 14; + numTimeout.ValueChanged += numTimeout_ValueChanged; // // lblTimeout // - this.lblTimeout.AutoSize = true; - this.lblTimeout.Location = new System.Drawing.Point(10, 132); - this.lblTimeout.Name = "lblTimeout"; - this.lblTimeout.Size = new System.Drawing.Size(51, 15); - this.lblTimeout.TabIndex = 13; - this.lblTimeout.Text = "Timeout"; + lblTimeout.AutoSize = true; + lblTimeout.Location = new System.Drawing.Point(10, 132); + lblTimeout.Name = "lblTimeout"; + lblTimeout.Size = new System.Drawing.Size(51, 15); + lblTimeout.TabIndex = 13; + lblTimeout.Text = "Timeout"; // // txtStrAddress // - this.txtStrAddress.Location = new System.Drawing.Point(119, 106); - this.txtStrAddress.Name = "txtStrAddress"; - this.txtStrAddress.Size = new System.Drawing.Size(312, 23); - this.txtStrAddress.TabIndex = 12; - this.txtStrAddress.TextChanged += new System.EventHandler(this.txtStrAddress_TextChanged); + txtStrAddress.Location = new System.Drawing.Point(119, 106); + txtStrAddress.Name = "txtStrAddress"; + txtStrAddress.Size = new System.Drawing.Size(312, 23); + txtStrAddress.TabIndex = 12; + txtStrAddress.TextChanged += txtStrAddress_TextChanged; // // lblStrAddress // - this.lblStrAddress.AutoSize = true; - this.lblStrAddress.Location = new System.Drawing.Point(116, 88); - this.lblStrAddress.Name = "lblStrAddress"; - this.lblStrAddress.Size = new System.Drawing.Size(154, 15); - this.lblStrAddress.TabIndex = 11; - this.lblStrAddress.Text = "String address or host name"; + lblStrAddress.AutoSize = true; + lblStrAddress.Location = new System.Drawing.Point(116, 88); + lblStrAddress.Name = "lblStrAddress"; + lblStrAddress.Size = new System.Drawing.Size(154, 15); + lblStrAddress.TabIndex = 11; + lblStrAddress.Text = "String address or host name"; // // numNumAddress // - this.numNumAddress.Location = new System.Drawing.Point(13, 106); - this.numNumAddress.Maximum = new decimal(new int[] { - 2147483647, - 0, - 0, - 0}); - this.numNumAddress.Name = "numNumAddress"; - this.numNumAddress.Size = new System.Drawing.Size(100, 23); - this.numNumAddress.TabIndex = 10; - this.numNumAddress.ValueChanged += new System.EventHandler(this.numNumAddress_ValueChanged); + numNumAddress.Location = new System.Drawing.Point(13, 106); + numNumAddress.Maximum = new decimal(new int[] { int.MaxValue, 0, 0, 0 }); + numNumAddress.Name = "numNumAddress"; + numNumAddress.Size = new System.Drawing.Size(100, 23); + numNumAddress.TabIndex = 10; + numNumAddress.ValueChanged += numNumAddress_ValueChanged; // // lblNumAddress // - this.lblNumAddress.AutoSize = true; - this.lblNumAddress.Location = new System.Drawing.Point(10, 88); - this.lblNumAddress.Name = "lblNumAddress"; - this.lblNumAddress.Size = new System.Drawing.Size(96, 15); - this.lblNumAddress.TabIndex = 9; - this.lblNumAddress.Text = "Numeric address"; + lblNumAddress.AutoSize = true; + lblNumAddress.Location = new System.Drawing.Point(10, 88); + lblNumAddress.Name = "lblNumAddress"; + lblNumAddress.Size = new System.Drawing.Size(96, 15); + lblNumAddress.TabIndex = 9; + lblNumAddress.Text = "Numeric address"; // // cbDriver // - this.cbDriver.FormattingEnabled = true; - this.cbDriver.Location = new System.Drawing.Point(331, 62); - this.cbDriver.Name = "cbDriver"; - this.cbDriver.Size = new System.Drawing.Size(100, 23); - this.cbDriver.TabIndex = 8; - this.cbDriver.TextChanged += new System.EventHandler(this.cbDriver_TextChanged); + cbDriver.FormattingEnabled = true; + cbDriver.Location = new System.Drawing.Point(331, 62); + cbDriver.Name = "cbDriver"; + cbDriver.Size = new System.Drawing.Size(100, 23); + cbDriver.TabIndex = 8; + cbDriver.TextChanged += cbDriver_TextChanged; // // lblDriver // - this.lblDriver.AutoSize = true; - this.lblDriver.Location = new System.Drawing.Point(328, 44); - this.lblDriver.Name = "lblDriver"; - this.lblDriver.Size = new System.Drawing.Size(38, 15); - this.lblDriver.TabIndex = 7; - this.lblDriver.Text = "Driver"; + lblDriver.AutoSize = true; + lblDriver.Location = new System.Drawing.Point(328, 44); + lblDriver.Name = "lblDriver"; + lblDriver.Size = new System.Drawing.Size(38, 15); + lblDriver.TabIndex = 7; + lblDriver.Text = "Driver"; // // txtName // - this.txtName.Location = new System.Drawing.Point(119, 62); - this.txtName.Name = "txtName"; - this.txtName.Size = new System.Drawing.Size(206, 23); - this.txtName.TabIndex = 6; - this.txtName.TextChanged += new System.EventHandler(this.txtName_TextChanged); + txtName.Location = new System.Drawing.Point(119, 62); + txtName.Name = "txtName"; + txtName.Size = new System.Drawing.Size(206, 23); + txtName.TabIndex = 6; + txtName.TextChanged += txtName_TextChanged; // // lblName // - this.lblName.AutoSize = true; - this.lblName.Location = new System.Drawing.Point(116, 44); - this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(39, 15); - this.lblName.TabIndex = 5; - this.lblName.Text = "Name"; + lblName.AutoSize = true; + lblName.Location = new System.Drawing.Point(116, 44); + lblName.Name = "lblName"; + lblName.Size = new System.Drawing.Size(39, 15); + lblName.TabIndex = 5; + lblName.Text = "Name"; // // numDeviceNum // - this.numDeviceNum.Location = new System.Drawing.Point(13, 62); - this.numDeviceNum.Maximum = new decimal(new int[] { - 2147483647, - 0, - 0, - 0}); - this.numDeviceNum.Name = "numDeviceNum"; - this.numDeviceNum.Size = new System.Drawing.Size(100, 23); - this.numDeviceNum.TabIndex = 4; - this.numDeviceNum.ValueChanged += new System.EventHandler(this.numDeviceNum_ValueChanged); + numDeviceNum.Location = new System.Drawing.Point(13, 62); + numDeviceNum.Maximum = new decimal(new int[] { int.MaxValue, 0, 0, 0 }); + numDeviceNum.Name = "numDeviceNum"; + numDeviceNum.Size = new System.Drawing.Size(100, 23); + numDeviceNum.TabIndex = 4; + numDeviceNum.ValueChanged += numDeviceNum_ValueChanged; // // lblDeviceNum // - this.lblDeviceNum.AutoSize = true; - this.lblDeviceNum.Location = new System.Drawing.Point(10, 44); - this.lblDeviceNum.Name = "lblDeviceNum"; - this.lblDeviceNum.Size = new System.Drawing.Size(51, 15); - this.lblDeviceNum.TabIndex = 3; - this.lblDeviceNum.Text = "Number"; + lblDeviceNum.AutoSize = true; + lblDeviceNum.Location = new System.Drawing.Point(10, 44); + lblDeviceNum.Name = "lblDeviceNum"; + lblDeviceNum.Size = new System.Drawing.Size(51, 15); + lblDeviceNum.TabIndex = 3; + lblDeviceNum.Text = "Number"; // // chkIsBound // - this.chkIsBound.AutoSize = true; - this.chkIsBound.Location = new System.Drawing.Point(331, 22); - this.chkIsBound.Name = "chkIsBound"; - this.chkIsBound.Size = new System.Drawing.Size(220, 19); - this.chkIsBound.TabIndex = 2; - this.chkIsBound.Text = "Bound to the configuration database"; - this.chkIsBound.UseVisualStyleBackColor = true; - this.chkIsBound.CheckedChanged += new System.EventHandler(this.chkIsBound_CheckedChanged); + chkIsBound.AutoSize = true; + chkIsBound.Location = new System.Drawing.Point(331, 22); + chkIsBound.Name = "chkIsBound"; + chkIsBound.Size = new System.Drawing.Size(220, 19); + chkIsBound.TabIndex = 2; + chkIsBound.Text = "Bound to the configuration database"; + chkIsBound.UseVisualStyleBackColor = true; + chkIsBound.CheckedChanged += chkIsBound_CheckedChanged; // // chkPollOnCmd // - this.chkPollOnCmd.AutoSize = true; - this.chkPollOnCmd.Location = new System.Drawing.Point(119, 22); - this.chkPollOnCmd.Name = "chkPollOnCmd"; - this.chkPollOnCmd.Size = new System.Drawing.Size(147, 19); - this.chkPollOnCmd.TabIndex = 1; - this.chkPollOnCmd.Text = "Poll only on command"; - this.chkPollOnCmd.UseVisualStyleBackColor = true; - this.chkPollOnCmd.CheckedChanged += new System.EventHandler(this.chkPollOnCmd_CheckedChanged); + chkPollOnCmd.AutoSize = true; + chkPollOnCmd.Location = new System.Drawing.Point(119, 22); + chkPollOnCmd.Name = "chkPollOnCmd"; + chkPollOnCmd.Size = new System.Drawing.Size(147, 19); + chkPollOnCmd.TabIndex = 1; + chkPollOnCmd.Text = "Poll only on command"; + chkPollOnCmd.UseVisualStyleBackColor = true; + chkPollOnCmd.CheckedChanged += chkPollOnCmd_CheckedChanged; // // chkActive // - this.chkActive.AutoSize = true; - this.chkActive.Location = new System.Drawing.Point(13, 22); - this.chkActive.Name = "chkActive"; - this.chkActive.Size = new System.Drawing.Size(59, 19); - this.chkActive.TabIndex = 0; - this.chkActive.Text = "Active"; - this.chkActive.UseVisualStyleBackColor = true; - this.chkActive.CheckedChanged += new System.EventHandler(this.chkActive_CheckedChanged); + chkActive.AutoSize = true; + chkActive.Location = new System.Drawing.Point(13, 22); + chkActive.Name = "chkActive"; + chkActive.Size = new System.Drawing.Size(59, 19); + chkActive.TabIndex = 0; + chkActive.Text = "Active"; + chkActive.UseVisualStyleBackColor = true; + chkActive.CheckedChanged += chkActive_CheckedChanged; // // lvDevicePolling // - this.lvDevicePolling.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.colOrder, - this.colActive, - this.colPollOnCmd, - this.colIsBound, - this.colNumber, - this.colName, - this.colDriver, - this.colNumAddress, - this.colStrAddress, - this.colTimeout, - this.colDelay, - this.colTime, - this.colPeriod, - this.colCmdLine}); - this.lvDevicePolling.Dock = System.Windows.Forms.DockStyle.Fill; - this.lvDevicePolling.FullRowSelect = true; - this.lvDevicePolling.GridLines = true; - this.lvDevicePolling.Location = new System.Drawing.Point(0, 29); - this.lvDevicePolling.Margin = new System.Windows.Forms.Padding(9, 3, 12, 3); - this.lvDevicePolling.MultiSelect = false; - this.lvDevicePolling.Name = "lvDevicePolling"; - this.lvDevicePolling.ShowItemToolTips = true; - this.lvDevicePolling.Size = new System.Drawing.Size(700, 521); - this.lvDevicePolling.TabIndex = 1; - this.lvDevicePolling.UseCompatibleStateImageBehavior = false; - this.lvDevicePolling.View = System.Windows.Forms.View.Details; - this.lvDevicePolling.SelectedIndexChanged += new System.EventHandler(this.lvDevicePolling_SelectedIndexChanged); - this.lvDevicePolling.DoubleClick += new System.EventHandler(this.lvDevicePolling_DoubleClick); + lvDevicePolling.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { colOrder, colActive, colPollOnCmd, colIsBound, colNumber, colName, colDriver, colNumAddress, colStrAddress, colTimeout, colDelay, colTime, colPeriod, colCmdLine }); + lvDevicePolling.Dock = System.Windows.Forms.DockStyle.Fill; + lvDevicePolling.FullRowSelect = true; + lvDevicePolling.GridLines = true; + lvDevicePolling.Location = new System.Drawing.Point(0, 29); + lvDevicePolling.Margin = new System.Windows.Forms.Padding(9, 3, 12, 3); + lvDevicePolling.MultiSelect = false; + lvDevicePolling.Name = "lvDevicePolling"; + lvDevicePolling.ShowItemToolTips = true; + lvDevicePolling.Size = new System.Drawing.Size(700, 259); + lvDevicePolling.TabIndex = 1; + lvDevicePolling.UseCompatibleStateImageBehavior = false; + lvDevicePolling.View = System.Windows.Forms.View.Details; + lvDevicePolling.SelectedIndexChanged += lvDevicePolling_SelectedIndexChanged; + lvDevicePolling.DoubleClick += lvDevicePolling_DoubleClick; // // colOrder // - this.colOrder.Text = "#"; - this.colOrder.Width = 50; + colOrder.Text = "#"; + colOrder.Width = 50; // // colActive // - this.colActive.Text = "Active"; - this.colActive.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colActive.Text = "Active"; + colActive.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colPollOnCmd // - this.colPollOnCmd.Text = "Poll on Command"; - this.colPollOnCmd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colPollOnCmd.Text = "Poll on Command"; + colPollOnCmd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colIsBound // - this.colIsBound.Text = "Bound"; - this.colIsBound.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colIsBound.Text = "Bound"; + colIsBound.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colNumber // - this.colNumber.Text = "Number"; - this.colNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colNumber.Text = "Number"; + colNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colName // - this.colName.Text = "Name"; - this.colName.Width = 150; + colName.Text = "Name"; + colName.Width = 150; // // colDriver // - this.colDriver.Text = "Driver"; - this.colDriver.Width = 100; + colDriver.Text = "Driver"; + colDriver.Width = 100; // // colNumAddress // - this.colNumAddress.Text = "Numerc Address"; - this.colNumAddress.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colNumAddress.Text = "Numerc Address"; + colNumAddress.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colStrAddress // - this.colStrAddress.Text = "String Address"; - this.colStrAddress.Width = 150; + colStrAddress.Text = "String Address"; + colStrAddress.Width = 150; // // colTimeout // - this.colTimeout.Text = "Timeout"; - this.colTimeout.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colTimeout.Text = "Timeout"; + colTimeout.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colDelay // - this.colDelay.Text = "Delay"; - this.colDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colDelay.Text = "Delay"; + colDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colTime // - this.colTime.Text = "Time"; - this.colTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colTime.Text = "Time"; + colTime.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colPeriod // - this.colPeriod.Text = "Period"; - this.colPeriod.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + colPeriod.Text = "Period"; + colPeriod.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // colCmdLine // - this.colCmdLine.Text = "Command Line"; - this.colCmdLine.Width = 150; + colCmdLine.Text = "Command Line"; + colCmdLine.Width = 150; // // btnAddDevice // - this.btnAddDevice.Location = new System.Drawing.Point(0, 0); - this.btnAddDevice.Name = "btnAddDevice"; - this.btnAddDevice.Size = new System.Drawing.Size(80, 23); - this.btnAddDevice.TabIndex = 0; - this.btnAddDevice.Text = "Add"; - this.btnAddDevice.UseVisualStyleBackColor = true; - this.btnAddDevice.Click += new System.EventHandler(this.btnAddDevice_Click); + btnAddDevice.Location = new System.Drawing.Point(0, 0); + btnAddDevice.Name = "btnAddDevice"; + btnAddDevice.Size = new System.Drawing.Size(80, 23); + btnAddDevice.TabIndex = 0; + btnAddDevice.Text = "Add"; + btnAddDevice.UseVisualStyleBackColor = true; + btnAddDevice.Click += btnAddDevice_Click; // // btnMoveUpDevice // - this.btnMoveUpDevice.Location = new System.Drawing.Point(86, 0); - this.btnMoveUpDevice.Name = "btnMoveUpDevice"; - this.btnMoveUpDevice.Size = new System.Drawing.Size(80, 23); - this.btnMoveUpDevice.TabIndex = 1; - this.btnMoveUpDevice.Text = "Move Up"; - this.btnMoveUpDevice.UseVisualStyleBackColor = true; - this.btnMoveUpDevice.Click += new System.EventHandler(this.btnMoveUpDevice_Click); + btnMoveUpDevice.Location = new System.Drawing.Point(86, 0); + btnMoveUpDevice.Name = "btnMoveUpDevice"; + btnMoveUpDevice.Size = new System.Drawing.Size(80, 23); + btnMoveUpDevice.TabIndex = 1; + btnMoveUpDevice.Text = "Move Up"; + btnMoveUpDevice.UseVisualStyleBackColor = true; + btnMoveUpDevice.Click += btnMoveUpDevice_Click; // // btnMoveDownDevice // - this.btnMoveDownDevice.Location = new System.Drawing.Point(172, 0); - this.btnMoveDownDevice.Name = "btnMoveDownDevice"; - this.btnMoveDownDevice.Size = new System.Drawing.Size(80, 23); - this.btnMoveDownDevice.TabIndex = 2; - this.btnMoveDownDevice.Text = "Move Down"; - this.btnMoveDownDevice.UseVisualStyleBackColor = true; - this.btnMoveDownDevice.Click += new System.EventHandler(this.btnMoveDownDevice_Click); + btnMoveDownDevice.Location = new System.Drawing.Point(172, 0); + btnMoveDownDevice.Name = "btnMoveDownDevice"; + btnMoveDownDevice.Size = new System.Drawing.Size(80, 23); + btnMoveDownDevice.TabIndex = 2; + btnMoveDownDevice.Text = "Move Down"; + btnMoveDownDevice.UseVisualStyleBackColor = true; + btnMoveDownDevice.Click += btnMoveDownDevice_Click; // // btnDeleteDevice // - this.btnDeleteDevice.Location = new System.Drawing.Point(258, 0); - this.btnDeleteDevice.Name = "btnDeleteDevice"; - this.btnDeleteDevice.Size = new System.Drawing.Size(80, 23); - this.btnDeleteDevice.TabIndex = 3; - this.btnDeleteDevice.Text = "Delete"; - this.btnDeleteDevice.UseVisualStyleBackColor = true; - this.btnDeleteDevice.Click += new System.EventHandler(this.btnDeleteDevice_Click); + btnDeleteDevice.Location = new System.Drawing.Point(258, 0); + btnDeleteDevice.Name = "btnDeleteDevice"; + btnDeleteDevice.Size = new System.Drawing.Size(80, 23); + btnDeleteDevice.TabIndex = 3; + btnDeleteDevice.Text = "Delete"; + btnDeleteDevice.UseVisualStyleBackColor = true; + btnDeleteDevice.Click += btnDeleteDevice_Click; // // btnPasteDevice // - this.btnPasteDevice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnPasteDevice.Location = new System.Drawing.Point(620, 0); - this.btnPasteDevice.Name = "btnPasteDevice"; - this.btnPasteDevice.Size = new System.Drawing.Size(80, 23); - this.btnPasteDevice.TabIndex = 6; - this.btnPasteDevice.Text = "Paste"; - this.btnPasteDevice.UseVisualStyleBackColor = true; - this.btnPasteDevice.Click += new System.EventHandler(this.btnPasteDevice_Click); + btnPasteDevice.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnPasteDevice.Location = new System.Drawing.Point(620, 0); + btnPasteDevice.Name = "btnPasteDevice"; + btnPasteDevice.Size = new System.Drawing.Size(80, 23); + btnPasteDevice.TabIndex = 6; + btnPasteDevice.Text = "Paste"; + btnPasteDevice.UseVisualStyleBackColor = true; + btnPasteDevice.Click += btnPasteDevice_Click; // // btnCopyDevice // - this.btnCopyDevice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnCopyDevice.Location = new System.Drawing.Point(534, 0); - this.btnCopyDevice.Name = "btnCopyDevice"; - this.btnCopyDevice.Size = new System.Drawing.Size(80, 23); - this.btnCopyDevice.TabIndex = 5; - this.btnCopyDevice.Text = "Copy"; - this.btnCopyDevice.UseVisualStyleBackColor = true; - this.btnCopyDevice.Click += new System.EventHandler(this.btnCopyDevice_Click); + btnCopyDevice.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnCopyDevice.Location = new System.Drawing.Point(534, 0); + btnCopyDevice.Name = "btnCopyDevice"; + btnCopyDevice.Size = new System.Drawing.Size(80, 23); + btnCopyDevice.TabIndex = 5; + btnCopyDevice.Text = "Copy"; + btnCopyDevice.UseVisualStyleBackColor = true; + btnCopyDevice.Click += btnCopyDevice_Click; // // btnCutDevice // - this.btnCutDevice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnCutDevice.Location = new System.Drawing.Point(448, 0); - this.btnCutDevice.Name = "btnCutDevice"; - this.btnCutDevice.Size = new System.Drawing.Size(80, 23); - this.btnCutDevice.TabIndex = 4; - this.btnCutDevice.Text = "Cut"; - this.btnCutDevice.UseVisualStyleBackColor = true; - this.btnCutDevice.Click += new System.EventHandler(this.btnCutDevice_Click); + btnCutDevice.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnCutDevice.Location = new System.Drawing.Point(448, 0); + btnCutDevice.Name = "btnCutDevice"; + btnCutDevice.Size = new System.Drawing.Size(80, 23); + btnCutDevice.TabIndex = 4; + btnCutDevice.Text = "Cut"; + btnCutDevice.UseVisualStyleBackColor = true; + btnCutDevice.Click += btnCutDevice_Click; // // pnlTop // - this.pnlTop.Controls.Add(this.btnPasteDevice); - this.pnlTop.Controls.Add(this.btnCopyDevice); - this.pnlTop.Controls.Add(this.btnCutDevice); - this.pnlTop.Controls.Add(this.btnDeleteDevice); - this.pnlTop.Controls.Add(this.btnMoveDownDevice); - this.pnlTop.Controls.Add(this.btnMoveUpDevice); - this.pnlTop.Controls.Add(this.btnAddDevice); - this.pnlTop.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlTop.Location = new System.Drawing.Point(0, 0); - this.pnlTop.Name = "pnlTop"; - this.pnlTop.Size = new System.Drawing.Size(700, 29); - this.pnlTop.TabIndex = 0; + pnlTop.Controls.Add(btnPasteDevice); + pnlTop.Controls.Add(btnCopyDevice); + pnlTop.Controls.Add(btnCutDevice); + pnlTop.Controls.Add(btnDeleteDevice); + pnlTop.Controls.Add(btnMoveDownDevice); + pnlTop.Controls.Add(btnMoveUpDevice); + pnlTop.Controls.Add(btnAddDevice); + pnlTop.Dock = System.Windows.Forms.DockStyle.Top; + pnlTop.Location = new System.Drawing.Point(0, 0); + pnlTop.Name = "pnlTop"; + pnlTop.Size = new System.Drawing.Size(700, 29); + pnlTop.TabIndex = 0; // // pnlBottom // - this.pnlBottom.Controls.Add(this.gbSelectedDevice); - this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlBottom.Location = new System.Drawing.Point(0, 288); - this.pnlBottom.Name = "pnlBottom"; - this.pnlBottom.Size = new System.Drawing.Size(700, 262); - this.pnlBottom.TabIndex = 2; + pnlBottom.Controls.Add(gbSelectedDevice); + pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; + pnlBottom.Location = new System.Drawing.Point(0, 288); + pnlBottom.Name = "pnlBottom"; + pnlBottom.Size = new System.Drawing.Size(700, 262); + pnlBottom.TabIndex = 2; // // CtrlLinePolling // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.pnlBottom); - this.Controls.Add(this.lvDevicePolling); - this.Controls.Add(this.pnlTop); - this.Name = "CtrlLinePolling"; - this.Size = new System.Drawing.Size(700, 550); - this.Load += new System.EventHandler(this.CtrlLineReqSequence_Load); - this.gbSelectedDevice.ResumeLayout(false); - this.gbSelectedDevice.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numDelay)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numTimeout)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numNumAddress)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numDeviceNum)).EndInit(); - this.pnlTop.ResumeLayout(false); - this.pnlBottom.ResumeLayout(false); - this.ResumeLayout(false); - + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + Controls.Add(lvDevicePolling); + Controls.Add(pnlBottom); + Controls.Add(pnlTop); + Name = "CtrlLinePolling"; + Size = new System.Drawing.Size(700, 550); + Load += CtrlLineReqSequence_Load; + gbSelectedDevice.ResumeLayout(false); + gbSelectedDevice.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)numDelay).EndInit(); + ((System.ComponentModel.ISupportInitialize)numTimeout).EndInit(); + ((System.ComponentModel.ISupportInitialize)numNumAddress).EndInit(); + ((System.ComponentModel.ISupportInitialize)numDeviceNum).EndInit(); + pnlTop.ResumeLayout(false); + pnlBottom.ResumeLayout(false); + ResumeLayout(false); } #endregion diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.cs b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.cs index a8dfbb69c..3e0ba637b 100644 --- a/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.cs +++ b/ScadaAdmin/OpenExtensions/ExtCommConfig/Controls/CtrlLinePolling.cs @@ -333,7 +333,7 @@ public void ControlsToConfig(List devicePolling) private void CtrlLineReqSequence_Load(object sender, EventArgs e) { - FormTranslator.Translate(this, GetType().FullName, + FormTranslator.Translate(this, GetType().FullName, new FormTranslatorOptions { ToolTip = toolTip, SkipUserControls = false }); SetControlsEnabled(); btnPasteDevice.Enabled = false; @@ -515,7 +515,7 @@ private void dtpTime_ValueChanged(object sender, EventArgs e) { if (!changing && GetSelectedItem(out ListViewItem item, out DeviceConfig deviceConfig)) { - deviceConfig.PollingOptions.Time = + deviceConfig.PollingOptions.Time = new TimeSpan(dtpTime.Value.Hour, dtpTime.Value.Minute, dtpTime.Value.Second); item.SubItems[11].Text = deviceConfig.PollingOptions.Time.ToString(); OnConfigChanged(); @@ -526,7 +526,7 @@ private void dtpPeriod_ValueChanged(object sender, EventArgs e) { if (!changing && GetSelectedItem(out ListViewItem item, out DeviceConfig deviceConfig)) { - deviceConfig.PollingOptions.Period = + deviceConfig.PollingOptions.Period = new TimeSpan(dtpPeriod.Value.Hour, dtpPeriod.Value.Minute, dtpPeriod.Value.Second); item.SubItems[12].Text = deviceConfig.PollingOptions.Period.ToString(); OnConfigChanged(); diff --git a/ScadaAdmin/OpenExtensions/ExtCommConfig/ExtCommConfig.csproj b/ScadaAdmin/OpenExtensions/ExtCommConfig/ExtCommConfig.csproj index 6276827f9..21567bde9 100644 --- a/ScadaAdmin/OpenExtensions/ExtCommConfig/ExtCommConfig.csproj +++ b/ScadaAdmin/OpenExtensions/ExtCommConfig/ExtCommConfig.csproj @@ -10,7 +10,7 @@ Rapid SCADA Copyright © 2023 6.0.1 - 6.0.1.0 + 6.0.1.1 From f286c8b44f35f5e6a00ee2acd3f61abf7b23e47a Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 09:54:00 +0300 Subject: [PATCH 02/23] ScadaDoc: update extension history --- .../En/Version61/VersionHistory/AdministratorHistory.cshtml | 5 +++++ .../Ru/Version61/VersionHistory/AdministratorHistory.cshtml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml index f9e95bbad..b32148d95 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml @@ -41,6 +41,11 @@

Communicator Configurator

+
ExtCommConfig 6.0.1.1 (In development)
+
    +
  • Fixed layout of controls
    • +
+
ExtCommConfig 6.0.1.0 (March 21, 2023)
  • Added new application options
    • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml index 1efc5b95c..22b9f8532 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml @@ -41,6 +41,11 @@

Конфигуратор Коммуникатора

+
ExtCommConfig 6.0.1.1 (В разработке)
+
    +
  • Исправлено расположение элементов управления
    • +
+
ExtCommConfig 6.0.1.0 (21.03.2023)
  • Добавлены новые параметры приложения
    • From 7e74d622546e6c4c42116ff335523791ef146c38 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 11:41:07 +0300 Subject: [PATCH 03/23] ScadaAdmin: fix displaying channel limit --- ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs | 2 +- ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj | 2 +- ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs b/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs index 21686e3a6..a69056b71 100644 --- a/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs +++ b/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs @@ -259,7 +259,7 @@ string LimToStr(string columnName) txtLow.Text = LimToStr("Low"); txtHigh.Text = LimToStr("High"); txtHiHi.Text = LimToStr("HiHi"); - txtDeadband.Text = Convert.ToString(rowView["Deadband"]); + txtDeadband.Text = LimToStr("Deadband"); } else { diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj b/ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj index 27ced16f7..f3d6cc1bc 100644 --- a/ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj +++ b/ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj @@ -12,7 +12,7 @@ Copyright © 2023 lamp.ico 6.1.0 - 6.1.0.0 + 6.1.0.1 diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj b/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj index 55266f44a..6ee49f612 100644 --- a/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj +++ b/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj @@ -10,7 +10,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.0 + 6.1.0.1 From 3bebe448da2149105de1ecc7ec65e4311f00ee98 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 11:43:44 +0300 Subject: [PATCH 04/23] ScadaDoc: update Admin history --- .../En/Version61/VersionHistory/AdministratorHistory.cshtml | 5 +++++ .../Ru/Version61/VersionHistory/AdministratorHistory.cshtml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml index b32148d95..290bee1ad 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml @@ -23,6 +23,11 @@

    Administrator History

    Administrator Application

    +
    ScadaAdmin 6.1.0.1 (In development)
    +
      +
    • UI fixes
      • +
    +
    ScadaAdmin 6.1.0.0 (March 21, 2023)
    • Uses new configuration database and application protocol
      • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml index 22b9f8532..7b7a1d25e 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml @@ -23,6 +23,11 @@

      История Администратора

      Приложение Администратор

      +
      ScadaAdmin 6.1.0.1 (В разработке)
      +
        +
      • Исправления в пользовательском интерфейсе
        • +
      +
      ScadaAdmin 6.1.0.0 (21.03.2023)
      • Использует новую базу конфигурации и протокол приложений
        • From 55ba190e06fd95e436432d3d6ed8250825472cc1 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 15:21:50 +0300 Subject: [PATCH 05/23] ScadaDoc: update module history --- .../Pages/En/Version61/VersionHistory/ServerHistory.cshtml | 5 +++++ .../Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml index cd0dd9f63..d055de57f 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml @@ -137,6 +137,11 @@ @**** ModRapidGate ****@

        Rapid Gate

        +
        ModRapidGate 6.0.1.1 (In development)
        +
          +
        • Fixed statistics calculation for current data
          • +
        +
        ModRapidGate 6.0.1.0 (March 21, 2023)
        • Batch transfer of current data
          • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml index 2a57e5891..298c7d5eb 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml @@ -137,6 +137,11 @@ @**** ModRapidGate ****@

          Быстрый шлюз

          +
          ModRapidGate 6.0.1.1 (В разработке)
          +
            +
          • Исправлен расчёт статистики для текущих данных
            • +
          +
          ModRapidGate 6.0.1.0 (21.03.2023)
          • Пакетная передача текущих данных
            • From c925a73825cc249442b8a71aa3c6a3bb758d4c0a Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 15:29:10 +0300 Subject: [PATCH 06/23] Update DrvTelegram_031.xml --- .../Instances/Default/ScadaComm/Config/DrvTelegram_031.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/WirenBoardDemo/Instances/Default/ScadaComm/Config/DrvTelegram_031.xml b/Projects/WirenBoardDemo/Instances/Default/ScadaComm/Config/DrvTelegram_031.xml index 1426540cd..69a4855c0 100644 --- a/Projects/WirenBoardDemo/Instances/Default/ScadaComm/Config/DrvTelegram_031.xml +++ b/Projects/WirenBoardDemo/Instances/Default/ScadaComm/Config/DrvTelegram_031.xml @@ -1,6 +1,6 @@ - xxx + BE9876390BA068A080E28AC328C935CD From fc5915c6e223a5c2a91142a6b2e0e7b4ae22dee2 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:04:59 +0300 Subject: [PATCH 07/23] ScadaServer: init config database --- ScadaServer/ScadaServer/ScadaServerApp/ScadaServerApp.csproj | 2 +- .../ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj | 2 +- .../ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj | 2 +- ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs | 2 ++ .../ScadaServer/ScadaServerEngine/ScadaServerEngine.csproj | 2 +- ScadaServer/ScadaServer/ScadaServerWkr/ScadaServerWkr.csproj | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ScadaServer/ScadaServer/ScadaServerApp/ScadaServerApp.csproj b/ScadaServer/ScadaServer/ScadaServerApp/ScadaServerApp.csproj index 29cba1996..862e4599b 100644 --- a/ScadaServer/ScadaServer/ScadaServerApp/ScadaServerApp.csproj +++ b/ScadaServer/ScadaServer/ScadaServerApp/ScadaServerApp.csproj @@ -9,7 +9,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.0 + 6.1.0.1 diff --git a/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj b/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj index be4e3d29d..5e76b3d67 100644 --- a/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj +++ b/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj @@ -13,7 +13,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.0 + 6.1.0.1 diff --git a/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj b/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj index 5e3ed84da..80c6517a1 100644 --- a/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj +++ b/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj @@ -9,7 +9,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.0 + 6.1.0.1 diff --git a/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs b/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs index 4313724cf..61f04baab 100644 --- a/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs +++ b/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs @@ -248,6 +248,8 @@ private bool ReadConfigDatabase() Storage.ReadBaseTable(baseTable); } + tableTitle = CommonPhrases.UndefinedTable; + ConfigDatabase.Init(); Log.WriteAction(Locale.IsRussian ? "База конфигурации считана успешно" : "The configuration database has been read successfully"); diff --git a/ScadaServer/ScadaServer/ScadaServerEngine/ScadaServerEngine.csproj b/ScadaServer/ScadaServer/ScadaServerEngine/ScadaServerEngine.csproj index 1571ae89c..2c9f3a0e7 100644 --- a/ScadaServer/ScadaServer/ScadaServerEngine/ScadaServerEngine.csproj +++ b/ScadaServer/ScadaServer/ScadaServerEngine/ScadaServerEngine.csproj @@ -8,7 +8,7 @@ Mikhail Shiryaev Copyright © 2023 6.1.0 - 6.1.0.0 + 6.1.0.1 diff --git a/ScadaServer/ScadaServer/ScadaServerWkr/ScadaServerWkr.csproj b/ScadaServer/ScadaServer/ScadaServerWkr/ScadaServerWkr.csproj index 313509b80..d3f90ee81 100644 --- a/ScadaServer/ScadaServer/ScadaServerWkr/ScadaServerWkr.csproj +++ b/ScadaServer/ScadaServer/ScadaServerWkr/ScadaServerWkr.csproj @@ -9,7 +9,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.0 + 6.1.0.1 From c770892c708c1df8b0792ab9b14793fc7c075b43 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:07:41 +0300 Subject: [PATCH 08/23] ScadaDoc: update server history --- .../Pages/En/Version61/VersionHistory/ServerHistory.cshtml | 5 +++++ .../Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml index d055de57f..292935548 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml @@ -24,6 +24,11 @@

            Server History

            Server Application

            +
            ScadaServer 6.1.0.1 (In development)
            +
              +
            • Fixed reading configuration database
              • +
            +
            ScadaServer 6.1.0.0 (March 21, 2023)
            • Added the Command format column to the Channels table
              • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml index 298c7d5eb..bfa1c9a44 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml @@ -24,6 +24,11 @@

              История Сервера

              Приложение Сервер

              +
              ScadaServer 6.1.0.1 (В разработке)
              +
                +
              • Исправлено считывание базы конфигурации
                • +
              +
              ScadaServer 6.1.0.0 (21.03.2023)
              • В таблице Каналы добавлен столбец Формат команды
                • From 8d746d4c4122a073909ebc1e4c5c7d12190d0ce8 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:14:30 +0300 Subject: [PATCH 09/23] ScadaWeb: empty line --- ScadaWeb/ScadaWeb/ScadaWeb/Code/WebContext.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ScadaWeb/ScadaWeb/ScadaWeb/Code/WebContext.cs b/ScadaWeb/ScadaWeb/ScadaWeb/Code/WebContext.cs index 81097eccf..b6403db5b 100644 --- a/ScadaWeb/ScadaWeb/ScadaWeb/Code/WebContext.cs +++ b/ScadaWeb/ScadaWeb/ScadaWeb/Code/WebContext.cs @@ -346,6 +346,7 @@ private bool ReadConfigDatabase(out ConfigDatabase configDatabase) tableTitle = CommonPhrases.UndefinedTable; PostprocessConfigDatabase(configDatabase); + Log.WriteAction(Locale.IsRussian ? "База конфигурации получена успешно" : "The configuration database has been received successfully"); From 54995bb31ef5e8d0fc435341872cf1ddad4d96a8 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:14:40 +0300 Subject: [PATCH 10/23] ScadaServer: empty line --- ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs b/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs index 61f04baab..66fe35daa 100644 --- a/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs +++ b/ScadaServer/ScadaServer/ScadaServerEngine/CoreLogic.cs @@ -250,6 +250,7 @@ private bool ReadConfigDatabase() tableTitle = CommonPhrases.UndefinedTable; ConfigDatabase.Init(); + Log.WriteAction(Locale.IsRussian ? "База конфигурации считана успешно" : "The configuration database has been read successfully"); From 84052978dd80a3e91da4f15a971c3a5475f951de Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:15:41 +0300 Subject: [PATCH 11/23] DrvDsScadaServer: fix stats and base init --- .../DrvDsScadaServer.Logic/DrvDsScadaServer.Logic.csproj | 2 +- .../OpenDrivers/DrvDsScadaServer.Logic/ScadaServerDSL.cs | 9 +++++++++ .../DrvDsScadaServer.View/DrvDsScadaServer.View.csproj | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/DrvDsScadaServer.Logic.csproj b/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/DrvDsScadaServer.Logic.csproj index 48043a3ad..eb3678f4d 100644 --- a/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/DrvDsScadaServer.Logic.csproj +++ b/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/DrvDsScadaServer.Logic.csproj @@ -8,7 +8,7 @@ Rapid SCADA Copyright © 2023 6.0.1 - 6.0.1.0 + 6.0.1.1 diff --git a/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/ScadaServerDSL.cs b/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/ScadaServerDSL.cs index cde20fadf..9a163f79d 100644 --- a/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/ScadaServerDSL.cs +++ b/ScadaComm/OpenDrivers/DrvDsScadaServer.Logic/ScadaServerDSL.cs @@ -200,6 +200,8 @@ private void TransferCurrentData() try { scadaClient.WriteCurrentData(slicesToSend, WriteDataFlags.Default); + curDataQueue.Stats.ExportedItems += slicesToSend.Count; + curDataQueue.Stats.HasError = false; slicesToSend.Clear(); } catch (Exception ex) @@ -243,6 +245,8 @@ private void TransferHistoricalData() { // send the slice scadaClient.WriteHistoricalData(deviceSlice.ArchiveMask, slice, WriteDataFlags.Default); + histDataQueue.Stats.ExportedItems++; + histDataQueue.Stats.HasError = false; CallDataSent(deviceSlice); } catch (Exception ex) @@ -290,6 +294,8 @@ private void TransferEvents() // send the event deviceEvent.CnlNum = deviceEvent.DeviceTag.Cnl.CnlNum; scadaClient.WriteEvent(deviceEvent.ArchiveMask, deviceEvent); + eventQueue.Stats.ExportedItems++; + eventQueue.Stats.HasError = false; CallEventSent(deviceEvent); } catch (Exception ex) @@ -589,6 +595,9 @@ public override bool ReadConfigDatabase(out ConfigDatabase configDatabase) localClient.DownloadBaseTable(baseTable); } + tableTitle = CommonPhrases.UndefinedTable; + configDatabase.Init(); + log.WriteAction(CommPhrases.DataSourceMessage, Code, Locale.IsRussian ? "База конфигурации получена успешно" : "The configuration database has been received successfully"); diff --git a/ScadaComm/OpenDrivers/DrvDsScadaServer.View/DrvDsScadaServer.View.csproj b/ScadaComm/OpenDrivers/DrvDsScadaServer.View/DrvDsScadaServer.View.csproj index 27eed6774..d36bcda0f 100644 --- a/ScadaComm/OpenDrivers/DrvDsScadaServer.View/DrvDsScadaServer.View.csproj +++ b/ScadaComm/OpenDrivers/DrvDsScadaServer.View/DrvDsScadaServer.View.csproj @@ -12,7 +12,7 @@ Rapid SCADA Copyright © 2023 6.0.1 - 6.0.1.0 + 6.0.1.1 From e2b409bf4940b2a2bef589b89d39f3b78ca1ebff Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:17:57 +0300 Subject: [PATCH 12/23] ScadaDoc: update driver history --- .../En/Version61/VersionHistory/CommunicatorHistory.cshtml | 6 ++++++ .../Ru/Version61/VersionHistory/CommunicatorHistory.cshtml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml index 493d9fc26..b6a0ad296 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml @@ -127,6 +127,12 @@ @**** DrvDsScadaServer ****@

                Server Data Source

                +
                DrvDsScadaServer 6.0.1.1 (In development)
                +
                  +
                • Fixed reading configuration database
                  • +
                • Fixed statistics calculation
                  • +
                +
                DrvDsScadaServer 6.0.1.0 (March 21, 2023)
                • Batch transfer of current data
                  • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml index f9a28df7b..fd110306a 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml @@ -140,6 +140,12 @@ @**** DrvDsScadaServer ****@

                  Источник данных Сервер

                  +
                  DrvDsScadaServer 6.0.1.1 (В разработке)
                  +
                    +
                  • Исправлено считывание базы конфигурации
                    • +
                  • Исправлен расчёт статистики
                    • +
                  +
                  DrvDsScadaServer 6.0.1.0 (21.03.2023)
                  • Пакетная передача текущих данных
                    • From cd134dc5a8fe581e3889c649a8314ee508afec05 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:49:33 +0300 Subject: [PATCH 13/23] Revert versions of *Common projects --- ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj | 2 +- .../ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj b/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj index 6ee49f612..55266f44a 100644 --- a/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj +++ b/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj @@ -10,7 +10,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.1 + 6.1.0.0 diff --git a/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj b/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj index 80c6517a1..5e3ed84da 100644 --- a/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj +++ b/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj @@ -9,7 +9,7 @@ Rapid SCADA Copyright © 2023 6.1.0 - 6.1.0.1 + 6.1.0.0 From b5b7c2401188190b92f53f88d19403e182cc3beb Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:49:54 +0300 Subject: [PATCH 14/23] ExtServerConfig: update a phrase --- .../ExtServerConfig/Forms/FrmGeneralOptions.Designer.cs | 4 ++-- .../ExtServerConfig/Lang/ExtServerConfig.en-GB.xml | 2 +- .../ExtServerConfig/Lang/ExtServerConfig.ru-RU.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ScadaAdmin/OpenExtensions/ExtServerConfig/Forms/FrmGeneralOptions.Designer.cs b/ScadaAdmin/OpenExtensions/ExtServerConfig/Forms/FrmGeneralOptions.Designer.cs index ce16811dd..1b9813de7 100644 --- a/ScadaAdmin/OpenExtensions/ExtServerConfig/Forms/FrmGeneralOptions.Designer.cs +++ b/ScadaAdmin/OpenExtensions/ExtServerConfig/Forms/FrmGeneralOptions.Designer.cs @@ -224,9 +224,9 @@ private void InitializeComponent() lblDisableFormulas.AutoSize = true; lblDisableFormulas.Location = new Point(10, 200); lblDisableFormulas.Name = "lblDisableFormulas"; - lblDisableFormulas.Size = new Size(343, 15); + lblDisableFormulas.Size = new Size(219, 15); lblDisableFormulas.TabIndex = 12; - lblDisableFormulas.Text = "Enable channel formulas only for channels belonging to objects"; + lblDisableFormulas.Text = "Disable channel formulas except objects"; // // numMaxLogSize // diff --git a/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.en-GB.xml b/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.en-GB.xml index cfb33c5ee..c06947a31 100644 --- a/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.en-GB.xml +++ b/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.en-GB.xml @@ -50,7 +50,7 @@ Generate command when event is acknowledged Wait for service stop, sec Maximum log file size, MB - Enable channel formulas only for channels belonging to objects + Disable channel formulas except objects Select... Listener Options TCP port diff --git a/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.ru-RU.xml b/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.ru-RU.xml index 36bcc4df1..ca09f3796 100644 --- a/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.ru-RU.xml +++ b/ScadaAdmin/OpenExtensions/ExtServerConfig/Lang/ExtServerConfig.ru-RU.xml @@ -50,7 +50,7 @@ Генерировать команду при квитировании события Ожидание остановки сервиса, с Максимальный размер файла журнала, МБ - Включить формулы каналов только для следующих объектов + Отключить формулы каналов, кроме объектов Выбрать... Прослушиватель TCP-порт From 9f387172899ce109533bc7f72be0ba340550b53a Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 16:55:06 +0300 Subject: [PATCH 15/23] Update versions in *Common.csproj --- ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj | 3 +-- ScadaAgent/ScadaAgent/ScadaAgentCommon/ScadaAgentCommon.csproj | 3 +-- ScadaComm/ScadaComm/ScadaCommCommon/ScadaCommCommon.csproj | 3 +-- .../ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj | 3 +-- .../ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj b/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj index 55266f44a..fcf66d20d 100644 --- a/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj +++ b/ScadaAdmin/ScadaAdmin/ScadaAdminCommon/ScadaAdminCommon.csproj @@ -5,12 +5,11 @@ true true Scada.Admin + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA Copyright © 2023 - 6.1.0 - 6.1.0.0 diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCommon/ScadaAgentCommon.csproj b/ScadaAgent/ScadaAgent/ScadaAgentCommon/ScadaAgentCommon.csproj index 435d0ec2e..01801961b 100644 --- a/ScadaAgent/ScadaAgent/ScadaAgentCommon/ScadaAgentCommon.csproj +++ b/ScadaAgent/ScadaAgent/ScadaAgentCommon/ScadaAgentCommon.csproj @@ -4,12 +4,11 @@ netstandard2.0 Scada.Agent True + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA Copyright © 2023 - 6.1.0 - 6.1.0.0 diff --git a/ScadaComm/ScadaComm/ScadaCommCommon/ScadaCommCommon.csproj b/ScadaComm/ScadaComm/ScadaCommCommon/ScadaCommCommon.csproj index 5f2612038..bac2f70cc 100644 --- a/ScadaComm/ScadaComm/ScadaCommCommon/ScadaCommCommon.csproj +++ b/ScadaComm/ScadaComm/ScadaCommCommon/ScadaCommCommon.csproj @@ -4,12 +4,11 @@ netstandard2.0 Scada.Comm True + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA Copyright © 2023 - 6.1.0 - 6.1.0.0 diff --git a/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj b/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj index 5e76b3d67..857b454d3 100644 --- a/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj +++ b/ScadaServer/ScadaServer/ScadaServerCommon.Forms/ScadaServerCommon.Forms.csproj @@ -8,12 +8,11 @@ enable True Scada.Server.Forms + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA Copyright © 2023 - 6.1.0 - 6.1.0.1 diff --git a/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj b/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj index 5e3ed84da..7265bda9a 100644 --- a/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj +++ b/ScadaServer/ScadaServer/ScadaServerCommon/ScadaServerCommon.csproj @@ -4,12 +4,11 @@ netstandard2.0 Scada.Server True + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA Copyright © 2023 - 6.1.0 - 6.1.0.0 From 97278361b159683352881a9b46cc1a3eefb2f1fa Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 18:32:43 +0300 Subject: [PATCH 16/23] Update TeleCommand.cs --- ScadaCommon/ScadaCommon/Data/Models/TeleCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ScadaCommon/ScadaCommon/Data/Models/TeleCommand.cs b/ScadaCommon/ScadaCommon/Data/Models/TeleCommand.cs index 41196c3fc..005a0deab 100644 --- a/ScadaCommon/ScadaCommon/Data/Models/TeleCommand.cs +++ b/ScadaCommon/ScadaCommon/Data/Models/TeleCommand.cs @@ -94,7 +94,7 @@ public TeleCommand(int cnlNum, byte[] cmdData, int userID) /// /// Gets or sets the name of the client delivered the command. /// - /// Used to avoid receiving own commands. + /// Set by the server and used to avoid receiving own commands. public string ClientName { get; set; } /// From a20cf8830e2bf938cce8cd309f9f8968aea5f5c4 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 18:32:47 +0300 Subject: [PATCH 17/23] Update ServerContext.cs --- ScadaServer/ScadaServer/ScadaServerEngine/ServerContext.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ScadaServer/ScadaServer/ScadaServerEngine/ServerContext.cs b/ScadaServer/ScadaServer/ScadaServerEngine/ServerContext.cs index 83f62a69a..e4712abc3 100644 --- a/ScadaServer/ScadaServer/ScadaServerEngine/ServerContext.cs +++ b/ScadaServer/ScadaServer/ScadaServerEngine/ServerContext.cs @@ -227,6 +227,9 @@ public void SendCommand(TeleCommand command) /// public CommandResult SendCommand(TeleCommand command, WriteCommandFlags flags) { + if (command == null) + throw new ArgumentNullException(nameof(command)); + if (command.CnlNum > 0) { // validate and send command From ad2b2005bc52e688ec862cb32b4eced00e4bcba2 Mon Sep 17 00:00:00 2001 From: 2mik Date: Thu, 23 Mar 2023 18:50:27 +0300 Subject: [PATCH 18/23] ScadaDoc: update history --- .../Pages/En/Version61/VersionHistory/ServerHistory.cshtml | 1 + .../Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml | 1 + 2 files changed, 2 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml index 292935548..78b552e9a 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml @@ -144,6 +144,7 @@

                    Rapid Gate

                    ModRapidGate 6.0.1.1 (In development)
                      +
                    • Command handling changed
                    • Fixed statistics calculation for current data
                    diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml index bfa1c9a44..c3113e54b 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml @@ -144,6 +144,7 @@

                    Быстрый шлюз

                    ModRapidGate 6.0.1.1 (В разработке)
                      +
                    • Изменена обработка команд
                    • Исправлен расчёт статистики для текущих данных
                    From 47e73d013074d242480a07e4e97df4f68935180e Mon Sep 17 00:00:00 2001 From: 2mik Date: Fri, 24 Mar 2023 11:19:25 +0300 Subject: [PATCH 19/23] ScadaServer: add CmdDataStr function --- .../ScadaServer/ScadaServerEngine/CalcEngine.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ScadaServer/ScadaServer/ScadaServerEngine/CalcEngine.cs b/ScadaServer/ScadaServer/ScadaServerEngine/CalcEngine.cs index e432016ff..e771898f6 100644 --- a/ScadaServer/ScadaServer/ScadaServerEngine/CalcEngine.cs +++ b/ScadaServer/ScadaServer/ScadaServerEngine/CalcEngine.cs @@ -20,7 +20,7 @@ * * Author : Mikhail Shiryaev * Created : 2020 - * Modified : 2021 + * Modified : 2023 */ using Scada.Data.Const; @@ -222,6 +222,17 @@ public byte[] CmdData } } + /// + /// Gets the command data as a string. + /// + public string CmdDataStr + { + get + { + return TeleCommand.CmdDataToString(initialCmdData); + } + } + /// /// Converts the specifined object into a channel value. From 0c21036e19e6ba4a740507d2999deeb6374815dd Mon Sep 17 00:00:00 2001 From: 2mik Date: Fri, 24 Mar 2023 18:22:34 +0300 Subject: [PATCH 20/23] Update EventTable.cs --- .../ScadaCommon/Data/Tables/EventTable.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ScadaCommon/ScadaCommon/Data/Tables/EventTable.cs b/ScadaCommon/ScadaCommon/Data/Tables/EventTable.cs index 8aafd9df7..f28c59137 100644 --- a/ScadaCommon/ScadaCommon/Data/Tables/EventTable.cs +++ b/ScadaCommon/ScadaCommon/Data/Tables/EventTable.cs @@ -20,7 +20,7 @@ * * Author : Mikhail Shiryaev * Created : 2020 - * Modified : 2021 + * Modified : 2023 */ using Scada.Data.Models; @@ -269,7 +269,16 @@ public bool AddEvent(Event ev) if (ev == null) throw new ArgumentNullException(nameof(ev)); - if (eventsByID != null && !eventsByID.ContainsKey(ev.EventID)) + if (eventsByID == null) + { + return false; + } + else if (eventsByID.TryGetValue(ev.EventID, out Event existingEvent)) + { + ev.Position = existingEvent.Position; + return false; + } + else { int index = Events.BinarySearch(ev, EventComparer); if (index < 0) @@ -279,10 +288,6 @@ public bool AddEvent(Event ev) eventsByID.Add(ev.EventID, ev); return true; } - else - { - return false; - } } } } From 6ea5eab418c30546acf00c7ad6d2fc013b9afa0d Mon Sep 17 00:00:00 2001 From: 2mik Date: Tue, 28 Mar 2023 15:38:54 +0300 Subject: [PATCH 21/23] ScadaDoc: update history --- .../En/Version61/VersionHistory/WebstationHistory.cshtml | 5 +++++ .../Ru/Version61/VersionHistory/WebstationHistory.cshtml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml index 1cdef6135..eb7e5371c 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml @@ -56,6 +56,11 @@

                  Chart Pro

                  +
                  PlgChartPro 6.0.0.2 (In development)
                  +
                    +
                  • Fixed zoom button color
                    • +
                  +
                  PlgChartPro 6.0.0.1 (January 17, 2023)
                  • Changes in JavaScript
                    • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml index 1cd2acfbd..19c03b8e3 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml @@ -56,6 +56,11 @@

                  Графики Про

                  +
                  PlgChartPro 6.0.0.2 (В разработке)
                  +
                    +
                  • Исправлен цвет кнопки масштаба
                    • +
                  +
                  PlgChartPro 6.0.0.1 (17.01.2023)
                  • Изменения в JavaScript
                    • From e65707b7829ad89b6707be68ace10b94b67cedd6 Mon Sep 17 00:00:00 2001 From: 2mik Date: Sat, 1 Apr 2023 10:40:27 +0300 Subject: [PATCH 22/23] ScadaCommon: update version to 6.1.0 --- ScadaCommon/FileStorage/FileStorage.csproj | 2 +- ScadaCommon/PostgreSqlStorage/PostgreSqlStorage.csproj | 2 +- ScadaCommon/ScadaCommon.Forms/ScadaCommon.Forms.csproj | 2 +- ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj | 2 +- ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj | 2 +- ScadaCommon/ScadaCommon/ScadaCommon.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ScadaCommon/FileStorage/FileStorage.csproj b/ScadaCommon/FileStorage/FileStorage.csproj index 5ad211faf..6ad901589 100644 --- a/ScadaCommon/FileStorage/FileStorage.csproj +++ b/ScadaCommon/FileStorage/FileStorage.csproj @@ -3,7 +3,7 @@ netstandard2.0 Scada.Storages.FileStorage - 6.0.0 + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA diff --git a/ScadaCommon/PostgreSqlStorage/PostgreSqlStorage.csproj b/ScadaCommon/PostgreSqlStorage/PostgreSqlStorage.csproj index d550ffd7b..dc4486239 100644 --- a/ScadaCommon/PostgreSqlStorage/PostgreSqlStorage.csproj +++ b/ScadaCommon/PostgreSqlStorage/PostgreSqlStorage.csproj @@ -3,7 +3,7 @@ netstandard2.0 Scada.Storages.PostgreSqlStorage - 6.0.0 + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA diff --git a/ScadaCommon/ScadaCommon.Forms/ScadaCommon.Forms.csproj b/ScadaCommon/ScadaCommon.Forms/ScadaCommon.Forms.csproj index 1301bbfce..b13a27d1f 100644 --- a/ScadaCommon/ScadaCommon.Forms/ScadaCommon.Forms.csproj +++ b/ScadaCommon/ScadaCommon.Forms/ScadaCommon.Forms.csproj @@ -6,7 +6,7 @@ true Scada.Forms True - 6.0.0 + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA diff --git a/ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj b/ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj index ff31e3cfb..6104b75ad 100644 --- a/ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj +++ b/ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj @@ -4,7 +4,7 @@ netstandard2.0 Scada.Log True - 6.0.0 + 6.1.0 Rapid SCADA Rapid Software LLC Mikhail Shiryaev diff --git a/ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj b/ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj index a767461e6..2410afded 100644 --- a/ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj +++ b/ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj @@ -7,7 +7,7 @@ true Scada.MultiDb True - 6.0.0 + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA diff --git a/ScadaCommon/ScadaCommon/ScadaCommon.csproj b/ScadaCommon/ScadaCommon/ScadaCommon.csproj index 69fa6a4a4..3ea02c65f 100644 --- a/ScadaCommon/ScadaCommon/ScadaCommon.csproj +++ b/ScadaCommon/ScadaCommon/ScadaCommon.csproj @@ -4,7 +4,7 @@ netstandard2.0 Scada True - 6.0.0 + 6.1.0 Mikhail Shiryaev Rapid Software LLC Rapid SCADA From 04443ec566c6353b3ee23d5fa334e06f4645db28 Mon Sep 17 00:00:00 2001 From: 2mik Date: Sat, 1 Apr 2023 14:37:58 +0300 Subject: [PATCH 23/23] ScadaDoc: update release date --- .../AdministratorHistory.cshtml | 4 ++-- .../VersionHistory/CommunicatorHistory.cshtml | 2 +- .../VersionHistory/ScadaHistory.cshtml | 20 +++++++++++++++++++ .../VersionHistory/ServerHistory.cshtml | 4 ++-- .../VersionHistory/WebstationHistory.cshtml | 2 +- .../AdministratorHistory.cshtml | 4 ++-- .../VersionHistory/CommunicatorHistory.cshtml | 2 +- .../VersionHistory/ScadaHistory.cshtml | 20 +++++++++++++++++++ .../VersionHistory/ServerHistory.cshtml | 4 ++-- .../VersionHistory/WebstationHistory.cshtml | 2 +- 10 files changed, 52 insertions(+), 12 deletions(-) diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml index 290bee1ad..58e4c05e1 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/AdministratorHistory.cshtml @@ -23,7 +23,7 @@

                    Administrator History

                    Administrator Application

                    -
                    ScadaAdmin 6.1.0.1 (In development)
                    +
                    ScadaAdmin 6.1.0.1 (April 02, 2023)
                    • UI fixes
                    @@ -46,7 +46,7 @@

                  Communicator Configurator

                  -
                  ExtCommConfig 6.0.1.1 (In development)
                  +
                  ExtCommConfig 6.0.1.1 (April 02, 2023)
                  • Fixed layout of controls
                  diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml index b6a0ad296..dae5d6474 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/CommunicatorHistory.cshtml @@ -127,7 +127,7 @@ @**** DrvDsScadaServer ****@

                  Server Data Source

                  -
                  DrvDsScadaServer 6.0.1.1 (In development)
                  +
                  DrvDsScadaServer 6.0.1.1 (April 02, 2023)
                  • Fixed reading configuration database
                  • Fixed statistics calculation
                    • diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ScadaHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ScadaHistory.cshtml index 49050e647..846f4ed02 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ScadaHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ScadaHistory.cshtml @@ -6,6 +6,26 @@

                    History of Rapid SCADA

                    +
                    Rapid SCADA 6.1.1 (April 02, 2023)
                    +
                      +
                    • Server 6.1.0.1
                      • +
                    • + Communicator 6.1.0.0 +
                        +
                      • DrvDsScadaServer 6.0.1.1
                        • +
                      +
                      • +
                    • Webstation 6.1.0.0
                      • +
                    • Agent 6.1.0.0
                      • +
                    • + Administrator 6.1.0.1 +
                        +
                      • ExtCommConfig 6.0.1.1
                        • +
                      +
                      • +
                    • Scheme Editor 5.3.1.1
                      • +
                    +
                    Rapid SCADA 6.1.0 (March 21, 2023)
                    • diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml index 78b552e9a..915b5de16 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/ServerHistory.cshtml @@ -24,7 +24,7 @@

                      Server History

                      Server Application

                      -
                      ScadaServer 6.1.0.1 (In development)
                      +
                      ScadaServer 6.1.0.1 (April 02, 2023)
                      • Fixed reading configuration database
                      @@ -142,7 +142,7 @@ @**** ModRapidGate ****@

                      Rapid Gate

                      -
                      ModRapidGate 6.0.1.1 (In development)
                      +
                      ModRapidGate 6.0.1.1 (April 02, 2023)
                      • Command handling changed
                      • Fixed statistics calculation for current data
                        • diff --git a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml index eb7e5371c..0f3ff5b38 100644 --- a/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/En/Version61/VersionHistory/WebstationHistory.cshtml @@ -56,7 +56,7 @@

                      Chart Pro

                      -
                      PlgChartPro 6.0.0.2 (In development)
                      +
                      PlgChartPro 6.0.0.2 (April 02, 2023)
                      • Fixed zoom button color
                      diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml index 7b7a1d25e..a16b2559a 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/AdministratorHistory.cshtml @@ -23,7 +23,7 @@

                      История Администратора

                      Приложение Администратор

                      -
                      ScadaAdmin 6.1.0.1 (В разработке)
                      +
                      ScadaAdmin 6.1.0.1 (02.04.2023)
                      • Исправления в пользовательском интерфейсе
                      @@ -46,7 +46,7 @@

                    Конфигуратор Коммуникатора

                    -
                    ExtCommConfig 6.0.1.1 (В разработке)
                    +
                    ExtCommConfig 6.0.1.1 (02.04.2023)
                    • Исправлено расположение элементов управления
                    diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml index fd110306a..0672719ec 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/CommunicatorHistory.cshtml @@ -140,7 +140,7 @@ @**** DrvDsScadaServer ****@

                    Источник данных Сервер

                    -
                    DrvDsScadaServer 6.0.1.1 (В разработке)
                    +
                    DrvDsScadaServer 6.0.1.1 (02.04.2023)
                    • Исправлено считывание базы конфигурации
                    • Исправлен расчёт статистики
                      • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ScadaHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ScadaHistory.cshtml index fc6ae7e09..3871ba0f8 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ScadaHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ScadaHistory.cshtml @@ -6,6 +6,26 @@

                      История Rapid SCADA

                      +
                      Rapid SCADA 6.1.1 (02.04.2023)
                      +
                        +
                      • Сервер 6.1.0.1
                        • +
                      • + Коммуникатор 6.1.0.0 +
                          +
                        • DrvDsScadaServer 6.0.1.1
                          • +
                        +
                        • +
                      • Вебстанция 6.1.0.0
                        • +
                      • Агент 6.1.0.0
                        • +
                      • + Администратор 6.1.0.1 +
                          +
                        • ExtCommConfig 6.0.1.1
                          • +
                        +
                        • +
                      • Редактор схем 5.3.1.1
                        • +
                      +
                      Rapid SCADA 6.1.0 (21.03.2023)
                      • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml index c3113e54b..3010d7102 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/ServerHistory.cshtml @@ -24,7 +24,7 @@

                        История Сервера

                        Приложение Сервер

                        -
                        ScadaServer 6.1.0.1 (В разработке)
                        +
                        ScadaServer 6.1.0.1 (02.04.2023)
                        • Исправлено считывание базы конфигурации
                        @@ -142,7 +142,7 @@ @**** ModRapidGate ****@

                        Быстрый шлюз

                        -
                        ModRapidGate 6.0.1.1 (В разработке)
                        +
                        ModRapidGate 6.0.1.1 (02.04.2023)
                        • Изменена обработка команд
                        • Исправлен расчёт статистики для текущих данных
                          • diff --git a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml index 19c03b8e3..ad6faf9f2 100644 --- a/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml +++ b/ScadaDoc/ScadaDoc/Pages/Ru/Version61/VersionHistory/WebstationHistory.cshtml @@ -56,7 +56,7 @@

                        Графики Про

                        -
                        PlgChartPro 6.0.0.2 (В разработке)
                        +
                        PlgChartPro 6.0.0.2 (02.04.2023)
                        • Исправлен цвет кнопки масштаба