Merge pull request #483 from open-ephys/issue-314

Mark AxisMap and AxisSign as not browsable

Author: bparks13

OpenEphys.Onix1.Design/PolledBno055Dialog.Designer.cs

@@ -50,7 +50,7 @@ public ConfigureHeadstageNeuropixelsV1e()
         /// Gets or sets the Bno055 9-axis inertial measurement unit configuration.
         /// </summary>
         [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 };

OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1e.cs

@@ -60,7 +60,7 @@ public ConfigureHeadstageNeuropixelsV1f()
         /// Gets or sets the Bno055 9-axis inertial measurement unit configuration.
         /// </summary>
         [Category(DevicesCategory)]
-        [TypeConverter(typeof(PolledBno055SingleDeviceFactoryConverter))]
+        [TypeConverter(typeof(SingleDeviceFactoryConverter))]
         [Description("Specifies the configuration for the Bno055 device.")]
         public ConfigureBno055 Bno055 { get; set; } = new();
 

OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV1f.cs

@@ -49,7 +49,7 @@ public ConfigureHeadstageNeuropixelsV2e()
         /// Gets or sets the Bno055 9-axis inertial measurement unit configuration.
         /// </summary>
         [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 };

OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2e.cs

@@ -49,7 +49,7 @@ public ConfigureHeadstageNeuropixelsV2eBeta()
         /// Gets or sets the Bno055 9-axis inertial measurement unit configuration.
         /// </summary>
         [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 };

OpenEphys.Onix1/ConfigureHeadstageNeuropixelsV2eBeta.cs

@@ -62,6 +62,7 @@ public ConfigurePolledBno055(ConfigurePolledBno055 configurePolledBno055)
         /// </remarks>
         [Category(ConfigurationCategory)]
         [Description("Specifies the axis map that will be applied during configuration.")]
+        [Browsable(false)]
         public Bno055AxisMap AxisMap { get; set; } = Bno055AxisMap.XYZ;
 
         /// <summary>
@@ -74,6 +75,7 @@ public ConfigurePolledBno055(ConfigurePolledBno055 configurePolledBno055)
         /// </remarks>
         [Category(ConfigurationCategory)]
         [Description("Specifies axis sign that will be applied during configuration.")]
+        [Browsable(false)]
         public Bno055AxisSign AxisSign { get; set; } = Bno055AxisSign.Default;
 
         /// <summary>
@@ -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<PropertyDescriptor>()
-                              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());
-        }
-    }
-
     /// <inheritdoc cref = "ConfigurePolledBno055"/>
     [Obsolete("This operator is obsolete. Use ConfigurePolledBno055 instead. Will be removed in version 1.0.0.")]
     public class ConfigureNeuropixelsV1eBno055 : ConfigurePolledBno055

OpenEphys.Onix1/ConfigurePolledBno055.cs

@@ -47,7 +47,7 @@ public ConfigureUclaMiniscopeV4()
         /// Gets or sets the Bno055 9-axis inertial measurement unit configuration.
         /// </summary>
         [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 };