Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-17 11:46:35 +01:00
Code Issues Releases Wiki Activity

Added Space-Saver meters. These are now the default.

Browse Source 
Fixed ResetToolbars so that SpectralSelectionBar is not shown after a reset.
This commit is contained in:
james.k.crook@gmail.com
2014-11-09 15:47:09 +00:00
parent 0880d1777a
commit 7ee3c47441
9 changed files with 126 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/widgets/Meter.cpp
View File

@@ -351,6 +351,7 @@ void Meter::UpdatePrefs()
mStyle = gPrefs->Read(wxT("/Meter/MeterStyle"), wxT("HorizontalStereo")) == wxT("HorizontalStereo") ?
HorizontalStereo :
VerticalStereo;
mGradient = gPrefs->Read(wxT("/Meter/MeterBars"), wxT("Gradient")) == wxT("Gradient");
mDB = gPrefs->Read(wxT("/Meter/MeterType"), wxT("dB")) == wxT("dB");
@@ -820,12 +821,20 @@ void Meter::HandleLayout(wxDC &dc)
int left = 0, top = 0;
int right, bottom;
int barw, barh;
int rulerHeight;
int i;
mRuler.SetFlip(true);
mRuler.SetLabelEdges(true);
switch(mStyle) {
// How many pixels between items?
const int iSpacer = 2;
Meter::Style AdjustedMeterStyle = mStyle;
if( (mStyle == HorizontalStereo) && (height < 50 ) )
AdjustedMeterStyle = HorizontalStereoCompact;
switch(AdjustedMeterStyle) {
default:
wxPrintf(wxT("Style not handled yet!\n"));
break;
@@ -940,6 +949,66 @@ void Meter::HandleLayout(wxDC &dc)
}
mRuler.OfflimitsPixels(0, mMenuRect.x+mMenuRect.width-4);
break;
case HorizontalStereoCompact:
left = iSpacer;
mIconPos = wxPoint(left, (height-iconHeight)/2);
left += iconWidth + iSpacer;
mMenuRect = wxRect(left, (height-menuHeight)/2, menuWidth, menuHeight);
left += menuWidth + 2 * iSpacer;
mLeftTextPos = wxPoint(left, (height)/4 - mLeftSize.y/2);
mRightTextPos = wxPoint(left, (height*3)/4 - mLeftSize.y/2);
left += intmax(mLeftSize.x, mRightSize.x) + iSpacer;
// The proportion to use for ruler is chosen to give a good ruler at
// two tb height.
rulerHeight = intmin( height*0.35, 24 );
// Below 12 pixels height, the ruler is pointless.
if( rulerHeight < 12 )
rulerHeight = 0;
rulerHeight = 0;
width -= left;
barw = width - 4;
barh = (height-2-rulerHeight)/2;
mNumBars = 2;
mBar[0].vert = false;
ResetBar(&mBar[0], false);
mBar[0].r = wxRect(left+2, 0, barw, barh);
if (mClip) {
mBar[0].rClip = mBar[0].r;
mBar[0].rClip.x += mBar[0].rClip.width-3;
mBar[0].rClip.width = 3;
mBar[0].r.width -= 4;
}
mBar[1].vert = false;
ResetBar(&mBar[1], false);
mBar[1].r = wxRect(left+2, 2 + barh, barw, barh);
if (mClip) {
mBar[1].rClip = mBar[1].r;
mBar[1].rClip.x += mBar[1].rClip.width-3;
mBar[1].rClip.width = 3;
mBar[1].r.width -= 4;
}
mRuler.SetOrientation(wxHORIZONTAL);
{
int BarMid = (mBar[0].r.y + mBar[1].r.y + mBar[1].r.height ) / 2;
const int RulerHeight = 24;
const int TextDownBy = 2;
mRuler.SetBounds(mBar[0].r.x,
BarMid - RulerHeight / 2 +TextDownBy,
mBar[1].r.x + mBar[1].r.width,
BarMid + RulerHeight / 2 +TextDownBy);
}
if (mDB) {
mRuler.SetRange(-mDBRange, 0);
mRuler.SetFormat(Ruler::LinearDBFormat);
}
else {
mRuler.SetRange(0, 1);
mRuler.SetFormat(Ruler::RealFormat);
}
mRuler.OfflimitsPixels(0,0);
break;
case Waveform:
mNumBars = 0;
break;
@@ -1118,6 +1187,9 @@ void Meter::HandlePaint(wxDC &destDC)
for (int i = 0; i < mNumBars; i++)
{
DrawMeterBar(destDC, &mBar[i]);
// We can have numbers over the bars, in which case we have to draw them each time.
if( mRuler.mRect.Intersects( mBar[0].r ) )
mRuler.Draw(destDC);
}
}
@@ -1139,6 +1211,9 @@ void Meter::RepaintBarsNow()
{
DrawMeterBar(*dc, &mBar[i]);
}
// We can have numbers over the bars, in which case we have to draw them each time.
if( mRuler.mRect.Intersects( mBar[0].r ) )
mRuler.Draw(*dc);
}
}