Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-07 04:01:54 +01:00
Code Issues Releases Wiki Activity

Keep the current note centered when holding control to zoom

Browse Source
This commit is contained in:
Pokechu22
2017-07-04 01:02:43 -07:00
committed by Paul Licameli
parent 776e4dfdab
commit b46abbec62
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/NoteTrack.cpp
View File

@@ -911,22 +911,26 @@ void NoteTrack::VScroll(int start, int end)
SetBottomNote(mStartBottomNote + delta);
}
// Zoom the note track, centering the pitch at centerY,
// positive amounts zoom in; negative amounts zoom out
void NoteTrack::Zoom(const wxRect &rect, int centerY, int amount)
void NoteTrack::Zoom(const wxRect &rect, int y, int amount, bool center)
{
// Construct track rectangle to map pitch to screen coordinates
// Only y and height are needed:
wxRect trackRect(0, rect.GetY(), 1, rect.GetHeight());
PrepareIPitchToY(trackRect);
int centerPitch = YToIPitch(centerY);
int clickedPitch = YToIPitch(y);
// zoom out by changing the pitch height -- a small integer
mPitchHeight += amount;
if (mPitchHeight <= 0) mPitchHeight = 1;
PrepareIPitchToY(trackRect); // update because mPitchHeight changed
int newCenterPitch = YToIPitch(rect.GetY() + rect.GetHeight() / 2);
// center the pitch that the user clicked on
SetBottomNote(mBottomNote + (centerPitch - newCenterPitch));
if (center) {
int newCenterPitch = YToIPitch(rect.GetY() + rect.GetHeight() / 2);
// center the pitch that the user clicked on
SetBottomNote(mBottomNote + (clickedPitch - newCenterPitch));
} else {
int newClickedPitch = YToIPitch(y);
// align to keep the pitch that the user clicked on in the same place
SetBottomNote(mBottomNote + (clickedPitch - newClickedPitch));
}
}
@@ -940,7 +944,7 @@ void NoteTrack::ZoomTo(const wxRect &rect, int start, int end)
int temp = topPitch; topPitch = botPitch; botPitch = temp;
}
if (topPitch == botPitch) { // can't divide by zero, do something else
Zoom(rect, start, 1);
Zoom(rect, start, 1, true);
return;
}
int trialPitchHeight = trackRect.height / (topPitch - botPitch);
@@ -949,7 +953,7 @@ void NoteTrack::ZoomTo(const wxRect &rect, int start, int end)
} else if (trialPitchHeight == 0) {
trialPitchHeight = 1;
}
Zoom(rect, (start + end) / 2, trialPitchHeight - mPitchHeight);
Zoom(rect, (start + end) / 2, trialPitchHeight - mPitchHeight, true);
}
int NoteTrack::YToIPitch(int y)