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

http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/10586-kleiner-anzeigebug-in-der-nummernbox-der-infobar/

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1460 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-05-12 13:00:28 +00:00
parent 958ca99122
commit b3747cf823
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/infoviewer.cpp
View File

@@ -196,11 +196,11 @@ void CInfoViewer::start ()
{ /* default mode, with signal bars etc. */ { /* default mode, with signal bars etc. */
ChanWidth = 122; ChanWidth = 122;
ChanHeight = 74; ChanHeight = 74;
int test = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth()*12; int test = g_SignalFont->getWidth() * 14;
if (test > ChanWidth) { if (test > ChanWidth) {
ChanWidth = test; ChanWidth = test;
} }
test = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getHeight() * 9 / 8; test = (g_SignalFont->getHeight() * 2) + 36;
if (test > ChanHeight) { if (test > ChanHeight) {
ChanHeight = test; ChanHeight = test;
} }
@@ -1295,7 +1295,12 @@ void CInfoViewer::showSNR ()
newfreq = false; newfreq = false;
CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo (); CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo ();
snprintf (freq, sizeof(freq), "%d.%d MHz %c", si.tsfrequency / 1000, si.tsfrequency % 1000, si.polarisation ? 'V' : 'H'); std::string polarisation;
if (g_info.delivery_system == DVB_S || (cs_get_revision() == 1))
polarisation = (si.polarisation) ? "V" : "H";
else
polarisation = "";
snprintf (freq, sizeof(freq), "%d.%d MHz %s", si.tsfrequency / 1000, si.tsfrequency % 1000, polarisation.c_str());
#if 0 #if 0
//FIXME this sets default params for scan menu //FIXME this sets default params for scan menu
sprintf (get_set.TP_freq, "%d", si.tsfrequency); sprintf (get_set.TP_freq, "%d", si.tsfrequency);
@@ -1320,10 +1325,9 @@ void CInfoViewer::showSNR ()
if (lastsig != sig) { if (lastsig != sig) {
lastsig = sig; lastsig = sig;
posx = BoxStartX + 4; posx = BoxStartX + (ChanWidth - (bar_width + 2 + (g_SignalFont->getWidth() * 4))) / 2;
posy = ChanNumYPos + 3; posy = ChanNumYPos + 3;
sigscale->paintProgressBar(posx, posy+4, bar_width, 10, sig, 100); sigscale->paintProgressBar(posx, posy+4, bar_width, 10, sig, 100);
snprintf (percent, sizeof(percent), "%d%%S", sig); snprintf (percent, sizeof(percent), "%d%%S", sig);
posx = posx + bar_width + 2; posx = posx + bar_width + 2;
sw = BoxStartX + ChanWidth - posx; sw = BoxStartX + ChanWidth - posx;
@@ -1332,11 +1336,9 @@ void CInfoViewer::showSNR ()
} }
if (lastsnr != snr) { if (lastsnr != snr) {
lastsnr = snr; lastsnr = snr;
posx = BoxStartX + 4; posx = BoxStartX + (ChanWidth - (bar_width + 2 + (g_SignalFont->getWidth() * 4))) / 2;
posy = ChanNumYPos + 3 + height - 2; posy = ChanNumYPos + 3 + height - 2;
snrscale->paintProgressBar(posx, posy+4, bar_width, 10, snr, 100); snrscale->paintProgressBar(posx, posy+4, bar_width, 10, snr, 100);
snprintf (percent, sizeof(percent), "%d%%Q", snr); snprintf (percent, sizeof(percent), "%d%%Q", snr);
posx = posx + bar_width + 2; posx = posx + bar_width + 2;
sw = BoxStartX + ChanWidth - posx -4; sw = BoxStartX + ChanWidth - posx -4;