From 679c6ceb5ad91431df0180ce46c2b407cfe49def Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sat, 14 Nov 2020 01:49:42 +0200 Subject: Thread Break/Loading improvements. --- Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/Tango.Touch/Controls') diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml index 97d91477d..d54b155d2 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml @@ -242,7 +242,7 @@ OK - + -- cgit v1.3.1 From f838a715af54ef7fc35bf9d99fee95dd8ac6533f Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sat, 14 Nov 2020 16:40:53 +0200 Subject: Fixed issues with UWF enable/disable on settings. --- .../UWF/AlternativeUnifiedWriteFilterManager.cs | 14 ++++++++++---- .../UWF/DefaultUnifiedWriteFilterManager.cs | 14 ++++++++++---- .../Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) (limited to 'Software/Visual_Studio/Tango.Touch/Controls') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs index a471a369d..c95cdb376 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/AlternativeUnifiedWriteFilterManager.cs @@ -4,11 +4,12 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Tango.Core; using Tango.Core.Components; namespace Tango.PPC.Common.UWF { - public class AlternativeUnifiedWriteFilterManager : IUnifiedWriteFilterManager + public class AlternativeUnifiedWriteFilterManager : ExtendedObject, IUnifiedWriteFilterManager { private const string UWF_PATH = "C:\\Windows\\Sysnative\\uwfmgr.exe"; @@ -70,16 +71,21 @@ namespace Tango.PPC.Common.UWF /// public async Task IsEnabled() { + String pattern = @"Next Session Settings[\n\r]+FILTER SETTINGS[\n\r]+\s+Filter state:\s+(OFF|ON)"; + + LogManager.Log($"Getting UWF status using pattern '{pattern}'..."); CmdCommand command = new CmdCommand(UWF_PATH, $"get-config"); command.OutputEncoding = CmdCommand.OutEncoding.Unicode; var result = await command.Run(); - Match match = Regex.Match(result.StandardOutput, "Filter state:\\s+(OFF|ON)"); + Match match = Regex.Match(result.StandardOutput, pattern); if (match != null && match.Success && match.Groups.Count > 1) { var value = match.Groups[1].Value; - bool enabled = value.ToStringOrEmpty().Trim() == "ON"; - return true; + + LogManager.Log($"UWF pattern parsing result: '{value}'."); + + return value.ToStringOrEmpty().Trim() == "ON"; } return false; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/DefaultUnifiedWriteFilterManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/DefaultUnifiedWriteFilterManager.cs index 3f13a1aa1..5684f6926 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/DefaultUnifiedWriteFilterManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/UWF/DefaultUnifiedWriteFilterManager.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Tango.Core; using Tango.Core.Components; namespace Tango.PPC.Common.UWF @@ -12,7 +13,7 @@ namespace Tango.PPC.Common.UWF /// Represents the default unified writer filter manager. /// /// - public class DefaultUnifiedWriteFilterManager : IUnifiedWriteFilterManager + public class DefaultUnifiedWriteFilterManager : ExtendedObject, IUnifiedWriteFilterManager { private const int UWF_CAPACITY_MB = 5000; private const string UWF_PATH = "C:\\Windows\\Sysnative\\uwfmgr.exe"; @@ -98,16 +99,21 @@ namespace Tango.PPC.Common.UWF /// public async Task IsEnabled() { + String pattern = @"Next Session Settings[\n\r]+FILTER SETTINGS[\n\r]+\s+Filter state:\s+(OFF|ON)"; + + LogManager.Log($"Getting UWF status using pattern '{pattern}'..."); CmdCommand command = new CmdCommand(UWF_PATH, $"get-config"); command.OutputEncoding = CmdCommand.OutEncoding.Unicode; var result = await command.Run(); - Match match = Regex.Match(result.StandardOutput, "Filter state:\\s+(OFF|ON)"); + Match match = Regex.Match(result.StandardOutput, pattern); if (match != null && match.Success && match.Groups.Count > 1) { var value = match.Groups[1].Value; - bool enabled = value.ToStringOrEmpty().Trim() == "ON"; - return true; + + LogManager.Log($"UWF pattern parsing result: '{value}'."); + + return value.ToStringOrEmpty().Trim() == "ON"; } return false; diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml index d54b155d2..dd405a6c3 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml @@ -242,7 +242,7 @@ OK - + -- cgit v1.3.1