Merge pull request #518 from open-ephys/patch-estim-dialog

Update ElectricalStimulator dialog to match OpticalStimulator behavior

Author: jonnew

OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorOptions.Designer.cs

@@ -37,5 +37,21 @@ public Headstage64ElectricalStimulatorOptions(ConfigureHeadstage64ElectricalStim
             textBoxTrainBurstCount.Text = electricalStimulator.TrainBurstCount.ToString();
             textBoxTrainDelay.Text = electricalStimulator.TriggerDelay.ToString();
         }
+
+        void BurstPulseCountChanged(object sender, System.EventArgs e)
+        {
+            if (int.TryParse(textBoxBurstPulseCount.Text, out int result))
+            {
+                textBoxPulsePeriod.Enabled = result > 1;
+            }
+        }
+
+        void TrainBurstCountChanged(object sender, System.EventArgs e)
+        {
+            if (int.TryParse(textBoxTrainBurstCount.Text, out int result))
+            {
+                textBoxInterBurstInterval.Enabled = result > 1;
+            }
+        }
     }
 }

OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorOptions.cs

@@ -231,13 +231,9 @@ static bool AnyCurrentIsSet(ConfigureHeadstage64ElectricalStimulator sequence)
                 SetTextBoxBackgroundError(StimulusSequenceOptions.textBoxPhaseTwoDuration);
                 return false;
             }
-            else if (AnyCurrentIsSet(electricalStimulator) && electricalStimulator.InterPulseInterval == 0)
-            {
-                reason = "Pulse period has not been set.";
-                SetTextBoxBackgroundError(StimulusSequenceOptions.textBoxPulsePeriod);
-                return false;
-            }
-            else if (AnyCurrentIsSet(electricalStimulator) && electricalStimulator.InterPulseInterval < electricalStimulator.PhaseOneDuration + electricalStimulator.InterPhaseInterval + electricalStimulator.PhaseTwoDuration)
+            else if (AnyCurrentIsSet(electricalStimulator) && electricalStimulator.BurstPulseCount > 1
+                && (electricalStimulator.InterPulseInterval == 0
+                   || electricalStimulator.InterPulseInterval < electricalStimulator.PhaseOneDuration + electricalStimulator.InterPhaseInterval + electricalStimulator.PhaseTwoDuration))
             {
                 reason = "Pulse period is too short.";
                 SetTextBoxBackgroundError(StimulusSequenceOptions.textBoxPulsePeriod);

OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorSequenceDialog.cs

@@ -49,5 +49,21 @@ internal void UpdateSequenceParameters(ConfigureHeadstage64OpticalStimulator opt
 
         internal readonly double channelOneScalingFactor;
         internal readonly double channelTwoScalingFactor;
+
+        void PulsesPerBurstChanged(object sender, System.EventArgs e)
+        {
+            if (int.TryParse(textBoxPulsesPerBurst.Text, out int result))
+            {
+                textBoxPulsePeriod.Enabled = result > 1;
+            }
+        }
+
+        void BurstsPerTrainChanged(object sender, System.EventArgs e)
+        {
+            if (int.TryParse(textBoxBurstsPerTrain.Text, out int result))
+            {
+                textBoxInterBurstInterval.Enabled = result > 1;
+            }
+        }
     }
 }

OpenEphys.Onix1.Design/Headstage64OpticalStimulatorOptions.Designer.cs

@@ -100,22 +100,12 @@ public Headstage64OpticalStimulatorSequenceDialog(ConfigureHeadstage64OpticalSti
                 { StimulusSequenceOptions.textBoxPulsesPerBurst,
                     new TextBoxBinding<uint>(
                         StimulusSequenceOptions.textBoxPulsesPerBurst,
-                        value =>
-                        {
-                            OpticalStimulator.PulsesPerBurst = value;
-                            StimulusSequenceOptions.textBoxPulsePeriod.Enabled = OpticalStimulator.PulsesPerBurst > 1;
-                            return OpticalStimulator.PulsesPerBurst;
-                        },
+                        value => { OpticalStimulator.PulsesPerBurst = value; return OpticalStimulator.PulsesPerBurst; },
                         uint.Parse) },
                 { StimulusSequenceOptions.textBoxBurstsPerTrain,
                     new TextBoxBinding<uint>(
                         StimulusSequenceOptions.textBoxBurstsPerTrain,
-                        value =>
-                        {
-                            OpticalStimulator.BurstsPerTrain = value;
-                            StimulusSequenceOptions.textBoxInterBurstInterval.Enabled = OpticalStimulator.BurstsPerTrain > 1;
-                            return OpticalStimulator.BurstsPerTrain;
-                        },
+                        value => { OpticalStimulator.BurstsPerTrain = value; return OpticalStimulator.BurstsPerTrain; },
                         uint.Parse) }
             };
 
@@ -180,7 +170,7 @@ void TextBoxChanged(object sender, EventArgs e)
                 }
                 else
                 {
-                    throw new NotImplementedException($"No valid text box found when updating parameters in {nameof(Headstage64ElectricalStimulatorSequenceDialog)}");
+                    throw new NotImplementedException($"No valid text box found when updating parameters in {nameof(Headstage64OpticalStimulatorSequenceDialog)}");
                 }
 
                 SetTextBoxBackgroundDefault(textBox);