Update look and feel based on work in main

- Ensure reference contacts are correctly highlighted
- Update adc/gain calibration file parsing
- Fix anchors for controls to allow resizing more fluidly
- Add icons to dialogs
- Add zoom in boundary
- Reduce scale bar thickness
- Fix splitter panel distance

Author: bparks13

OpenEphys.Onix1.Design/ChannelConfigurationDialog.cs

@@ -632,10 +632,34 @@ internal virtual void HighlightEnabledContacts()
 
                 foreach (var contact in contactsToEnable)
                 {
-                    var tag = (ContactTag)contact.Tag;
+                    contact.Fill.Color = EnabledContactFill;
+                }
+            }
+
+            HighlightReferenceContacts();
+        }
+
+        internal void HighlightReferenceContacts()
+        {
+            if (ChannelConfiguration == null)
+                return;
 
-                    contact.Fill.Color = ReferenceContacts.Any(x => x == tag.ContactIndex) ? ReferenceContactFill : EnabledContactFill;
+            var contactObjects = zedGraphChannels.GraphPane.GraphObjList.OfType<BoxObj>()
+                                                                        .Where(c => c is not PolyObj);
+
+            var referenceContacts = contactObjects.Where(c =>
+            {
+                if (c.Tag is ContactTag tag)
+                {
+                    return ReferenceContacts.Any(r => tag.ContactIndex == r);
                 }
+
+                return false;
+            });
+
+            foreach (var contact in referenceContacts)
+            {
+                contact.Fill.Color = ReferenceContactFill;
             }
         }
 

OpenEphys.Onix1.Design/NeuropixelsV1eChannelConfigurationDialog.cs

@@ -31,7 +31,6 @@ public partial class NeuropixelsV1eChannelConfigurationDialog : ChannelConfigura
         public NeuropixelsV1eChannelConfigurationDialog(NeuropixelsV1eProbeConfiguration probeConfiguration)
             : base(probeConfiguration.ChannelConfiguration)
         {
-            zedGraphChannels.IsEnableHPan = false;
             zedGraphChannels.ZoomButtons = MouseButtons.None;
             zedGraphChannels.ZoomButtons2 = MouseButtons.None;
 
@@ -41,6 +40,9 @@ public NeuropixelsV1eChannelConfigurationDialog(NeuropixelsV1eProbeConfiguration
 
             ProbeConfiguration = probeConfiguration;
 
+            ZoomInBoundaryX = 400;
+            ZoomInBoundaryY = 400;
+
             HighlightEnabledContacts();
             UpdateContactLabels();
             DrawScale();
@@ -166,7 +168,9 @@ internal override void DrawScale()
 
             var curve = zedGraphChannels.GraphPane.AddCurve(ScalePointsTag, pointList, Color.Black, SymbolType.None);
 
-            curve.Line.Width = zoomedOut ? 2 : 4;
+            const float scaleBarWidth = 1;
+
+            curve.Line.Width = scaleBarWidth;
             curve.Label.IsVisible = false;
             curve.Symbol.IsVisible = false;
         }
@@ -195,10 +199,10 @@ internal override void HighlightEnabledContacts()
 
             foreach (var contact in contactsToEnable)
             {
-                var tag = (ContactTag)contact.Tag;
-
-                contact.Fill.Color = ReferenceContacts.Any(x => x == tag.ContactIndex) ? ReferenceContactFill : EnabledContactFill;
+                contact.Fill.Color = EnabledContactFill;
             }
+
+            HighlightReferenceContacts();
         }
 
         internal override void UpdateContactLabels()

OpenEphys.Onix1.Design/NeuropixelsV1eDialog.Designer.cs

@@ -142,9 +142,10 @@ private void ParseAdcCalibrationFile()
                 {
                     StreamReader adcFile = new(ConfigureNode.AdcCalibrationFile);
 
-                    adcCalibrationSN.Text = ulong.Parse(adcFile.ReadLine()).ToString();
+                    var adcCalibration = NeuropixelsV1Helper.ParseAdcCalibrationFile(adcFile);
 
-                    Adcs = NeuropixelsV1Helper.ParseAdcCalibrationFile(adcFile);
+                    adcCalibrationSN.Text = adcCalibration.SN.ToString();
+                    Adcs = adcCalibration.Adcs;
 
                     dataGridViewAdcs.DataSource = Adcs;
 
@@ -161,10 +162,9 @@ private void ParseGainCalibrationFile()
                 {
                     StreamReader gainCalibrationFile = new(ConfigureNode.GainCalibrationFile);
 
-                    gainCalibrationSN.Text = ulong.Parse(gainCalibrationFile.ReadLine()).ToString();
-
                     var gainCorrection = NeuropixelsV1Helper.ParseGainCalibrationFile(gainCalibrationFile, ConfigureNode.ProbeConfiguration.SpikeAmplifierGain, ConfigureNode.ProbeConfiguration.LfpAmplifierGain);
 
+                    gainCalibrationSN.Text = gainCorrection.SN.ToString();
                     ApGainCorrection = gainCorrection.AP;
                     LfpGainCorrection = gainCorrection.LFP;
 
@@ -359,16 +359,6 @@ private void ButtonClick(object sender, EventArgs e)
                         textBoxGainCalibrationFile.Text = ofd.FileName;
                     }
                 }
-                else if (button.Name == nameof(buttonClearGainCalibrationFile))
-                {
-                    textBoxGainCalibrationFile.Text = "";
-                    ApGainCorrection = default;
-                    LfpGainCorrection = default;
-
-                    panelProbe.Visible = false;
-
-                    CheckStatus();
-                }
                 else if (button.Name == nameof(buttonChooseAdcCalibrationFile))
                 {
                     var ofd = new OpenFileDialog()
@@ -383,14 +373,6 @@ private void ButtonClick(object sender, EventArgs e)
                         textBoxAdcCalibrationFile.Text = ofd.FileName;
                     }
                 }
-                else if (button.Name == nameof(buttonClearAdcCalibrationFile))
-                {
-                    textBoxAdcCalibrationFile.Text = "";
-                    Adcs = null;
-                    dataGridViewAdcs.DataSource = null;
-
-                    CheckStatus();
-                }
                 else if (button.Name == nameof(buttonResetZoom))
                 {
                     ResetZoom();