mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mixer/SpectrumView: Add zero line and more dB levels. Also, remove Hz and Db labels.

This commit is contained in:
Jonathan Moore Liles 2013-10-08 18:40:03 -07:00
parent e6313394cd
commit 50a5f66fff
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mixer/src/SpectrumView.C
View File

@ -237,13 +237,13 @@ SpectrumView::draw_semilog ( void )
fl_font( FL_HELVETICA_ITALIC, 7 ); fl_font( FL_HELVETICA_ITALIC, 7 );
//Db grid is easy, it is just a linear spacing //Db grid is easy, it is just a linear spacing
for(int i=0; i<8; ++i) { for(int i=0; i<16; ++i) {
int level = y()+H*i/8.0; int level = y()+H*i/16.0;
fl_line(x(), level, x()+W, level); fl_line(x(), level, x()+W, level);
float value = (1-i/8.0)*(_dbmax-_dbmin) + _dbmin; float value = (1-i/16.0)*(_dbmax-_dbmin) + _dbmin;
sprintf(label, "%.1f dB", value); sprintf(label, "%.1f", value);
fl_draw(label, x(), level + 3, w(), 7, FL_ALIGN_RIGHT ); fl_draw(label, x(), level + 3, w() - 2, 7, FL_ALIGN_RIGHT );
} }
//The frequency grid is defined with points at //The frequency grid is defined with points at
@ -265,7 +265,7 @@ SpectrumView::draw_semilog ( void )
if ( j == 1 || j == 2 || j == 5 ) if ( j == 1 || j == 2 || j == 5 )
{ {
sprintf(label, "%0.f %s", freq < 1000.0 ? freq : freq / 1000.0, freq < 1000.0 ? "Hz" : "KHz" ); sprintf(label, "%0.f %s", freq < 1000.0 ? freq : freq / 1000.0, freq < 1000.0 ? "" : "k" );
int sx = x() + xloc*W + 1; int sx = x() + xloc*W + 1;
if ( sx < x() * W - 20 ) if ( sx < x() * W - 20 )
fl_draw(label, sx, y()+h()); fl_draw(label, sx, y()+h());
@ -273,6 +273,18 @@ SpectrumView::draw_semilog ( void )
} }
} }
} }
/* draw 0dB line */
{
fl_line_style(FL_DASH,0);
float i = ((_dbmax-_dbmin)+_dbmin) / (_dbmax-_dbmin);
int level = y()+H*i;
fl_color(fl_color_add_alpha(fl_rgb_color(240,240,240), 60 ));
fl_line(x(), level, x()+W, level);
fl_line_style(FL_SOLID,0);
}
} }
void void