added global only flag for PersistentVariableService

- related to #27
fbarresi · Mar 3, 2023 · 5cf8c20 · 5cf8c20
1 parent 68f4c02
commit 5cf8c20
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/TwinCatAdsTool.Gui/ViewModels/BackupViewModel.cs b/TwinCatAdsTool.Gui/ViewModels/BackupViewModel.cs
@@ -23,6 +23,7 @@ public class BackupViewModel : ViewModelBase
         private readonly Subject<JObject> variableSubject = new Subject<JObject>();
         private string backupText;
         private ObservableAsPropertyHelper<string> currentTaskHelper;
+        private bool globalOnly;
 
         public BackupViewModel(IClientService clientService, IPersistentVariableService persistentVariableService)
         {
@@ -41,6 +42,17 @@ public string BackupText
             }
         }
 
+        public bool GlobalOnly
+        {
+            get => globalOnly;
+            set
+            {
+                if (value == globalOnly) return;
+                globalOnly = value;
+                raisePropertyChanged();
+            }
+        }
+
         public ReactiveCommand<Unit, Unit> Read { get; set; }
         public ReactiveCommand<Unit, Unit> Save { get; set; }
 
@@ -69,7 +81,7 @@ private async Task<Unit> ReadVariables()
         {
             var persistentVariables = await persistentVariableService.ReadGlobalPersistentVariables(
                 clientService.Client, 
-                clientService.TreeViewSymbols);
+                clientService.TreeViewSymbols, globalOnly);
             variableSubject.OnNext(persistentVariables);
             Logger.Debug(Resources.ReadPersistentVariables);
 

diff --git a/TwinCatAdsTool.Gui/ViewModels/CompareViewModel.cs b/TwinCatAdsTool.Gui/ViewModels/CompareViewModel.cs
@@ -33,6 +33,7 @@ public class CompareViewModel : ViewModelBase
         private IEnumerable<ListBoxItem> rightBoxText;
         private string sourceLeft;
         private string sourceRight;
+        private bool globalOnly = true;
 
         public CompareViewModel(IClientService clientService, IPersistentVariableService persistentVariableService)
         {
@@ -269,9 +270,20 @@ private Task LoadJsonRight()
             return Task.FromResult(Unit.Default);
         }
 
+        public bool GlobalOnly
+        {
+            get => globalOnly;
+            set
+            {
+                if (value == globalOnly) return;
+                globalOnly = value;
+                raisePropertyChanged();
+            }
+        }
+
         private async Task<JObject> ReadVariables()
         {
-            var persistentVariables = await persistentVariableService.ReadGlobalPersistentVariables(clientService.Client, clientService.TreeViewSymbols);
+            var persistentVariables = await persistentVariableService.ReadGlobalPersistentVariables(clientService.Client, clientService.TreeViewSymbols, globalOnly);
 
             Logger.Debug(Resources.ReadPersistentVariables);
             return persistentVariables;

diff --git a/TwinCatAdsTool.Gui/Views/BackupView.xaml b/TwinCatAdsTool.Gui/Views/BackupView.xaml
@@ -29,6 +29,8 @@
                     >
             </Button>
 
+            <CheckBox Margin="16" IsChecked="{Binding GlobalOnly}">global only</CheckBox>
+
             <Label Margin="24,16,0,16" Content="{Binding CurrentTask}"/>
 
 

diff --git a/TwinCatAdsTool.Interfaces/Services/IPersistentVariableService.cs b/TwinCatAdsTool.Interfaces/Services/IPersistentVariableService.cs
@@ -9,7 +9,8 @@ namespace TwinCatAdsTool.Interfaces.Services
 {
     public interface IPersistentVariableService
     {
-        Task<JObject> ReadGlobalPersistentVariables(AdsClient client, IInstanceCollection<ISymbol> symbols);
+        Task<JObject> ReadGlobalPersistentVariables(AdsClient client, IInstanceCollection<ISymbol> symbols,
+            bool globalOnly);
         IObservable<string> CurrentTask { get; }
     }
 }
diff --git a/TwinCatAdsTool.Logic/Services/PersistentVariableService.cs b/TwinCatAdsTool.Logic/Services/PersistentVariableService.cs
@@ -23,15 +23,17 @@ public class PersistentVariableService : IPersistentVariableService
     {
         private readonly ILog logger =LoggerFactory.GetLogger();
         private readonly Subject<string> currentTaskSubject = new Subject<string>();
-        public async Task<JObject> ReadGlobalPersistentVariables(AdsClient client, IInstanceCollection<ISymbol> symbols)
+        public async Task<JObject> ReadGlobalPersistentVariables(AdsClient client, IInstanceCollection<ISymbol> symbols,
+            bool globalOnly)
         {
             var jobj = new JObject();
             try
             {
                 if (client.IsConnected)
                 {
                     var iterator = new SymbolIterator(symbols,
-                            s => s.IsPersistent && s.InstancePath.Split('.').Length >= 2 &&
+                            s => s.IsPersistent && 
+                                 (globalOnly ? s.InstancePath.Split('.').Length == 2 : s.InstancePath.Split('.').Length >= 2) &&
                                  !s.InstancePath.Contains("["))
                         ;