Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

Bug2277 partial: in dB ruler, always draw midline value if in range...

Browse Source 
... and also draw the zeroes if in range, taking precedence over the extreme
values (which might be positive dB values when zoomed out or scrolled).

See comments 10 and 11 in the bug report.
This commit is contained in:
Paul Licameli 2020-01-20 12:19:17 -05:00
parent 72d8a927e7
commit 9cd7a5eaf3
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/widgets/Ruler.cpp
View File

@ -1093,22 +1093,55 @@ void Ruler::Update(const Envelope* envelope)// Envelope *speedEnv, long minSpeed
double UPP = (mHiddenMax-mHiddenMin)/mLength; // Units per pixel
FindLinearTickSizes(UPP);
// Left and Right Edges
auto TickAtValue = [this, zoomInfo]( double value ) -> int {
// Make a tick only if the value is strictly between the bounds
if ( value <= std::min( mMin, mMax ) )
return -1;
if ( value >= std::max( mMin, mMax ) )
return -1;
int mid;
if (zoomInfo != NULL) {
// Tick only at zero
if ( value )
return -1;
mid = (int)(zoomInfo->TimeToPosition(0.0, mLeftOffset));
}
else
mid = (int)(mLength*((mMin - value) / (mMin - mMax)) + 0.5);
const int iMaxPos = (mOrientation == wxHORIZONTAL) ? mRight : mBottom - 5;
if (mid >= 0 && mid < iMaxPos)
Tick(mid, value, true, false);
else
return -1;
return mid;
};
if ( mDbMirrorValue ) {
// For dB scale, let the zeroes prevail over the extreme values if
// not the same, and let midline prevail over all
// Do the midline
TickAtValue( -mDbMirrorValue );
// Do the upper zero
TickAtValue( 0.0 );
// Do the other zero
TickAtValue( -2 * mDbMirrorValue );
}
// Extreme values
if (mLabelEdges) {
Tick(0, mMin, true, false);
Tick(mLength, mMax, true, false);
}
// Zero (if it's in the middle somewhere)
if (mMin * mMax < 0.0) {
int mid;
if (zoomInfo != NULL)
mid = (int)(zoomInfo->TimeToPosition(0.0, mLeftOffset));
else
mid = (int)(mLength*(mMin / (mMin - mMax)) + 0.5);
const int iMaxPos = (mOrientation == wxHORIZONTAL) ? mRight : mBottom - 5;
if (mid >= 0 && mid < iMaxPos)
Tick(mid, 0.0, true, false);
if ( !mDbMirrorValue ) {
// Zero (if it's strictly in the middle somewhere)
TickAtValue( 0.0 );
}
double sg = UPP > 0.0? 1.0: -1.0;