vhdl nodeprovider

one-ware · Nov 12, 2023 · 0c9a828 · 0c9a828
1 parent c3aad91
commit 0c9a828
Show file tree

Hide file tree

Showing 19 changed files with 296 additions and 45 deletions.
diff --git a/demo/OneWare.Demo/DemoApp.cs b/demo/OneWare.Demo/DemoApp.cs
@@ -57,13 +57,12 @@ public override void Initialize()
     protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
     {
         base.ConfigureModuleCatalog(moduleCatalog);
+        moduleCatalog.AddModule<UniversalFpgaProjectSystemModule>();
         moduleCatalog.AddModule<VhdlModule>();
         moduleCatalog.AddModule<VerilogModule>();
         moduleCatalog.AddModule<JsonModule>();
         moduleCatalog.AddModule<TomlModule>();
         moduleCatalog.AddModule<VcdViewerModule>();
-        moduleCatalog.AddModule<UniversalFpgaProjectSystemModule>();
-
         moduleCatalog.AddModule<IceBreakerModule>();
     }
 }
diff --git a/src/OneWare.Core/Services/Paths.cs b/src/OneWare.Core/Services/Paths.cs
@@ -39,7 +39,7 @@ public Paths(string appName, string appIconPath)
         Directory.CreateDirectory(CrashReportsDirectory);
         Directory.CreateDirectory(ProjectsDirectory);
         //...
-        
+
         var sessionsDir = Path.Combine(TempDirectory, "OneWare", "Sessions");
         CleanupSessions(sessionsDir);
 
