From b07318588aa7e7223a2dca08e267448a7477f6b4 Mon Sep 17 00:00:00 2001 From: bparks13 Date: Wed, 20 Aug 2025 11:21:39 -0400 Subject: [PATCH] Mark AxisMap and AxisSign as not browsable - Remove PolledBno055 TypeConverter, as it is no longer needed - Fix PolledBno055Dialog title --- .../PolledBno055Dialog.Designer.cs | 4 ++-- .../ConfigureHeadstageNeuropixelsV1e.cs | 2 +- .../ConfigureHeadstageNeuropixelsV1f.cs | 2 +- .../ConfigureHeadstageNeuropixelsV2e.cs | 2 +- .../ConfigureHeadstageNeuropixelsV2eBeta.cs | 2 +- OpenEphys.Onix1/ConfigurePolledBno055.cs | 20 ++----------------- OpenEphys.Onix1/ConfigureUclaMiniscopeV4.cs | 2 +- 7 files changed, 9 insertions(+), 25 deletions(-) diff --git a/OpenEphys.Onix1.Design/PolledBno055Dialog.Designer.cs b/OpenEphys.Onix1.Design/PolledBno055Dialog.Designer.cs index 9c47b505..a440c3e1 100644 --- a/OpenEphys.Onix1.Design/PolledBno055Dialog.Designer.cs +++ b/OpenEphys.Onix1.Design/PolledBno055Dialog.Designer.cs @@ -31,9 +31,9 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "NeuropixelsV1eBno055Dialog"; + this.Text = "Bno055Dialog"; } #endregion } -} \ No newline at end of file +} diff --git a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1e.cs b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1e.cs index 683334ee..768c9d84 100644 --- a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1e.cs +++ b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1e.cs @@ -50,7 +50,7 @@ public ConfigureHeadstageNeuropixelsV1e() /// Gets or sets the Bno055 9-axis inertial measurement unit configuration. /// [Category(DevicesCategory)] - [TypeConverter(typeof(PolledBno055SingleDeviceFactoryConverter))] + [TypeConverter(typeof(SingleDeviceFactoryConverter))] [Description("Specifies the configuration for the Bno055 device.")] public ConfigurePolledBno055 Bno055 { get; set; } = new ConfigurePolledBno055 { AxisMap = Bno055AxisMap.YZX, AxisSign = Bno055AxisSign.MirrorX | Bno055AxisSign.MirrorZ }; diff --git a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1f.cs b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1f.cs index 422581c6..9fde2bc8 100644 --- a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1f.cs +++ b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1f.cs @@ -60,7 +60,7 @@ public ConfigureHeadstageNeuropixelsV1f() /// Gets or sets the Bno055 9-axis inertial measurement unit configuration. /// [Category(DevicesCategory)] - [TypeConverter(typeof(PolledBno055SingleDeviceFactoryConverter))] + [TypeConverter(typeof(SingleDeviceFactoryConverter))] [Description("Specifies the configuration for the Bno055 device.")] public ConfigureBno055 Bno055 { get; set; } = new(); diff --git a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2e.cs b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2e.cs index 251cdfe6..fd67ef0d 100644 --- a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2e.cs +++ b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2e.cs @@ -49,7 +49,7 @@ public ConfigureHeadstageNeuropixelsV2e() /// Gets or sets the Bno055 9-axis inertial measurement unit configuration. /// [Category(DevicesCategory)] - [TypeConverter(typeof(PolledBno055SingleDeviceFactoryConverter))] + [TypeConverter(typeof(SingleDeviceFactoryConverter))] [Description("Specifies the configuration for the Bno055 device.")] public ConfigurePolledBno055 Bno055 { get; set; } = new ConfigurePolledBno055 { AxisMap = Bno055AxisMap.YZX, AxisSign = Bno055AxisSign.MirrorX | Bno055AxisSign.MirrorY }; diff --git a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2eBeta.cs b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2eBeta.cs index 9180891e..08e28bec 100644 --- a/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2eBeta.cs +++ b/OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2eBeta.cs @@ -49,7 +49,7 @@ public ConfigureHeadstageNeuropixelsV2eBeta() /// Gets or sets the Bno055 9-axis inertial measurement unit configuration. /// [Category(DevicesCategory)] - [TypeConverter(typeof(PolledBno055SingleDeviceFactoryConverter))] + [TypeConverter(typeof(SingleDeviceFactoryConverter))] [Description("Specifies the configuration for the Bno055 device.")] public ConfigurePolledBno055 Bno055 { get; set; } = new ConfigurePolledBno055 { AxisMap = Bno055AxisMap.YZX, AxisSign = Bno055AxisSign.MirrorX | Bno055AxisSign.MirrorY }; diff --git a/OpenEphys.Onix1/ConfigurePolledBno055.cs b/OpenEphys.Onix1/ConfigurePolledBno055.cs index 1f318fea..9cf299e1 100644 --- a/OpenEphys.Onix1/ConfigurePolledBno055.cs +++ b/OpenEphys.Onix1/ConfigurePolledBno055.cs @@ -62,6 +62,7 @@ public ConfigurePolledBno055(ConfigurePolledBno055 configurePolledBno055) /// [Category(ConfigurationCategory)] [Description("Specifies the axis map that will be applied during configuration.")] + [Browsable(false)] public Bno055AxisMap AxisMap { get; set; } = Bno055AxisMap.XYZ; /// @@ -74,6 +75,7 @@ public ConfigurePolledBno055(ConfigurePolledBno055 configurePolledBno055) /// [Category(ConfigurationCategory)] [Description("Specifies axis sign that will be applied during configuration.")] + [Browsable(false)] public Bno055AxisSign AxisSign { get; set; } = Bno055AxisSign.Default; /// @@ -229,24 +231,6 @@ public enum Bno055AxisSign : uint MirrorX = 0b00000_100, } - // NB: Can be used to remove axis map and sign properties from MultiDeviceFactories that include a - // ConfigurePolledBno055 when having those options would cause confusion and potential - // commutator malfunction - internal class PolledBno055SingleDeviceFactoryConverter : SingleDeviceFactoryConverter - { - public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes) - { - var properties = (from property in base.GetProperties(context, value, attributes).Cast() - where !property.IsReadOnly && - !(property.PropertyType == typeof(Bno055AxisMap)) && - !(property.PropertyType == typeof(Bno055AxisSign)) && - property.ComponentType != typeof(SingleDeviceFactory) - select property) - .ToArray(); - return new PropertyDescriptorCollection(properties).Sort(properties.Select(p => p.Name).ToArray()); - } - } - /// [Obsolete("This operator is obsolete. Use ConfigurePolledBno055 instead. Will be removed in version 1.0.0.")] public class ConfigureNeuropixelsV1eBno055 : ConfigurePolledBno055 diff --git a/OpenEphys.Onix1/ConfigureUclaMiniscopeV4.cs b/OpenEphys.Onix1/ConfigureUclaMiniscopeV4.cs index 7e20a19f..b2df4ec6 100644 --- a/OpenEphys.Onix1/ConfigureUclaMiniscopeV4.cs +++ b/OpenEphys.Onix1/ConfigureUclaMiniscopeV4.cs @@ -47,7 +47,7 @@ public ConfigureUclaMiniscopeV4() /// Gets or sets the Bno055 9-axis inertial measurement unit configuration. /// [Category(DevicesCategory)] - [TypeConverter(typeof(PolledBno055SingleDeviceFactoryConverter))] + [TypeConverter(typeof(SingleDeviceFactoryConverter))] [Description("Specifies the configuration for the Bno055 device.")] public ConfigurePolledBno055 Bno055 { get; set; } = new ConfigurePolledBno055 { AxisMap = Bno055AxisMap.ZYX, AxisSign = Bno055AxisSign.MirrorZ };