Merge pull request #51 from RapidScada/develop

Develop
RapidScada · May 15, 2023 · 15c22ac · 15c22ac
2 parents 9c64af6 + d1518dc
commit 15c22ac
Show file tree

Hide file tree

Showing 82 changed files with 518 additions and 279 deletions.
diff --git a/ScadaAdmin/OpenExtensions/ExtServerConfig/Code/ExtensionUtils.cs b/ScadaAdmin/OpenExtensions/ExtServerConfig/Code/ExtensionUtils.cs
@@ -25,6 +25,7 @@ public static bool GetModuleView(IAdminContext adminContext, ServerApp serverApp
             {
                 moduleView.ConfigDataset = adminContext.CurrentProject.ConfigDatabase;
                 moduleView.AppDirs = adminContext.AppDirs.CreateDirsForView(serverApp.ConfigDir);
+                moduleView.AgentClient = adminContext.MainForm.GetAgentClient(false);
                 moduleView.AppConfig = serverApp.AppConfig;
                 moduleView.LoadDictionaries();
                 return true;

diff --git a/ScadaAdmin/OpenExtensions/ExtServerConfig/ExtServerConfig.csproj b/ScadaAdmin/OpenExtensions/ExtServerConfig/ExtServerConfig.csproj
@@ -12,7 +12,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.1</Version>
-    <AssemblyVersion>6.0.1.0</AssemblyVersion>
+    <AssemblyVersion>6.0.1.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Deployment/FrmInstanceStatus.cs b/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Deployment/FrmInstanceStatus.cs
@@ -31,7 +31,6 @@
 using Scada.Forms;
 using Scada.Lang;
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -43,10 +42,6 @@ namespace Scada.Admin.App.Forms.Deployment
     /// </summary>
     public partial class FrmInstanceStatus : Form, IDeploymentForm
     {
-        /// <summary>
-        /// The time period for disabling the button after pressing, ms.
-        /// </summary>
-        private const int ButtonWait = 1000;
         /// <summary>
         /// The services which status is displayed.
         /// </summary>
@@ -86,6 +81,11 @@ public FrmInstanceStatus(AppData appData, ScadaProject project, ProjectInstance
         }
 
 
+        /// <summary>
+        /// Gets a value indicating whether the form is available to a user.
+        /// </summary>
+        private bool FormAvailable => Visible && !IsDisposed;
+
         /// <summary>
         /// Gets a value indicating whether the selected profile changed.
         /// </summary>
@@ -184,43 +184,34 @@ await Task.Run(() =>
             });
         }
 
-        /// <summary>
-        /// Displays the button in waiting state.
-        /// </summary>
-        private static void DisplayWait(Button button)
-        {
-            Task.Run(() =>
-            {
-                button.Enabled = false;
-                Thread.Sleep(ButtonWait);
-                button.Enabled = true;
-            });
-        }
-
         /// <summary>
         /// Sends the command to the service.
         /// </summary>
-        private static void ControlService(IAgentClient client, ServiceApp serviceApp, ServiceCommand command)
+        private async Task ControlServiceAsync(IAgentClient client, ServiceApp serviceApp, ServiceCommand command)
         {
             if (client == null)
                 return;
 
-            try
+            await Task.Run(() =>
             {
-                bool result;
+                try
+                {
+                    bool result;
 
-                lock (client)
+                    lock (client)
+                    {
+                        result = client.ControlService(serviceApp, command, 0);
+                    }
+
+                    if (!result && FormAvailable)
+                        ScadaUiUtils.ShowError(AppPhrases.UnableControlService);
+                }
+                catch (Exception ex)
                 {
-                    result = client.ControlService(serviceApp, command, 0);
+                    if (FormAvailable)
+                        ScadaUiUtils.ShowError(ex.BuildErrorMessage(AppPhrases.ControlServiceError));
                 }
-
-                if (!result)
-                    ScadaUiUtils.ShowError(AppPhrases.UnableControlService);
-            }
-            catch (Exception ex)
-            {
-                ScadaUiUtils.ShowError(ex.BuildErrorMessage(AppPhrases.ControlServiceError));
-            }
+            });
         }
 
 