@@ -53,7 +53,6 @@ public Paths(string appName, string appIconPath)
 
     private static void CleanupSessions(string sessionsDir)
     {
-        //Cleanup
         try
         {
             if (Directory.Exists(sessionsDir))

diff --git a/src/OneWare.Core/Styles/Icons.axaml b/src/OneWare.Core/Styles/Icons.axaml
diff --git a/src/OneWare.ProjectExplorer/Views/ProjectExplorerView.axaml b/src/OneWare.ProjectExplorer/Views/ProjectExplorerView.axaml
@@ -80,6 +80,18 @@
                         <Grid VerticalAlignment="Center">
                             <Image Height="16" Width="16"
                                    Source="{Binding Icon}" />
+                            <ItemsControl ItemsSource="{Binding IconOverlays}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <Panel/>
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Image Source="{Binding }"/>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
                             <Image Height="16" Width="16"
                                    Source="{DynamicResource VsImageLib.StatusCriticalErrorOverlayExp16X}"
                                    IsVisible="{Binding LoadingFailed}" />

diff --git a/src/OneWare.ProjectSystem/Models/ProjectEntry.cs b/src/OneWare.ProjectSystem/Models/ProjectEntry.cs
@@ -39,6 +39,8 @@ public IImage? Icon
         get => _icon;
         set => SetProperty(ref _icon, value);
     }
+
+    public ObservableCollection<IImage> IconOverlays { get; } = new();
 
     private string _header;
     public string Header

diff --git a/src/OneWare.ProjectSystem/Models/ProjectRoot.cs b/src/OneWare.ProjectSystem/Models/ProjectRoot.cs
@@ -28,12 +28,12 @@ protected ProjectRoot(string rootFolderPath) : base(Path.GetFileName(rootFolderP
         TopFolder = this;
     }
 
-    internal void RegisterEntry(IProjectEntry entry)
+    public virtual void RegisterEntry(IProjectEntry entry)
     {
         if(entry is ProjectFile file) Files.Add(file);
     }
 
-    internal void UnregisterEntry(IProjectEntry entry)
+    public virtual void UnregisterEntry(IProjectEntry entry)
     {
         if (entry is ProjectFile file) Files.Remove(file);
     }

diff --git a/src/OneWare.Shared/Models/IProjectEntry.cs b/src/OneWare.Shared/Models/IProjectEntry.cs
@@ -13,6 +13,8 @@ public interface IProjectEntry : IHasPath
 
     public IImage Icon { get; }
 
+    public ObservableCollection<IImage> IconOverlays { get; }
+
     public bool IsExpanded { get; set; }
 
     public IBrush Background { get; set; }

diff --git a/src/OneWare.UniversalFpgaProjectSystem/INodeProvider.cs b/src/OneWare.UniversalFpgaProjectSystem/INodeProvider.cs
@@ -0,0 +1,9 @@
+using OneWare.Shared.Models;
+using OneWare.UniversalFpgaProjectSystem.Models;
+
+namespace OneWare.UniversalFpgaProjectSystem;
+
+public interface INodeProvider
+{
+    public IEnumerable<NodeModel> ExtractNodes(IProjectFile file);
+}
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModelBase.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModelBase.cs
@@ -19,6 +19,9 @@ public abstract class FpgaModelBase : ObservableObject
 
     public Dictionary<string, FpgaPinModel> Pins { get; } = new();
     public ObservableCollection<FpgaPinModel> VisiblePins { get; } = new();
+
+    public Dictionary<string, NodeModel> Nodes { get; } = new();
+    public ObservableCollection<NodeModel> VisibleNodes { get; } = new();
 
 
     private FpgaPinModel? _selectedPin;

diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/UniversalFpgaProjectRoot.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/UniversalFpgaProjectRoot.cs
@@ -1,6 +1,10 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;
+using Avalonia.Styling;
 using OneWare.ProjectSystem.Models;
 using OneWare.Shared.Converters;
 using OneWare.Shared.Helpers;
@@ -20,14 +24,46 @@ public class UniversalFpgaProjectRoot : ProjectRoot, IProjectRootWithFile
     public string ProjectFilePath { get; }
     public JsonObject Properties { get; }
 
+    private readonly IImage _topEntityOverlay;
+
+    private IProjectEntry? _topEntity;
+
+    public IProjectEntry? TopEntity
+    {
+        get => _topEntity;
+        set
+        {
+            _topEntity?.IconOverlays.Remove(_topEntityOverlay);
+            SetProperty(ref _topEntity, value);
+            _topEntity?.IconOverlays.Add(_topEntityOverlay);
+
+            if (_topEntity != null)
+                Properties[nameof(TopEntity)] = _topEntity.RelativePath;
+            else
+                Properties.Remove(nameof(TopEntity));
+        }
+    }
+
     public UniversalFpgaProjectRoot(string projectFilePath, JsonObject properties) : base(Path.GetDirectoryName(projectFilePath) ?? throw new NullReferenceException("Invalid Project Path"))
     {
         ProjectFilePath = projectFilePath;
         Properties = properties;
 
+        _topEntityOverlay = Application.Current!.FindResource(ThemeVariant.Dark, "VsImageLib2019.DownloadOverlay16X") as IImage 
+                            ?? throw new NullReferenceException("TopEntity Icon");
+
         Icon = SharedConverters.PathToBitmapConverter.Convert(ContainerLocator.Container.Resolve<IPaths>().AppIconPath, typeof(Bitmap), null, null) as Bitmap;
     }
-
+
+    public override void UnregisterEntry(IProjectEntry entry)
+    {
+        if (entry == TopEntity)
+        {
+            TopEntity = null;
+        }
+        base.UnregisterEntry(entry);
+    }
+
     public override bool IsPathIncluded(string relativePath)
     {
         var includes = Properties["Include"].Deserialize<string[]>();

diff --git a/src/OneWare.UniversalFpgaProjectSystem/Services/NodeProviderService.cs b/src/OneWare.UniversalFpgaProjectSystem/Services/NodeProviderService.cs
@@ -0,0 +1,24 @@
+namespace OneWare.UniversalFpgaProjectSystem.Services;
+
+public class NodeProviderService
+{
+    private readonly Dictionary<string, INodeProvider> _providers = new();
+
+    public NodeProviderService()
+    {
+        Console.WriteLine("?");
+    }
+
+    public void RegisterNodeProvider(INodeProvider provider, params string[] extensions)
+    {
+        foreach (var ext in extensions)
+        {
+            _providers[ext] = provider;
+        }
+    }
+
+    public INodeProvider? GetNodeProvider(string extension)
+    {
+        return _providers.TryGetValue(extension, out var provider) ? provider : null;
+    }
+}
diff --git a/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectManager.cs b/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectManager.cs
@@ -36,10 +36,18 @@ await _windowService.ShowDialogAsync(new UniversalFpgaProjectCreatorView()
     public async Task<IProjectRoot?> LoadProjectAsync(string path)
     {
         var root = await UniversalFpgaProjectParser.DeserializeAsync(path);
+
+        if (root == null) return root;
 
-        if(root != null)
-            ProjectHelper.ImportEntries(root.FullPath, root);
+        ProjectHelper.ImportEntries(root.FullPath, root);
 
+        //Load Properties
+        var top = root.Properties["TopEntity"];
+        if (top != null && root.Search(top.ToString()) is {} entity)
+        {
+            root.TopEntity = entity;
+        }
+
         return root;
     }
 
@@ -71,6 +79,30 @@ public IEnumerable<MenuItemModel> ConstructContextMenu(IProjectEntry entry)
                     Command = new AsyncRelayCommand(() => _dockService.OpenFileAsync(_projectExplorerService.GetTemporaryFile(root.ProjectFilePath))),
                 };
                 break;
+            case IProjectFile { Root: UniversalFpgaProjectRoot universalFpgaProjectRoot } file:
+                if (universalFpgaProjectRoot.TopEntity == file)
+                {
+                    yield return new MenuItemModel("Unset Top Entity")
+                    {
+                        Header = $"Unset Top Entity",
+                        Command = new RelayCommand(() =>
+                        {
+                            universalFpgaProjectRoot.TopEntity = null;
+                        }),
+                    };
+                }
+                else
+                {
+                    yield return new MenuItemModel("Set Top Entity")
+                    {
+                        Header = $"Set Top Entity",
+                        Command = new RelayCommand(() =>
+                        {
+                            universalFpgaProjectRoot.TopEntity = file;
+                        }),
+                    };
+                }
+                break;
         }
     }
 }
