Merge pull request #526 from open-ephys/fix-hs64-zoom

bparks13 · web-flow · commit faf6ea1cdb79 · 2025-10-20T17:31:57.000-04:00
Fix zoom and channel scaling in Headstage64 dialogs
diff --git a/OpenEphys.Onix1.Design/GenericStimulusSequenceDialog.cs b/OpenEphys.Onix1.Design/GenericStimulusSequenceDialog.cs
@@ -97,7 +97,7 @@ internal void OnSelect(object sender, EventArgs e)
 
         void OnZoom_Waveform(ZedGraphControl sender, ZoomState oldState, ZoomState newState)
         {
-            if (newState.Type == ZoomState.StateType.WheelZoom)
+            if (newState.Type == ZoomState.StateType.WheelZoom && sender.IsEnableHZoom && sender.IsEnableVZoom)
             {
                 CenterAxesOnCursor(sender);
             }
diff --git a/OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorSequenceDialog.cs b/OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorSequenceDialog.cs
@@ -289,8 +289,8 @@ internal override bool CanCloseForm(out DialogResult result)
 
         internal override double GetPeakToPeakAmplitudeInMicroAmps()
         {
-            var peakToPeak = (Math.Max(Math.Max(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent)
-                          + Math.Abs(Math.Min(Math.Min(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent))) * ChannelScale;
+            var peakToPeak = Math.Max(Math.Max(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent)
+                          + Math.Abs(Math.Min(Math.Min(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent));
 
             return peakToPeak == 0 ? ZeroPeakToPeak : peakToPeak;
         }
@@ -299,7 +299,7 @@ internal override PointPairList[] CreateStimulusWaveforms()
         {
             PointPairList[] waveforms = new PointPairList[NumberOfChannels];
 
-            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();
+            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;
 
             if (ElectricalStimulator != null)
             {
diff --git a/OpenEphys.Onix1.Design/Headstage64OpticalStimulatorSequenceDialog.cs b/OpenEphys.Onix1.Design/Headstage64OpticalStimulatorSequenceDialog.cs
@@ -212,14 +212,14 @@ double GetChannelCurrentScaled(double maxCurrent, double channelPercent, double
 
         internal override double GetPeakToPeakAmplitudeInMicroAmps()
         {
-            return OpticalStimulator.MaxCurrent == 0 ? ZeroPeakToPeak : OpticalStimulator.MaxCurrent * ChannelScale;
+            return OpticalStimulator.MaxCurrent == 0 ? ZeroPeakToPeak : OpticalStimulator.MaxCurrent;
         }
 
         internal override PointPairList[] CreateStimulusWaveforms()
         {
             PointPairList[] waveforms = new PointPairList[NumberOfChannels];
 
-            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();
+            var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;
 
             for (int channel = 0; channel < NumberOfChannels; channel++)
             {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ internal void OnSelect(object sender, EventArgs e)`
`97`	`97`
`98`	`98`	`void OnZoom_Waveform(ZedGraphControl sender, ZoomState oldState, ZoomState newState)`
`99`	`99`	`{`
`100`		`- if (newState.Type == ZoomState.StateType.WheelZoom)`
	`100`	`+ if (newState.Type == ZoomState.StateType.WheelZoom && sender.IsEnableHZoom && sender.IsEnableVZoom)`
`101`	`101`	`{`
`102`	`102`	`CenterAxesOnCursor(sender);`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,8 +289,8 @@ internal override bool CanCloseForm(out DialogResult result)`
`289`	`289`
`290`	`290`	`internal override double GetPeakToPeakAmplitudeInMicroAmps()`
`291`	`291`	`{`
`292`		`- var peakToPeak = (Math.Max(Math.Max(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent)`
`293`		`- + Math.Abs(Math.Min(Math.Min(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent))) * ChannelScale;`
	`292`	`+ var peakToPeak = Math.Max(Math.Max(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent)`
	`293`	`+ + Math.Abs(Math.Min(Math.Min(ElectricalStimulator.PhaseOneCurrent, ElectricalStimulator.PhaseTwoCurrent), ElectricalStimulator.InterPhaseCurrent));`
`294`	`294`
`295`	`295`	`return peakToPeak == 0 ? ZeroPeakToPeak : peakToPeak;`
`296`	`296`	`}`
`@@ -299,7 +299,7 @@ internal override PointPairList[] CreateStimulusWaveforms()`
`299`	`299`	`{`
`300`	`300`	`PointPairList[] waveforms = new PointPairList[NumberOfChannels];`
`301`	`301`
`302`		`- var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();`
	`302`	`+ var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;`
`303`	`303`
`304`	`304`	`if (ElectricalStimulator != null)`
`305`	`305`	`{`
Original file line number	Diff line number	Diff line change
`@@ -212,14 +212,14 @@ double GetChannelCurrentScaled(double maxCurrent, double channelPercent, double`
`212`	`212`
`213`	`213`	`internal override double GetPeakToPeakAmplitudeInMicroAmps()`
`214`	`214`	`{`
`215`		`- return OpticalStimulator.MaxCurrent == 0 ? ZeroPeakToPeak : OpticalStimulator.MaxCurrent * ChannelScale;`
	`215`	`+ return OpticalStimulator.MaxCurrent == 0 ? ZeroPeakToPeak : OpticalStimulator.MaxCurrent;`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`internal override PointPairList[] CreateStimulusWaveforms()`
`219`	`219`	`{`
`220`	`220`	`PointPairList[] waveforms = new PointPairList[NumberOfChannels];`
`221`	`221`
`222`		`- var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();`
	`222`	`+ var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;`
`223`	`223`
`224`	`224`	`for (int channel = 0; channel < NumberOfChannels; channel++)`
`225`	`225`	`{`