@@ -276,7 +267,7 @@ private void btnDisconnect_Click(object sender, EventArgs e)
             Disconnect();
         }
 
-        private void btnControlService_Click(object sender, EventArgs e)
+        private async void btnControlService_Click(object sender, EventArgs e)
         {
             Button button = (Button)sender;
             string buttonName = button.Name;
@@ -302,8 +293,8 @@ private void btnControlService_Click(object sender, EventArgs e)
             // send command to application
             if (serviceApp != null && serviceCommand != null)
             {
-                DisplayWait(button);
-                ControlService(agentClient, serviceApp.Value, serviceCommand.Value);
+                button.DisplayWait();
+                await ControlServiceAsync(agentClient, serviceApp.Value, serviceCommand.Value);
             }
         }
 

diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs b/ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs
@@ -135,7 +135,8 @@ private bool ApplyChanges()
             if (!(int.TryParse(txtCnlNum.Text, out int cnlNum) &&
                 ConfigDatabase.MinID <= cnlNum && cnlNum <= ConfigDatabase.MaxID))
             {
-                sbError.AppendError(lblCnlNum, CommonPhrases.IntegerInRangeRequired, ConfigDatabase.MinID, ConfigDatabase.MaxID);
+                sbError.AppendError(lblCnlNum, CommonPhrases.IntegerInRangeRequired, 
+                    ConfigDatabase.MinID, ConfigDatabase.MaxID);
             }
 
             int dataLen = -1;

diff --git a/ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj b/ScadaAdmin/ScadaAdmin/ScadaAdmin/ScadaAdmin.csproj
@@ -12,7 +12,7 @@
     <Copyright>Copyright © 2023</Copyright>
     <ApplicationIcon>lamp.ico</ApplicationIcon>
     <Version>6.1.0</Version>
