1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-12 14:47:43 +02:00

Bug1744: Editing of linear frequency scale EQ curve should work

This commit is contained in:
Paul Licameli 2017-09-09 22:51:14 -04:00
parent cee28ab535
commit cc3c56818a
2 changed files with 5 additions and 3 deletions

View File

@ -2851,7 +2851,8 @@ EqualizationPanel::EqualizationPanel(EffectEqualization *effect, wxWindow *paren
mWidth = 0; mWidth = 0;
mHeight = 0; mHeight = 0;
mEditor = std::make_unique<EnvelopeEditor>(*mEffect->mEnvelope, false); mLinEditor = std::make_unique<EnvelopeEditor>(*mEffect->mLinEnvelope, false);
mLogEditor = std::make_unique<EnvelopeEditor>(*mEffect->mLogEnvelope, false);
mEffect->mEnvelope->Flatten(0.); mEffect->mEnvelope->Flatten(0.);
mEffect->mEnvelope->SetTrackLen(1.0); mEffect->mEnvelope->SetTrackLen(1.0);
@ -3073,7 +3074,8 @@ void EqualizationPanel::OnMouseEvent(wxMouseEvent & event)
CaptureMouse(); CaptureMouse();
} }
if (mEditor->MouseEvent(event, mEnvRect, ZoomInfo(0.0, mEnvRect.width), auto &pEditor = (mEffect->mLin ? mLinEditor : mLogEditor);
if (pEditor->MouseEvent(event, mEnvRect, ZoomInfo(0.0, mEnvRect.width),
false, 0.0, false, 0.0,
mEffect->mdBMin, mEffect->mdBMax)) mEffect->mdBMin, mEffect->mdBMax))
{ {

View File

@ -309,7 +309,7 @@ public:
private: private:
wxWindow *mParent; wxWindow *mParent;
EffectEqualization *mEffect; EffectEqualization *mEffect;
std::unique_ptr<EnvelopeEditor> mEditor; std::unique_ptr<EnvelopeEditor> mLinEditor, mLogEditor;
bool mRecalcRequired; bool mRecalcRequired;