Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Bug 916 - User input not validated in Noise Reduction effect

Browse Source
This commit is contained in:
James Crook 2018-04-09 18:08:43 +01:00
parent 0dd3aef6bc
commit 473a92d28f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/effects/NoiseReduction.cpp
View File

@ -47,6 +47,7 @@
#include "../WaveTrack.h" #include "../WaveTrack.h"
#include "../widgets/ErrorDialog.h" #include "../widgets/ErrorDialog.h"
#include "../widgets/valnum.h"
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
@ -1423,12 +1424,16 @@ struct ControlInfo {
return wxString::Format(format, value); return wxString::Format(format, value);
} }
void CreateControls(int id, wxTextValidator &vld, ShuttleGui &S) const void CreateControls(int id, ShuttleGui &S) const
{ {
FloatingPointValidator<double> vld2(2);// precision.
if (formatAsInt)
vld2.SetPrecision( 0 );
vld2.SetRange( valueMin, valueMax );
wxTextCtrl *const text = wxTextCtrl *const text =
S.Id(id + 1).AddTextBox(textBoxCaption(), wxT(""), 0); S.Id(id + 1).AddTextBox(textBoxCaption(), wxT(""), 0);
S.SetStyle(wxSL_HORIZONTAL); S.SetStyle(wxSL_HORIZONTAL);
text->SetValidator(vld); text->SetValidator(vld2);
wxSlider *const slider = wxSlider *const slider =
S.Id(id).AddSlider( {}, 0, sliderMax); S.Id(id).AddSlider( {}, 0, sliderMax);
@ -1705,10 +1710,9 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
S.StartMultiColumn(3, wxEXPAND); S.StartMultiColumn(3, wxEXPAND);
S.SetStretchyCol(2); S.SetStretchyCol(2);
{ {
wxTextValidator vld(wxFILTER_NUMERIC);
for (int id = FIRST_SLIDER; id < END_OF_BASIC_SLIDERS; id += 2) { for (int id = FIRST_SLIDER; id < END_OF_BASIC_SLIDERS; id += 2) {
const ControlInfo &info = controlInfo()[(id - FIRST_SLIDER) / 2]; const ControlInfo &info = controlInfo()[(id - FIRST_SLIDER) / 2];
info.CreateControls(id, vld, S); info.CreateControls(id, S);
} }
} }
S.EndMultiColumn(); S.EndMultiColumn();
@ -1806,10 +1810,9 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
S.StartMultiColumn(3, wxEXPAND); S.StartMultiColumn(3, wxEXPAND);
S.SetStretchyCol(2); S.SetStretchyCol(2);
{ {
wxTextValidator vld(wxFILTER_NUMERIC);
for (int id = END_OF_BASIC_SLIDERS; id < END_OF_ADVANCED_SLIDERS; id += 2) { for (int id = END_OF_BASIC_SLIDERS; id < END_OF_ADVANCED_SLIDERS; id += 2) {
const ControlInfo &info = controlInfo[(id - FIRST_SLIDER) / 2]; const ControlInfo &info = controlInfo[(id - FIRST_SLIDER) / 2];
info.CreateControls(id, vld, S); info.CreateControls(id, S);
} }
} }
S.EndMultiColumn(); S.EndMultiColumn();
@ -1854,6 +1857,8 @@ bool EffectNoiseReduction::Dialog::TransferDataToWindow()
bool EffectNoiseReduction::Dialog::TransferDataFromWindow() bool EffectNoiseReduction::Dialog::TransferDataFromWindow()
{ {
if( !wxWindow::Validate() )
return false;
// Do the choice controls: // Do the choice controls:
if (!EffectDialog::TransferDataFromWindow()) if (!EffectDialog::TransferDataFromWindow())
return false; return false;