-    <AssemblyVersion>6.1.0.1</AssemblyVersion>
+    <AssemblyVersion>6.1.0.2</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvDsOpcUaServer.Logic/DrvDsOpcUaServer.Logic.csproj b/ScadaComm/OpenDrivers/DrvDsOpcUaServer.Logic/DrvDsOpcUaServer.Logic.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.4.371.41" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.371.41" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.4.371.86" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.4.371.86" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvModbus.Common/DrvModbus.Common.csproj b/ScadaComm/OpenDrivers/DrvModbus.Common/DrvModbus.Common.csproj
@@ -9,7 +9,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.2</AssemblyVersion>
+    <AssemblyVersion>6.0.0.3</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvModbus.Common/Protocol/ModbusUtils.cs b/ScadaComm/OpenDrivers/DrvModbus.Common/Protocol/ModbusUtils.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Rapid Software LLC. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Globalization;
+
 namespace Scada.Comm.Drivers.DrvModbus.Protocol
 {
     /// <summary>
@@ -183,7 +185,7 @@ public static string GetAddressRange(int address, int count, bool zeroAddr, bool
         }
 
         /// <summary>
-        /// Parses a byte order array from the string notation like '01234567'.
+        /// Parses a byte order array from the string notation like '0123456789ABCDEF'.
         /// </summary>
         public static int[] ParseByteOrder(string byteOrderStr)
         {
@@ -198,7 +200,8 @@ public static int[] ParseByteOrder(string byteOrderStr)
 
                 for (int i = 0; i < len; i++)
                 {
-                    byteOrder[i] = int.TryParse(byteOrderStr[i].ToString(), out int n) ? n : 0;
+                    byteOrder[i] = int.TryParse(byteOrderStr[i].ToString(),
+                        NumberStyles.HexNumber, CultureInfo.InvariantCulture, out int n) ? n : 0;
                 }
 
                 return byteOrder;

diff --git a/ScadaComm/OpenDrivers/DrvModbus.Logic/DrvModbus.Logic.csproj b/ScadaComm/OpenDrivers/DrvModbus.Logic/DrvModbus.Logic.csproj
@@ -8,7 +8,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.2</AssemblyVersion>
+    <AssemblyVersion>6.0.0.3</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvModbus.View/DrvModbus.View.csproj b/ScadaComm/OpenDrivers/DrvModbus.View/DrvModbus.View.csproj
@@ -12,7 +12,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.2</AssemblyVersion>
+    <AssemblyVersion>6.0.0.3</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvMqttClient.Common/DrvMqttClient.Common.csproj b/ScadaComm/OpenDrivers/DrvMqttClient.Common/DrvMqttClient.Common.csproj
@@ -10,7 +10,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.1</AssemblyVersion>
+    <AssemblyVersion>6.0.0.2</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvMqttClient.Logic/DevMqttClientLogic.cs b/ScadaComm/OpenDrivers/DrvMqttClient.Logic/DevMqttClientLogic.cs
@@ -192,12 +192,7 @@ private void ExecuteJavaScript(ReceivedMessage message, SubscriptionTag subscrip
                 {
                     int tagIndex = subscriptionTag.TagIndex + i;
                     double tagValue = subscriptionTag.JsValues[i];
-
-                    if (double.IsNaN(tagValue))
-                        DeviceData.Invalidate(tagIndex);
-                    else
-                        DeviceData.Set(tagIndex, tagValue);
-
+                    DeviceData.Set(tagIndex, tagValue);
                     updateTimestamps[tagIndex] = LastSessionTime;
                 }
             }

diff --git a/ScadaComm/OpenDrivers/DrvMqttClient.Logic/DrvMqttClient.Logic.csproj b/ScadaComm/OpenDrivers/DrvMqttClient.Logic/DrvMqttClient.Logic.csproj
@@ -11,7 +11,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.1</AssemblyVersion>
+    <AssemblyVersion>6.0.0.2</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvMqttClient.View/DrvMqttClient.View.csproj b/ScadaComm/OpenDrivers/DrvMqttClient.View/DrvMqttClient.View.csproj
@@ -12,7 +12,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.0.0</Version>
-    <AssemblyVersion>6.0.0.1</AssemblyVersion>
+    <AssemblyVersion>6.0.0.2</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/OpenDrivers/DrvOpcUa.Common/DrvOpcUa.Common.csproj b/ScadaComm/OpenDrivers/DrvOpcUa.Common/DrvOpcUa.Common.csproj
@@ -23,8 +23,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.4.371.41" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.371.41" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.4.371.86" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.4.371.86" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/ScadaComm/ScadaCommApp/ScadaCommApp.csproj b/ScadaComm/ScadaComm/ScadaCommApp/ScadaCommApp.csproj
@@ -9,7 +9,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.1.0</Version>
-    <AssemblyVersion>6.1.0.0</AssemblyVersion>
+    <AssemblyVersion>6.1.0.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/ScadaComm/ScadaCommEngine/CoreLogic.cs b/ScadaComm/ScadaComm/ScadaCommEngine/CoreLogic.cs
@@ -893,7 +893,7 @@ public void StopProcessing()
                     terminated = true;
                     serviceStatus = ServiceStatus.Terminating;
 
-                    if (thread.Join(AppConfig.GeneralOptions.StopWait))
+                    if (thread.Join(TimeSpan.FromSeconds(AppConfig.GeneralOptions.StopWait)))
                         Log.WriteAction(CommonPhrases.LogicStopped);
                     else
                         Log.WriteAction(CommonPhrases.UnableToStopLogic);

diff --git a/ScadaComm/ScadaComm/ScadaCommEngine/ScadaCommEngine.csproj b/ScadaComm/ScadaComm/ScadaCommEngine/ScadaCommEngine.csproj
@@ -8,7 +8,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.1.0</Version>
-    <AssemblyVersion>6.1.0.0</AssemblyVersion>
+    <AssemblyVersion>6.1.0.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaComm/ScadaComm/ScadaCommWkr/ScadaCommWkr.csproj b/ScadaComm/ScadaComm/ScadaCommWkr/ScadaCommWkr.csproj
@@ -9,7 +9,7 @@
     <Product>Rapid SCADA</Product>
     <Copyright>Copyright © 2023</Copyright>
     <Version>6.1.0</Version>
-    <AssemblyVersion>6.1.0.0</AssemblyVersion>
+    <AssemblyVersion>6.1.0.1</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ScadaCommon/ScadaCommon.Forms/ListViewExtensions.cs b/ScadaCommon/ScadaCommon.Forms/ListViewExtensions.cs
@@ -50,6 +50,14 @@ public static ListViewItem GetSelectedItem(this ListView listView)
             return listView.SelectedItems.Count > 0 ? listView.SelectedItems[0] : null;
         }
 
+        /// <summary>
+        /// Gets an object associated with the first selected list item.
+        /// </summary>
+        public static object GetSelectedObject(this ListView listView)
+        {
+            return listView.GetSelectedItem()?.Tag;
+        }
+
         /// <summary>
         /// Moves up the selected list item.
         /// </summary>

diff --git a/ScadaCommon/ScadaCommon.Forms/ScadaUiUtils.cs b/ScadaCommon/ScadaCommon.Forms/ScadaUiUtils.cs
@@ -9,6 +9,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Scada.Forms
@@ -27,7 +29,11 @@ public static class ScadaUiUtils
         /// The maximum column width in DataGridView in pixels.
         /// </summary>
         private const int MaxColumnWidth = 500;
-
+        /// <summary>
+        /// The time period for disabling the button after pressing, ms.
+        /// </summary>
+        private const int ButtonWait = 1000;
+
         /// <summary>
         /// The log refresh interval for local access, ms.
         /// </summary>
@@ -115,17 +121,15 @@ public static void SetValue(this NumericUpDown numericUpDown, decimal val)
         /// </summary>
         public static void SetTime(this DateTimePicker dateTimePicker, DateTime time)
         {
-            DateTime date = dateTimePicker.MinDate;
-            dateTimePicker.Value = new DateTime(date.Year, date.Month, date.Day, time.Hour, time.Minute, time.Second);
+            dateTimePicker.Value = dateTimePicker.MinDate + time.TimeOfDay;
         }
 
         /// <summary>
         /// Sets the time of the DateTimePicker control.
         /// </summary>
         public static void SetTime(this DateTimePicker dateTimePicker, TimeSpan timeSpan)
         {
-            DateTime date = dateTimePicker.MinDate;
-            dateTimePicker.Value = new DateTime(date.Year, date.Month, date.Day).Add(timeSpan);
+            dateTimePicker.Value = dateTimePicker.MinDate + timeSpan;
         }
 
         /// <summary>
@@ -174,6 +178,19 @@ public static void DrawTabItem(this ListBox listBox, DrawItemEventArgs e)
             e.DrawFocusRectangle();
         }
 
+        /// <summary>
+        /// Displays the button in waiting state.
+        /// </summary>
+        public static void DisplayWait(this Button button)
+        {
+            Task.Run(() =>
+            {
+                button.Enabled = false;
+                Thread.Sleep(ButtonWait);
+                button.Enabled = true;
+            });
+        }
+
         /// <summary>
         /// Tests whether the specified area is visible on any of the available screens.
         /// </summary>

diff --git a/ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj b/ScadaCommon/ScadaCommon.Log/ScadaCommon.Log.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Scada.Log</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <Version>6.1.0</Version>
+    <Version>6.0.0</Version>
     <Product>Rapid SCADA</Product>
     <Company>Rapid Software LLC</Company>
     <Authors>Mikhail Shiryaev</Authors>

diff --git a/ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj b/ScadaCommon/ScadaCommon.MultiDb/ScadaCommon.MultiDb.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="MySql.Data" Version="8.0.31" />
     <PackageReference Include="Npgsql" Version="6.0.6" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.80" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
   </ItemGroup>