Added checkbox for usage of flat symbol list

- fix #18 - fixed jetbrains annotations
fbarresi · Mar 20, 2021 · 852eb34 · 852eb34
1 parent 828d9dc
commit 852eb34
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 5 deletions.
diff --git a/TwinCatAdsTool.Gui/Properties/Resources.Designer.cs b/TwinCatAdsTool.Gui/Properties/Resources.Designer.cs
diff --git a/TwinCatAdsTool.Gui/Properties/Resources.de.resx b/TwinCatAdsTool.Gui/Properties/Resources.de.resx
@@ -244,4 +244,7 @@
 	<data name="PoweredBy" xml:space="preserve">
 		<value>Eine Software von</value>
 	</data>
+	<data name="UseFlatSymbolList" xml:space="preserve">
+		<value>Symbolliste in flat Format nutzen</value>
+	</data>
 </root>
diff --git a/TwinCatAdsTool.Gui/Properties/Resources.resx b/TwinCatAdsTool.Gui/Properties/Resources.resx
@@ -270,4 +270,7 @@
   <data name="ConnectionCabViewModel_ConnectClient_Dll_for_TwinCAT_Ads_not_found__Have_you_installed_the_drivers_" xml:space="preserve">
     <value>Dll for TwinCAT.Ads not found. Have you installed the drivers?</value>
   </data>
+	<data name="UseFlatSymbolList" xml:space="preserve">
+		<value>Use flat symbol list</value>
+	</data>
 </root>
diff --git a/TwinCatAdsTool.Gui/TwinCatAdsTool.Gui.csproj b/TwinCatAdsTool.Gui/TwinCatAdsTool.Gui.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="DiffPlex" Version="1.4.4" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="3.6.0" />
     <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
     <PackageReference Include="MahApps.Metro" Version="2.2.0" />
     <PackageReference Include="MaterialDesignExtensions" Version="3.2.0" />
     <PackageReference Include="MaterialDesignThemes.MahApps" Version="0.1.4" />

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 useFlatSymbolList;
 
         public BackupViewModel(IClientService clientService, IPersistentVariableService persistentVariableService)
         {
@@ -44,6 +45,17 @@ public string BackupText
         public ReactiveCommand<Unit, Unit> Read { get; set; }
         public ReactiveCommand<Unit, Unit> Save { get; set; }
 
+        public bool UseFlatSymbolList
+        {
+            get => useFlatSymbolList;
+            set
+            {
+                if (value == useFlatSymbolList) return;
+                useFlatSymbolList = value;
+                raisePropertyChanged();
+            }
+        }
+
         public override void Init()
         {
             variableSubject
@@ -67,7 +79,8 @@ public override void Init()
 
         private async Task<Unit> ReadVariables()
         {
-            var persistentVariables = await persistentVariableService.ReadPersistentVariables(clientService.Client, clientService.TreeViewSymbols);
+            var persistentVariables = await persistentVariableService.ReadPersistentVariables(clientService.Client, 
+                UseFlatSymbolList ? clientService.FlatViewSymbols : clientService.TreeViewSymbols);
             variableSubject.OnNext(persistentVariables);
             Logger.Debug(Resources.ReadPersistentVariables);
 

diff --git a/TwinCatAdsTool.Gui/ViewModels/ViewModelBase.cs b/TwinCatAdsTool.Gui/ViewModels/ViewModelBase.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Reactive.Disposables;
 using System.Runtime.CompilerServices;
-using DynamicData.Annotations;
+using JetBrains.Annotations;
 using log4net;
 using ReactiveUI;
 using TwinCatAdsTool.Interfaces.Commons;

diff --git a/TwinCatAdsTool.Gui/Views/BackupView.xaml b/TwinCatAdsTool.Gui/Views/BackupView.xaml
@@ -29,7 +29,9 @@
                     >
             </Button>
 
+            <CheckBox IsChecked="{Binding UseFlatSymbolList, UpdateSourceTrigger=PropertyChanged}" Margin="16" Content="{x:Static properties:Resources.UseFlatSymbolList}"/>
             <Label Margin="24,16,0,16" Content="{Binding CurrentTask}"/>
+
 
         </StackPanel>
 

diff --git a/TwinCatAdsTool.Gui/Views/ExploreView.xaml b/TwinCatAdsTool.Gui/Views/ExploreView.xaml
@@ -176,11 +176,12 @@
                                 <StackPanel Orientation="Horizontal">
                                     <Button Command="{Binding  Path=DataContext.CmdDelete, RelativeSource={RelativeSource FindAncestor, AncestorType=UserControl}}" 
                                             CommandParameter="{Binding}" 
-                                            Style="{StaticResource MaterialDesignIconForegroundButton}"
-                                    >
+                                            Style="{StaticResource MaterialDesignIconForegroundButton}">
                                         <materialDesign:PackIcon Kind="MinusCircleOutline" Foreground="Red"/>
                                     </Button>
-                                    <Label Content="{Binding Name}" ToolTip="{Binding FullName}" VerticalContentAlignment="Center"/>
+                                    <Label Content="{Binding Name}" 
+                                           ToolTip="{Binding FullName}" 
+                                           VerticalContentAlignment="Center"/>
                                 </StackPanel>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>