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

NumericTextCtrl for time input in Nyquist plug-ins

Browse Source 
Also add widget for inserting a line of text into a Nyquist plug-in.
This commit is contained in:
Steve Daulton 2018-04-28 19:15:45 +01:00
parent 660dc03b9f
commit cf07f858ec
2 changed files with 263 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/effects/nyquist/Nyquist.cpp
View File

@ -57,6 +57,7 @@ effects from this one class.
#include "../../widgets/ErrorDialog.h"
#include "../../Prefs.h"
#include "../../prefs/WaveformSettings.h"
#include "../../widgets/NumericTextCtrl.h"
#include "FileDialog.h"
@ -83,7 +84,8 @@ enum
ID_Slider = 11000,
ID_Text = 12000,
ID_Choice = 13000
ID_Choice = 13000,
ID_Time = 14000
};
// Protect Nyquist from selections greater than 2^31 samples (bug 439)
@ -110,6 +112,8 @@ BEGIN_EVENT_TABLE(NyquistEffect, wxEvtHandler)
wxEVT_COMMAND_TEXT_UPDATED, NyquistEffect::OnText)
EVT_COMMAND_RANGE(ID_Choice, ID_Choice + 99,
wxEVT_COMMAND_CHOICE_SELECTED, NyquistEffect::OnChoice)
EVT_COMMAND_RANGE(ID_Time, ID_Time + 99,
wxEVT_COMMAND_TEXT_UPDATED, NyquistEffect::OnTime)
END_EVENT_TABLE()
NyquistEffect::NyquistEffect(const wxString &fName)
@ -311,7 +315,8 @@ bool NyquistEffect::DefineParams( ShuttleParams & S )
d = GetCtrlValue(ctrl.valStr);
}
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT)
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT ||
ctrl.type == NYQ_CTRL_TIME)
{
S.Define( d, static_cast<const wxChar*>( ctrl.var.c_str() ), (double)0.0, ctrl.low, ctrl.high, 1.0);
}
@ -363,7 +368,8 @@ bool NyquistEffect::GetAutomationParameters(CommandParameters & parms)
d = GetCtrlValue(ctrl.valStr);
}
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT)
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT ||
ctrl.type == NYQ_CTRL_TIME)
{
parms.Write(ctrl.var, d);
}
@ -407,7 +413,8 @@ bool NyquistEffect::SetAutomationParameters(CommandParameters & parms)
NyqControl & ctrl = mControls[c];
bool good = false;
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT)
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT ||
ctrl.type == NYQ_CTRL_TIME)
{
double val;
good = parms.Read(ctrl.var, &val) &&
@ -452,7 +459,8 @@ bool NyquistEffect::SetAutomationParameters(CommandParameters & parms)
d = GetCtrlValue(ctrl.valStr);
}
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT)
if (ctrl.type == NYQ_CTRL_REAL || ctrl.type == NYQ_CTRL_FLOAT_TEXT ||
ctrl.type == NYQ_CTRL_TIME)
{
parms.Read(ctrl.var, &ctrl.val);
}
@ -1158,7 +1166,8 @@ bool NyquistEffect::ProcessOne()
}
for (unsigned int j = 0; j < mControls.size(); j++) {
if (mControls[j].type == NYQ_CTRL_REAL || mControls[j].type == NYQ_CTRL_FLOAT_TEXT) {
if (mControls[j].type == NYQ_CTRL_REAL || mControls[j].type == NYQ_CTRL_FLOAT_TEXT ||
mControls[j].type == NYQ_CTRL_TIME) {
// We use Internat::ToString() rather than "%f" here because we
// always have to use the dot as decimal separator when giving
// numbers to Nyquist, whereas using "%f" will use the user's
@ -1869,9 +1878,17 @@ bool NyquistEffect::Parse(
return true;
}
if (len >= 5 && tokens[0] == wxT("control")) {
if (len >= 3 && tokens[0] == wxT("control")) {
NyqControl ctrl;
if (len == 3 && tokens[1] == wxT("text")) {
ctrl.var = tokens[1];
ctrl.label = UnQuote( tokens[2] );
ctrl.type = NYQ_CTRL_TEXT;
}
else if (len >= 5)
{
ctrl.var = tokens[1];
ctrl.name = UnQuote( tokens[2] );
// 3 is type, below
@ -1913,6 +1930,8 @@ bool NyquistEffect::Parse(
ctrl.type = NYQ_CTRL_FLOAT_TEXT;
else if (tokens[3] == wxT("int-text"))
ctrl.type = NYQ_CTRL_INT_TEXT;
else if (tokens[3] == wxT("time"))
ctrl.type = NYQ_CTRL_TIME;
else
{
wxString str;
@ -1935,6 +1954,9 @@ bool NyquistEffect::Parse(
else if (ctrl.type == NYQ_CTRL_FLOAT_TEXT && ctrl.lowStr.IsSameAs(wxT("nil"), false)) {
ctrl.low = -(FLT_MAX);
}
else if (ctrl.type == NYQ_CTRL_TIME && ctrl.lowStr.IsSameAs(wxT("nil"), false)) {
ctrl.low = 0.0;
}
else {
ctrl.low = GetCtrlValue(ctrl.lowStr);
}
@ -1943,7 +1965,9 @@ bool NyquistEffect::Parse(
if (ctrl.type == NYQ_CTRL_INT_TEXT && ctrl.highStr.IsSameAs(wxT("nil"), false)) {
ctrl.high = INT_MAX;
}
else if (ctrl.type == NYQ_CTRL_FLOAT_TEXT && ctrl.highStr.IsSameAs(wxT("nil"), false)) {
else if ((ctrl.type == NYQ_CTRL_FLOAT_TEXT || ctrl.type == NYQ_CTRL_TIME) &&
ctrl.highStr.IsSameAs(wxT("nil"), false))
{
ctrl.high = FLT_MAX;
}
else {
@ -1968,6 +1992,7 @@ bool NyquistEffect::Parse(
ctrl.ticks = (int)(ctrl.high - ctrl.low);
}
}
}
if( mPresetNames.Index( ctrl.var ) == wxNOT_FOUND )
{
@ -1975,6 +2000,7 @@ bool NyquistEffect::Parse(
}
}
// Deprecated
if (len >= 2 && tokens[0] == wxT("categories")) {
for (size_t i = 1; i < tokens.GetCount(); ++i) {
mCategories.Add(tokens[i]);
@ -2328,23 +2354,35 @@ bool NyquistEffect::TransferDataFromEffectWindow()
continue;
}
if (ctrl->type == NYQ_CTRL_TIME)
{
NumericTextCtrl *n = (NumericTextCtrl *) mUIParent->FindWindow(ID_Time + i);
ctrl->val = n->GetValue();
}
if (ctrl->type == NYQ_CTRL_INT_TEXT && ctrl->lowStr.IsSameAs(wxT("nil"), false)) {
ctrl->low = INT_MIN;
}
else if (ctrl->type == NYQ_CTRL_FLOAT_TEXT && ctrl->lowStr.IsSameAs(wxT("nil"), false)) {
else if ((ctrl->type == NYQ_CTRL_FLOAT_TEXT || ctrl->type == NYQ_CTRL_TIME) &&
ctrl->lowStr.IsSameAs(wxT("nil"), false))
{
ctrl->low = -(FLT_MAX);
}
else {
else
{
ctrl->low = GetCtrlValue(ctrl->lowStr);
}
if (ctrl->type == NYQ_CTRL_INT_TEXT && ctrl->highStr.IsSameAs(wxT("nil"), false)) {
ctrl->high = INT_MAX;
}
else if (ctrl->type == NYQ_CTRL_FLOAT_TEXT && ctrl->highStr.IsSameAs(wxT("nil"), false)) {
else if ((ctrl->type == NYQ_CTRL_FLOAT_TEXT || ctrl->type == NYQ_CTRL_TIME) &&
ctrl->highStr.IsSameAs(wxT("nil"), false))
{
ctrl->high = FLT_MAX;
}
else {
else
{
ctrl->high = GetCtrlValue(ctrl->highStr);
}
@ -2421,7 +2459,20 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
{
NyqControl & ctrl = mControls[i];
wxString prompt = ctrl.name + wxT(" ");
if (ctrl.type == NYQ_CTRL_TEXT)
{
S.EndMultiColumn();
S.StartHorizontalLay(wxALIGN_LEFT, 0);
{
S.AddSpace(0, 10);
S.AddFixedText( ctrl.label, false );
}
S.EndHorizontalLay();
S.StartMultiColumn(4);
}
else
{
wxString prompt = ctrl.name + wxT(":");
S.AddPrompt(prompt);
if (ctrl.type == NYQ_CTRL_STRING)
@ -2440,6 +2491,25 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
LocalizedStrings(ctrl.choices.data(), ctrl.choices.size());
S.Id(ID_Choice + i).AddChoice( {}, wxT(""), &choices);
}
else if (ctrl.type == NYQ_CTRL_TIME)
{
S.AddSpace(10, 10);
const auto options = NumericTextCtrl::Options{}
.AutoPos(true)
.MenuEnabled(true)
.ReadOnly(false);
NumericTextCtrl *time = new
NumericTextCtrl(S.GetParent(), (ID_Time + i),
NumericConverter::TIME,
GetSelectionFormat(),
ctrl.val,
mProjectRate,
options);
time->SetName(prompt);
S.AddWindow(time, wxALIGN_LEFT | wxALL);
}
else
{
// Integer or Real
@ -2494,6 +2564,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
}
}
}
}
S.EndMultiColumn();
}
S.EndScroller();
@ -2602,6 +2673,44 @@ void NyquistEffect::OnChoice(wxCommandEvent & evt)
mControls[evt.GetId() - ID_Choice].val = (double) evt.GetInt();
}
void NyquistEffect::OnTime(wxCommandEvent& evt)
{
int i = evt.GetId() - ID_Time;
static double value = 0.0;
NyqControl & ctrl = mControls[i];
NumericTextCtrl *n = (NumericTextCtrl *) mUIParent->FindWindow(ID_Time + i);
double val = n->GetValue();
// Observed that two events transmitted on each control change (Linux)
// so skip if value has not changed.
if (val != value) {
if (val < ctrl.low || val > ctrl.high) {
const auto message = wxString::Format(_("Value range:\n%s to %s"),
ToTimeFormat(ctrl.low), ToTimeFormat(ctrl.high));
Effect::MessageBox(message, wxOK | wxCENTRE, _("Value Error"));
}
if (val < ctrl.low)
val = ctrl.low;
else if (val > ctrl.high)
val = ctrl.high;
n->SetValue(val);
value = val;
}
}
wxString NyquistEffect::ToTimeFormat(double t)
{
int seconds = static_cast<int>(t);
int hh = seconds / 3600;
int mm = seconds % 3600;
mm = mm / 60;
return wxString::Format("%d:%d:%.3f", hh, mm, t - (hh * 3600 + mm * 60));
}
void NyquistEffect::OnText(wxCommandEvent & evt)
{
int i = evt.GetId() - ID_Text;

7
src/effects/nyquist/Nyquist.h
View File

@ -45,7 +45,9 @@ enum NyqControlType
NYQ_CTRL_STRING,
NYQ_CTRL_CHOICE,
NYQ_CTRL_INT_TEXT,
NYQ_CTRL_FLOAT_TEXT
NYQ_CTRL_FLOAT_TEXT,
NYQ_CTRL_TEXT,
NYQ_CTRL_TIME,
};
class NyqControl
@ -190,6 +192,9 @@ private:
void OnText(wxCommandEvent & evt);
void OnSlider(wxCommandEvent & evt);
void OnChoice(wxCommandEvent & evt);
void OnTime(wxCommandEvent & evt);
wxString ToTimeFormat(double t);
private: