diff --git a/src/OneWare.UniversalFpgaProjectSystem/Helpers/HardwareGuiCreator.cs b/src/OneWare.UniversalFpgaProjectSystem/Helpers/HardwareGuiCreator.cs index c8e12de9..1484e355 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/Helpers/HardwareGuiCreator.cs +++ b/src/OneWare.UniversalFpgaProjectSystem/Helpers/HardwareGuiCreator.cs @@ -72,6 +72,10 @@ public static async Task CreateGuiAsync(string guiPath, IH var bind = element.TryGetProperty("bind", out var bindProperty) ? bindProperty.GetString() : null; + + var connectorStyle = element.TryGetProperty("connectorStyle", out var connectorStyleProperty) + ? connectorStyleProperty.GetString() + : "default"; switch (element.GetProperty("type").GetString()?.ToLower()) { @@ -157,6 +161,7 @@ public static async Task CreateGuiAsync(string guiPath, IH Rotation = rotation, Bind = bind, Parent = hardwareModel, + ConnectorStyle = connectorStyle }); break; } @@ -168,6 +173,7 @@ public static async Task CreateGuiAsync(string guiPath, IH Rotation = rotation, Bind = bind, Parent = hardwareModel, + ConnectorStyle = connectorStyle }); break; } @@ -178,7 +184,8 @@ public static async Task CreateGuiAsync(string guiPath, IH { Rotation = rotation, Bind = bind, - Parent = hardwareModel + Parent = hardwareModel, + ConnectorStyle = connectorStyle }); break; } diff --git a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/FpgaGuiElements/FpgaGuiElementInterfaceViewModelBase.cs b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/FpgaGuiElements/FpgaGuiElementInterfaceViewModelBase.cs index aff3f640..57690630 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/FpgaGuiElements/FpgaGuiElementInterfaceViewModelBase.cs +++ b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/FpgaGuiElements/FpgaGuiElementInterfaceViewModelBase.cs @@ -7,6 +7,7 @@ namespace OneWare.UniversalFpgaProjectSystem.ViewModels.FpgaGuiElements; public abstract class FpgaGuiElementInterfaceViewModelBase : FpgaGuiElementViewModelBase { + public string? ConnectorStyle { get; init; } public string? Bind { get; init; } private HardwareInterfaceModel? _interfaceModel; diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviHsView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviHsView.axaml index 811b7d51..c9e6c730 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviHsView.axaml +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviHsView.axaml @@ -27,8 +27,8 @@ - - + + @@ -41,6 +41,13 @@ + + diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviLsView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviLsView.axaml index 4dad3cd6..91c2f0e6 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviLsView.axaml +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementCruviLsView.axaml @@ -27,7 +27,7 @@ - + @@ -40,6 +40,13 @@ + + diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml index 00640fa8..9e2d2563 100644 --- a/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml +++ b/src/OneWare.UniversalFpgaProjectSystem/Views/FpgaGuiElements/FpgaGuiElementPmodView.axaml @@ -5,6 +5,7 @@ xmlns:fpgaGuiElements="clr-namespace:OneWare.UniversalFpgaProjectSystem.ViewModels.FpgaGuiElements" xmlns:behaviors="clr-namespace:OneWare.UniversalFpgaProjectSystem.Behaviors" xmlns:fpgaGuiElements1="clr-namespace:OneWare.UniversalFpgaProjectSystem.Views.FpgaGuiElements" + xmlns:converters="clr-namespace:OneWare.Essentials.Converters;assembly=OneWare.Essentials" mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="150" x:Class="OneWare.UniversalFpgaProjectSystem.Views.FpgaGuiElements.FpgaGuiElementPmodView" x:DataType="fpgaGuiElements:FpgaGuiElementPmodViewModel" ClipToBounds="False" @@ -16,53 +17,70 @@ - + + + + - - - - - - - - - - - - - - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +