Skip to content

Fix zoom and channel scaling in Headstage64 dialogs #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bparks13 merged 1 commit into from
Oct 20, 2025
Merged

Fix zoom and channel scaling in Headstage64 dialogs #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OpenEphys.Onix1.Design/GenericStimulusSequenceDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions OpenEphys.Onix1.Design/Headstage64ElectricalStimulatorSequenceDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -299,7 +299,7 @@ internal override PointPairList[] CreateStimulusWaveforms()
{
PointPairList[] waveforms = new PointPairList[NumberOfChannels];

var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps();
var peakToPeak = GetPeakToPeakAmplitudeInMicroAmps() * ChannelScale;

if (ElectricalStimulator != null)
{
Expand Down
4 changes: 2 additions & 2 deletions OpenEphys.Onix1.Design/Headstage64OpticalStimulatorSequenceDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
{
Expand Down