Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-03 06:03:13 +02:00
Code Issues Releases Wiki Activity

pop-up menus for vertical ruler

Browse Source
This commit is contained in:
Paul Licameli 2015-06-22 23:56:36 -04:00
parent a1aca5428a
commit 197700967f
2 changed files with 129 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/TrackPanel.cpp
View File

@ -344,6 +344,14 @@ enum {
OnTimeTrackLinID,
OnTimeTrackLogID,
OnTimeTrackLogIntID,
// Reserve an ample block of ids for waveform scale types
OnFirstWaveformScaleID,
OnLastWaveformScaleID = OnFirstWaveformScaleID + 9,
// Reserve an ample block of ids for spectrum scale types
OnFirstSpectrumScaleID,
OnLastSpectrumScaleID = OnFirstSpectrumScaleID + 19,
};
BEGIN_EVENT_TABLE(TrackPanel, wxWindow)
@ -385,6 +393,9 @@ BEGIN_EVENT_TABLE(TrackPanel, wxWindow)
EVT_MENU(OnTimeTrackLinID, TrackPanel::OnTimeTrackLin)
EVT_MENU(OnTimeTrackLogID, TrackPanel::OnTimeTrackLog)
EVT_MENU(OnTimeTrackLogIntID, TrackPanel::OnTimeTrackLogInt)
EVT_MENU_RANGE(OnFirstWaveformScaleID, OnLastWaveformScaleID, TrackPanel::OnWaveformScaleType)
EVT_MENU_RANGE(OnFirstSpectrumScaleID, OnLastSpectrumScaleID, TrackPanel::OnSpectrumScaleType)
END_EVENT_TABLE()
/// Makes a cursor from an XPM, uses CursorId as a fallback.
@ -552,6 +563,8 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
mLabelTrackInfoMenu = NULL;
mTimeTrackMenu = NULL;
mRulerWaveformMenu = mRulerSpectrumMenu = NULL;
BuildMenus();
mTrackArtist = new TrackArtist();
@ -764,6 +777,16 @@ void TrackPanel::BuildMenus(void)
mLabelTrackInfoMenu->Append(OnCopySelectedTextID, _("&Copy"));
mLabelTrackInfoMenu->Append(OnPasteSelectedTextID, _("&Paste"));
mLabelTrackInfoMenu->Append(OnDeleteSelectedLabelID, _("&Delete Label"));
mRulerWaveformMenu = new wxMenu();
BuildVRulerMenuItems
(mRulerWaveformMenu, OnFirstWaveformScaleID,
WaveformSettings::GetScaleNames());
mRulerSpectrumMenu = new wxMenu();
BuildVRulerMenuItems
(mRulerSpectrumMenu, OnFirstSpectrumScaleID,
SpectrogramSettings::GetScaleNames());
}
void TrackPanel::BuildCommonDropMenuItems(wxMenu * menu)
@ -778,6 +801,15 @@ void TrackPanel::BuildCommonDropMenuItems(wxMenu * menu)
}
// static
void TrackPanel::BuildVRulerMenuItems
(wxMenu * menu, int firstId, const wxArrayString &names)
{
int id = firstId;
for (int ii = 0, nn = names.size(); ii < nn; ++ii)
menu->AppendRadioItem(id++, names[ii]);
}
void TrackPanel::DeleteMenus(void)
{
// Note that the submenus (mRateMenu, ...)
@ -806,6 +838,9 @@ void TrackPanel::DeleteMenus(void)
delete mTimeTrackMenu;
mTimeTrackMenu = NULL;
}
delete mRulerWaveformMenu;
delete mRulerSpectrumMenu;
}
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
@ -4610,10 +4645,17 @@ void TrackPanel::HandleVZoomButtonUp( wxMouseEvent & event )
}
#endif
// don't do anything if track is not wave
if (mCapturedTrack->GetKind() != Track::Wave)
return;
if (event.RightUp() &&
!(event.ShiftDown() || event.CmdDown())) {
OnVRulerMenu(mCapturedTrack, &event);
return;
}
WaveTrack *track = static_cast<WaveTrack*>(mCapturedTrack);
WaveTrack *partner = static_cast<WaveTrack *>(mTracks->GetLink(track));
int height = track->GetHeight();
@ -8482,6 +8524,51 @@ void TrackPanel::OnTrackMenu(Track *t)
Refresh(false);
}
void TrackPanel::OnVRulerMenu(Track *t, wxMouseEvent *pEvent)
{
if (!t) {
t = GetFocusedTrack();
if (!t)
return;
}
if (t->GetKind() != Track::Wave)
return;
WaveTrack *const wt = static_cast<WaveTrack*>(t);
const int display = wt->GetDisplay();
wxMenu *theMenu;
if (display == WaveTrack::Waveform) {
theMenu = mRulerWaveformMenu;
const int id =
OnFirstWaveformScaleID + int(wt->GetWaveformSettings().scaleType);
theMenu->Check(id, true);
}
else {
theMenu = mRulerSpectrumMenu;
const int id =
OnFirstSpectrumScaleID + int(wt->GetSpectrogramSettings().scaleType);
theMenu->Check(id, true);
}
int x, y;
if (pEvent)
x = pEvent->m_x, y = pEvent->m_y;
else {
// If no event given, pop up the menu at the same height
// as for the track control menu
const wxRect r = FindTrackRect(wt, true);
wxRect titleRect;
mTrackInfo.GetTitleBarRect(r, titleRect);
x = GetVRulerOffset(), y = titleRect.y + titleRect.height + 1;
}
mPopupMenuTarget = wt;
PopupMenu(theMenu, x, y);
mPopupMenuTarget = NULL;
}
void TrackPanel::OnTrackMute(bool shiftDown, Track *t)
{
if (!t) {
@ -9266,6 +9353,40 @@ void TrackPanel::OnTimeTrackLogInt(wxCommandEvent & /*event*/)
Refresh(false);
}
void TrackPanel::OnWaveformScaleType(wxCommandEvent &evt)
{
WaveTrack *const wt = static_cast<WaveTrack *>(mPopupMenuTarget);
const WaveformSettings::ScaleType newScaleType =
WaveformSettings::ScaleType(
std::max(0,
std::min(int(WaveformSettings::stNumScaleTypes) - 1,
evt.GetId() - OnFirstWaveformScaleID
)));
if (wt->GetWaveformSettings().scaleType != newScaleType) {
wt->GetIndependentWaveformSettings().scaleType = newScaleType;
UpdateVRuler(wt); // Is this really needed?
MakeParentModifyState(true);
Refresh(false);
}
}
void TrackPanel::OnSpectrumScaleType(wxCommandEvent &evt)
{
WaveTrack *const wt = static_cast<WaveTrack *>(mPopupMenuTarget);
const SpectrogramSettings::ScaleType newScaleType =
SpectrogramSettings::ScaleType(
std::max(0,
std::min(int(SpectrogramSettings::stNumScaleTypes) - 1,
evt.GetId() - OnFirstSpectrumScaleID
)));
if (wt->GetSpectrogramSettings().scaleType != newScaleType) {
wt->GetIndependentSpectrogramSettings().scaleType = newScaleType;
UpdateVRuler(wt); // Is this really needed?
MakeParentModifyState(true);
Refresh(false);
}
}
/// Move a track up, down, to top or to bottom.
void TrackPanel::OnMoveTrack(wxCommandEvent &event)

8
src/TrackPanel.h
View File

@ -210,6 +210,7 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel {
virtual void OnTrackGainDec();
virtual void OnTrackGainInc();
virtual void OnTrackMenu(Track *t = NULL);
virtual void OnVRulerMenu(Track *t, wxMouseEvent *pEvent = NULL);
virtual void OnTrackMute(bool shiftdown, Track *t = NULL);
virtual void OnTrackSolo(bool shiftdown, Track *t = NULL);
virtual void OnTrackClose();
@ -244,6 +245,7 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel {
* @param menu the menu to add the commands to.
*/
virtual void BuildCommonDropMenuItems(wxMenu * menu);
static void BuildVRulerMenuItems(wxMenu * menu, int firstId, const wxArrayString &names);
virtual bool IsUnsafe();
virtual bool HandleLabelTrackMouseEvent(LabelTrack * lTrack, wxRect &r, wxMouseEvent & event);
virtual bool HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &r, wxMouseEvent &event);
@ -466,6 +468,9 @@ protected:
virtual void OnTimeTrackLog(wxCommandEvent &event);
virtual void OnTimeTrackLogInt(wxCommandEvent &event);
virtual void OnWaveformScaleType(wxCommandEvent &event);
virtual void OnSpectrumScaleType(wxCommandEvent &event);
virtual void SetMenuCheck( wxMenu & menu, int newId );
virtual void SetRate(Track *pTrack, double rate);
virtual void OnRateChange(wxCommandEvent &event);
@ -825,6 +830,9 @@ protected:
wxMenu *mFormatMenu;
wxMenu *mLabelTrackInfoMenu;
wxMenu *mRulerWaveformMenu;
wxMenu *mRulerSpectrumMenu;
Track *mPopupMenuTarget;
friend class TrackPanelAx;