mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/motorcontrol, gui/scan: switch to CSignalBox

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Conflicts:
	src/gui/scan.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b5fed3bd7
Author: martii <m4rtii@gmx.de>
Date: 2013-12-18 (Wed, 18 Dec 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-12-18 20:42:02 +01:00
committed by Thilo Graf
parent e40a2c3057
commit 54a91da22e
4 changed files with 26 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/gui/scan.cpp
View File

@@ -80,20 +80,13 @@ CScanTs::CScanTs(int dtype)
radar = 0;
total = done = 0;
freqready = 0;
deltype = dtype;
sigscale = new CProgressBar();
sigscale->setBlink();
snrscale = new CProgressBar();
snrscale->setBlink();
signalbox = NULL;
memset(&TP, 0, sizeof(TP)); // valgrind
}
CScanTs::~CScanTs()
{
delete sigscale;
delete snrscale;
}
void CScanTs::prev_next_TP( bool up)
@@ -201,10 +194,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
ypos_radar = y + hheight + (mheight >> 1);
xpos1 = x + 10;
sigscale->reset();
snrscale->reset();
lastsig = lastsnr = -1;
if (!frameBuffer->getActive())
return menu_return::RETURN_EXIT_ALL;
@@ -349,6 +338,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
} while (!(msg == CRCInput::RC_timeout));
}
delete signalbox;
signalbox = NULL;
hide();
CZapit::getInstance()->scanPids(scan_pids);
@@ -558,51 +549,14 @@ int CScanTs::greater_xpos(int xpos, const neutrino_locale_t txt)
void CScanTs::showSNR ()
{
char percent[10];
int barwidth = 150;
uint16_t ssig, ssnr;
int sig, snr;
int posx, posy;
int sw;
CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
ssig = frontend->getSignalStrength();
ssnr = frontend->getSignalNoiseRatio();
snr = (ssnr & 0xFFFF) * 100 / 65535;
sig = (ssig & 0xFFFF) * 100 / 65535;
posy = y + height - mheight - 5;
//TODO: move sig/snr display into its own class, similar or same code also to find in motorcontrol
if (lastsig != sig) {
lastsig = sig;
posx = x + 20;
sprintf(percent, "%d%%", sig);
sw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("100%");
sigscale->setProgress(posx - 1, posy+2, BAR_WIDTH, BAR_HEIGHT, sig, 100);
sigscale->paint();
posx = posx + barwidth + 3;
frameBuffer->paintBoxRel(posx, posy -1, sw, mheight-8, COL_MENUCONTENT_PLUS_0);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString (posx+2, posy + mheight-(mheight-BAR_HEIGHT)/4, sw, percent, COL_MENUCONTENTDARK_TEXT);
frameBuffer->paintBoxRel(posx+(4*fw), posy - 2, 4*fw, mheight, COL_MENUCONTENT_PLUS_0);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString (posx+2+(4*fw), posy + mheight-(mheight-BAR_HEIGHT)/4, 4*fw, "SIG", COL_MENUCONTENT_TEXT);
if (signalbox == NULL){
CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
signalbox = new CSignalBox(xpos1, y + height - mheight - 5, width - 2*(xpos1-x), g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(), frontend, false);
signalbox->setScaleWidth(60); /*%*/
signalbox->setColorBody(COL_MENUCONTENT_PLUS_0);
signalbox->setTextColor(COL_MENUCONTENT_TEXT);
signalbox->doPaintBg(true);
}
if (lastsnr != snr) {
lastsnr = snr;
posx = x + 20 + (20 * fw);
sprintf(percent, "%d%%", snr);
sw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("100%");
snrscale->setProgress(posx - 1, posy+2, BAR_WIDTH, BAR_HEIGHT, snr, 100);
snrscale->paint();
posx = posx + barwidth + 3;
frameBuffer->paintBoxRel(posx, posy - 1, sw, mheight-8, COL_MENUCONTENT_PLUS_0, 0, true);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString (posx + 2, posy + mheight-(mheight-BAR_HEIGHT)/4, sw, percent, COL_MENUCONTENTDARK_TEXT, 0, true);
frameBuffer->paintBoxRel(posx+(4*fw), posy - 2, 4*fw, mheight, COL_MENUCONTENT_PLUS_0);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString (posx+2+(4*fw), posy + mheight-(mheight-BAR_HEIGHT)/4, 4*fw, "SNR", COL_MENUCONTENT_TEXT);
}
signalbox->paint(false);
}