Merge branch 'main' into issue-339

Author: bparks13

Directory.Build.props

@@ -13,7 +13,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <UseArtifactsOutput>true</UseArtifactsOutput>
     <PackageIcon>icon.png</PackageIcon>
-    <VersionPrefix>0.6.1</VersionPrefix>
+    <VersionPrefix>0.7.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <LangVersion>10.0</LangVersion>
     <Features>strict</Features>

OpenEphys.Onix1.Design/Bno055Dialog.cs

@@ -14,7 +14,7 @@ namespace OpenEphys.Onix1.Design
     /// Within, there are a number of useful methods for initializing, resizing, and drawing channels.
     /// Each device must implement their own ChannelConfigurationDialog.
     /// </summary>
-    public abstract partial class ChannelConfigurationDialog : Form
+    public partial class ChannelConfigurationDialog : Form
     {
         internal event EventHandler OnResizeZedGraph;
         internal event EventHandler OnDrawProbeGroup;
@@ -25,6 +25,12 @@ public abstract partial class ChannelConfigurationDialog : Form
 
         internal readonly bool[] SelectedContacts = null;
 
+        [Obsolete("Designer only.", true)]
+        ChannelConfigurationDialog()
+        {
+            InitializeComponent();
+        }
+
         /// <summary>
         /// Constructs the dialog window using the given probe group, and plots all contacts after loading.
         /// </summary>
@@ -85,7 +91,10 @@ public ChannelConfigurationDialog(ProbeGroup probeGroup)
         /// </code>
         /// </example>
         /// <returns>Returns an object that inherits from <see cref="ProbeInterface.NET.ProbeGroup"/></returns>
-        internal abstract ProbeGroup DefaultChannelLayout();
+        internal virtual ProbeGroup DefaultChannelLayout()
+        {
+            throw new NotImplementedException();
+        }
 
         internal virtual void LoadDefaultChannelLayout()
         {

OpenEphys.Onix1.Design/ChannelConfigurationDialog.Designer.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using System.Reflection;
 using Newtonsoft.Json;
 
 namespace OpenEphys.Onix1.Design
@@ -95,7 +96,7 @@ public static IEnumerable<Control> GetTopLevelControls(this Control root)
         /// </summary>
         /// <param name="thisForm"></param>
         /// <param name="childForm"></param>
-        public static void AddMenuItemsFromDialogToFileOption(this Form thisForm, Form childForm)
+        public static Form AddMenuItemsFromDialogToFileOption(this Form thisForm, Form childForm)
         {
             const string FileString = "File";
 
@@ -130,6 +131,8 @@ public static void AddMenuItemsFromDialogToFileOption(this Form thisForm, Form c
                     }
                 }
             }
+
+            return thisForm;
         }
 
         /// <summary>
@@ -139,7 +142,7 @@ public static void AddMenuItemsFromDialogToFileOption(this Form thisForm, Form c
         /// <param name="thisForm"></param>
         /// <param name="childForm"></param>
         /// <param name="subMenuName"></param>
-        public static void AddMenuItemsFromDialogToFileOption(this Form thisForm, Form childForm, string subMenuName)
+        public static Form AddMenuItemsFromDialogToFileOption(this Form thisForm, Form childForm, string subMenuName)
         {
             const string FileString = "File";
 
@@ -181,6 +184,58 @@ public static void AddMenuItemsFromDialogToFileOption(this Form thisForm, Form c
 
                 thisFileMenuItem.DropDownItems.Add(newChildMenuItems);
             }
+
+            return thisForm;
+        }
+
+        public static Form AddDialogToTab(this Form form, TabPage tabPage)
+        {
+            tabPage.Controls.Add(form);
+            form.Show();
+
+            return form;
+        }
+
+        public static Form AddDialogToPanel(this Form form, Panel panel)
+        {
+            panel.Controls.Add(form);
+            form.Show();
+
+            return form;
+        }
+
+        public static Form SetChildFormProperties(this Form child, Form parent)
+        {
+            child.TopLevel = false;
+            child.FormBorderStyle = FormBorderStyle.None;
+            child.Dock = DockStyle.Fill;
+            child.Parent = parent;
+
+            return child;
+        }
+
+        internal static readonly IEnumerable<string> PropertiesToIgnore = new[] { "DeviceName", "DeviceAddress" };
+
+        public static void CopyProperties<T>(T source, T target, IEnumerable<string> propertiesToIgnore = null) where T : class
+        {
+            if (source == null || target == null)
+                throw new NullReferenceException("Null objects cannot have their properties copied from/to.");
+
+            var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+
+            propertiesToIgnore ??= Array.Empty<string>();
+
+            foreach (var property in properties)
+            {
+                if (propertiesToIgnore.Contains(property.Name))
+                    continue;
+
+                if (property.CanRead && property.CanWrite)
+                {
+                    var value = property.GetValue(source);
+                    property.SetValue(target, value);
+                }
+            }
         }
     }
 }

OpenEphys.Onix1.Design/ChannelConfigurationDialog.cs

@@ -1,19 +1,40 @@
-using System.Windows.Forms;
+using System;
+using System.Windows.Forms;
 
 namespace OpenEphys.Onix1.Design
 {
     /// <summary>
     /// Abstract form that implements a very basic GUI consisting of a single property grid and
     /// two buttons (OK / Cancel).
     /// </summary>
-    public abstract partial class GenericDeviceDialog : Form
+    public partial class GenericDeviceDialog : Form
     {
+        internal object Device
+        {
+            get => propertyGrid.SelectedObject;
+            set => propertyGrid.SelectedObject = value;
+        }
+
         /// <summary>
         /// Initializes a new instance of <see cref="GenericDeviceDialog"/>.
         /// </summary>
-        public GenericDeviceDialog()
+        public GenericDeviceDialog(object device)
         {
             InitializeComponent();
+
+            Shown += FormShown;
+            Device = device;
+        }
+
+        void FormShown(object sender, EventArgs e)
+        {
+            if (!TopLevel)
+            {
+                tableLayoutPanel1.Controls.Remove(flowLayoutPanel1);
+                tableLayoutPanel1.RowCount = 1;
+
+                MaximumSize = new System.Drawing.Size(0, 0);
+            }
         }
     }
 }