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

BenBenjamin Drung's patch for http://bugzilla.audacityteam.org/show_bug.cgi?id=466

Browse Source
This commit is contained in:
v.audacity
2012-06-25 00:13:59 +00:00
parent b47341eb33
commit 312fee2c77
2 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/LabelTrack.cpp
View File

@@ -1238,36 +1238,64 @@ void LabelStruct::MoveLabel( int iEdge, double fNewTime)
LabelStruct::TimeRelations LabelStruct::RegionRelation(
double reg_t0, double reg_t1, LabelTrack *parent)
{
wxASSERT(reg_t0 <= reg_t1);
bool retainLabels = false;
// AWD: Desired behavior for edge cases: point labels bordered by the
// selection are included within it. Region labels are included in the
// selection to the extent that the selection covers them; specifically,
// they're not included at all if the selection borders them, and they're
// fully included if the selection covers them fully, even if it just
// borders their endpoints. This is just one of many possible schemes.
wxASSERT(reg_t0 <= reg_t1);
gPrefs->Read(wxT("/GUI/RetainLabels"), &retainLabels);
// The first test catches bordered point-labels and selected-through
// region-labels; move it to third and selection edges become inclusive WRT
// point-labels.
if (reg_t0 <= t && reg_t1 >= t1)
return SURROUNDS_LABEL;
else if (reg_t1 <= t)
return BEFORE_LABEL;
else if (reg_t0 >= t1)
return AFTER_LABEL;
if(retainLabels) {
// At this point, all point labels should have returned.
// Desired behavior for edge cases: The length of the selection is smaller
// than the length of the label if the selection is within the label.
// Selections matching exactly a (region) label surround the label.
else if (reg_t0 > t && reg_t0 < t1 && reg_t1 > t && reg_t1 < t1)
return WITHIN_LABEL;
// Knowing that none of the other relations match simplifies remaining
// tests
else if (reg_t0 > t && reg_t0 < t1)
return BEGINS_IN_LABEL;
else
return ENDS_IN_LABEL;
if ((reg_t0 < t && reg_t1 > t1) || (reg_t0 == t && reg_t1 == t1))
return SURROUNDS_LABEL;
else if (reg_t1 < t)
return BEFORE_LABEL;
else if (reg_t0 > t1)
return AFTER_LABEL;
else if (reg_t0 >= t && reg_t0 <= t1 && reg_t1 >= t && reg_t1 <= t1)
return WITHIN_LABEL;
else if (reg_t0 >= t && reg_t0 <= t1)
return BEGINS_IN_LABEL;
else
return ENDS_IN_LABEL;
} else {
// AWD: Desired behavior for edge cases: point labels bordered by the
// selection are included within it. Region labels are included in the
// selection to the extent that the selection covers them; specifically,
// they're not included at all if the selection borders them, and they're
// fully included if the selection covers them fully, even if it just
// borders their endpoints. This is just one of many possible schemes.
// The first test catches bordered point-labels and selected-through
// region-labels; move it to third and selection edges become inclusive
// WRT point-labels.
if (reg_t0 <= t && reg_t1 >= t1)
return SURROUNDS_LABEL;
else if (reg_t1 <= t)
return BEFORE_LABEL;
else if (reg_t0 >= t1)
return AFTER_LABEL;
// At this point, all point labels should have returned.
else if (reg_t0 > t && reg_t0 < t1 && reg_t1 > t && reg_t1 < t1)
return WITHIN_LABEL;
// Knowing that none of the other relations match simplifies remaining
// tests
else if (reg_t0 > t && reg_t0 < t1)
return BEGINS_IN_LABEL;
else
return ENDS_IN_LABEL;
}
}
/// If the index is for a real label, adjust its left or right boundary.

3
src/prefs/GUIPrefs.cpp
View File

@@ -128,6 +128,9 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
S.TieCheckBox(_("&Show track name in waveform display"),
wxT("/GUI/ShowTrackNameInWaveform"),
false);
S.TieCheckBox(_("&Retain labels when they define the edge of a selection"),
wxT("/GUI/RetainLabels"),
false);
}
S.EndStatic();