Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-11 17:41:15 +02:00
Code Issues Releases Wiki Activity

Remove spectral selection edges when not in spectral selection.

Browse Source
This commit is contained in:
Steve Daulton 2015-05-19 02:57:08 +01:00
parent 26707aabfa
commit d1994e702e
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/TrackArtist.cpp
View File

@ -1806,28 +1806,22 @@ static float sumFreqValues(
AColor::ColorGradientChoice ChooseColorSet( float bin0, float bin1, float selBinLo, AColor::ColorGradientChoice ChooseColorSet( float bin0, float bin1, float selBinLo,
float selBinCenter, float selBinHi, int dashCount, bool isSpectral ) float selBinCenter, float selBinHi, int dashCount, bool isSpectral )
{ {
if ( (selBinCenter >= 0) && (bin0 <= selBinCenter) && (selBinCenter < bin1) ) if (!isSpectral)
return AColor::ColorGradientTimeSelected;
if ((selBinCenter >= 0) && (bin0 <= selBinCenter) &&
(selBinCenter < bin1))
return AColor::ColorGradientEdge; return AColor::ColorGradientEdge;
else if ( if ((0 == dashCount % 2) &&
(0 == dashCount % 2) && (((selBinLo >= 0) && (bin0 <= selBinLo) && ( selBinLo < bin1)) ||
(((selBinLo >= 0) && (bin0 <= selBinLo) && ( selBinLo < bin1)) || ((selBinHi >= 0) && (bin0 <= selBinHi) && ( selBinHi < bin1))))
((selBinHi >= 0) && (bin0 <= selBinHi) && ( selBinHi < bin1)) ) )
return AColor::ColorGradientEdge; return AColor::ColorGradientEdge;
else if ( if ((selBinLo < 0 || selBinLo < bin1) && (selBinHi < 0 || selBinHi > bin0))
(selBinLo < 0 || selBinLo < bin1) && return AColor::ColorGradientTimeAndFrequencySelected;
(selBinHi < 0 || selBinHi > bin0) )
if (isSpectral) {
return AColor::ColorGradientTimeAndFrequencySelected;
}
else {
return AColor::ColorGradientTimeSelected;
}
else
return AColor::ColorGradientTimeSelected; return AColor::ColorGradientTimeSelected;
} }
void TrackArtist::DrawClipSpectrum(WaveTrackCache &cache, void TrackArtist::DrawClipSpectrum(WaveTrackCache &cache,
WaveClip *clip, WaveClip *clip,
wxDC & dc, wxDC & dc,