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

neutrino: consolidate CScale and CProgressBar code

Browse Source 
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
 check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 697e3c6756
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-03 (Sun, 03 Jan 2010)

Origin message was:
------------------
neutrino: consolidate CScale and CProgressBar code

Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
   check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-01-03 10:39:40 +00:00
parent 2aef67aa92
commit 80c9969dcd
17 changed files with 325 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/scan.cpp
View File

@@ -37,7 +37,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <gui/scale.h>
#include <gui/scan.h>
#include <driver/rcinput.h>
@@ -47,6 +46,7 @@
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/progressbar.h>
#include <system/settings.h>
@@ -66,9 +66,6 @@ extern CFrontend * frontend;
#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf"
TP_params TP;
#define RED_BAR 40
#define YELLOW_BAR 70
#define GREEN_BAR 100
#define BAR_BORDER 2
#define BAR_WIDTH 150
#define BAR_HEIGHT 16//(13 + BAR_BORDER*2)
@@ -82,8 +79,8 @@ CScanTs::CScanTs()
total = done = 0;
freqready = 0;
sigscale = new CScale(BAR_WIDTH, BAR_HEIGHT, RED_BAR, GREEN_BAR, YELLOW_BAR);
snrscale = new CScale(BAR_WIDTH, BAR_HEIGHT, RED_BAR, GREEN_BAR, YELLOW_BAR);
sigscale = new CProgressBar(BAR_WIDTH, BAR_HEIGHT);
snrscale = new CProgressBar(BAR_WIDTH, BAR_HEIGHT);
}
@@ -119,6 +116,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
sigscale->reset();
snrscale->reset();
lastsig = lastsnr = -1;
if (!frameBuffer->getActive())
return menu_return::RETURN_EXIT_ALL;
@@ -479,23 +477,25 @@ void CScanTs::showSNR ()
posy = y + height - mheight - 5;
if(sigscale->getPercent() != sig) {
if (lastsig != sig) {
lastsig = sig;
posx = x + 20;
sprintf(percent, "%d%% SIG", sig);
sw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("100% SIG");
sigscale->paint(posx - 1, posy+2, sig);
sigscale->paintProgressBar2(posx - 1, posy+2, sig);
posx = posx + barwidth + 3;
sw = x + 247 - posx;
frameBuffer->paintBoxRel(posx, posy - 2, sw, mheight, COL_MENUCONTENT_PLUS_0);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString (posx+2, posy + mheight, sw, percent, COL_MENUCONTENT);
}
if(snrscale->getPercent() != snr) {
if (lastsnr != snr) {
lastsnr = snr;
posx = x + 20 + 260;
sprintf(percent, "%d%% SNR", snr);
sw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("100% SNR");
snrscale->paint(posx - 1, posy+2, snr);
snrscale->paintProgressBar2(posx - 1, posy+2, snr);
posx = posx + barwidth + 3;
sw = x + width - posx;