diff --git a/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectSystemModule.cs b/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectSystemModule.cs
@@ -22,6 +22,7 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
     {
         containerRegistry.RegisterSingleton<UniversalFpgaProjectManager>();
         containerRegistry.RegisterSingleton<FpgaService>();
+        containerRegistry.RegisterSingleton<NodeProviderService>();
     }
 
     public void OnInitialized(IContainerProvider containerProvider)

diff --git a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCompileViewModel.cs b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCompileViewModel.cs
@@ -1,6 +1,8 @@
 using System.Collections.ObjectModel;
+using AvaloniaEdit.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 using OneWare.Shared.Controls;
+using OneWare.Shared.Models;
 using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Services;
 using OneWare.UniversalFpgaProjectSystem.Views;
@@ -28,13 +30,23 @@ public bool HideExtensions
         set => SetProperty(ref _hideExtensions, value);
     }
 
-    public UniversalFpgaProjectCompileViewModel(FpgaService fpgaService, UniversalFpgaProjectRoot project)
+    public UniversalFpgaProjectCompileViewModel(FpgaService fpgaService, NodeProviderService nodeProviderService, UniversalFpgaProjectRoot project)
     {
         _project = project;
 
         FpgaModels = fpgaService.FpgaModels;
 
         SelectedFpga = FpgaModels.FirstOrDefault();
+
+        if (project.TopEntity is IProjectFile file)
+        {
+            var provider = nodeProviderService.GetNodeProvider(file.Extension);
+            if (provider is not null)
+            {
+                var nodes = provider.ExtractNodes(file);
+                SelectedFpga?.VisibleNodes.AddRange(nodes);
+            }
+        }
     }
 
     public async Task SaveAsync(FlexibleWindow window)

diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml
@@ -41,17 +41,18 @@
                                     IsVisible="{Binding Converter={x:Static converters:SharedConverters.ViewFoundConverter}}"
                                     Content="{Binding }" />
 
