change colors (thx to hase)

one-ware · Jul 22, 2023 · 78d6847 · 78d6847
1 parent a85bc14
commit 78d6847
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/OneWare.Vcd.Viewer/Models/VcdScopeModel.cs b/src/OneWare.Vcd.Viewer/Models/VcdScopeModel.cs
@@ -6,7 +6,7 @@ namespace OneWare.Vcd.Viewer.Models;
 
 public class VcdScopeModel : ObservableObject
 {
-    private bool _isExpanded;
+    private bool _isExpanded = true;
     public bool IsExpanded
     {
         get => _isExpanded;
@@ -18,8 +18,8 @@ public bool IsExpanded
 
     public VcdScopeModel(VcdScope scope)
     {
-        Name = scope.Name;
-        Scopes = scope.Scopes.Select(x => new VcdScopeModel(x));
+        Name = scope.Name.Split(' ').Last();
+        Scopes = scope.Scopes.Where(x => x.Signals.Any() || x.Scopes.Any()).Select(x => new VcdScopeModel(x));
         Signals = scope.Signals;
     }
 }
diff --git a/src/OneWare.Vcd.Viewer/ViewModels/VcdViewModel.cs b/src/OneWare.Vcd.Viewer/ViewModels/VcdViewModel.cs
@@ -72,7 +72,7 @@ private async Task<bool> LoadAsync()
 
             _vcdFile = context.Item1;
 
-            Scopes.AddRange(_vcdFile.Definition.Scopes.Select(x => new VcdScopeModel(x)));
+            Scopes.AddRange(_vcdFile.Definition.Scopes.Where(x => x.Signals.Any() || x.Scopes.Any()).Select(x => new VcdScopeModel(x)));
 
             progress.ProgressChanged += (o, i) =>
             {

diff --git a/src/OneWare.WaveFormViewer/ViewModels/WaveFormViewModel.cs b/src/OneWare.WaveFormViewer/ViewModels/WaveFormViewModel.cs
@@ -13,7 +13,7 @@ namespace OneWare.WaveFormViewer.ViewModels;
 public class WaveFormViewModel : ObservableObject
 {
     private static readonly IBrush[] WaveColors =
-        { Brushes.Lime, Brushes.Magenta, Brushes.Yellow, Brushes.CornflowerBlue };
+        { Brushes.Lime, Brushes.Aqua, Brushes.Magenta, Brushes.Yellow};
 
     public ObservableCollection<WaveModel> Signals { get; } = new();