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

Spectral selection toolbar refinements

Browse Source 
Delete key in center/width spectral selection toolbar works
  Delete key, not - key, in the spectral selection bar maks frequency undefined.
This commit is contained in:
Paul Licameli 2015-07-29 12:11:49 -04:00
commit 910e7f87bd
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/toolbars/SpectralSelectionBar.cpp
View File

@ -146,12 +146,14 @@ void SpectralSelectionBar::Populate()
mCenterCtrl = new NumericTextCtrl( mCenterCtrl = new NumericTextCtrl(
NumericConverter::FREQUENCY, this, OnCenterID, frequencyFormatName, 0.0); NumericConverter::FREQUENCY, this, OnCenterID, frequencyFormatName, 0.0);
mCenterCtrl->SetInvalidValue(SelectedRegion::UndefinedFrequency);
mCenterCtrl->SetName(_("Center Frequency:")); mCenterCtrl->SetName(_("Center Frequency:"));
mCenterCtrl->EnableMenu(); mCenterCtrl->EnableMenu();
subSizer->Add(mCenterCtrl, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5); subSizer->Add(mCenterCtrl, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
mWidthCtrl = new NumericTextCtrl( mWidthCtrl = new NumericTextCtrl(
NumericConverter::BANDWIDTH, this, OnWidthID, bandwidthFormatName, 0.0); NumericConverter::BANDWIDTH, this, OnWidthID, bandwidthFormatName, 0.0);
mWidthCtrl->SetInvalidValue(-1.0);
mWidthCtrl->SetName(wxString(_("Bandwidth:"))); mWidthCtrl->SetName(wxString(_("Bandwidth:")));
mWidthCtrl->EnableMenu(); mWidthCtrl->EnableMenu();
subSizer->Add(mWidthCtrl, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 0); subSizer->Add(mWidthCtrl, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 0);
@ -228,7 +230,11 @@ void SpectralSelectionBar::ModifySpectralSelection(bool done)
if (mbCenterAndWidth) { if (mbCenterAndWidth) {
mCenter = mCenterCtrl->GetValue(); mCenter = mCenterCtrl->GetValue();
mWidth = mWidthCtrl->GetValue(); mWidth = mWidthCtrl->GetValue();
if (mCenter < 0 && mWidth < 0) if ((mCenter < 0 || mWidth < 0) &&
(mLow >= 0 || mHigh >= 0))
// Transition from defined spectral selection to undefined
bottom = top = SelectedRegion::UndefinedFrequency;
else if (mCenter < 0 && mWidth < 0)
bottom = top = SelectedRegion::UndefinedFrequency; bottom = top = SelectedRegion::UndefinedFrequency;
else { else {
if (mCenter < 0) { if (mCenter < 0) {

6
src/widgets/NumericTextCtrl.cpp
View File

@ -1612,7 +1612,7 @@ void NumericTextCtrl::OnCaptureKey(wxCommandEvent &event)
case WXK_TAB: case WXK_TAB:
case WXK_RETURN: case WXK_RETURN:
case WXK_NUMPAD_ENTER: case WXK_NUMPAD_ENTER:
case '-': case WXK_DELETE:
return; return;
default: default:
@ -1635,7 +1635,7 @@ void NumericTextCtrl::OnKeyUp(wxKeyEvent &event)
keyCode -= WXK_NUMPAD0 - '0'; keyCode -= WXK_NUMPAD0 - '0';
if ((keyCode >= '0' && keyCode <= '9') || if ((keyCode >= '0' && keyCode <= '9') ||
(keyCode == '-') || (keyCode == WXK_DELETE) ||
(keyCode == WXK_BACK) || (keyCode == WXK_BACK) ||
(keyCode == WXK_UP) || (keyCode == WXK_UP) ||
(keyCode == WXK_DOWN)) { (keyCode == WXK_DOWN)) {
@ -1680,7 +1680,7 @@ void NumericTextCtrl::OnKeyDown(wxKeyEvent &event)
Updated(); Updated();
} }
else if (!mReadOnly && keyCode == '-') { else if (!mReadOnly && keyCode == WXK_DELETE) {
if (mAllowInvalidValue) if (mAllowInvalidValue)
SetValue(mInvalidValue); SetValue(mInvalidValue);
} }