-                    <Border BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderLowBrush}" Background="{DynamicResource ThemeControlLowBrush}">
-                        <DockPanel >
+                    <Grid ColumnDefinitions="*, 100, *" RowDefinitions="Auto, *" DockPanel.Dock="Top">
+                        <TextBlock Text="Nodes"></TextBlock>
+                        <Border Grid.Column="0" Grid.Row="1" Background="{DynamicResource ThemeControlLowBrush}" BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderLowBrush}">
+                        <DockPanel Background="{DynamicResource ThemeControlLowBrush}">
                             <controls:SearchBox DockPanel.Dock="Top" VerticalAlignment="Center"
                                                 Background="{DynamicResource ThemeBackgroundBrush}"
                                                 VerticalContentAlignment="Center" />
-
-                            <ListBox DockPanel.Dock="Top" AutoScrollToSelectedItem="True"
+                            <ListBox AutoScrollToSelectedItem="True"
                                      ScrollViewer.VerticalScrollBarVisibility="Visible"
                                      BorderThickness="0,1,0,0" BorderBrush="{DynamicResource ThemeBorderLowBrush}"
-                                     Name="SignalList" ItemsSource="{Binding VisiblePins}"
-                                     SelectedItem="{Binding Path=SelectedPin, Mode=TwoWay}" VerticalAlignment="Stretch">
+                                     Name="SignalList" ItemsSource="{Binding VisibleNodes}"
+                                     SelectedItem="{Binding Path=SelectedNode, Mode=TwoWay}" VerticalAlignment="Stretch">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <DockPanel>
@@ -61,7 +62,41 @@
                                 </ListBox.ItemTemplate>
                             </ListBox>
                         </DockPanel>
-                    </Border>
+                        </Border>
+
+                            <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Background="{DynamicResource ThemeBackgroundBrush}">
+                                <StackPanel Orientation="Vertical" VerticalAlignment="Center" Spacing="15">
+                                    <Button Classes="BorderButton" Height="40" Width="40" CornerRadius="5">
+                                        <Image Source="{DynamicResource VSImageLib2019.Plugged_16x}" Height="25" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Button>
+                                    <Button Classes="BorderButton" Height="40" Width="40" CornerRadius="5">
+                                        <Image Source="{DynamicResource VSImageLib2019.Unplugged_16x}" Height="25" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Button>
+                                </StackPanel>
+                            </Border>
+
+                        <TextBlock Grid.Row="0" Grid.Column="2" Text="Pins"></TextBlock>
+                        <Border Grid.Column="2" Grid.Row="1" Background="{DynamicResource ThemeControlLowBrush}" BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderLowBrush}">
+                            <DockPanel Background="{DynamicResource ThemeControlLowBrush}">
+                                <controls:SearchBox DockPanel.Dock="Top" VerticalAlignment="Center"
+                                                    Background="{DynamicResource ThemeBackgroundBrush}"
+                                                    VerticalContentAlignment="Center" />
+                                <ListBox AutoScrollToSelectedItem="True"
+                                         ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                         BorderThickness="0,1,0,0" BorderBrush="{DynamicResource ThemeBorderLowBrush}"
+                                         Name="PinList" ItemsSource="{Binding VisiblePins}"
+                                         SelectedItem="{Binding Path=SelectedPin, Mode=TwoWay}" VerticalAlignment="Stretch">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <DockPanel>
+                                                <TextBlock Text="{Binding Name}" />
+                                            </DockPanel>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                            </DockPanel>
+                        </Border>
+                        </Grid>
                 </DockPanel>
             </Grid>
         </Border>

diff --git a/src/OneWare.Vhdl/OneWare.Vhdl.csproj b/src/OneWare.Vhdl/OneWare.Vhdl.csproj
@@ -7,6 +7,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\OneWare.Shared\OneWare.Shared.csproj" Private="true" ExcludeAssets="runtime"/>
+        <ProjectReference Include="..\OneWare.UniversalFpgaProjectSystem\OneWare.UniversalFpgaProjectSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>