mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

-fix max<->min

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@327 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-02-12 16:40:36 +00:00
parent fd0f797bfc
commit 5c63dd831f
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/streaminfo2.cpp
View File

@@ -316,7 +316,6 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h)
sig_text_rate_x = _x + 10 + xd * 3; sig_text_rate_x = _x + 10 + xd * 3;
int maxmin_x; // x-position of min and max int maxmin_x; // x-position of min and max
int max_pos = 0;
int fontW = g_Font[font_small]->getWidth(); int fontW = g_Font[font_small]->getWidth();
if (paint_mode == 0) { if (paint_mode == 0) {
@@ -324,9 +323,8 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h)
} }
else { else {
maxmin_x = _x + 40 + xd * 3 + (fontW*4); maxmin_x = _x + 40 + xd * 3 + (fontW*4);
max_pos= sheight;
} }
g_Font[font_small]->RenderString(maxmin_x, y1 + max_pos , 50, "max", COL_MENUCONTENTDARK, 0, true); g_Font[font_small]->RenderString(maxmin_x, y1 + sheight , 50, "max", COL_MENUCONTENTDARK, 0, true);
g_Font[font_small]->RenderString(maxmin_x, y1 + (sheight * 3), 50, "min", COL_MENUCONTENTDARK, 0, true); g_Font[font_small]->RenderString(maxmin_x, y1 + (sheight * 3), 50, "min", COL_MENUCONTENTDARK, 0, true);
@@ -354,8 +352,8 @@ void CStreamInfo2::paint_signal_fe(struct bitrate br, struct feSignal s)
long value = (long) (bit_s / 1000ULL); long value = (long) (bit_s / 1000ULL);
SignalRenderStr(value, sig_text_rate_x, yt + sheight); SignalRenderStr(value, sig_text_rate_x, yt + sheight);
SignalRenderStr(br.max_short_average/ 1000ULL, sig_text_rate_x, yt + (sheight * 2)); SignalRenderStr(br.max_short_average/ 1000ULL, sig_text_rate_x, yt);
SignalRenderStr(br.min_short_average/ 1000ULL, sig_text_rate_x, yt); SignalRenderStr(br.min_short_average/ 1000ULL, sig_text_rate_x, yt + (sheight * 2));
if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){ if ( g_RemoteControl->current_PIDs.PIDs.vpid > 0 ){
yd = y_signal_fe (value, scaling, sigBox_h);// Video + Audio yd = y_signal_fe (value, scaling, sigBox_h);// Video + Audio
} else { } else {
@@ -372,8 +370,8 @@ void CStreamInfo2::paint_signal_fe(struct bitrate br, struct feSignal s)
if (s.ber != s.old_ber) { if (s.ber != s.old_ber) {
SignalRenderStr(s.ber, sig_text_ber_x, yt + sheight); SignalRenderStr(s.ber, sig_text_ber_x, yt + sheight);
SignalRenderStr(s.max_ber, sig_text_ber_x, yt + (sheight * 2)); SignalRenderStr(s.max_ber, sig_text_ber_x, yt);
SignalRenderStr(s.min_ber, sig_text_ber_x, yt); SignalRenderStr(s.min_ber, sig_text_ber_x, yt + (sheight * 2));
} }
yd = y_signal_fe (s.ber, 4000, sigBox_h); yd = y_signal_fe (s.ber, 4000, sigBox_h);
frameBuffer->paintPixel(sigBox_x+x_now, sigBox_y+sigBox_h-yd, COL_RED); //red frameBuffer->paintPixel(sigBox_x+x_now, sigBox_y+sigBox_h-yd, COL_RED); //red
@@ -381,8 +379,8 @@ void CStreamInfo2::paint_signal_fe(struct bitrate br, struct feSignal s)
if (s.sig != s.old_sig) { if (s.sig != s.old_sig) {
SignalRenderStr(s.sig, sig_text_sig_x, yt + sheight); SignalRenderStr(s.sig, sig_text_sig_x, yt + sheight);
SignalRenderStr(s.max_sig, sig_text_sig_x, yt + (sheight * 2)); SignalRenderStr(s.max_sig, sig_text_sig_x, yt);
SignalRenderStr(s.min_sig, sig_text_sig_x, yt); SignalRenderStr(s.min_sig, sig_text_sig_x, yt + (sheight * 2));
} }
yd = y_signal_fe (s.sig, 65000, sigBox_h); yd = y_signal_fe (s.sig, 65000, sigBox_h);
frameBuffer->paintPixel(sigBox_x+x_now, sigBox_y+sigBox_h-yd, COL_GREEN); //green frameBuffer->paintPixel(sigBox_x+x_now, sigBox_y+sigBox_h-yd, COL_GREEN); //green
@@ -390,8 +388,8 @@ void CStreamInfo2::paint_signal_fe(struct bitrate br, struct feSignal s)
if (s.snr != s.old_snr) { if (s.snr != s.old_snr) {
SignalRenderStr(s.snr, sig_text_snr_x, yt + sheight); SignalRenderStr(s.snr, sig_text_snr_x, yt + sheight);
SignalRenderStr(s.max_snr, sig_text_snr_x, yt + (sheight * 2)); SignalRenderStr(s.max_snr, sig_text_snr_x, yt);
SignalRenderStr(s.min_snr, sig_text_snr_x, yt); SignalRenderStr(s.min_snr, sig_text_snr_x, yt + (sheight * 2));
} }
yd = y_signal_fe (s.snr, 65000, sigBox_h); yd = y_signal_fe (s.snr, 65000, sigBox_h);
frameBuffer->paintPixel(sigBox_x+x_now, sigBox_y+sigBox_h-yd, COL_BLUE); //blue frameBuffer->paintPixel(sigBox_x+x_now, sigBox_y+sigBox_h-yd, COL_BLUE); //blue