Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Paul L's new SelectedRegion class replacing use of t0 and t1. Also LabelTrack.h no longer in TrackPanel.h includes.

Browse Source 
This change is believed to be a direct refactoring that does not change functionality.  It paves the way for more complex kinds of selection, such as selections involving frequency as well as time.  It also reduces risk of left and right edges being swapped in future code using SelectedRegion, as the default is to swap on assignment if needed.
This commit is contained in:
james.k.crook@gmail.com
2014-10-05 17:10:09 +00:00
parent 6ce364f2d2
commit f5e593cc4c
36 changed files with 836 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/LabelDialog.cpp
View File

@@ -59,8 +59,7 @@ class RowData
int index;
wxString title;
double stime;
double etime;
SelectedRegion selectedRegion;
};
enum {
@@ -251,8 +250,13 @@ bool LabelDialog::TransferDataToWindow()
// Set the cell contents
mGrid->SetCellValue(i, Col_Track, TrackName(rd->index));
mGrid->SetCellValue(i, Col_Label, rd->title);
mGrid->SetCellValue(i, Col_Stime, wxString::Format(wxT("%g"), rd->stime));
mGrid->SetCellValue(i, Col_Etime, wxString::Format(wxT("%g"), rd->etime));
mGrid->SetCellValue(i, Col_Stime,
wxString::Format(wxT("%g"), rd->selectedRegion.t0()));
mGrid->SetCellValue(i, Col_Etime,
wxString::Format(wxT("%g"), rd->selectedRegion.t1()));
// PRL: to do: -- populate future additional selection fields
// and write event code to update them from controls
}
// Autosize all the rows
@@ -336,7 +340,7 @@ bool LabelDialog::TransferDataFromWindow()
return false;
// Add the label to it
((LabelTrack *) t)->AddLabel(rd->stime, rd->etime, rd->title);
((LabelTrack *) t)->AddLabel(rd->selectedRegion, rd->title);
((LabelTrack *) t)->Unselect();
}
@@ -400,8 +404,7 @@ void LabelDialog::AddLabels(LabelTrack *t)
RowData *rd = new RowData();
rd->index = tndx;
rd->stime = ls->t;
rd->etime = ls->t1;
rd->selectedRegion = ls->selectedRegion;
rd->title = ls->title;
mData.Add(rd);
@@ -446,8 +449,7 @@ void LabelDialog::OnInsert(wxCommandEvent &event)
// Initialize the new label
rd->index = index;
rd->stime = 0.0;
rd->etime = 0.0;
rd->selectedRegion = SelectedRegion();
rd->title = wxT("");
// Insert it before or after the current row
@@ -612,7 +614,7 @@ void LabelDialog::OnExport(wxCommandEvent & WXUNUSED(event))
for (i = 0; i < cnt; i++) {
RowData *rd = mData[i];
lt->AddLabel(rd->stime, rd->etime, rd->title);
lt->AddLabel(rd->selectedRegion, rd->title);
}
// Export them and clean
@@ -641,8 +643,7 @@ void LabelDialog::OnSelectCell(wxGridEvent &event)
{
RowData *rd;
rd = mData[event.GetRow()];
mViewInfo->sel0 = rd->stime;
mViewInfo->sel1 = rd->etime;
mViewInfo->selectedRegion = rd->selectedRegion;
GetActiveProject()->RedrawProject();
}
@@ -739,11 +740,11 @@ void LabelDialog::OnChangeLabel(wxGridEvent & WXUNUSED(event), int row, RowData
void LabelDialog::OnChangeStime(wxGridEvent & WXUNUSED(event), int row, RowData *rd)
{
// Remember the value...no need to repopulate
mGrid->GetCellValue(row, Col_Stime).ToDouble(&rd->stime);
if (rd->etime < rd->stime) {
rd->etime = rd->stime;
mGrid->SetCellValue(row, Col_Etime, wxString::Format(wxT("%g"), rd->etime));
}
double t;
mGrid->GetCellValue(row, Col_Stime).ToDouble(&t);
rd->selectedRegion.setT0(t, false);
mGrid->SetCellValue(row, Col_Etime, wxString::Format(wxT("%g"),
rd->selectedRegion.t1()));
return;
}
@@ -751,11 +752,11 @@ void LabelDialog::OnChangeStime(wxGridEvent & WXUNUSED(event), int row, RowData
void LabelDialog::OnChangeEtime(wxGridEvent & WXUNUSED(event), int row, RowData *rd)
{
// Remember the value...no need to repopulate
mGrid->GetCellValue(row, Col_Etime).ToDouble(&rd->etime);
if (rd->etime < rd->stime) {
rd->stime = rd->etime;
mGrid->SetCellValue(row, Col_Stime, wxString::Format(wxT("%g"), rd->stime));
}
double t;
mGrid->GetCellValue(row, Col_Etime).ToDouble(&t);
rd->selectedRegion.setT1(t, false);
mGrid->SetCellValue(row, Col_Stime, wxString::Format(wxT("%g"),
rd->selectedRegion.t0()));
return;
}